@remixhq/mcp 0.1.10 → 0.1.12

package/dist/cli.js

@@ -77,6 +77,7 @@ var ERROR_CODES = {
   DIRTY_WORKTREE: "DIRTY_WORKTREE",
   DETACHED_HEAD: "DETACHED_HEAD",
   PREFERRED_BRANCH_MISMATCH: "PREFERRED_BRANCH_MISMATCH",
+  FAMILY_SELECTION_AMBIGUOUS: "FAMILY_SELECTION_AMBIGUOUS",
   MISSING_HEAD: "MISSING_HEAD",
   REPO_LOCK_HELD: "REPO_LOCK_HELD",
   REPO_LOCK_TIMEOUT: "REPO_LOCK_TIMEOUT",
@@ -205,7 +206,7 @@ function normalizeByMessage(err) {
       category: "local_state"
     });
   }
-  if (code === ERROR_CODES.PREFERRED_BRANCH_MISMATCH || message.includes("preferred branch")) {
+  if (code === ERROR_CODES.PREFERRED_BRANCH_MISMATCH || message.includes("preferred branch") || message.includes("bound branch")) {
     return makeNormalized({
       code: ERROR_CODES.PREFERRED_BRANCH_MISMATCH,
       message,
@@ -213,6 +214,14 @@ function normalizeByMessage(err) {
       category: "local_state"
     });
   }
+  if (message.includes("Multiple canonical Remix families") || message.includes("family selection is ambiguous")) {
+    return makeNormalized({
+      code: ERROR_CODES.FAMILY_SELECTION_AMBIGUOUS,
+      message,
+      hint,
+      category: "local_state"
+    });
+  }
   if (message.includes("Failed to resolve local HEAD")) {
     return makeNormalized({
       code: ERROR_CODES.MISSING_HEAD,
@@ -624,7 +633,9 @@ var initDataSchema = z2.object({
   dashboardUrl: z2.string().url(),
   upstreamAppId: z2.string(),
   bindingPath: z2.string(),
-  repoRoot: z2.string()
+  repoRoot: z2.string(),
+  bindingMode: z2.enum(["legacy", "lane", "explicit_root"]).optional(),
+  createdCanonicalFamily: z2.boolean().optional()
 });
 var listDataSchema = z2.object({
   apps: genericArraySchema,
@@ -776,6 +787,7 @@ import {
 import { findGitRoot, getHeadCommitHash, listUntrackedFiles } from "@remixhq/core/repo";
 function getRiskLevel(status) {
   if (status.recommendedAction === "reconcile") return "high";
+  if (status.recommendedAction === "choose_family") return "medium";
   if (status.recommendedAction === "sync" || status.remote.incomingOpenMergeRequestCount) return "medium";
   if (status.repo.branchMismatch || !status.repo.isGitRepo || !status.binding.isBound || !status.repo.worktree.isClean) return "medium";
   return "low";
@@ -783,7 +795,7 @@ function getRiskLevel(status) {
 function getRecommendedNextActions(status) {
   if (status.repo.branchMismatch) {
     return [
-      `Switch to the preferred branch (${status.binding.preferredBranch ?? "configured in the binding"}) before using Remix mutation tools, or rerun with allowBranchMismatch=true if this deviation is intentional.`
+      `Switch to the bound branch (${status.binding.branchName ?? "configured in the binding"}) before using Remix mutation tools, or rerun with allowBranchMismatch=true if this deviation is intentional.`
     ];
   }
   switch (status.recommendedAction) {
@@ -795,6 +807,10 @@ function getRecommendedNextActions(status) {
       return ["Run remix_collab_reconcile_preview before attempting remix_collab_reconcile_apply. Reconcile is the explicit Remix recovery path when fast-forward sync is no longer possible."];
     case "review_queue":
       return ["Run remix_collab_review_queue to inspect reviewable merge requests instead of using local git merge flows."];
+    case "choose_family":
+      return [
+        "This checkout is ambiguous across multiple canonical Remix families. Continue from a checkout already bound to the intended family, or run remix_collab_init with forceNew=true to create and bind a new canonical family."
+      ];
     default:
       return [];
   }