@remixhq/claude-plugin 0.1.23 → 0.1.25

package/dist/hook-user-prompt.cjs

@@ -38,7 +38,7 @@ var require_windows = __commonJS({
     module2.exports = isexe;
     isexe.sync = sync;
     var fs11 = require("fs");
-    function checkPathExt(path17, options) {
+    function checkPathExt(path18, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -49,25 +49,25 @@ var require_windows = __commonJS({
       }
       for (var i2 = 0; i2 < pathext.length; i2++) {
         var p = pathext[i2].toLowerCase();
-        if (p && path17.substr(-p.length).toLowerCase() === p) {
+        if (p && path18.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path17, options) {
+    function checkStat(stat, path18, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path17, options);
+      return checkPathExt(path18, options);
     }
-    function isexe(path17, options, cb) {
-      fs11.stat(path17, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path17, options));
+    function isexe(path18, options, cb) {
+      fs11.stat(path18, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path18, options));
       });
     }
-    function sync(path17, options) {
-      return checkStat(fs11.statSync(path17), path17, options);
+    function sync(path18, options) {
+      return checkStat(fs11.statSync(path18), path18, options);
     }
   }
 });
@@ -79,13 +79,13 @@ var require_mode = __commonJS({
     module2.exports = isexe;
     isexe.sync = sync;
     var fs11 = require("fs");
-    function isexe(path17, options, cb) {
-      fs11.stat(path17, function(er, stat) {
+    function isexe(path18, options, cb) {
+      fs11.stat(path18, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path17, options) {
-      return checkStat(fs11.statSync(path17), options);
+    function sync(path18, options) {
+      return checkStat(fs11.statSync(path18), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -119,7 +119,7 @@ var require_isexe = __commonJS({
     }
     module2.exports = isexe;
     isexe.sync = sync;
-    function isexe(path17, options, cb) {
+    function isexe(path18, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -129,7 +129,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve, reject) {
-          isexe(path17, options || {}, function(er, is) {
+          isexe(path18, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -138,7 +138,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path17, options || {}, function(er, is) {
+      core(path18, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -148,9 +148,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path17, options) {
+    function sync(path18, options) {
       try {
-        return core.sync(path17, options || {});
+        return core.sync(path18, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -167,7 +167,7 @@ var require_which = __commonJS({
   "node_modules/which/which.js"(exports2, module2) {
     "use strict";
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path17 = require("path");
+    var path18 = require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -205,7 +205,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path17.join(pathPart, cmd);
+        const pCmd = path18.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve(subStep(p, i2, 0));
       });
@@ -232,7 +232,7 @@ var require_which = __commonJS({
       for (let i2 = 0; i2 < pathEnv.length; i2++) {
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path17.join(pathPart, cmd);
+        const pCmd = path18.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];
@@ -280,7 +280,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module2) {
     "use strict";
-    var path17 = require("path");
+    var path18 = require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -298,7 +298,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path17.delimiter : void 0
+          pathExt: withoutPathExt ? path18.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -307,7 +307,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path17.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path18.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -361,8 +361,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path17, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path17.split("/").pop();
+      const [path18, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path18.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -397,7 +397,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports2, module2) {
     "use strict";
-    var path17 = require("path");
+    var path18 = require("path");
     var resolveCommand = require_resolveCommand();
     var escape = require_escape();
     var readShebang = require_readShebang();
@@ -422,7 +422,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path17.normalize(parsed.command);
+        parsed.command = path18.normalize(parsed.command);
         parsed.command = escape.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -540,7 +540,7 @@ __export(hook_user_prompt_exports, {
 module.exports = __toCommonJS(hook_user_prompt_exports);
 var import_node_child_process8 = require("child_process");
 var import_node_fs7 = require("fs");
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_path14 = __toESM(require("path"), 1);
 
 // node_modules/@remixhq/core/dist/chunk-7XJGOKEO.js
 var RemixError = class extends Error {
@@ -4943,13 +4943,13 @@ var logOutputSync = ({ serializedResult, fdNumber, state, verboseInfo, encoding,
   }
 };
 var writeToFiles = (serializedResult, stdioItems, outputFiles) => {
-  for (const { path: path17, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
-    const pathString = typeof path17 === "string" ? path17 : path17.toString();
+  for (const { path: path18, append } of stdioItems.filter(({ type }) => FILE_TYPES.has(type))) {
+    const pathString = typeof path18 === "string" ? path18 : path18.toString();
     if (append || outputFiles.has(pathString)) {
-      (0, import_node_fs4.appendFileSync)(path17, serializedResult);
+      (0, import_node_fs4.appendFileSync)(path18, serializedResult);
     } else {
       outputFiles.add(pathString);
-      (0, import_node_fs4.writeFileSync)(path17, serializedResult);
+      (0, import_node_fs4.writeFileSync)(path18, serializedResult);
     }
   }
 };
@@ -7668,6 +7668,21 @@ async function writeCollabBinding(repoRoot, binding) {
   return filePath;
 }
 
+// src/collab-init-spawn-lock.ts
+var import_node_crypto = require("crypto");
+var import_node_os4 = __toESM(require("os"), 1);
+var import_node_path6 = __toESM(require("path"), 1);
+function stateRoot() {
+  const configured = process.env.REMIX_CLAUDE_PLUGIN_HOOK_STATE_ROOT?.trim();
+  return configured || import_node_path6.default.join(import_node_os4.default.tmpdir(), "remix-claude-plugin-hooks");
+}
+function sha256Hex(value) {
+  return (0, import_node_crypto.createHash)("sha256").update(value).digest("hex");
+}
+function collabInitSpawnLockPath(repoRoot) {
+  return import_node_path6.default.join(stateRoot(), "collab-init-spawn-locks", `${sha256Hex(repoRoot)}.json`);
+}
+
 // src/history-routing.ts
 var STRONG_MEMORY_FIRST_PATTERNS = [
   /\bwhy\b/i,
@@ -7773,25 +7788,25 @@ function buildPromptRoutingAdvisory(intent) {
 
 // src/deferred-turn-queue.ts
 var import_promises14 = __toESM(require("fs/promises"), 1);
-var import_node_os4 = __toESM(require("os"), 1);
-var import_node_path6 = __toESM(require("path"), 1);
+var import_node_os5 = __toESM(require("os"), 1);
+var import_node_path7 = __toESM(require("path"), 1);
 var DEFERRED_TURN_SCHEMA_VERSION = 1;
 var DEFERRED_TURN_MAX_ATTEMPTS = 10;
 var DEFERRED_TURN_TTL_MS = 24 * 60 * 60 * 1e3;
 var DEFERRED_TURN_DIR = "deferred-turns";
-function stateRoot() {
+function stateRoot2() {
   const configured = process.env.REMIX_CLAUDE_PLUGIN_HOOK_STATE_ROOT?.trim();
-  return configured || import_node_path6.default.join(import_node_os4.default.tmpdir(), "remix-claude-plugin-hooks");
+  return configured || import_node_path7.default.join(import_node_os5.default.tmpdir(), "remix-claude-plugin-hooks");
 }
 function getDeferredTurnDirPath() {
-  return import_node_path6.default.join(stateRoot(), DEFERRED_TURN_DIR);
+  return import_node_path7.default.join(stateRoot2(), DEFERRED_TURN_DIR);
 }
 function deferredTurnFileName(sessionId, turnId) {
   const safe = (s) => s.replace(/[^A-Za-z0-9_-]/g, "_");
   return `${safe(sessionId)}-${safe(turnId)}.json`;
 }
 function getDeferredTurnFilePath(sessionId, turnId) {
-  return import_node_path6.default.join(getDeferredTurnDirPath(), deferredTurnFileName(sessionId, turnId));
+  return import_node_path7.default.join(getDeferredTurnDirPath(), deferredTurnFileName(sessionId, turnId));
 }
 async function writeDeferredTurn(record) {
   if (record.schemaVersion !== DEFERRED_TURN_SCHEMA_VERSION) {
@@ -7852,7 +7867,7 @@ async function listDeferredTurnsForRepo(repoRoot) {
   const entries = [];
   for (const entry of dirEntries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const filePath = import_node_path6.default.join(dir, entry.name);
+    const filePath = import_node_path7.default.join(dir, entry.name);
     const record = await readDeferredTurnFile(filePath);
     if (!record) continue;
     if (record.repoRoot !== repoRoot) continue;
@@ -7876,7 +7891,7 @@ async function pruneStaleDeferredTurns(maxAgeMs = DEFERRED_TURN_TTL_MS) {
   const now = Date.now();
   for (const entry of dirEntries) {
     if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const filePath = import_node_path6.default.join(dir, entry.name);
+    const filePath = import_node_path7.default.join(dir, entry.name);
     const record = await readDeferredTurnFile(filePath);
     if (!record) {
       const stat = await import_promises14.default.stat(filePath).catch(() => null);
@@ -7912,8 +7927,8 @@ async function recordDeferredTurnFailedAttempt(filePath) {
 
 // src/deferred-turn-drainer.ts
 var import_promises23 = __toESM(require("fs/promises"), 1);
-var import_node_path11 = __toESM(require("path"), 1);
-var import_node_crypto3 = require("crypto");
+var import_node_path12 = __toESM(require("path"), 1);
+var import_node_crypto5 = require("crypto");
 
 // node_modules/@remixhq/core/dist/collab.js
 var import_promises15 = __toESM(require("fs/promises"), 1);
@@ -8015,7 +8030,7 @@ function buildBranchMismatchHint(params) {
     `Switch to ${describeBranch(params.branchName)} or rerun with ${overrideFlag} if this is intentional.`
   ].join("\n");
 }
-function sha256Hex(value) {
+function sha256Hex2(value) {
   return (0, import_crypto.createHash)("sha256").update(value).digest("hex");
 }
 function getCollabStateRoot() {
@@ -8029,7 +8044,7 @@ function buildLaneStateKey(params) {
   const stableSource = repoRoot || "unknown-repo-root";
   const fingerprintSource = fingerprint || "unknown-repo-fingerprint";
   const laneSource = laneId || "unknown-lane";
-  return sha256Hex(`${stableSource}::${fingerprintSource}::${laneSource}`);
+  return sha256Hex2(`${stableSource}::${fingerprintSource}::${laneSource}`);
 }
 function getSnapshotsRoot() {
   return import_path3.default.join(getCollabStateRoot(), "snapshots");
@@ -8230,7 +8245,7 @@ async function writeLocalBaseline(baseline) {
   await writeJsonAtomic(getBaselinePath(baseline), normalized);
   return normalized;
 }
-function sha256Hex2(value) {
+function sha256Hex22(value) {
   return (0, import_crypto2.createHash)("sha256").update(value).digest("hex");
 }
 function getSnapshotRecordPath(snapshotId) {
@@ -8281,7 +8296,7 @@ async function persistBlob(blobHash, content) {
 }
 function buildSnapshotHash(files) {
   const manifest = files.map((file) => `${file.path}	${file.mode}	${file.blobHash}	${file.size}`).join("\n");
-  return sha256Hex2(manifest);
+  return sha256Hex22(manifest);
 }
 async function inspectLocalSnapshot(params) {
   const repoRoot = params.repoRoot;
@@ -8292,7 +8307,7 @@ async function inspectLocalSnapshot(params) {
     const stat = await import_promises17.default.lstat(absolutePath);
     if (stat.isSymbolicLink()) {
       const linkTarget = await import_promises17.default.readlink(absolutePath);
-      const blobHash2 = sha256Hex2(`symlink:${linkTarget}`);
+      const blobHash2 = sha256Hex22(`symlink:${linkTarget}`);
       if (params.persistBlobs !== false) {
         await persistBlob(blobHash2, linkTarget);
       }
@@ -8305,7 +8320,7 @@ async function inspectLocalSnapshot(params) {
       continue;
     }
     const content = await import_promises17.default.readFile(absolutePath);
-    const blobHash = sha256Hex2(content);
+    const blobHash = sha256Hex22(content);
     if (params.persistBlobs !== false) {
       await persistBlob(blobHash, content);
     }
@@ -8409,7 +8424,7 @@ async function diffLocalSnapshots(params) {
       baseSnapshotId: params.baseSnapshotId,
       targetSnapshotId: params.targetSnapshotId,
       diff,
-      diffSha256: diff ? sha256Hex2(diff) : null,
+      diffSha256: diff ? sha256Hex22(diff) : null,
       changedPaths,
       stats: summarizeUnifiedDiff(diff)
     };
@@ -8827,6 +8842,15 @@ function shouldRequireRemoteLaneForCurrentBranch(params) {
   if (params.currentBranch === defaultBranch) return false;
   return !params.binding.laneId || params.binding.currentAppId === params.binding.upstreamAppId;
 }
+function resolveLaneLookupProjectId(params) {
+  const currentBranch = normalizeBranchName2(params.currentBranch);
+  const defaultBranch = normalizeBranchName2(params.defaultBranch);
+  const localProjectId = params.localBinding.projectId ?? null;
+  if (currentBranch && currentBranch !== defaultBranch && localProjectId) {
+    return localProjectId;
+  }
+  return params.explicitRootProjectId ?? (params.requireRemoteLane ? void 0 : localProjectId ?? params.fallbackProjectId ?? void 0);
+}
 async function persistResolvedLane(repoRoot, binding) {
   await writeCollabBinding(repoRoot, {
     projectId: binding.projectId,
@@ -8905,7 +8929,14 @@ async function resolveActiveLaneBindingUncached(params, state) {
       };
     }
     const laneResp2 = await params.api.resolveProjectLaneBinding({
-      projectId: state.explicitRootBinding?.projectId ?? (requireRemoteLane ? void 0 : localBinding.projectId ?? state.projectId ?? void 0),
+      projectId: resolveLaneLookupProjectId({
+        explicitRootProjectId: state.explicitRootBinding?.projectId,
+        localBinding,
+        currentBranch,
+        defaultBranch: state.defaultBranch,
+        requireRemoteLane,
+        fallbackProjectId: state.projectId
+      }),
       repoFingerprint: state.repoFingerprint ?? void 0,
       remoteUrl: state.remoteUrl ?? void 0,
       defaultBranch: state.defaultBranch ?? void 0,
@@ -9756,6 +9787,59 @@ function buildWorkspaceMetadata(params) {
   }
   return metadata;
 }
+async function findExistingChangeStepByIdempotency(params) {
+  const idempotencyKey = params.idempotencyKey?.trim();
+  if (!idempotencyKey) return null;
+  const resp = await params.api.listChangeSteps(params.appId, { limit: 1, idempotencyKey });
+  const responseObject = unwrapResponseObject(
+    resp,
+    "change step list"
+  );
+  const steps = Array.isArray(responseObject) ? responseObject : Array.isArray(responseObject.items) ? responseObject.items : [];
+  return steps.find((step) => step.idempotencyKey === idempotencyKey) ?? null;
+}
+async function writeBaselineFromSucceededChangeStep(params) {
+  const nextServerHeadHash = typeof params.changeStep.headCommitHash === "string" ? params.changeStep.headCommitHash.trim() : "";
+  if (!nextServerHeadHash) {
+    throw buildFinalizeCliError({
+      message: "Backend returned a succeeded change step without a head commit hash.",
+      exitCode: 1,
+      hint: "This is a backend invariant violation; retry will not help. Run `remix collab status` before trying again.",
+      disposition: "terminal",
+      reason: "missing_head_commit_hash"
+    });
+  }
+  let nextServerRevisionId = typeof params.changeStep.resultRevisionId === "string" ? params.changeStep.resultRevisionId.trim() : "";
+  let nextServerTreeHash = null;
+  if (!nextServerRevisionId) {
+    const freshHeadResp = await params.api.getAppHead(params.job.currentAppId);
+    const freshHead = unwrapResponseObject(freshHeadResp, "app head");
+    if (freshHead.headCommitHash !== nextServerHeadHash || !freshHead.headRevisionId) {
+      throw buildFinalizeCliError({
+        message: "Backend returned a succeeded change step without a matching result revision.",
+        exitCode: 1,
+        hint: "The local baseline was not advanced because the post-step revision could not be verified. Restart the backend/CLI and retry after checking `remix collab status`.",
+        disposition: "terminal",
+        reason: "missing_result_revision_id"
+      });
+    }
+    nextServerRevisionId = freshHead.headRevisionId;
+    nextServerTreeHash = freshHead.treeHash ?? null;
+  }
+  await writeLocalBaseline({
+    repoRoot: params.job.repoRoot,
+    repoFingerprint: params.job.repoFingerprint,
+    laneId: params.job.laneId,
+    currentAppId: params.job.currentAppId,
+    branchName: params.job.branchName,
+    lastSnapshotId: params.snapshot.id,
+    lastSnapshotHash: params.snapshot.snapshotHash,
+    lastServerRevisionId: nextServerRevisionId,
+    lastServerTreeHash: nextServerTreeHash,
+    lastServerHeadHash: nextServerHeadHash,
+    lastSeenLocalCommitHash: params.snapshot.localCommitHash
+  });
+}
 async function harvestPreTurnEvents(repoRoot, fromCommit, toCommit) {
   if (!toCommit) return null;
   try {
@@ -9941,6 +10025,34 @@ async function processClaimedPendingFinalizeJobInner(params) {
     });
   }
   const replayNeeded = appHead.headCommitHash !== submissionBaseHeadHash || baselineDrifted;
+  if (replayNeeded) {
+    const existingChangeStep = await findExistingChangeStepByIdempotency({
+      api: params.api,
+      appId: job.currentAppId,
+      idempotencyKey: job.idempotencyKey
+    });
+    if (existingChangeStep) {
+      const changeStep2 = existingChangeStep.status === "succeeded" ? existingChangeStep : await pollChangeStep(params.api, job.currentAppId, existingChangeStep.id);
+      invalidateAppHeadCache(job.currentAppId);
+      invalidateAppDeltaCacheForApp(job.currentAppId);
+      await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep: changeStep2 });
+      await updatePendingFinalizeJob(job.id, {
+        status: "completed",
+        metadata: { changeStepId: String(changeStep2.id ?? "") }
+      });
+      return {
+        mode: "changed_turn",
+        idempotencyKey: job.idempotencyKey ?? "",
+        queued: false,
+        jobId: job.id,
+        repoState,
+        changeStep: changeStep2,
+        collabTurn: null,
+        autoSync: null,
+        warnings: []
+      };
+    }
+  }
   if (replayNeeded) {
     try {
       const replayResp = await params.api.startChangeStepReplay(job.currentAppId, {
@@ -10038,46 +10150,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
   const changeStep = await pollChangeStep(params.api, job.currentAppId, String(createdStep.id));
   invalidateAppHeadCache(job.currentAppId);
   invalidateAppDeltaCacheForApp(job.currentAppId);
-  const nextServerHeadHash = typeof changeStep.headCommitHash === "string" ? changeStep.headCommitHash.trim() : "";
-  if (!nextServerHeadHash) {
-    throw buildFinalizeCliError({
-      message: "Backend returned a succeeded change step without a head commit hash.",
-      exitCode: 1,
-      hint: "This is a backend invariant violation; retry will not help. Run `remix collab status` before trying again.",
-      disposition: "terminal",
-      reason: "missing_head_commit_hash"
-    });
-  }
-  let nextServerRevisionId = typeof changeStep.resultRevisionId === "string" ? changeStep.resultRevisionId.trim() : "";
-  let nextServerTreeHash = null;
-  if (!nextServerRevisionId) {
-    const freshHeadResp = await params.api.getAppHead(job.currentAppId);
-    const freshHead = unwrapResponseObject(freshHeadResp, "app head");
-    if (freshHead.headCommitHash !== nextServerHeadHash || !freshHead.headRevisionId) {
-      throw buildFinalizeCliError({
-        message: "Backend returned a succeeded change step without a matching result revision.",
-        exitCode: 1,
-        hint: "The local baseline was not advanced because the post-step revision could not be verified. Restart the backend/CLI and retry after checking `remix collab status`.",
-        disposition: "terminal",
-        reason: "missing_result_revision_id"
-      });
-    }
-    nextServerRevisionId = freshHead.headRevisionId;
-    nextServerTreeHash = freshHead.treeHash ?? null;
-  }
-  await writeLocalBaseline({
-    repoRoot: job.repoRoot,
-    repoFingerprint: job.repoFingerprint,
-    laneId: job.laneId,
-    currentAppId: job.currentAppId,
-    branchName: job.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
-    lastServerRevisionId: nextServerRevisionId,
-    lastServerTreeHash: nextServerTreeHash,
-    lastServerHeadHash: nextServerHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
-  });
+  await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep });
   await updatePendingFinalizeJob(job.id, {
     status: "completed",
     metadata: { changeStepId: String(changeStep.id ?? "") }
@@ -10362,15 +10435,17 @@ function isFinalizePreflightFailureCode(value) {
 
 // src/auto-fix-dispatcher.ts
 var import_node_child_process6 = require("child_process");
+var import_node_crypto4 = require("crypto");
 var import_node_fs6 = require("fs");
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_os8 = __toESM(require("os"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 
 // src/finalize-failure-marker.ts
 var import_promises19 = __toESM(require("fs/promises"), 1);
-var import_node_path7 = __toESM(require("path"), 1);
-var FINALIZE_FAILURE_MARKER_REL = import_node_path7.default.join(".remix", ".last-finalize-failure.json");
+var import_node_path8 = __toESM(require("path"), 1);
+var FINALIZE_FAILURE_MARKER_REL = import_node_path8.default.join(".remix", ".last-finalize-failure.json");
 function markerPath(repoRoot) {
-  return import_node_path7.default.join(repoRoot, FINALIZE_FAILURE_MARKER_REL);
+  return import_node_path8.default.join(repoRoot, FINALIZE_FAILURE_MARKER_REL);
 }
 async function readFinalizeFailureMarker(repoRoot) {
   const raw = await import_promises19.default.readFile(markerPath(repoRoot), "utf8").catch(() => null);
@@ -10387,7 +10462,7 @@ async function readFinalizeFailureMarker(repoRoot) {
 }
 async function writeFinalizeFailureMarker(marker) {
   const filePath = markerPath(marker.repoRoot);
-  await import_promises19.default.mkdir(import_node_path7.default.dirname(filePath), { recursive: true });
+  await import_promises19.default.mkdir(import_node_path8.default.dirname(filePath), { recursive: true });
   const tmpPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
   await import_promises19.default.writeFile(tmpPath, JSON.stringify(marker, null, 2), "utf8");
   await import_promises19.default.rename(tmpPath, filePath);
@@ -10413,31 +10488,31 @@ function buildFreshFailureMarker(params) {
 }
 
 // src/hook-diagnostics.ts
-var import_node_crypto2 = require("crypto");
+var import_node_crypto3 = require("crypto");
 var import_promises21 = __toESM(require("fs/promises"), 1);
-var import_node_os6 = __toESM(require("os"), 1);
-var import_node_path9 = __toESM(require("path"), 1);
+var import_node_os7 = __toESM(require("os"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
 
 // src/hook-state.ts
 var import_promises20 = __toESM(require("fs/promises"), 1);
-var import_node_os5 = __toESM(require("os"), 1);
-var import_node_path8 = __toESM(require("path"), 1);
-var import_node_crypto = require("crypto");
-function stateRoot2() {
+var import_node_os6 = __toESM(require("os"), 1);
+var import_node_path9 = __toESM(require("path"), 1);
+var import_node_crypto2 = require("crypto");
+function stateRoot3() {
   const configured = process.env.REMIX_CLAUDE_PLUGIN_HOOK_STATE_ROOT?.trim();
-  return configured || import_node_path8.default.join(import_node_os5.default.tmpdir(), "remix-claude-plugin-hooks");
+  return configured || import_node_path9.default.join(import_node_os6.default.tmpdir(), "remix-claude-plugin-hooks");
 }
 function statePath(sessionId) {
-  return import_node_path8.default.join(stateRoot2(), `${sessionId}.json`);
+  return import_node_path9.default.join(stateRoot3(), `${sessionId}.json`);
 }
 function stateLockPath(sessionId) {
-  return import_node_path8.default.join(stateRoot2(), `${sessionId}.lock`);
+  return import_node_path9.default.join(stateRoot3(), `${sessionId}.lock`);
 }
 function stateLockMetaPath(sessionId) {
-  return import_node_path8.default.join(stateLockPath(sessionId), "owner.json");
+  return import_node_path9.default.join(stateLockPath(sessionId), "owner.json");
 }
 async function writeJsonAtomic2(filePath, value) {
-  await import_promises20.default.mkdir(import_node_path8.default.dirname(filePath), { recursive: true });
+  await import_promises20.default.mkdir(import_node_path9.default.dirname(filePath), { recursive: true });
   const tmpPath = `${filePath}.tmp-${Date.now()}-${Math.random().toString(16).slice(2)}`;
   await import_promises20.default.writeFile(tmpPath, JSON.stringify(value, null, 2) + "\n", "utf8");
   await import_promises20.default.rename(tmpPath, filePath);
@@ -10490,11 +10565,11 @@ async function tryRemoveStaleStateLock(sessionId) {
 async function acquireStateLock(sessionId) {
   const lockPath = stateLockPath(sessionId);
   const deadline = Date.now() + STATE_LOCK_WAIT_MS;
-  await import_promises20.default.mkdir(stateRoot2(), { recursive: true });
+  await import_promises20.default.mkdir(stateRoot3(), { recursive: true });
   while (true) {
     try {
       await import_promises20.default.mkdir(lockPath);
-      const ownerId = (0, import_node_crypto.randomUUID)();
+      const ownerId = (0, import_node_crypto2.randomUUID)();
       const createdAt = (/* @__PURE__ */ new Date()).toISOString();
       const metadata = {
         ownerId,
@@ -10551,7 +10626,7 @@ async function createPendingTurnState(params) {
   return withStateLock(params.sessionId, async () => {
     const state = {
       sessionId: params.sessionId,
-      turnId: (0, import_node_crypto.randomUUID)(),
+      turnId: (0, import_node_crypto2.randomUUID)(),
       prompt: params.prompt,
       initialCwd: params.initialCwd?.trim() || null,
       intent: params.intent,
@@ -10570,7 +10645,7 @@ async function createPendingTurnState(params) {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.23",
+  version: "0.1.25",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -10608,8 +10683,8 @@ var package_default = {
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.18",
-    "@remixhq/mcp": "^0.1.18"
+    "@remixhq/core": "^0.1.20",
+    "@remixhq/mcp": "^0.1.20"
   },
   devDependencies: {
     "@types/node": "^25.4.0",
@@ -10632,17 +10707,17 @@ var pluginMetadata = {
 var MAX_LOG_BYTES = 512 * 1024;
 function resolveClaudeRoot() {
   const configured = process.env.CLAUDE_CONFIG_DIR?.trim();
-  return configured || import_node_path9.default.join(import_node_os6.default.homedir(), ".claude");
+  return configured || import_node_path10.default.join(import_node_os7.default.homedir(), ".claude");
 }
 function resolvePluginDataDirName() {
   return `${pluginMetadata.pluginId}-${pluginMetadata.pluginId}`;
 }
 function getHookDiagnosticsDirPath() {
   const configured = process.env.REMIX_CLAUDE_PLUGIN_HOOK_DIAGNOSTICS_DIR?.trim();
-  return configured || import_node_path9.default.join(resolveClaudeRoot(), "plugins", "data", resolvePluginDataDirName());
+  return configured || import_node_path10.default.join(resolveClaudeRoot(), "plugins", "data", resolvePluginDataDirName());
 }
 function getHookDiagnosticsLogPath() {
-  return import_node_path9.default.join(getHookDiagnosticsDirPath(), "hooks.ndjson");
+  return import_node_path10.default.join(getHookDiagnosticsDirPath(), "hooks.ndjson");
 }
 function toFieldValue(value) {
   if (value === null) return null;
@@ -10680,13 +10755,13 @@ function summarizeText(value) {
   return {
     present: true,
     length: trimmed.length,
-    sha256Prefix: (0, import_node_crypto2.createHash)("sha256").update(trimmed).digest("hex").slice(0, 12)
+    sha256Prefix: (0, import_node_crypto3.createHash)("sha256").update(trimmed).digest("hex").slice(0, 12)
   };
 }
 async function appendHookDiagnosticsEvent(params) {
   try {
     const logPath = getHookDiagnosticsLogPath();
-    await import_promises21.default.mkdir(import_node_path9.default.dirname(logPath), { recursive: true });
+    await import_promises21.default.mkdir(import_node_path10.default.dirname(logPath), { recursive: true });
     await rotateLogIfNeeded(logPath);
     const event = {
       ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -10733,18 +10808,27 @@ var RECOMMENDED_USER_COMMAND = {
   pull_required: "remix collab sync",
   baseline_missing: "remix collab init"
 };
-var SPAWN_LOCK_REL = (cmdSlug) => import_node_path10.default.join(".remix", `.${cmdSlug}-spawning`);
-var SPAWN_LOG_REL = (cmdSlug) => import_node_path10.default.join(".remix", `${cmdSlug}.log`);
 var SPAWN_THROTTLE_MS = 5 * 60 * 1e3;
 function commandSlug(args) {
   return args.join("-").replace(/[^a-zA-Z0-9_-]/g, "_");
 }
+function stateRoot4() {
+  const configured = process.env.REMIX_CLAUDE_PLUGIN_HOOK_STATE_ROOT?.trim();
+  return configured || import_node_path11.default.join(import_node_os8.default.tmpdir(), "remix-claude-plugin-hooks");
+}
+function sha256Hex3(value) {
+  return (0, import_node_crypto4.createHash)("sha256").update(value).digest("hex");
+}
+function spawnLockPath(repoRoot, cmdSlug) {
+  if (cmdSlug === "collab-init") {
+    return collabInitSpawnLockPath(repoRoot);
+  }
+  return import_node_path11.default.join(stateRoot4(), "auto-fix-spawn-locks", sha256Hex3(repoRoot), `${cmdSlug}.lock`);
+}
 function spawnFixDetached(repoRoot, args) {
   const slug = commandSlug(args);
   const command = `remix ${args.join(" ")}`;
-  const remixDir = import_node_path10.default.join(repoRoot, ".remix");
-  const lockPath = import_node_path10.default.join(repoRoot, SPAWN_LOCK_REL(slug));
-  const logPath = import_node_path10.default.join(repoRoot, SPAWN_LOG_REL(slug));
+  const lockPath = spawnLockPath(repoRoot, slug);
   try {
     if ((0, import_node_fs6.existsSync)(lockPath)) {
       const ageMs = Date.now() - (0, import_node_fs6.statSync)(lockPath).mtimeMs;
@@ -10755,27 +10839,14 @@ function spawnFixDetached(repoRoot, args) {
   } catch {
   }
   try {
-    (0, import_node_fs6.mkdirSync)(remixDir, { recursive: true });
+    (0, import_node_fs6.mkdirSync)(import_node_path11.default.dirname(lockPath), { recursive: true });
   } catch {
   }
-  let out;
-  let err;
-  try {
-    out = (0, import_node_fs6.openSync)(logPath, "a");
-    err = (0, import_node_fs6.openSync)(logPath, "a");
-  } catch (logErr) {
-    return {
-      kind: "spawn_failed",
-      command,
-      reason: "log_open_failed",
-      message: logErr instanceof Error ? logErr.message : String(logErr)
-    };
-  }
   try {
     const child = (0, import_node_child_process6.spawn)("remix", [...args], {
       cwd: repoRoot,
       detached: true,
-      stdio: ["ignore", out, err],
+      stdio: "ignore",
       env: { ...process.env, REMIX_AUTO_FIX_SPAWN: "1" }
     });
     child.unref();
@@ -10784,7 +10855,7 @@ function spawnFixDetached(repoRoot, args) {
       (0, import_node_fs6.utimesSync)(lockPath, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date());
     } catch {
     }
-    return { kind: "spawned", command, pid: child.pid, logPath };
+    return { kind: "spawned", command, pid: child.pid };
   } catch (spawnErr) {
     return {
       kind: "spawn_failed",
@@ -10840,7 +10911,6 @@ async function dispatchFinalizeFailure(input) {
       preflightCode: input.preflightCode,
       command: "command" in outcome ? outcome.command : null,
       pid: outcome.kind === "spawned" ? outcome.pid ?? null : null,
-      logPath: outcome.kind === "spawned" ? outcome.logPath : null,
       recommendedCommand
     },
     message: outcome.kind === "spawn_failed" ? outcome.message : null
@@ -10853,7 +10923,7 @@ function mergeOutcomeIntoMarker(existing, outcome) {
       status: "in_progress",
       command: outcome.command,
       pid: outcome.pid ?? null,
-      logPath: outcome.logPath,
+      logPath: null,
       attemptedAt: (/* @__PURE__ */ new Date()).toISOString(),
       failureMessage: null
     };
@@ -10881,7 +10951,7 @@ function mergeOutcomeIntoMarker(existing, outcome) {
   return existing;
 }
 
-// node_modules/@remixhq/core/dist/chunk-RCNOSZP6.js
+// node_modules/@remixhq/core/dist/chunk-C2FOZ3O7.js
 async function readJsonSafe(res) {
   const ct = res.headers.get("content-type") ?? "";
   if (!ct.toLowerCase().includes("application/json")) return null;
@@ -10900,7 +10970,7 @@ function createApiClient(config, opts) {
     const ms = typeof timeoutMs === "number" && timeoutMs > 0 ? timeoutMs : defaultTimeoutMs;
     return ms != null ? AbortSignal.timeout(ms) : void 0;
   }
-  async function request(path17, init, opts2) {
+  async function request(path18, init, opts2) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -10908,7 +10978,7 @@ function createApiClient(config, opts) {
       });
     }
     const auth = await tokenProvider();
-    const url = new URL(path17, config.apiUrl).toString();
+    const url = new URL(path18, config.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
       signal: makeTimeoutSignal(opts2?.timeoutMs),
@@ -10937,7 +11007,7 @@ function createApiClient(config, opts) {
     const json = await readJsonSafe(res);
     return json ?? null;
   }
-  async function requestBinary(path17, init, opts2) {
+  async function requestBinary(path18, init, opts2) {
     if (!tokenProvider) {
       throw new RemixError("API client is missing a token provider.", {
         exitCode: 1,
@@ -10945,7 +11015,7 @@ function createApiClient(config, opts) {
       });
     }
     const auth = await tokenProvider();
-    const url = new URL(path17, config.apiUrl).toString();
+    const url = new URL(path18, config.apiUrl).toString();
     const doFetch = async (bearer) => fetch(url, {
       ...init,
       signal: makeTimeoutSignal(opts2?.timeoutMs),
@@ -11075,6 +11145,14 @@ function createApiClient(config, opts) {
       method: "POST",
       body: JSON.stringify(payload)
     }),
+    listChangeSteps: (appId, params) => {
+      const qs = new URLSearchParams();
+      if (params?.limit !== void 0) qs.set("limit", String(params.limit));
+      if (params?.offset !== void 0) qs.set("offset", String(params.offset));
+      if (params?.idempotencyKey) qs.set("idempotencyKey", params.idempotencyKey);
+      const suffix = qs.toString() ? `?${qs.toString()}` : "";
+      return request(`/v1/apps/${encodeURIComponent(appId)}/change-steps${suffix}`, { method: "GET" });
+    },
     createCollabTurn: (appId, payload) => request(`/v1/apps/${encodeURIComponent(appId)}/collab-turns`, {
       method: "POST",
       body: JSON.stringify(payload)
@@ -11800,8 +11878,8 @@ function getErrorMap() {
 
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path17, errorMaps, issueData } = params;
-  const fullPath = [...path17, ...issueData.path || []];
+  const { data, path: path18, errorMaps, issueData } = params;
+  const fullPath = [...path18, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -11917,11 +11995,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path17, key) {
+  constructor(parent, value, path18, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path17;
+    this._path = path18;
     this._key = key;
   }
   get path() {
@@ -24469,8 +24547,8 @@ var IcebergError = class extends Error {
     return this.status === 419;
   }
 };
-function buildUrl(baseUrl, path17, query) {
-  const url = new URL(path17, baseUrl);
+function buildUrl(baseUrl, path18, query) {
+  const url = new URL(path18, baseUrl);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       if (value !== void 0) {
@@ -24500,12 +24578,12 @@ function createFetchClient(options) {
   return {
     async request({
       method,
-      path: path17,
+      path: path18,
       query,
       body,
       headers
     }) {
-      const url = buildUrl(options.baseUrl, path17, query);
+      const url = buildUrl(options.baseUrl, path18, query);
       const authHeaders = await buildAuthHeaders(options.auth);
       const res = await fetchFn(url, {
         method,
@@ -25343,7 +25421,7 @@ var StorageFileApi = class extends BaseApiClient {
   * @param path The relative file path. Should be of the format `folder/subfolder/filename.png`. The bucket must already exist before attempting to upload.
   * @param fileBody The body of the file to be stored in the bucket.
   */
-  async uploadOrUpdate(method, path17, fileBody, fileOptions) {
+  async uploadOrUpdate(method, path18, fileBody, fileOptions) {
     var _this = this;
     return _this.handleOperation(async () => {
       let body;
@@ -25367,7 +25445,7 @@ var StorageFileApi = class extends BaseApiClient {
         if ((typeof ReadableStream !== "undefined" && body instanceof ReadableStream || body && typeof body === "object" && "pipe" in body && typeof body.pipe === "function") && !options.duplex) options.duplex = "half";
       }
       if (fileOptions === null || fileOptions === void 0 ? void 0 : fileOptions.headers) for (const [key, value] of Object.entries(fileOptions.headers)) headers = setHeader(headers, key, value);
-      const cleanPath = _this._removeEmptyFolders(path17);
+      const cleanPath = _this._removeEmptyFolders(path18);
       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 {
@@ -25428,8 +25506,8 @@ var StorageFileApi = class extends BaseApiClient {
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   * - For React Native, using either `Blob`, `File` or `FormData` does not work as intended. Upload file using `ArrayBuffer` from base64 file data instead, see example below.
   */
-  async upload(path17, fileBody, fileOptions) {
-    return this.uploadOrUpdate("POST", path17, fileBody, fileOptions);
+  async upload(path18, fileBody, fileOptions) {
+    return this.uploadOrUpdate("POST", path18, fileBody, fileOptions);
   }
   /**
   * Upload a file with a token generated from `createSignedUploadUrl`.
@@ -25468,9 +25546,9 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: none
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async uploadToSignedUrl(path17, token, fileBody, fileOptions) {
+  async uploadToSignedUrl(path18, token, fileBody, fileOptions) {
     var _this3 = this;
-    const cleanPath = _this3._removeEmptyFolders(path17);
+    const cleanPath = _this3._removeEmptyFolders(path18);
     const _path = _this3._getFinalPath(cleanPath);
     const url = new URL(_this3.url + `/object/upload/sign/${_path}`);
     url.searchParams.set("token", token);
@@ -25532,10 +25610,10 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `insert`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async createSignedUploadUrl(path17, options) {
+  async createSignedUploadUrl(path18, options) {
     var _this4 = this;
     return _this4.handleOperation(async () => {
-      let _path = _this4._getFinalPath(path17);
+      let _path = _this4._getFinalPath(path18);
       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 });
@@ -25544,7 +25622,7 @@ var StorageFileApi = class extends BaseApiClient {
       if (!token) throw new StorageError("No token returned by API");
       return {
         signedUrl: url.toString(),
-        path: path17,
+        path: path18,
         token
       };
     });
@@ -25600,8 +25678,8 @@ var StorageFileApi = class extends BaseApiClient {
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   * - For React Native, using either `Blob`, `File` or `FormData` does not work as intended. Update file using `ArrayBuffer` from base64 file data instead, see example below.
   */
-  async update(path17, fileBody, fileOptions) {
-    return this.uploadOrUpdate("PUT", path17, fileBody, fileOptions);
+  async update(path18, fileBody, fileOptions) {
+    return this.uploadOrUpdate("PUT", path18, fileBody, fileOptions);
   }
   /**
   * Moves an existing file to a new path in the same bucket.
@@ -25749,10 +25827,10 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `select`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async createSignedUrl(path17, expiresIn, options) {
+  async createSignedUrl(path18, expiresIn, options) {
     var _this8 = this;
     return _this8.handleOperation(async () => {
-      let _path = _this8._getFinalPath(path17);
+      let _path = _this8._getFinalPath(path18);
       const hasTransform = typeof (options === null || options === void 0 ? void 0 : options.transform) === "object" && options.transform !== null && Object.keys(options.transform).length > 0;
       let data = await post(_this8.fetch, `${_this8.url}/object/sign/${_path}`, _objectSpread22({ expiresIn }, hasTransform ? { transform: options.transform } : {}), { headers: _this8.headers });
       const query = new URLSearchParams();
@@ -25886,13 +25964,13 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `select`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  download(path17, options, parameters) {
+  download(path18, options, parameters) {
     const renderPath = typeof (options === null || options === void 0 ? void 0 : options.transform) === "object" && options.transform !== null && Object.keys(options.transform).length > 0 ? "render/image/authenticated" : "object";
     const query = new URLSearchParams();
     if (options === null || options === void 0 ? void 0 : options.transform) this.applyTransformOptsToQuery(query, options.transform);
     if ((options === null || options === void 0 ? void 0 : options.cacheNonce) != null) query.set("cacheNonce", String(options.cacheNonce));
     const queryString = query.toString();
-    const _path = this._getFinalPath(path17);
+    const _path = this._getFinalPath(path18);
     const downloadFn = () => get(this.fetch, `${this.url}/${renderPath}/${_path}${queryString ? `?${queryString}` : ""}`, {
       headers: this.headers,
       noResolveJson: true
@@ -25922,9 +26000,9 @@ var StorageFileApi = class extends BaseApiClient {
   * }
   * ```
   */
-  async info(path17) {
+  async info(path18) {
     var _this10 = this;
-    const _path = _this10._getFinalPath(path17);
+    const _path = _this10._getFinalPath(path18);
     return _this10.handleOperation(async () => {
       return recursiveToCamel(await get(_this10.fetch, `${_this10.url}/object/info/${_path}`, { headers: _this10.headers }));
     });
@@ -25944,9 +26022,9 @@ var StorageFileApi = class extends BaseApiClient {
   *   .exists('folder/avatar1.png')
   * ```
   */
-  async exists(path17) {
+  async exists(path18) {
     var _this11 = this;
-    const _path = _this11._getFinalPath(path17);
+    const _path = _this11._getFinalPath(path18);
     try {
       await head(_this11.fetch, `${_this11.url}/object/${_path}`, { headers: _this11.headers });
       return {
@@ -26024,8 +26102,8 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: none
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  getPublicUrl(path17, options) {
-    const _path = this._getFinalPath(path17);
+  getPublicUrl(path18, options) {
+    const _path = this._getFinalPath(path18);
     const query = new URLSearchParams();
     if (options === null || options === void 0 ? void 0 : options.download) query.set("download", options.download === true ? "" : options.download);
     if (options === null || options === void 0 ? void 0 : options.transform) this.applyTransformOptsToQuery(query, options.transform);
@@ -26162,10 +26240,10 @@ var StorageFileApi = class extends BaseApiClient {
   *   - `objects` table permissions: `select`
   * - Refer to the [Storage guide](/docs/guides/storage/security/access-control) on how access control works
   */
-  async list(path17, options, parameters) {
+  async list(path18, options, parameters) {
     var _this13 = this;
     return _this13.handleOperation(async () => {
-      const body = _objectSpread22(_objectSpread22(_objectSpread22({}, DEFAULT_SEARCH_OPTIONS), options), {}, { prefix: path17 || "" });
+      const body = _objectSpread22(_objectSpread22(_objectSpread22({}, DEFAULT_SEARCH_OPTIONS), options), {}, { prefix: path18 || "" });
       return await post(_this13.fetch, `${_this13.url}/object/list/${_this13.bucketId}`, body, { headers: _this13.headers }, parameters);
     });
   }
@@ -26229,11 +26307,11 @@ var StorageFileApi = class extends BaseApiClient {
     if (typeof Buffer !== "undefined") return Buffer.from(data).toString("base64");
     return btoa(data);
   }
-  _getFinalPath(path17) {
-    return `${this.bucketId}/${path17.replace(/^\/+/, "")}`;
+  _getFinalPath(path18) {
+    return `${this.bucketId}/${path18.replace(/^\/+/, "")}`;
   }
-  _removeEmptyFolders(path17) {
-    return path17.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
+  _removeEmptyFolders(path18) {
+    return path18.replace(/^\/|\/$/g, "").replace(/\/+/g, "/");
   }
   /** Modifies the `query`, appending values the from `transform` */
   applyTransformOptsToQuery(query, transform) {
@@ -35611,11 +35689,11 @@ function isPidAlive(pid) {
   }
 }
 function repoLockFileName(repoRoot) {
-  const hash = (0, import_node_crypto3.createHash)("sha256").update(repoRoot).digest("hex").slice(0, 16);
+  const hash = (0, import_node_crypto5.createHash)("sha256").update(repoRoot).digest("hex").slice(0, 16);
   return `.drainer-${hash}.lock`;
 }
 function repoLockPath(repoRoot) {
-  return import_node_path11.default.join(getDeferredTurnDirPath(), repoLockFileName(repoRoot));
+  return import_node_path12.default.join(getDeferredTurnDirPath(), repoLockFileName(repoRoot));
 }
 async function readDrainLockMetadata(lockPath) {
   const raw = await import_promises23.default.readFile(lockPath, "utf8").catch(() => null);
@@ -35637,7 +35715,7 @@ async function writeDrainLockMetadata(lockPath, metadata) {
 }
 async function tryAcquireDrainLock(repoRoot) {
   const lockPath = repoLockPath(repoRoot);
-  await import_promises23.default.mkdir(import_node_path11.default.dirname(lockPath), { recursive: true });
+  await import_promises23.default.mkdir(import_node_path12.default.dirname(lockPath), { recursive: true });
   const existingMeta = await readDrainLockMetadata(lockPath);
   if (existingMeta) {
     const lockStat = await import_promises23.default.stat(lockPath).catch(() => null);
@@ -36034,7 +36112,7 @@ function spawnDeferredTurnDrainer(repoRoot) {
 
 // src/hook-utils.ts
 var import_promises24 = __toESM(require("fs/promises"), 1);
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 async function readJsonStdin() {
   const chunks = [];
   for await (const chunk of process.stdin) {
@@ -36060,16 +36138,16 @@ function extractString(input, keys) {
 }
 async function findBoundRepo(startPath) {
   if (!startPath) return null;
-  let current = import_node_path12.default.resolve(startPath);
+  let current = import_node_path13.default.resolve(startPath);
   let stats = await import_promises24.default.stat(current).catch(() => null);
   if (stats?.isFile()) {
-    current = import_node_path12.default.dirname(current);
+    current = import_node_path13.default.dirname(current);
   }
   while (true) {
-    const bindingPath = import_node_path12.default.join(current, ".remix", "config.json");
+    const bindingPath = import_node_path13.default.join(current, ".remix", "config.json");
     const bindingStats = await import_promises24.default.stat(bindingPath).catch(() => null);
     if (bindingStats?.isFile()) return current;
-    const parent = import_node_path12.default.dirname(current);
+    const parent = import_node_path13.default.dirname(current);
     if (parent === current) return null;
     current = parent;
   }
@@ -36093,8 +36171,6 @@ function buildRuntimeStatusOverride() {
     "Use `remix_collab_drain_finalize_queue` only for explicit recovery flows, such as status reporting `await_finalize` before a merge-related operation."
   ].join("\n");
 }
-var COLLAB_INIT_LOG_REL = import_node_path13.default.join(".remix", "collab-init.log");
-var COLLAB_INIT_SPAWN_LOCK_REL = import_node_path13.default.join(".remix", ".collab-init-spawning");
 var COLLAB_INIT_SPAWN_LOCK_STALE_MS = 90 * 1e3;
 function isPidAlive2(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
@@ -36105,31 +36181,42 @@ function isPidAlive2(pid) {
     return false;
   }
 }
-function readLockPid(spawnLockPath) {
+function readSpawnLock(spawnLockPath2) {
   try {
-    const raw = (0, import_node_fs7.readFileSync)(spawnLockPath, "utf8").trim();
+    const raw = (0, import_node_fs7.readFileSync)(spawnLockPath2, "utf8").trim();
     if (!raw) return null;
+    if (raw.startsWith("{")) {
+      const parsed = JSON.parse(raw);
+      const pid2 = Number(parsed?.pid ?? 0);
+      return {
+        pid: Number.isFinite(pid2) && pid2 > 0 ? pid2 : null,
+        branchName: typeof parsed?.branchName === "string" && parsed.branchName.trim() ? parsed.branchName : null
+      };
+    }
     const pid = Number.parseInt(raw, 10);
-    return Number.isFinite(pid) && pid > 0 ? pid : null;
+    return {
+      pid: Number.isFinite(pid) && pid > 0 ? pid : null,
+      branchName: null
+    };
   } catch {
     return null;
   }
 }
-function maybeAutoSpawnBranchInit(repoRoot) {
-  const remixDir = import_node_path13.default.join(repoRoot, ".remix");
-  const spawnLockPath = import_node_path13.default.join(repoRoot, COLLAB_INIT_SPAWN_LOCK_REL);
-  const logPath = import_node_path13.default.join(repoRoot, COLLAB_INIT_LOG_REL);
+function maybeAutoSpawnBranchInit(repoRoot, branchName) {
+  const spawnLockPath2 = collabInitSpawnLockPath(repoRoot);
   try {
-    if ((0, import_node_fs7.existsSync)(spawnLockPath)) {
-      const lockPid = readLockPid(spawnLockPath);
+    if ((0, import_node_fs7.existsSync)(spawnLockPath2)) {
+      const lock = readSpawnLock(spawnLockPath2);
+      const lockPid = lock?.pid ?? null;
       const lockAlive = lockPid !== null && isPidAlive2(lockPid);
-      const ageMs = Date.now() - (0, import_node_fs7.statSync)(spawnLockPath).mtimeMs;
-      if (lockAlive && ageMs < COLLAB_INIT_SPAWN_LOCK_STALE_MS) {
+      const sameBranch = !lock?.branchName || !branchName || lock.branchName === branchName;
+      const ageMs = Date.now() - (0, import_node_fs7.statSync)(spawnLockPath2).mtimeMs;
+      if (lockAlive && sameBranch && ageMs < COLLAB_INIT_SPAWN_LOCK_STALE_MS) {
         return { spawned: false, reason: "spawn_lock_held" };
       }
       if (!lockAlive) {
         try {
-          (0, import_node_fs7.unlinkSync)(spawnLockPath);
+          (0, import_node_fs7.unlinkSync)(spawnLockPath2);
         } catch {
         }
       }
@@ -36137,35 +36224,32 @@ function maybeAutoSpawnBranchInit(repoRoot) {
   } catch {
   }
   try {
-    (0, import_node_fs7.mkdirSync)(remixDir, { recursive: true });
+    (0, import_node_fs7.mkdirSync)(import_node_path14.default.dirname(spawnLockPath2), { recursive: true });
   } catch {
   }
-  let out;
-  let err;
-  try {
-    out = (0, import_node_fs7.openSync)(logPath, "a");
-    err = (0, import_node_fs7.openSync)(logPath, "a");
-  } catch (logErr) {
-    return {
-      spawned: false,
-      reason: "log_open_failed",
-      message: logErr instanceof Error ? logErr.message : String(logErr)
-    };
-  }
   try {
     const child = (0, import_node_child_process8.spawn)("remix", ["collab", "init"], {
       cwd: repoRoot,
       detached: true,
-      stdio: ["ignore", out, err],
+      stdio: "ignore",
       env: { ...process.env, REMIX_COLLAB_INIT_AUTO_SPAWN: "1" }
     });
     child.unref();
     try {
-      (0, import_node_fs7.writeFileSync)(spawnLockPath, String(child.pid ?? ""), "utf8");
-      (0, import_node_fs7.utimesSync)(spawnLockPath, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date());
+      const lock = {
+        schemaVersion: 1,
+        pid: child.pid ?? null,
+        branchName,
+        repoRoot,
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        command: "remix collab init"
+      };
+      (0, import_node_fs7.writeFileSync)(spawnLockPath2, `${JSON.stringify(lock, null, 2)}
+`, "utf8");
+      (0, import_node_fs7.utimesSync)(spawnLockPath2, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date());
     } catch {
     }
-    return { spawned: true, pid: child.pid, logPath };
+    return { spawned: true, pid: child.pid };
   } catch (spawnErr) {
     return {
       spawned: false,
@@ -36174,14 +36258,13 @@ function maybeAutoSpawnBranchInit(repoRoot) {
     };
   }
 }
-function buildBranchInitContextMessage(branch, repoRoot, logPath) {
+function buildBranchInitContextMessage(branch, repoRoot) {
   const branchLabel = branch ? `\`${branch}\`` : "the current branch";
   return [
     "[Remix recovery in progress]:",
     `Remix is initializing recording for ${branchLabel} in ${repoRoot} in the background.`,
     "This turn may be recorded retroactively once init finishes (it may appear in the timeline with a small delay).",
-    "Do NOT call any Remix MCP tool to initialize, repair, or sync this branch \u2014 the plugin is handling it automatically.",
-    `Init log: ${logPath}`
+    "Do NOT call any Remix MCP tool to initialize, repair, or sync this branch \u2014 the plugin is handling it automatically."
   ].join("\n");
 }
 var STALE_MARKER_THRESHOLD_MS = 24 * 60 * 60 * 1e3;
@@ -36380,9 +36463,9 @@ async function runHookUserPrompt(payload) {
   }
   if (isCurrentBranchUnbound) {
     const currentBranch = bindingState?.currentBranch ?? null;
-    const outcome = maybeAutoSpawnBranchInit(boundRepo);
+    const outcome = maybeAutoSpawnBranchInit(boundRepo, currentBranch);
     if (outcome.spawned) {
-      advisorySections.push(buildBranchInitContextMessage(currentBranch, boundRepo, outcome.logPath));
+      advisorySections.push(buildBranchInitContextMessage(currentBranch, boundRepo));
       await appendHookDiagnosticsEvent({
         hook: "UserPromptSubmit",
         sessionId,
@@ -36393,8 +36476,7 @@ async function runHookUserPrompt(payload) {
         fields: {
           currentBranch,
           knownBoundBranchCount: knownBoundBranches.length,
-          pid: outcome.pid ?? null,
-          logPath: outcome.logPath
+          pid: outcome.pid ?? null
         }
       });
     } else {