@codebyplan/cli 2.2.0 → 2.3.0

package/dist/cli.js

@@ -37,7 +37,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "2.2.0";
+    VERSION = "2.3.0";
     PACKAGE_NAME = "@codebyplan/cli";
   }
 });
@@ -23555,6 +23555,19 @@ async function createPR(options) {
     return { pr_url: null, pr_number: null, error: errorMessage };
   }
 }
+async function mergePR(options) {
+  const { repoPath, prNumber, mergeMethod } = options;
+  try {
+    const { stdout: stdout5 } = await exec(
+      `gh pr merge ${prNumber} --${mergeMethod} --delete-branch`,
+      { cwd: repoPath }
+    );
+    return { merged: true, message: stdout5.trim() || `PR #${prNumber} merged via ${mergeMethod}` };
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    return { merged: false, message: "Merge failed", error: errorMessage };
+  }
+}
 async function getPRStatus(repoPath, prNumber) {
   try {
     const { stdout: stdout5 } = await exec(
@@ -23642,12 +23655,27 @@ Automatically created by CodeByPlan promotion engine.`
         status: "in_progress"
       });
     }
+    let mergeMessage = "";
+    if (prResult.pr_number) {
+      const mergeResult = await mergePR({
+        repoPath: repo.path,
+        prNumber: prResult.pr_number,
+        mergeMethod: "merge"
+      });
+      mergeMessage = mergeResult.merged ? ` \u2192 Merged` : ` \u2192 Merge failed: ${mergeResult.error}`;
+      if (mergeResult.merged && checklist) {
+        await apiPut(`/merge-checklists/${checklist.id}`, {
+          status: "completed",
+          completed_at: (/* @__PURE__ */ new Date()).toISOString()
+        });
+      }
+    }
     return {
       promoted: true,
       pr_url: prResult.pr_url,
       pr_number: prResult.pr_number,
       checklist_id: checklist?.id ?? null,
-      message: prResult.error ? `PR creation issue: ${prResult.error}` : `PR created: ${prResult.pr_url}`
+      message: prResult.error ? `PR creation issue: ${prResult.error}` : `PR created: ${prResult.pr_url}${mergeMessage}`
     };
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
@@ -23685,12 +23713,21 @@ async function promoteToMain(repoId) {
 
 Automatically created by CodeByPlan promotion engine.`
     });
+    let mergeMessage = "";
+    if (prResult.pr_number) {
+      const mergeResult = await mergePR({
+        repoPath: repo.path,
+        prNumber: prResult.pr_number,
+        mergeMethod: "merge"
+      });
+      mergeMessage = mergeResult.merged ? ` \u2192 Merged` : ` \u2192 Merge failed: ${mergeResult.error}`;
+    }
     return {
       promoted: true,
       pr_url: prResult.pr_url,
       pr_number: prResult.pr_number,
       checklist_id: null,
-      message: prResult.error ? `PR creation issue: ${prResult.error}` : `PR created: ${prResult.pr_url}`
+      message: prResult.error ? `PR creation issue: ${prResult.error}` : `PR created: ${prResult.pr_url}${mergeMessage}`
     };
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebyplan/cli",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "MCP server for CodeByPlan — AI-powered development planning and tracking",
   "type": "module",
   "bin": {