@remixhq/claude-plugin 0.1.15 → 0.1.16

package/dist/mcp-server.cjs

@@ -3223,8 +3223,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path14) {
-      let input = path14;
+    function removeDotSegments(path13) {
+      let input = path13;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -3423,8 +3423,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path14, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path14 && path14 !== "/" ? path14 : void 0;
+        const [path13, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path13 && path13 !== "/" ? path13 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -6806,7 +6806,7 @@ var require_windows = __commonJS({
     module2.exports = isexe;
     isexe.sync = sync;
     var fs11 = require("fs");
-    function checkPathExt(path14, options) {
+    function checkPathExt(path13, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -6817,25 +6817,25 @@ var require_windows = __commonJS({
       }
       for (var i2 = 0; i2 < pathext.length; i2++) {
         var p = pathext[i2].toLowerCase();
-        if (p && path14.substr(-p.length).toLowerCase() === p) {
+        if (p && path13.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path14, options) {
+    function checkStat(stat, path13, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path14, options);
+      return checkPathExt(path13, options);
     }
-    function isexe(path14, options, cb) {
-      fs11.stat(path14, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path14, options));
+    function isexe(path13, options, cb) {
+      fs11.stat(path13, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path13, options));
       });
     }
-    function sync(path14, options) {
-      return checkStat(fs11.statSync(path14), path14, options);
+    function sync(path13, options) {
+      return checkStat(fs11.statSync(path13), path13, options);
     }
   }
 });
@@ -6847,13 +6847,13 @@ var require_mode = __commonJS({
     module2.exports = isexe;
     isexe.sync = sync;
     var fs11 = require("fs");
-    function isexe(path14, options, cb) {
-      fs11.stat(path14, function(er, stat) {
+    function isexe(path13, options, cb) {
+      fs11.stat(path13, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path14, options) {
-      return checkStat(fs11.statSync(path14), options);
+    function sync(path13, options) {
+      return checkStat(fs11.statSync(path13), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -6887,7 +6887,7 @@ var require_isexe = __commonJS({
     }
     module2.exports = isexe;
     isexe.sync = sync;
-    function isexe(path14, options, cb) {
+    function isexe(path13, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -6897,7 +6897,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve, reject) {
-          isexe(path14, options || {}, function(er, is) {
+          isexe(path13, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -6906,7 +6906,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path14, options || {}, function(er, is) {
+      core(path13, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -6916,9 +6916,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path14, options) {
+    function sync(path13, options) {
       try {
-        return core.sync(path14, options || {});
+        return core.sync(path13, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -6935,7 +6935,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 path14 = require("path");
+    var path13 = require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -6973,7 +6973,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 = path14.join(pathPart, cmd);
+        const pCmd = path13.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve(subStep(p, i2, 0));
       });
@@ -7000,7 +7000,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 = path14.join(pathPart, cmd);
+        const pCmd = path13.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];
@@ -7048,7 +7048,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
     "use strict";
-    var path14 = require("path");
+    var path13 = require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -7066,7 +7066,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path14.delimiter : void 0
+          pathExt: withoutPathExt ? path13.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -7075,7 +7075,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path14.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path13.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -7129,8 +7129,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path14, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path14.split("/").pop();
+      const [path13, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path13.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -7165,7 +7165,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
     "use strict";
-    var path14 = require("path");
+    var path13 = require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -7190,7 +7190,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path14.normalize(parsed.command);
+        parsed.command = path13.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(" ");
@@ -7498,10 +7498,10 @@ function assignProp(target, prop, value) {
     configurable: true
   });
 }
-function getElementAtPath(obj, path14) {
-  if (!path14)
+function getElementAtPath(obj, path13) {
+  if (!path13)
     return obj;
-  return path14.reduce((acc, key) => acc?.[key], obj);
+  return path13.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(path14, issues) {
+function prefixIssues(path13, issues) {
   return issues.map((iss) => {
     var _a;
     (_a = iss).path ?? (_a.path = []);
-    iss.path.unshift(path14);
+    iss.path.unshift(path13);
     return iss;
   });
 }
@@ -13886,8 +13886,8 @@ function getErrorMap() {
 
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path14, errorMaps, issueData } = params;
-  const fullPath = [...path14, ...issueData.path || []];
+  const { data, path: path13, errorMaps, issueData } = params;
+  const fullPath = [...path13, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -14003,11 +14003,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path14, key) {
+  constructor(parent, value, path13, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path14;
+    this._path = path13;
     this._key = key;
   }
   get path() {
@@ -21513,7 +21513,7 @@ var RemixError = class extends Error {
   }
 };
 
-// node_modules/@remixhq/core/dist/chunk-B5S3PUIR.js
+// node_modules/@remixhq/core/dist/chunk-BNKPTE2U.js
 async function readJsonSafe(res) {
   const ct = res.headers.get("content-type") ?? "";
   if (!ct.toLowerCase().includes("application/json")) return null;
@@ -21527,7 +21527,7 @@ function createApiClient(config2, opts) {
   const apiKey = (opts?.apiKey ?? "").trim();
   const tokenProvider = opts?.tokenProvider;
   const CLIENT_KEY_HEADER = "x-comerge-api-key";
-  async function request(path14, init) {
+  async function request(path13, init) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -21535,7 +21535,7 @@ function createApiClient(config2, opts) {
       });
     }
     const auth = await tokenProvider();
-    const url = new URL(path14, config2.apiUrl).toString();
+    const url = new URL(path13, config2.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
       headers: {
@@ -21559,7 +21559,7 @@ function createApiClient(config2, opts) {
     const json = await readJsonSafe(res);
     return json ?? null;
   }
-  async function requestBinary(path14, init) {
+  async function requestBinary(path13, init) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -21567,7 +21567,7 @@ function createApiClient(config2, opts) {
       });
     }
     const auth = await tokenProvider();
-    const url = new URL(path14, config2.apiUrl).toString();
+    const url = new URL(path13, config2.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
       headers: {
@@ -21611,8 +21611,20 @@ function createApiClient(config2, opts) {
       const qs = new URLSearchParams();
       if (params.repoFingerprint) qs.set("repoFingerprint", params.repoFingerprint);
       if (params.remoteUrl) qs.set("remoteUrl", params.remoteUrl);
+      if (params.branchName) qs.set("branchName", params.branchName);
       return request(`/v1/projects/bindings/resolve?${qs.toString()}`, { method: "GET" });
     },
+    resolveProjectLaneBinding: (params) => {
+      const qs = new URLSearchParams();
+      if (params.projectId) qs.set("projectId", params.projectId);
+      if (params.repoFingerprint) qs.set("repoFingerprint", params.repoFingerprint);
+      if (params.remoteUrl) qs.set("remoteUrl", params.remoteUrl);
+      if (params.defaultBranch) qs.set("defaultBranch", params.defaultBranch);
+      qs.set("branchName", params.branchName);
+      return request(`/v1/projects/bindings/resolve-lane?${qs.toString()}`, { method: "GET" });
+    },
+    ensureProjectLaneBinding: (payload) => request("/v1/projects/bindings/ensure-lane", { method: "POST", body: JSON.stringify(payload) }),
+    bootstrapFreshProjectLane: (payload) => request("/v1/projects/bindings/bootstrap-fresh-lane", { method: "POST", body: JSON.stringify(payload) }),
     autoEnableDeveloper: () => request("/v1/developer/auto-enable", { method: "POST" }),
     listClientApps: (params) => {
       const qs = params?.orgId ? `?orgId=${encodeURIComponent(params.orgId)}` : "";
@@ -21676,6 +21688,7 @@ function createApiClient(config2, opts) {
       if (params?.offset !== void 0) qs.set("offset", String(params.offset));
       if (params?.changeStepId) qs.set("changeStepId", params.changeStepId);
       if (params?.threadId) qs.set("threadId", params.threadId);
+      if (params?.collabLaneId) qs.set("collabLaneId", params.collabLaneId);
       if (params?.createdAfter) qs.set("createdAfter", params.createdAfter);
       if (params?.createdBefore) qs.set("createdBefore", params.createdBefore);
       const suffix = qs.toString() ? `?${qs.toString()}` : "";
@@ -30785,8 +30798,8 @@ var IcebergError = class extends Error {
     return this.status === 419;
   }
 };
-function buildUrl(baseUrl, path14, query) {
-  const url = new URL(path14, baseUrl);
+function buildUrl(baseUrl, path13, query) {
+  const url = new URL(path13, baseUrl);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       if (value !== void 0) {
@@ -30816,12 +30829,12 @@ function createFetchClient(options) {
   return {
     async request({
       method,
-      path: path14,
+      path: path13,
       query,
       body,
       headers
     }) {
-      const url = buildUrl(options.baseUrl, path14, query);
+      const url = buildUrl(options.baseUrl, path13, query);
       const authHeaders = await buildAuthHeaders(options.auth);
       const res = await fetchFn(url, {
         method,
@@ -31640,7 +31653,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, path14, fileBody, fileOptions) {
+  async uploadOrUpdate(method, path13, fileBody, fileOptions) {
     var _this = this;
     return _this.handleOperation(async () => {
       let body;
@@ -31664,7 +31677,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) headers = _objectSpread22(_objectSpread22({}, headers), fileOptions.headers);
-      const cleanPath = _this._removeEmptyFolders(path14);
+      const cleanPath = _this._removeEmptyFolders(path13);
       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 {
@@ -31725,8 +31738,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(path14, fileBody, fileOptions) {
-    return this.uploadOrUpdate("POST", path14, fileBody, fileOptions);
+  async upload(path13, fileBody, fileOptions) {
+    return this.uploadOrUpdate("POST", path13, fileBody, fileOptions);
   }
   /**
   * Upload a file with a token generated from `createSignedUploadUrl`.
@@ -31765,9 +31778,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(path14, token, fileBody, fileOptions) {
+  async uploadToSignedUrl(path13, token, fileBody, fileOptions) {
     var _this3 = this;
-    const cleanPath = _this3._removeEmptyFolders(path14);
+    const cleanPath = _this3._removeEmptyFolders(path13);
     const _path = _this3._getFinalPath(cleanPath);
     const url = new URL(_this3.url + `/object/upload/sign/${_path}`);
     url.searchParams.set("token", token);
@@ -31829,10 +31842,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(path14, options) {
+  async createSignedUploadUrl(path13, options) {
     var _this4 = this;
     return _this4.handleOperation(async () => {
-      let _path = _this4._getFinalPath(path14);
+      let _path = _this4._getFinalPath(path13);
       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 });
@@ -31841,7 +31854,7 @@ var StorageFileApi = class extends BaseApiClient {
       if (!token) throw new StorageError("No token returned by API");
       return {
         signedUrl: url.toString(),
-        path: path14,
+        path: path13,
         token
       };
     });
@@ -31897,8 +31910,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(path14, fileBody, fileOptions) {
-    return this.uploadOrUpdate("PUT", path14, fileBody, fileOptions);
+  async update(path13, fileBody, fileOptions) {
+    return this.uploadOrUpdate("PUT", path13, fileBody, fileOptions);
   }
   /**
   * Moves an existing file to a new path in the same bucket.
@@ -32045,10 +32058,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(path14, expiresIn, options) {
+  async createSignedUrl(path13, expiresIn, options) {
     var _this8 = this;
     return _this8.handleOperation(async () => {
-      let _path = _this8._getFinalPath(path14);
+      let _path = _this8._getFinalPath(path13);
       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 downloadQueryParam = (options === null || options === void 0 ? void 0 : options.download) ? `&download=${options.download === true ? "" : options.download}` : "";
@@ -32175,11 +32188,11 @@ 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(path14, options, parameters) {
+  download(path13, options, parameters) {
     const renderPath = typeof (options === null || options === void 0 ? void 0 : options.transform) !== "undefined" ? "render/image/authenticated" : "object";
     const transformationQuery = this.transformOptsToQueryString((options === null || options === void 0 ? void 0 : options.transform) || {});
     const queryString = transformationQuery ? `?${transformationQuery}` : "";
-    const _path = this._getFinalPath(path14);
+    const _path = this._getFinalPath(path13);
     const downloadFn = () => get(this.fetch, `${this.url}/${renderPath}/${_path}${queryString}`, {
       headers: this.headers,
       noResolveJson: true
@@ -32209,9 +32222,9 @@ var StorageFileApi = class extends BaseApiClient {
   * }
   * ```
   */
-  async info(path14) {
+  async info(path13) {
     var _this10 = this;
-    const _path = _this10._getFinalPath(path14);
+    const _path = _this10._getFinalPath(path13);
     return _this10.handleOperation(async () => {
       return recursiveToCamel(await get(_this10.fetch, `${_this10.url}/object/info/${_path}`, { headers: _this10.headers }));
     });
@@ -32231,9 +32244,9 @@ var StorageFileApi = class extends BaseApiClient {
   *   .exists('folder/avatar1.png')
   * ```
   */
-  async exists(path14) {
+  async exists(path13) {
     var _this11 = this;
-    const _path = _this11._getFinalPath(path14);
+    const _path = _this11._getFinalPath(path13);
     try {
       await head(_this11.fetch, `${_this11.url}/object/${_path}`, { headers: _this11.headers });
       return {
@@ -32310,8 +32323,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(path14, options) {
-    const _path = this._getFinalPath(path14);
+  getPublicUrl(path13, options) {
+    const _path = this._getFinalPath(path13);
     const _queryString = [];
     const downloadQueryParam = (options === null || options === void 0 ? void 0 : options.download) ? `download=${options.download === true ? "" : options.download}` : "";
     if (downloadQueryParam !== "") _queryString.push(downloadQueryParam);
@@ -32450,10 +32463,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(path14, options, parameters) {
+  async list(path13, options, parameters) {
     var _this13 = this;
     return _this13.handleOperation(async () => {
-      const body = _objectSpread22(_objectSpread22(_objectSpread22({}, DEFAULT_SEARCH_OPTIONS), options), {}, { prefix: path14 || "" });
+      const body = _objectSpread22(_objectSpread22(_objectSpread22({}, DEFAULT_SEARCH_OPTIONS), options), {}, { prefix: path13 || "" });
       return await post(_this13.fetch, `${_this13.url}/object/list/${_this13.bucketId}`, body, { headers: _this13.headers }, parameters);
     });
   }
@@ -32517,11 +32530,11 @@ var StorageFileApi = class extends BaseApiClient {
     if (typeof Buffer !== "undefined") return Buffer.from(data).toString("base64");
     return btoa(data);
   }
-  _getFinalPath(path14) {
-    return `${this.bucketId}/${path14.replace(/^\/+/, "")}`;
+  _getFinalPath(path13) {
+    return `${this.bucketId}/${path13.replace(/^\/+/, "")}`;
   }
-  _removeEmptyFolders(path14) {
-    return path14.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
+  _removeEmptyFolders(path13) {
+    return path13.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
   }
   transformOptsToQueryString(transform2) {
     const params = [];
@@ -41792,89 +41805,11 @@ var REMIX_ERROR_CODES = {
 // node_modules/@remixhq/mcp/dist/index.js
 var import_path11 = __toESM(require("path"), 1);
 
-// node_modules/@remixhq/core/dist/chunk-GEHSFPCD.js
-var import_promises2 = __toESM(require("fs/promises"), 1);
-var import_path2 = __toESM(require("path"), 1);
-var import_promises3 = __toESM(require("fs/promises"), 1);
-var import_path3 = __toESM(require("path"), 1);
-async function reserveDirectory(targetDir) {
-  try {
-    await import_promises3.default.mkdir(targetDir);
-    return targetDir;
-  } catch (error2) {
-    if (error2?.code === "EEXIST") {
-      throw new RemixError("Output directory already exists.", {
-        exitCode: 2,
-        hint: `Choose an empty destination path: ${targetDir}`
-      });
-    }
-    throw error2;
-  }
-}
-async function reserveAvailableDirPath(preferredDir) {
-  const parent = import_path3.default.dirname(preferredDir);
-  const base = import_path3.default.basename(preferredDir);
-  for (let i2 = 1; i2 <= 1e3; i2 += 1) {
-    const candidate = i2 === 1 ? preferredDir : import_path3.default.join(parent, `${base}-${i2}`);
-    try {
-      await import_promises3.default.mkdir(candidate);
-      return candidate;
-    } catch (error2) {
-      if (error2?.code === "EEXIST") continue;
-      throw error2;
-    }
-  }
-  throw new RemixError("No available output directory name.", {
-    exitCode: 2,
-    hint: `Tried ${base} through ${base}-1000 under ${parent}.`
-  });
-}
-async function writeJsonAtomic2(filePath, value) {
-  const dir = import_path3.default.dirname(filePath);
-  await import_promises3.default.mkdir(dir, { recursive: true });
-  const tmp = `${filePath}.tmp-${Date.now()}`;
-  await import_promises3.default.writeFile(tmp, `${JSON.stringify(value, null, 2)}
-`, "utf8");
-  await import_promises3.default.rename(tmp, filePath);
-}
-function getCollabBindingPath(repoRoot) {
-  return import_path2.default.join(repoRoot, ".remix", "config.json");
-}
-async function readCollabBinding(repoRoot) {
-  try {
-    const raw = await import_promises2.default.readFile(getCollabBindingPath(repoRoot), "utf8");
-    const parsed = JSON.parse(raw);
-    if (parsed?.schemaVersion !== 1) return null;
-    if (!parsed.projectId || !parsed.currentAppId || !parsed.upstreamAppId) return null;
-    return {
-      schemaVersion: 1,
-      projectId: parsed.projectId,
-      currentAppId: parsed.currentAppId,
-      upstreamAppId: parsed.upstreamAppId,
-      threadId: parsed.threadId ?? null,
-      repoFingerprint: parsed.repoFingerprint ?? null,
-      remoteUrl: parsed.remoteUrl ?? null,
-      defaultBranch: parsed.defaultBranch ?? null,
-      preferredBranch: parsed.preferredBranch ?? parsed.defaultBranch ?? null
-    };
-  } catch {
-    return null;
-  }
-}
-async function writeCollabBinding(repoRoot, binding) {
-  const filePath = getCollabBindingPath(repoRoot);
-  await writeJsonAtomic2(filePath, {
-    schemaVersion: 1,
-    ...binding
-  });
-  return filePath;
-}
-
-// node_modules/@remixhq/core/dist/chunk-J3J4PBQ7.js
-var import_promises15 = __toESM(require("fs/promises"), 1);
+// node_modules/@remixhq/core/dist/chunk-RREREIGW.js
+var import_promises13 = __toESM(require("fs/promises"), 1);
 var import_crypto = require("crypto");
 var import_os2 = __toESM(require("os"), 1);
-var import_path4 = __toESM(require("path"), 1);
+var import_path2 = __toESM(require("path"), 1);
 
 // node_modules/is-plain-obj/index.js
 function isPlainObject4(value) {
@@ -42806,7 +42741,7 @@ var npmRunPathEnv = ({ env = import_node_process6.default.env, ...options } = {}
 };
 
 // node_modules/execa/lib/terminate/kill.js
-var import_promises4 = require("timers/promises");
+var import_promises2 = require("timers/promises");
 
 // node_modules/execa/lib/return/final-error.js
 var getFinalError = (originalError, message, isSync) => {
@@ -43313,7 +43248,7 @@ var killOnTimeout = async ({ kill, forceKillAfterDelay, context, controllerSigna
     return;
   }
   try {
-    await (0, import_promises4.setTimeout)(forceKillAfterDelay, void 0, { signal: controllerSignal });
+    await (0, import_promises2.setTimeout)(forceKillAfterDelay, void 0, { signal: controllerSignal });
     if (kill("SIGKILL")) {
       context.isForcefullyTerminated ??= true;
     }
@@ -43344,7 +43279,7 @@ var terminateOnCancel = async (subprocess, cancelSignal, context, { signal }) =>
 };
 
 // node_modules/execa/lib/ipc/graceful.js
-var import_promises6 = require("timers/promises");
+var import_promises4 = require("timers/promises");
 
 // node_modules/execa/lib/ipc/send.js
 var import_node_util5 = require("util");
@@ -43531,7 +43466,7 @@ var import_node_events4 = require("events");
 
 // node_modules/execa/lib/ipc/incoming.js
 var import_node_events3 = require("events");
-var import_promises5 = require("timers/promises");
+var import_promises3 = require("timers/promises");
 
 // node_modules/execa/lib/ipc/reference.js
 var addReference = (channel, reference) => {
@@ -43578,7 +43513,7 @@ var onMessage = async ({ anyProcess, channel, isSubprocess, ipcEmitter }, wrappe
   }
   while (incomingMessages.length > 0) {
     await waitForOutgoingMessages(anyProcess, ipcEmitter, wrappedMessage);
-    await import_promises5.scheduler.yield();
+    await import_promises3.scheduler.yield();
     const message = await handleStrictRequest({
       wrappedMessage: incomingMessages[0],
       anyProcess,
@@ -43858,7 +43793,7 @@ var startIpc = async ({ anyProcess, channel, isSubprocess, ipc }) => {
     return;
   }
   getIpcEmitter(anyProcess, channel, isSubprocess);
-  await import_promises6.scheduler.yield();
+  await import_promises4.scheduler.yield();
 };
 var cancelListening = false;
 var handleAbort = (wrappedMessage) => {
@@ -43931,7 +43866,7 @@ var getReason = ({ reason }) => {
 };
 
 // node_modules/execa/lib/terminate/timeout.js
-var import_promises7 = require("timers/promises");
+var import_promises5 = require("timers/promises");
 var validateTimeout = ({ timeout }) => {
   if (timeout !== void 0 && (!Number.isFinite(timeout) || timeout < 0)) {
     throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`);
@@ -43939,7 +43874,7 @@ var validateTimeout = ({ timeout }) => {
 };
 var throwOnTimeout = (subprocess, timeout, context, controller) => timeout === 0 || timeout === void 0 ? [] : [killAfterTimeout(subprocess, timeout, context, controller)];
 var killAfterTimeout = async (subprocess, timeout, context, { signal }) => {
-  await (0, import_promises7.setTimeout)(timeout, void 0, { signal });
+  await (0, import_promises5.setTimeout)(timeout, void 0, { signal });
   context.terminationReason ??= "timeout";
   subprocess.kill();
   throw new DiscardedError();
@@ -44196,7 +44131,7 @@ var CR_BINARY = CR.codePointAt(0);
 
 // node_modules/get-stream/source/index.js
 var import_node_events6 = require("events");
-var import_promises8 = require("stream/promises");
+var import_promises6 = require("stream/promises");
 
 // node_modules/is-stream/index.js
 function isStream(stream, { checkOpen = true } = {}) {
@@ -44562,7 +44497,7 @@ var stringMethods = {
 };
 
 // node_modules/get-stream/source/index.js
-Object.assign(nodeImports, { on: import_node_events6.on, finished: import_promises8.finished });
+Object.assign(nodeImports, { on: import_node_events6.on, finished: import_promises6.finished });
 
 // node_modules/execa/lib/io/max-buffer.js
 var handleMaxBuffer = ({ error: error2, stream, readableObjectMode, lines, encoding, fdNumber }) => {
@@ -46257,13 +46192,13 @@ var logOutputSync = ({ serializedResult, fdNumber, state, verboseInfo, encoding,
   }
 };
 var writeToFiles = (serializedResult, stdioItems, outputFiles) => {
-  for (const { path: path14, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
-    const pathString = typeof path14 === "string" ? path14 : path14.toString();
+  for (const { path: path13, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
+    const pathString = typeof path13 === "string" ? path13 : path13.toString();
     if (append || outputFiles.has(pathString)) {
-      (0, import_node_fs4.appendFileSync)(path14, serializedResult);
+      (0, import_node_fs4.appendFileSync)(path13, serializedResult);
     } else {
       outputFiles.add(pathString);
-      (0, import_node_fs4.writeFileSync)(path14, serializedResult);
+      (0, import_node_fs4.writeFileSync)(path13, serializedResult);
     }
   }
 };
@@ -46754,7 +46689,7 @@ var addPropertiesAsync = {
 // node_modules/@sindresorhus/merge-streams/index.js
 var import_node_events10 = require("events");
 var import_node_stream4 = require("stream");
-var import_promises9 = require("stream/promises");
+var import_promises7 = require("stream/promises");
 function mergeStreams(streams) {
   if (!Array.isArray(streams)) {
     throw new TypeError(`Expected an array, got \`${typeof streams}\`.`);
@@ -46837,7 +46772,7 @@ var onMergedStreamFinished = async (passThroughStream, streams, unpipeEvent) =>
 };
 var onMergedStreamEnd = async (passThroughStream, { signal }) => {
   try {
-    await (0, import_promises9.finished)(passThroughStream, { signal, cleanup: true });
+    await (0, import_promises7.finished)(passThroughStream, { signal, cleanup: true });
   } catch (error2) {
     errorOrAbortStream(passThroughStream, error2);
     throw error2;
@@ -46904,7 +46839,7 @@ var afterMergedStreamFinished = async (onFinished, stream, { signal }) => {
 };
 var onInputStreamEnd = async ({ passThroughStream, stream, streams, ended, aborted: aborted3, controller: { signal } }) => {
   try {
-    await (0, import_promises9.finished)(stream, {
+    await (0, import_promises7.finished)(stream, {
       signal,
       cleanup: true,
       readable: true,
@@ -46969,7 +46904,7 @@ var PASSTHROUGH_LISTENERS_COUNT = 2;
 var PASSTHROUGH_LISTENERS_PER_STREAM = 1;
 
 // node_modules/execa/lib/io/pipeline.js
-var import_promises10 = require("stream/promises");
+var import_promises8 = require("stream/promises");
 var pipeStreams = (source, destination) => {
   source.pipe(destination);
   onSourceFinish(source, destination);
@@ -46980,7 +46915,7 @@ var onSourceFinish = async (source, destination) => {
     return;
   }
   try {
-    await (0, import_promises10.finished)(source, { cleanup: true, readable: true, writable: false });
+    await (0, import_promises8.finished)(source, { cleanup: true, readable: true, writable: false });
   } catch {
   }
   endDestinationStream(destination);
@@ -46995,7 +46930,7 @@ var onDestinationFinish = async (source, destination) => {
     return;
   }
   try {
-    await (0, import_promises10.finished)(destination, { cleanup: true, readable: false, writable: true });
+    await (0, import_promises8.finished)(destination, { cleanup: true, readable: false, writable: true });
   } catch {
   }
   abortSourceStream(source);
@@ -47466,7 +47401,7 @@ var waitForBothSubprocesses = async (subprocessPromises) => {
 };
 
 // node_modules/execa/lib/pipe/streaming.js
-var import_promises11 = require("stream/promises");
+var import_promises9 = require("stream/promises");
 var pipeSubprocessStream = (sourceStream, destinationStream, maxListenersController) => {
   const mergedStream = MERGED_STREAMS.has(destinationStream) ? pipeMoreSubprocessStream(sourceStream, destinationStream) : pipeFirstSubprocessStream(sourceStream, destinationStream);
   incrementMaxListeners(sourceStream, SOURCE_LISTENERS_PER_PIPE, maxListenersController.signal);
@@ -47487,7 +47422,7 @@ var pipeMoreSubprocessStream = (sourceStream, destinationStream) => {
 };
 var cleanupMergedStreamsMap = async (destinationStream) => {
   try {
-    await (0, import_promises11.finished)(destinationStream, { cleanup: true, readable: false, writable: true });
+    await (0, import_promises9.finished)(destinationStream, { cleanup: true, readable: false, writable: true });
   } catch {
   }
   MERGED_STREAMS.delete(destinationStream);
@@ -47571,7 +47506,7 @@ var handlePipePromise = async ({
 var getSubprocessPromises = (sourcePromise, destination) => Promise.allSettled([sourcePromise, destination]);
 
 // node_modules/execa/lib/io/contents.js
-var import_promises12 = require("timers/promises");
+var import_promises10 = require("timers/promises");
 
 // node_modules/execa/lib/io/iterate.js
 var import_node_events12 = require("events");
@@ -47723,7 +47658,7 @@ var logOutputAsync = async ({ stream, onStreamEnd, fdNumber, encoding, allMixed,
   await logLines(linesIterable, stream, fdNumber, verboseInfo);
 };
 var resumeStream = async (stream) => {
-  await (0, import_promises12.setImmediate)();
+  await (0, import_promises10.setImmediate)();
   if (stream.readableFlowing === null) {
     stream.resume();
   }
@@ -47758,14 +47693,14 @@ var getBufferedData = async (streamPromise) => {
 var handleBufferedData = ({ bufferedData }) => isArrayBuffer(bufferedData) ? new Uint8Array(bufferedData) : bufferedData;
 
 // node_modules/execa/lib/resolve/wait-stream.js
-var import_promises13 = require("stream/promises");
+var import_promises11 = require("stream/promises");
 var waitForStream = async (stream, fdNumber, streamInfo, { isSameDirection, stopOnExit = false } = {}) => {
   const state = handleStdinDestroy(stream, streamInfo);
   const abortController = new AbortController();
   try {
     await Promise.race([
       ...stopOnExit ? [streamInfo.exitPromise] : [],
-      (0, import_promises13.finished)(stream, { cleanup: true, signal: abortController.signal })
+      (0, import_promises11.finished)(stream, { cleanup: true, signal: abortController.signal })
     ]);
   } catch (error2) {
     if (!state.stdinCleanedUp) {
@@ -48079,7 +48014,7 @@ var import_node_stream6 = require("stream");
 var import_node_util9 = require("util");
 
 // node_modules/execa/lib/convert/shared.js
-var import_promises14 = require("stream/promises");
+var import_promises12 = require("stream/promises");
 var safeWaitForSubprocessStdin = async (subprocessStdin) => {
   if (subprocessStdin === void 0) {
     return;
@@ -48099,10 +48034,10 @@ var safeWaitForSubprocessStdout = async (subprocessStdout) => {
   }
 };
 var waitForSubprocessStdin = async (subprocessStdin) => {
-  await (0, import_promises14.finished)(subprocessStdin, { cleanup: true, readable: false, writable: true });
+  await (0, import_promises12.finished)(subprocessStdin, { cleanup: true, readable: false, writable: true });
 };
 var waitForSubprocessStdout = async (subprocessStdout) => {
-  await (0, import_promises14.finished)(subprocessStdout, { cleanup: true, readable: true, writable: false });
+  await (0, import_promises12.finished)(subprocessStdout, { cleanup: true, readable: true, writable: false });
 };
 var waitForSubprocess = async (subprocess, error2) => {
   await subprocess;
@@ -48651,7 +48586,7 @@ var {
   getCancelSignal: getCancelSignal2
 } = getIpcExport();
 
-// node_modules/@remixhq/core/dist/chunk-J3J4PBQ7.js
+// node_modules/@remixhq/core/dist/chunk-RREREIGW.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;
@@ -48709,8 +48644,8 @@ function sanitizeRefFragment(value) {
   return value.trim().replace(/[^A-Za-z0-9._/-]+/g, "-").replace(/\/{2,}/g, "/").replace(/^\/+|\/+$/g, "").replace(/^-+|-+$/g, "").slice(0, 120);
 }
 function normalizeRepoRelativePath(value) {
-  const normalized = import_path4.default.posix.normalize(value.replace(/\\/g, "/").trim());
-  if (!normalized || normalized === "." || normalized === ".." || normalized.startsWith("../") || import_path4.default.posix.isAbsolute(normalized)) {
+  const normalized = import_path2.default.posix.normalize(value.replace(/\\/g, "/").trim());
+  if (!normalized || normalized === "." || normalized === ".." || normalized.startsWith("../") || import_path2.default.posix.isAbsolute(normalized)) {
     throw new RemixError("Git returned an invalid repository-relative path.", {
       exitCode: 1,
       hint: `Path: ${value}`
@@ -48719,11 +48654,11 @@ function normalizeRepoRelativePath(value) {
   return normalized;
 }
 function resolveRepoRelativePath(repoRoot, relativePath) {
-  return import_path4.default.resolve(repoRoot, ...relativePath.split("/"));
+  return import_path2.default.resolve(repoRoot, ...relativePath.split("/"));
 }
 function isWithinRepoRoot(repoRoot, targetPath) {
-  const relative = import_path4.default.relative(repoRoot, targetPath);
-  return relative === "" || !relative.startsWith("..") && !import_path4.default.isAbsolute(relative);
+  const relative = import_path2.default.relative(repoRoot, targetPath);
+  return relative === "" || !relative.startsWith("..") && !import_path2.default.isAbsolute(relative);
 }
 function sha256Hex(value) {
   return (0, import_crypto.createHash)("sha256").update(value).digest("hex");
@@ -48733,7 +48668,7 @@ function resolveGitReportedPath(cwd, reportedPath) {
   if (!value) {
     throw new RemixError("Git returned an empty internal path.", { exitCode: 1 });
   }
-  return import_path4.default.isAbsolute(value) ? value : import_path4.default.resolve(cwd, value);
+  return import_path2.default.isAbsolute(value) ? value : import_path2.default.resolve(cwd, value);
 }
 function parseGitNameStatusZ(stdout) {
   const tokens = stdout.split("\0");
@@ -48804,12 +48739,12 @@ function classifyGitApplyFailure(detail) {
   return "unknown";
 }
 async function pruneEmptyParentDirectories(repoRoot, filePath) {
-  let current = import_path4.default.dirname(filePath);
+  let current = import_path2.default.dirname(filePath);
   while (current !== repoRoot && isWithinRepoRoot(repoRoot, current)) {
-    const entries = await import_promises15.default.readdir(current).catch(() => null);
+    const entries = await import_promises13.default.readdir(current).catch(() => null);
     if (!entries || entries.length > 0) return;
-    await import_promises15.default.rmdir(current).catch(() => void 0);
-    current = import_path4.default.dirname(current);
+    await import_promises13.default.rmdir(current).catch(() => void 0);
+    current = import_path2.default.dirname(current);
   }
 }
 async function findGitRoot(startDir) {
@@ -48911,8 +48846,8 @@ async function getWorkspaceSnapshot(cwd) {
     throw new RemixError("Failed to resolve local HEAD commit.", { exitCode: 1 });
   }
   const includedUntrackedPaths = Array.from(new Set((await listUntrackedFiles(cwd)).map((entry) => normalizeRepoRelativePath(entry))));
-  const tempDir = await import_promises15.default.mkdtemp(import_path4.default.join(import_os2.default.tmpdir(), "remix-index-"));
-  const tempIndexPath = import_path4.default.join(tempDir, "index");
+  const tempDir = await import_promises13.default.mkdtemp(import_path2.default.join(import_os2.default.tmpdir(), "remix-index-"));
+  const tempIndexPath = import_path2.default.join(tempDir, "index");
   const env = { ...process.env, GIT_INDEX_FILE: tempIndexPath };
   try {
     try {
@@ -48935,14 +48870,14 @@ async function getWorkspaceSnapshot(cwd) {
       });
     }
   } finally {
-    await import_promises15.default.rm(tempDir, { recursive: true, force: true }).catch(() => void 0);
+    await import_promises13.default.rm(tempDir, { recursive: true, force: true }).catch(() => void 0);
   }
 }
 async function writeTempUnifiedDiffBackup(diff, prefix = "remix-add-backup") {
   const safePrefix = prefix.replace(/[^a-zA-Z0-9._-]+/g, "-") || "remix-add-backup";
-  const tmpDir = await import_promises15.default.mkdtemp(import_path4.default.join(import_os2.default.tmpdir(), `${safePrefix}-`));
-  const backupPath = import_path4.default.join(tmpDir, "submitted.diff");
-  await import_promises15.default.writeFile(backupPath, diff, "utf8");
+  const tmpDir = await import_promises13.default.mkdtemp(import_path2.default.join(import_os2.default.tmpdir(), `${safePrefix}-`));
+  const backupPath = import_path2.default.join(tmpDir, "submitted.diff");
+  await import_promises13.default.writeFile(backupPath, diff, "utf8");
   return { backupPath, diffSha256: sha256Hex(diff) };
 }
 async function validateUnifiedDiff(cwd, diff) {
@@ -48959,7 +48894,7 @@ async function validateUnifiedDiff(cwd, diff) {
       detail
     };
   } finally {
-    await import_promises15.default.rm(import_path4.default.dirname(backupPath), { recursive: true, force: true }).catch(() => void 0);
+    await import_promises13.default.rm(import_path2.default.dirname(backupPath), { recursive: true, force: true }).catch(() => void 0);
   }
 }
 async function preserveWorkspaceChanges(cwd, prefix = "remix-add-preserve") {
@@ -48979,7 +48914,7 @@ async function preserveWorkspaceChanges(cwd, prefix = "remix-add-preserve") {
 }
 async function reapplyPreservedWorkspaceChanges(cwd, preserved, operation = "`remix collab add`") {
   const patchFilePath = preserved.preservedDiffPath;
-  const tempPatchHash = await import_promises15.default.readFile(patchFilePath, "utf8").then((content) => sha256Hex(content)).catch(() => null);
+  const tempPatchHash = await import_promises13.default.readFile(patchFilePath, "utf8").then((content) => sha256Hex(content)).catch(() => null);
   if (!tempPatchHash) {
     return { status: "failed", detail: "Preserved diff artifact is missing." };
   }
@@ -49019,8 +48954,8 @@ async function createGitBundle(cwd, bundleName = "repository.bundle") {
     throw new RemixError("Failed to resolve local HEAD commit.", { exitCode: 1 });
   }
   const safeName = bundleName.replace(/[^a-zA-Z0-9._-]+/g, "_");
-  const tmpDir = await import_promises15.default.mkdtemp(import_path4.default.join(import_os2.default.tmpdir(), "remix-bundle-"));
-  const bundlePath = import_path4.default.join(tmpDir, safeName);
+  const tmpDir = await import_promises13.default.mkdtemp(import_path2.default.join(import_os2.default.tmpdir(), "remix-bundle-"));
+  const bundlePath = import_path2.default.join(tmpDir, safeName);
   const res = await runGitDetailed(["bundle", "create", bundlePath, "--all"], cwd);
   if (res.exitCode !== 0) {
     const detail = [res.stderr.trim(), res.stdout.trim()].filter(Boolean).join("\n\n");
@@ -49129,7 +49064,7 @@ async function discardCapturedUntrackedChanges(repoRoot, capturedPaths) {
         hint: `Path: ${relativePath}`
       });
     }
-    await import_promises15.default.rm(absolutePath, { recursive: true, force: true }).catch((err) => {
+    await import_promises13.default.rm(absolutePath, { recursive: true, force: true }).catch((err) => {
       throw new RemixError("Failed to remove a captured untracked path before syncing.", {
         exitCode: 1,
         hint: err instanceof Error ? `${relativePath}
@@ -49171,7 +49106,7 @@ async function importGitBundle(cwd, bundlePath, bundleRef) {
   }
 }
 async function cloneGitBundleToDirectory(bundlePath, targetDir) {
-  const parentDir = import_path4.default.dirname(targetDir);
+  const parentDir = import_path2.default.dirname(targetDir);
   const cloneRes = await runGitDetailed(["clone", bundlePath, targetDir], parentDir);
   if (cloneRes.exitCode !== 0) {
     const detail = [cloneRes.stderr.trim(), cloneRes.stdout.trim()].filter(Boolean).join("\n\n");
@@ -49191,10 +49126,10 @@ async function cloneGitBundleToDirectory(bundlePath, targetDir) {
 }
 async function ensureGitInfoExcludeEntries(cwd, entries) {
   const excludePath = await getGitPath(cwd, "info/exclude");
-  await import_promises15.default.mkdir(import_path4.default.dirname(excludePath), { recursive: true });
+  await import_promises13.default.mkdir(import_path2.default.dirname(excludePath), { recursive: true });
   let current = "";
   try {
-    current = await import_promises15.default.readFile(excludePath, "utf8");
+    current = await import_promises13.default.readFile(excludePath, "utf8");
   } catch {
   }
   const lines = new Set(current.split("\n").map((line) => line.trim()).filter(Boolean));
@@ -49206,7 +49141,7 @@ async function ensureGitInfoExcludeEntries(cwd, entries) {
     changed = true;
   }
   if (!changed) return;
-  await import_promises15.default.writeFile(excludePath, `${Array.from(lines).join("\n")}
+  await import_promises13.default.writeFile(excludePath, `${Array.from(lines).join("\n")}
 `, "utf8");
 }
 async function ensureCommitExists(cwd, commitHash) {
@@ -49267,7 +49202,7 @@ async function hardResetToCommit(cwd, commitHash, operation = "`remix collab rec
 async function buildRepoFingerprint(params) {
   const remote = normalizeGitRemote(params.remoteUrl);
   const defaultBranch = params.defaultBranch?.trim().toLowerCase() || "";
-  const payload = remote ? { remote, defaultBranch } : { local: import_path4.default.resolve(params.gitRoot).toLowerCase(), defaultBranch };
+  const payload = remote ? { remote, defaultBranch } : { local: import_path2.default.resolve(params.gitRoot).toLowerCase(), defaultBranch };
   return (0, import_crypto.createHash)("sha256").update(JSON.stringify(payload)).digest("hex");
 }
 function summarizeUnifiedDiff(diff) {
@@ -49283,6 +49218,268 @@ function summarizeUnifiedDiff(diff) {
   return { changedFilesCount, insertions, deletions };
 }
 
+// node_modules/@remixhq/core/dist/chunk-4L3ZBZUQ.js
+var import_promises14 = __toESM(require("fs/promises"), 1);
+var import_path3 = __toESM(require("path"), 1);
+var import_promises15 = __toESM(require("fs/promises"), 1);
+var import_path4 = __toESM(require("path"), 1);
+async function reserveDirectory(targetDir) {
+  try {
+    await import_promises15.default.mkdir(targetDir);
+    return targetDir;
+  } catch (error2) {
+    if (error2?.code === "EEXIST") {
+      throw new RemixError("Output directory already exists.", {
+        exitCode: 2,
+        hint: `Choose an empty destination path: ${targetDir}`
+      });
+    }
+    throw error2;
+  }
+}
+async function reserveAvailableDirPath(preferredDir) {
+  const parent = import_path4.default.dirname(preferredDir);
+  const base = import_path4.default.basename(preferredDir);
+  for (let i2 = 1; i2 <= 1e3; i2 += 1) {
+    const candidate = i2 === 1 ? preferredDir : import_path4.default.join(parent, `${base}-${i2}`);
+    try {
+      await import_promises15.default.mkdir(candidate);
+      return candidate;
+    } catch (error2) {
+      if (error2?.code === "EEXIST") continue;
+      throw error2;
+    }
+  }
+  throw new RemixError("No available output directory name.", {
+    exitCode: 2,
+    hint: `Tried ${base} through ${base}-1000 under ${parent}.`
+  });
+}
+async function writeJsonAtomic2(filePath, value) {
+  const dir = import_path4.default.dirname(filePath);
+  await import_promises15.default.mkdir(dir, { recursive: true });
+  const tmp = `${filePath}.tmp-${Date.now()}`;
+  await import_promises15.default.writeFile(tmp, `${JSON.stringify(value, null, 2)}
+`, "utf8");
+  await import_promises15.default.rename(tmp, filePath);
+}
+function getCollabBindingPath(repoRoot) {
+  return import_path3.default.join(repoRoot, ".remix", "config.json");
+}
+function buildBindingFileV3(params) {
+  return {
+    schemaVersion: 3,
+    repoFingerprint: params.repoFingerprint,
+    remoteUrl: params.remoteUrl,
+    defaultBranch: params.defaultBranch,
+    branchBindings: params.branchBindings
+  };
+}
+function normalizeBranchName(value) {
+  const normalized = String(value ?? "").trim();
+  return normalized || null;
+}
+function normalizeProjectId(value) {
+  const normalized = String(value ?? "").trim();
+  return normalized || null;
+}
+function normalizeBranchBinding(value) {
+  if (!value?.currentAppId || !value?.upstreamAppId) return null;
+  return {
+    projectId: normalizeProjectId(value.projectId),
+    currentAppId: value.currentAppId,
+    upstreamAppId: value.upstreamAppId,
+    threadId: value.threadId ?? null,
+    laneId: value.laneId ?? null,
+    bindingMode: value.bindingMode === "legacy" ? "legacy" : "lane"
+  };
+}
+function buildResolvedBinding(params) {
+  if (!params.binding) return null;
+  return {
+    schemaVersion: 3,
+    projectId: params.binding.projectId ?? params.fallbackProjectId,
+    currentAppId: params.binding.currentAppId,
+    upstreamAppId: params.binding.upstreamAppId,
+    threadId: params.binding.threadId,
+    repoFingerprint: params.repoFingerprint,
+    remoteUrl: params.remoteUrl,
+    defaultBranch: params.defaultBranch,
+    laneId: params.binding.laneId,
+    branchName: params.branchName,
+    bindingMode: params.binding.bindingMode
+  };
+}
+function deriveFallbackProjectId(params) {
+  const candidates = [
+    params.currentBranch ? params.branchBindings[params.currentBranch]?.projectId ?? null : null,
+    params.defaultBranch ? params.branchBindings[params.defaultBranch]?.projectId ?? null : null,
+    ...Object.values(params.branchBindings).map((binding) => binding.projectId),
+    params.legacyProjectId
+  ];
+  for (const candidate of candidates) {
+    if (candidate) return candidate;
+  }
+  return null;
+}
+async function readCollabBindingState(repoRoot, options) {
+  try {
+    const persist = options?.persist === true;
+    const filePath = getCollabBindingPath(repoRoot);
+    const raw = await import_promises14.default.readFile(filePath, "utf8");
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== "object") return null;
+    const currentBranch = normalizeBranchName(await getCurrentBranch(repoRoot).catch(() => null));
+    if (parsed.schemaVersion === 1) {
+      if (!parsed.currentAppId || !parsed.upstreamAppId) return null;
+      const projectId = normalizeProjectId(parsed.projectId);
+      const preferredBranch = normalizeBranchName(parsed.preferredBranch ?? parsed.defaultBranch ?? null);
+      const branchKey = preferredBranch ?? currentBranch ?? null;
+      const branchBindings2 = branchKey ? {
+        [branchKey]: {
+          projectId,
+          currentAppId: parsed.currentAppId,
+          upstreamAppId: parsed.upstreamAppId,
+          threadId: parsed.threadId ?? null,
+          laneId: null,
+          bindingMode: "legacy"
+        }
+      } : {};
+      const migratedFile = buildBindingFileV3({
+        repoFingerprint: parsed.repoFingerprint ?? null,
+        remoteUrl: parsed.remoteUrl ?? null,
+        defaultBranch: parsed.defaultBranch ?? null,
+        branchBindings: branchBindings2
+      });
+      if (persist) {
+        try {
+          await writeJsonAtomic2(filePath, migratedFile);
+        } catch {
+        }
+      }
+      return {
+        schemaVersion: 3,
+        projectId,
+        repoFingerprint: migratedFile.repoFingerprint,
+        remoteUrl: migratedFile.remoteUrl,
+        defaultBranch: migratedFile.defaultBranch,
+        currentBranch,
+        branchBindings: migratedFile.branchBindings,
+        binding: buildResolvedBinding({
+          fallbackProjectId: projectId,
+          repoFingerprint: migratedFile.repoFingerprint,
+          remoteUrl: migratedFile.remoteUrl,
+          defaultBranch: migratedFile.defaultBranch,
+          branchName: branchKey,
+          binding: branchKey ? migratedFile.branchBindings[branchKey] : null
+        })
+      };
+    }
+    if (parsed.schemaVersion !== 2 && parsed.schemaVersion !== 3) return null;
+    const file = parsed;
+    let shouldPersistNormalizedBranchBindings = false;
+    const legacyProjectId = normalizeProjectId(file.projectId);
+    const branchBindings = Object.fromEntries(
+      Object.entries(file.branchBindings ?? {}).map(([branchName, branchBinding]) => {
+        const normalized = normalizeBranchBinding(branchBinding);
+        const rawProjectId = branchBinding && typeof branchBinding === "object" && "projectId" in branchBinding ? normalizeProjectId(branchBinding.projectId) : null;
+        const rawBindingMode = branchBinding && typeof branchBinding === "object" && "bindingMode" in branchBinding ? branchBinding.bindingMode : null;
+        const hasLegacyPreferredBranch = Boolean(branchBinding) && typeof branchBinding === "object" && "preferredBranch" in branchBinding;
+        let normalizedWithProject = normalized;
+        if (normalizedWithProject && !normalizedWithProject.projectId && legacyProjectId) {
+          normalizedWithProject = {
+            ...normalizedWithProject,
+            projectId: legacyProjectId
+          };
+        }
+        if (normalizedWithProject && (rawBindingMode !== normalizedWithProject.bindingMode || hasLegacyPreferredBranch || rawProjectId !== normalizedWithProject.projectId)) {
+          shouldPersistNormalizedBranchBindings = true;
+        }
+        return [branchName, normalizedWithProject];
+      }).filter((entry) => Boolean(entry[1]))
+    );
+    const legacyExplicitBinding = normalizeBranchBinding(file.explicitBinding ?? null);
+    const legacyExplicitBranch = currentBranch ?? normalizeBranchName(file.defaultBranch);
+    if (legacyExplicitBinding && legacyExplicitBranch) {
+      branchBindings[legacyExplicitBranch] = {
+        ...legacyExplicitBinding,
+        projectId: legacyExplicitBinding.projectId ?? branchBindings[legacyExplicitBranch]?.projectId ?? legacyProjectId,
+        bindingMode: "lane"
+      };
+      shouldPersistNormalizedBranchBindings = true;
+    }
+    if (persist && ("explicitBinding" in file || shouldPersistNormalizedBranchBindings || parsed.schemaVersion === 2)) {
+      try {
+        await writeJsonAtomic2(
+          filePath,
+          buildBindingFileV3({
+            repoFingerprint: file.repoFingerprint ?? null,
+            remoteUrl: file.remoteUrl ?? null,
+            defaultBranch: file.defaultBranch ?? null,
+            branchBindings
+          })
+        );
+      } catch {
+      }
+    }
+    const resolvedBranch = currentBranch ?? normalizeBranchName(file.defaultBranch);
+    const fallbackProjectId = deriveFallbackProjectId({
+      branchBindings,
+      currentBranch: resolvedBranch,
+      defaultBranch: normalizeBranchName(file.defaultBranch),
+      legacyProjectId
+    });
+    return {
+      schemaVersion: parsed.schemaVersion,
+      projectId: fallbackProjectId,
+      repoFingerprint: file.repoFingerprint ?? null,
+      remoteUrl: file.remoteUrl ?? null,
+      defaultBranch: file.defaultBranch ?? null,
+      currentBranch,
+      branchBindings,
+      binding: buildResolvedBinding({
+        fallbackProjectId,
+        repoFingerprint: file.repoFingerprint ?? null,
+        remoteUrl: file.remoteUrl ?? null,
+        defaultBranch: file.defaultBranch ?? null,
+        branchName: resolvedBranch,
+        binding: resolvedBranch ? branchBindings[resolvedBranch] ?? null : null
+      })
+    };
+  } catch {
+    return null;
+  }
+}
+async function readCollabBinding(repoRoot) {
+  const state = await readCollabBindingState(repoRoot);
+  return state?.binding ?? null;
+}
+async function writeCollabBinding(repoRoot, binding) {
+  const filePath = getCollabBindingPath(repoRoot);
+  const currentBranch = normalizeBranchName(await getCurrentBranch(repoRoot).catch(() => null));
+  const branchName = normalizeBranchName(binding.branchName) ?? currentBranch ?? binding.defaultBranch ?? "main";
+  const existing = await readCollabBindingState(repoRoot, { persist: true });
+  const branchBindings = { ...existing?.branchBindings ?? {} };
+  branchBindings[branchName] = {
+    projectId: normalizeProjectId(binding.projectId) ?? branchBindings[branchName]?.projectId ?? existing?.projectId ?? null,
+    currentAppId: binding.currentAppId,
+    upstreamAppId: binding.upstreamAppId,
+    threadId: binding.threadId ?? null,
+    laneId: binding.laneId ?? null,
+    bindingMode: binding.bindingMode ?? "lane"
+  };
+  await writeJsonAtomic2(
+    filePath,
+    buildBindingFileV3({
+      repoFingerprint: binding.repoFingerprint ?? null,
+      remoteUrl: binding.remoteUrl ?? null,
+      defaultBranch: binding.defaultBranch ?? null,
+      branchBindings
+    })
+  );
+  return filePath;
+}
+
 // node_modules/@remixhq/core/dist/collab.js
 var import_promises16 = __toESM(require("fs/promises"), 1);
 var import_path5 = __toESM(require("path"), 1);
@@ -49309,29 +49506,29 @@ function describeBranch(value) {
   const normalized = String(value ?? "").trim();
   return normalized || "(detached)";
 }
-function isPreferredBranchMatch(currentBranch, preferredBranch) {
+function isBoundBranchMatch(currentBranch, branchName) {
   const current = String(currentBranch ?? "").trim();
-  const preferred = String(preferredBranch ?? "").trim();
-  if (!preferred || !current) return true;
-  return current === preferred;
+  const expected = String(branchName ?? "").trim();
+  if (!expected || !current) return true;
+  return current === expected;
 }
-function buildPreferredBranchMismatchHint(params) {
+function buildBranchMismatchHint(params) {
   const overrideFlag = params.overrideFlag?.trim() || "--allow-branch-mismatch";
   return [
     `Current branch: ${describeBranch(params.currentBranch)}`,
-    `Preferred branch: ${describeBranch(params.preferredBranch)}`,
-    `Switch to ${describeBranch(params.preferredBranch)} or rerun with ${overrideFlag} if this is intentional.`
+    `Bound branch: ${describeBranch(params.branchName)}`,
+    `Switch to ${describeBranch(params.branchName)} or rerun with ${overrideFlag} if this is intentional.`
   ].join("\n");
 }
-function assertPreferredBranchMatch(params) {
+function assertBoundBranchMatch(params) {
   if (params.allowBranchMismatch) return;
-  if (isPreferredBranchMatch(params.currentBranch, params.preferredBranch)) return;
-  throw new RemixError(`Current branch does not match this checkout's Remix preferred branch while running ${params.operation}.`, {
+  if (isBoundBranchMatch(params.currentBranch, params.branchName)) return;
+  throw new RemixError(`Current branch does not match this checkout's bound Remix branch while running ${params.operation}.`, {
     code: REMIX_ERROR_CODES.PREFERRED_BRANCH_MISMATCH,
     exitCode: 2,
-    hint: buildPreferredBranchMismatchHint({
+    hint: buildBranchMismatchHint({
       currentBranch: params.currentBranch,
-      preferredBranch: params.preferredBranch,
+      branchName: params.branchName,
       overrideFlag: params.overrideFlag
     })
   });
@@ -49392,6 +49589,52 @@ function sanitizeCheckoutDirName(value) {
 function buildDashboardAppUrl(appId) {
   return `https://dashboard.remix.one/apps/${encodeURIComponent(appId)}`;
 }
+async function resolveProjectLaneIfAuthoritative(api, params) {
+  const branchName = String(params.branchName ?? "").trim();
+  if (!branchName) return null;
+  if (!params.projectId && !params.repoFingerprint && !params.remoteUrl) return null;
+  const readLane = async () => {
+    const laneResp = await api.resolveProjectLaneBinding({
+      projectId: params.projectId ?? void 0,
+      repoFingerprint: params.repoFingerprint ?? void 0,
+      remoteUrl: params.remoteUrl ?? void 0,
+      defaultBranch: params.defaultBranch ?? void 0,
+      branchName
+    });
+    return unwrapResponseObject(laneResp, "project lane binding");
+  };
+  let lane = await readLane();
+  const shouldRepairResolvedLane = lane.status === "resolved" && Boolean(
+    params.expectedUpstreamAppId && (!lane.upstreamAppId || lane.upstreamAppId !== params.expectedUpstreamAppId)
+  );
+  if (shouldRepairResolvedLane && params.createIfMissing && params.seedAppId) {
+    const ensuredResp = await api.ensureProjectLaneBinding({
+      projectId: params.projectId ?? void 0,
+      repoFingerprint: params.repoFingerprint ?? void 0,
+      remoteUrl: params.remoteUrl ?? void 0,
+      defaultBranch: params.defaultBranch ?? void 0,
+      branchName,
+      seedAppId: params.seedAppId
+    });
+    lane = unwrapResponseObject(ensuredResp, "project lane binding");
+  }
+  if (lane.status !== "resolved" && params.createIfMissing && params.seedAppId) {
+    const ensuredResp = await api.ensureProjectLaneBinding({
+      projectId: params.projectId ?? void 0,
+      repoFingerprint: params.repoFingerprint ?? void 0,
+      remoteUrl: params.remoteUrl ?? void 0,
+      defaultBranch: params.defaultBranch ?? void 0,
+      branchName,
+      seedAppId: params.seedAppId
+    });
+    lane = unwrapResponseObject(ensuredResp, "project lane binding");
+  }
+  if (lane.status !== "resolved") return null;
+  if (params.projectId && lane.projectId && lane.projectId !== params.projectId) return null;
+  if (params.currentAppId && lane.currentAppId && lane.currentAppId !== params.currentAppId) return null;
+  if (params.expectedUpstreamAppId && lane.upstreamAppId && lane.upstreamAppId !== params.expectedUpstreamAppId) return null;
+  return lane;
+}
 async function pollAppReady(api, appId) {
   const started = Date.now();
   let delay = 2e3;
@@ -49535,6 +49778,273 @@ async function pollMergeRequestCompletion(api, mrId, params) {
   }
   throw new RemixError("Timed out waiting for merge approval to complete.", { exitCode: 1 });
 }
+function normalizeBranchName2(value) {
+  const normalized = String(value ?? "").trim();
+  return normalized || null;
+}
+function buildBindingFromLane(state, lane) {
+  if (!lane.currentAppId || !lane.upstreamAppId) return null;
+  return {
+    schemaVersion: 3,
+    projectId: lane.projectId ?? state.projectId,
+    currentAppId: lane.currentAppId,
+    upstreamAppId: lane.upstreamAppId,
+    threadId: lane.threadId ?? null,
+    repoFingerprint: lane.repoFingerprint ?? state.repoFingerprint ?? null,
+    remoteUrl: lane.remoteUrl ?? state.remoteUrl ?? null,
+    defaultBranch: lane.defaultBranch ?? state.defaultBranch ?? null,
+    laneId: lane.laneId ?? null,
+    branchName: lane.branchName ?? state.currentBranch ?? null,
+    bindingMode: "lane"
+  };
+}
+function shouldPersistRemoteLaneMetadata(localBinding, lane) {
+  return Boolean(
+    !localBinding.laneId && lane.laneId || !localBinding.threadId && lane.threadId || !localBinding.repoFingerprint && lane.repoFingerprint || !localBinding.remoteUrl && lane.remoteUrl || !localBinding.defaultBranch && lane.defaultBranch || !localBinding.branchName && lane.branchName
+  );
+}
+function shouldRequireRemoteLaneForCurrentBranch(params) {
+  if (!params.currentBranch) return false;
+  const defaultBranch = normalizeBranchName2(params.defaultBranch);
+  if (params.currentBranch === defaultBranch) return false;
+  return !params.binding.laneId || params.binding.currentAppId === params.binding.upstreamAppId;
+}
+async function persistResolvedLane(repoRoot, binding) {
+  await writeCollabBinding(repoRoot, {
+    projectId: binding.projectId,
+    currentAppId: binding.currentAppId,
+    upstreamAppId: binding.upstreamAppId,
+    threadId: binding.threadId,
+    repoFingerprint: binding.repoFingerprint,
+    remoteUrl: binding.remoteUrl,
+    defaultBranch: binding.defaultBranch,
+    laneId: binding.laneId,
+    branchName: binding.branchName,
+    bindingMode: binding.bindingMode
+  });
+  return readCollabBinding(repoRoot);
+}
+async function resolveActiveLaneBinding(params) {
+  const state = await readCollabBindingState(params.repoRoot);
+  if (!state) {
+    return { status: "not_bound", currentBranch: null };
+  }
+  const currentBranch = normalizeBranchName2(state.currentBranch);
+  const localBinding = state.binding;
+  if (localBinding) {
+    const requireRemoteLane = shouldRequireRemoteLaneForCurrentBranch({
+      binding: localBinding,
+      currentBranch,
+      defaultBranch: state.defaultBranch
+    });
+    if (!params.api || !currentBranch) {
+      return {
+        status: "resolved",
+        source: "local",
+        binding: localBinding,
+        currentBranch
+      };
+    }
+    const laneResp2 = await params.api.resolveProjectLaneBinding({
+      projectId: localBinding.projectId ?? state.projectId ?? void 0,
+      repoFingerprint: state.repoFingerprint ?? void 0,
+      remoteUrl: state.remoteUrl ?? void 0,
+      defaultBranch: state.defaultBranch ?? void 0,
+      branchName: currentBranch
+    });
+    const lane2 = unwrapResponseObject(laneResp2, "project lane binding");
+    if (lane2.status === "resolved") {
+      const resolvedBranch = normalizeBranchName2(lane2.branchName);
+      const resolvedProjectId = lane2.projectId ?? state.projectId;
+      const branchConflict = Boolean(resolvedBranch && localBinding.branchName && resolvedBranch !== localBinding.branchName);
+      const appConflict = Boolean(lane2.currentAppId && lane2.currentAppId !== localBinding.currentAppId);
+      const upstreamConflict = Boolean(lane2.upstreamAppId && lane2.upstreamAppId !== localBinding.upstreamAppId);
+      const projectConflict = Boolean(resolvedProjectId && localBinding.projectId && resolvedProjectId !== localBinding.projectId);
+      if (branchConflict || appConflict || upstreamConflict || projectConflict) {
+        if (requireRemoteLane) {
+          const binding = buildBindingFromLane(state, lane2);
+          if (binding) {
+            return {
+              status: "resolved",
+              source: "remote",
+              binding,
+              currentBranch
+            };
+          }
+        }
+        return {
+          status: "binding_conflict",
+          binding: localBinding,
+          resolvedLane: lane2,
+          currentBranch
+        };
+      }
+      if (shouldPersistRemoteLaneMetadata(localBinding, lane2)) {
+        const binding = buildBindingFromLane(state, lane2);
+        if (binding) {
+          return {
+            status: "resolved",
+            source: "remote",
+            binding,
+            currentBranch
+          };
+        }
+      }
+    }
+    if (requireRemoteLane) {
+      return {
+        status: "missing_branch_binding",
+        currentBranch,
+        projectId: state.projectId,
+        repoFingerprint: state.repoFingerprint,
+        remoteUrl: state.remoteUrl,
+        defaultBranch: state.defaultBranch,
+        upstreamAppId: localBinding.upstreamAppId ?? null,
+        threadId: localBinding.threadId ?? null
+      };
+    }
+    return {
+      status: "resolved",
+      source: "local",
+      binding: localBinding,
+      currentBranch
+    };
+  }
+  if (!params.api || !currentBranch) {
+    return {
+      status: "missing_branch_binding",
+      currentBranch,
+      projectId: state.projectId,
+      repoFingerprint: state.repoFingerprint,
+      remoteUrl: state.remoteUrl,
+      defaultBranch: state.defaultBranch,
+      upstreamAppId: null,
+      threadId: null
+    };
+  }
+  const laneResp = await params.api.resolveProjectLaneBinding({
+    projectId: state.projectId ?? void 0,
+    repoFingerprint: state.repoFingerprint ?? void 0,
+    remoteUrl: state.remoteUrl ?? void 0,
+    defaultBranch: state.defaultBranch ?? void 0,
+    branchName: currentBranch
+  });
+  const lane = unwrapResponseObject(laneResp, "project lane binding");
+  if (lane.status === "resolved") {
+    const binding = buildBindingFromLane(state, lane);
+    if (binding) {
+      return {
+        status: "resolved",
+        source: "remote",
+        binding,
+        currentBranch
+      };
+    }
+  }
+  if (lane.status === "binding_not_found") {
+    return { status: "not_bound", currentBranch };
+  }
+  return {
+    status: "missing_branch_binding",
+    currentBranch,
+    projectId: lane.projectId ?? state.projectId,
+    repoFingerprint: lane.repoFingerprint ?? state.repoFingerprint,
+    remoteUrl: lane.remoteUrl ?? state.remoteUrl,
+    defaultBranch: lane.defaultBranch ?? state.defaultBranch,
+    upstreamAppId: lane.upstreamAppId ?? null,
+    threadId: lane.threadId ?? null
+  };
+}
+async function ensureActiveLaneBinding(params) {
+  const resolved = await resolveActiveLaneBinding({
+    repoRoot: params.repoRoot,
+    api: params.api
+  });
+  if (resolved.status === "resolved") {
+    if (resolved.source === "local") {
+      return resolved.binding;
+    }
+    return persistResolvedLane(params.repoRoot, resolved.binding);
+  }
+  if (resolved.status === "binding_conflict") {
+    throw new RemixError("Current branch binding conflicts with the server-resolved Remix lane.", {
+      exitCode: 2,
+      hint: `Local app ${resolved.binding.currentAppId}; server app ${resolved.resolvedLane.currentAppId ?? "(unknown)"}. Repair the branch binding before running ${params.operation ?? "this command"}.`
+    });
+  }
+  if (resolved.status === "not_bound") {
+    return null;
+  }
+  if (!resolved.currentBranch) {
+    throw new RemixError("Current branch is not yet bound to a Remix lane.", {
+      exitCode: 2,
+      hint: `Switch to a named branch before running ${params.operation ?? "this command"}.`
+    });
+  }
+  throw new RemixError("Current branch is not yet bound to a Remix lane.", {
+    exitCode: 2,
+    hint: `Run \`remix collab init\` on branch ${resolved.currentBranch} before running ${params.operation ?? "this command"}.`
+  });
+}
+async function provisionActiveLaneBinding(params) {
+  const resolved = await resolveActiveLaneBinding(params);
+  if (resolved.status === "resolved") {
+    if (resolved.source === "local") {
+      return { binding: resolved.binding, warnings: [] };
+    }
+    const persisted2 = await persistResolvedLane(params.repoRoot, resolved.binding);
+    return { binding: persisted2, warnings: [] };
+  }
+  if (resolved.status === "binding_conflict") {
+    throw new RemixError("Current branch binding conflicts with the server-resolved Remix lane.", {
+      exitCode: 2,
+      hint: `Local app ${resolved.binding.currentAppId}; server app ${resolved.resolvedLane.currentAppId ?? "(unknown)"}. Repair the branch binding before running ${params.operation}.`
+    });
+  }
+  if (resolved.status === "not_bound") {
+    return { binding: null, warnings: [] };
+  }
+  if (!resolved.currentBranch) {
+    throw new RemixError("Current branch is not yet bound to a Remix lane.", {
+      exitCode: 2,
+      hint: `Switch to a named branch before running ${params.operation}.`
+    });
+  }
+  let lane;
+  try {
+    const laneResp = await params.api.ensureProjectLaneBinding({
+      projectId: resolved.projectId ?? void 0,
+      repoFingerprint: resolved.repoFingerprint ?? void 0,
+      remoteUrl: resolved.remoteUrl ?? void 0,
+      defaultBranch: resolved.defaultBranch ?? void 0,
+      branchName: resolved.currentBranch
+    });
+    lane = unwrapResponseObject(laneResp, "project lane binding");
+  } catch (error2) {
+    throw new RemixError(`Failed to provision a Remix lane for branch ${resolved.currentBranch}.`, {
+      exitCode: error2 instanceof RemixError ? error2.exitCode : 1,
+      hint: formatCliErrorDetail(error2) || `Remix could not create or recover the branch lane required before ${params.operation}.`
+    });
+  }
+  const state = await readCollabBindingState(params.repoRoot);
+  if (!state) {
+    return { binding: null, warnings: [] };
+  }
+  const binding = buildBindingFromLane(state, lane);
+  if (!binding) {
+    throw new RemixError(`Failed to provision a Remix lane for branch ${resolved.currentBranch}.`, {
+      exitCode: 1,
+      hint: "The server returned incomplete lane binding metadata."
+    });
+  }
+  const persisted = await persistResolvedLane(params.repoRoot, binding);
+  return {
+    binding: persisted,
+    warnings: [
+      lane.created ? `Provisioned Remix lane for branch ${resolved.currentBranch}.` : `Recovered existing Remix lane binding for branch ${resolved.currentBranch}.`
+    ]
+  };
+}
 async function collabRecordingPreflight(params) {
   let repoRoot;
   try {
@@ -49546,7 +50056,7 @@ async function collabRecordingPreflight(params) {
       repoRoot: null,
       appId: null,
       currentBranch: null,
-      preferredBranch: null,
+      branchName: null,
       headCommitHash: null,
       worktreeClean: false,
       syncStatus: null,
@@ -49558,14 +50068,14 @@ async function collabRecordingPreflight(params) {
       hint: message
     };
   }
-  const binding = await readCollabBinding(repoRoot);
-  if (!binding) {
+  const bindingResolution = await resolveActiveLaneBinding({ repoRoot, api: params.api });
+  if (bindingResolution.status === "not_bound") {
     return {
       status: "not_bound",
       repoRoot,
       appId: null,
       currentBranch: null,
-      preferredBranch: null,
+      branchName: null,
       headCommitHash: null,
       worktreeClean: false,
       syncStatus: null,
@@ -49577,19 +50087,56 @@ async function collabRecordingPreflight(params) {
       hint: "Run `remix collab init` first."
     };
   }
+  if (bindingResolution.status === "missing_branch_binding") {
+    return {
+      status: "branch_binding_missing",
+      repoRoot,
+      appId: null,
+      currentBranch: bindingResolution.currentBranch,
+      branchName: bindingResolution.currentBranch,
+      headCommitHash: null,
+      worktreeClean: false,
+      syncStatus: null,
+      syncTargetCommitHash: null,
+      syncTargetCommitId: null,
+      reconcileTargetHeadCommitHash: null,
+      reconcileTargetHeadCommitId: null,
+      warnings: [],
+      hint: `Current branch ${bindingResolution.currentBranch ?? "(detached)"} is not yet bound to a Remix lane.`
+    };
+  }
+  if (bindingResolution.status === "binding_conflict") {
+    return {
+      status: "metadata_conflict",
+      repoRoot,
+      appId: bindingResolution.binding.currentAppId,
+      currentBranch: bindingResolution.currentBranch,
+      branchName: bindingResolution.binding.branchName,
+      headCommitHash: null,
+      worktreeClean: false,
+      syncStatus: null,
+      syncTargetCommitHash: null,
+      syncTargetCommitId: null,
+      reconcileTargetHeadCommitHash: null,
+      reconcileTargetHeadCommitId: null,
+      warnings: [],
+      hint: `Local binding for ${bindingResolution.currentBranch ?? "(detached)"} points to app ${bindingResolution.binding.currentAppId}, but the server resolved lane ${bindingResolution.resolvedLane.laneId ?? "(unknown)"} / app ${bindingResolution.resolvedLane.currentAppId ?? "(unknown)"}. Repair the branch binding before recording work.`
+    };
+  }
+  const binding = bindingResolution.binding;
   const [currentBranch, headCommitHash, worktreeStatus] = await Promise.all([
     getCurrentBranch(repoRoot),
     getHeadCommitHash(repoRoot),
     getWorktreeStatus(repoRoot)
   ]);
-  const preferredBranch = binding.preferredBranch ?? null;
+  const branchName = binding.branchName ?? null;
   if (!headCommitHash) {
     return {
       status: "missing_head",
       repoRoot,
       appId: binding.currentAppId,
       currentBranch,
-      preferredBranch,
+      branchName,
       headCommitHash: null,
       worktreeClean: worktreeStatus.isClean,
       syncStatus: null,
@@ -49601,13 +50148,13 @@ async function collabRecordingPreflight(params) {
       hint: "Failed to resolve local HEAD commit."
     };
   }
-  if (!params.allowBranchMismatch && !isPreferredBranchMatch(currentBranch, preferredBranch)) {
+  if (!params.allowBranchMismatch && !isBoundBranchMatch(currentBranch, branchName)) {
     return {
       status: "branch_mismatch",
       repoRoot,
       appId: binding.currentAppId,
       currentBranch,
-      preferredBranch,
+      branchName,
       headCommitHash,
       worktreeClean: worktreeStatus.isClean,
       syncStatus: null,
@@ -49616,9 +50163,9 @@ async function collabRecordingPreflight(params) {
       reconcileTargetHeadCommitHash: null,
       reconcileTargetHeadCommitId: null,
       warnings: [],
-      hint: buildPreferredBranchMismatchHint({
+      hint: buildBranchMismatchHint({
         currentBranch,
-        preferredBranch
+        branchName
       })
     };
   }
@@ -49636,7 +50183,7 @@ async function collabRecordingPreflight(params) {
       repoRoot,
       appId: binding.currentAppId,
       currentBranch,
-      preferredBranch,
+      branchName,
       headCommitHash,
       worktreeClean: worktreeStatus.isClean,
       syncStatus: sync.status,
@@ -49654,7 +50201,7 @@ async function collabRecordingPreflight(params) {
       repoRoot,
       appId: binding.currentAppId,
       currentBranch,
-      preferredBranch,
+      branchName,
       headCommitHash,
       worktreeClean: worktreeStatus.isClean,
       syncStatus: sync.status,
@@ -49679,7 +50226,7 @@ async function collabRecordingPreflight(params) {
       repoRoot,
       appId: binding.currentAppId,
       currentBranch,
-      preferredBranch,
+      branchName,
       headCommitHash,
       worktreeClean: worktreeStatus.isClean,
       syncStatus: sync.status,
@@ -49697,7 +50244,7 @@ async function collabRecordingPreflight(params) {
       repoRoot,
       appId: binding.currentAppId,
       currentBranch,
-      preferredBranch,
+      branchName,
       headCommitHash,
       worktreeClean: worktreeStatus.isClean,
       syncStatus: sync.status,
@@ -49714,7 +50261,7 @@ async function collabRecordingPreflight(params) {
     repoRoot,
     appId: binding.currentAppId,
     currentBranch,
-    preferredBranch,
+    branchName,
     headCommitHash,
     worktreeClean: worktreeStatus.isClean,
     syncStatus: sync.status,
@@ -49936,7 +50483,11 @@ async function withRepoMutationLock(options, fn) {
 }
 async function collabSync(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab sync`"
+  });
   if (!binding) {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
@@ -49945,9 +50496,9 @@ async function collabSync(params) {
   }
   await ensureCleanWorktree(repoRoot);
   const branch = await requireCurrentBranch(repoRoot);
-  assertPreferredBranchMatch({
+  assertBoundBranchMatch({
     currentBranch: branch,
-    preferredBranch: binding.preferredBranch,
+    branchName: binding.branchName,
     allowBranchMismatch: params.allowBranchMismatch,
     operation: "`remix collab sync`"
   });
@@ -50024,9 +50575,9 @@ async function collabSync(params) {
       });
       await ensureCleanWorktree(lockedRepoRoot);
       const lockedBranch = await requireCurrentBranch(lockedRepoRoot);
-      assertPreferredBranchMatch({
+      assertBoundBranchMatch({
         currentBranch: lockedBranch,
-        preferredBranch: binding.preferredBranch,
+        branchName: binding.branchName,
         allowBranchMismatch: params.allowBranchMismatch,
         operation: "`remix collab sync`"
       });
@@ -50057,6 +50608,12 @@ function assertSupportedRecordingPreflight(preflight) {
       hint: preflight.hint
     });
   }
+  if (preflight.status === "branch_binding_missing") {
+    throw new RemixError("Current branch is not yet bound to a Remix lane.", {
+      exitCode: 2,
+      hint: preflight.hint
+    });
+  }
   if (preflight.status === "not_git_repo") {
     throw new RemixError(preflight.hint || "Not inside a git repository.", {
       exitCode: 2,
@@ -50070,9 +50627,9 @@ function assertSupportedRecordingPreflight(preflight) {
     });
   }
   if (preflight.status === "branch_mismatch") {
-    assertPreferredBranchMatch({
+    assertBoundBranchMatch({
       currentBranch: preflight.currentBranch,
-      preferredBranch: preflight.preferredBranch,
+      branchName: preflight.branchName,
       allowBranchMismatch: false,
       operation: "`remix collab add`"
     });
@@ -50092,7 +50649,11 @@ function assertSupportedRecordingPreflight(preflight) {
 }
 async function collabAdd(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab add`"
+  });
   if (!binding) {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
@@ -50113,9 +50674,9 @@ async function collabAdd(params) {
     });
     assertSupportedRecordingPreflight(preflight);
     const branch = preflight.currentBranch;
-    assertPreferredBranchMatch({
+    assertBoundBranchMatch({
       currentBranch: branch,
-      preferredBranch: binding.preferredBranch,
+      branchName: binding.branchName,
       allowBranchMismatch: params.allowBranchMismatch,
       operation: "`remix collab add`"
     });
@@ -50288,6 +50849,7 @@ async function collabAdd(params) {
     });
     const resp = await params.api.createChangeStep(binding.currentAppId, {
       threadId: binding.threadId ?? void 0,
+      collabLaneId: binding.laneId ?? void 0,
       prompt,
       assistantResponse: assistantResponse ?? void 0,
       diff,
@@ -50361,6 +50923,12 @@ function assertSupportedRecordingPreflight2(preflight) {
       hint: preflight.hint
     });
   }
+  if (preflight.status === "branch_binding_missing") {
+    throw new RemixError("Current branch is not yet bound to a Remix lane.", {
+      exitCode: 2,
+      hint: preflight.hint
+    });
+  }
   if (preflight.status === "not_git_repo") {
     throw new RemixError(preflight.hint || "Not inside a git repository.", {
       exitCode: 2,
@@ -50374,9 +50942,9 @@ function assertSupportedRecordingPreflight2(preflight) {
     });
   }
   if (preflight.status === "branch_mismatch") {
-    assertPreferredBranchMatch({
+    assertBoundBranchMatch({
       currentBranch: preflight.currentBranch,
-      preferredBranch: preflight.preferredBranch,
+      branchName: preflight.branchName,
       allowBranchMismatch: false,
       operation: "`remix collab record-turn`"
     });
@@ -50396,7 +50964,11 @@ function assertSupportedRecordingPreflight2(preflight) {
 }
 async function collabRecordTurn(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab record-turn`"
+  });
   if (!binding) {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
@@ -50428,9 +51000,9 @@ async function collabRecordTurn(params) {
     });
   }
   const branch = await getCurrentBranch(repoRoot);
-  assertPreferredBranchMatch({
+  assertBoundBranchMatch({
     currentBranch: branch,
-    preferredBranch: binding.preferredBranch,
+    branchName: binding.branchName,
     allowBranchMismatch: params.allowBranchMismatch,
     operation: "`remix collab record-turn`"
   });
@@ -50444,6 +51016,7 @@ async function collabRecordTurn(params) {
   });
   const resp = await params.api.createCollabTurn(binding.currentAppId, {
     threadId: binding.threadId ?? void 0,
+    collabLaneId: binding.laneId ?? void 0,
     prompt,
     assistantResponse,
     actor: params.actor,
@@ -50456,7 +51029,8 @@ async function collabRecordTurn(params) {
     },
     idempotencyKey
   });
-  return unwrapResponseObject(resp, "collab turn");
+  const turn = unwrapResponseObject(resp, "collab turn");
+  return turn;
 }
 function collectWarnings(value) {
   if (!Array.isArray(value)) return [];
@@ -50464,7 +51038,11 @@ function collectWarnings(value) {
 }
 async function collabFinalizeTurn(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab finalize-turn`"
+  });
   if (!binding) {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
@@ -50570,7 +51148,11 @@ async function collabApprove(params) {
         operation: "collabApproveSyncTarget"
       },
       async ({ repoRoot, warnings }) => {
-        const binding = await readCollabBinding(repoRoot);
+        const binding = await ensureActiveLaneBinding({
+          repoRoot,
+          api: params.api,
+          operation: "`remix collab approve --sync-target-repo`"
+        });
         if (!binding) {
           throw new RemixError("Repository is not bound to Remix.", {
             exitCode: 2,
@@ -50579,9 +51161,9 @@ async function collabApprove(params) {
         }
         await ensureCleanWorktree(repoRoot, "`remix collab approve --sync-target-repo`");
         const branch = await requireCurrentBranch(repoRoot);
-        assertPreferredBranchMatch({
+        assertBoundBranchMatch({
           currentBranch: branch,
-          preferredBranch: binding.preferredBranch,
+          branchName: binding.branchName,
           allowBranchMismatch: params.allowBranchMismatch,
           operation: "`remix collab approve --sync-target-repo`"
         });
@@ -50659,10 +51241,6 @@ function isSubpath(parentPath, candidatePath) {
   const relative = import_path8.default.relative(parentPath, candidatePath);
   return relative === "" || !relative.startsWith("..") && !import_path8.default.isAbsolute(relative);
 }
-function buildPreferredCheckoutBranch(appId) {
-  const normalized = appId.trim().replace(/[^a-zA-Z0-9._-]+/g, "-").replace(/^-+|-+$/g, "");
-  return `remix/remix/${normalized || "app"}`;
-}
 async function resolveCheckoutDestination(params) {
   if (params.outputDir?.trim()) {
     const preferredRepoRoot = import_path8.default.resolve(params.outputDir.trim());
@@ -50727,7 +51305,9 @@ async function materializeAppCheckout(params) {
     const bundle = await params.api.downloadAppBundle(params.appId);
     await import_promises19.default.writeFile(bundlePath, bundle.data);
     await cloneGitBundleToDirectory(bundlePath, repoRoot);
-    await checkoutLocalBranch(repoRoot, buildPreferredCheckoutBranch(params.appId));
+    if (params.expectedBranchName?.trim()) {
+      await checkoutLocalBranch(repoRoot, params.expectedBranchName.trim());
+    }
     await ensureGitInfoExcludeEntries(repoRoot, [".remix/"]);
   } catch (err) {
     await import_promises19.default.rm(repoRoot, { recursive: true, force: true }).catch(() => {
@@ -50736,15 +51316,15 @@ async function materializeAppCheckout(params) {
   } finally {
     await import_promises19.default.rm(bundleTempDir, { recursive: true, force: true });
   }
-  const remoteUrl = normalizeGitRemote(await getRemoteOriginUrl(repoRoot));
-  const defaultBranch = await getDefaultBranch(repoRoot) ?? await getCurrentBranch(repoRoot) ?? null;
-  const preferredBranch = await getCurrentBranch(repoRoot) ?? buildPreferredCheckoutBranch(params.appId);
+  const branchName = await getCurrentBranch(repoRoot) ?? params.expectedBranchName?.trim() ?? null;
+  const remoteUrl = normalizeGitRemote(params.expectedRemoteUrl ?? await getRemoteOriginUrl(repoRoot));
+  const defaultBranch = params.expectedDefaultBranch?.trim() ?? await getDefaultBranch(repoRoot) ?? branchName ?? null;
   const repoFingerprint = remoteUrl ? await buildRepoFingerprint({ gitRoot: repoRoot, remoteUrl, defaultBranch }) : null;
   return {
     repoRoot,
     remoteUrl,
     defaultBranch,
-    preferredBranch,
+    branchName,
     repoFingerprint
   };
 }
@@ -50757,29 +51337,55 @@ async function collabCheckout(params) {
     });
   }
   const app = await pollAppReady(params.api, appId);
+  const collab = app.collab && typeof app.collab === "object" ? app.collab : null;
+  const source = app.source && typeof app.source === "object" ? app.source : null;
+  const authoritativeBranchName = typeof collab?.branchName === "string" && collab.branchName.trim() || typeof source?.branch === "string" && source.branch.trim() || typeof source?.defaultBranch === "string" && source.defaultBranch.trim() || null;
+  const authoritativeRemoteUrl = typeof source?.remoteUrl === "string" && source.remoteUrl.trim() || null;
+  const authoritativeDefaultBranch = typeof source?.defaultBranch === "string" && source.defaultBranch.trim() || null;
   const checkout = await materializeAppCheckout({
     api: params.api,
     cwd: params.cwd,
     appId: String(app.id),
     outputDir: params.outputDir ?? null,
-    defaultDirName: sanitizeCheckoutDirName(String(app.name || app.id))
+    defaultDirName: sanitizeCheckoutDirName(String(app.name || app.id)),
+    expectedBranchName: authoritativeBranchName,
+    expectedRemoteUrl: authoritativeRemoteUrl,
+    expectedDefaultBranch: authoritativeDefaultBranch
   });
   const upstreamAppId = String(app.forkedFromAppId ?? app.id);
-  const bindingPath = await writeCollabBinding(checkout.repoRoot, {
+  const laneId = typeof collab?.laneId === "string" ? collab.laneId : null;
+  const repoFingerprint = typeof source?.repoFingerprint === "string" ? source.repoFingerprint : checkout.repoFingerprint;
+  const remoteUrl = typeof source?.remoteUrl === "string" ? source.remoteUrl : checkout.remoteUrl;
+  const defaultBranch = typeof source?.defaultBranch === "string" ? source.defaultBranch : checkout.defaultBranch;
+  const branchName = authoritativeBranchName ?? checkout.branchName;
+  const authoritativeLane = await resolveProjectLaneIfAuthoritative(params.api, {
     projectId: String(app.projectId),
+    repoFingerprint,
+    remoteUrl,
+    defaultBranch,
+    branchName,
     currentAppId: String(app.id),
-    upstreamAppId,
-    threadId: app.threadId ? String(app.threadId) : null,
-    repoFingerprint: checkout.repoFingerprint,
-    remoteUrl: checkout.remoteUrl,
-    defaultBranch: checkout.defaultBranch,
-    preferredBranch: checkout.preferredBranch
+    expectedUpstreamAppId: upstreamAppId,
+    createIfMissing: true,
+    seedAppId: String(app.id)
+  });
+  const bindingPath = await writeCollabBinding(checkout.repoRoot, {
+    projectId: authoritativeLane?.projectId ?? String(app.projectId),
+    currentAppId: authoritativeLane?.currentAppId ?? String(app.id),
+    upstreamAppId: authoritativeLane?.upstreamAppId ?? upstreamAppId,
+    threadId: authoritativeLane?.threadId ?? (app.threadId ? String(app.threadId) : null),
+    repoFingerprint: authoritativeLane?.repoFingerprint ?? repoFingerprint,
+    remoteUrl: authoritativeLane?.remoteUrl ?? remoteUrl,
+    defaultBranch: authoritativeLane?.defaultBranch ?? defaultBranch,
+    laneId: authoritativeLane?.laneId ?? laneId,
+    branchName: authoritativeLane?.branchName ?? branchName,
+    bindingMode: "lane"
   });
   return {
-    appId: String(app.id),
-    dashboardUrl: buildDashboardAppUrl(String(app.id)),
-    projectId: String(app.projectId),
-    upstreamAppId,
+    appId: authoritativeLane?.currentAppId ?? String(app.id),
+    dashboardUrl: buildDashboardAppUrl(authoritativeLane?.currentAppId ?? String(app.id)),
+    projectId: authoritativeLane?.projectId ?? String(app.projectId),
+    upstreamAppId: authoritativeLane?.upstreamAppId ?? upstreamAppId,
     bindingPath,
     repoRoot: checkout.repoRoot
   };
@@ -50799,14 +51405,26 @@ async function resolveQueueAppId(params) {
     });
   }
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
-  if (!binding) {
+  const bindingResolution = await resolveActiveLaneBinding({ repoRoot });
+  if (bindingResolution.status === "not_bound") {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
       hint: "Bind the repository first or pass `appId` explicitly for the app-scoped merge-request queue."
     });
   }
-  return binding.currentAppId;
+  if (bindingResolution.status === "missing_branch_binding") {
+    throw new RemixError("Current branch is not yet bound to a Remix lane.", {
+      exitCode: 2,
+      hint: `Switch back to a bound branch or create a lane by recording work on ${bindingResolution.currentBranch ?? "this branch"}.`
+    });
+  }
+  if (bindingResolution.status === "binding_conflict") {
+    throw new RemixError("Current branch binding conflicts with the server-resolved Remix lane.", {
+      exitCode: 2,
+      hint: `Local app ${bindingResolution.binding.currentAppId}; server app ${bindingResolution.resolvedLane.currentAppId ?? "(unknown)"}.`
+    });
+  }
+  return bindingResolution.binding.currentAppId;
 }
 async function collabListMergeRequests(params) {
   const appId = await resolveQueueAppId({
@@ -50835,12 +51453,32 @@ async function collabListMergeRequests(params) {
 async function resolveScopeTarget(params) {
   if (params.targetId?.trim()) return params.targetId.trim();
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
-  if (!binding) {
+  const bindingResolution = await resolveActiveLaneBinding({ repoRoot, api: params.api });
+  if (bindingResolution.status === "not_bound") {
     throw new RemixError("Repository is not bound to Remix and no explicit target id was provided.", { exitCode: 2 });
   }
-  if (params.scope === "project") return binding.projectId;
+  if (bindingResolution.status === "missing_branch_binding") {
+    throw new RemixError("Current branch is not yet bound to a Remix lane and no explicit target id was provided.", {
+      exitCode: 2
+    });
+  }
+  if (bindingResolution.status === "binding_conflict") {
+    throw new RemixError("Current branch binding conflicts with the server-resolved Remix lane.", {
+      exitCode: 2,
+      hint: `Local app ${bindingResolution.binding.currentAppId}; server app ${bindingResolution.resolvedLane.currentAppId ?? "(unknown)"}.`
+    });
+  }
+  const binding = bindingResolution.binding;
+  if (params.scope === "project") {
+    if (!binding.projectId) {
+      throw new RemixError("Could not resolve the project for the current repository binding.", { exitCode: 2 });
+    }
+    return binding.projectId;
+  }
   if (params.scope === "app") return binding.currentAppId;
+  if (!binding.projectId) {
+    throw new RemixError("Could not resolve the project for the current repository binding.", { exitCode: 2 });
+  }
   const project = unwrapResponseObject(await params.api.getProject(binding.projectId), "project");
   const organizationId = typeof project.organizationId === "string" ? project.organizationId : null;
   if (!organizationId) {
@@ -50962,13 +51600,28 @@ async function collabInit(params) {
       const remoteUrl = normalizeGitRemote(await getRemoteOriginUrl(repoRoot));
       const currentBranch = await getCurrentBranch(repoRoot);
       const defaultBranch = await getDefaultBranch(repoRoot) ?? currentBranch;
-      const preferredBranch = currentBranch ?? defaultBranch ?? null;
+      const branchName = currentBranch ?? defaultBranch ?? null;
       const repoFingerprint = await buildRepoFingerprint({ gitRoot: repoRoot, remoteUrl, defaultBranch });
       const repoSnapshot = await captureRepoSnapshot(repoRoot);
+      if (params.forceNew) {
+        const bindingResp = await params.api.resolveProjectBinding({
+          repoFingerprint,
+          remoteUrl: remoteUrl ?? void 0,
+          branchName: branchName ?? void 0
+        });
+        const existing = bindingResp?.responseObject;
+        if (existing?.projectId && existing?.appId) {
+          throw new RemixError("`remix collab init --force-new` is not allowed for repositories already known to Remix.", {
+            exitCode: 2,
+            hint: "This repository already resolves to an existing Remix lineage. Run `remix collab init` without `--force-new`, or use an explicit checkout/remix flow instead of creating a duplicate imported app."
+          });
+        }
+      }
       if (!params.forceNew) {
         const bindingResp = await params.api.resolveProjectBinding({
           repoFingerprint,
-          remoteUrl: remoteUrl ?? void 0
+          remoteUrl: remoteUrl ?? void 0,
+          branchName: branchName ?? void 0
         });
         const existing = bindingResp?.responseObject;
         if (existing?.projectId && existing?.appId) {
@@ -50976,25 +51629,55 @@ async function collabInit(params) {
             operation: "`remix collab init`",
             recoveryHint: "The repository changed while the local binding was being initialized. Review the local changes and rerun `remix collab init`."
           });
+          const initialProjectId = String(existing.projectId);
+          const initialCurrentAppId = String(existing.appId);
+          const initialUpstreamAppId = String(existing.upstreamAppId ?? existing.appId);
+          const initialThreadId = existing.threadId ? String(existing.threadId) : null;
           const bindingPath2 = await writeCollabBinding(repoRoot, {
-            projectId: String(existing.projectId),
-            currentAppId: String(existing.appId),
-            upstreamAppId: String(existing.upstreamAppId ?? existing.appId),
-            threadId: existing.threadId ? String(existing.threadId) : null,
+            projectId: initialProjectId,
+            currentAppId: initialCurrentAppId,
+            upstreamAppId: initialUpstreamAppId,
+            threadId: initialThreadId,
             repoFingerprint,
             remoteUrl,
             defaultBranch: defaultBranch ?? null,
-            preferredBranch
+            laneId: null,
+            branchName,
+            bindingMode: "lane"
           });
+          let boundProjectId2 = initialProjectId;
+          let boundCurrentAppId2 = initialCurrentAppId;
+          let boundUpstreamAppId2 = initialUpstreamAppId;
+          let boundThreadId2 = initialThreadId;
+          let finalWarnings = [...warnings];
+          if (branchName) {
+            const provisioned = await provisionActiveLaneBinding({
+              repoRoot,
+              api: params.api,
+              operation: "`remix collab init`"
+            });
+            if (provisioned.binding) {
+              boundProjectId2 = provisioned.binding.projectId ?? boundProjectId2;
+              boundCurrentAppId2 = provisioned.binding.currentAppId;
+              boundUpstreamAppId2 = provisioned.binding.upstreamAppId;
+              boundThreadId2 = provisioned.binding.threadId;
+            }
+            finalWarnings = [...finalWarnings, ...provisioned.warnings];
+          }
+          if (boundCurrentAppId2) {
+            const readyApp = await pollAppReady(params.api, boundCurrentAppId2);
+            boundProjectId2 = String(readyApp.projectId ?? boundProjectId2);
+            boundThreadId2 = readyApp.threadId ? String(readyApp.threadId) : boundThreadId2;
+          }
           return {
             reused: true,
-            projectId: String(existing.projectId),
-            appId: String(existing.appId),
-            dashboardUrl: buildDashboardAppUrl(String(existing.appId)),
-            upstreamAppId: String(existing.upstreamAppId ?? existing.appId),
+            projectId: boundProjectId2,
+            appId: boundCurrentAppId2,
+            dashboardUrl: buildDashboardAppUrl(boundCurrentAppId2),
+            upstreamAppId: boundUpstreamAppId2,
             bindingPath: bindingPath2,
             repoRoot,
-            ...warnings.length > 0 ? { warnings } : {}
+            ...finalWarnings.length > 0 ? { warnings: finalWarnings } : {}
           };
         }
       }
@@ -51021,6 +51704,7 @@ async function collabInit(params) {
         path: params.path?.trim() || void 0,
         platform: "generic",
         isPublic: false,
+        branch: currentBranch ?? void 0,
         remoteUrl: remoteUrl ?? void 0,
         defaultBranch: defaultBranch ?? void 0,
         repoFingerprint,
@@ -51028,31 +51712,65 @@ async function collabInit(params) {
       });
       const imported = unwrapResponseObject(importResp, "import");
       const app = await pollAppReady(params.api, String(imported.appId));
+      let boundProjectId = String(app.projectId);
+      let boundCurrentAppId = String(app.id);
+      let boundUpstreamAppId = String(app.id);
+      let boundThreadId = app.threadId ? String(app.threadId) : null;
+      let boundLaneId = null;
+      if (branchName) {
+        const laneResp = defaultBranch && branchName !== defaultBranch ? await params.api.bootstrapFreshProjectLane({
+          projectId: boundProjectId,
+          repoFingerprint,
+          remoteUrl: remoteUrl ?? void 0,
+          defaultBranch: defaultBranch ?? void 0,
+          branchName,
+          seedAppId: String(app.id)
+        }) : await params.api.ensureProjectLaneBinding({
+          projectId: boundProjectId,
+          repoFingerprint,
+          remoteUrl: remoteUrl ?? void 0,
+          defaultBranch: defaultBranch ?? void 0,
+          branchName,
+          seedAppId: String(app.id)
+        });
+        const lane = unwrapResponseObject(laneResp, "project lane binding");
+        boundProjectId = typeof lane.projectId === "string" && lane.projectId ? lane.projectId : boundProjectId;
+        boundCurrentAppId = typeof lane.currentAppId === "string" && lane.currentAppId ? lane.currentAppId : boundCurrentAppId;
+        boundUpstreamAppId = typeof lane.upstreamAppId === "string" && lane.upstreamAppId ? lane.upstreamAppId : boundUpstreamAppId;
+        boundThreadId = typeof lane.threadId === "string" && lane.threadId ? lane.threadId : boundThreadId;
+        boundLaneId = typeof lane.laneId === "string" && lane.laneId ? lane.laneId : null;
+      }
+      if (boundCurrentAppId) {
+        const readyApp = await pollAppReady(params.api, boundCurrentAppId);
+        boundProjectId = String(readyApp.projectId ?? boundProjectId);
+        boundThreadId = readyApp.threadId ? String(readyApp.threadId) : boundThreadId;
+      }
       await assertRepoSnapshotUnchanged(repoRoot, repoSnapshot, {
         operation: "`remix collab init`",
         recoveryHint: "The repository changed before the Remix binding was written. Review the local changes and rerun `remix collab init`."
       });
       const bindingPath = await writeCollabBinding(repoRoot, {
-        projectId: String(app.projectId),
-        currentAppId: String(app.id),
-        upstreamAppId: String(app.id),
-        threadId: app.threadId ? String(app.threadId) : null,
+        projectId: boundProjectId,
+        currentAppId: boundCurrentAppId,
+        upstreamAppId: boundUpstreamAppId,
+        threadId: boundThreadId,
         repoFingerprint,
         remoteUrl,
         defaultBranch: defaultBranch ?? null,
-        preferredBranch
+        laneId: boundLaneId,
+        branchName,
+        bindingMode: "lane"
       });
       return {
         reused: false,
-        projectId: String(app.projectId),
-        appId: String(app.id),
-        dashboardUrl: buildDashboardAppUrl(String(app.id)),
-        upstreamAppId: String(app.id),
+        projectId: boundProjectId,
+        appId: boundCurrentAppId,
+        dashboardUrl: buildDashboardAppUrl(boundCurrentAppId),
+        upstreamAppId: boundUpstreamAppId,
         bindingPath,
         repoRoot,
         remoteUrl,
         defaultBranch,
-        preferredBranch,
         ...warnings.length > 0 ? { warnings } : {}
       };
     }
@@ -51098,7 +51816,11 @@ async function collabList(params) {
 }
 async function collabReconcile(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab reconcile`"
+  });
   if (!binding) {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
@@ -51107,9 +51829,9 @@ async function collabReconcile(params) {
   }
   await ensureCleanWorktree(repoRoot, "`remix collab reconcile`");
   const branch = await requireCurrentBranch(repoRoot);
-  assertPreferredBranchMatch({
+  assertBoundBranchMatch({
     currentBranch: branch,
-    preferredBranch: binding.preferredBranch,
+    branchName: binding.branchName,
     allowBranchMismatch: params.allowBranchMismatch,
     operation: "`remix collab reconcile`"
   });
@@ -51218,9 +51940,9 @@ async function collabReconcile(params) {
         });
         await ensureCleanWorktree(lockedRepoRoot, "`remix collab reconcile`");
         const lockedBranch = await requireCurrentBranch(lockedRepoRoot);
-        assertPreferredBranchMatch({
+        assertBoundBranchMatch({
           currentBranch: lockedBranch,
-          preferredBranch: binding.preferredBranch,
+          branchName: binding.branchName,
           allowBranchMismatch: params.allowBranchMismatch,
           operation: "`remix collab reconcile`"
         });
@@ -51275,38 +51997,76 @@ async function collabRemix(params) {
       hint: "Pass the source app id to remix."
     });
   }
-  const forkResp = await params.api.forkApp(sourceAppId, { name: params.name?.trim() || void 0, platform: "generic" });
+  const sourceApp = await pollAppReady(params.api, sourceAppId);
+  const sourceCollab = sourceApp.collab && typeof sourceApp.collab === "object" ? sourceApp.collab : null;
+  const sourceSource = sourceApp.source && typeof sourceApp.source === "object" ? sourceApp.source : null;
+  const sourceBranchName = typeof sourceCollab?.branchName === "string" && sourceCollab.branchName.trim() || typeof sourceSource?.branch === "string" && sourceSource.branch.trim() || typeof sourceSource?.defaultBranch === "string" && sourceSource.defaultBranch.trim() || void 0;
+  const forkResp = await params.api.forkApp(sourceAppId, {
+    name: params.name?.trim() || void 0,
+    platform: "generic",
+    branchName: sourceBranchName
+  });
   const forked = unwrapResponseObject(forkResp, "fork");
   const app = await pollAppReady(params.api, String(forked.id));
+  const collab = app.collab && typeof app.collab === "object" ? app.collab : null;
+  const source = app.source && typeof app.source === "object" ? app.source : null;
+  const authoritativeBranchName = typeof collab?.branchName === "string" && collab.branchName.trim() || typeof source?.branch === "string" && source.branch.trim() || typeof source?.defaultBranch === "string" && source.defaultBranch.trim() || sourceBranchName || null;
+  const authoritativeRemoteUrl = typeof source?.remoteUrl === "string" && source.remoteUrl.trim() || null;
+  const authoritativeDefaultBranch = typeof source?.defaultBranch === "string" && source.defaultBranch.trim() || null;
   const checkout = await materializeAppCheckout({
     api: params.api,
     cwd: params.cwd,
     appId: String(app.id),
     outputDir: params.outputDir ?? null,
-    defaultDirName: sanitizeCheckoutDirName(String(params.name?.trim() || app.name || app.id))
-  });
-  const bindingPath = await writeCollabBinding(checkout.repoRoot, {
+    defaultDirName: sanitizeCheckoutDirName(String(params.name?.trim() || app.name || app.id)),
+    expectedBranchName: authoritativeBranchName,
+    expectedRemoteUrl: authoritativeRemoteUrl,
+    expectedDefaultBranch: authoritativeDefaultBranch
+  });
+  const laneId = typeof collab?.laneId === "string" ? collab.laneId : null;
+  const repoFingerprint = typeof source?.repoFingerprint === "string" ? source.repoFingerprint : checkout.repoFingerprint;
+  const remoteUrl = typeof source?.remoteUrl === "string" ? source.remoteUrl : checkout.remoteUrl;
+  const defaultBranch = typeof source?.defaultBranch === "string" ? source.defaultBranch : checkout.defaultBranch;
+  const branchName = authoritativeBranchName ?? checkout.branchName;
+  const authoritativeLane = await resolveProjectLaneIfAuthoritative(params.api, {
     projectId: String(app.projectId),
+    repoFingerprint,
+    remoteUrl,
+    defaultBranch,
+    branchName,
     currentAppId: String(app.id),
-    upstreamAppId: String(app.forkedFromAppId ?? sourceAppId),
-    threadId: app.threadId ? String(app.threadId) : null,
-    repoFingerprint: checkout.repoFingerprint,
-    remoteUrl: checkout.remoteUrl,
-    defaultBranch: checkout.defaultBranch,
-    preferredBranch: checkout.preferredBranch
+    expectedUpstreamAppId: String(app.forkedFromAppId ?? sourceAppId),
+    createIfMissing: true,
+    seedAppId: String(app.id)
+  });
+  const bindingPath = await writeCollabBinding(checkout.repoRoot, {
+    projectId: authoritativeLane?.projectId ?? String(app.projectId),
+    currentAppId: authoritativeLane?.currentAppId ?? String(app.id),
+    upstreamAppId: authoritativeLane?.upstreamAppId ?? String(app.forkedFromAppId ?? sourceAppId),
+    threadId: authoritativeLane?.threadId ?? (app.threadId ? String(app.threadId) : null),
+    repoFingerprint: authoritativeLane?.repoFingerprint ?? repoFingerprint,
+    remoteUrl: authoritativeLane?.remoteUrl ?? remoteUrl,
+    defaultBranch: authoritativeLane?.defaultBranch ?? defaultBranch,
+    laneId: authoritativeLane?.laneId ?? laneId,
+    branchName: authoritativeLane?.branchName ?? branchName,
+    bindingMode: "lane"
   });
   return {
-    appId: String(app.id),
-    dashboardUrl: buildDashboardAppUrl(String(app.id)),
-    projectId: String(app.projectId),
-    upstreamAppId: String(app.forkedFromAppId ?? sourceAppId),
+    appId: authoritativeLane?.currentAppId ?? String(app.id),
+    dashboardUrl: buildDashboardAppUrl(authoritativeLane?.currentAppId ?? String(app.id)),
+    projectId: authoritativeLane?.projectId ?? String(app.projectId),
+    upstreamAppId: authoritativeLane?.upstreamAppId ?? String(app.forkedFromAppId ?? sourceAppId),
     bindingPath,
     repoRoot: checkout.repoRoot
   };
 }
 async function collabRequestMerge(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab request-merge`"
+  });
   if (!binding) throw new RemixError("Repository is not bound to Remix.", { exitCode: 2 });
   const resp = await params.api.openMergeRequest(binding.currentAppId);
   return unwrapResponseObject(resp, "merge request");
@@ -51339,7 +52099,9 @@ function createBaseStatus() {
       repoFingerprint: null,
       remoteUrl: null,
       defaultBranch: null,
-      preferredBranch: null
+      laneId: null,
+      branchName: null,
+      bindingMode: null
     },
     remote: {
       checked: false,
@@ -51403,12 +52165,13 @@ async function collabStatus(params) {
   }
   status.repo.isGitRepo = true;
   status.repo.repoRoot = repoRoot;
-  const [branch, headCommitHash, worktreeStatus, binding] = await Promise.all([
+  const [branch, initialHeadCommitHash, worktreeStatus, bindingResolution] = await Promise.all([
     getCurrentBranch(repoRoot),
     getHeadCommitHash(repoRoot),
     getWorktreeStatus(repoRoot),
-    readCollabBinding(repoRoot)
+    resolveActiveLaneBinding({ repoRoot, api: params.api ?? void 0 })
   ]);
+  let headCommitHash = initialHeadCommitHash;
   status.repo.branch = branch;
   status.repo.branchMismatch = false;
   status.repo.headCommitHash = headCommitHash;
@@ -51422,13 +52185,36 @@ async function collabStatus(params) {
   if (!status.repo.worktree.isClean) addWarning(status, "Working tree has local changes.");
   if (!branch) addWarning(status, "Repository is in a detached HEAD state.");
   if (!headCommitHash) addWarning(status, "Failed to resolve local HEAD commit.");
-  if (!binding) {
+  if (bindingResolution.status === "not_bound") {
     status.binding.path = null;
     addBlockedReason(status.sync, "not_bound");
     addBlockedReason(status.reconcile, "not_bound");
     status.recommendedAction = "init";
     return status;
   }
+  if (bindingResolution.status === "missing_branch_binding") {
+    status.binding = {
+      isBound: true,
+      path: getCollabBindingPath(repoRoot),
+      projectId: bindingResolution.projectId,
+      currentAppId: null,
+      upstreamAppId: bindingResolution.upstreamAppId,
+      isRemix: null,
+      threadId: bindingResolution.threadId,
+      repoFingerprint: bindingResolution.repoFingerprint,
+      remoteUrl: bindingResolution.remoteUrl,
+      defaultBranch: bindingResolution.defaultBranch,
+      laneId: null,
+      branchName: bindingResolution.currentBranch,
+      bindingMode: "lane"
+    };
+    addBlockedReason(status.sync, "branch_binding_missing");
+    addBlockedReason(status.reconcile, "branch_binding_missing");
+    addWarning(status, `Current branch ${bindingResolution.currentBranch ?? "(detached)"} is not yet bound to a Remix lane.`);
+    status.recommendedAction = "no_action";
+    return status;
+  }
+  const binding = bindingResolution.binding;
   status.binding = {
     isBound: true,
     path: getCollabBindingPath(repoRoot),
@@ -51440,13 +52226,21 @@ async function collabStatus(params) {
     repoFingerprint: binding.repoFingerprint,
     remoteUrl: binding.remoteUrl,
     defaultBranch: binding.defaultBranch,
-    preferredBranch: binding.preferredBranch
+    laneId: binding.laneId,
+    branchName: binding.branchName,
+    bindingMode: binding.bindingMode
   };
-  status.repo.branchMismatch = !isPreferredBranchMatch(branch, binding.preferredBranch);
+  status.repo.branchMismatch = !isBoundBranchMatch(branch, binding.branchName);
   if (status.repo.branchMismatch) {
     addWarning(
       status,
-      `Current branch ${branch ?? "(detached)"} does not match preferred branch ${binding.preferredBranch ?? "(unset)"}.`
+      `Current branch ${branch ?? "(detached)"} does not match bound branch ${binding.branchName ?? "(unset)"}.`
+    );
+  }
+  if (bindingResolution.status === "binding_conflict") {
+    addWarning(
+      status,
+      `Local binding app ${binding.currentAppId} conflicts with server-resolved app ${bindingResolution.resolvedLane.currentAppId ?? "(unknown)"} for branch ${bindingResolution.currentBranch ?? "(detached)"}.`
     );
   }
   if (!params.api) {
@@ -51494,8 +52288,14 @@ async function collabStatus(params) {
     const syncResp = syncResult.value;
     if (syncResp) {
       const sync = unwrapResponseObject(syncResp, "sync result");
+      const latestHeadCommitHash = sync.targetCommitHash && sync.status !== "up_to_date" ? await getHeadCommitHash(repoRoot) : headCommitHash;
+      if (latestHeadCommitHash) {
+        headCommitHash = latestHeadCommitHash;
+        status.repo.headCommitHash = latestHeadCommitHash;
+      }
+      const normalizedSyncStatus = headCommitHash && sync.targetCommitHash && headCommitHash === sync.targetCommitHash ? "up_to_date" : sync.status;
       status.sync.checked = true;
-      status.sync.status = sync.status;
+      status.sync.status = normalizedSyncStatus;
       status.sync.warnings = sync.warnings;
       status.sync.targetCommitHash = sync.targetCommitHash;
       status.sync.targetCommitId = sync.targetCommitId;
@@ -51503,9 +52303,9 @@ async function collabStatus(params) {
       if (!status.repo.worktree.isClean) addBlockedReason(status.sync, "dirty_worktree");
       if (!branch) addBlockedReason(status.sync, "detached_head");
       if (status.repo.branchMismatch) addBlockedReason(status.sync, "branch_mismatch");
-      if (sync.status === "conflict_risk") addBlockedReason(status.sync, "metadata_conflict");
+      if (normalizedSyncStatus === "conflict_risk") addBlockedReason(status.sync, "metadata_conflict");
       status.sync.canApply = status.sync.status === "ready_to_fast_forward" && status.repo.worktree.isClean && Boolean(branch) && !status.sync.blockedReasons.includes("metadata_conflict");
-      if (sync.status === "conflict_risk") {
+      if (normalizedSyncStatus === "conflict_risk") {
         status.reconcile.checked = true;
         status.reconcile.status = "metadata_conflict";
         status.reconcile.warnings = sync.warnings;
@@ -51515,7 +52315,7 @@ async function collabStatus(params) {
         if (!status.repo.worktree.isClean) addBlockedReason(status.reconcile, "dirty_worktree");
         if (!branch) addBlockedReason(status.reconcile, "detached_head");
         if (status.repo.branchMismatch) addBlockedReason(status.reconcile, "branch_mismatch");
-      } else if (sync.status === "base_unknown") {
+      } else if (normalizedSyncStatus === "base_unknown") {
         try {
           const preflightResp = await params.api.preflightAppReconcile(binding.currentAppId, {
             localHeadCommitHash: headCommitHash,
@@ -51570,7 +52370,11 @@ async function collabStatus(params) {
 }
 async function collabSyncUpstream(params) {
   const repoRoot = await findGitRoot(params.cwd);
-  const binding = await readCollabBinding(repoRoot);
+  const binding = await ensureActiveLaneBinding({
+    repoRoot,
+    api: params.api,
+    operation: "`remix collab sync-upstream`"
+  });
   if (!binding) {
     throw new RemixError("Repository is not bound to Remix.", {
       exitCode: 2,
@@ -51828,7 +52632,7 @@ function normalizeByMessage(err) {
       category: "local_state"
     });
   }
-  if (code === ERROR_CODES.PREFERRED_BRANCH_MISMATCH || message.includes("preferred branch")) {
+  if (code === ERROR_CODES.PREFERRED_BRANCH_MISMATCH || message.includes("preferred branch") || message.includes("bound branch")) {
     return makeNormalized({
       code: ERROR_CODES.PREFERRED_BRANCH_MISMATCH,
       message,
@@ -52367,7 +53171,7 @@ function getRiskLevel(status) {
 function getRecommendedNextActions(status) {
   if (status.repo.branchMismatch) {
     return [
-      `Switch to the preferred branch (${status.binding.preferredBranch ?? "configured in the binding"}) before using Remix mutation tools, or rerun with allowBranchMismatch=true if this deviation is intentional.`
+      `Switch to the bound branch (${status.binding.branchName ?? "configured in the binding"}) before using Remix mutation tools, or rerun with allowBranchMismatch=true if this deviation is intentional.`
     ];
   }
   switch (status.recommendedAction) {
@@ -55329,7 +56133,7 @@ async function listPendingTurnStateSummaries() {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.15",
+  version: "0.1.16",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -55360,8 +56164,8 @@ var package_default = {
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.10",
-    "@remixhq/mcp": "^0.1.10"
+    "@remixhq/core": "^0.1.11",
+    "@remixhq/mcp": "^0.1.11"
   },
   devDependencies: {
     "@types/node": "^25.4.0",