@bobbyg603/mog 1.1.0 → 1.2.0

package/README.md

@@ -1,4 +1,4 @@
-<img width="300" alt="claude moggin" src="https://github.com/user-attachments/assets/bed005f3-12c3-47ee-8b6e-6974ed4e0a79" />
+<img height="320" alt="claude moggin issues" src="https://github.com/user-attachments/assets/72b347d2-b128-47b5-8dcd-e15248350fe0" />
 
 
 # mog — Sandboxed Claude Issue Mogging

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobbyg603/mog",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "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

@@ -34,7 +34,8 @@ export function pushAndCreatePR(
   branchName: string,
   defaultBranch: string,
   issueNum: string,
-  issue: Issue
+  issue: Issue,
+  summary?: string
 ): void {
   // Check for unpushed commits or uncommitted changes
   const unpushed = Bun.spawnSync(["git", "log", `origin/${defaultBranch}..HEAD`, "--oneline"], { cwd: worktreeDir });
@@ -75,11 +76,15 @@ export function pushAndCreatePR(
   // Create PR
   log.info("Opening pull request...");
 
+  const summarySection = summary
+    ? `### What was done\n\n${summary}\n\n`
+    : "";
+
   const prBody = `## Summary
 
 Closes #${issueNum}
 
-This PR was generated by [mog](https://github.com/bobbyg603/mog) using Claude Code in a Docker sandbox.
+${summarySection}This PR was generated by [mog](https://github.com/bobbyg603/mog) using Claude Code in a Docker sandbox.
 
 ### Issue: ${issue.title}
 

package/src/index.ts

@@ -95,14 +95,16 @@ async function main() {
     return;
   }
 
-  const repo = args[0];
-  const issueNum = args[1];
+  const repo = args[0] as string;
+  const issueNum = args[1] as string;
 
-  if (!/^\d+$/.test(issueNum)) {
+  if (!repo || !issueNum || !/^\d+$/.test(issueNum)) {
     log.die(`Invalid issue number: '${issueNum}'. Must be a positive integer.`);
   }
 
-  const [owner, repoName] = repo.split("/");
+  const parts = repo.split("/");
+  const owner = parts[0] as string;
+  const repoName = parts[1] as string;
 
   if (!owner || !repoName) {
     log.die("Invalid repo format. Use: owner/repo");
@@ -144,10 +146,10 @@ async function main() {
   log.info(`Worktree: ${worktreeDir}`);
   console.log();
 
-  await runClaude(SANDBOX_NAME, worktreeDir, planningPrompt, buildingPromptFn);
+  const summary = await runClaude(SANDBOX_NAME, worktreeDir, planningPrompt, buildingPromptFn);
 
   // Push and create PR
-  pushAndCreatePR(repo, worktreeDir, branchName, defaultBranch, issueNum, issue);
+  pushAndCreatePR(repo, worktreeDir, branchName, defaultBranch, issueNum, issue, summary);
 }
 
 function getReposDir(): string {

package/src/sandbox.ts

@@ -76,7 +76,9 @@ export async function runClaude(
   worktreeDir: string,
   planningPrompt: string,
   buildingPromptFn: (remainingItems: string[], planContent: string) => string,
-): Promise<void> {
+): Promise<string> {
+  let lastResult = "";
+
   // Phase 1 — Planning
   log.info("Phase 1: Creating implementation plan...");
   await execClaude(sandboxName, worktreeDir, ["-p", planningPrompt]);
@@ -88,21 +90,23 @@ export async function runClaude(
   if (!planContent || unchecked.length === 0) {
     log.warn("No implementation plan created — falling back to single-shot mode.");
     const fallbackPrompt = buildingPromptFn([], "");
-    await execClaude(sandboxName, worktreeDir, ["-p", fallbackPrompt]);
+    const fallbackResult = await execClaude(sandboxName, worktreeDir, ["-p", fallbackPrompt]);
+    if (fallbackResult) lastResult = fallbackResult;
 
     for (let i = 0; i < MAX_ITERATIONS; i++) {
-      if (getCommitCount(sandboxName, worktreeDir) > 0) return;
+      if (getCommitCount(sandboxName, worktreeDir) > 0) return lastResult;
       log.warn(`No commits yet — continuing Claude (attempt ${i + 2}/${MAX_ITERATIONS + 1})...`);
-      await execClaude(sandboxName, worktreeDir, [
+      const contResult = await execClaude(sandboxName, worktreeDir, [
         "--continue", "-p",
         "You stopped before finishing. The task is not done yet — there are no commits. Continue where you left off. Do NOT re-plan. Execute the implementation now and commit when done.",
       ]);
+      if (contResult) lastResult = contResult;
     }
 
     if (getCommitCount(sandboxName, worktreeDir) === 0) {
       log.warn("Claude did not produce any commits after all attempts.");
     }
-    return;
+    return lastResult;
   }
 
   log.ok(`Implementation plan created with ${unchecked.length} task(s).`);
@@ -126,10 +130,11 @@ export async function runClaude(
     const commitsBefore = getCommitCount(sandboxName, worktreeDir);
     const uncheckedBefore = remaining.length;
 
-    log.info(`Iteration ${i + 1}/${MAX_ITERATIONS}: ${remaining[0].replace("- [ ] ", "")}`);
+    log.info(`Iteration ${i + 1}/${MAX_ITERATIONS}: ${remaining[0]!.replace("- [ ] ", "")}`);
     log.info(`${remaining.length} task(s) remaining.`);
 
-    await execClaude(sandboxName, worktreeDir, ["-p", buildingPromptFn(remaining, currentPlan)]);
+    const buildResult = await execClaude(sandboxName, worktreeDir, ["-p", buildingPromptFn(remaining, currentPlan)]);
+    if (buildResult) lastResult = buildResult;
 
     const planAfter = readPlanFile(worktreeDir);
     const uncheckedAfter = planAfter ? getUncheckedItems(planAfter).length : 0;
@@ -159,9 +164,11 @@ export async function runClaude(
   } else {
     log.ok("Plan file cleaned up.");
   }
+
+  return lastResult;
 }
 
-async function execClaude(sandboxName: string, worktreeDir: string, claudeArgs: string[]): Promise<void> {
+async function execClaude(sandboxName: string, worktreeDir: string, claudeArgs: string[]): Promise<string> {
   const proc = Bun.spawn([
     "docker", "sandbox", "exec",
     "-w", worktreeDir,
@@ -178,6 +185,7 @@ async function execClaude(sandboxName: string, worktreeDir: string, claudeArgs:
   const reader = proc.stdout.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
+  let resultText = "";
 
   while (true) {
     const { done, value } = await reader.read();
@@ -194,7 +202,8 @@ async function execClaude(sandboxName: string, worktreeDir: string, claudeArgs:
 
       try {
         const event: StreamEvent = JSON.parse(line);
-        printEvent(event);
+        const r = printEvent(event);
+        if (r) resultText = r;
       } catch {
         // Skip malformed JSON lines
       }
@@ -205,7 +214,8 @@ async function execClaude(sandboxName: string, worktreeDir: string, claudeArgs:
   if (buffer.trim()) {
     try {
       const event: StreamEvent = JSON.parse(buffer);
-      printEvent(event);
+      const r = printEvent(event);
+      if (r) resultText = r;
     } catch {
       // Skip
     }
@@ -220,9 +230,11 @@ async function execClaude(sandboxName: string, worktreeDir: string, claudeArgs:
     }
     log.warn(`Claude Code exited with code ${exitCode}.`);
   }
+
+  return resultText;
 }
 
-function printEvent(event: StreamEvent): void {
+function printEvent(event: StreamEvent): string | null {
   if (event.type === "assistant" && event.message?.content) {
     for (const block of event.message.content) {
       if (block.type === "text" && block.text) {
@@ -237,8 +249,10 @@ function printEvent(event: StreamEvent): void {
       log.err(event.result || "Unknown error");
     } else if (event.result) {
       log.done(event.result.slice(0, 200));
+      return event.result;
     }
   }
+  return null;
 }
 
 function getToolDetail(name: string, input?: Record<string, unknown>): string {

package/src/worktree.ts

@@ -36,11 +36,9 @@ export function ensureRepo(
 
   const defaultBranch = branchProc.stdout.toString().trim();
 
-  // Update the main repo to latest before creating worktrees
-  log.info(`Updating ${repoDir} (${defaultBranch})...`);
+  // Fetch latest remote refs (no checkout/pull — avoids conflicts with existing worktrees)
+  log.info(`Fetching latest from origin (${defaultBranch})...`);
   Bun.spawnSync(["git", "fetch", "origin", defaultBranch], { cwd: repoDir });
-  Bun.spawnSync(["git", "checkout", defaultBranch], { cwd: repoDir, stdout: "ignore", stderr: "ignore" });
-  Bun.spawnSync(["git", "pull", "origin", defaultBranch], { cwd: repoDir });
 
   return { defaultBranch };
 }
@@ -81,14 +79,17 @@ export function createWorktree(
   );
 
   if (result.exitCode !== 0) {
-    // Try using existing branch
-    const fallback = Bun.spawnSync(
-      ["git", "worktree", "add", worktreeDir, branchName],
+    // Branch likely exists from a previous run — delete it and retry from origin
+    log.info(`Branch '${branchName}' already exists, recreating from origin/${defaultBranch}...`);
+    Bun.spawnSync(["git", "branch", "-D", branchName], { cwd: repoDir });
+
+    const retry = Bun.spawnSync(
+      ["git", "worktree", "add", "-b", branchName, worktreeDir, `origin/${defaultBranch}`],
       { cwd: repoDir }
     );
 
-    if (fallback.exitCode !== 0) {
-      log.die(`Failed to create worktree. Branch '${branchName}' may already exist.`);
+    if (retry.exitCode !== 0) {
+      log.die(`Failed to create worktree. Branch '${branchName}' may be in use by another worktree.`);
     }
   }