@bobbyg603/mog 1.1.0 → 1.3.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
@@ -19,7 +19,7 @@ That's it. `mog` will:
 ## Prerequisites
 
 - **macOS or Windows** (Docker sandbox microVMs require Docker Desktop)
-- **Docker Desktop** — running and up to date (must support `docker sandbox`)
+- **Docker Desktop 4.40+** — running and up to date. Docker sandbox support (required by mog) was introduced in Docker Desktop 4.40. Verify with `docker sandbox ls`.
 - **Bun** — install from [bun.sh](https://bun.sh)
 - **GitHub CLI** (`gh`) — authenticated via `gh auth login`
 - **Git** with push access to your target repos
@@ -33,6 +33,9 @@ bun install -g @bobbyg603/mog
 ## Quick start
 
 ```bash
+# 0. Verify Docker sandbox support is available
+docker sandbox ls
+
 # 1. One-time setup: create sandbox & authenticate
 mog init
 # This launches Claude Code — use /login to authenticate with your Max subscription
@@ -131,6 +134,10 @@ git worktree remove ../repo-worktrees/123-fix-broken-login
 
 **"No changes detected"** — Claude may have struggled with the issue. Check the worktree manually, or re-run with a more detailed issue description.
 
+**"Docker sandbox state is stale"** — Restart Docker Desktop, or remove and recreate the sandbox: `docker sandbox rm mog && mog init`.
+
+**"docker: 'sandbox' is not a docker command"** — Your Docker Desktop version doesn't support sandboxes. Update Docker Desktop to **4.40 or later**, then verify with `docker sandbox ls`.
+
 **"Failed to push"** — Ensure `gh` is authenticated with push access. Try `gh auth login` and select HTTPS.
 
 ## Managing the sandbox

package/package.json

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

@@ -28,13 +28,56 @@ export function fetchIssue(repo: string, issueNum: string): Issue {
   };
 }
 
+export function listIssues(repo: string, verbose: boolean): void {
+  log.info(`Fetching open issues for ${repo}...`);
+
+  const fields = verbose
+    ? "number,title,body,labels,assignees"
+    : "number,title";
+
+  const proc = Bun.spawnSync([
+    "gh", "issue", "list",
+    "--repo", repo,
+    "--state", "open",
+    "--json", fields,
+  ]);
+
+  if (proc.exitCode !== 0) {
+    log.die(`Failed to fetch issues for ${repo}. Check the repo name.`);
+  }
+
+  const issues = JSON.parse(proc.stdout.toString());
+
+  if (issues.length === 0) {
+    log.info("No open issues found.");
+    return;
+  }
+
+  log.ok(`${issues.length} open issue(s):\n`);
+
+  for (const issue of issues) {
+    if (verbose) {
+      const labels = issue.labels?.map((l: { name: string }) => l.name).join(", ") || "none";
+      const assignees = issue.assignees?.map((a: { login: string }) => a.login).join(", ") || "unassigned";
+      console.log(`  #${issue.number}  ${issue.title}`);
+      console.log(`         Labels: ${labels}`);
+      console.log(`         Assignees: ${assignees}`);
+      console.log(`         ${(issue.body || "No description.").split("\n")[0]}`);
+      console.log();
+    } else {
+      console.log(`  #${issue.number}  ${issue.title}`);
+    }
+  }
+}
+
 export function pushAndCreatePR(
   repo: string,
   worktreeDir: string,
   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 +118,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

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 
-import { fetchIssue } from "./github";
-import { ensureRepo, createWorktree } from "./worktree";
+import { fetchIssue, listIssues } from "./github";
+import { detectRepo, ensureRepo, createWorktree } from "./worktree";
 import { runClaude } from "./sandbox";
 import { pushAndCreatePR } from "./github";
 import { log } from "./log";
@@ -54,7 +54,7 @@ async function init() {
     log.ok("Snapshot saved.");
   }
 
-  log.ok("mog is ready. Run: mog <owner/repo> <issue_number>");
+  log.ok("mog is ready. Run: mog <issue_number> (from a git repo) or mog <owner/repo> <issue_number>");
 }
 
 async function main() {
@@ -84,25 +84,80 @@ async function main() {
     return;
   }
 
-  if (args.length < 2) {
+  // mog list [--verbose]  or  mog <owner/repo> list [--verbose]
+  if (args[0] === "list" || args[1] === "list") {
+    let repo: string;
+    const verbose = args.includes("--verbose");
+
+    if (args[0] === "list") {
+      const detected = detectRepo();
+      if (!detected) {
+        log.die("Could not detect repo from git remote. Run from inside a git repo or use: mog <owner/repo> list");
+      }
+      repo = detected;
+    } else {
+      repo = args[0];
+    }
+
+    listIssues(repo, verbose);
+    return;
+  }
+
+  if (args.length < 1) {
     console.log("Usage:");
     console.log("  mog init                      — one-time setup (create sandbox & login)");
+    console.log("  mog <issue_num>               — auto-detect repo from git remote");
     console.log("  mog <owner/repo> <issue_num>  — fetch issue, run Claude, open PR");
+    console.log("  mog list [--verbose]           — list open issues (auto-detect repo)");
+    console.log("  mog <owner/repo> list [--verbose] — list open issues for a repo");
     console.log();
     console.log("Example:");
     console.log("  mog init");
+    console.log("  mog 123");
     console.log("  mog workingdevshero/automate-it 123");
+    console.log("  mog list");
+    console.log("  mog list --verbose");
     return;
   }
 
-  const repo = args[0];
-  const issueNum = args[1];
+  let repo: string;
+  let issueNum: string;
 
-  if (!/^\d+$/.test(issueNum)) {
-    log.die(`Invalid issue number: '${issueNum}'. Must be a positive integer.`);
+  if (/^\d+$/.test(args[0])) {
+    // mog <issue_number> — auto-detect repo
+    const detected = detectRepo();
+    if (!detected) {
+      log.die("Could not detect repo from git remote. Run from inside a git repo or use: mog <owner/repo> <issue_num>");
+    }
+    repo = detected;
+    issueNum = args[0];
+  } else if (args.length >= 2) {
+    // mog <owner/repo> <issue_number>
+    repo = args[0];
+    issueNum = args[1];
+    if (!/^\d+$/.test(issueNum)) {
+      log.die(`Invalid issue number: '${issueNum}'. Must be a positive integer.`);
+    }
+  } else {
+    console.log("Usage:");
+    console.log("  mog init                      — one-time setup (create sandbox & login)");
+    console.log("  mog <issue_num>               — auto-detect repo from git remote");
+    console.log("  mog <owner/repo> <issue_num>  — fetch issue, run Claude, open PR");
+    console.log("  mog list [--verbose]           — list open issues (auto-detect repo)");
+    console.log("  mog <owner/repo> list [--verbose] — list open issues for a repo");
+    console.log();
+    console.log("Example:");
+    console.log("  mog init");
+    console.log("  mog 123");
+    console.log("  mog workingdevshero/automate-it 123");
+    console.log("  mog list");
+    console.log("  mog list --verbose");
+    return;
   }
 
-  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 +199,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

@@ -1,6 +1,29 @@
 import fs from "fs";
 import { log } from "./log";
 
+export function detectRepo(): string | null {
+  const result = Bun.spawnSync(["git", "remote", "get-url", "origin"]);
+  if (result.exitCode !== 0) {
+    return null;
+  }
+
+  const url = result.stdout.toString().trim();
+
+  // SSH: git@github.com:owner/repo.git
+  const sshMatch = url.match(/^git@[^:]+:([^/]+)\/([^/]+?)(?:\.git)?$/);
+  if (sshMatch) {
+    return `${sshMatch[1]}/${sshMatch[2]}`;
+  }
+
+  // HTTPS: https://github.com/owner/repo.git
+  const httpsMatch = url.match(/^https?:\/\/[^/]+\/([^/]+)\/([^/]+?)(?:\.git)?$/);
+  if (httpsMatch) {
+    return `${httpsMatch[1]}/${httpsMatch[2]}`;
+  }
+
+  return null;
+}
+
 export function ensureRepo(
   repo: string,
   owner: string,
@@ -36,11 +59,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 +102,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.`);
     }
   }