@remixhq/claude-plugin 0.1.23 → 0.1.24

package/dist/hook-user-prompt.cjs

@@ -8827,6 +8827,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 +8914,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 +9772,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 +10010,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 +10135,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 ?? "") }
@@ -10570,7 +10628,7 @@ async function createPendingTurnState(params) {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.23",
+  version: "0.1.24",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -10608,8 +10666,8 @@ var package_default = {
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.18",
-    "@remixhq/mcp": "^0.1.18"
+    "@remixhq/core": "^0.1.19",
+    "@remixhq/mcp": "^0.1.19"
   },
   devDependencies: {
     "@types/node": "^25.4.0",
@@ -10881,7 +10939,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;
@@ -11075,6 +11133,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)
@@ -36105,26 +36171,39 @@ function isPidAlive2(pid) {
     return false;
   }
 }
-function readLockPid(spawnLockPath) {
+function readSpawnLock(spawnLockPath) {
   try {
     const raw = (0, import_node_fs7.readFileSync)(spawnLockPath, "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) {
+function maybeAutoSpawnBranchInit(repoRoot, branchName) {
   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);
   try {
     if ((0, import_node_fs7.existsSync)(spawnLockPath)) {
-      const lockPid = readLockPid(spawnLockPath);
+      const lock = readSpawnLock(spawnLockPath);
+      const lockPid = lock?.pid ?? null;
       const lockAlive = lockPid !== null && isPidAlive2(lockPid);
+      const sameBranch = !lock?.branchName || !branchName || lock.branchName === branchName;
       const ageMs = Date.now() - (0, import_node_fs7.statSync)(spawnLockPath).mtimeMs;
-      if (lockAlive && ageMs < COLLAB_INIT_SPAWN_LOCK_STALE_MS) {
+      if (lockAlive && sameBranch && ageMs < COLLAB_INIT_SPAWN_LOCK_STALE_MS) {
         return { spawned: false, reason: "spawn_lock_held" };
       }
       if (!lockAlive) {
@@ -36153,6 +36232,13 @@ function maybeAutoSpawnBranchInit(repoRoot) {
     };
   }
   try {
+    (0, import_node_fs7.appendFileSync)(
+      logPath,
+      `
+[${(/* @__PURE__ */ new Date()).toISOString()}] auto-spawning remix collab init for branch=${branchName ?? "(unknown)"} repo=${repoRoot}
+`,
+      "utf8"
+    );
     const child = (0, import_node_child_process8.spawn)("remix", ["collab", "init"], {
       cwd: repoRoot,
       detached: true,
@@ -36161,7 +36247,16 @@ function maybeAutoSpawnBranchInit(repoRoot) {
     });
     child.unref();
     try {
-      (0, import_node_fs7.writeFileSync)(spawnLockPath, String(child.pid ?? ""), "utf8");
+      const lock = {
+        schemaVersion: 1,
+        pid: child.pid ?? null,
+        branchName,
+        repoRoot,
+        startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        command: "remix collab init"
+      };
+      (0, import_node_fs7.writeFileSync)(spawnLockPath, `${JSON.stringify(lock, null, 2)}
+`, "utf8");
       (0, import_node_fs7.utimesSync)(spawnLockPath, /* @__PURE__ */ new Date(), /* @__PURE__ */ new Date());
     } catch {
     }
@@ -36380,7 +36475,7 @@ 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));
       await appendHookDiagnosticsEvent({