@remixhq/claude-plugin 0.1.16 → 0.1.17

package/dist/hook-stop-collab.cjs

@@ -7795,7 +7795,7 @@ function summarizeUnifiedDiff(diff) {
   return { changedFilesCount, insertions, deletions };
 }
 
-// node_modules/@remixhq/core/dist/chunk-4L3ZBZUQ.js
+// node_modules/@remixhq/core/dist/chunk-IXWQWFYT.js
 var import_promises13 = __toESM(require("fs/promises"), 1);
 var import_path2 = __toESM(require("path"), 1);
 var import_promises14 = __toESM(require("fs/promises"), 1);
@@ -7817,7 +7817,8 @@ function buildBindingFileV3(params) {
     repoFingerprint: params.repoFingerprint,
     remoteUrl: params.remoteUrl,
     defaultBranch: params.defaultBranch,
-    branchBindings: params.branchBindings
+    branchBindings: params.branchBindings,
+    ...params.explicitRootBinding ? { explicitRootBinding: params.explicitRootBinding } : {}
   };
 }
 function normalizeBranchName(value) {
@@ -7836,7 +7837,7 @@ function normalizeBranchBinding(value) {
     upstreamAppId: value.upstreamAppId,
     threadId: value.threadId ?? null,
     laneId: value.laneId ?? null,
-    bindingMode: value.bindingMode === "legacy" ? "legacy" : "lane"
+    bindingMode: value.bindingMode === "legacy" ? "legacy" : value.bindingMode === "explicit_root" ? "explicit_root" : "lane"
   };
 }
 function buildResolvedBinding(params) {
@@ -7910,6 +7911,7 @@ async function readCollabBindingState(repoRoot, options) {
         defaultBranch: migratedFile.defaultBranch,
         currentBranch,
         branchBindings: migratedFile.branchBindings,
+        explicitRootBinding: null,
         binding: buildResolvedBinding({
           fallbackProjectId: projectId,
           repoFingerprint: migratedFile.repoFingerprint,
@@ -7953,7 +7955,22 @@ async function readCollabBindingState(repoRoot, options) {
       };
       shouldPersistNormalizedBranchBindings = true;
     }
-    if (persist && ("explicitBinding" in file || shouldPersistNormalizedBranchBindings || parsed.schemaVersion === 2)) {
+    let explicitRootBinding = normalizeBranchBinding(file.explicitRootBinding ?? null);
+    if (explicitRootBinding && !explicitRootBinding.projectId && legacyProjectId) {
+      explicitRootBinding = {
+        ...explicitRootBinding,
+        projectId: legacyProjectId
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (explicitRootBinding && explicitRootBinding.bindingMode !== "explicit_root") {
+      explicitRootBinding = {
+        ...explicitRootBinding,
+        bindingMode: "explicit_root"
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (persist && ("explicitBinding" in file || "explicitRootBinding" in file || shouldPersistNormalizedBranchBindings || parsed.schemaVersion === 2)) {
       try {
         await writeJsonAtomic(
           filePath,
@@ -7961,7 +7978,8 @@ async function readCollabBindingState(repoRoot, options) {
             repoFingerprint: file.repoFingerprint ?? null,
             remoteUrl: file.remoteUrl ?? null,
             defaultBranch: file.defaultBranch ?? null,
-            branchBindings
+            branchBindings,
+            explicitRootBinding
           })
         );
       } catch {
@@ -7972,8 +7990,23 @@ async function readCollabBindingState(repoRoot, options) {
       branchBindings,
       currentBranch: resolvedBranch,
       defaultBranch: normalizeBranchName(file.defaultBranch),
-      legacyProjectId
+      legacyProjectId: explicitRootBinding?.projectId ?? legacyProjectId
     });
+    const resolvedBinding = buildResolvedBinding({
+      fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      branchName: resolvedBranch,
+      binding: resolvedBranch ? branchBindings[resolvedBranch] ?? null : null
+    }) ?? (resolvedBranch && resolvedBranch === normalizeBranchName(file.defaultBranch) && explicitRootBinding ? buildResolvedBinding({
+      fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      branchName: normalizeBranchName(file.defaultBranch),
+      binding: explicitRootBinding
+    }) : null);
     return {
       schemaVersion: parsed.schemaVersion,
       projectId: fallbackProjectId,
@@ -7982,14 +8015,15 @@ async function readCollabBindingState(repoRoot, options) {
       defaultBranch: file.defaultBranch ?? null,
       currentBranch,
       branchBindings,
-      binding: buildResolvedBinding({
+      explicitRootBinding: buildResolvedBinding({
         fallbackProjectId,
         repoFingerprint: file.repoFingerprint ?? null,
         remoteUrl: file.remoteUrl ?? null,
         defaultBranch: file.defaultBranch ?? null,
-        branchName: resolvedBranch,
-        binding: resolvedBranch ? branchBindings[resolvedBranch] ?? null : null
-      })
+        branchName: normalizeBranchName(file.defaultBranch),
+        binding: explicitRootBinding
+      }),
+      binding: resolvedBinding
     };
   } catch {
     return null;
@@ -8013,13 +8047,25 @@ async function writeCollabBinding(repoRoot, binding) {
     laneId: binding.laneId ?? null,
     bindingMode: binding.bindingMode ?? "lane"
   };
+  const explicitRootBinding = binding.bindingMode === "explicit_root" ? {
+    ...branchBindings[branchName],
+    bindingMode: "explicit_root"
+  } : existing?.explicitRootBinding ? {
+    projectId: existing.explicitRootBinding.projectId,
+    currentAppId: existing.explicitRootBinding.currentAppId,
+    upstreamAppId: existing.explicitRootBinding.upstreamAppId,
+    threadId: existing.explicitRootBinding.threadId,
+    laneId: existing.explicitRootBinding.laneId,
+    bindingMode: "explicit_root"
+  } : null;
   await writeJsonAtomic(
     filePath,
     buildBindingFileV3({
       repoFingerprint: binding.repoFingerprint ?? null,
       remoteUrl: binding.remoteUrl ?? null,
       defaultBranch: binding.defaultBranch ?? null,
-      branchBindings
+      branchBindings,
+      explicitRootBinding
     })
   );
   return filePath;
@@ -8157,6 +8203,10 @@ function normalizeBranchName2(value) {
 }
 function buildBindingFromLane(state, lane) {
   if (!lane.currentAppId || !lane.upstreamAppId) return null;
+  const resolvedBranch = normalizeBranchName2(lane.branchName) ?? state.currentBranch ?? null;
+  const resolvedDefaultBranch = normalizeBranchName2(lane.defaultBranch) ?? normalizeBranchName2(state.defaultBranch);
+  const explicitRootProjectId = state.explicitRootBinding?.projectId ?? null;
+  const bindingMode = explicitRootProjectId && lane.projectId === explicitRootProjectId && resolvedBranch && resolvedBranch === resolvedDefaultBranch ? "explicit_root" : "lane";
   return {
     schemaVersion: 3,
     projectId: lane.projectId ?? state.projectId,
@@ -8167,8 +8217,8 @@ function buildBindingFromLane(state, lane) {
     remoteUrl: lane.remoteUrl ?? state.remoteUrl ?? null,
     defaultBranch: lane.defaultBranch ?? state.defaultBranch ?? null,
     laneId: lane.laneId ?? null,
-    branchName: lane.branchName ?? state.currentBranch ?? null,
-    bindingMode: "lane"
+    branchName: resolvedBranch,
+    bindingMode
   };
 }
 function shouldPersistRemoteLaneMetadata(localBinding, lane) {
@@ -8197,6 +8247,16 @@ async function persistResolvedLane(repoRoot, binding) {
   });
   return readCollabBinding(repoRoot);
 }
+function buildAmbiguousResolution(params) {
+  return {
+    status: "ambiguous_family_selection",
+    currentBranch: params.currentBranch,
+    projectIds: Array.isArray(params.lane.projectIds) ? params.lane.projectIds.filter((value) => typeof value === "string" && value.trim().length > 0) : [],
+    repoFingerprint: params.lane.repoFingerprint ?? params.state.repoFingerprint,
+    remoteUrl: params.lane.remoteUrl ?? params.state.remoteUrl,
+    defaultBranch: params.lane.defaultBranch ?? params.state.defaultBranch
+  };
+}
 async function resolveActiveLaneBinding(params) {
   const state = await readCollabBindingState(params.repoRoot);
   if (!state) {
@@ -8219,13 +8279,16 @@ async function resolveActiveLaneBinding(params) {
       };
     }
     const laneResp2 = await params.api.resolveProjectLaneBinding({
-      projectId: localBinding.projectId ?? state.projectId ?? void 0,
+      projectId: state.explicitRootBinding?.projectId ?? (requireRemoteLane ? void 0 : localBinding.projectId ?? state.projectId ?? void 0),
       repoFingerprint: state.repoFingerprint ?? void 0,
       remoteUrl: state.remoteUrl ?? void 0,
       defaultBranch: state.defaultBranch ?? void 0,
       branchName: currentBranch
     });
     const lane2 = unwrapResponseObject(laneResp2, "project lane binding");
+    if (lane2.status === "ambiguous_family_selection") {
+      return buildAmbiguousResolution({ state, currentBranch, lane: lane2 });
+    }
     if (lane2.status === "resolved") {
       const resolvedBranch = normalizeBranchName2(lane2.branchName);
       const resolvedProjectId = lane2.projectId ?? state.projectId;
@@ -8268,12 +8331,12 @@ async function resolveActiveLaneBinding(params) {
       return {
         status: "missing_branch_binding",
         currentBranch,
-        projectId: state.projectId,
-        repoFingerprint: state.repoFingerprint,
-        remoteUrl: state.remoteUrl,
-        defaultBranch: state.defaultBranch,
-        upstreamAppId: localBinding.upstreamAppId ?? null,
-        threadId: localBinding.threadId ?? null
+        projectId: lane2.projectId ?? state.projectId,
+        repoFingerprint: lane2.repoFingerprint ?? state.repoFingerprint,
+        remoteUrl: lane2.remoteUrl ?? state.remoteUrl,
+        defaultBranch: lane2.defaultBranch ?? state.defaultBranch,
+        upstreamAppId: lane2.upstreamAppId ?? localBinding.upstreamAppId ?? null,
+        threadId: lane2.threadId ?? localBinding.threadId ?? null
       };
     }
     return {
@@ -8296,13 +8359,16 @@ async function resolveActiveLaneBinding(params) {
     };
   }
   const laneResp = await params.api.resolveProjectLaneBinding({
-    projectId: state.projectId ?? void 0,
+    projectId: state.explicitRootBinding?.projectId ?? state.projectId ?? void 0,
     repoFingerprint: state.repoFingerprint ?? void 0,
     remoteUrl: state.remoteUrl ?? void 0,
     defaultBranch: state.defaultBranch ?? void 0,
     branchName: currentBranch
   });
   const lane = unwrapResponseObject(laneResp, "project lane binding");
+  if (lane.status === "ambiguous_family_selection") {
+    return buildAmbiguousResolution({ state, currentBranch, lane });
+  }
   if (lane.status === "resolved") {
     const binding = buildBindingFromLane(state, lane);
     if (binding) {
@@ -8314,18 +8380,15 @@ async function resolveActiveLaneBinding(params) {
       };
     }
   }
-  if (lane.status === "binding_not_found") {
-    return { status: "not_bound", currentBranch };
-  }
   return {
     status: "missing_branch_binding",
     currentBranch,
-    projectId: lane.projectId ?? state.projectId,
+    projectId: lane.projectId ?? state.explicitRootBinding?.projectId ?? state.projectId,
     repoFingerprint: lane.repoFingerprint ?? state.repoFingerprint,
     remoteUrl: lane.remoteUrl ?? state.remoteUrl,
     defaultBranch: lane.defaultBranch ?? state.defaultBranch,
-    upstreamAppId: lane.upstreamAppId ?? null,
-    threadId: lane.threadId ?? null
+    upstreamAppId: lane.upstreamAppId ?? state.explicitRootBinding?.upstreamAppId ?? null,
+    threadId: lane.threadId ?? state.explicitRootBinding?.threadId ?? null
   };
 }
 async function ensureActiveLaneBinding(params) {
@@ -8345,6 +8408,12 @@ async function ensureActiveLaneBinding(params) {
       hint: `Local app ${resolved.binding.currentAppId}; server app ${resolved.resolvedLane.currentAppId ?? "(unknown)"}. Repair the branch binding before running ${params.operation ?? "this command"}.`
     });
   }
+  if (resolved.status === "ambiguous_family_selection") {
+    throw new RemixError("Multiple canonical Remix families match this repository.", {
+      exitCode: 2,
+      hint: "This checkout is not specific enough to choose a single family for the current branch. Continue from a checkout already bound to the intended family, or run `remix collab init --force-new` to create a new canonical family."
+    });
+  }
   if (resolved.status === "not_bound") {
     return null;
   }
@@ -8419,6 +8488,24 @@ async function collabRecordingPreflight(params) {
       hint: `Current branch ${bindingResolution.currentBranch ?? "(detached)"} is not yet bound to a Remix lane.`
     };
   }
+  if (bindingResolution.status === "ambiguous_family_selection") {
+    return {
+      status: "family_ambiguous",
+      repoRoot,
+      appId: null,
+      currentBranch: bindingResolution.currentBranch,
+      branchName: bindingResolution.currentBranch,
+      headCommitHash: null,
+      worktreeClean: false,
+      syncStatus: null,
+      syncTargetCommitHash: null,
+      syncTargetCommitId: null,
+      reconcileTargetHeadCommitHash: null,
+      reconcileTargetHeadCommitId: null,
+      warnings: [],
+      hint: "Multiple canonical Remix families match this repository. Continue from a checkout already bound to the intended family, or run `remix collab init --force-new` to create a new canonical family."
+    };
+  }
   if (bindingResolution.status === "binding_conflict") {
     return {
       status: "metadata_conflict",
@@ -8928,6 +9015,12 @@ function assertSupportedRecordingPreflight(preflight) {
       hint: preflight.hint
     });
   }
+  if (preflight.status === "family_ambiguous") {
+    throw new RemixError("Multiple canonical Remix families match this repository.", {
+      exitCode: 2,
+      hint: preflight.hint
+    });
+  }
   if (preflight.status === "not_git_repo") {
     throw new RemixError(preflight.hint || "Not inside a git repository.", {
       exitCode: 2,
@@ -9243,6 +9336,12 @@ function assertSupportedRecordingPreflight2(preflight) {
       hint: preflight.hint
     });
   }
+  if (preflight.status === "family_ambiguous") {
+    throw new RemixError("Multiple canonical Remix families match this repository.", {
+      exitCode: 2,
+      hint: preflight.hint
+    });
+  }
   if (preflight.status === "not_git_repo") {
     throw new RemixError(preflight.hint || "Not inside a git repository.", {
       exitCode: 2,
@@ -34012,7 +34111,7 @@ async function clearPendingTurnState(sessionId) {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.16",
+  version: "0.1.17",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -34043,8 +34142,8 @@ var package_default = {
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.11",
-    "@remixhq/mcp": "^0.1.11"
+    "@remixhq/core": "^0.1.12",
+    "@remixhq/mcp": "^0.1.12"
   },
   devDependencies: {
     "@types/node": "^25.4.0",
@@ -34260,6 +34359,12 @@ function getRecordingBlockedMessage(status, repoRoot) {
       hint: status.hint || `Run \`remix_collab_status\` for ${repoRoot}, then initialize or provision the current branch lane before recording work.`
     };
   }
+  if (status.status === "family_ambiguous") {
+    return {
+      message: "Fallback Remix turn recording was blocked because multiple canonical Remix families match this repository and the current checkout does not identify which family to use.",
+      hint: status.hint || `Continue from a checkout already bound to the intended family, or run \`remix_collab_init\` with forceNew=true for ${repoRoot} to create a new canonical family.`
+    };
+  }
   switch (status.status) {
     case "not_git_repo":
       return {