@programinglive/dev-workflow-mcp-server 1.1.16 → 1.2.0

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.2.0](https://github.com/programinglive/dev-workflow-mcp-server/compare/v1.1.18...v1.2.0) (2025-11-03)
+
+
+### 🐛 Bug Fixes
+
+* reload workflow state from disk on each request to prevent stale state ([96bf50d](https://github.com/programinglive/dev-workflow-mcp-server/commit/96bf50de532713c2a83a3774d8e0dc05870eb24d))
+
+### [1.1.18](https://github.com/programinglive/dev-workflow-mcp-server/compare/v1.1.17...v1.1.18) (2025-11-03)
+
+
+### ✨ Features
+
+* auto-detect primary branch for commit_and_push ([a68d38b](https://github.com/programinglive/dev-workflow-mcp-server/commit/a68d38ba547e6007bd2c0cfe5d231ebf417a2010))
+
+### [1.1.17](https://github.com/programinglive/dev-workflow-mcp-server/compare/v1.1.16...v1.1.17) (2025-10-31)
+
 ### [1.1.16](https://github.com/programinglive/dev-workflow-mcp-server/compare/v1.1.15...v1.1.16) (2025-10-31)
 
 

package/README.md

@@ -378,9 +378,11 @@ Check if all workflow steps are completed and you're ready to commit & push.
 ### `commit_and_push`
 Automatically run `git add`, `git commit`, and `git push` after the ready check passes.
 
+**Auto-detection of primary branch:** If no `branch` is specified, the tool automatically detects your project's primary branch by checking for `origin/main` first, then falling back to `origin/master`. This eliminates the need to specify the branch parameter for most projects.
+
 **Parameters:**
 - `commitMessage` (string, required): Conventional commit message to use
-- `branch` (string, optional): Target branch to push (defaults to current branch)
+- `branch` (string, optional): Target branch to push. If omitted, auto-detects primary branch (main or master)
 
 ### `perform_release`
 Record the release after you've committed and pushed. Required before you can complete the task.

package/git-helpers.js

@@ -150,3 +150,28 @@ export async function getCurrentBranch() {
     return "";
   }
 }
+
+export async function getPrimaryBranch() {
+  try {
+    // Check if 'main' exists on origin
+    const { stdout: mainCheck } = await exec("git rev-parse --verify origin/main");
+    if (mainCheck.trim()) {
+      return "main";
+    }
+  } catch {
+    // main doesn't exist, fall through to master check
+  }
+
+  try {
+    // Check if 'master' exists on origin
+    const { stdout: masterCheck } = await exec("git rev-parse --verify origin/master");
+    if (masterCheck.trim()) {
+      return "master";
+    }
+  } catch {
+    // master doesn't exist either
+  }
+
+  // Fallback to current branch if neither main nor master exist
+  return await getCurrentBranch();
+}

package/index.js

@@ -56,8 +56,12 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
 }));
 
 // Handle tool calls
-server.setRequestHandler(CallToolRequestSchema, (request) =>
-  handleToolCall({
+server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  // Reload state from disk before each request to ensure consistency
+  if (workflowState) {
+    await workflowState.load();
+  }
+  return handleToolCall({
     request,
     normalizeRequestArgs,
     workflowState,
@@ -72,8 +76,8 @@ server.setRequestHandler(CallToolRequestSchema, (request) =>
       workingTreeSummary,
     },
     utils: { shellEscape, determineReleaseTypeFromCommit, createCommitMessageParts },
-  })
-);
+  });
+});
 
 // Helper function
 export function getNextStep(status) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@programinglive/dev-workflow-mcp-server",
-  "version": "1.1.16",
+  "version": "1.2.0",
   "description": "MCP server to enforce development workflow discipline",
   "type": "module",
   "main": "index.js",

package/tests/handlers.test.js

@@ -62,6 +62,7 @@ test("commit_and_push commits changes and pushes", async () => {
       hasTestChanges: async () => true,
       getStagedChanges: async () => [{ status: "M", path: "src/index.js" }],
       getCurrentBranch: async () => "main",
+      getPrimaryBranch: async () => "main",
       getLastCommitMessage: async () => "",
       workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
     };
@@ -129,6 +130,7 @@ test("run_full_workflow iterates until commit/release complete with clean tree",
       hasTestChanges: async () => true,
       getStagedChanges: async () => [],
       getCurrentBranch: async () => "main",
+      getPrimaryBranch: async () => "main",
       getLastCommitMessage: async () => "chore: existing",
       workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
     };
@@ -163,6 +165,172 @@ test("run_full_workflow iterates until commit/release complete with clean tree",
   });
 });
 
+test("commit_and_push uses primary branch when no branch specified", async () => {
+  await withWorkflowState(async (workflowState) => {
+    workflowState.state.readyToCommit = true;
+    workflowState.state.readyCheckCompleted = true;
+    workflowState.state.testsSkipped = false;
+    workflowState.state.testsCreated = true;
+    workflowState.state.testsPassed = true;
+    workflowState.state.currentPhase = "commit";
+    await workflowState.save();
+
+    const commands = [];
+    const execStub = async (command) => {
+      commands.push(command);
+      return { stdout: "" };
+    };
+
+    const git = {
+      hasWorkingChanges: async () => true,
+      hasStagedChanges: async () => false,
+      hasTestChanges: async () => true,
+      getStagedChanges: async () => [{ status: "M", path: "src/index.js" }],
+      getCurrentBranch: async () => "feature/test",
+      getPrimaryBranch: async () => "main",
+      getLastCommitMessage: async () => "",
+      workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+    };
+
+    const response = await handleToolCall({
+      request: createRequest("commit_and_push", { commitMessage: "feat: test" }),
+      normalizeRequestArgs,
+      workflowState,
+      exec: execStub,
+      git,
+      utils,
+    });
+
+    const pushCommand = commands.find((command) => command.startsWith("git push"));
+    assert.ok(pushCommand, "git push should be executed");
+    assert.ok(
+      pushCommand.includes("main"),
+      "push command should use detected primary branch (main)"
+    );
+    assert.ok(
+      response.content[0].text.includes("Commit and push completed!"),
+      "response should confirm commit and push"
+    );
+  });
+});
+
+test("commit_and_push falls back to master when main not found", async () => {
+  await withWorkflowState(async (workflowState) => {
+    workflowState.state.readyToCommit = true;
+    workflowState.state.readyCheckCompleted = true;
+    workflowState.state.testsSkipped = false;
+    workflowState.state.testsCreated = true;
+    workflowState.state.testsPassed = true;
+    workflowState.state.currentPhase = "commit";
+    await workflowState.save();
+
+    const commands = [];
+    const execStub = async (command) => {
+      commands.push(command);
+      return { stdout: "" };
+    };
+
+    const git = {
+      hasWorkingChanges: async () => true,
+      hasStagedChanges: async () => false,
+      hasTestChanges: async () => true,
+      getStagedChanges: async () => [{ status: "M", path: "src/index.js" }],
+      getCurrentBranch: async () => "feature/test",
+      getPrimaryBranch: async () => "master",
+      getLastCommitMessage: async () => "",
+      workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+    };
+
+    const response = await handleToolCall({
+      request: createRequest("commit_and_push", { commitMessage: "feat: test" }),
+      normalizeRequestArgs,
+      workflowState,
+      exec: execStub,
+      git,
+      utils,
+    });
+
+    const pushCommand = commands.find((command) => command.startsWith("git push"));
+    assert.ok(pushCommand, "git push should be executed");
+    assert.ok(
+      pushCommand.includes("master"),
+      "push command should use detected primary branch (master)"
+    );
+  });
+});
+
+test("run_full_workflow uses provided branch for release push when commit is clean", async () => {
+  await withWorkflowState(async (workflowState) => {
+    workflowState.state.taskDescription = "Ship feature";
+    workflowState.state.taskType = "feature";
+    workflowState.state.currentPhase = "commit";
+    workflowState.state.bugFixed = true;
+    workflowState.state.testsCreated = true;
+    workflowState.state.testsPassed = true;
+    workflowState.state.documentationCreated = true;
+    workflowState.state.readyToCommit = true;
+    workflowState.state.readyCheckCompleted = true;
+    workflowState.state.commitAndPushCompleted = false;
+    workflowState.state.released = false;
+    workflowState.state.documentationType = "README";
+    workflowState.state.documentationSummary = "Docs";
+    workflowState.state.fixSummary = "Feature done";
+    await workflowState.save();
+
+    const commands = [];
+    const execStub = async (command) => {
+      commands.push(command);
+      if (command === "git status --porcelain") {
+        return { stdout: "" };
+      }
+      return { stdout: "" };
+    };
+
+    const git = {
+      hasWorkingChanges: async () => false,
+      hasStagedChanges: async () => false,
+      hasTestChanges: async () => true,
+      getStagedChanges: async () => [],
+      getCurrentBranch: async () => "feature/local",
+      getPrimaryBranch: async () => "main",
+      getLastCommitMessage: async () => "chore: existing",
+      workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+    };
+
+    const branchName = "master";
+    const response = await handleToolCall({
+      request: createRequest("run_full_workflow", {
+        summary: "Feature done",
+        testCommand: "npm test",
+        documentationType: "README",
+        documentationSummary: "Docs",
+        commitMessage: "feat: ship feature",
+        branch: branchName,
+        releaseCommand: "npm run release:patch",
+      }),
+      normalizeRequestArgs,
+      workflowState,
+      exec: execStub,
+      git,
+      utils,
+    });
+
+    assert.ok(
+      response.content[0].text.includes("✅ Full workflow completed successfully"),
+      "run_full_workflow should finish successfully"
+    );
+
+    const tagPushCommand = commands.find((command) => command.startsWith("git push --follow-tags"));
+    assert.ok(tagPushCommand, "release should push tags");
+    assert.ok(
+      /origin\s+'?master'?/.test(tagPushCommand),
+      `release push should target the provided branch (${branchName})`
+    );
+
+    assert.equal(workflowState.state.currentPhase, "idle");
+  });
+});
+
 test("project_summary_data reads persisted file and falls back", async () => {
   await withWorkflowState(async (workflowState) => {
     // Seed some history
@@ -174,7 +342,16 @@ test("project_summary_data reads persisted file and falls back", async () => {
       normalizeRequestArgs,
       workflowState,
       exec: async () => ({ stdout: "" }),
-      git: {},
+      git: {
+        hasWorkingChanges: async () => false,
+        hasStagedChanges: async () => false,
+        hasTestChanges: async () => true,
+        getStagedChanges: async () => [],
+        getCurrentBranch: async () => "main",
+        getPrimaryBranch: async () => "main",
+        getLastCommitMessage: async () => "",
+        workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+      },
       utils,
     });
 
@@ -199,7 +376,16 @@ test("project_summary aggregates task types and recent activity", async () => {
       normalizeRequestArgs,
       workflowState,
       exec: async () => ({ stdout: "" }),
-      git: {},
+      git: {
+        hasWorkingChanges: async () => false,
+        hasStagedChanges: async () => false,
+        hasTestChanges: async () => true,
+        getStagedChanges: async () => [],
+        getCurrentBranch: async () => "main",
+        getPrimaryBranch: async () => "main",
+        getLastCommitMessage: async () => "",
+        workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+      },
       utils,
     });
 
@@ -239,6 +425,7 @@ test("run_full_workflow executes all steps successfully", async () => {
       hasTestChanges: async () => true,
       getStagedChanges: async () => [{ status: "M", path: "src/app.js" }],
       getCurrentBranch: async () => "main",
+      getPrimaryBranch: async () => "main",
       getLastCommitMessage: async () => "",
       workingTreeSummary: () =>
         workingChanges
@@ -315,6 +502,7 @@ test("run_full_workflow resumes from current phase when steps are already comple
       hasTestChanges: async () => true,
       getStagedChanges: async () => [],
       getCurrentBranch: async () => "main",
+      getPrimaryBranch: async () => "main",
       getLastCommitMessage: async () => "",
       workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
     };
@@ -373,7 +561,16 @@ test("run_full_workflow validates required arguments", async () => {
       normalizeRequestArgs,
       workflowState,
       exec: async () => ({ stdout: "" }),
-      git: {},
+      git: {
+        hasWorkingChanges: async () => false,
+        hasStagedChanges: async () => false,
+        hasTestChanges: async () => true,
+        getStagedChanges: async () => [],
+        getCurrentBranch: async () => "main",
+        getPrimaryBranch: async () => "main",
+        getLastCommitMessage: async () => "",
+        workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+      },
       utils,
     });
 
@@ -400,7 +597,16 @@ test("force_complete_task records entry and resets state", async () => {
       normalizeRequestArgs,
       workflowState,
       exec: async () => ({ stdout: "" }),
-      git: {},
+      git: {
+        hasWorkingChanges: async () => false,
+        hasStagedChanges: async () => false,
+        hasTestChanges: async () => true,
+        getStagedChanges: async () => [],
+        getCurrentBranch: async () => "main",
+        getPrimaryBranch: async () => "main",
+        getLastCommitMessage: async () => "",
+        workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+      },
       utils,
     });
 
@@ -436,7 +642,8 @@ test("perform_release blocks when new changes detected", async () => {
       hasTestChanges: async () => true,
       getStagedChanges: async () => [],
       getCurrentBranch: async () => "main",
-      getLastCommitMessage: async () => "fix: adjust layout",
+      getPrimaryBranch: async () => "main",
+      getLastCommitMessage: async () => "",
       workingTreeSummary: () => ({ hasChanges: true, lines: ["?? new-file.js"] }),
     };
 
@@ -466,6 +673,7 @@ test("continue_workflow warns when workflow is idle", async () => {
       hasTestChanges: async () => false,
       getStagedChanges: async () => [],
       getCurrentBranch: async () => "main",
+      getPrimaryBranch: async () => "main",
       getLastCommitMessage: async () => "",
       workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
     };
@@ -499,8 +707,9 @@ test("continue_workflow resets to commit when new changes detected", async () =>
       hasTestChanges: async () => true,
       getStagedChanges: async () => [],
       getCurrentBranch: async () => "main",
-      getLastCommitMessage: async () => "fix: adjust layout",
-      workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
+      getPrimaryBranch: async () => "main",
+      getLastCommitMessage: async () => "",
+      workingTreeSummary: () => ({ hasChanges: true, lines: ["?? new-file.js"] }),
     };
 
     const response = await handleToolCall({
@@ -543,6 +752,7 @@ test("commit_and_push recognizes already committed work", async () => {
       hasTestChanges: async () => true,
       getStagedChanges: async () => [],
       getCurrentBranch: async () => "main",
+      getPrimaryBranch: async () => "main",
       getLastCommitMessage: async () => "fix: previous work",
       workingTreeSummary: () => ({ hasChanges: false, lines: [] }),
     };

package/tools/handlers.js

@@ -426,8 +426,9 @@ async function handleCommitAndPush(args, context) {
     typeof args.commitMessage === "string" ? args.commitMessage.trim() : "";
 
   const requestedBranch = typeof args.branch === "string" ? args.branch.trim() : "";
+  const primaryBranch = await git.getPrimaryBranch();
   const currentBranch = await git.getCurrentBranch();
-  const branchForPush = requestedBranch || currentBranch || "";
+  const branchForPush = requestedBranch || primaryBranch || currentBranch || "";
 
   const hasWorkingChanges = await git.hasWorkingChanges();
 
@@ -780,6 +781,7 @@ async function handleProjectSummaryDb(workflowState) {
 }
 
 async function handleRerunWorkflow(workflowState) {
+  // Capture task context BEFORE reset to avoid losing it
   const currentDescription = workflowState.state.taskDescription;
   const currentType = workflowState.state.taskType;
 
@@ -787,7 +789,10 @@ async function handleRerunWorkflow(workflowState) {
     return textResponse("⚠️ No active task to rerun. Use 'start_task' to begin a new workflow.");
   }
 
+  // Reset all progress flags but preserve history
   workflowState.reset();
+  
+  // Restore task context after reset
   workflowState.state.currentPhase = "coding";
   workflowState.state.taskDescription = currentDescription;
   workflowState.state.taskType = currentType;
@@ -817,6 +822,12 @@ async function handleRunFullWorkflow(args, { workflowState, exec, git, utils })
 
   await workflowState.ensurePrimaryFile();
 
+  const requestedBranch = typeof args.branch === "string" ? args.branch.trim() : "";
+  if (requestedBranch) {
+    workflowState.state.lastPushBranch = requestedBranch;
+    await workflowState.save();
+  }
+
   const requiredStrings = [
     { key: "summary", message: "Provide a non-empty 'summary' for mark_bug_fixed." },
     { key: "testCommand", message: "Provide a non-empty 'testCommand' for run_tests." },
@@ -906,7 +917,7 @@ async function handleRunFullWorkflow(args, { workflowState, exec, git, utils })
       const resp = await executeStep("commit_and_push", handleCommitAndPush, [
         {
           commitMessage: args.commitMessage,
-          branch: typeof args.branch === "string" ? args.branch : "",
+          branch: requestedBranch,
         },
         { workflowState, exec, git, utils },
       ]);