@bobbyg603/mog 1.5.0 → 1.5.2

package/README.md

@@ -11,10 +11,13 @@ mog workingdevshero/automate-it 123
 
 That's it. `mog` will:
 
-1. Fetch the issue title, description, and labels via `gh` CLI
+1. Fetch the issue title, description, labels, and comments via `gh` CLI
 2. Create a git worktree on a clean branch (`123-fix-broken-login`)
 3. Run Claude Code inside a persistent Docker sandbox (microVM) with `--dangerously-skip-permissions`
-4. Push the branch and open a PR that `Closes #123`
+4. **Plan** — analyze the codebase and create an implementation plan
+5. **Build** — execute each task in the plan, one at a time
+6. **Review** — self-review all changes for missed patterns, duplication, and quality
+7. Squash commits, push the branch, and open a PR that `Closes #123`
 
 ## Prerequisites
 
@@ -57,12 +60,37 @@ If your session ever expires, just run `mog init` again to re-authenticate.
 # One-time setup
 mog init
 
-# Basic usage
-mog owner/repo issue_number
+# Auto-detect repo from git remote (run from inside a git repo)
+mog 123
 
-# Examples
-mog workingdevshero/automate-it 123
-mog sparx-tech/hub-firmware 45
+# Explicit repo
+mog owner/repo 123
+
+# Include files the project needs at runtime (e.g. .env, credentials)
+# Files are copied into the worktree and removed before pushing
+mog 123 --include .env --include serviceAccountKey.json
+
+# List open issues
+mog list
+mog list --verbose
+mog owner/repo list --verbose
+```
+
+### Re-mogging
+
+Running `mog` again on an issue that already has an open PR will:
+
+1. Fetch review comments and feedback from the existing PR
+2. Include that feedback in the prompt so Claude addresses it
+3. Start fresh from the default branch
+4. Force-push to update the existing PR
+
+```bash
+# Re-mog after getting PR feedback — Claude sees reviewer comments
+mog 123
+
+# Start completely over, ignoring the existing PR
+mog 123 --fresh
 ```
 
 ## How it works
@@ -71,7 +99,8 @@ mog sparx-tech/hub-firmware 45
 ┌──────────────────────────────────────────────────────────┐
 │  Host machine                                            │
 │                                                          │
-│  1. gh issue view #123 → fetch title, body, labels       │
+│  1. gh issue view #123 → fetch title, body, labels,      │
+│     comments, and PR review feedback (if re-mogging)     │
 │  2. git worktree add → clean branch from default branch  │
 │                                                          │
 │  ┌────────────────────────────────────────────────────┐  │
@@ -80,12 +109,14 @@ mog sparx-tech/hub-firmware 45
 │  │  • ~/mog-repos mounted as workspace                │  │
 │  │  • Auth persists across runs (login once)          │  │
 │  │  • Isolated from host (own Docker daemon)          │  │
-│  │  • claude --dangerously-skip-permissions -p "..."  │  │
-│  │  • Reads code, implements fix, commits             │  │
+│  │  • Phase 1: Plan — analyze codebase, create plan   │  │
+│  │  • Phase 2: Build — execute tasks one at a time    │  │
+│  │  • Phase 3: Review — self-review for quality       │  │
 │  └────────────────────────────────────────────────────┘  │
 │                                                          │
-│  3. git push origin branch                               │
-│  4. gh pr create --body "Closes #123"                    │
+│  3. Squash commits into one                              │
+│  4. git push origin branch (force-push if updating PR)   │
+│  5. gh pr create --body "Closes #123" (or update PR)     │
 └──────────────────────────────────────────────────────────┘
 ```
 
@@ -94,7 +125,7 @@ mog sparx-tech/hub-firmware 45
 | Environment Variable | Default | Description |
 |---|---|---|
 | `MOG_REPOS_DIR` | `~/mog-repos` | Where repos are cloned and worktrees created (also the sandbox workspace) |
-| `MOG_MAX_ITERATIONS` | `10` | Max build loop iterations per issue |
+| `MOG_MAX_ITERATIONS` | `30` | Max build loop iterations per issue |
 | `MOG_MAX_CONTINUATIONS` | — | Legacy alias for `MOG_MAX_ITERATIONS` |
 
 ## Worktree management

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobbyg603/mog",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "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/index.ts

@@ -216,16 +216,18 @@ 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.`);
     }
   }
@@ -242,7 +244,7 @@ async function main() {
 
   // Build prompts
   const prFeedback = existingPR?.reviews || "";
-  const planningPrompt = buildPlanningPrompt(repo, issueNum, issue, prFeedback);
+  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);
@@ -319,7 +321,7 @@ function tryRecoverSandbox(reposDir: string): boolean {
   return true;
 }
 
-function formatIssueContext(issueNum: string, issue: { title: string; body: string; labels: string; comments: string }, prFeedback?: 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
@@ -335,22 +337,29 @@ ${issue.labels}`;
 ${issue.comments}`;
   }
 
-  if (prFeedback) {
+  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
-A previous attempt at this issue was reviewed. Address the following feedback in your implementation:
+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 }, prFeedback?: 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, prFeedback)}
+${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 };
 }