@codebyplan/cli 2.1.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.1.0";
+    VERSION = "2.3.0";
     PACKAGE_NAME = "@codebyplan/cli";
   }
 });
@@ -23526,63 +23526,269 @@ var init_read = __esm({
   }
 });
 
-// src/lib/auto-push.ts
+// src/lib/git-pr.ts
 import { exec as execCb } from "node:child_process";
 import { promisify } from "node:util";
-async function autoPushToMain(repoId) {
-  let repo;
+async function createPR(options) {
+  const { repoPath, head, base, title, body } = options;
   try {
-    const res = await apiGet(`/repos/${repoId}`);
-    repo = res.data;
-  } catch {
+    try {
+      const { stdout: existing } = await exec(
+        `gh pr list --head "${head}" --base "${base}" --json number,url --jq '.[0]'`,
+        { cwd: repoPath }
+      );
+      if (existing.trim()) {
+        const pr = JSON.parse(existing.trim());
+        return { pr_url: pr.url, pr_number: pr.number };
+      }
+    } catch {
+    }
+    const { stdout: stdout5 } = await exec(
+      `gh pr create --head "${head}" --base "${base}" --title "${title.replace(/"/g, '\\"')}" --body "${body.replace(/"/g, '\\"')}"`,
+      { cwd: repoPath }
+    );
+    const prUrl = stdout5.trim();
+    const prNumber = parseInt(prUrl.split("/").pop() ?? "0", 10);
+    return { pr_url: prUrl, pr_number: prNumber || null };
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    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(
+      `gh pr view ${prNumber} --json state,mergeable,title,url,number`,
+      { cwd: repoPath }
+    );
+    const pr = JSON.parse(stdout5.trim());
     return {
-      pushed: false,
-      message: "Repo not found",
-      error: "Repo not found"
+      state: pr.state,
+      mergeable: pr.mergeable,
+      title: pr.title,
+      url: pr.url,
+      number: pr.number
     };
-  }
-  if (!repo.auto_push_enabled) {
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
     return {
-      pushed: false,
-      message: "Auto-push is not enabled for this repo"
+      state: "UNKNOWN",
+      mergeable: "UNKNOWN",
+      title: "",
+      url: "",
+      number: prNumber,
+      error: errorMessage
     };
   }
-  if (!repo.path) {
+}
+var exec;
+var init_git_pr = __esm({
+  "src/lib/git-pr.ts"() {
+    "use strict";
+    exec = promisify(execCb);
+  }
+});
+
+// src/lib/promotion.ts
+async function promoteCheckpoint(checkpointId) {
+  try {
+    const checkpointRes = await apiGet(`/checkpoints/${checkpointId}`);
+    const checkpoint = checkpointRes.data;
+    if (!checkpoint.branch_name) {
+      return {
+        promoted: false,
+        pr_url: null,
+        pr_number: null,
+        checklist_id: null,
+        message: "Checkpoint has no branch_name set",
+        error: "No branch_name on checkpoint"
+      };
+    }
+    const repoRes = await apiGet(`/repos/${checkpoint.repo_id}`);
+    const repo = repoRes.data;
+    if (!repo.path) {
+      return {
+        promoted: false,
+        pr_url: null,
+        pr_number: null,
+        checklist_id: null,
+        message: "Repo path not configured",
+        error: "Repo path not configured"
+      };
+    }
+    const baseBranch = repo.git_branch ?? "development";
+    const chkNumber = checkpoint.number.toString().padStart(3, "0");
+    const checklist = await createChecklistFromTemplates(
+      checkpoint.repo_id,
+      checkpointId,
+      "feat_to_development",
+      `CHK-${chkNumber}: ${checkpoint.title ?? "Untitled"} \u2192 ${baseBranch}`
+    );
+    const prResult = await createPR({
+      repoPath: repo.path,
+      head: checkpoint.branch_name,
+      base: baseBranch,
+      title: `CHK-${chkNumber}: ${checkpoint.title ?? "Checkpoint completion"}`,
+      body: `## Checkpoint CHK-${chkNumber}
+
+**Goal**: ${checkpoint.goal ?? "N/A"}
+
+Automatically created by CodeByPlan promotion engine.`
+    });
+    if (checklist && prResult.pr_url) {
+      await apiPut(`/merge-checklists/${checklist.id}`, {
+        pr_url: prResult.pr_url,
+        pr_number: prResult.pr_number,
+        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 {
-      pushed: false,
-      message: "Repo path is not configured",
-      error: "Repo path is not configured"
+      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}${mergeMessage}`
+    };
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : String(err);
+    return {
+      promoted: false,
+      pr_url: null,
+      pr_number: null,
+      checklist_id: null,
+      message: "Promotion failed",
+      error: errorMessage
     };
   }
-  const sourceBranch = repo.git_branch ?? "development";
+}
+async function promoteToMain(repoId) {
   try {
-    await exec("git checkout main", { cwd: repo.path });
-    await exec(`git merge ${sourceBranch} --ff-only`, { cwd: repo.path });
-    await exec("git push origin main", { cwd: repo.path });
-    await exec(`git checkout ${sourceBranch}`, { cwd: repo.path });
+    const repoRes = await apiGet(`/repos/${repoId}`);
+    const repo = repoRes.data;
+    if (!repo.path) {
+      return {
+        promoted: false,
+        pr_url: null,
+        pr_number: null,
+        checklist_id: null,
+        message: "Repo path not configured",
+        error: "Repo path not configured"
+      };
+    }
+    const sourceBranch = repo.git_branch ?? "development";
+    const prResult = await createPR({
+      repoPath: repo.path,
+      head: sourceBranch,
+      base: "main",
+      title: `Promote ${sourceBranch} \u2192 main`,
+      body: `Promotion from ${sourceBranch} to main.
+
+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 {
-      pushed: true,
-      message: `Merged ${sourceBranch} -> main and pushed to origin`
+      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}${mergeMessage}`
     };
   } catch (err) {
-    try {
-      await exec(`git checkout ${sourceBranch}`, { cwd: repo.path });
-    } catch {
-    }
     const errorMessage = err instanceof Error ? err.message : String(err);
     return {
-      pushed: false,
-      message: "Auto-push failed",
+      promoted: false,
+      pr_url: null,
+      pr_number: null,
+      checklist_id: null,
+      message: "Promotion to main failed",
       error: errorMessage
     };
   }
 }
-var exec;
-var init_auto_push = __esm({
-  "src/lib/auto-push.ts"() {
+async function createChecklistFromTemplates(repoId, checkpointId, branchLevel, title) {
+  try {
+    const templatesRes = await apiGet(
+      `/repos/${repoId}/checklist-templates`,
+      { branch_level: branchLevel }
+    );
+    const templates = templatesRes.data ?? [];
+    const items = templates.map((t) => ({
+      title: t.title,
+      description: t.description,
+      is_required: t.is_required,
+      checked: false,
+      checked_at: null
+    }));
+    const checklistRes = await apiPost(
+      "/merge-checklists",
+      {
+        checkpoint_id: checkpointId,
+        branch_level: branchLevel,
+        title,
+        status: "pending",
+        items
+      }
+    );
+    return checklistRes.data;
+  } catch {
+    try {
+      const checklistRes = await apiPost(
+        "/merge-checklists",
+        {
+          checkpoint_id: checkpointId,
+          branch_level: branchLevel,
+          title,
+          status: "pending",
+          items: []
+        }
+      );
+      return checklistRes.data;
+    } catch {
+      return null;
+    }
+  }
+}
+var init_promotion = __esm({
+  "src/lib/promotion.ts"() {
     "use strict";
     init_api();
-    exec = promisify(execCb);
+    init_git_pr();
   }
 });
 
@@ -23659,6 +23865,7 @@ function registerWriteTools(server) {
       launch_id: external_exports.string().uuid().nullable().optional().describe("Launch UUID to connect (or null to disconnect)"),
       worktree_id: external_exports.string().uuid().nullable().optional().describe("Worktree UUID to assign (or null to unassign)"),
       assigned_to: external_exports.string().nullable().optional().describe("Who/what claimed this checkpoint"),
+      branch_name: external_exports.string().nullable().optional().describe("Git branch name for this checkpoint (e.g. feat/CHK-061-git-overhaul)"),
       ideas: external_exports.array(external_exports.object({
         description: external_exports.string().describe("Idea description"),
         requirements: external_exports.array(external_exports.string()).optional().describe("List of requirements for this idea"),
@@ -23668,7 +23875,7 @@ function registerWriteTools(server) {
       research: external_exports.any().optional().describe("Research JSONB (topics with findings and sources)"),
       qa: external_exports.any().optional().describe("QA JSONB (checklist items with type, check, status)")
     }
-  }, async ({ checkpoint_id, title, goal, status, deadline, completed_at, launch_id, worktree_id, assigned_to, ideas, context, research, qa }) => {
+  }, async ({ checkpoint_id, title, goal, status, deadline, completed_at, launch_id, worktree_id, assigned_to, branch_name, ideas, context, research, qa }) => {
     const update = {};
     if (title !== void 0) update.title = title;
     if (goal !== void 0) update.goal = goal;
@@ -23678,6 +23885,7 @@ function registerWriteTools(server) {
     if (launch_id !== void 0) update.launch_id = launch_id;
     if (worktree_id !== void 0) update.worktree_id = worktree_id;
     if (assigned_to !== void 0) update.assigned_to = assigned_to;
+    if (branch_name !== void 0) update.branch_name = branch_name;
     if (ideas !== void 0) update.ideas = ideas;
     if (context !== void 0) update.context = context;
     if (research !== void 0) update.research = research;
@@ -23693,7 +23901,7 @@ function registerWriteTools(server) {
     }
   });
   server.registerTool("complete_checkpoint", {
-    description: "Mark a checkpoint as completed. Sets status to 'completed', completed_at to now, and triggers auto-push to main if enabled for the repo.",
+    description: "Mark a checkpoint as completed. Sets status to 'completed', completed_at to now, and triggers promotion (creates PR from feat branch to development).",
     inputSchema: {
       checkpoint_id: external_exports.string().uuid().describe("The checkpoint UUID")
     }
@@ -23704,8 +23912,13 @@ function registerWriteTools(server) {
         completed_at: (/* @__PURE__ */ new Date()).toISOString()
       });
       const checkpoint = res.data;
-      const pushResult = await autoPushToMain(checkpoint.repo_id);
-      return { content: [{ type: "text", text: JSON.stringify({ checkpoint, autoPush: pushResult }, null, 2) }] };
+      const featToDevResult = await promoteCheckpoint(checkpoint_id);
+      let devToMainResult = null;
+      const repoRes = await apiGet(`/repos/${checkpoint.repo_id}`);
+      if (repoRes.data.auto_push_enabled) {
+        devToMainResult = await promoteToMain(checkpoint.repo_id);
+      }
+      return { content: [{ type: "text", text: JSON.stringify({ checkpoint, promotion: { feat_to_development: featToDevResult, development_to_main: devToMainResult } }, null, 2) }] };
     } catch (err) {
       return { content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }], isError: true };
     }
@@ -24101,13 +24314,74 @@ function registerWriteTools(server) {
       return { content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }], isError: true };
     }
   });
+  server.registerTool("create_pr", {
+    description: "Create a GitHub PR for a repo. Uses gh CLI.",
+    inputSchema: {
+      repo_id: external_exports.string().uuid().describe("The repo UUID"),
+      head: external_exports.string().describe("Source branch name"),
+      base: external_exports.string().describe("Target branch name"),
+      title: external_exports.string().describe("PR title"),
+      body: external_exports.string().optional().describe("PR description body")
+    }
+  }, async ({ repo_id, head, base, title, body }) => {
+    try {
+      const repoRes = await apiGet(`/repos/${repo_id}`);
+      const repo = repoRes.data;
+      if (!repo.path) {
+        return { content: [{ type: "text", text: "Error: Repo path is not configured." }], isError: true };
+      }
+      const result = await createPR({
+        repoPath: repo.path,
+        head,
+        base,
+        title,
+        body: body ?? ""
+      });
+      return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+    } catch (err) {
+      return { content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }], isError: true };
+    }
+  });
+  server.registerTool("get_pr_status", {
+    description: "Get the status of a GitHub PR by number.",
+    inputSchema: {
+      repo_id: external_exports.string().uuid().describe("The repo UUID"),
+      pr_number: external_exports.number().int().describe("The PR number")
+    }
+  }, async ({ repo_id, pr_number }) => {
+    try {
+      const repoRes = await apiGet(`/repos/${repo_id}`);
+      const repo = repoRes.data;
+      if (!repo.path) {
+        return { content: [{ type: "text", text: "Error: Repo path is not configured." }], isError: true };
+      }
+      const status = await getPRStatus(repo.path, pr_number);
+      return { content: [{ type: "text", text: JSON.stringify(status, null, 2) }] };
+    } catch (err) {
+      return { content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }], isError: true };
+    }
+  });
+  server.registerTool("promote_checkpoint", {
+    description: "Trigger full promotion flow for a checkpoint. Creates merge checklist from templates and GitHub PR (feat branch \u2192 development).",
+    inputSchema: {
+      checkpoint_id: external_exports.string().uuid().describe("The checkpoint UUID")
+    }
+  }, async ({ checkpoint_id }) => {
+    try {
+      const result = await promoteCheckpoint(checkpoint_id);
+      return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+    } catch (err) {
+      return { content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }], isError: true };
+    }
+  });
 }
 var init_write = __esm({
   "src/tools/write.ts"() {
     "use strict";
     init_zod();
     init_api();
-    init_auto_push();
+    init_promotion();
+    init_git_pr();
     init_sync_engine();
   }
 });
@@ -24117,30 +24391,45 @@ import { exec as execCb2 } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
 function registerFileGenTools(server) {
   server.registerTool("git_commit", {
-    description: "Stage files and create a git commit in a repo. If files are specified, stages only those files. Otherwise stages all changes.",
+    description: "Stage files and create a git commit in a repo. If files are specified, stages only those files. Otherwise stages all changes. Optionally verifies the current branch matches branch_name.",
     inputSchema: {
       repo_id: external_exports.string().uuid().describe("The repo UUID"),
       message: external_exports.string().describe("Commit message"),
-      files: external_exports.array(external_exports.string()).optional().describe("Specific file paths to stage (relative to repo root). If omitted, stages all changes.")
+      files: external_exports.array(external_exports.string()).optional().describe("Specific file paths to stage (relative to repo root). If omitted, stages all changes."),
+      branch_name: external_exports.string().optional().describe("Expected branch name. If provided, verifies the repo is on this branch before committing.")
     }
-  }, async ({ repo_id, message, files }) => {
+  }, async ({ repo_id, message, files, branch_name }) => {
     try {
       const repoRes = await apiGet(`/repos/${repo_id}`);
       const repo = repoRes.data;
       if (!repo.path) {
         return { content: [{ type: "text", text: "Error: Repo path is not configured." }], isError: true };
       }
+      if (branch_name) {
+        const { stdout: currentBranch } = await exec2("git rev-parse --abbrev-ref HEAD", { cwd: repo.path });
+        if (currentBranch.trim() !== branch_name) {
+          return {
+            content: [{
+              type: "text",
+              text: `Error: Expected branch "${branch_name}" but currently on "${currentBranch.trim()}".`
+            }],
+            isError: true
+          };
+        }
+      }
       const addCmd = files && files.length > 0 ? `git add ${files.map((f) => `"${f}"`).join(" ")}` : "git add .";
       await exec2(addCmd, { cwd: repo.path });
       const { stdout: stdout5, stderr } = await exec2(
         `git commit -m "${message.replace(/"/g, '\\"')}"`,
         { cwd: repo.path }
       );
+      const { stdout: branch } = await exec2("git rev-parse --abbrev-ref HEAD", { cwd: repo.path });
       return {
         content: [{
           type: "text",
           text: JSON.stringify({
             status: "committed",
+            branch: branch.trim(),
             output: stdout5.trim(),
             warnings: stderr.trim() || void 0
           }, null, 2)

package/package.json

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