@dunnewold-labs/mr-manager 0.4.46 → 0.4.50

package/dist/index.mjs

@@ -185,7 +185,7 @@ import { fileURLToPath } from "url";
 // cli/package.json
 var package_default = {
   name: "@dunnewold-labs/mr-manager",
-  version: "0.4.46",
+  version: "0.4.50",
   description: "Mr. Manager - Task and project management CLI",
   bin: {
     mr: "./dist/index.mjs"
@@ -550,7 +550,7 @@ var contextCommand = new Command8("context").description("Output project context
 import { Command as Command9 } from "commander";
 import { spawn as spawn4, exec } from "child_process";
 import { randomUUID } from "crypto";
-import { resolve as resolve2 } from "path";
+import { resolve as resolve2, extname } from "path";
 import { readFileSync as readFileSync5, readdirSync, unlinkSync, existsSync as existsSync7, statSync, writeFileSync as writeFileSync3, mkdirSync as mkdirSync3, rmdirSync } from "fs";
 import * as readline from "readline";
 
@@ -1133,7 +1133,7 @@ async function runTest(options) {
 }
 
 // lib/agent-fallback.ts
-var AGENT_FALLBACK_ORDER = ["claude", "codex", "gemini"];
+var AGENT_FALLBACK_ORDER = ["claude", "codex", "antigravity"];
 function getAgentFallbackChain(agent) {
   const startIndex = AGENT_FALLBACK_ORDER.indexOf(agent);
   if (startIndex === -1) {
@@ -1194,6 +1194,36 @@ function isPrOrMrUrl(input) {
   }
   return false;
 }
+var MAX_SLUG_LENGTH = 30;
+function baseSlug(input) {
+  return input.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, MAX_SLUG_LENGTH);
+}
+function extractTicketKey(input) {
+  const match = input.match(/\b([A-Z][A-Z0-9]+-\d+)\b/);
+  return match ? match[1].toLowerCase() : null;
+}
+function slugifyTitle(title) {
+  const raw = (title ?? "").trim();
+  if (!raw) return "";
+  const ticketKey = extractTicketKey(raw);
+  if (ticketKey) return baseSlug(ticketKey);
+  const urlPathSlug = urlToPathSlug(raw);
+  if (urlPathSlug) return urlPathSlug;
+  return baseSlug(raw);
+}
+function urlToPathSlug(input) {
+  let url;
+  try {
+    url = new URL(input);
+  } catch {
+    return null;
+  }
+  if (!/^https?:$/.test(url.protocol)) return null;
+  const segments = url.pathname.split("/").filter(Boolean);
+  if (segments.length === 0) return null;
+  const slug = baseSlug(segments.slice(-2).join("-"));
+  return slug || null;
+}
 
 // cli/browse-runner.ts
 import { execSync as execSync3, spawn as spawn3 } from "child_process";
@@ -1497,9 +1527,6 @@ function findDirectoryForProject(config, projectId, rootDir) {
   }
   return null;
 }
-function slugify(title) {
-  return title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 30);
-}
 function shortId(id) {
   return id.slice(0, 8);
 }
@@ -1514,7 +1541,8 @@ function taskBranchName(task) {
   if (branch && !isPrOrMrUrl(branch)) {
     return branch;
   }
-  return `${ownerPrefix(task)}/${slugify(task.title)}`;
+  const slug = slugifyTitle(task.title) || shortId(task.id);
+  return `${ownerPrefix(task)}/${slug}`;
 }
 function resolveBranchFromPrUrl(prUrl, repoDir, vcs) {
   const cmd = vcs === "gitlab" ? `glab mr view "${prUrl}" --output json 2>/dev/null | jq -r '.source_branch // empty'` : `gh pr view "${prUrl}" --json headRefName -q .headRefName 2>/dev/null`;
@@ -1996,7 +2024,7 @@ function buildFeaturesSection(repoDir) {
   ].join("\n");
 }
 function buildExecutionPrompt(task, repoDir, subtasks, vcs = "github", protoRefs = [], feedbackUpdates = [], existingResources = [], skillRefs = [], executionDir, startWithoutWorktree = false, preparedBranchName) {
-  const slug = slugify(task.title);
+  const slug = slugifyTitle(task.title) || shortId(task.id);
   const owner = ownerPrefix(task);
   const generatedBranchName = `${owner}/${slug}`;
   const branchName = taskBranchName(task);
@@ -2341,12 +2369,94 @@ function describeVariance(variance) {
     ]
   };
 }
+var EXEMPLAR_POOLS = [
+  ["Linear", "Vercel", "Arc", "Things 3"],
+  ["Stripe", "Notion", "Figma", "Cron"],
+  ["Raycast", "Superhuman", "Height", "Campsite"],
+  ["Apple", "Readymag", "Family", "Stripe Press"],
+  [
+    "Awwwards Site of the Day winners",
+    "indie SaaS",
+    "editorial / magazine sites",
+    "design-studio portfolios"
+  ]
+];
+function pickExemplars(seed) {
+  let hash = 0;
+  for (let i = 0; i < seed.length; i++) {
+    hash = hash * 31 + seed.charCodeAt(i) | 0;
+  }
+  return EXEMPLAR_POOLS[Math.abs(hash) % EXEMPLAR_POOLS.length].join(", ");
+}
+function buildReferenceSection(referenceImagePaths) {
+  if (referenceImagePaths.length === 0) return [];
+  return [
+    `## Reference Designs (CRITICAL \u2014 these define the visual direction)`,
+    ``,
+    `The user attached ${referenceImagePaths.length} reference image(s), saved on disk at:`,
+    ...referenceImagePaths.map((p) => `- \`${p}\``),
+    ``,
+    `Before designing anything, open and study each reference image (read the files at the paths above with your image-reading capability).`,
+    `The references define the intended look and feel: layout structure, color palette, typography, spacing, component styling, density, and overall mood. Match them closely.`,
+    `Where the references conflict with any generic style guidance below, THE REFERENCES WIN \u2014 do not override the user's attached direction with a default "design-led SaaS" look.`,
+    `Treat multiple references as one combined moodboard: extract the consistent visual language across them.`,
+    `You may still vary layout and composition across variants per the Design Variance section \u2014 but every variant must clearly belong to the reference designs' visual world.`,
+    ``
+  ];
+}
+async function downloadReferenceImages(proto, baseDir, prefix) {
+  const refs = proto.referenceImages;
+  if (!Array.isArray(refs) || refs.length === 0) return { paths: [], dir: null };
+  const dir = resolve2(baseDir, `.mr-proto-refs-${shortId(proto.id)}`);
+  try {
+    mkdirSync3(dir, { recursive: true });
+  } catch {
+    return { paths: [], dir: null };
+  }
+  const paths = [];
+  for (let i = 0; i < refs.length; i++) {
+    const ref = refs[i];
+    if (!ref || typeof ref.url !== "string") continue;
+    try {
+      const res = await fetch(ref.url);
+      if (!res.ok) {
+        logWarn(prefix, `Reference image ${i + 1} \u2192 HTTP ${res.status}, skipping`);
+        continue;
+      }
+      const buf = Buffer.from(await res.arrayBuffer());
+      let ext = extname(new URL(ref.url).pathname).toLowerCase();
+      if (!ext || ext.length > 5) ext = ".png";
+      const dest = resolve2(dir, `reference-${i + 1}${ext}`);
+      writeFileSync3(dest, buf);
+      paths.push(dest);
+    } catch (err) {
+      logWarn(prefix, `Failed to download reference image ${i + 1}: ${err.message}`);
+    }
+  }
+  return { paths, dir: paths.length > 0 ? dir : null };
+}
+function cleanupRefDir(dir) {
+  if (!dir) return;
+  try {
+    for (const f of readdirSync(dir)) {
+      try {
+        unlinkSync(resolve2(dir, f));
+      } catch {
+      }
+    }
+    rmdirSync(dir);
+  } catch {
+  }
+}
 function buildPrototypePrompt(proto, repoDir, options = {}) {
   const prototypeType = proto.prototypeType ?? "web_app";
   const variantsToProduce = options.variantsToProduce ?? proto.variantCount;
   const startIndex = options.variantStartIndex ?? 1;
   const variance = typeof proto.designVariance === "number" ? proto.designVariance : 70;
   const varianceInfo = describeVariance(variance);
+  const referenceImagePaths = options.referenceImagePaths ?? [];
+  const hasReferences = referenceImagePaths.length > 0;
+  const exemplars = pickExemplars(proto.id);
   const variantSteps = [];
   for (let i = 0; i < variantsToProduce; i++) {
     const idx = startIndex + i;
@@ -2354,7 +2464,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
     variantSteps.push(
       `### Variant ${idx}: ${filename}`,
       `1. ${varianceInfo.perVariantDirective}`,
-      `2. Spend a moment composing a real, opinionated design before you start typing HTML. Imagine the screen on Dribbble or in a Linear / Stripe / Vercel / Arc / Things-style portfolio.`,
+      `2. Spend a moment composing a real, opinionated design before you start typing HTML. ${hasReferences ? "Imagine the screen sitting alongside the reference designs the user attached \u2014 it should look like it belongs in the same set." : `Imagine the screen on Dribbble, holding its own next to ${exemplars}.`}`,
       `3. Write the complete self-contained HTML to \`${repoDir}/${filename}\` using the Write tool.`,
       `4. Verify the file was created by reading the first few lines of \`${repoDir}/${filename}\`.`,
       ``
@@ -2367,7 +2477,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
   const sharedQualityBar = [
     `## Craft & Polish Bar (this is the most important section \u2014 read carefully)`,
     ``,
-    `These are PORTFOLIO-QUALITY prototypes, not throwaway sketches. The reviewer will judge them at a glance against work from Linear, Vercel, Stripe, Arc, Things, Things 3, Notion, Figma, Apple, Cron, Raycast, Superhuman, and indie SaaS that wins design awards. Your output must look like it belongs in that company.`,
+    hasReferences ? `These are PORTFOLIO-QUALITY prototypes, not throwaway sketches. They must match the visual direction of the reference designs the user attached (see the Reference Designs section above) while hitting a high craft bar. Study the references first \u2014 everything below is secondary to them.` : `These are PORTFOLIO-QUALITY prototypes, not throwaway sketches. The reviewer will judge them at a glance against the craft level of ${exemplars}, and indie SaaS that wins design awards. Your output must look like it belongs in that company \u2014 but interpret the brief on its own terms, don't imitate any one of them.`,
     ``,
     `**Composition & layout**`,
     `- Use a real grid with intentional spacing (multiples of 4 or 8). No cramped or arbitrary padding.`,
@@ -2376,12 +2486,12 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
     `- Consider "uncommon" navigation: side-scrolling, vertical headers, command-palette-first interfaces, or minimalist "zen" modes.`,
     ``,
     `**Typography**`,
-    `- Pair a real display face with a clean text face. Pull from Google Fonts via \`<link>\` (Inter, Geist, Space Grotesk, Instrument Serif, Fraunces, S\xF6hne-style fallbacks, JetBrains Mono, IBM Plex, Manrope, DM Sans, Playfair Display, Caladea, Bricolage Grotesque). Tailwind CDN does NOT ship custom fonts \u2014 link them yourself.`,
+    hasReferences ? `- Match the typography of the reference designs \u2014 identify the display and text faces they use (or the closest Google Fonts equivalents) and pull them in via \`<link>\`. Tailwind CDN does NOT ship custom fonts \u2014 link them yourself.` : `- Pair a real display face with a clean text face, pulled from Google Fonts via \`<link>\`. Good starting points: Inter, Geist, Space Grotesk, Instrument Serif, Fraunces, JetBrains Mono, IBM Plex, Manrope, DM Sans, Playfair Display, Bricolage Grotesque \u2014 but don't feel limited to this list; pick faces that fit the brief and vary them across variants. Tailwind CDN does NOT ship custom fonts \u2014 link them yourself.`,
     `- Use real type scales (e.g. 12 / 14 / 16 / 20 / 28 / 40 / 64). Tighten tracking on display sizes (-0.02em to -0.05em). Use weight contrast (300 vs 600), not just size.`,
     `- Pay attention to line-height (1.5-1.6 for body, 1.1-1.2 for headers).`,
     ``,
     `**Color & material**`,
-    `- Pick a deliberate palette per variant. Avoid default Tailwind blue-500 / gray-900 unless that IS the design intent. Mix off-whites (#F9F9F9), warm neutrals, deep ink colors (#0A0A0B), accent pops, gradients, noise textures.`,
+    hasReferences ? `- Derive the palette from the reference designs \u2014 sample their actual colors (backgrounds, ink, accents) rather than defaulting to a generic scheme. Avoid default Tailwind blue-500 / gray-900 unless the references use them.` : `- Pick a deliberate palette per variant. Avoid default Tailwind blue-500 / gray-900. Off-whites, warm neutrals, deep inks, accent pops, gradients, and noise textures are all fair game \u2014 specific values like #F9F9F9 or #0A0A0B are illustrations, not a required palette. Commit to a distinct color story per variant.`,
     `- Use depth: soft shadows (e.g. \`0 10px 30px rgba(0,0,0,0.05)\`), subtle borders (1px @ low opacity), inner glows, glassmorphism (backdrop-blur), grain overlays, or mesh gradients. No flat-default look unless that's the chosen aesthetic.`,
     `- Use "subtle motion" even in static colors: very soft gradients that feel like lighting, not just a color ramp.`,
     ``,
@@ -2405,7 +2515,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
   ];
   const typeConfig = {
     web_app: {
-      role: "You are a senior product designer at a top-tier design-led startup, comfortable in Figma and shipping production HTML/CSS. You design at the level of Linear, Vercel, Stripe, and Arc.",
+      role: "You are a senior product designer at a top-tier design-led startup, comfortable in Figma and shipping production HTML/CSS.",
       guidelines: [
         `- **Layout DNA**: bento grid, editorial split, command-bar driven, three-pane mail-style, dashboard with sidebar + canvas, marketing landing with pinned hero, terminal/CLI-inspired, doc-style long-form.`,
         `- **Aesthetic**: Swiss minimal, brutalist editorial, glassmorphism, neumorphic, retro 90s web revival, hand-drawn / sketchy, dark IDE, pastel friendly, monochrome high-contrast, neo-skeuomorphic, "soft-ui" with deep shadows.`,
@@ -2434,7 +2544,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
       ]
     },
     desktop_app: {
-      role: "You are a senior desktop product designer who has shipped work on Linear, Things 3, Cron, Raycast, Notion, and Arc. You design at the level of those apps and don't settle for generic.",
+      role: "You are a senior desktop product designer who ships polished, best-in-class, native-feeling apps and doesn't settle for generic.",
       guidelines: [
         `- **Window chrome**: include realistic traffic-light controls or Windows controls, an integrated title bar, sidebar/main split, optional inspector pane.`,
         `- **Layout DNA**: three-pane mail-style, sidebar + canvas + inspector, command-bar driven (kbar / Raycast), tabbed workspace, ribbon toolbar, split-pane editor, agenda + detail, "spatial" layout with floating windows.`,
@@ -2473,6 +2583,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
     logo: "Logo"
   };
   const agentNote = options.agentLabel ? `You are one of several models collaborating on this prototype set. You are the "${options.agentLabel}" track, responsible for variants ${startIndex} through ${startIndex + variantsToProduce - 1}. Bring YOUR creative perspective \u2014 don't try to be a generic averaged designer.` : `You are the sole designer on this prototype set \u2014 bring a strong, opinionated point of view.`;
+  const creativeAnchor = hasReferences ? `The user attached reference designs for this prototype \u2014 they are the single most important input. Treat them as the definitive brief for look and feel (details in the Reference Designs section below).` : `Aim for the craft level of ${exemplars} \u2014 but interpret this brief on its own terms, don't imitate any one product.`;
   const creativeDirection = [
     `## Creative Direction & Polish`,
     `- **Be Opinionated**: Do not design generic "safe" UIs. Imagine you are designing for a product that wants to win "Site of the Day" on Awwwards or be featured in a "Best of Linear-style design" gallery.`,
@@ -2486,6 +2597,8 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
     ``,
     agentNote,
     ``,
+    creativeAnchor,
+    ``,
     `Working directory: ${repoDir}`,
     ``,
     `## Prototype Request`,
@@ -2496,6 +2609,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
     `## Design Prompt`,
     `${proto.prompt}`,
     ``,
+    ...buildReferenceSection(referenceImagePaths),
     `## Instructions`,
     ``,
     `Generate exactly ${variantsToProduce} HTML file(s) covering variants ${startIndex} through ${startIndex + variantsToProduce - 1}: ${variantList.join(", ")}. Follow the steps below IN ORDER. Do NOT collapse or skip variants. Each file must be completely self-contained (inline all CSS and JS, plus any Google Fonts \`<link>\` you reference). Tailwind CDN is acceptable.`,
@@ -2536,6 +2650,7 @@ function buildPrototypePrompt(proto, repoDir, options = {}) {
   ].join("\n");
 }
 function buildRefinementPrompt(proto, parentFiles, repoDir, options = {}) {
+  const referenceImagePaths = options.referenceImagePaths ?? [];
   const variantsToProduce = options.variantsToProduce ?? proto.variantCount;
   const startIndex = options.variantStartIndex ?? 1;
   const variance = typeof proto.designVariance === "number" ? proto.designVariance : 70;
@@ -2600,6 +2715,7 @@ function buildRefinementPrompt(proto, parentFiles, repoDir, options = {}) {
     `## Original Design Prompt`,
     `${proto.prompt}`,
     ``,
+    ...buildReferenceSection(referenceImagePaths),
     `## User Feedback (IMPORTANT \u2014 this is what you must address)`,
     `${proto.refinementFeedback}`,
     ``,
@@ -2652,15 +2768,15 @@ ${systemPrompt}` : prompt2;
     args.push(fullPrompt);
     return { bin: "codex", args };
   }
-  if (agent === "gemini") {
+  if (agent === "antigravity") {
     const fullPrompt = systemPrompt ? `${prompt2}
 
 ${systemPrompt}` : prompt2;
     const args = ["-p", fullPrompt];
     if (mode === "execute") {
-      args.push("--yolo");
+      args.push("--dangerously-skip-permissions");
     }
-    return { bin: "gemini", args };
+    return { bin: AGENT_BINARIES.antigravity, args };
   }
   const sessionArgs = sessionId ? resumeSession ? ["--resume", sessionId] : ["--session-id", sessionId] : [];
   const nameArgs = name ? ["--name", name] : [];
@@ -2673,6 +2789,11 @@ ${systemPrompt}` : prompt2;
   const permissionArgs = ["--dangerously-skip-permissions"];
   return { bin: "claude", args: [...sessionArgs, ...nameArgs, ...systemArgs, ...turnsArgs, ...modelArgs, ...permissionArgs, "-p", prompt2] };
 }
+var AGENT_BINARIES = {
+  claude: "claude",
+  codex: "codex",
+  antigravity: "agy"
+};
 function commandExists(cmd) {
   return new Promise((resolve9) => {
     exec(`command -v ${cmd}`, (err) => resolve9(!err));
@@ -2689,8 +2810,11 @@ function resolveTaskAgentAndModel(delegatedModel, watchAgent) {
       return { agent: "claude", claudeModel: "claude-haiku-4-5-20251001" };
     case "codex":
       return { agent: "codex" };
+    case "antigravity":
+      return { agent: "antigravity" };
+    // Legacy alias: tasks delegated before the Antigravity migration.
     case "gemini":
-      return { agent: "gemini" };
+      return { agent: "antigravity" };
     default:
       return { agent: watchAgent };
   }
@@ -2778,12 +2902,12 @@ function spawnAgent(agent, repoDir, prompt2, prefix, onActivity, sessionId, name
 }
 var watchCommand = new Command9("watch").description(
   "Watch for in-progress tasks and autonomously dispatch an AI coding agent to work on them"
-).option("--interval <seconds>", "Polling interval in seconds", "15").option("--dry-run", "Show what would be dispatched without spawning the agent", false).option("--plan-approval", "Show the agent's plan and ask for approval before executing", false).option("--root <dir>", "Root directory filter for linked repos (default: cwd)").option("--agent <agent>", "AI agent to use: claude, codex, or gemini", "claude").option("--scan-at <HH:MM>", "Run a product scan daily at this time (e.g., 02:00)").action(async (opts) => {
+).option("--interval <seconds>", "Polling interval in seconds", "15").option("--dry-run", "Show what would be dispatched without spawning the agent", false).option("--plan-approval", "Show the agent's plan and ask for approval before executing", false).option("--root <dir>", "Root directory filter for linked repos (default: cwd)").option("--agent <agent>", "AI agent to use: claude, codex, or antigravity", "claude").option("--scan-at <HH:MM>", "Run a product scan daily at this time (e.g., 02:00)").action(async (opts) => {
   const intervalMs = parseInt(opts.interval, 10) * 1e3;
   const dryRun = opts.dryRun;
   const planApproval = opts.planApproval;
   const rootDir = opts.root ? resolve2(opts.root) : process.cwd();
-  const agent = opts.agent === "codex" ? "codex" : opts.agent === "gemini" ? "gemini" : "claude";
+  const agent = opts.agent === "codex" ? "codex" : opts.agent === "antigravity" ? "antigravity" : "claude";
   const scanAt = opts.scanAt;
   const taskStallTimeoutMs = getTaskStallTimeoutMs();
   const hungTaskTimeoutMinutes = Math.max(5, parseInt(process.env.MR_WATCH_HUNG_TASK_TIMEOUT_MINUTES ?? "60", 10) || 60);
@@ -2825,13 +2949,13 @@ var watchCommand = new Command9("watch").description(
     if (cached !== void 0) {
       return cached;
     }
-    const available = await commandExists(candidate);
+    const available = await commandExists(AGENT_BINARIES[candidate]);
     agentAvailability.set(candidate, available);
     return available;
   }
   async function resolveAgentChain(preferred) {
     const availability = {};
-    for (const candidate of ["claude", "codex", "gemini"]) {
+    for (const candidate of ["claude", "codex", "antigravity"]) {
       availability[candidate] = await isAgentAvailable(candidate);
     }
     return getAvailableAgentFallbackChain(preferred, availability);
@@ -2923,7 +3047,7 @@ var watchCommand = new Command9("watch").description(
   }
   async function dispatchTask(task, repoDir) {
     const sid = shortId(task.id);
-    const slug = slugify(task.title);
+    const slug = slugifyTitle(task.title) || sid;
     const owner = ownerPrefix(task);
     let branchName = taskBranchName(task);
     const legacyBranchName = `mr/${sid}/${slug}`;
@@ -3408,7 +3532,15 @@ var watchCommand = new Command9("watch").description(
       } catch {
       }
     }
-    const validAgents = ["claude", "codex", "gemini"];
+    const { paths: refImagePaths, dir: refImageDir } = await downloadReferenceImages(
+      proto,
+      repoDir,
+      prefix
+    );
+    if (refImagePaths.length > 0) {
+      logDispatch(prefix, `${refImagePaths.length} reference image(s) attached`);
+    }
+    const validAgents = ["claude", "codex", "antigravity"];
     const requested = Array.isArray(proto.selectedAgents) ? proto.selectedAgents.filter(
       (a) => validAgents.includes(a)
     ) : [];
@@ -3428,13 +3560,15 @@ var watchCommand = new Command9("watch").description(
         return buildRefinementPrompt(proto, parentFiles, sliceDir, {
           variantStartIndex: startIndex,
           variantsToProduce,
-          agentLabel
+          agentLabel,
+          referenceImagePaths: refImagePaths
         });
       }
       return buildPrototypePrompt(proto, sliceDir, {
         variantStartIndex: startIndex,
         variantsToProduce,
-        agentLabel
+        agentLabel,
+        referenceImagePaths: refImagePaths
       });
     };
     if (dedupedRequested.length <= 1) {
@@ -3444,6 +3578,7 @@ var watchCommand = new Command9("watch").description(
         logError(prefix, `No available agents found for ${preferred}`);
         await api.patch(`/api/prototypes/${proto.id}`, { status: "failed" }).catch(() => {
         });
+        cleanupRefDir(refImageDir);
         queued.delete(key);
         return;
       }
@@ -3497,14 +3632,16 @@ var watchCommand = new Command9("watch").description(
                 const found = readdirSync(repoDir).filter((f) => protoPattern.test(f)).sort();
                 const files = found.map((f) => ({
                   name: f,
-                  content: readFileSync5(resolve2(repoDir, f), "utf-8")
+                  content: readFileSync5(resolve2(repoDir, f), "utf-8"),
+                  agent: attemptAgent
                 }));
                 if (files.length === 0) {
                   logError(prefix, `No prototype HTML files found in ${repoDir}`);
                   await api.patch(`/api/prototypes/${proto.id}`, { status: "failed" });
                   return;
                 }
-                await api.patch(`/api/prototypes/${proto.id}`, { status: "completed", files });
+                const variantModels = files.map((f) => f.agent ?? null);
+                await api.patch(`/api/prototypes/${proto.id}`, { status: "completed", files, variantModels });
                 logSuccess(prefix, `"${paint("bold", proto.title)}" uploaded ${files.length} file(s)`);
                 for (const file of files) {
                   try {
@@ -3528,6 +3665,7 @@ var watchCommand = new Command9("watch").description(
               }
             }
           } finally {
+            cleanupRefDir(refImageDir);
             queued.delete(key);
             finishing.delete(key);
           }
@@ -3563,6 +3701,7 @@ var watchCommand = new Command9("watch").description(
       logError(prefix, `Could not assign any variants to selected agents`);
       await api.patch(`/api/prototypes/${proto.id}`, { status: "failed" }).catch(() => {
       });
+      cleanupRefDir(refImageDir);
       queued.delete(key);
       return;
     }
@@ -3626,7 +3765,7 @@ var watchCommand = new Command9("watch").description(
         for (const f of found) {
           try {
             const content = readFileSync5(resolve2(slice.dir, f), "utf-8");
-            collected.push({ name: f, content });
+            collected.push({ name: f, content, agent: slice.agentLabel });
           } catch (err) {
             logError(prefix, `Failed reading ${f} from ${slice.dir}: ${err.message}`);
           }
@@ -3647,7 +3786,7 @@ var watchCommand = new Command9("watch").description(
           name = `prototype-${renumberCursor}.html`;
         }
         seen.add(name);
-        finalFiles.push({ name, content: f.content });
+        finalFiles.push({ name, content: f.content, agent: f.agent });
       }
       const allOk = sliceResults.every((r) => r.ok);
       if (finalFiles.length === 0) {
@@ -3656,7 +3795,8 @@ var watchCommand = new Command9("watch").description(
       } else {
         await api.patch(`/api/prototypes/${proto.id}`, {
           status: "completed",
-          files: finalFiles
+          files: finalFiles,
+          variantModels: finalFiles.map((f) => f.agent ?? null)
         });
         if (allOk) {
           logSuccess(prefix, `"${paint("bold", proto.title)}" uploaded ${finalFiles.length} file(s) from ${slices.length} agent(s)`);
@@ -3684,6 +3824,7 @@ var watchCommand = new Command9("watch").description(
       } catch {
       }
     } finally {
+      cleanupRefDir(refImageDir);
       queued.delete(key);
       finishing.delete(key);
     }
@@ -4456,6 +4597,17 @@ ${summaryBlock}${lines.join("\n")}`;
         }
         const vcs = review.branchUrl.includes("gitlab") ? "gitlab" : "github";
         const prLabel = vcs === "gitlab" ? "MR" : "PR";
+        const preMergeStatus = await checkPrStatus(review.branchUrl, repoDir, vcs);
+        if (preMergeStatus?.merged) {
+          logSuccess(prefix, `${prLabel} already merged \u2014 recording auto-merge as complete`);
+          try {
+            await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "merged" });
+            await postTaskUpdate(taskId, `Auto-merge complete \u2014 ${prLabel} was already merged`, "system");
+          } catch (err) {
+            logError(prefix, `Failed to record auto-merge success: ${err.message}`);
+          }
+          continue;
+        }
         logDispatch(prefix, `Sanity review clean \u2014 merging ${prLabel} ${paint("cyan", review.branchUrl)}`);
         const mergeResult = await mergePrViaCli(review.branchUrl, repoDir, vcs);
         if (!mergeResult.ok) {
@@ -4469,8 +4621,9 @@ ${summaryBlock}${lines.join("\n")}`;
         }
         try {
           await api.patch(`/api/reviews/${review.id}`, { autoMergeStatus: "merged" });
-          await postTaskUpdate(taskId, `Auto-merge complete \u2014 sanity review passed and ${prLabel} merged`, "system");
-          logSuccess(prefix, `Auto-merge complete for ${prLabel}`);
+          await api.patch(`/api/tasks/${taskId}`, { status: "completed" });
+          await postTaskUpdate(taskId, `Auto-merge complete \u2014 sanity review passed, ${prLabel} merged, and task moved to Done`, "system");
+          logSuccess(prefix, `Auto-merge complete for ${prLabel} \u2014 task moved to Done`);
         } catch (err) {
           logError(prefix, `Failed to record auto-merge success: ${err.message}`);
         }
@@ -4932,30 +5085,30 @@ async function checkCodexAuth() {
     fix: hasKey ? void 0 : "Set OPENAI_API_KEY or CODEX_API_KEY environment variable"
   };
 }
-async function checkGeminiInstalled() {
-  const exists = await commandExists2("gemini");
+async function checkAntigravityInstalled() {
+  const exists = await commandExists2("agy");
   return {
-    name: "Gemini CLI (gemini)",
+    name: "Antigravity CLI (agy)",
     ok: exists,
     message: exists ? "installed" : "not found",
-    fix: exists ? void 0 : "Install: npm install -g @google/gemini-cli"
+    fix: exists ? void 0 : "Install: curl -fsSL https://antigravity.google/cli/install.sh | bash"
   };
 }
-async function checkGeminiAuth() {
-  const exists = await commandExists2("gemini");
+async function checkAntigravityAuth() {
+  const exists = await commandExists2("agy");
   if (!exists) {
     return {
-      name: "Gemini CLI auth",
+      name: "Antigravity CLI auth",
       ok: false,
-      message: "skipped (gemini not installed)"
+      message: "skipped (agy not installed)"
     };
   }
-  const hasKey = !!process.env.GEMINI_API_KEY || !!process.env.GOOGLE_API_KEY;
+  const hasKey = !!process.env.ANTIGRAVITY_API_KEY;
   return {
-    name: "Gemini CLI auth",
+    name: "Antigravity CLI auth",
     ok: hasKey,
     message: hasKey ? "API key configured" : "no API key found",
-    fix: hasKey ? void 0 : "Set GEMINI_API_KEY or GOOGLE_API_KEY environment variable, or run: gcloud auth login"
+    fix: hasKey ? void 0 : "Set ANTIGRAVITY_API_KEY environment variable, or run `agy` once to sign in with Google"
   };
 }
 async function checkGlabInstalled() {
@@ -5087,8 +5240,8 @@ async function autoFix(checks, agent) {
     console.log("");
   }
 }
-var setupCommand = new Command16("setup").description("Check that all dependencies for mr watch are installed and configured").option("--fix", "Attempt to auto-fix issues where possible", false).option("--agent <agent>", "AI agent to check: claude, codex, or gemini (default: claude)", "claude").action(async (opts) => {
-  const agent = opts.agent === "codex" ? "codex" : opts.agent === "gemini" ? "gemini" : "claude";
+var setupCommand = new Command16("setup").description("Check that all dependencies for mr watch are installed and configured").option("--fix", "Attempt to auto-fix issues where possible", false).option("--agent <agent>", "AI agent to check: claude, codex, or antigravity (default: claude)", "claude").action(async (opts) => {
+  const agent = opts.agent === "codex" ? "codex" : opts.agent === "antigravity" ? "antigravity" : "claude";
   const banner = [
     ``,
     paint5("cyan", `  \u2554\u2566\u2557\u2551\u2550\u2557  \u2554\u2550\u2557\u2554\u2550\u2557\u2554\u2566\u2557\u2551 \u2551\u2554\u2550\u2557`),
@@ -5099,7 +5252,7 @@ var setupCommand = new Command16("setup").description("Check that all dependenci
     ``
   ].join("\n");
   console.log(banner);
-  const agentChecks = agent === "codex" ? [checkCodexInstalled(), checkCodexAuth()] : agent === "gemini" ? [checkGeminiInstalled(), checkGeminiAuth()] : [checkClaudeInstalled(), checkClaudeAuth()];
+  const agentChecks = agent === "codex" ? [checkCodexInstalled(), checkCodexAuth()] : agent === "antigravity" ? [checkAntigravityInstalled(), checkAntigravityAuth()] : [checkClaudeInstalled(), checkClaudeAuth()];
   const checks = await Promise.all([
     checkGitInstalled(),
     checkNodeVersion(),
@@ -5117,7 +5270,7 @@ var setupCommand = new Command16("setup").description("Check that all dependenci
   if (allOk) {
     console.log(paint5("green", "  All checks passed! You're ready to run mr watch."));
     if (agent === "claude") {
-      console.log(paint5("dim", "  Tip: check other agents with --agent codex or --agent gemini"));
+      console.log(paint5("dim", "  Tip: check other agents with --agent codex or --agent antigravity"));
     }
     console.log("");
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dunnewold-labs/mr-manager",
-  "version": "0.4.46",
+  "version": "0.4.50",
   "description": "Mr. Manager - Task and project management CLI",
   "bin": {
     "mr": "./dist/index.mjs"