opencode-mission-control 1.1.1 → 1.2.0

package/dist/index.js

@@ -14045,8 +14045,8 @@ var init_plan_types = __esm(() => {
     waiting_deps: ["running", "stopped", "canceled"],
     running: ["completed", "failed", "stopped", "canceled"],
     completed: ["ready_to_merge", "stopped", "canceled"],
-    failed: ["stopped", "canceled"],
-    ready_to_merge: ["merging", "stopped", "canceled"],
+    failed: ["ready_to_merge", "stopped", "canceled"],
+    ready_to_merge: ["merging", "needs_rebase", "stopped", "canceled"],
     merging: ["merged", "conflict", "stopped", "canceled"],
     merged: ["needs_rebase"],
     conflict: ["ready_to_merge", "stopped", "canceled"],
@@ -28495,6 +28495,57 @@ var init_integration = __esm(() => {
 // src/lib/merge-train.ts
 import { join as join9 } from "path";
 import { existsSync, lstatSync, rmSync } from "fs";
+async function validateTouchSet(jobBranch, baseBranch, touchSet, opts) {
+  if (touchSet.length === 0) {
+    return { valid: true };
+  }
+  const diffResult = await gitCommand(["diff", "--name-only", `${baseBranch}...${jobBranch}`], opts);
+  if (diffResult.exitCode !== 0) {
+    return { valid: false, violations: [`Failed to diff: ${diffResult.stderr}`] };
+  }
+  const changedFiles = diffResult.stdout.split(`
+`).map((f) => f.trim()).filter(Boolean);
+  if (changedFiles.length === 0) {
+    return { valid: true, changedFiles: [] };
+  }
+  const violations = [];
+  for (const file3 of changedFiles) {
+    const matchesAny = touchSet.some((pattern) => {
+      const glob = new Bun.Glob(pattern);
+      return glob.match(file3);
+    });
+    if (!matchesAny) {
+      violations.push(file3);
+    }
+  }
+  return {
+    valid: violations.length === 0,
+    violations: violations.length > 0 ? violations : undefined,
+    changedFiles
+  };
+}
+async function checkMergeability(integrationWorktree, jobBranch) {
+  const testMerge = await gitCommand([
+    "-C",
+    integrationWorktree,
+    "merge",
+    "--no-commit",
+    "--no-ff",
+    jobBranch
+  ]);
+  await gitCommand(["-C", integrationWorktree, "merge", "--abort"]).catch(() => {});
+  await gitCommand(["-C", integrationWorktree, "reset", "--hard", "HEAD"]).catch(() => {});
+  await gitCommand(["-C", integrationWorktree, "clean", "-fd"]).catch(() => {});
+  if (testMerge.exitCode !== 0) {
+    const conflicts = extractConflicts([testMerge.stdout, testMerge.stderr].filter(Boolean).join(`
+`));
+    return {
+      canMerge: false,
+      conflicts: conflicts.length > 0 ? conflicts : undefined
+    };
+  }
+  return { canMerge: true };
+}
 async function rollbackMerge(worktreePath) {
   await gitCommand(["-C", worktreePath, "merge", "--abort"]).catch(() => {});
   await gitCommand(["-C", worktreePath, "reset", "--hard", "HEAD"]).catch(() => {});
@@ -29368,6 +29419,23 @@ class Orchestrator {
       }
       for (const job of mergeOrder) {
         if (job.status === "completed") {
+          if (job.touchSet && job.touchSet.length > 0 && job.branch && plan.integrationBranch) {
+            const validation = await validateTouchSet(job.branch, plan.integrationBranch, job.touchSet);
+            if (!validation.valid && validation.violations) {
+              await updatePlanJob(plan.id, job.name, {
+                status: "failed",
+                error: `Modified files outside touchSet: ${validation.violations.join(", ")}. Expected only: ${job.touchSet.join(", ")}`
+              });
+              job.status = "failed";
+              this.showToast("Mission Control", `Job "${job.name}" touched files outside its touchSet. Plan paused.`, "error");
+              this.notify(`\u274C Job "${job.name}" modified files outside its touchSet:
+  Violations: ${validation.violations.join(", ")}
+  Allowed: ${job.touchSet.join(", ")}
+Fix the branch and retry with mc_plan_approve(checkpoint: "on_error", retry: "${job.name}").`);
+              await this.setCheckpoint("on_error", plan);
+              return;
+            }
+          }
           await updatePlanJob(plan.id, job.name, { status: "ready_to_merge" });
           job.status = "ready_to_merge";
         }
@@ -29384,6 +29452,22 @@ class Orchestrator {
         if (!canMergeNow) {
           continue;
         }
+        if (job.branch && plan.integrationWorktree) {
+          const mergeCheck = await checkMergeability(plan.integrationWorktree, job.branch);
+          if (!mergeCheck.canMerge) {
+            await updatePlanJob(plan.id, job.name, {
+              status: "needs_rebase",
+              error: mergeCheck.conflicts?.join(", ") ?? "merge conflict detected in trial merge"
+            });
+            job.status = "needs_rebase";
+            this.showToast("Mission Control", `Job "${job.name}" has merge conflicts. Plan paused.`, "error");
+            this.notify(`\u274C Job "${job.name}" would conflict with the integration branch.
+  Files: ${mergeCheck.conflicts?.join(", ") ?? "unknown"}
+Rebase the job branch and retry with mc_plan_approve(checkpoint: "on_error", retry: "${job.name}").`);
+            await this.setCheckpoint("on_error", plan);
+            return;
+          }
+        }
         if (this.isSupervisor(plan) && !this.approvedForMerge.has(job.name)) {
           await this.setCheckpoint("pre_merge", plan);
           return;
@@ -29422,13 +29506,10 @@ class Orchestrator {
             status: "conflict",
             error: mergeResult.files?.join(", ") ?? "merge conflict"
           });
-          if (this.isSupervisor(plan)) {
-            await this.setCheckpoint("on_error", plan);
-            return;
-          }
-          plan.status = "failed";
-          this.showToast("Mission Control", `Merge conflict in job "${nextJob.name}".`, "error");
-          this.notify(`\u274C Merge conflict in job "${nextJob.name}". Files: ${mergeResult.files?.join(", ") ?? "unknown"}. Plan failed.`);
+          this.showToast("Mission Control", `Merge conflict in job "${nextJob.name}". Plan paused.`, "error");
+          this.notify(`\u274C Merge conflict in job "${nextJob.name}". Files: ${mergeResult.files?.join(", ") ?? "unknown"}. Fix the branch and retry with mc_plan_approve(checkpoint: "on_error", retry: "${nextJob.name}").`);
+          await this.setCheckpoint("on_error", plan);
+          return;
         } else {
           await updatePlanJob(plan.id, nextJob.name, {
             status: "failed",
@@ -29438,13 +29519,10 @@ class Orchestrator {
           if (testSummary) {
             this.notify(`\uD83E\uDDEA ${nextJob.name}: ${testSummary}`);
           }
-          if (this.isSupervisor(plan)) {
-            await this.setCheckpoint("on_error", plan);
-            return;
-          }
-          plan.status = "failed";
-          this.showToast("Mission Control", `Job "${nextJob.name}" failed during merge.`, "error");
-          this.notify(`\u274C Job "${nextJob.name}" failed merge tests. Plan failed.`);
+          this.showToast("Mission Control", `Job "${nextJob.name}" failed merge tests. Plan paused.`, "error");
+          this.notify(`\u274C Job "${nextJob.name}" failed merge tests. Fix the branch and retry with mc_plan_approve(checkpoint: "on_error", retry: "${nextJob.name}").`);
+          await this.setCheckpoint("on_error", plan);
+          return;
         }
       }
       if (plan.status === "merging" && (!this.mergeTrain || this.mergeTrain.getQueue().length === 0)) {
@@ -29615,20 +29693,22 @@ IMPORTANT: When you have completed ALL of your work, you MUST commit your change
     }
   }
   handleJobComplete = (job) => {
-    if (job.planId && this.activePlanId && job.planId === this.activePlanId) {
-      if (!this.firstJobCompleted) {
-        this.firstJobCompleted = true;
-        this.showToast("Mission Control", `First job completed: "${job.name}".`, "success");
-      }
-      updatePlanJob(job.planId, job.name, {
+    if (!job.planId || !this.activePlanId || job.planId !== this.activePlanId) {
+      return;
+    }
+    if (!this.firstJobCompleted) {
+      this.firstJobCompleted = true;
+      this.showToast("Mission Control", `First job completed: "${job.name}".`, "success");
+    }
+    const planId = job.planId;
+    (async () => {
+      await updatePlanJob(planId, job.name, {
         status: "completed"
-      }).catch((error92) => {
-        console.error("Failed to update completed job state:", error92);
-      });
-      this.reconcile().catch((error92) => {
-        console.error("Reconcile after completion failed:", error92);
       });
-    }
+      await this.reconcile();
+    })().catch((error92) => {
+      console.error("Failed to reconcile completed job state:", error92);
+    });
   };
   handleJobFailed = (job) => {
     if (job.planId && this.activePlanId && job.planId === this.activePlanId) {
@@ -29640,15 +29720,9 @@ IMPORTANT: When you have completed ALL of your work, you MUST commit your change
         if (!plan || plan.id !== job.planId) {
           return;
         }
-        if (this.isSupervisor(plan)) {
-          await this.setCheckpoint("on_error", plan);
-          return;
-        }
-        plan.status = "failed";
-        plan.completedAt = new Date().toISOString();
-        await savePlan(plan);
-        this.showToast("Mission Control", `Plan failed: job "${job.name}" failed.`, "error");
-        this.notify(`\u274C Plan failed: job "${job.name}" failed.`);
+        this.showToast("Mission Control", `Job "${job.name}" failed. Plan paused.`, "error");
+        this.notify(`\u274C Job "${job.name}" failed. Fix and retry with mc_plan_approve(checkpoint: "on_error", retry: "${job.name}").`);
+        await this.setCheckpoint("on_error", plan);
       }).catch(() => {}).finally(() => {
         if (!this.checkpoint) {
           this.stopReconciler();
@@ -29881,17 +29955,37 @@ var init_plan_approve = __esm(() => {
   init_integration();
   init_worktree_setup();
   mc_plan_approve = tool({
-    description: "Approve a pending copilot plan or clear a supervisor checkpoint to continue execution",
+    description: "Approve a pending copilot plan, clear a supervisor checkpoint, or retry a failed job to continue execution",
     args: {
-      checkpoint: tool.schema.enum(["pre_merge", "on_error", "pre_pr"]).optional().describe("Specific checkpoint to clear (for supervisor mode)")
+      checkpoint: tool.schema.enum(["pre_merge", "on_error", "pre_pr"]).optional().describe("Specific checkpoint to clear (for supervisor mode)"),
+      retry: tool.schema.string().optional().describe("Name of a failed, conflict, or needs_rebase job to retry")
     },
     async execute(args) {
       const plan = await loadPlan();
       if (!plan) {
         throw new Error("No active plan to approve");
       }
+      if (args.retry) {
+        const job = plan.jobs.find((j) => j.name === args.retry);
+        if (!job) {
+          throw new Error(`Job "${args.retry}" not found in plan`);
+        }
+        if (job.status !== "failed" && job.status !== "conflict" && job.status !== "needs_rebase") {
+          throw new Error(`Job "${args.retry}" is not in a retryable state (current: ${job.status}). Only failed, conflict, or needs_rebase jobs can be retried.`);
+        }
+      }
       if (plan.status === "paused" && plan.checkpoint) {
         const checkpoint = args.checkpoint ?? plan.checkpoint;
+        if (args.retry) {
+          const job = plan.jobs.find((j) => j.name === args.retry);
+          if (!job) {
+            throw new Error(`Job "${args.retry}" not found in plan`);
+          }
+          if (job.status !== "failed" && job.status !== "conflict" && job.status !== "needs_rebase") {
+            throw new Error(`Job "${args.retry}" is not in a retryable state (current: ${job.status}). Only failed, conflict, or needs_rebase jobs can be retried.`);
+          }
+          await updatePlanJob(plan.id, args.retry, { status: "ready_to_merge", error: undefined });
+        }
         plan.status = "running";
         plan.checkpoint = null;
         await savePlan(plan);
@@ -29900,8 +29994,9 @@ var init_plan_approve = __esm(() => {
         setSharedOrchestrator(orchestrator2);
         orchestrator2.setPlanModelSnapshot(getCurrentModel());
         await orchestrator2.resumePlan();
+        const retryMsg = args.retry ? ` Job "${args.retry}" reset to ready_to_merge.` : "";
         return [
-          `Checkpoint "${checkpoint}" cleared. Plan "${plan.name}" resuming.`,
+          `Checkpoint "${checkpoint}" cleared.${retryMsg} Plan "${plan.name}" resuming.`,
           "",
           `  ID:   ${plan.id}`,
           `  Mode: ${plan.mode}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-mission-control",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "OpenCode plugin for parallel AI coding sessions in isolated git worktrees",
   "type": "module",
   "main": "./dist/index.js",