@bobbyg603/mog 1.4.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobbyg603/mog",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "description": "One command to go from GitHub issue to pull request, powered by Claude Code in a Docker sandbox",
   "module": "src/index.ts",
   "type": "module",

package/src/github.ts

@@ -76,6 +76,57 @@ export function listIssues(repo: string, verbose: boolean): void {
   }
 }
 
+export interface PRFeedback {
+  prNumber: number;
+  prUrl: string;
+  reviews: string;
+}
+
+export function fetchPRFeedback(repo: string, branchName: string): PRFeedback | null {
+  const proc = Bun.spawnSync([
+    "gh", "pr", "list",
+    "--repo", repo,
+    "--head", branchName,
+    "--state", "open",
+    "--json", "number,url",
+  ]);
+
+  if (proc.exitCode !== 0) return null;
+
+  const prs = JSON.parse(proc.stdout.toString());
+  if (prs.length === 0) return null;
+
+  const prNumber = prs[0].number;
+  const prUrl = prs[0].url;
+
+  // Fetch review comments
+  const reviewProc = Bun.spawnSync([
+    "gh", "pr", "view", String(prNumber),
+    "--repo", repo,
+    "--json", "reviews,comments",
+  ]);
+
+  let reviews = "";
+  if (reviewProc.exitCode === 0) {
+    const data = JSON.parse(reviewProc.stdout.toString());
+
+    const reviewEntries = (data.reviews || [])
+      .filter((r: { body: string }) => r.body?.trim())
+      .map((r: { author: { login: string }; state: string; body: string }) =>
+        `**@${r.author.login}** (${r.state}):\n${r.body}`
+      );
+
+    const commentEntries = (data.comments || [])
+      .map((c: { author: { login: string }; body: string }) =>
+        `**@${c.author.login}:**\n${c.body}`
+      );
+
+    reviews = [...reviewEntries, ...commentEntries].join("\n\n");
+  }
+
+  return { prNumber, prUrl, reviews };
+}
+
 export function pushAndCreatePR(
   repo: string,
   worktreeDir: string,
@@ -83,7 +134,8 @@ export function pushAndCreatePR(
   defaultBranch: string,
   issueNum: string,
   issue: Issue,
-  summary?: string
+  summary?: string,
+  existingPR?: PRFeedback,
 ): void {
   // Check for unpushed commits or uncommitted changes
   const unpushed = Bun.spawnSync(["git", "log", `origin/${defaultBranch}..HEAD`, "--oneline"], { cwd: worktreeDir });
@@ -129,14 +181,28 @@ export function pushAndCreatePR(
     }
   }
 
-  // Push
+  // Push (force-with-lease when updating an existing PR)
   log.info(`Pushing branch '${branchName}' to origin...`);
-  const push = Bun.spawnSync(["git", "push", "-u", "origin", branchName], { cwd: worktreeDir });
+  const pushArgs = existingPR
+    ? ["git", "push", "--force-with-lease", "-u", "origin", branchName]
+    : ["git", "push", "-u", "origin", branchName];
+  const push = Bun.spawnSync(pushArgs, { cwd: worktreeDir });
   if (push.exitCode !== 0) {
     log.die("Failed to push. Check your git credentials.");
   }
   log.ok("Branch pushed.");
 
+  if (existingPR) {
+    // Update existing PR
+    log.ok("Existing PR updated!");
+    console.log(`\x1b[0;32m${existingPR.prUrl}\x1b[0m`);
+    console.log();
+    log.ok(`All done! Issue #${issueNum} → Branch '${branchName}' → PR updated.`);
+    log.info(`Worktree: ${worktreeDir}`);
+    log.info(`To clean up the worktree later: git worktree remove ${worktreeDir}`);
+    return;
+  }
+
   // Create PR
   log.info("Opening pull request...");
 

package/src/index.ts

@@ -2,10 +2,11 @@
 
 import fs from "fs";
 import path from "path";
-import { fetchIssue, listIssues } from "./github";
+import { fetchIssue, listIssues, fetchPRFeedback } from "./github";
 import { detectRepo, ensureRepo, createWorktree } from "./worktree";
 import { runClaude } from "./sandbox";
 import { pushAndCreatePR } from "./github";
+import type { PRFeedback } from "./github";
 import { log } from "./log";
 
 const SANDBOX_NAME = "mog";
@@ -115,6 +116,7 @@ async function main() {
     console.log();
     console.log("Options:");
     console.log("  --include <file>              — copy a file into the worktree (repeatable)");
+    console.log("  --fresh                       — ignore existing PR, start a brand new one");
     console.log();
     console.log("Example:");
     console.log("  mog init");
@@ -126,9 +128,10 @@ async function main() {
     return;
   }
 
-  // Parse --include flags
+  // Parse --include and --fresh flags
   const includeFiles: string[] = [];
   const filteredArgs: string[] = [];
+  let fresh = false;
   for (let i = 0; i < args.length; i++) {
     if (args[i] === "--include" && i + 1 < args.length) {
       const filePath = path.resolve(args[i + 1]!);
@@ -137,6 +140,8 @@ async function main() {
       }
       includeFiles.push(filePath);
       i++; // skip the path argument
+    } else if (args[i] === "--fresh") {
+      fresh = true;
     } else {
       filteredArgs.push(args[i]!);
     }
@@ -170,6 +175,7 @@ async function main() {
     console.log();
     console.log("Options:");
     console.log("  --include <file>              — copy a file into the worktree (repeatable)");
+    console.log("  --fresh                       — ignore existing PR, start a brand new one");
     console.log();
     console.log("Example:");
     console.log("  mog init");
@@ -210,10 +216,22 @@ async function main() {
   const { defaultBranch } = ensureRepo(repo, owner, repoName, reposDir);
   log.info(`Default branch: ${defaultBranch}`);
 
-  const { worktreeDir, branchName } = createWorktree(
+  const { worktreeDir, branchName, reused } = createWorktree(
     reposDir, owner, repoName, defaultBranch, issueNum, issue.title
   );
 
+  // Check for existing PR (unless --fresh)
+  let existingPR: PRFeedback | undefined;
+  let isRetry = reused;
+  if (!fresh) {
+    const pr = fetchPRFeedback(repo, branchName);
+    if (pr) {
+      existingPR = pr;
+      isRetry = true;
+      log.ok(`Found existing PR #${pr.prNumber} — will include review feedback and update it.`);
+    }
+  }
+
   // Copy included files into worktree
   const copiedFiles: string[] = [];
   for (const filePath of includeFiles) {
@@ -225,7 +243,8 @@ async function main() {
   }
 
   // Build prompts
-  const planningPrompt = buildPlanningPrompt(repo, issueNum, issue);
+  const prFeedback = existingPR?.reviews || "";
+  const planningPrompt = buildPlanningPrompt(repo, issueNum, issue, prFeedback, isRetry);
   const buildingPromptFn = (remaining: string[], plan: string) =>
     buildBuildingPrompt(repo, issueNum, issue, remaining, plan);
   const reviewPrompt = buildReviewPrompt(repo, issueNum, issue);
@@ -249,8 +268,8 @@ async function main() {
     }
   }
 
-  // Push and create PR
-  pushAndCreatePR(repo, worktreeDir, branchName, defaultBranch, issueNum, issue, summary);
+  // Push and create/update PR
+  pushAndCreatePR(repo, worktreeDir, branchName, defaultBranch, issueNum, issue, summary, existingPR);
 }
 
 function getReposDir(): string {
@@ -302,7 +321,7 @@ function tryRecoverSandbox(reposDir: string): boolean {
   return true;
 }
 
-function formatIssueContext(issueNum: string, issue: { title: string; body: string; labels: string; comments: string }): string {
+function formatIssueContext(issueNum: string, issue: { title: string; body: string; labels: string; comments: string }, prFeedback?: string, isRetry?: boolean): string {
   let context = `## Issue: ${issue.title}
 
 ### Description
@@ -318,13 +337,29 @@ ${issue.labels}`;
 ${issue.comments}`;
   }
 
+  if (isRetry) {
+    context += `
+
+### Re-attempt Notice
+**This is a re-attempt of a previous run.** The issue description, comments, or requirements may have been updated since the last attempt. Carefully review ALL context above to catch anything that may have changed.`;
+
+    if (prFeedback) {
+      context += `
+
+### Previous PR Review Feedback
+Address the following reviewer feedback in your implementation:
+
+${prFeedback}`;
+    }
+  }
+
   return context;
 }
 
-function buildPlanningPrompt(repo: string, issueNum: string, issue: { title: string; body: string; labels: string; comments: string }): string {
+function buildPlanningPrompt(repo: string, issueNum: string, issue: { title: string; body: string; labels: string; comments: string }, prFeedback?: string, isRetry?: boolean): string {
   return `You are working on GitHub issue #${issueNum} for the repository ${repo}.
 
-${formatIssueContext(issueNum, issue)}
+${formatIssueContext(issueNum, issue, prFeedback, isRetry)}
 
 ## Instructions
 

package/src/worktree.ts

@@ -73,7 +73,7 @@ export function createWorktree(
   defaultBranch: string,
   issueNum: string,
   issueTitle: string
-): { worktreeDir: string; branchName: string } {
+): { worktreeDir: string; branchName: string; reused: boolean } {
   const safeTitle = issueTitle
     .toLowerCase()
     .replace(/[^a-z0-9]/g, "-")
@@ -87,7 +87,7 @@ export function createWorktree(
 
   if (fs.existsSync(worktreeDir)) {
     log.warn(`Worktree already exists at ${worktreeDir}, reusing.`);
-    return { worktreeDir, branchName };
+    return { worktreeDir, branchName, reused: true };
   }
 
   log.info(`Creating worktree for branch '${branchName}'...`);
@@ -120,5 +120,5 @@ export function createWorktree(
   Bun.spawnSync(["git", "submodule", "update", "--init", "--recursive"], { cwd: worktreeDir });
 
   log.ok(`Worktree created at ${worktreeDir}`);
-  return { worktreeDir, branchName };
+  return { worktreeDir, branchName, reused: false };
 }