@remixhq/claude-plugin 0.1.22 → 0.1.24

package/dist/mcp-server.cjs

@@ -36,8 +36,8 @@ var require_windows = __commonJS({
     "use strict";
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs17 = require("fs");
-    function checkPathExt(path17, options) {
+    var fs16 = require("fs");
+    function checkPathExt(path16, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -48,25 +48,25 @@ var require_windows = __commonJS({
       }
       for (var i2 = 0; i2 < pathext.length; i2++) {
         var p = pathext[i2].toLowerCase();
-        if (p && path17.substr(-p.length).toLowerCase() === p) {
+        if (p && path16.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path17, options) {
+    function checkStat(stat, path16, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path17, options);
+      return checkPathExt(path16, options);
     }
-    function isexe(path17, options, cb) {
-      fs17.stat(path17, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path17, options));
+    function isexe(path16, options, cb) {
+      fs16.stat(path16, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path16, options));
       });
     }
-    function sync(path17, options) {
-      return checkStat(fs17.statSync(path17), path17, options);
+    function sync(path16, options) {
+      return checkStat(fs16.statSync(path16), path16, options);
     }
   }
 });
@@ -77,14 +77,14 @@ var require_mode = __commonJS({
     "use strict";
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs17 = require("fs");
-    function isexe(path17, options, cb) {
-      fs17.stat(path17, function(er, stat) {
+    var fs16 = require("fs");
+    function isexe(path16, options, cb) {
+      fs16.stat(path16, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path17, options) {
-      return checkStat(fs17.statSync(path17), options);
+    function sync(path16, options) {
+      return checkStat(fs16.statSync(path16), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -109,7 +109,7 @@ var require_mode = __commonJS({
 var require_isexe = __commonJS({
   "node_modules/isexe/index.js"(exports2, module2) {
     "use strict";
-    var fs17 = require("fs");
+    var fs16 = require("fs");
     var core;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core = require_windows();
@@ -118,7 +118,7 @@ var require_isexe = __commonJS({
     }
     module2.exports = isexe;
     isexe.sync = sync;
-    function isexe(path17, options, cb) {
+    function isexe(path16, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -128,7 +128,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve, reject) {
-          isexe(path17, options || {}, function(er, is) {
+          isexe(path16, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -137,7 +137,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path17, options || {}, function(er, is) {
+      core(path16, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -147,9 +147,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path17, options) {
+    function sync(path16, options) {
       try {
-        return core.sync(path17, options || {});
+        return core.sync(path16, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -166,7 +166,7 @@ var require_which = __commonJS({
   "node_modules/which/which.js"(exports2, module2) {
     "use strict";
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path17 = require("path");
+    var path16 = require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -204,7 +204,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path17.join(pathPart, cmd);
+        const pCmd = path16.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve(subStep(p, i2, 0));
       });
@@ -231,7 +231,7 @@ var require_which = __commonJS({
       for (let i2 = 0; i2 < pathEnv.length; i2++) {
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path17.join(pathPart, cmd);
+        const pCmd = path16.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j = 0; j < pathExt.length; j++) {
           const cur = p + pathExt[j];
@@ -279,7 +279,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
     "use strict";
-    var path17 = require("path");
+    var path16 = require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -297,7 +297,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path17.delimiter : void 0
+          pathExt: withoutPathExt ? path16.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -306,7 +306,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path17.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path16.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -360,8 +360,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path17, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path17.split("/").pop();
+      const [path16, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path16.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -374,16 +374,16 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "node_modules/cross-spawn/lib/util/readShebang.js"(exports2, module2) {
     "use strict";
-    var fs17 = require("fs");
+    var fs16 = require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs17.openSync(command, "r");
-        fs17.readSync(fd, buffer, 0, size, 0);
-        fs17.closeSync(fd);
+        fd = fs16.openSync(command, "r");
+        fs16.readSync(fd, buffer, 0, size, 0);
+        fs16.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -396,7 +396,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
     "use strict";
-    var path17 = require("path");
+    var path16 = require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -421,7 +421,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path17.normalize(parsed.command);
+        parsed.command = path16.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -3724,8 +3724,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path17) {
-      let input = path17;
+    function removeDotSegments(path16) {
+      let input = path16;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -3924,8 +3924,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path17, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path17 && path17 !== "/" ? path17 : void 0;
+        const [path16, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path16 && path16 !== "/" ? path16 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -7287,12 +7287,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs17, exportName) {
+    function addFormats(ajv, list, fs16, exportName) {
       var _a;
       var _b;
       (_a = (_b = ajv.opts.code).formats) !== null && _a !== void 0 ? _a : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs17[f]);
+        ajv.addFormat(f, fs16[f]);
     }
     module2.exports = exports2 = formatsPlugin;
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -7498,10 +7498,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path17) {
-  if (!path17)
+function getElementAtPath(obj, path16) {
+  if (!path16)
     return obj;
-  return path17.reduce((acc, key) => acc?.[key], obj);
+  return path16.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -7821,11 +7821,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path17, issues) {
+function prefixIssues(path16, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path17);
+    iss.path.unshift(path16);
     return iss;
   });
 }
@@ -13430,21 +13430,27 @@ var REMIX_ERROR_CODES = {
   PREFERRED_BRANCH_MISMATCH: "PREFERRED_BRANCH_MISMATCH"
 };
 
-// node_modules/@remixhq/core/dist/chunk-YZ34ICNN.js
+// node_modules/@remixhq/core/dist/chunk-7XJGOKEO.js
 var RemixError = class extends Error {
   code;
   exitCode;
   hint;
+  // HTTP status code when this error originates from an API response.
+  // null for non-HTTP errors (validation, local IO, programming bugs).
+  // Callers use this to distinguish transient (5xx) from permanent (4xx)
+  // API failures without resorting to error-message string matching.
+  statusCode;
   constructor(message, opts) {
     super(message);
     this.name = "RemixError";
     this.code = opts?.code ?? null;
     this.exitCode = opts?.exitCode ?? 1;
     this.hint = opts?.hint ?? null;
+    this.statusCode = opts?.statusCode ?? null;
   }
 };
 
-// node_modules/@remixhq/core/dist/chunk-WT6VRLXU.js
+// node_modules/@remixhq/core/dist/chunk-S4ECO35X.js
 var import_promises12 = __toESM(require("fs/promises"), 1);
 var import_crypto = require("crypto");
 var import_os = __toESM(require("os"), 1);
@@ -17831,13 +17837,13 @@ var logOutputSync = ({ serializedResult, fdNumber, state, verboseInfo, encoding,
   }
 };
 var writeToFiles = (serializedResult, stdioItems, outputFiles) => {
-  for (const { path: path17, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
-    const pathString = typeof path17 === "string" ? path17 : path17.toString();
+  for (const { path: path16, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
+    const pathString = typeof path16 === "string" ? path16 : path16.toString();
     if (append || outputFiles.has(pathString)) {
-      (0, import_node_fs4.appendFileSync)(path17, serializedResult);
+      (0, import_node_fs4.appendFileSync)(path16, serializedResult);
     } else {
       outputFiles.add(pathString);
-      (0, import_node_fs4.writeFileSync)(path17, serializedResult);
+      (0, import_node_fs4.writeFileSync)(path16, serializedResult);
     }
   }
 };
@@ -20225,7 +20231,7 @@ var {
   getCancelSignal: getCancelSignal2
 } = getIpcExport();
 
-// node_modules/@remixhq/core/dist/chunk-WT6VRLXU.js
+// node_modules/@remixhq/core/dist/chunk-S4ECO35X.js
 var GIT_REMOTE_PROTOCOL_RE = /^(https?|ssh):\/\//i;
 var SCP_LIKE_GIT_REMOTE_RE = /^(?<user>[^@\s]+)@(?<host>[^:\s]+):(?<path>[^\\\s]+)$/;
 var CANONICAL_GIT_REMOTE_RE = /^(?<host>(?:localhost|[a-z0-9.-]+))\/(?<path>[^\\\s]+)$/i;
@@ -20691,7 +20697,7 @@ function summarizeUnifiedDiff(diff) {
   return { changedFilesCount, insertions, deletions };
 }
 
-// node_modules/@remixhq/core/dist/chunk-YCFLOHJV.js
+// node_modules/@remixhq/core/dist/chunk-DBVN42RF.js
 var import_promises13 = __toESM(require("fs/promises"), 1);
 var import_path2 = __toESM(require("path"), 1);
 var import_promises14 = __toESM(require("fs/promises"), 1);
@@ -21044,14 +21050,11 @@ var import_crypto8 = __toESM(require("crypto"), 1);
 var import_fs = __toESM(require("fs"), 1);
 var import_fs2 = __toESM(require("fs"), 1);
 var import_stream3 = require("stream");
-var import_crypto9 = require("crypto");
 var import_promises23 = __toESM(require("fs/promises"), 1);
+var import_os6 = __toESM(require("os"), 1);
 var import_path12 = __toESM(require("path"), 1);
 var import_promises24 = __toESM(require("fs/promises"), 1);
-var import_os6 = __toESM(require("os"), 1);
 var import_path13 = __toESM(require("path"), 1);
-var import_promises25 = __toESM(require("fs/promises"), 1);
-var import_path14 = __toESM(require("path"), 1);
 var APP_DELTA_CACHE_TTL_MS = 5e3;
 var appDeltaCache = /* @__PURE__ */ new Map();
 var cacheClock = () => Date.now();
@@ -21060,6 +21063,8 @@ function buildAppDeltaCacheKey(appId, payload) {
     appId,
     payload.baseHeadHash,
     payload.targetHeadHash ?? "",
+    payload.baseRevisionId ?? "",
+    payload.targetRevisionId ?? "",
     payload.localSnapshotHash ?? "",
     payload.repoFingerprint ?? "",
     payload.remoteUrl ?? "",
@@ -21188,9 +21193,6 @@ function getAsyncJobDir(jobId) {
 function getAsyncJobFilePath(jobId) {
   return import_path5.default.join(getAsyncJobDir(jobId), "job.json");
 }
-function getAsyncJobBundlePath(jobId) {
-  return import_path5.default.join(getAsyncJobDir(jobId), "bundle.bundle");
-}
 function getLogsRoot() {
   return import_path5.default.join(getCollabStateRoot(), "logs");
 }
@@ -21459,11 +21461,11 @@ async function readLocalBaseline(params) {
     const raw = await import_promises16.default.readFile(getBaselinePath(params), "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") return null;
-    if (parsed.schemaVersion !== 1 || typeof parsed.key !== "string" || typeof parsed.repoRoot !== "string") {
+    if (![1, 2].includes(Number(parsed.schemaVersion)) || typeof parsed.key !== "string" || typeof parsed.repoRoot !== "string") {
       return null;
     }
     return {
-      schemaVersion: 1,
+      schemaVersion: Number(parsed.schemaVersion) === 2 ? 2 : 1,
       key: parsed.key,
       repoRoot: parsed.repoRoot,
       repoFingerprint: parsed.repoFingerprint ?? null,
@@ -21472,6 +21474,8 @@ async function readLocalBaseline(params) {
       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 ?? "")
@@ -21483,7 +21487,7 @@ async function readLocalBaseline(params) {
 async function writeLocalBaseline(baseline) {
   const key = buildLaneStateKey(baseline);
   const normalized = {
-    schemaVersion: 1,
+    schemaVersion: 2,
     key,
     repoRoot: baseline.repoRoot,
     repoFingerprint: baseline.repoFingerprint ?? null,
@@ -21492,6 +21496,8 @@ async function writeLocalBaseline(baseline) {
     branchName: baseline.branchName ?? null,
     lastSnapshotId: baseline.lastSnapshotId ?? null,
     lastSnapshotHash: baseline.lastSnapshotHash ?? null,
+    lastServerRevisionId: baseline.lastServerRevisionId ?? null,
+    lastServerTreeHash: baseline.lastServerTreeHash ?? null,
     lastServerHeadHash: baseline.lastServerHeadHash ?? null,
     lastSeenLocalCommitHash: baseline.lastSeenLocalCommitHash ?? null,
     updatedAt: baseline.updatedAt ?? (/* @__PURE__ */ new Date()).toISOString()
@@ -21833,6 +21839,7 @@ function normalizeJob2(input) {
     prompt: input.prompt,
     assistantResponse: input.assistantResponse,
     baselineSnapshotId: input.baselineSnapshotId ?? null,
+    baselineServerRevisionId: input.baselineServerRevisionId ?? null,
     baselineServerHeadHash: input.baselineServerHeadHash ?? null,
     currentSnapshotId: input.currentSnapshotId,
     capturedAt: input.capturedAt ?? now,
@@ -21862,6 +21869,7 @@ async function readPendingFinalizeJob(jobId) {
       prompt: String(parsed.prompt ?? ""),
       assistantResponse: String(parsed.assistantResponse ?? ""),
       baselineSnapshotId: parsed.baselineSnapshotId ?? null,
+      baselineServerRevisionId: parsed.baselineServerRevisionId ?? null,
       baselineServerHeadHash: parsed.baselineServerHeadHash ?? null,
       currentSnapshotId: String(parsed.currentSnapshotId ?? ""),
       capturedAt: parsed.capturedAt,
@@ -22351,6 +22359,15 @@ function shouldRequireRemoteLaneForCurrentBranch(params) {
   if (params.currentBranch === defaultBranch) return false;
   return !params.binding.laneId || params.binding.currentAppId === params.binding.upstreamAppId;
 }
+function resolveLaneLookupProjectId(params) {
+  const currentBranch = normalizeBranchName2(params.currentBranch);
+  const defaultBranch = normalizeBranchName2(params.defaultBranch);
+  const localProjectId = params.localBinding.projectId ?? null;
+  if (currentBranch && currentBranch !== defaultBranch && localProjectId) {
+    return localProjectId;
+  }
+  return params.explicitRootProjectId ?? (params.requireRemoteLane ? void 0 : localProjectId ?? params.fallbackProjectId ?? void 0);
+}
 async function persistResolvedLane(repoRoot, binding) {
   await writeCollabBinding(repoRoot, {
     projectId: binding.projectId,
@@ -22429,7 +22446,14 @@ async function resolveActiveLaneBindingUncached(params, state) {
       };
     }
     const laneResp2 = await params.api.resolveProjectLaneBinding({
-      projectId: state.explicitRootBinding?.projectId ?? (requireRemoteLane ? void 0 : localBinding.projectId ?? state.projectId ?? void 0),
+      projectId: resolveLaneLookupProjectId({
+        explicitRootProjectId: state.explicitRootBinding?.projectId,
+        localBinding,
+        currentBranch,
+        defaultBranch: state.defaultBranch,
+        requireRemoteLane,
+        fallbackProjectId: state.projectId
+      }),
       repoFingerprint: state.repoFingerprint ?? void 0,
       remoteUrl: state.remoteUrl ?? void 0,
       defaultBranch: state.defaultBranch ?? void 0,
@@ -22588,6 +22612,8 @@ function buildBaseState() {
     branchName: null,
     localCommitHash: null,
     currentSnapshotHash: null,
+    currentServerRevisionId: null,
+    currentServerTreeHash: null,
     currentServerHeadHash: null,
     currentServerHeadCommitId: null,
     worktreeClean: false,
@@ -22621,6 +22647,8 @@ function buildBaseState() {
     baseline: {
       lastSnapshotId: null,
       lastSnapshotHash: null,
+      lastServerRevisionId: null,
+      lastServerTreeHash: null,
       lastServerHeadHash: null,
       lastSeenLocalCommitHash: null
     }
@@ -22747,6 +22775,8 @@ async function collabDetectRepoState(params) {
       summarizeAsyncJobs({ repoRoot, branchName: binding.branchName ?? null })
     ]);
     const appHead = unwrapResponseObject(headResp, "app head");
+    detected.currentServerRevisionId = appHead.headRevisionId ?? null;
+    detected.currentServerTreeHash = appHead.treeHash ?? null;
     detected.currentServerHeadHash = appHead.headCommitHash;
     detected.currentServerHeadCommitId = appHead.headCommitId;
     detected.currentSnapshotHash = inspection.snapshotHash;
@@ -22755,6 +22785,8 @@ async function collabDetectRepoState(params) {
     detected.baseline = {
       lastSnapshotId: baseline?.lastSnapshotId ?? null,
       lastSnapshotHash: baseline?.lastSnapshotHash ?? null,
+      lastServerRevisionId: baseline?.lastServerRevisionId ?? null,
+      lastServerTreeHash: baseline?.lastServerTreeHash ?? null,
       lastServerHeadHash: baseline?.lastServerHeadHash ?? null,
       lastSeenLocalCommitHash: baseline?.lastSeenLocalCommitHash ?? null
     };
@@ -22764,6 +22796,7 @@ async function collabDetectRepoState(params) {
           const bootstrapResp = await params.api.getAppDelta(binding.currentAppId, {
             baseHeadHash: localCommitHash,
             targetHeadHash: appHead.headCommitHash,
+            targetRevisionId: appHead.headRevisionId,
             repoFingerprint: binding.repoFingerprint ?? void 0,
             remoteUrl: binding.remoteUrl ?? void 0,
             defaultBranch: binding.defaultBranch ?? void 0
@@ -22786,7 +22819,7 @@ async function collabDetectRepoState(params) {
         }
       }
       detected.repoState = "external_local_base_changed";
-      detected.hint = "No local Remix baseline exists for this lane yet. Run `remix collab re-anchor` to anchor this checkout.";
+      detected.hint = "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;
@@ -22805,7 +22838,30 @@ async function collabDetectRepoState(params) {
       return detected;
     }
     const localChanged = inspection.snapshotHash !== baseline.lastSnapshotHash;
-    const serverChanged = appHead.headCommitHash !== baseline.lastServerHeadHash;
+    const serverHeadChanged = appHead.headCommitHash !== baseline.lastServerHeadHash;
+    const revisionChanged = Boolean(
+      baseline.lastServerRevisionId && (appHead.headRevisionId ?? null) !== baseline.lastServerRevisionId
+    );
+    const equivalentRevisionDrift = revisionChanged && !serverHeadChanged;
+    if (equivalentRevisionDrift) {
+      await writeLocalBaseline({
+        repoRoot,
+        repoFingerprint: binding.repoFingerprint,
+        laneId: binding.laneId,
+        currentAppId: binding.currentAppId,
+        branchName: binding.branchName,
+        lastSnapshotId: baseline.lastSnapshotId,
+        lastSnapshotHash: baseline.lastSnapshotHash,
+        lastServerRevisionId: appHead.headRevisionId ?? null,
+        lastServerTreeHash: appHead.treeHash ?? baseline.lastServerTreeHash ?? null,
+        lastServerHeadHash: appHead.headCommitHash,
+        lastSeenLocalCommitHash: baseline.lastSeenLocalCommitHash
+      });
+      detected.baseline.lastServerRevisionId = appHead.headRevisionId ?? null;
+      detected.baseline.lastServerTreeHash = appHead.treeHash ?? baseline.lastServerTreeHash ?? null;
+      detected.baseline.lastServerHeadHash = appHead.headCommitHash;
+    }
+    const serverChanged = serverHeadChanged;
     if (!localChanged && !serverChanged) {
       detected.repoState = "idle";
       return detected;
@@ -23229,6 +23285,7 @@ function buildWorkspaceMetadata(params) {
     recordingMode: "boundary_delta",
     baselineSnapshotId: params.baselineSnapshotId,
     currentSnapshotId: params.currentSnapshotId,
+    baselineServerRevisionId: params.baselineServerRevisionId ?? null,
     baselineServerHeadHash: params.baselineServerHeadHash,
     currentSnapshotHash: params.currentSnapshotHash,
     localCommitHash: params.localCommitHash,
@@ -23247,6 +23304,59 @@ function buildWorkspaceMetadata(params) {
   }
   return metadata;
 }
+async function findExistingChangeStepByIdempotency(params) {
+  const idempotencyKey = params.idempotencyKey?.trim();
+  if (!idempotencyKey) return null;
+  const resp = await params.api.listChangeSteps(params.appId, { limit: 1, idempotencyKey });
+  const responseObject = unwrapResponseObject(
+    resp,
+    "change step list"
+  );
+  const steps = Array.isArray(responseObject) ? responseObject : Array.isArray(responseObject.items) ? responseObject.items : [];
+  return steps.find((step) => step.idempotencyKey === idempotencyKey) ?? null;
+}
+async function writeBaselineFromSucceededChangeStep(params) {
+  const nextServerHeadHash = typeof params.changeStep.headCommitHash === "string" ? params.changeStep.headCommitHash.trim() : "";
+  if (!nextServerHeadHash) {
+    throw buildFinalizeCliError({
+      message: "Backend returned a succeeded change step without a head commit hash.",
+      exitCode: 1,
+      hint: "This is a backend invariant violation; retry will not help. Run `remix collab status` before trying again.",
+      disposition: "terminal",
+      reason: "missing_head_commit_hash"
+    });
+  }
+  let nextServerRevisionId = typeof params.changeStep.resultRevisionId === "string" ? params.changeStep.resultRevisionId.trim() : "";
+  let nextServerTreeHash = null;
+  if (!nextServerRevisionId) {
+    const freshHeadResp = await params.api.getAppHead(params.job.currentAppId);
+    const freshHead = unwrapResponseObject(freshHeadResp, "app head");
+    if (freshHead.headCommitHash !== nextServerHeadHash || !freshHead.headRevisionId) {
+      throw buildFinalizeCliError({
+        message: "Backend returned a succeeded change step without a matching result revision.",
+        exitCode: 1,
+        hint: "The local baseline was not advanced because the post-step revision could not be verified. Restart the backend/CLI and retry after checking `remix collab status`.",
+        disposition: "terminal",
+        reason: "missing_result_revision_id"
+      });
+    }
+    nextServerRevisionId = freshHead.headRevisionId;
+    nextServerTreeHash = freshHead.treeHash ?? null;
+  }
+  await writeLocalBaseline({
+    repoRoot: params.job.repoRoot,
+    repoFingerprint: params.job.repoFingerprint,
+    laneId: params.job.laneId,
+    currentAppId: params.job.currentAppId,
+    branchName: params.job.branchName,
+    lastSnapshotId: params.snapshot.id,
+    lastSnapshotHash: params.snapshot.snapshotHash,
+    lastServerRevisionId: nextServerRevisionId,
+    lastServerTreeHash: nextServerTreeHash,
+    lastServerHeadHash: nextServerHeadHash,
+    lastSeenLocalCommitHash: params.snapshot.localCommitHash
+  });
+}
 async function harvestPreTurnEvents(repoRoot, fromCommit, toCommit) {
   if (!toCommit) return null;
   try {
@@ -23307,12 +23417,12 @@ async function processClaimedPendingFinalizeJobInner(params) {
     throw buildFinalizeCliError({
       message: "Local baseline is missing for this queued finalize job.",
       exitCode: 2,
-      hint: "Run `remix collab re-anchor` to anchor the repository again.",
+      hint: "Run `remix collab init` to seed this checkout's revision baseline.",
       disposition: "terminal",
       reason: "baseline_missing"
     });
   }
-  const baselineDrifted = baseline.lastSnapshotId !== job.baselineSnapshotId || baseline.lastServerHeadHash !== job.baselineServerHeadHash;
+  const baselineDrifted = baseline.lastSnapshotId !== job.baselineSnapshotId || (job.baselineServerRevisionId ? baseline.lastServerRevisionId !== job.baselineServerRevisionId : false) || baseline.lastServerHeadHash !== job.baselineServerHeadHash;
   const appHead = unwrapResponseObject(appHeadResp, "app head");
   const remoteUrl = readMetadataString(job, "remoteUrl");
   const defaultBranch = readMetadataString(job, "defaultBranch");
@@ -23335,12 +23445,13 @@ async function processClaimedPendingFinalizeJobInner(params) {
       throw buildFinalizeCliError({
         message: "Finalize queue baseline drifted before this job was processed.",
         exitCode: 1,
-        hint: "Process queued finalize jobs in capture order, or re-anchor the repository before retrying.",
+        hint: "Process queued finalize jobs in capture order, or run `remix collab init` to refresh the revision baseline before retrying.",
         disposition: "terminal",
         reason: "baseline_drifted"
       });
     }
-    if (appHead.headCommitHash !== job.baselineServerHeadHash) {
+    const serverStillAtBaseline = job.baselineServerRevisionId ? appHead.headRevisionId === job.baselineServerRevisionId : appHead.headCommitHash === job.baselineServerHeadHash;
+    if (!serverStillAtBaseline) {
       throw buildFinalizeCliError({
         message: "Server lane changed before a no-diff turn could be recorded.",
         exitCode: 2,
@@ -23362,6 +23473,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
         defaultBranch,
         baselineSnapshotId: job.baselineSnapshotId,
         currentSnapshotId: job.currentSnapshotId,
+        baselineServerRevisionId: job.baselineServerRevisionId,
         baselineServerHeadHash: job.baselineServerHeadHash,
         currentSnapshotHash: snapshot.snapshotHash,
         localCommitHash: snapshot.localCommitHash,
@@ -23382,6 +23494,8 @@ async function processClaimedPendingFinalizeJobInner(params) {
       branchName: job.branchName,
       lastSnapshotId: snapshot.id,
       lastSnapshotHash: snapshot.snapshotHash,
+      lastServerRevisionId: appHead.headRevisionId ?? null,
+      lastServerTreeHash: appHead.treeHash ?? null,
       lastServerHeadHash: appHead.headCommitHash,
       lastSeenLocalCommitHash: snapshot.localCommitHash
     });
@@ -23402,14 +23516,14 @@ async function processClaimedPendingFinalizeJobInner(params) {
     };
   }
   const localBaselineAdvanced = baseline.lastSnapshotId !== job.baselineSnapshotId;
-  const serverHeadAdvanced = appHead.headCommitHash !== job.baselineServerHeadHash;
+  const serverHeadAdvanced = job.baselineServerRevisionId ? appHead.headRevisionId !== job.baselineServerRevisionId : appHead.headCommitHash !== job.baselineServerHeadHash;
   if (baselineDrifted) {
     const consistentAdvance = localBaselineAdvanced && serverHeadAdvanced;
     if (!consistentAdvance) {
       throw buildFinalizeCliError({
         message: `Finalize queue baseline advanced inconsistently before this job was processed (localBaselineAdvanced=${localBaselineAdvanced}, serverHeadAdvanced=${serverHeadAdvanced}, jobBaselineSnapshotId=${job.baselineSnapshotId ?? "null"}, liveBaselineSnapshotId=${baseline.lastSnapshotId ?? "null"}, jobBaselineServerHeadHash=${job.baselineServerHeadHash ?? "null"}, liveBaselineServerHeadHash=${baseline.lastServerHeadHash ?? "null"}, currentAppHeadHash=${appHead.headCommitHash}). This indicates local Remix state diverged from the backend in a way that should not be reachable in normal operation; please report this as a bug.`,
         exitCode: 1,
-        hint: "Run `remix collab status` to inspect, then `remix collab re-anchor` only if the lane has no valid baseline.",
+        hint: "Run `remix collab status` to inspect, then sync or reconcile before retrying.",
         disposition: "terminal",
         reason: "baseline_drifted"
       });
@@ -23417,6 +23531,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
   }
   let submissionDiff = diffResult.diff;
   let submissionBaseHeadHash = job.baselineServerHeadHash;
+  let submissionBaseRevisionId = job.baselineServerRevisionId;
   let replayedFromBaseHash = null;
   if (!submissionBaseHeadHash) {
     throw buildFinalizeCliError({
@@ -23427,6 +23542,34 @@ async function processClaimedPendingFinalizeJobInner(params) {
     });
   }
   const replayNeeded = appHead.headCommitHash !== submissionBaseHeadHash || baselineDrifted;
+  if (replayNeeded) {
+    const existingChangeStep = await findExistingChangeStepByIdempotency({
+      api: params.api,
+      appId: job.currentAppId,
+      idempotencyKey: job.idempotencyKey
+    });
+    if (existingChangeStep) {
+      const changeStep2 = existingChangeStep.status === "succeeded" ? existingChangeStep : await pollChangeStep(params.api, job.currentAppId, existingChangeStep.id);
+      invalidateAppHeadCache(job.currentAppId);
+      invalidateAppDeltaCacheForApp(job.currentAppId);
+      await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep: changeStep2 });
+      await updatePendingFinalizeJob(job.id, {
+        status: "completed",
+        metadata: { changeStepId: String(changeStep2.id ?? "") }
+      });
+      return {
+        mode: "changed_turn",
+        idempotencyKey: job.idempotencyKey ?? "",
+        queued: false,
+        jobId: job.id,
+        repoState,
+        changeStep: changeStep2,
+        collabTurn: null,
+        autoSync: null,
+        warnings: []
+      };
+    }
+  }
   if (replayNeeded) {
     try {
       const replayResp = await params.api.startChangeStepReplay(job.currentAppId, {
@@ -23434,7 +23577,9 @@ async function processClaimedPendingFinalizeJobInner(params) {
         assistantResponse: job.assistantResponse,
         diff: diffResult.diff,
         baseCommitHash: submissionBaseHeadHash,
+        baseRevisionId: job.baselineServerRevisionId,
         targetHeadCommitHash: appHead.headCommitHash,
+        targetRevisionId: appHead.headRevisionId,
         expectedPaths: diffResult.changedPaths,
         actor,
         workspaceMetadata: buildWorkspaceMetadata({
@@ -23444,6 +23589,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
           defaultBranch,
           baselineSnapshotId: job.baselineSnapshotId,
           currentSnapshotId: job.currentSnapshotId,
+          baselineServerRevisionId: job.baselineServerRevisionId,
           baselineServerHeadHash: job.baselineServerHeadHash,
           currentSnapshotHash: snapshot.snapshotHash,
           localCommitHash: snapshot.localCommitHash,
@@ -23469,6 +23615,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
       submissionDiff = replayDiff.diff;
       replayedFromBaseHash = submissionBaseHeadHash;
       submissionBaseHeadHash = appHead.headCommitHash;
+      submissionBaseRevisionId = appHead.headRevisionId;
     } catch (error2) {
       if (error2 instanceof RemixError && error2.finalizeDisposition === void 0) {
         const detail = error2.hint ? `${error2.message} (${error2.hint})` : error2.message;
@@ -23490,6 +23637,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
     assistantResponse: job.assistantResponse,
     diff: submissionDiff,
     baseCommitHash: submissionBaseHeadHash,
+    baseRevisionId: submissionBaseRevisionId,
     headCommitHash: submissionBaseHeadHash,
     changedFilesCount: diffResult.stats.changedFilesCount,
     insertions: diffResult.stats.insertions,
@@ -23502,6 +23650,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
       defaultBranch,
       baselineSnapshotId: job.baselineSnapshotId,
       currentSnapshotId: job.currentSnapshotId,
+      baselineServerRevisionId: job.baselineServerRevisionId,
       baselineServerHeadHash: job.baselineServerHeadHash,
       currentSnapshotHash: snapshot.snapshotHash,
       localCommitHash: snapshot.localCommitHash,
@@ -23518,27 +23667,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
   const changeStep = await pollChangeStep(params.api, job.currentAppId, String(createdStep.id));
   invalidateAppHeadCache(job.currentAppId);
   invalidateAppDeltaCacheForApp(job.currentAppId);
-  const nextServerHeadHash = typeof changeStep.headCommitHash === "string" ? changeStep.headCommitHash.trim() : "";
-  if (!nextServerHeadHash) {
-    throw buildFinalizeCliError({
-      message: "Backend returned a succeeded change step without a head commit hash.",
-      exitCode: 1,
-      hint: "This is a backend invariant violation; retry will not help. Re-anchor and try again.",
-      disposition: "terminal",
-      reason: "missing_head_commit_hash"
-    });
-  }
-  await writeLocalBaseline({
-    repoRoot: job.repoRoot,
-    repoFingerprint: job.repoFingerprint,
-    laneId: job.laneId,
-    currentAppId: job.currentAppId,
-    branchName: job.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
-    lastServerHeadHash: nextServerHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
-  });
+  await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep });
   await updatePendingFinalizeJob(job.id, {
     status: "completed",
     metadata: { changeStepId: String(changeStep.id ?? "") }
@@ -23596,9 +23725,10 @@ var FINALIZE_PREFLIGHT_FAILURE_CODES = [
   // Server has commits we don't. Fix: `remix collab sync` (safe to
   // auto-run for fast-forward; non-FF refused by the command itself).
   "pull_required",
-  // Local base hash doesn't match the recorded baseline (force-push,
-  // hard reset, rebase). Fix: `remix collab re-anchor`.
-  "re_anchor_required"
+  // Both local and server changed. Fix: inspect and apply reconcile.
+  "reconcile_required",
+  // Local revision baseline is missing. Fix: `remix collab init` or sync.
+  "baseline_missing"
 ];
 var CODE_SET = new Set(FINALIZE_PREFLIGHT_FAILURE_CODES);
 var DEFAULT_ACQUIRE_TIMEOUT_MS = 15e3;
@@ -23818,7 +23948,7 @@ async function ensureWorkspaceMatchesBaseline(params) {
   if (!baseline?.lastSnapshotHash || !baseline.lastServerHeadHash) {
     throw new RemixError("Local Remix baseline is missing for this lane.", {
       exitCode: 2,
-      hint: "Run `remix collab re-anchor` to create a fresh baseline before applying server changes."
+      hint: "Run `remix collab init` or sync from a checkout with a valid revision baseline before applying server changes."
     });
   }
   const inspection = await inspectLocalSnapshot({
@@ -23890,11 +24020,12 @@ async function collabSync(params) {
   const repoSnapshot = await captureRepoSnapshot(repoRoot, { includeWorkspaceDiffHash: true });
   const bootstrapFromLocalHead = !detected.baseline.lastSnapshotHash || !detected.baseline.lastServerHeadHash;
   let baselineServerHeadHash;
+  let baselineServerRevisionId = null;
   if (bootstrapFromLocalHead) {
     if (!headCommitHash) {
       throw new RemixError("Failed to resolve local HEAD commit for the initial sync bootstrap.", {
         exitCode: 1,
-        hint: "Retry after Git HEAD is available, or run `remix collab re-anchor` if this checkout has no local Remix baseline yet."
+        hint: "Retry after Git HEAD is available, or run `remix collab init` to seed this checkout's revision baseline."
       });
     }
     baselineServerHeadHash = headCommitHash;
@@ -23909,13 +24040,15 @@ async function collabSync(params) {
     if (!baseline.lastServerHeadHash) {
       throw new RemixError("Local Remix baseline is missing the last acknowledged server head.", {
         exitCode: 2,
-        hint: "Run `remix collab re-anchor` to create a fresh baseline before pulling server changes."
+        hint: "Run `remix collab init` or sync from a checkout with a valid revision baseline before pulling server changes."
       });
     }
     baselineServerHeadHash = baseline.lastServerHeadHash;
+    baselineServerRevisionId = baseline.lastServerRevisionId;
   }
   const deltaResp = await params.api.getAppDelta(binding.currentAppId, {
     baseHeadHash: baselineServerHeadHash,
+    baseRevisionId: baselineServerRevisionId,
     repoFingerprint: binding.repoFingerprint ?? void 0,
     remoteUrl: binding.remoteUrl ?? void 0,
     defaultBranch: binding.defaultBranch ?? void 0
@@ -23939,13 +24072,54 @@ async function collabSync(params) {
     applied: false,
     dryRun: params.dryRun
   };
-  if (params.dryRun || delta.status === "up_to_date") {
+  if (params.dryRun) {
     return previewResult;
   }
+  if (delta.status === "up_to_date") {
+    if (!bootstrapFromLocalHead) {
+      return previewResult;
+    }
+    return withRepoMutationLock(
+      {
+        cwd: repoRoot,
+        operation: "collabSync"
+      },
+      async ({ repoRoot: lockedRepoRoot, warnings }) => {
+        await assertRepoSnapshotUnchanged(lockedRepoRoot, repoSnapshot, {
+          operation: "`remix collab sync`",
+          recoveryHint: "The repository changed before the first local Remix baseline could be created. Review the local changes and rerun `remix collab sync`."
+        });
+        const snapshot = await captureLocalSnapshot({
+          repoRoot: lockedRepoRoot,
+          repoFingerprint: binding.repoFingerprint,
+          laneId: binding.laneId,
+          branchName: binding.branchName
+        });
+        await writeLocalBaseline({
+          repoRoot: lockedRepoRoot,
+          repoFingerprint: binding.repoFingerprint,
+          laneId: binding.laneId,
+          currentAppId: binding.currentAppId,
+          branchName: binding.branchName,
+          lastSnapshotId: snapshot.id,
+          lastSnapshotHash: snapshot.snapshotHash,
+          lastServerRevisionId: delta.targetRevisionId ?? null,
+          lastServerTreeHash: delta.targetTreeHash ?? null,
+          lastServerHeadHash: delta.targetHeadHash,
+          lastSeenLocalCommitHash: snapshot.localCommitHash
+        });
+        return {
+          ...previewResult,
+          localCommitHash: snapshot.localCommitHash,
+          ...warnings.length > 0 ? { warnings } : {}
+        };
+      }
+    );
+  }
   if (delta.status === "base_unknown") {
     throw new RemixError("Direct pull is unavailable because Remix can no longer diff from the last acknowledged server head.", {
       exitCode: 2,
-      hint: "Run `remix collab reconcile --dry-run` to inspect recovery options before retrying. If this checkout has no local Remix baseline yet for this lane, `remix collab re-anchor` may be required."
+      hint: "Run `remix collab reconcile --dry-run` to inspect recovery options before retrying. If this checkout has no local Remix baseline yet for this lane, run `remix collab init` to seed one."
     });
   }
   if (delta.status !== "delta_ready") {
@@ -23989,6 +24163,8 @@ async function collabSync(params) {
         branchName: binding.branchName,
         lastSnapshotId: snapshot.id,
         lastSnapshotHash: snapshot.snapshotHash,
+        lastServerRevisionId: delta.targetRevisionId ?? null,
+        lastServerTreeHash: delta.targetTreeHash ?? null,
         lastServerHeadHash: delta.targetHeadHash,
         lastSeenLocalCommitHash: snapshot.localCommitHash
       });
@@ -24274,6 +24450,8 @@ async function collabCheckout(params) {
     branchName: branchNameForBaseline,
     lastSnapshotId: snapshot.id,
     lastSnapshotHash: snapshot.snapshotHash,
+    lastServerRevisionId: appHead.headRevisionId ?? null,
+    lastServerTreeHash: appHead.treeHash ?? null,
     lastServerHeadHash: appHead.headCommitHash,
     lastSeenLocalCommitHash: snapshot.localCommitHash
   });
@@ -24631,25 +24809,21 @@ async function trySeedEquivalentBranchBaseline(params) {
     branchName: params.branchName,
     persistBlobs: false
   });
-  if (inspection.snapshotHash !== defaultBaseline.lastSnapshotHash) {
+  if (inspection.snapshotHash !== defaultBaseline.lastSnapshotHash && inspection.localCommitHash !== defaultBaseline.lastSeenLocalCommitHash) {
     return null;
   }
-  const snapshot = await captureLocalSnapshot({
-    repoRoot: params.repoRoot,
-    repoFingerprint: params.repoFingerprint,
-    laneId: params.laneId,
-    branchName: params.branchName
-  });
   await writeLocalBaseline({
     repoRoot: params.repoRoot,
     repoFingerprint: params.repoFingerprint,
     laneId: params.laneId,
     currentAppId: params.currentAppId,
     branchName: params.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
+    lastSnapshotId: defaultBaseline.lastSnapshotId,
+    lastSnapshotHash: defaultBaseline.lastSnapshotHash,
+    lastServerRevisionId: params.appHeadRevisionId,
+    lastServerTreeHash: params.appTreeHash,
     lastServerHeadHash: params.appHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
+    lastSeenLocalCommitHash: inspection.localCommitHash
   });
   return "seeded";
 }
@@ -24659,11 +24833,11 @@ async function resolveInitBaselineStatus(params) {
     laneId: params.laneId,
     repoRoot: params.repoRoot
   });
-  if (baseline?.lastSnapshotHash && baseline.lastServerHeadHash) {
+  if (baseline?.lastSnapshotHash && (baseline.lastServerRevisionId || baseline.lastServerHeadHash)) {
     return "existing";
   }
   const localHeadCommitHash = await getHeadCommitHash(params.repoRoot);
-  if (!localHeadCommitHash) return "requires_re_anchor";
+  if (!localHeadCommitHash) return "baseline_missing";
   const appHead = unwrapResponseObject(
     await params.api.getAppHead(params.currentAppId),
     "app head"
@@ -24690,6 +24864,7 @@ async function resolveInitBaselineStatus(params) {
     const deltaResp = await params.api.getAppDelta(params.currentAppId, {
       baseHeadHash: localHeadCommitHash,
       targetHeadHash: appHead.headCommitHash,
+      targetRevisionId: appHead.headRevisionId,
       localSnapshotHash,
       repoFingerprint: params.repoFingerprint,
       remoteUrl: params.remoteUrl ?? void 0,
@@ -24697,6 +24872,21 @@ async function resolveInitBaselineStatus(params) {
     });
     const delta = unwrapResponseObject(deltaResp, "app delta");
     if (delta.status === "up_to_date" || delta.status === "delta_ready") {
+      const equivalentBaseline = await trySeedEquivalentBranchBaseline({
+        repoRoot: params.repoRoot,
+        repoFingerprint: params.repoFingerprint,
+        laneId: params.laneId,
+        currentAppId: params.currentAppId,
+        upstreamAppId: params.upstreamAppId ?? null,
+        branchName: params.branchName,
+        defaultBranch: params.defaultBranch,
+        appHeadHash: appHead.headCommitHash,
+        appHeadRevisionId: appHead.headRevisionId ?? null,
+        appTreeHash: appHead.treeHash ?? null
+      });
+      if (equivalentBaseline) {
+        return equivalentBaseline;
+      }
       return "requires_sync";
     }
     if (delta.status === "content_equivalent") {
@@ -24719,7 +24909,9 @@ async function resolveInitBaselineStatus(params) {
         upstreamAppId: params.upstreamAppId ?? null,
         branchName: params.branchName,
         defaultBranch: params.defaultBranch,
-        appHeadHash: appHead.headCommitHash
+        appHeadHash: appHead.headCommitHash,
+        appHeadRevisionId: appHead.headRevisionId ?? null,
+        appTreeHash: appHead.treeHash ?? null
       });
       if (equivalentBaseline) {
         return equivalentBaseline;
@@ -24727,7 +24919,7 @@ async function resolveInitBaselineStatus(params) {
     }
   } catch {
   }
-  return "requires_re_anchor";
+  return "baseline_missing";
 }
 async function seedImportedInitBaseline(params) {
   const appHead = unwrapResponseObject(
@@ -24748,6 +24940,8 @@ async function seedImportedInitBaseline(params) {
     branchName: params.branchName,
     lastSnapshotId: snapshot.id,
     lastSnapshotHash: snapshot.snapshotHash,
+    lastServerRevisionId: appHead.headRevisionId ?? null,
+    lastServerTreeHash: appHead.treeHash ?? null,
     lastServerHeadHash: appHead.headCommitHash,
     lastSeenLocalCommitHash: snapshot.localCommitHash
   });
@@ -24761,7 +24955,6 @@ async function collabInit(params) {
     },
     async ({ repoRoot, warnings }) => {
       await ensureGitInfoExcludeEntries(repoRoot, [".remix/"]);
-      await ensureCleanWorktree(repoRoot, "`remix collab init`");
       if (params.path?.trim()) {
         throw new RemixError("`remix collab init --path` is not supported.", {
           exitCode: 2,
@@ -24769,6 +24962,10 @@ async function collabInit(params) {
         });
       }
       const localBindingState = await readCollabBindingState(repoRoot, { persist: true });
+      const hasExistingBinding = localBindingState != null && Object.keys(localBindingState.branchBindings ?? {}).length > 0;
+      if (params.forceNew || !hasExistingBinding) {
+        await ensureCleanWorktree(repoRoot, "`remix collab init`");
+      }
       const persistedRemoteUrl = normalizeGitRemote(localBindingState?.remoteUrl ?? null);
       const currentBranch = await getCurrentBranch(repoRoot);
       const defaultBranch = localBindingState?.defaultBranch ?? await getDefaultBranch(repoRoot) ?? currentBranch;
@@ -25620,248 +25817,6 @@ function hasPendingFinalize(summary) {
 function buildPendingFinalizeHint() {
   return "Drain or await the local finalize queue first, then retry after the queued Remix turn finishes recording remotely.";
 }
-async function collabReAnchor(params) {
-  const repoRoot = await findGitRoot(params.cwd);
-  const binding = await ensureActiveLaneBinding({
-    repoRoot,
-    api: params.api,
-    operation: "`remix collab re-anchor`"
-  });
-  if (!binding) {
-    throw new RemixError("Repository is not bound to Remix.", {
-      exitCode: 2,
-      hint: "Run `remix collab init` first."
-    });
-  }
-  const detected = await collabDetectRepoState({
-    api: params.api,
-    cwd: repoRoot,
-    allowBranchMismatch: params.allowBranchMismatch
-  });
-  if (detected.status === "metadata_conflict" || detected.status === "branch_mismatch") {
-    throw new RemixError("Repository must be realigned before seeding a fresh local Remix baseline.", {
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  if (detected.status !== "ready" || !detected.binding) {
-    throw new RemixError(detected.hint || "Repository is not ready for re-anchor.", {
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  if (detected.repoState === "server_only_changed") {
-    throw new RemixError("This checkout is already on a server-known base and only needs a local pull.", {
-      exitCode: 2,
-      hint: "Run `remix collab sync` instead of `remix collab re-anchor`."
-    });
-  }
-  if (detected.repoState === "both_changed") {
-    throw new RemixError("Both the local workspace and the server lane changed since the last agreed baseline.", {
-      exitCode: 2,
-      hint: "Run `remix collab reconcile` to replay the local boundary onto the newer server head."
-    });
-  }
-  if (detected.repoState === "local_only_changed") {
-    if (hasPendingFinalize(detected.pendingFinalize)) {
-      throw new RemixError("Re-anchor is not needed while queued Remix turn recording is still processing.", {
-        exitCode: 2,
-        hint: buildPendingFinalizeHint()
-      });
-    }
-    throw new RemixError("Re-anchor is not the right command for local content changes.", {
-      exitCode: 2,
-      hint: "Remix is source-blind: any local content change since the last recorded turn \u2014 including manual commits, pulls, merges, and rebases \u2014 is recorded with `remix collab finalize-turn`. Use `remix collab re-anchor` only when no local Remix baseline exists yet for this lane (status reports `re_anchor`)."
-    });
-  }
-  if (detected.repoState === "idle") {
-    throw new RemixError("This checkout is already aligned with Remix.", {
-      exitCode: 2,
-      hint: "No re-anchor step is needed. Re-anchor only applies when no local Remix baseline exists yet for this lane."
-    });
-  }
-  await ensureCleanWorktree(repoRoot, "`remix collab re-anchor`");
-  const branch = await requireCurrentBranch(repoRoot);
-  const headCommitHash = await getHeadCommitHash(repoRoot);
-  if (!headCommitHash) {
-    throw new RemixError("Failed to resolve local HEAD commit.", { exitCode: 1 });
-  }
-  if (params.asyncSubmit && !params.dryRun) {
-    const pending = await findPendingAsyncJob({
-      repoRoot,
-      branchName: binding.branchName ?? branch,
-      kind: "re_anchor"
-    });
-    if (pending) {
-      return {
-        status: "queued",
-        queued: true,
-        jobId: pending.id,
-        repoRoot,
-        branch,
-        currentAppId: binding.currentAppId,
-        dryRun: false,
-        applied: false
-      };
-    }
-  }
-  const preflightResp = await params.api.preflightAppReconcile(binding.currentAppId, {
-    localHeadCommitHash: headCommitHash,
-    repoFingerprint: binding.repoFingerprint ?? void 0,
-    remoteUrl: binding.remoteUrl ?? void 0,
-    defaultBranch: binding.defaultBranch ?? void 0
-  });
-  const preflight = unwrapResponseObject(preflightResp, "reconcile preflight");
-  if (preflight.status === "metadata_conflict") {
-    throw new RemixError("Local repository metadata conflicts with the bound Remix app.", {
-      exitCode: 2,
-      hint: preflight.warnings.join("\n") || "Run the command from the correct bound repository."
-    });
-  }
-  const preview = {
-    status: preflight.status === "up_to_date" ? "reanchored" : "re_anchor_required",
-    repoRoot,
-    branch,
-    currentAppId: binding.currentAppId,
-    localHeadCommitHash: headCommitHash,
-    targetHeadCommitHash: preflight.targetHeadCommitHash,
-    targetHeadCommitId: preflight.targetHeadCommitId,
-    warnings: preflight.warnings,
-    applied: false,
-    dryRun: params.dryRun === true
-  };
-  if (params.dryRun) {
-    return preview;
-  }
-  let anchoredServerHeadHash = preflight.targetHeadCommitHash;
-  if (params.asyncSubmit && preflight.status === "ready_to_reconcile") {
-    const failed = await findFailedAsyncJob({
-      repoRoot,
-      branchName: binding.branchName ?? branch,
-      kind: "re_anchor"
-    });
-    if (failed) {
-      await deleteAsyncJob(failed.id);
-    }
-    const { bundlePath: tmpBundlePath, headCommitHash: bundledHeadCommitHash } = await createGitBundle(
-      repoRoot,
-      "re-anchor.bundle"
-    );
-    const tmpBundleDir = import_path12.default.dirname(tmpBundlePath);
-    try {
-      const jobId = (0, import_crypto9.randomUUID)();
-      const durableBundlePath = getAsyncJobBundlePath(jobId);
-      await import_promises23.default.mkdir(getAsyncJobDir(jobId), { recursive: true });
-      try {
-        await import_promises23.default.rename(tmpBundlePath, durableBundlePath);
-      } catch (error2) {
-        if (error2?.code !== "EXDEV") throw error2;
-        await import_promises23.default.copyFile(tmpBundlePath, durableBundlePath);
-        await import_promises23.default.unlink(tmpBundlePath).catch(() => void 0);
-      }
-      const bundleSha = await sha256FileHex(durableBundlePath);
-      const job = await enqueueAsyncJob({
-        id: jobId,
-        kind: "re_anchor",
-        status: "queued",
-        repoRoot,
-        repoFingerprint: binding.repoFingerprint,
-        branchName: binding.branchName ?? branch,
-        laneId: binding.laneId,
-        retryCount: 0,
-        error: null,
-        idempotencyKey: null,
-        payload: {
-          bundlePath: durableBundlePath,
-          bundleSha256: bundleSha,
-          localHeadCommitHash: bundledHeadCommitHash,
-          targetHeadCommitHash: preflight.targetHeadCommitHash,
-          appId: binding.currentAppId
-        }
-      });
-      await logDrainerEvent(job.id, "submitted", { kind: "re_anchor" });
-      return {
-        status: "queued",
-        queued: true,
-        jobId: job.id,
-        repoRoot,
-        branch,
-        currentAppId: binding.currentAppId,
-        localHeadCommitHash: bundledHeadCommitHash,
-        targetHeadCommitHash: preflight.targetHeadCommitHash,
-        warnings: preflight.warnings,
-        dryRun: false,
-        applied: false
-      };
-    } finally {
-      await import_promises23.default.rm(tmpBundleDir, { recursive: true, force: true }).catch(() => void 0);
-    }
-  }
-  if (preflight.status === "ready_to_reconcile") {
-    const { bundlePath, headCommitHash: bundledHeadCommitHash } = await createGitBundle(repoRoot, "re-anchor.bundle");
-    const bundleTempDir = import_path12.default.dirname(bundlePath);
-    try {
-      const bundleStat = await import_promises23.default.stat(bundlePath);
-      const checksumSha256 = await sha256FileHex(bundlePath);
-      const presignResp = await params.api.presignImportUploadFirstParty({
-        file: {
-          name: import_path12.default.basename(bundlePath),
-          mimeType: "application/x-git-bundle",
-          size: bundleStat.size,
-          checksumSha256
-        }
-      });
-      const uploadTarget = unwrapResponseObject(presignResp, "import upload target");
-      await uploadPresigned({
-        uploadUrl: String(uploadTarget.uploadUrl),
-        filePath: bundlePath,
-        headers: uploadTarget.headers ?? {}
-      });
-      const startResp = await params.api.startAppReconcile(binding.currentAppId, {
-        uploadId: String(uploadTarget.uploadId),
-        localHeadCommitHash: bundledHeadCommitHash,
-        repoFingerprint: binding.repoFingerprint ?? void 0,
-        remoteUrl: binding.remoteUrl ?? void 0,
-        defaultBranch: binding.defaultBranch ?? void 0,
-        idempotencyKey: buildDeterministicIdempotencyKey({
-          kind: "collab_re_anchor_v1",
-          appId: binding.currentAppId,
-          localHeadCommitHash: bundledHeadCommitHash,
-          targetHeadCommitHash: preflight.targetHeadCommitHash
-        })
-      });
-      const started = unwrapResponseObject(startResp, "reconcile");
-      const reconcile2 = await pollReconcile(params.api, binding.currentAppId, started.id);
-      anchoredServerHeadHash = reconcile2.reconciledHeadCommitHash ?? reconcile2.targetHeadCommitHash ?? preflight.targetHeadCommitHash;
-    } finally {
-      await import_promises23.default.rm(bundleTempDir, { recursive: true, force: true });
-    }
-  }
-  const snapshot = await captureLocalSnapshot({
-    repoRoot,
-    repoFingerprint: binding.repoFingerprint,
-    laneId: binding.laneId,
-    branchName: binding.branchName
-  });
-  await writeLocalBaseline({
-    repoRoot,
-    repoFingerprint: binding.repoFingerprint,
-    laneId: binding.laneId,
-    currentAppId: binding.currentAppId,
-    branchName: binding.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
-    lastServerHeadHash: anchoredServerHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
-  });
-  return {
-    ...preview,
-    status: "reanchored",
-    targetHeadCommitHash: anchoredServerHeadHash,
-    applied: true,
-    dryRun: false
-  };
-}
 async function reconcileBothChanged(params) {
   const repoRoot = await findGitRoot(params.cwd);
   const binding = await ensureActiveLaneBinding({
@@ -25884,7 +25839,7 @@ async function reconcileBothChanged(params) {
   if (!baseline?.lastSnapshotId || !baseline.lastServerHeadHash) {
     throw new RemixError("Local Remix baseline is missing for this lane.", {
       exitCode: 2,
-      hint: "Run `remix collab re-anchor` to create a fresh baseline first."
+      hint: "Run `remix collab init` or sync from a checkout with a valid revision baseline first."
     });
   }
   const currentSnapshot = await captureLocalSnapshot({
@@ -25907,6 +25862,7 @@ async function reconcileBothChanged(params) {
     params.api.getAppHead(binding.currentAppId),
     params.api.getAppDelta(binding.currentAppId, {
       baseHeadHash: baseline.lastServerHeadHash,
+      baseRevisionId: baseline.lastServerRevisionId,
       repoFingerprint: binding.repoFingerprint ?? void 0,
       remoteUrl: binding.remoteUrl ?? void 0,
       defaultBranch: binding.defaultBranch ?? void 0
@@ -25924,7 +25880,7 @@ async function reconcileBothChanged(params) {
   if (delta.status === "base_unknown") {
     throw new RemixError("Reconcile cannot pull the newer server state from the last acknowledged baseline.", {
       exitCode: 2,
-      hint: "Run `remix collab re-anchor` to re-anchor this checkout before retrying."
+      hint: "Run `remix collab init` to seed a fresh revision baseline for this checkout before retrying."
     });
   }
   if (delta.status !== "delta_ready" && delta.status !== "up_to_date") {
@@ -25955,7 +25911,9 @@ async function reconcileBothChanged(params) {
     assistantResponse: "Replay the local boundary delta onto the latest server head without recording a new change step.",
     diff: diffResult.diff,
     baseCommitHash: baseline.lastServerHeadHash,
+    baseRevisionId: baseline.lastServerRevisionId,
     targetHeadCommitHash: appHead.headCommitHash,
+    targetRevisionId: appHead.headRevisionId,
     expectedPaths: diffResult.changedPaths,
     workspaceMetadata: {
       recordingMode: "boundary_delta",
@@ -25963,6 +25921,7 @@ async function reconcileBothChanged(params) {
       branch,
       baselineSnapshotId: baseline.lastSnapshotId,
       currentSnapshotId: currentSnapshot.id,
+      baselineServerRevisionId: baseline.lastServerRevisionId,
       baselineServerHeadHash: baseline.lastServerHeadHash,
       currentSnapshotHash: currentSnapshot.snapshotHash,
       localCommitHash: currentSnapshot.localCommitHash,
@@ -25981,12 +25940,12 @@ async function reconcileBothChanged(params) {
   const replay = await pollChangeStepReplay(params.api, binding.currentAppId, String(replayStart.id));
   const replayDiffResp = await params.api.getChangeStepReplayDiff(binding.currentAppId, replay.id);
   const replayDiff = unwrapResponseObject(replayDiffResp, "change step replay diff");
-  const tempRoot = await import_promises24.default.mkdtemp(import_path13.default.join(import_os6.default.tmpdir(), "remix-reconcile-"));
+  const tempRoot = await import_promises23.default.mkdtemp(import_path12.default.join(import_os6.default.tmpdir(), "remix-reconcile-"));
   let serverHeadSnapshot = null;
   let mergedSnapshot = null;
   try {
-    const tempRepoRoot = import_path13.default.join(tempRoot, "repo");
-    await import_promises24.default.mkdir(tempRepoRoot, { recursive: true });
+    const tempRepoRoot = import_path12.default.join(tempRoot, "repo");
+    await import_promises23.default.mkdir(tempRepoRoot, { recursive: true });
     await execa("git", ["init"], { cwd: tempRepoRoot, stderr: "ignore" });
     await materializeLocalSnapshot(baseline.lastSnapshotId, tempRepoRoot);
     if (delta.status === "delta_ready" && delta.diff.trim()) {
@@ -26008,7 +25967,7 @@ async function reconcileBothChanged(params) {
       branchName: binding.branchName
     });
   } finally {
-    await import_promises24.default.rm(tempRoot, { recursive: true, force: true }).catch(() => void 0);
+    await import_promises23.default.rm(tempRoot, { recursive: true, force: true }).catch(() => void 0);
   }
   if (!serverHeadSnapshot || !mergedSnapshot) {
     throw new RemixError("Failed to materialize the reconciled local workspace.", { exitCode: 1 });
@@ -26045,6 +26004,8 @@ async function reconcileBothChanged(params) {
         branchName: binding.branchName,
         lastSnapshotId: serverHeadSnapshot.id,
         lastSnapshotHash: serverHeadSnapshot.snapshotHash,
+        lastServerRevisionId: appHead.headRevisionId ?? null,
+        lastServerTreeHash: appHead.treeHash ?? null,
         lastServerHeadHash: appHead.headCommitHash,
         lastSeenLocalCommitHash: restoredSnapshot.localCommitHash
       });
@@ -26080,7 +26041,10 @@ async function collabReconcile(params) {
     return reconcileBothChanged(params);
   }
   if (detected.repoState === "external_local_base_changed") {
-    return collabReAnchor(params);
+    throw new RemixError("This checkout needs a local Remix revision baseline before reconciliation.", {
+      exitCode: 2,
+      hint: detected.hint || "Run `remix collab init` or `remix collab sync` to seed the baseline."
+    });
   }
   if (detected.repoState === "local_only_changed") {
     if (hasPendingFinalize(detected.pendingFinalize)) {
@@ -26187,6 +26151,8 @@ async function collabRemix(params) {
     branchName: branchNameForBaseline,
     lastSnapshotId: snapshot.id,
     lastSnapshotHash: snapshot.snapshotHash,
+    lastServerRevisionId: appHead.headRevisionId ?? null,
+    lastServerTreeHash: appHead.treeHash ?? null,
     lastServerHeadHash: appHead.headCommitHash,
     lastSeenLocalCommitHash: snapshot.localCommitHash
   });
@@ -26307,11 +26273,15 @@ function createBaseStatus() {
       baseline: {
         lastSnapshotId: null,
         lastSnapshotHash: null,
+        lastServerRevisionId: null,
+        lastServerTreeHash: null,
         lastServerHeadHash: null,
         lastSeenLocalCommitHash: null
       },
       current: {
         snapshotHash: null,
+        serverRevisionId: null,
+        serverTreeHash: null,
         serverHeadHash: null,
         serverHeadCommitId: null,
         localCommitHash: null
@@ -26398,6 +26368,8 @@ async function collabStatus(params) {
   status.alignment.baseline = detected.baseline;
   status.alignment.current = {
     snapshotHash: detected.currentSnapshotHash,
+    serverRevisionId: detected.currentServerRevisionId,
+    serverTreeHash: detected.currentServerTreeHash,
     serverHeadHash: detected.currentServerHeadHash,
     serverHeadCommitId: detected.currentServerHeadCommitId,
     localCommitHash: detected.localCommitHash
@@ -26461,7 +26433,7 @@ async function collabStatus(params) {
     status.reconcile.canApply = !status.repo.branchMismatch;
     status.recommendedAction = "reconcile";
   } else if (detected.repoState === "external_local_base_changed") {
-    status.recommendedAction = "re_anchor";
+    status.recommendedAction = "init";
     addBlockedReason(status.sync, "baseline_missing");
     addBlockedReason(status.reconcile, "baseline_missing");
   } else if (detected.repoState === "local_only_changed") {
@@ -26714,10 +26686,10 @@ async function processInitJob(job, api) {
   try {
     await updateAsyncJob(job.id, { status: "submitting", error: null });
     await logDrainerEvent(job.id, "claimed", { kind: "init" });
-    const bundleStat = await import_promises25.default.stat(job.payload.bundlePath);
+    const bundleStat = await import_promises24.default.stat(job.payload.bundlePath);
     const presignResp = await api.presignImportUploadFirstParty({
       file: {
-        name: import_path14.default.basename(job.payload.bundlePath),
+        name: import_path13.default.basename(job.payload.bundlePath),
         mimeType: "application/x-git-bundle",
         size: bundleStat.size,
         checksumSha256: job.payload.bundleSha256
@@ -26734,7 +26706,7 @@ async function processInitJob(job, api) {
     await updateAsyncJob(job.id, { status: "server_processing" });
     const importResp = await api.importFromUploadFirstParty({
       uploadId: String(presign.uploadId),
-      appName: job.payload.appName?.trim() || import_path14.default.basename(job.repoRoot),
+      appName: job.payload.appName?.trim() || import_path13.default.basename(job.repoRoot),
       platform: "generic",
       isPublic: false,
       branch: job.payload.defaultBranch && job.branchName && job.branchName !== job.payload.defaultBranch ? job.payload.defaultBranch : job.branchName ?? void 0,
@@ -26928,7 +26900,7 @@ async function processInitPostJob(job, api) {
     if (outcome.status === "failed") {
       const bindingPath = getCollabBindingPath(job.repoRoot);
       try {
-        await import_promises25.default.unlink(bindingPath);
+        await import_promises24.default.unlink(bindingPath);
         await logDrainerEvent(job.id, "binding_cleared", {
           kind: "init_post",
           appId: job.payload.appId,
@@ -26969,10 +26941,10 @@ async function processReAnchorJob(job, api) {
     }
     let anchoredServerHeadHash = preflight.targetHeadCommitHash;
     if (preflight.status === "ready_to_reconcile") {
-      const bundleStat = await import_promises25.default.stat(job.payload.bundlePath);
+      const bundleStat = await import_promises24.default.stat(job.payload.bundlePath);
       const presignResp = await api.presignImportUploadFirstParty({
         file: {
-          name: import_path14.default.basename(job.payload.bundlePath),
+          name: import_path13.default.basename(job.payload.bundlePath),
           mimeType: "application/x-git-bundle",
           size: bundleStat.size,
           checksumSha256: job.payload.bundleSha256
@@ -27076,9 +27048,9 @@ async function collabReAnchorProcess(jobId, opts) {
 }
 async function acquireDrainerPidLock() {
   const pidPath = getDrainerPidPath();
-  await import_promises25.default.mkdir(import_path14.default.dirname(pidPath), { recursive: true });
+  await import_promises24.default.mkdir(import_path13.default.dirname(pidPath), { recursive: true });
   try {
-    const existing = await import_promises25.default.readFile(pidPath, "utf8").catch(() => "");
+    const existing = await import_promises24.default.readFile(pidPath, "utf8").catch(() => "");
     const existingPid = parseInt(existing.trim(), 10);
     if (Number.isFinite(existingPid) && existingPid > 0 && existingPid !== process.pid) {
       try {
@@ -27088,13 +27060,13 @@ async function acquireDrainerPidLock() {
         if (error2?.code !== "ESRCH") return null;
       }
     }
-    await import_promises25.default.writeFile(pidPath, String(process.pid), "utf8");
+    await import_promises24.default.writeFile(pidPath, String(process.pid), "utf8");
     return {
       release: async () => {
         try {
-          const current = (await import_promises25.default.readFile(pidPath, "utf8")).trim();
+          const current = (await import_promises24.default.readFile(pidPath, "utf8")).trim();
           if (current === String(process.pid)) {
-            await import_promises25.default.unlink(pidPath).catch(() => void 0);
+            await import_promises24.default.unlink(pidPath).catch(() => void 0);
           }
         } catch {
         }
@@ -27609,8 +27581,8 @@ function getErrorMap() {
 
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path17, errorMaps, issueData } = params;
-  const fullPath = [...path17, ...issueData.path || []];
+  const { data, path: path16, errorMaps, issueData } = params;
+  const fullPath = [...path16, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -27726,11 +27698,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path17, key) {
+  constructor(parent, value, path16, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path17;
+    this._path = path16;
     this._key = key;
   }
   get path() {
@@ -35222,7 +35194,7 @@ var EMPTY_COMPLETION_RESULT = {
   }
 };
 
-// node_modules/@remixhq/core/dist/chunk-US5SM7ZC.js
+// node_modules/@remixhq/core/dist/chunk-C2FOZ3O7.js
 async function readJsonSafe(res) {
   const ct = res.headers.get("content-type") ?? "";
   if (!ct.toLowerCase().includes("application/json")) return null;
@@ -35235,8 +35207,13 @@ async function readJsonSafe(res) {
 function createApiClient(config2, opts) {
   const apiKey = (opts?.apiKey ?? "").trim();
   const tokenProvider = opts?.tokenProvider;
+  const defaultTimeoutMs = typeof opts?.defaultRequestTimeoutMs === "number" && opts.defaultRequestTimeoutMs > 0 ? opts.defaultRequestTimeoutMs : null;
   const CLIENT_KEY_HEADER = "x-comerge-api-key";
-  async function request(path17, init) {
+  function makeTimeoutSignal(timeoutMs) {
+    const ms = typeof timeoutMs === "number" && timeoutMs > 0 ? timeoutMs : defaultTimeoutMs;
+    return ms != null ? AbortSignal.timeout(ms) : void 0;
+  }
+  async function request(path16, init, opts2) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -35244,9 +35221,10 @@ function createApiClient(config2, opts) {
       });
     }
     const auth = await tokenProvider();
-    const url = new URL(path17, config2.apiUrl).toString();
+    const url = new URL(path16, config2.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
+      signal: makeTimeoutSignal(opts2?.timeoutMs),
       headers: {
         Accept: "application/json",
         "Content-Type": "application/json",
@@ -35263,12 +35241,16 @@ function createApiClient(config2, opts) {
     if (!res.ok) {
       const body = await readJsonSafe(res);
       const msg = (body && typeof body === "object" && body && "message" in body && typeof body.message === "string" ? body.message : null) ?? `Request failed (status ${res.status})`;
-      throw new RemixError(msg, { exitCode: 1, hint: body ? JSON.stringify(body, null, 2) : null });
+      throw new RemixError(msg, {
+        exitCode: 1,
+        hint: body ? JSON.stringify(body, null, 2) : null,
+        statusCode: res.status
+      });
     }
     const json = await readJsonSafe(res);
     return json ?? null;
   }
-  async function requestBinary(path17, init) {
+  async function requestBinary(path16, init, opts2) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -35276,9 +35258,10 @@ function createApiClient(config2, opts) {
       });
     }
     const auth = await tokenProvider();
-    const url = new URL(path17, config2.apiUrl).toString();
+    const url = new URL(path16, config2.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
+      signal: makeTimeoutSignal(opts2?.timeoutMs),
       headers: {
         Accept: "*/*",
         ...init?.headers ?? {},
@@ -35294,7 +35277,11 @@ function createApiClient(config2, opts) {
     if (!res.ok) {
       const body = await readJsonSafe(res);
       const msg = (body && typeof body === "object" && body && "message" in body && typeof body.message === "string" ? body.message : null) ?? `Request failed (status ${res.status})`;
-      throw new RemixError(msg, { exitCode: 1, hint: body ? JSON.stringify(body, null, 2) : null });
+      throw new RemixError(msg, {
+        exitCode: 1,
+        hint: body ? JSON.stringify(body, null, 2) : null,
+        statusCode: res.status
+      });
     }
     const contentDisposition = res.headers.get("content-disposition") ?? "";
     const fileNameMatch = contentDisposition.match(/filename=\"([^\"]+)\"/i);
@@ -35401,6 +35388,14 @@ function createApiClient(config2, opts) {
       method: "POST",
       body: JSON.stringify(payload)
     }),
+    listChangeSteps: (appId, params) => {
+      const qs = new URLSearchParams();
+      if (params?.limit !== void 0) qs.set("limit", String(params.limit));
+      if (params?.offset !== void 0) qs.set("offset", String(params.offset));
+      if (params?.idempotencyKey) qs.set("idempotencyKey", params.idempotencyKey);
+      const suffix = qs.toString() ? `?${qs.toString()}` : "";
+      return request(`/v1/apps/${encodeURIComponent(appId)}/change-steps${suffix}`, { method: "GET" });
+    },
     createCollabTurn: (appId, payload) => request(`/v1/apps/${encodeURIComponent(appId)}/collab-turns`, {
       method: "POST",
       body: JSON.stringify(payload)
@@ -35648,10 +35643,10 @@ function createApiClient(config2, opts) {
   };
 }
 
-// node_modules/@remixhq/core/dist/chunk-P6JHXOV4.js
-var import_promises26 = __toESM(require("fs/promises"), 1);
+// node_modules/@remixhq/core/dist/chunk-XETDXVGM.js
+var import_promises25 = __toESM(require("fs/promises"), 1);
 var import_os7 = __toESM(require("os"), 1);
-var import_path15 = __toESM(require("path"), 1);
+var import_path14 = __toESM(require("path"), 1);
 
 // node_modules/tslib/tslib.es6.mjs
 function __rest(s, e) {
@@ -44754,8 +44749,8 @@ var IcebergError = class extends Error {
     return this.status === 419;
   }
 };
-function buildUrl(baseUrl, path17, query) {
-  const url = new URL(path17, baseUrl);
+function buildUrl(baseUrl, path16, query) {
+  const url = new URL(path16, baseUrl);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       if (value !== void 0) {
@@ -44785,12 +44780,12 @@ function createFetchClient(options) {
   return {
     async request({
       method,
-      path: path17,
+      path: path16,
       query,
       body,
       headers
     }) {
-      const url = buildUrl(options.baseUrl, path17, query);
+      const url = buildUrl(options.baseUrl, path16, query);
       const authHeaders = await buildAuthHeaders(options.auth);
       const res = await fetchFn(url, {
         method,
@@ -45628,7 +45623,7 @@ var StorageFileApi = class extends BaseApiClient {
   * @param path The relative file path. Should be of the format `folder/subfolder/filename.png`. The bucket must already exist before attempting to upload.
   * @param fileBody The body of the file to be stored in the bucket.
   */
-  async uploadOrUpdate(method, path17, fileBody, fileOptions) {
+  async uploadOrUpdate(method, path16, fileBody, fileOptions) {
     var _this = this;
     return _this.handleOperation(async () => {
       let body;
@@ -45652,7 +45647,7 @@ var StorageFileApi = class extends BaseApiClient {
         if ((typeof ReadableStream !== "undefined" && body instanceof ReadableStream || body && typeof body === "object" && "pipe" in body && typeof body.pipe === "function") && !options.duplex) options.duplex = "half";
       }
       if (fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.headers) for (const [key, value] of Object.entries(fileOptions.headers)) headers = setHeader(headers, key, value);
-      const cleanPath = _this._removeEmptyFolders(path17);
+      const cleanPath = _this._removeEmptyFolders(path16);
       const _path = _this._getFinalPath(cleanPath);
       const data = await (method == "PUT" ? put : post)(_this.fetch, `${_this.url}/object/${_path}`, body, _objectSpread22({ headers }, (options === null || options === void 0 ? void 0 : options.duplex) ? { duplex: options.duplex } : {}));
       return {
@@ -45713,8 +45708,8 @@ var StorageFileApi = class extends BaseApiClient {
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   * - For React Native, using either `Blob`, `File` or `FormData` does not work as intended. Upload file using `ArrayBuffer` from base64 file data instead, see example below.
   */
-  async upload(path17, fileBody, fileOptions) {
-    return this.uploadOrUpdate("POST", path17, fileBody, fileOptions);
+  async upload(path16, fileBody, fileOptions) {
+    return this.uploadOrUpdate("POST", path16, fileBody, fileOptions);
   }
   /**
   * Upload a file with a token generated from `createSignedUploadUrl`.
@@ -45753,9 +45748,9 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: none
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async uploadToSignedUrl(path17, token, fileBody, fileOptions) {
+  async uploadToSignedUrl(path16, token, fileBody, fileOptions) {
     var _this3 = this;
-    const cleanPath = _this3._removeEmptyFolders(path17);
+    const cleanPath = _this3._removeEmptyFolders(path16);
     const _path = _this3._getFinalPath(cleanPath);
     const url = new URL(_this3.url + `/object/upload/sign/${_path}`);
     url.searchParams.set("token", token);
@@ -45817,10 +45812,10 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `insert`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async createSignedUploadUrl(path17, options) {
+  async createSignedUploadUrl(path16, options) {
     var _this4 = this;
     return _this4.handleOperation(async () => {
-      let _path = _this4._getFinalPath(path17);
+      let _path = _this4._getFinalPath(path16);
       const headers = _objectSpread22({}, _this4.headers);
       if (options === null || options === void 0 ? void 0 : options.upsert) headers["x-upsert"] = "true";
       const data = await post(_this4.fetch, `${_this4.url}/object/upload/sign/${_path}`, {}, { headers });
@@ -45829,7 +45824,7 @@ var StorageFileApi = class extends BaseApiClient {
       if (!token) throw new StorageError("No token returned by API");
       return {
         signedUrl: url.toString(),
-        path: path17,
+        path: path16,
         token
       };
     });
@@ -45885,8 +45880,8 @@ var StorageFileApi = class extends BaseApiClient {
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   * - For React Native, using either `Blob`, `File` or `FormData` does not work as intended. Update file using `ArrayBuffer` from base64 file data instead, see example below.
   */
-  async update(path17, fileBody, fileOptions) {
-    return this.uploadOrUpdate("PUT", path17, fileBody, fileOptions);
+  async update(path16, fileBody, fileOptions) {
+    return this.uploadOrUpdate("PUT", path16, fileBody, fileOptions);
   }
   /**
   * Moves an existing file to a new path in the same bucket.
@@ -46034,10 +46029,10 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `select`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async createSignedUrl(path17, expiresIn, options) {
+  async createSignedUrl(path16, expiresIn, options) {
     var _this8 = this;
     return _this8.handleOperation(async () => {
-      let _path = _this8._getFinalPath(path17);
+      let _path = _this8._getFinalPath(path16);
       const hasTransform = typeof (options === null || options === void 0 ? void 0 : options.transform) === "object" && options.transform !== null && Object.keys(options.transform).length > 0;
       let data = await post(_this8.fetch, `${_this8.url}/object/sign/${_path}`, _objectSpread22({ expiresIn }, hasTransform ? { transform: options.transform } : {}), { headers: _this8.headers });
       const query = new URLSearchParams();
@@ -46171,13 +46166,13 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `select`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  download(path17, options, parameters) {
+  download(path16, options, parameters) {
     const renderPath = typeof (options === null || options === void 0 ? void 0 : options.transform) === "object" && options.transform !== null && Object.keys(options.transform).length > 0 ? "render/image/authenticated" : "object";
     const query = new URLSearchParams();
     if (options === null || options === void 0 ? void 0 : options.transform) this.applyTransformOptsToQuery(query, options.transform);
     if ((options === null || options === void 0 ? void 0 : options.cacheNonce) != null) query.set("cacheNonce", String(options.cacheNonce));
     const queryString = query.toString();
-    const _path = this._getFinalPath(path17);
+    const _path = this._getFinalPath(path16);
     const downloadFn = () => get(this.fetch, `${this.url}/${renderPath}/${_path}${queryString ? `?${queryString}` : ""}`, {
       headers: this.headers,
       noResolveJson: true
@@ -46207,9 +46202,9 @@ var StorageFileApi = class extends BaseApiClient {
   * }
   * ```
   */
-  async info(path17) {
+  async info(path16) {
     var _this10 = this;
-    const _path = _this10._getFinalPath(path17);
+    const _path = _this10._getFinalPath(path16);
     return _this10.handleOperation(async () => {
       return recursiveToCamel(await get(_this10.fetch, `${_this10.url}/object/info/${_path}`, { headers: _this10.headers }));
     });
@@ -46229,9 +46224,9 @@ var StorageFileApi = class extends BaseApiClient {
   *   .exists('folder/avatar1.png')
   * ```
   */
-  async exists(path17) {
+  async exists(path16) {
     var _this11 = this;
-    const _path = _this11._getFinalPath(path17);
+    const _path = _this11._getFinalPath(path16);
     try {
       await head(_this11.fetch, `${_this11.url}/object/${_path}`, { headers: _this11.headers });
       return {
@@ -46309,8 +46304,8 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: none
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  getPublicUrl(path17, options) {
-    const _path = this._getFinalPath(path17);
+  getPublicUrl(path16, options) {
+    const _path = this._getFinalPath(path16);
     const query = new URLSearchParams();
     if (options === null || options === void 0 ? void 0 : options.download) query.set("download", options.download === true ? "" : options.download);
     if (options === null || options === void 0 ? void 0 : options.transform) this.applyTransformOptsToQuery(query, options.transform);
@@ -46447,10 +46442,10 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `select`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async list(path17, options, parameters) {
+  async list(path16, options, parameters) {
     var _this13 = this;
     return _this13.handleOperation(async () => {
-      const body = _objectSpread22(_objectSpread22(_objectSpread22({}, DEFAULT_SEARCH_OPTIONS), options), {}, { prefix: path17 || "" });
+      const body = _objectSpread22(_objectSpread22(_objectSpread22({}, DEFAULT_SEARCH_OPTIONS), options), {}, { prefix: path16 || "" });
       return await post(_this13.fetch, `${_this13.url}/object/list/${_this13.bucketId}`, body, { headers: _this13.headers }, parameters);
     });
   }
@@ -46514,11 +46509,11 @@ var StorageFileApi = class extends BaseApiClient {
     if (typeof Buffer !== "undefined") return Buffer.from(data).toString("base64");
     return btoa(data);
   }
-  _getFinalPath(path17) {
-    return `${this.bucketId}/${path17.replace(/^\/+/, "")}`;
+  _getFinalPath(path16) {
+    return `${this.bucketId}/${path16.replace(/^\/+/, "")}`;
   }
-  _removeEmptyFolders(path17) {
-    return path17.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
+  _removeEmptyFolders(path16) {
+    return path16.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
   }
   /** Modifies the `query`, appending values the from `transform` */
   applyTransformOptsToQuery(query, transform2) {
@@ -55593,7 +55588,7 @@ function shouldShowDeprecationWarning() {
 }
 if (shouldShowDeprecationWarning()) console.warn("\u26A0\uFE0F  Node.js 18 and below are deprecated and will no longer be supported in future versions of @supabase/supabase-js. Please upgrade to Node.js 20 or later. For more information, visit: https://github.com/orgs/supabase/discussions/37217");
 
-// node_modules/@remixhq/core/dist/chunk-P6JHXOV4.js
+// node_modules/@remixhq/core/dist/chunk-XETDXVGM.js
 var storedSessionSchema = external_exports.object({
   access_token: external_exports.string().min(1),
   refresh_token: external_exports.string().min(1),
@@ -55607,7 +55602,7 @@ var storedSessionSchema = external_exports.object({
 function xdgConfigHome() {
   const value = process.env.XDG_CONFIG_HOME;
   if (typeof value === "string" && value.trim()) return value;
-  return import_path15.default.join(import_os7.default.homedir(), ".config");
+  return import_path14.default.join(import_os7.default.homedir(), ".config");
 }
 async function maybeLoadKeytar() {
   try {
@@ -55625,22 +55620,22 @@ async function maybeLoadKeytar() {
   return null;
 }
 async function ensurePathPermissions(filePath) {
-  const dir = import_path15.default.dirname(filePath);
-  await import_promises26.default.mkdir(dir, { recursive: true });
+  const dir = import_path14.default.dirname(filePath);
+  await import_promises25.default.mkdir(dir, { recursive: true });
   try {
-    await import_promises26.default.chmod(dir, 448);
+    await import_promises25.default.chmod(dir, 448);
   } catch {
   }
   try {
-    await import_promises26.default.chmod(filePath, 384);
+    await import_promises25.default.chmod(filePath, 384);
   } catch {
   }
 }
 async function writeJsonAtomic2(filePath, value) {
-  await import_promises26.default.mkdir(import_path15.default.dirname(filePath), { recursive: true });
+  await import_promises25.default.mkdir(import_path14.default.dirname(filePath), { recursive: true });
   const tmpPath = `${filePath}.tmp-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-  await import_promises26.default.writeFile(tmpPath, JSON.stringify(value, null, 2) + "\n", "utf8");
-  await import_promises26.default.rename(tmpPath, filePath);
+  await import_promises25.default.writeFile(tmpPath, JSON.stringify(value, null, 2) + "\n", "utf8");
+  await import_promises25.default.rename(tmpPath, filePath);
 }
 async function writeSessionFileFallback(filePath, session) {
   await writeJsonAtomic2(filePath, session);
@@ -55649,7 +55644,7 @@ async function writeSessionFileFallback(filePath, session) {
 function createLocalSessionStore(params) {
   const service = params?.service?.trim() || "remix-cli";
   const account = params?.account?.trim() || "default";
-  const filePath = params?.filePath?.trim() || import_path15.default.join(xdgConfigHome(), "remix", "session.json");
+  const filePath = params?.filePath?.trim() || import_path14.default.join(xdgConfigHome(), "remix", "session.json");
   async function readKeytar() {
     const keytar = await maybeLoadKeytar();
     if (!keytar) return null;
@@ -55663,7 +55658,7 @@ function createLocalSessionStore(params) {
     }
   }
   async function readFile() {
-    const raw = await import_promises26.default.readFile(filePath, "utf8").catch(() => null);
+    const raw = await import_promises25.default.readFile(filePath, "utf8").catch(() => null);
     if (!raw) return null;
     try {
       const parsed = storedSessionSchema.safeParse(JSON.parse(raw));
@@ -55807,7 +55802,7 @@ function createSupabaseAuthHelpers(config2) {
   };
 }
 
-// node_modules/@remixhq/core/dist/chunk-VM3CGCNX.js
+// node_modules/@remixhq/core/dist/chunk-XCZRNB35.js
 var DEFAULT_API_URL = "https://api.remix.one";
 var DEFAULT_SUPABASE_URL = "https://xtfxwbckjpfmqubnsusu.supabase.co";
 var DEFAULT_SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inh0Znh3YmNranBmbXF1Ym5zdXN1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NjA2MDEyMzAsImV4cCI6MjA3NjE3NzIzMH0.dzWGAWrK4CvrmHVHzf8w7JlUZohdap0ZPnLZnABMV8s";
@@ -55845,10 +55840,10 @@ async function resolveConfig(_opts) {
 }
 
 // node_modules/@remixhq/mcp/dist/index.js
-var import_path16 = __toESM(require("path"), 1);
+var import_path15 = __toESM(require("path"), 1);
 var import_child_process = require("child_process");
 var import_fs3 = require("fs");
-var import_path17 = __toESM(require("path"), 1);
+var import_path16 = __toESM(require("path"), 1);
 async function createRemixTokenProvider(config2) {
   const resolvedConfig = config2 ?? await resolveConfig();
   const sessionStore = createLocalSessionStore();
@@ -56077,6 +56072,15 @@ function normalizeByMessage(err) {
       category: "remote_state"
     });
   }
+  if (statusCode === 409) {
+    return makeNormalized({
+      code: ERROR_CODES.REMOTE_ERROR,
+      message,
+      hint,
+      retryable: true,
+      category: "remote_state"
+    });
+  }
   if (message.includes("Timed out") || message.includes("failed") || message.includes("error state")) {
     return makeNormalized({
       code: ERROR_CODES.REMOTE_ERROR,
@@ -56141,12 +56145,12 @@ function parsePositiveIntEnv(name, fallback) {
 }
 function parseAllowedRoots(raw) {
   if (!raw) return null;
-  const roots = raw.split(import_path16.default.delimiter).map((entry) => entry.trim()).filter(Boolean).map((entry) => import_path16.default.resolve(entry));
+  const roots = raw.split(import_path15.default.delimiter).map((entry) => entry.trim()).filter(Boolean).map((entry) => import_path15.default.resolve(entry));
   return roots.length > 0 ? roots : null;
 }
 function isWithinRoot(root, candidate) {
-  const relative = import_path16.default.relative(root, candidate);
-  return relative === "" || !relative.startsWith("..") && !import_path16.default.isAbsolute(relative);
+  const relative = import_path15.default.relative(root, candidate);
+  return relative === "" || !relative.startsWith("..") && !import_path15.default.isAbsolute(relative);
 }
 function loadPolicy() {
   return {
@@ -56158,7 +56162,7 @@ function loadPolicy() {
   };
 }
 function resolvePolicyCwd(policy, cwd) {
-  const resolved = import_path16.default.resolve(cwd?.trim() || process.cwd());
+  const resolved = import_path15.default.resolve(cwd?.trim() || process.cwd());
   if (!policy.allowedRepoRoots) return resolved;
   if (policy.allowedRepoRoots.some((root) => isWithinRoot(root, resolved))) return resolved;
   throw createPolicyError("Requested working directory is outside the allowed repository roots.", resolved);
@@ -56240,7 +56244,6 @@ function makeSuccessResult2(envelope) {
 function makeErrorResult(envelope) {
   return {
     content: [{ type: "text", text: toJsonText(envelope) }],
-    structuredContent: envelope,
     isError: true
   };
 }
@@ -56317,9 +56320,6 @@ var applyInputSchema = {
   confirm: external_exports.boolean(),
   allowBranchMismatch: external_exports.boolean().optional()
 };
-var reAnchorInputSchema = {
-  ...applyInputSchema
-};
 var requestMergeInputSchema = {
   ...commonRequestFieldsSchema
 };
@@ -56432,7 +56432,7 @@ var initSyncDataSchema = external_exports.object({
   repoRoot: external_exports.string(),
   bindingMode: external_exports.enum(["legacy", "lane", "explicit_root"]).optional(),
   createdCanonicalFamily: external_exports.boolean().optional(),
-  baselineStatus: external_exports.enum(["seeded", "existing", "requires_re_anchor", "requires_sync"]).optional()
+  baselineStatus: external_exports.enum(["seeded", "existing", "baseline_missing", "requires_sync"]).optional()
 });
 var initQueuedDataSchema = external_exports.object({
   queued: external_exports.literal(true),
@@ -56480,7 +56480,6 @@ var drainFinalizeQueueDataSchema = external_exports.object({
   results: external_exports.array(genericRecordSchema)
 });
 var syncDataSchema = genericRecordSchema;
-var reAnchorDataSchema = genericRecordSchema;
 var requestMergeDataSchema = genericRecordSchema;
 var mergeRequestQueueDataSchema = external_exports.object({
   queue: mergeRequestQueueSchema,
@@ -56556,7 +56555,6 @@ var addSuccessSchema = makeSuccessSchema(addDataSchema);
 var recordTurnSuccessSchema = makeSuccessSchema(recordTurnDataSchema);
 var drainFinalizeQueueSuccessSchema = makeSuccessSchema(drainFinalizeQueueDataSchema);
 var syncSuccessSchema = makeSuccessSchema(syncDataSchema);
-var reAnchorSuccessSchema = makeSuccessSchema(reAnchorDataSchema);
 var requestMergeSuccessSchema = makeSuccessSchema(requestMergeDataSchema);
 var mergeRequestQueueSuccessSchema = makeSuccessSchema(mergeRequestQueueDataSchema);
 var viewMergeRequestSuccessSchema = makeSuccessSchema(viewMergeRequestDataSchema);
@@ -56575,7 +56573,7 @@ var updateMemberRoleSuccessSchema = makeSuccessSchema(updateMemberRoleDataSchema
 function getRiskLevel(status) {
   if (status.recommendedAction === "reconcile") return "high";
   if (status.recommendedAction === "choose_family" || status.recommendedAction === "await_finalize") return "medium";
-  if (status.recommendedAction === "pull" || status.recommendedAction === "re_anchor" || status.remote.incomingOpenMergeRequestCount) {
+  if (status.recommendedAction === "pull" || status.remote.incomingOpenMergeRequestCount) {
     return "medium";
   }
   if (status.repo.branchMismatch || !status.repo.isGitRepo || !status.binding.isBound || !status.repo.worktree.isClean) return "medium";
@@ -56592,10 +56590,6 @@ function getRecommendedNextActions(status) {
       return ["Run remix_collab_init to bind the repository to Remix before using any Remix collaboration mutation flow."];
     case "pull":
       return ["Run remix_collab_sync_preview, then remix_collab_sync_apply if the preview is acceptable. This pulls the server delta into the local working tree without rewriting local git history."];
-    case "re_anchor":
-      return [
-        "Run remix_collab_re_anchor_preview, then remix_collab_re_anchor_apply. This seeds a local Remix baseline. It is required because no local baseline exists for this lane yet (fresh clone, deleted .remix/ state, or first init didn't seed) \u2014 not because of any specific git operation. After it succeeds, automatic hook recording can capture completed turns."
-      ];
     case "record":
       return [
         "No MCP recording tool is required. Automatic hook finalization will capture the local boundary at the end of the completed turn; this covers agent edits, manual user edits, git commit, git pull, git merge, git rebase, and git reset."
@@ -56680,8 +56674,8 @@ async function initCollab(params) {
   return {
     data: syncResult,
     warnings: collectResultWarnings(result),
-    recommendedNextActions: syncResult.baselineStatus === "requires_re_anchor" ? [
-      "This checkout has no local Remix baseline yet. Run remix_collab_re_anchor_preview, then remix_collab_re_anchor_apply to seed one. After it succeeds, automatic hook recording can capture completed turns."
+    recommendedNextActions: syncResult.baselineStatus === "baseline_missing" ? [
+      "This checkout has no local Remix revision baseline yet. Run remix_collab_init or remix_collab_sync_preview/apply to seed one. After it succeeds, automatic hook recording can capture completed turns."
     ] : syncResult.baselineStatus === "requires_sync" ? [
       "Run remix_collab_sync_preview, then remix_collab_sync_apply to pull the server delta and create the first local baseline for this checkout."
     ] : ["Run remix_collab_status to inspect sync, reconcile, and merge-request readiness before mutating bound-repo state."],
@@ -56784,26 +56778,6 @@ async function syncCollab(params) {
     }
   };
 }
-async function reAnchor(params) {
-  const api = await createCollabApiClient();
-  const result = await collabReAnchor({
-    api,
-    cwd: params.cwd,
-    dryRun: params.dryRun,
-    allowBranchMismatch: params.allowBranchMismatch ?? false
-  });
-  return {
-    data: result,
-    warnings: collectWarnings(result.warnings),
-    recommendedNextActions: params.dryRun ? [
-      "Run remix_collab_re_anchor_apply with confirm=true to seed a local Remix baseline for this checkout. Re-anchor is for missing-baseline cases only and does not replace automatic hook recording for ordinary local content changes."
-    ] : [],
-    logContext: {
-      repoRoot: result.repoRoot,
-      appId: result.currentAppId
-    }
-  };
-}
 async function requestMerge(params) {
   const api = await createCollabApiClient();
   const drainWarnings = await drainBeforeMutation(api);
@@ -57520,22 +57494,25 @@ async function accessDebug(params) {
     }
   };
 }
-var MARKER_REL_PATH = import_path17.default.join(".remix", ".history-imported");
-var LOG_REL_PATH = import_path17.default.join(".remix", "history-import.log");
+var MARKER_REL_PATH = import_path16.default.join(".remix", ".history-imported");
+var LOG_REL_PATH = import_path16.default.join(".remix", "history-import.log");
 function shouldAutoSpawnHistoryImport(repoRoot) {
   try {
-    return !(0, import_fs3.existsSync)(import_path17.default.join(repoRoot, MARKER_REL_PATH));
+    return !(0, import_fs3.existsSync)(import_path16.default.join(repoRoot, MARKER_REL_PATH));
   } catch {
     return false;
   }
 }
-function spawnHistoryImportDetached(repoRoot) {
-  const remixDir = import_path17.default.join(repoRoot, ".remix");
+function isAutoSpawnEligibleBindingMode(bindingMode) {
+  return bindingMode === "explicit_root";
+}
+function spawnHistoryImportDetached(repoRoot, options) {
+  const remixDir = import_path16.default.join(repoRoot, ".remix");
   try {
     (0, import_fs3.mkdirSync)(remixDir, { recursive: true });
   } catch {
   }
-  const logPath = import_path17.default.join(repoRoot, LOG_REL_PATH);
+  const logPath = import_path16.default.join(repoRoot, LOG_REL_PATH);
   const out = (0, import_fs3.openSync)(logPath, "a");
   const err = (0, import_fs3.openSync)(logPath, "a");
   const child = (0, import_child_process.spawn)(
@@ -57545,6 +57522,8 @@ function spawnHistoryImportDetached(repoRoot) {
       "import",
       "--repo",
       repoRoot,
+      "--before",
+      options.cutoffAt,
       // Include prompt text for parity with the CLI auto-spawn path:
       // first-time UX is a lot worse if the dashboard renders every
       // historical row as "(prompt not uploaded)".
@@ -57612,6 +57591,24 @@ function buildErrorEnvelope(tool, requestId, error2) {
     recommendedNextActions
   };
 }
+function buildOutputValidationErrorEnvelope(tool, requestId, error2) {
+  return {
+    schemaVersion: SCHEMA_VERSION,
+    ok: false,
+    tool,
+    requestId: requestId ?? null,
+    error: {
+      code: ERROR_CODES.INTERNAL_ERROR,
+      message: "Tool output failed validation against its declared MCP schema.",
+      hint: error2.issues.map((issue2) => `${issue2.path.join(".") || "output"}: ${issue2.message}`).join("; "),
+      retryable: false,
+      category: "internal"
+    },
+    warnings: [],
+    risks: ["The MCP server returned an output shape that did not match the tool descriptor."],
+    recommendedNextActions: ["Report this MCP schema mismatch with the tool name and error hint."]
+  };
+}
 function registerTool(server, context, params) {
   const errorSchema = makeErrorSchema();
   server.registerTool(
@@ -57630,7 +57627,20 @@ function registerTool(server, context, params) {
         assertToolAccess(context.policy, params.access);
         const result = await params.run(rawArgs);
         const envelope = buildSuccessEnvelope(params.name, requestId, result);
-        params.outputSchema.parse(envelope);
+        const parsedEnvelope = params.outputSchema.safeParse(envelope);
+        if (!parsedEnvelope.success) {
+          const errorEnvelope = buildOutputValidationErrorEnvelope(params.name, requestId, parsedEnvelope.error);
+          context.logger.log({
+            level: "error",
+            message: "tool_output_validation_failed",
+            tool: params.name,
+            requestId: errorEnvelope.requestId,
+            durationMs: Date.now() - startedAt,
+            result: "error",
+            errorCode: errorEnvelope.error.code
+          });
+          return makeErrorResult(errorEnvelope);
+        }
         context.logger.log({
           level: "info",
           message: "tool_completed",
@@ -57693,11 +57703,13 @@ function registerCollabTools(server, context) {
       });
       try {
         const repoRoot = result && typeof result === "object" && "data" in result && result.data && typeof result.data.repoRoot === "string" ? result.data.repoRoot : null;
-        if (repoRoot && shouldAutoSpawnHistoryImport(repoRoot)) {
-          const spawned = spawnHistoryImportDetached(repoRoot);
+        const bindingMode = result && typeof result === "object" && "data" in result && result.data && typeof result.data.bindingMode === "string" ? result.data.bindingMode : null;
+        if (repoRoot && isAutoSpawnEligibleBindingMode(bindingMode) && shouldAutoSpawnHistoryImport(repoRoot)) {
+          const cutoffAt = (/* @__PURE__ */ new Date()).toISOString();
+          const spawned = spawnHistoryImportDetached(repoRoot, { cutoffAt });
           context.logger.log({
             level: "info",
-            message: `history_import_auto_spawned pid=${spawned.pid ?? "?"} log=${spawned.logPath}`,
+            message: `history_import_auto_spawned pid=${spawned.pid ?? "?"} log=${spawned.logPath} cutoffAt=${cutoffAt}`,
             tool: "remix_collab_init",
             repoRoot
           });
@@ -57801,31 +57813,6 @@ function registerCollabTools(server, context) {
       return syncCollab({ cwd, dryRun: false, allowBranchMismatch: input.allowBranchMismatch ?? false });
     }
   });
-  registerTool(server, context, {
-    name: "remix_collab_re_anchor_preview",
-    description: "Preview whether this checkout needs a fresh local Remix baseline. Use only when status reports `re_anchor` (no local baseline exists for this lane yet \u2014 fresh clone, deleted `.remix/` state, or first init didn't seed). Re-anchor does not replace automatic hook recording; ordinary local content changes (including merges, pulls, and rebases) are captured at the completed-turn boundary, not by re-anchor.",
-    access: "read",
-    inputSchema: previewInputSchema,
-    outputSchema: reAnchorSuccessSchema,
-    run: async (args) => {
-      const input = external_exports.object(previewInputSchema).parse(args);
-      const cwd = resolvePolicyCwd(context.policy, input.cwd);
-      return reAnchor({ cwd, dryRun: true });
-    }
-  });
-  registerTool(server, context, {
-    name: "remix_collab_re_anchor_apply",
-    description: "Establish a local Remix baseline for the current checkout against the existing app head, without rewriting the local checkout afterward. Required only when status reports `re_anchor` (missing local baseline). It does not replace automatic hook recording \u2014 local commits, pulls, merges, and rebases are still captured at the completed-turn boundary.",
-    access: "local_write",
-    inputSchema: reAnchorInputSchema,
-    outputSchema: reAnchorSuccessSchema,
-    run: async (args) => {
-      const input = external_exports.object(reAnchorInputSchema).parse(args);
-      assertConfirm(input.confirm, "remix_collab_re_anchor_apply");
-      const cwd = resolvePolicyCwd(context.policy, input.cwd);
-      return reAnchor({ cwd, dryRun: false, allowBranchMismatch: input.allowBranchMismatch ?? false });
-    }
-  });
   registerTool(server, context, {
     name: "remix_collab_request_merge",
     description: "Open a prompt-backed Remix merge request from the current bound repository to its upstream app instead of merging locally with raw git.",
@@ -59590,6 +59577,7 @@ function createRemixMcpServer(params) {
 }
 
 // src/hook-auth.ts
+var HOOK_API_REQUEST_TIMEOUT_MS = 6e4;
 async function createHookCollabApiClient() {
   const config2 = await resolveConfig();
   const sessionStore = createLocalSessionStore();
@@ -59602,18 +59590,19 @@ async function createHookCollabApiClient() {
     }
   });
   return createApiClient(config2, {
-    tokenProvider
+    tokenProvider,
+    defaultRequestTimeoutMs: HOOK_API_REQUEST_TIMEOUT_MS
   });
 }
 
 // src/hook-diagnostics.ts
 var import_node_crypto2 = require("crypto");
-var import_promises28 = __toESM(require("fs/promises"), 1);
+var import_promises27 = __toESM(require("fs/promises"), 1);
 var import_node_os5 = __toESM(require("os"), 1);
 var import_node_path7 = __toESM(require("path"), 1);
 
 // src/hook-state.ts
-var import_promises27 = __toESM(require("fs/promises"), 1);
+var import_promises26 = __toESM(require("fs/promises"), 1);
 var import_node_os4 = __toESM(require("os"), 1);
 var import_node_path6 = __toESM(require("path"), 1);
 var import_node_crypto = require("crypto");
@@ -59718,7 +59707,7 @@ function getPendingTurnStateRootPath() {
   return stateRoot();
 }
 async function loadPendingTurnState(sessionId) {
-  const raw = await import_promises27.default.readFile(statePath(sessionId), "utf8").catch(() => null);
+  const raw = await import_promises26.default.readFile(statePath(sessionId), "utf8").catch(() => null);
   if (!raw) return null;
   try {
     const parsed = JSON.parse(raw);
@@ -59745,7 +59734,7 @@ async function loadPendingTurnState(sessionId) {
 }
 async function listPendingTurnStateSummaries() {
   const root = stateRoot();
-  const entries = await import_promises27.default.readdir(root, { withFileTypes: true }).catch(() => []);
+  const entries = await import_promises26.default.readdir(root, { withFileTypes: true }).catch(() => []);
   const sessionIds = entries.filter((entry) => entry.isFile() && entry.name.endsWith(".json")).map((entry) => entry.name.replace(/\.json$/, "")).sort((a2, b) => a2.localeCompare(b));
   const states = await Promise.all(sessionIds.map((sessionId) => loadPendingTurnState(sessionId)));
   return states.filter((state) => state !== null).sort((a2, b) => b.submittedAt.localeCompare(a2.submittedAt)).map((state) => summarizePendingTurnState(state));
@@ -59754,7 +59743,7 @@ async function listPendingTurnStateSummaries() {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.22",
+  version: "0.1.24",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -59792,8 +59781,8 @@ var package_default = {
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.17",
-    "@remixhq/mcp": "^0.1.17"
+    "@remixhq/core": "^0.1.19",
+    "@remixhq/mcp": "^0.1.19"
   },
   devDependencies: {
     "@types/node": "^25.4.0",
@@ -59835,7 +59824,7 @@ function clampEventLimit(limit) {
   return Math.max(1, Math.min(MAX_EVENT_LIMIT, Math.trunc(limit)));
 }
 async function readEventsFromFile(filePath) {
-  const raw = await import_promises28.default.readFile(filePath, "utf8").catch(() => null);
+  const raw = await import_promises27.default.readFile(filePath, "utf8").catch(() => null);
   if (!raw) return [];
   return raw.split("\n").map((line) => line.trim()).filter(Boolean).flatMap((line) => {
     try {