@remixhq/core 0.1.33 → 0.1.34

package/dist/collab.js

@@ -509,6 +509,13 @@ import path3 from "path";
 function getBaselinePath(params) {
   return path3.join(getBaselinesRoot(), `${buildLaneStateKey(params)}.json`);
 }
+function normalizeNullableString(value) {
+  const normalized = String(value ?? "").trim();
+  return normalized || null;
+}
+function isSameBaselineIdentity(left, right) {
+  return left.repoRoot === right.repoRoot && (left.repoFingerprint ?? null) === (right.repoFingerprint ?? null) && (left.laneId ?? null) === (right.laneId ?? null) && left.currentAppId === right.currentAppId && (left.branchName ?? null) === (right.branchName ?? null);
+}
 async function readLocalBaseline(params) {
   try {
     const raw = await fs2.readFile(getBaselinePath(params), "utf8");
@@ -558,6 +565,105 @@ async function writeLocalBaseline(baseline) {
   await writeJsonAtomic(getBaselinePath(baseline), normalized);
   return normalized;
 }
+async function readAllLocalBaselines() {
+  let entries;
+  try {
+    entries = await fs2.readdir(getBaselinesRoot());
+  } catch (error) {
+    if (error?.code === "ENOENT") return [];
+    throw error;
+  }
+  const baselines = [];
+  for (const entry of entries) {
+    if (!entry.endsWith(".json")) continue;
+    try {
+      const raw = await fs2.readFile(path3.join(getBaselinesRoot(), entry), "utf8");
+      const parsed = JSON.parse(raw);
+      if (!parsed || typeof parsed !== "object") continue;
+      if (![1, 2].includes(Number(parsed.schemaVersion)) || typeof parsed.key !== "string" || typeof parsed.repoRoot !== "string") {
+        continue;
+      }
+      baselines.push({
+        schemaVersion: Number(parsed.schemaVersion) === 2 ? 2 : 1,
+        key: parsed.key,
+        repoRoot: parsed.repoRoot,
+        repoFingerprint: parsed.repoFingerprint ?? null,
+        laneId: parsed.laneId ?? null,
+        currentAppId: String(parsed.currentAppId ?? ""),
+        branchName: parsed.branchName ?? null,
+        lastSnapshotId: parsed.lastSnapshotId ?? null,
+        lastSnapshotHash: parsed.lastSnapshotHash ?? null,
+        lastServerRevisionId: parsed.lastServerRevisionId ?? null,
+        lastServerTreeHash: parsed.lastServerTreeHash ?? null,
+        lastServerHeadHash: parsed.lastServerHeadHash ?? null,
+        lastSeenLocalCommitHash: parsed.lastSeenLocalCommitHash ?? null,
+        updatedAt: String(parsed.updatedAt ?? "")
+      });
+    } catch {
+      continue;
+    }
+  }
+  return baselines;
+}
+async function migrateLocalBaselineForLaneChange(params) {
+  if ((params.fromLaneId ?? null) === (params.toLaneId ?? null)) {
+    return { status: "same_lane" };
+  }
+  const target = await readLocalBaseline({
+    repoRoot: params.repoRoot,
+    repoFingerprint: params.repoFingerprint,
+    laneId: params.toLaneId
+  });
+  if (target) {
+    return { status: "target_exists" };
+  }
+  const source = await readLocalBaseline({
+    repoRoot: params.repoRoot,
+    repoFingerprint: params.repoFingerprint,
+    laneId: params.fromLaneId
+  });
+  if (!source) {
+    return { status: "source_missing" };
+  }
+  const expectedSource = {
+    repoRoot: params.repoRoot,
+    repoFingerprint: params.repoFingerprint,
+    laneId: params.fromLaneId,
+    currentAppId: params.currentAppId,
+    branchName: params.branchName
+  };
+  const actualSource = {
+    repoRoot: source.repoRoot,
+    repoFingerprint: source.repoFingerprint,
+    laneId: source.laneId,
+    currentAppId: source.currentAppId,
+    branchName: source.branchName
+  };
+  if (!isSameBaselineIdentity(actualSource, expectedSource)) {
+    return { status: "source_missing" };
+  }
+  const baseline = await writeLocalBaseline({
+    ...source,
+    laneId: params.toLaneId
+  });
+  return { status: "migrated", baseline };
+}
+async function findCompatibleLocalBaseline(params) {
+  const targetKey = buildLaneStateKey(params);
+  const branchName = normalizeNullableString(params.branchName);
+  const candidates = (await readAllLocalBaselines()).filter((baseline) => {
+    if (baseline.key === targetKey) return false;
+    if (baseline.repoRoot !== params.repoRoot) return false;
+    if ((baseline.repoFingerprint ?? null) !== (params.repoFingerprint ?? null)) return false;
+    if (baseline.currentAppId !== params.currentAppId) return false;
+    return true;
+  });
+  const branchMatches = candidates.filter((baseline) => normalizeNullableString(baseline.branchName) === branchName);
+  const compatible = branchMatches.length > 0 ? branchMatches : candidates.filter((baseline) => normalizeNullableString(baseline.branchName) === null);
+  if (compatible.length === 0) return { status: "none", candidateCount: 0 };
+  if (compatible.length > 1) return { status: "ambiguous", candidateCount: compatible.length };
+  return { status: "found", baseline: compatible[0] };
+}
 async function clearLocalBaseline(params) {
   try {
     await fs2.unlink(getBaselinePath(params));
@@ -1500,6 +1606,7 @@ function resolveLaneLookupProjectId(params) {
   return params.explicitRootProjectId ?? (params.requireRemoteLane ? void 0 : localProjectId ?? params.fallbackProjectId ?? void 0);
 }
 async function persistResolvedLane(repoRoot, binding) {
+  const previousBinding = await readCollabBinding(repoRoot);
   await writeCollabBinding(repoRoot, {
     projectId: binding.projectId,
     currentAppId: binding.currentAppId,
@@ -1512,6 +1619,16 @@ async function persistResolvedLane(repoRoot, binding) {
     branchName: binding.branchName,
     bindingMode: binding.bindingMode
   });
+  if (previousBinding && (previousBinding.laneId ?? null) !== (binding.laneId ?? null)) {
+    await migrateLocalBaselineForLaneChange({
+      repoRoot,
+      repoFingerprint: binding.repoFingerprint,
+      currentAppId: binding.currentAppId,
+      branchName: binding.branchName,
+      fromLaneId: previousBinding.laneId,
+      toLaneId: binding.laneId
+    });
+  }
   return readCollabBinding(repoRoot);
 }
 function buildAmbiguousResolution(params) {
@@ -1911,11 +2028,36 @@ async function collabDetectRepoState(params) {
     return detected;
   }
   try {
-    const baseline = await readLocalBaseline({
+    let baseline = await readLocalBaseline({
       repoFingerprint: binding.repoFingerprint,
       laneId: binding.laneId,
       repoRoot
     });
+    let ambiguousBaselineCandidateCount = null;
+    if (!baseline) {
+      const compatibleBaseline = await findCompatibleLocalBaseline({
+        repoRoot,
+        repoFingerprint: binding.repoFingerprint,
+        laneId: binding.laneId,
+        currentAppId: binding.currentAppId,
+        branchName: binding.branchName
+      });
+      if (compatibleBaseline.status === "found") {
+        baseline = await writeLocalBaseline({
+          ...compatibleBaseline.baseline,
+          repoRoot,
+          repoFingerprint: binding.repoFingerprint,
+          laneId: binding.laneId,
+          currentAppId: binding.currentAppId,
+          branchName: binding.branchName
+        });
+        detected.warnings.push(
+          `Recovered local Remix baseline after lane id changed from ${compatibleBaseline.baseline.laneId ?? "null"} to ${binding.laneId ?? "null"} for app ${binding.currentAppId} on branch ${binding.branchName ?? "(unknown)"}.`
+        );
+      } else if (compatibleBaseline.status === "ambiguous") {
+        ambiguousBaselineCandidateCount = compatibleBaseline.candidateCount;
+      }
+    }
     const hasFullBaseline = Boolean(baseline?.lastSnapshotHash && baseline?.lastServerHeadHash);
     const metadataIdentityPromise = hasFullBaseline ? getAppDeltaCached(params.api, binding.currentAppId, {
       baseHeadHash: baseline.lastServerHeadHash,
@@ -1988,7 +2130,7 @@ async function collabDetectRepoState(params) {
         }
       }
       detected.repoState = "external_local_base_changed";
-      detected.hint = "No local Remix revision baseline exists for this lane yet. Run `remix collab init` or sync this lane to seed the baseline.";
+      detected.hint = ambiguousBaselineCandidateCount !== null ? `No local Remix revision baseline exists for this lane, and multiple compatible local baselines were found (${ambiguousBaselineCandidateCount}). Run \`remix collab status\` or sync this lane to seed an unambiguous baseline.` : "No local Remix revision baseline exists for this lane yet. Run `remix collab init` or sync this lane to seed the baseline.";
       return detected;
     }
     const localHeadMovedSinceBaseline = Boolean(baseline.lastSeenLocalCommitHash) && localCommitHash !== baseline.lastSeenLocalCommitHash;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remixhq/core",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "Remix core library",
   "homepage": "https://github.com/RemixDotOne/remix-core",
   "license": "MIT",