@remixhq/claude-plugin 0.1.20 → 0.1.22

package/dist/index.js

@@ -3,7 +3,7 @@
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.20",
+  version: "0.1.22",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -37,12 +37,12 @@ var package_default = {
     postbuild: `node -e "const fs=require('node:fs'); for (const p of ['dist/mcp-server.cjs','dist/hook-pre-git.cjs','dist/hook-user-prompt.cjs','dist/hook-post-collab.cjs','dist/hook-stop-collab.cjs']) fs.chmodSync(p, 0o755);"`,
     dev: "tsx src/mcp-server.ts",
     typecheck: "tsc -p tsconfig.json --noEmit",
-    test: "node --import tsx --test src/**/*.test.ts",
+    test: "node --import tsx --test 'src/**/*.test.ts'",
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.15",
-    "@remixhq/mcp": "^0.1.15"
+    "@remixhq/core": "^0.1.17",
+    "@remixhq/mcp": "^0.1.17"
   },
   devDependencies: {
     "@types/node": "^25.4.0",

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../package.json","../src/metadata.ts"],"sourcesContent":["{\n  \"name\": \"@remixhq/claude-plugin\",\n  \"version\": \"0.1.20\",\n  \"description\": \"Claude Code plugin for Remix collaboration workflows\",\n  \"homepage\": \"https://github.com/RemixDotOne/remix-claude-plugin\",\n  \"license\": \"MIT\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/RemixDotOne/remix-claude-plugin.git\"\n  },\n  \"type\": \"module\",\n  \"engines\": {\n    \"node\": \">=20\"\n  },\n  \"publishConfig\": {\n    \"access\": \"public\"\n  },\n  \"files\": [\n    \"dist\",\n    \".claude-plugin/plugin.json\",\n    \".mcp.json\",\n    \"skills\",\n    \"hooks\",\n    \"agents\"\n  ],\n  \"exports\": {\n    \".\": {\n      \"types\": \"./dist/index.d.ts\",\n      \"import\": \"./dist/index.js\"\n    }\n  },\n  \"scripts\": {\n    \"build\": \"tsup\",\n    \"postbuild\": \"node -e \\\"const fs=require('node:fs'); for (const p of ['dist/mcp-server.cjs','dist/hook-pre-git.cjs','dist/hook-user-prompt.cjs','dist/hook-post-collab.cjs','dist/hook-stop-collab.cjs']) fs.chmodSync(p, 0o755);\\\"\",\n    \"dev\": \"tsx src/mcp-server.ts\",\n    \"typecheck\": \"tsc -p tsconfig.json --noEmit\",\n    \"test\": \"node --import tsx --test src/**/*.test.ts\",\n    \"prepack\": \"npm run build\"\n  },\n  \"dependencies\": {\n    \"@remixhq/core\": \"^0.1.15\",\n    \"@remixhq/mcp\": \"^0.1.15\"\n  },\n  \"devDependencies\": {\n    \"@types/node\": \"^25.4.0\",\n    \"tsup\": \"^8.5.1\",\n    \"tsx\": \"^4.21.0\",\n    \"typescript\": \"^5.9.3\"\n  }\n}\n","import pkg from \"../package.json\";\n\nexport const pluginMetadata = {\n  name: pkg.name,\n  version: pkg.version,\n  description: pkg.description,\n  pluginId: \"remix\",\n  agentName: \"remix-collab\",\n};\n"],"mappings":";;;AAAA;AAAA,EACE,MAAQ;AAAA,EACR,SAAW;AAAA,EACX,aAAe;AAAA,EACf,UAAY;AAAA,EACZ,SAAW;AAAA,EACX,YAAc;AAAA,IACZ,MAAQ;AAAA,IACR,KAAO;AAAA,EACT;AAAA,EACA,MAAQ;AAAA,EACR,SAAW;AAAA,IACT,MAAQ;AAAA,EACV;AAAA,EACA,eAAiB;AAAA,IACf,QAAU;AAAA,EACZ;AAAA,EACA,OAAS;AAAA,IACP;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,SAAW;AAAA,IACT,KAAK;AAAA,MACH,OAAS;AAAA,MACT,QAAU;AAAA,IACZ;AAAA,EACF;AAAA,EACA,SAAW;AAAA,IACT,OAAS;AAAA,IACT,WAAa;AAAA,IACb,KAAO;AAAA,IACP,WAAa;AAAA,IACb,MAAQ;AAAA,IACR,SAAW;AAAA,EACb;AAAA,EACA,cAAgB;AAAA,IACd,iBAAiB;AAAA,IACjB,gBAAgB;AAAA,EAClB;AAAA,EACA,iBAAmB;AAAA,IACjB,eAAe;AAAA,IACf,MAAQ;AAAA,IACR,KAAO;AAAA,IACP,YAAc;AAAA,EAChB;AACF;;;AC/CO,IAAM,iBAAiB;AAAA,EAC5B,MAAM,gBAAI;AAAA,EACV,SAAS,gBAAI;AAAA,EACb,aAAa,gBAAI;AAAA,EACjB,UAAU;AAAA,EACV,WAAW;AACb;","names":[]}
+{"version":3,"sources":["../package.json","../src/metadata.ts"],"sourcesContent":["{\n  \"name\": \"@remixhq/claude-plugin\",\n  \"version\": \"0.1.22\",\n  \"description\": \"Claude Code plugin for Remix collaboration workflows\",\n  \"homepage\": \"https://github.com/RemixDotOne/remix-claude-plugin\",\n  \"license\": \"MIT\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"https://github.com/RemixDotOne/remix-claude-plugin.git\"\n  },\n  \"type\": \"module\",\n  \"engines\": {\n    \"node\": \">=20\"\n  },\n  \"publishConfig\": {\n    \"access\": \"public\"\n  },\n  \"files\": [\n    \"dist\",\n    \".claude-plugin/plugin.json\",\n    \".mcp.json\",\n    \"skills\",\n    \"hooks\",\n    \"agents\"\n  ],\n  \"exports\": {\n    \".\": {\n      \"types\": \"./dist/index.d.ts\",\n      \"import\": \"./dist/index.js\"\n    }\n  },\n  \"scripts\": {\n    \"build\": \"tsup\",\n    \"postbuild\": \"node -e \\\"const fs=require('node:fs'); for (const p of ['dist/mcp-server.cjs','dist/hook-pre-git.cjs','dist/hook-user-prompt.cjs','dist/hook-post-collab.cjs','dist/hook-stop-collab.cjs']) fs.chmodSync(p, 0o755);\\\"\",\n    \"dev\": \"tsx src/mcp-server.ts\",\n    \"typecheck\": \"tsc -p tsconfig.json --noEmit\",\n    \"test\": \"node --import tsx --test 'src/**/*.test.ts'\",\n    \"prepack\": \"npm run build\"\n  },\n  \"dependencies\": {\n    \"@remixhq/core\": \"^0.1.17\",\n    \"@remixhq/mcp\": \"^0.1.17\"\n  },\n  \"devDependencies\": {\n    \"@types/node\": \"^25.4.0\",\n    \"tsup\": \"^8.5.1\",\n    \"tsx\": \"^4.21.0\",\n    \"typescript\": \"^5.9.3\"\n  }\n}\n","import pkg from \"../package.json\";\n\nexport const pluginMetadata = {\n  name: pkg.name,\n  version: pkg.version,\n  description: pkg.description,\n  pluginId: \"remix\",\n  agentName: \"remix-collab\",\n};\n"],"mappings":";;;AAAA;AAAA,EACE,MAAQ;AAAA,EACR,SAAW;AAAA,EACX,aAAe;AAAA,EACf,UAAY;AAAA,EACZ,SAAW;AAAA,EACX,YAAc;AAAA,IACZ,MAAQ;AAAA,IACR,KAAO;AAAA,EACT;AAAA,EACA,MAAQ;AAAA,EACR,SAAW;AAAA,IACT,MAAQ;AAAA,EACV;AAAA,EACA,eAAiB;AAAA,IACf,QAAU;AAAA,EACZ;AAAA,EACA,OAAS;AAAA,IACP;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EACA,SAAW;AAAA,IACT,KAAK;AAAA,MACH,OAAS;AAAA,MACT,QAAU;AAAA,IACZ;AAAA,EACF;AAAA,EACA,SAAW;AAAA,IACT,OAAS;AAAA,IACT,WAAa;AAAA,IACb,KAAO;AAAA,IACP,WAAa;AAAA,IACb,MAAQ;AAAA,IACR,SAAW;AAAA,EACb;AAAA,EACA,cAAgB;AAAA,IACd,iBAAiB;AAAA,IACjB,gBAAgB;AAAA,EAClB;AAAA,EACA,iBAAmB;AAAA,IACjB,eAAe;AAAA,IACf,MAAQ;AAAA,IACR,KAAO;AAAA,IACP,YAAc;AAAA,EAChB;AACF;;;AC/CO,IAAM,iBAAiB;AAAA,EAC5B,MAAM,gBAAI;AAAA,EACV,SAAS,gBAAI;AAAA,EACb,aAAa,gBAAI;AAAA,EACjB,UAAU;AAAA,EACV,WAAW;AACb;","names":[]}

package/dist/mcp-server.cjs

@@ -21451,33 +21451,6 @@ async function pruneTerminalAsyncJobs() {
     }).map((job) => deleteAsyncJob(job.id))
   );
 }
-async function awaitAsyncJob(params) {
-  const pollIntervalMs = Math.max(50, params.pollIntervalMs ?? 500);
-  const deadline = Date.now() + params.timeoutMs;
-  let lastSeen = null;
-  while (Date.now() < deadline) {
-    const job = await readAsyncJob(params.jobId);
-    if (job) {
-      lastSeen = job;
-      if (job.status === "completed") return { status: "completed", job };
-      if (job.status === "failed") return { status: "failed", job };
-    } else if (lastSeen) {
-      return { status: "timeout", job: lastSeen };
-    } else {
-      return { status: "timeout", job: null };
-    }
-    const remaining = deadline - Date.now();
-    if (remaining <= 0) break;
-    await new Promise((resolve) => setTimeout(resolve, Math.min(pollIntervalMs, remaining)));
-  }
-  const final = await readAsyncJob(params.jobId);
-  if (final) {
-    if (final.status === "completed") return { status: "completed", job: final };
-    if (final.status === "failed") return { status: "failed", job: final };
-    return { status: "timeout", job: final };
-  }
-  return { status: "timeout", job: lastSeen };
-}
 function getBaselinePath(params) {
   return import_path6.default.join(getBaselinesRoot(), `${buildLaneStateKey(params)}.json`);
 }
@@ -21872,11 +21845,6 @@ function normalizeJob2(input) {
     metadata: input.metadata ?? {}
   };
 }
-async function enqueuePendingFinalizeJob(input) {
-  const job = normalizeJob2(input);
-  await writeJsonAtomic(getJobPath(job.id), job);
-  return job;
-}
 async function readPendingFinalizeJob(jobId) {
   try {
     const raw = await import_promises18.default.readFile(getJobPath(jobId), "utf8");
@@ -23587,28 +23555,6 @@ async function processClaimedPendingFinalizeJobInner(params) {
     warnings: []
   };
 }
-async function enqueueCapturedFinalizeTurn(params) {
-  return enqueuePendingFinalizeJob({
-    status: "queued",
-    repoRoot: params.repoRoot,
-    repoFingerprint: params.repoFingerprint,
-    currentAppId: params.currentAppId,
-    laneId: params.laneId,
-    threadId: params.threadId,
-    branchName: params.branchName,
-    prompt: params.prompt,
-    assistantResponse: params.assistantResponse,
-    baselineSnapshotId: params.baselineSnapshotId,
-    baselineServerHeadHash: params.baselineServerHeadHash,
-    currentSnapshotId: params.currentSnapshotId,
-    idempotencyKey: params.idempotencyKey,
-    error: null,
-    retryCount: 0,
-    lastAttemptAt: null,
-    nextRetryAt: params.nextRetryAt ?? null,
-    metadata: params.metadata ?? {}
-  });
-}
 async function drainPendingFinalizeQueue(params) {
   await prunePendingFinalizeJobs();
   const jobs = await listPendingFinalizeJobs();
@@ -23629,199 +23575,6 @@ async function drainPendingFinalizeQueue(params) {
   }
   return results;
 }
-var FINALIZE_AWAIT_INIT_POST_TIMEOUT_MS = 6e4;
-function collectWarnings(value) {
-  if (!Array.isArray(value)) return [];
-  return value.filter((entry) => typeof entry === "string" && entry.trim().length > 0);
-}
-var FINALIZE_QUEUED_WARNING = "Queued only: the local Remix turn was captured, but no remote change step or collab turn exists yet. Drain or await finalize before merge-related flows.";
-async function collabFinalizeTurn(params) {
-  const repoRoot = await findGitRoot(params.cwd);
-  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,
-      hint: "Run `remix collab init` first."
-    });
-  }
-  const prompt = params.prompt.trim();
-  const assistantResponse = params.assistantResponse.trim();
-  if (!prompt) throw new RemixError("Prompt is required.", { exitCode: 2 });
-  if (!assistantResponse) throw new RemixError("Assistant response is required.", { exitCode: 2 });
-  if (params.diff?.trim()) {
-    throw new RemixError("External diff submission is no longer supported for `finalize_turn`.", {
-      exitCode: 2,
-      hint: "Finalize turns now capture the real workspace boundary from the local snapshot store."
-    });
-  }
-  const pendingInit = await findPendingAsyncJob({
-    repoRoot,
-    branchName: binding.branchName ?? null,
-    kind: "init"
-  });
-  if (pendingInit) {
-    throw new RemixError("Cannot finalize a turn while the initial Remix import is still processing.", {
-      exitCode: 2,
-      hint: `Init job ${pendingInit.id} is still in the background queue. Run \`remix collab status\` to check progress.`
-    });
-  }
-  const pendingInitPost = await findPendingAsyncJob({
-    repoRoot,
-    branchName: binding.branchName ?? null,
-    kind: "init_post"
-  });
-  if (pendingInitPost) {
-    const result = await awaitAsyncJob({
-      jobId: pendingInitPost.id,
-      timeoutMs: FINALIZE_AWAIT_INIT_POST_TIMEOUT_MS,
-      pollIntervalMs: 500
-    });
-    if (result.status === "failed") {
-      throw new RemixError("The initial Remix import failed; this turn cannot be recorded.", {
-        exitCode: 2,
-        hint: (result.job?.error ? `Last error: ${result.job.error}
-
-` : "") + "Run `remix collab init` again to retry \u2014 the post-init drainer cleared the local binding so this is safe."
-      });
-    }
-    if (result.status === "timeout") {
-      throw new RemixError("Timed out waiting for the initial Remix import to finish provisioning.", {
-        exitCode: 2,
-        hint: `Init post job ${pendingInitPost.id} did not complete within ${Math.round(
-          FINALIZE_AWAIT_INIT_POST_TIMEOUT_MS / 1e3
-        )}s. Run \`remix collab status\` to check progress, then retry once it reports ready.`
-      });
-    }
-  }
-  const pendingReAnchor = await findPendingAsyncJob({
-    repoRoot,
-    branchName: binding.branchName ?? null,
-    kind: "re_anchor"
-  });
-  if (pendingReAnchor) {
-    throw new RemixError("Cannot finalize a turn while a re-anchor is still processing.", {
-      exitCode: 2,
-      hint: `Re-anchor job ${pendingReAnchor.id} is still in the background queue. Run \`remix collab status\` to check progress.`
-    });
-  }
-  const detected = await collabDetectRepoState({
-    api: params.api,
-    cwd: repoRoot,
-    allowBranchMismatch: params.allowBranchMismatch
-  });
-  if (detected.status === "not_bound") {
-    throw new RemixError("Repository is not bound to Remix.", {
-      code: "not_bound",
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  if (detected.status === "branch_binding_missing" || detected.status === "family_ambiguous") {
-    throw new RemixError(detected.hint || "Current branch is not ready for Remix recording.", {
-      code: detected.status,
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  if (detected.status === "metadata_conflict" || detected.status === "branch_mismatch") {
-    throw new RemixError("Repository must be realigned before finalizing the turn.", {
-      code: detected.status,
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  if (detected.status === "missing_head" || detected.status === "remote_error") {
-    throw new RemixError(detected.hint || "Failed to determine the current repo state.", {
-      code: detected.status,
-      exitCode: 1,
-      hint: detected.hint
-    });
-  }
-  if (detected.repoState === "server_only_changed") {
-    throw new RemixError("Server changes must be pulled locally before finalizing this turn.", {
-      code: "pull_required",
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  if (detected.repoState === "external_local_base_changed") {
-    throw new RemixError("The local checkout must be re-anchored before finalizing this turn.", {
-      code: "re_anchor_required",
-      exitCode: 2,
-      hint: detected.hint
-    });
-  }
-  const baseline = await readLocalBaseline({
-    repoFingerprint: binding.repoFingerprint,
-    laneId: binding.laneId,
-    repoRoot
-  });
-  if (!baseline) {
-    throw new RemixError("Local Remix baseline is missing for this lane.", {
-      exitCode: 2,
-      hint: "Run `remix collab re-anchor` to create a fresh baseline."
-    });
-  }
-  const snapshot = await captureLocalSnapshot({
-    repoRoot,
-    repoFingerprint: binding.repoFingerprint,
-    laneId: binding.laneId,
-    branchName: binding.branchName
-  });
-  const mode = snapshot.snapshotHash === baseline.lastSnapshotHash ? "no_diff_turn" : "changed_turn";
-  const idempotencyKey = params.idempotencyKey?.trim() || buildDeterministicIdempotencyKey({
-    kind: "collab_finalize_turn_boundary_v1",
-    appId: binding.currentAppId,
-    laneId: binding.laneId,
-    baselineSnapshotId: baseline.lastSnapshotId,
-    baselineServerHeadHash: baseline.lastServerHeadHash,
-    currentSnapshotId: snapshot.id,
-    currentSnapshotHash: snapshot.snapshotHash,
-    repoState: detected.repoState,
-    prompt,
-    assistantResponse
-  });
-  const awaitingDeadlineMs = typeof params.awaitingUsageDeadlineMs === "number" && params.awaitingUsageDeadlineMs > 0 ? params.awaitingUsageDeadlineMs : null;
-  const nextRetryAt = awaitingDeadlineMs === null ? null : new Date(Date.now() + awaitingDeadlineMs).toISOString();
-  const job = await enqueueCapturedFinalizeTurn({
-    repoRoot,
-    repoFingerprint: binding.repoFingerprint,
-    currentAppId: binding.currentAppId,
-    laneId: binding.laneId,
-    threadId: binding.threadId,
-    branchName: binding.branchName,
-    prompt,
-    assistantResponse,
-    baselineSnapshotId: baseline.lastSnapshotId,
-    baselineServerHeadHash: baseline.lastServerHeadHash,
-    currentSnapshotId: snapshot.id,
-    idempotencyKey,
-    metadata: {
-      remoteUrl: binding.remoteUrl,
-      defaultBranch: binding.defaultBranch,
-      actor: params.actor ?? null,
-      repoState: detected.repoState,
-      turnUsage: params.turnUsage ?? null,
-      promptedAt: typeof params.promptedAt === "string" && params.promptedAt.trim() ? params.promptedAt.trim() : null
-    },
-    nextRetryAt
-  });
-  return {
-    mode,
-    idempotencyKey,
-    queued: true,
-    jobId: job.id,
-    repoState: detected.repoState,
-    changeStep: null,
-    collabTurn: null,
-    autoSync: null,
-    warnings: [FINALIZE_QUEUED_WARNING, ...collectWarnings(detected.warnings)]
-  };
-}
 var FINALIZE_PREFLIGHT_FAILURE_CODES = [
   // Repo has no .remix/ binding at all. Fix: `remix collab init`.
   "not_bound",
@@ -25532,7 +25285,7 @@ async function collabInit(params) {
             operation: "`remix collab init`",
             recoveryHint: "The repository changed before the Remix binding was written. Review the local changes and rerun `remix collab init`."
           });
-          const bindingMode2 = params.forceNew && (!defaultBranch || branchName === defaultBranch) ? "explicit_root" : "lane";
+          const bindingMode2 = defaultBranch && branchName !== defaultBranch ? "lane" : "explicit_root";
           let bindingPath2;
           if (params.forceNew && defaultBranch && canonicalLane2) {
             const canonicalBinding = branchBindingFromLane(canonicalLane2, "explicit_root", {
@@ -25574,7 +25327,15 @@ async function collabInit(params) {
                 defaultBranch: canonicalLane2.defaultBranch ?? defaultBranch,
                 laneId: canonicalLane2.laneId ?? null,
                 branchName: defaultBranch,
-                bindingMode: params.forceNew ? "explicit_root" : "lane"
+                // This branch is reached only when the CURRENT branch is
+                // not the default branch — so the binding being written
+                // here is for the DEFAULT branch (the canonical/main app).
+                // It must always be `explicit_root` regardless of
+                // `forceNew`; the previous `forceNew ? ... : "lane"`
+                // produced a `lane`-marked default-branch binding for
+                // every plain init, which silently disabled the
+                // history-import auto-spawn.
+                bindingMode: "explicit_root"
               });
             }
             bindingPath2 = await writeCollabBinding(repoRoot, {
@@ -25726,7 +25487,7 @@ async function collabInit(params) {
         operation: "`remix collab init`",
         recoveryHint: "The repository changed before the Remix binding was written. Review the local changes and rerun `remix collab init`."
       });
-      const bindingMode = params.forceNew && (!defaultBranch || branchName === defaultBranch) ? "explicit_root" : "lane";
+      const bindingMode = defaultBranch && branchName !== defaultBranch ? "lane" : "explicit_root";
       let bindingPath;
       if (params.forceNew && defaultBranch && canonicalLane) {
         const canonicalBinding = branchBindingFromLane(canonicalLane, "explicit_root", {
@@ -25768,7 +25529,12 @@ async function collabInit(params) {
             defaultBranch: canonicalLane.defaultBranch ?? defaultBranch,
             laneId: canonicalLane.laneId ?? null,
             branchName: defaultBranch,
-            bindingMode: params.forceNew ? "explicit_root" : "lane"
+            // Same reasoning as the queued-path default-branch write
+            // above: this is the canonical/main-app binding for the
+            // default branch and must be `explicit_root`, otherwise the
+            // history-import auto-spawn (gated on explicit_root) will
+            // silently no-op for every plain init.
+            bindingMode: "explicit_root"
           });
         }
         bindingPath = await writeCollabBinding(repoRoot, {
@@ -27043,7 +26809,7 @@ async function processInitJob(job, api) {
       boundProjectId = String(readyApp.projectId ?? boundProjectId);
       boundThreadId = readyApp.threadId ? String(readyApp.threadId) : boundThreadId;
     }
-    const bindingMode = job.payload.forceNew && (!defaultBranch || branchName === defaultBranch) ? "explicit_root" : "lane";
+    const bindingMode = defaultBranch && branchName !== defaultBranch ? "lane" : "explicit_root";
     if (job.payload.forceNew && defaultBranch && canonicalLane) {
       const canonicalBinding = branchBindingFromLane(canonicalLane, "explicit_root", {
         projectId: canonicalLane.projectId ?? boundProjectId,
@@ -27082,7 +26848,12 @@ async function processInitJob(job, api) {
           defaultBranch: canonicalLane.defaultBranch ?? defaultBranch,
           laneId: canonicalLane.laneId ?? null,
           branchName: defaultBranch,
-          bindingMode: job.payload.forceNew ? "explicit_root" : "lane"
+          // This branch is reached only when the current branch is NOT
+          // the default branch — so the binding being written here is
+          // for the DEFAULT branch (the canonical/main app). It must
+          // always be `explicit_root` so the history-import auto-spawn
+          // can fire on first-ever inits (see autoSpawnHistoryImport.ts).
+          bindingMode: "explicit_root"
         });
       }
       await writeCollabBinding(repoRoot, {
@@ -56076,7 +55847,6 @@ async function resolveConfig(_opts) {
 // node_modules/@remixhq/mcp/dist/index.js
 var import_path16 = __toESM(require("path"), 1);
 var import_child_process = require("child_process");
-var import_child_process2 = require("child_process");
 var import_fs3 = require("fs");
 var import_path17 = __toESM(require("path"), 1);
 async function createRemixTokenProvider(config2) {
@@ -56536,14 +56306,6 @@ var recordTurnInputSchema = {
   allowBranchMismatch: external_exports.boolean().optional(),
   idempotencyKey: external_exports.string().trim().min(1).optional()
 };
-var finalizeTurnInputSchema = {
-  ...commonRequestFieldsSchema,
-  prompt: external_exports.string().trim().min(1),
-  assistantResponse: external_exports.string().trim().min(1),
-  sync: external_exports.boolean().optional(),
-  allowBranchMismatch: external_exports.boolean().optional(),
-  idempotencyKey: external_exports.string().trim().min(1).optional()
-};
 var previewInputSchema = {
   ...commonRequestFieldsSchema
 };
@@ -56713,17 +56475,6 @@ var addDataSchema = external_exports.object({
   changeStep: genericRecordSchema
 });
 var recordTurnDataSchema = genericRecordSchema;
-var finalizeTurnDataSchema = external_exports.object({
-  mode: external_exports.enum(["changed_turn", "no_diff_turn"]),
-  idempotencyKey: external_exports.string().min(1),
-  queued: external_exports.boolean(),
-  jobId: external_exports.string().nullable(),
-  repoState: external_exports.string().nullable(),
-  changeStep: genericRecordSchema.nullable(),
-  collabTurn: genericRecordSchema.nullable(),
-  autoSync: genericRecordSchema.nullable(),
-  warnings: external_exports.array(external_exports.string())
-});
 var drainFinalizeQueueDataSchema = external_exports.object({
   processed: external_exports.number().int().nonnegative(),
   results: external_exports.array(genericRecordSchema)
@@ -56803,7 +56554,6 @@ var remixSuccessSchema = makeSuccessSchema(remixDataSchema);
 var checkoutSuccessSchema = makeSuccessSchema(checkoutDataSchema);
 var addSuccessSchema = makeSuccessSchema(addDataSchema);
 var recordTurnSuccessSchema = makeSuccessSchema(recordTurnDataSchema);
-var finalizeTurnSuccessSchema = makeSuccessSchema(finalizeTurnDataSchema);
 var drainFinalizeQueueSuccessSchema = makeSuccessSchema(drainFinalizeQueueDataSchema);
 var syncSuccessSchema = makeSuccessSchema(syncDataSchema);
 var reAnchorSuccessSchema = makeSuccessSchema(reAnchorDataSchema);
@@ -56844,17 +56594,17 @@ function getRecommendedNextActions(status) {
       return ["Run remix_collab_sync_preview, then remix_collab_sync_apply if the preview is acceptable. This pulls the server delta into the local working tree without rewriting local git history."];
     case "re_anchor":
       return [
-        "Run remix_collab_re_anchor_preview, then remix_collab_re_anchor_apply. This seeds a local Remix baseline. It is required because no local baseline exists for this lane yet (fresh clone, deleted .remix/ state, or first init didn't seed) \u2014 not because of any specific git operation. After it succeeds, normal recording (remix_collab_finalize_turn) becomes available."
+        "Run remix_collab_re_anchor_preview, then remix_collab_re_anchor_apply. This seeds a local Remix baseline. It is required because no local baseline exists for this lane yet (fresh clone, deleted .remix/ state, or first init didn't seed) \u2014 not because of any specific git operation. After it succeeds, automatic hook recording can capture completed turns."
       ];
     case "record":
       return [
-        "Run remix_collab_finalize_turn to capture the local boundary delta. This is the catch-all for any local content change since the last recorded turn, regardless of whether the change came from agent edits, manual user edits, git commit, git pull, git merge, git rebase, or git reset."
+        "No MCP recording tool is required. Automatic hook finalization will capture the local boundary at the end of the completed turn; this covers agent edits, manual user edits, git commit, git pull, git merge, git rebase, and git reset."
       ];
     case "reconcile":
       return ["Run remix_collab_reconcile_preview before attempting remix_collab_reconcile_apply. Reconcile applies only when both the local workspace and the server lane changed since the last agreed baseline."];
     case "await_finalize":
       return [
-        "Run remix_collab_drain_finalize_queue before merge-related or recovery flows. finalize_turn is queued only until the local finalize queue is drained."
+        "Run remix_collab_drain_finalize_queue before merge-related or recovery flows. Hook recording is queued until the local finalize queue is drained."
       ];
     case "review_queue":
       return ["Run remix_collab_review_queue to inspect reviewable merge requests instead of using local git merge flows."];
@@ -56866,12 +56616,12 @@ function getRecommendedNextActions(status) {
       return [];
   }
 }
-function collectWarnings2(value) {
+function collectWarnings(value) {
   if (!value || !Array.isArray(value)) return [];
   return value.filter((entry) => typeof entry === "string" && entry.trim().length > 0);
 }
 function collectResultWarnings(value) {
-  return collectWarnings2(value.warnings);
+  return collectWarnings(value.warnings);
 }
 function truncateText(value, maxChars) {
   if (value.length <= maxChars) {
@@ -56889,17 +56639,6 @@ function truncateText(value, maxChars) {
     originalChars: value.length
   };
 }
-function spawnFinalizeQueueDrainer() {
-  const entrypoint = process.argv[1];
-  if (!entrypoint) return false;
-  const child = (0, import_child_process.spawn)(process.execPath, [...process.execArgv, entrypoint, "--drain-finalize-queue"], {
-    detached: true,
-    stdio: "ignore",
-    env: process.env
-  });
-  child.unref();
-  return true;
-}
 async function drainBeforeMutation(api) {
   const results = await drainPendingFinalizeQueue({ api });
   return results.flatMap((result) => collectResultWarnings(result));
@@ -56942,7 +56681,7 @@ async function initCollab(params) {
     data: syncResult,
     warnings: collectResultWarnings(result),
     recommendedNextActions: syncResult.baselineStatus === "requires_re_anchor" ? [
-      "This checkout has no local Remix baseline yet. Run remix_collab_re_anchor_preview, then remix_collab_re_anchor_apply to seed one. After it succeeds, normal recording (remix_collab_finalize_turn) becomes available."
+      "This checkout has no local Remix baseline yet. Run remix_collab_re_anchor_preview, then remix_collab_re_anchor_apply to seed one. After it succeeds, automatic hook recording can capture completed turns."
     ] : syncResult.baselineStatus === "requires_sync" ? [
       "Run remix_collab_sync_preview, then remix_collab_sync_apply to pull the server delta and create the first local baseline for this checkout."
     ] : ["Run remix_collab_status to inspect sync, reconcile, and merge-request readiness before mutating bound-repo state."],
@@ -57007,36 +56746,6 @@ async function checkoutCollab(params) {
     }
   };
 }
-async function finalizeCollabTurn(params) {
-  const api = await createCollabApiClient();
-  const repoRoot = await findGitRoot(params.cwd);
-  const result = await collabFinalizeTurn({
-    api,
-    cwd: params.cwd,
-    prompt: params.prompt,
-    assistantResponse: params.assistantResponse,
-    sync: params.sync,
-    allowBranchMismatch: params.allowBranchMismatch ?? false,
-    idempotencyKey: params.idempotencyKey ?? null,
-    actor: params.agent,
-    awaitingUsageDeadlineMs: params.awaitingUsageDeadlineMs ?? null
-  });
-  const hasAwaitingDeadline = typeof params.awaitingUsageDeadlineMs === "number" && params.awaitingUsageDeadlineMs > 0;
-  if (result.queued && !hasAwaitingDeadline) {
-    if (!spawnFinalizeQueueDrainer()) {
-      await drainPendingFinalizeQueue({ api });
-    }
-  }
-  return {
-    data: result,
-    warnings: result.warnings,
-    recommendedNextActions: result.queued ? ["Run remix_collab_drain_finalize_queue before merge-related flows if you need this queued turn recorded immediately."] : [],
-    logContext: {
-      repoRoot,
-      appId: result.changeStep?.appId ?? result.collabTurn?.appId ?? null
-    }
-  };
-}
 async function drainFinalizeQueue(params) {
   const api = await createCollabApiClient();
   const repoRoot = await findGitRoot(params.cwd);
@@ -57085,9 +56794,9 @@ async function reAnchor(params) {
   });
   return {
     data: result,
-    warnings: collectWarnings2(result.warnings),
+    warnings: collectWarnings(result.warnings),
     recommendedNextActions: params.dryRun ? [
-      "Run remix_collab_re_anchor_apply with confirm=true to seed a local Remix baseline for this checkout. Re-anchor is for missing-baseline cases only and does not replace remix_collab_finalize_turn for ordinary local content changes."
+      "Run remix_collab_re_anchor_apply with confirm=true to seed a local Remix baseline for this checkout. Re-anchor is for missing-baseline cases only and does not replace automatic hook recording for ordinary local content changes."
     ] : [],
     logContext: {
       repoRoot: result.repoRoot,
@@ -57269,7 +56978,7 @@ async function reconcile(params) {
   });
   return {
     data: result,
-    warnings: [...drainWarnings, ...collectWarnings2(result.warnings)],
+    warnings: [...drainWarnings, ...collectWarnings(result.warnings)],
     recommendedNextActions: params.dryRun ? ["Run remix_collab_reconcile_apply with confirm=true only if the preview is acceptable. This is the explicit Remix recovery flow for diverged state."] : [],
     risks: params.dryRun ? ["Reconcile may upload local history to recover the server lane onto the latest agreed state before future recording continues."] : [],
     logContext: {
@@ -57829,7 +57538,7 @@ function spawnHistoryImportDetached(repoRoot) {
   const logPath = import_path17.default.join(repoRoot, LOG_REL_PATH);
   const out = (0, import_fs3.openSync)(logPath, "a");
   const err = (0, import_fs3.openSync)(logPath, "a");
-  const child = (0, import_child_process2.spawn)(
+  const child = (0, import_child_process.spawn)(
     "remix",
     [
       "history",
@@ -57970,7 +57679,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_init",
-    description: "Import the current repository into Remix and write the local binding file. Synchronous: by the time this tool resolves, the local binding file AND the local Remix baseline are both on disk, so the very next call to remix_collab_finalize_turn will succeed. Brand-new init on the default branch typically takes ~10s; non-default-branch init can take 30-90s while the server provisions a feature lane. The result includes `reused: boolean` (false for a brand-new app, true if a binding already existed) plus the canonical app/project identifiers and the dashboard URL. Use forceNew=true only when intentionally creating a new canonical family from scratch in a previously-bound repo; do NOT use forceNew as a retry mechanism for a failed init \u2014 it creates orphan backend apps and triggers canonical-family ambiguity errors on subsequent inits in this directory.",
+    description: "Import the current repository into Remix and write the local binding file. Synchronous: by the time this tool resolves, the local binding file AND the local Remix baseline are both on disk, so automatic hook recording can capture subsequent completed turns. Brand-new init on the default branch typically takes ~10s; non-default-branch init can take 30-90s while the server provisions a feature lane. The result includes `reused: boolean` (false for a brand-new app, true if a binding already existed) plus the canonical app/project identifiers and the dashboard URL. Use forceNew=true only when intentionally creating a new canonical family from scratch in a previously-bound repo; do NOT use forceNew as a retry mechanism for a failed init \u2014 it creates orphan backend apps and triggers canonical-family ambiguity errors on subsequent inits in this directory.",
     access: "remote_write",
     inputSchema: initInputSchema,
     outputSchema: initSuccessSchema,
@@ -58054,31 +57763,9 @@ function registerCollabTools(server, context) {
       });
     }
   });
-  registerTool(server, context, {
-    name: "remix_collab_finalize_turn",
-    description: "Primary turn recorder for the current bound repository. Required: call this exactly once before the final response on every turn that touched a Remix-bound repo. Captures the current boundary locally and queues remote processing. Queued only: no remote change step exists yet until the finalize queue drains. Runtime exception: if this turn's context contains a [Remix runtime status] system note from the Remix UserPromptSubmit hook stating that the Stop hook will record this turn automatically, do NOT call this tool \u2014 the runtime is recording it on your behalf and a manual call would create a duplicate record. The runtime note is the only sanctioned override; trivial prompts, error states, and ambiguity all still require this call.",
-    access: "local_write",
-    inputSchema: finalizeTurnInputSchema,
-    outputSchema: finalizeTurnSuccessSchema,
-    annotations: getAnnotations("local_write", { idempotent: true }),
-    run: async (args) => {
-      const input = external_exports.object(finalizeTurnInputSchema).parse(args);
-      const cwd = resolvePolicyCwd(context.policy, input.cwd);
-      return finalizeCollabTurn({
-        cwd,
-        prompt: input.prompt,
-        assistantResponse: input.assistantResponse,
-        sync: input.sync,
-        allowBranchMismatch: input.allowBranchMismatch ?? false,
-        idempotencyKey: input.idempotencyKey,
-        agent: context.agentMetadata,
-        awaitingUsageDeadlineMs: 3e4
-      });
-    }
-  });
   registerTool(server, context, {
     name: "remix_collab_drain_finalize_queue",
-    description: "Drain the local finalize queue and record queued finalize_turn jobs immediately. NOT required as a precondition for `remix_collab_request_merge` or `remix_collab_reconcile_apply` \u2014 those tools drain the queue internally before they run. Useful only for explicit recovery flows (e.g. status reports `await_finalize` and you want to flush before re-checking). Runtime exception: if this turn's context contains a [Remix runtime status] system note from the Remix UserPromptSubmit hook, the runtime drains the queue automatically in the background; do NOT call this tool unless an explicit recovery flow requires it.",
+    description: "Drain the local finalize queue and record queued hook-finalize jobs immediately. NOT required as a precondition for `remix_collab_request_merge` or `remix_collab_reconcile_apply` \u2014 those tools drain the queue internally before they run. Useful only for explicit recovery flows (e.g. status reports `await_finalize` and you want to flush before re-checking). Runtime exception: if this turn's context contains a [Remix runtime status] system note from the Remix UserPromptSubmit hook, the runtime drains the queue automatically in the background; do NOT call this tool unless an explicit recovery flow requires it.",
     access: "local_write",
     inputSchema: drainFinalizeQueueInputSchema,
     outputSchema: drainFinalizeQueueSuccessSchema,
@@ -58116,7 +57803,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_re_anchor_preview",
-    description: "Preview whether this checkout needs a fresh local Remix baseline. Use only when status reports `re_anchor` (no local baseline exists for this lane yet \u2014 fresh clone, deleted `.remix/` state, or first init didn't seed). Re-anchor does not replace `remix_collab_finalize_turn`; ordinary local content changes (including merges, pulls, and rebases) are recorded by `finalize-turn`, not by re-anchor.",
+    description: "Preview whether this checkout needs a fresh local Remix baseline. Use only when status reports `re_anchor` (no local baseline exists for this lane yet \u2014 fresh clone, deleted `.remix/` state, or first init didn't seed). Re-anchor does not replace automatic hook recording; ordinary local content changes (including merges, pulls, and rebases) are captured at the completed-turn boundary, not by re-anchor.",
     access: "read",
     inputSchema: previewInputSchema,
     outputSchema: reAnchorSuccessSchema,
@@ -58128,7 +57815,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_re_anchor_apply",
-    description: "Establish a local Remix baseline for the current checkout against the existing app head, without rewriting the local checkout afterward. Required only when status reports `re_anchor` (missing local baseline). It does not replace `remix_collab_finalize_turn` \u2014 local commits, pulls, merges, and rebases must still be recorded with `finalize-turn`.",
+    description: "Establish a local Remix baseline for the current checkout against the existing app head, without rewriting the local checkout afterward. Required only when status reports `re_anchor` (missing local baseline). It does not replace automatic hook recording \u2014 local commits, pulls, merges, and rebases are still captured at the completed-turn boundary.",
     access: "local_write",
     inputSchema: reAnchorInputSchema,
     outputSchema: reAnchorSuccessSchema,
@@ -60067,7 +59754,7 @@ async function listPendingTurnStateSummaries() {
 // package.json
 var package_default = {
   name: "@remixhq/claude-plugin",
-  version: "0.1.20",
+  version: "0.1.22",
   description: "Claude Code plugin for Remix collaboration workflows",
   homepage: "https://github.com/RemixDotOne/remix-claude-plugin",
   license: "MIT",
@@ -60101,12 +59788,12 @@ var package_default = {
     postbuild: `node -e "const fs=require('node:fs'); for (const p of ['dist/mcp-server.cjs','dist/hook-pre-git.cjs','dist/hook-user-prompt.cjs','dist/hook-post-collab.cjs','dist/hook-stop-collab.cjs']) fs.chmodSync(p, 0o755);"`,
     dev: "tsx src/mcp-server.ts",
     typecheck: "tsc -p tsconfig.json --noEmit",
-    test: "node --import tsx --test src/**/*.test.ts",
+    test: "node --import tsx --test 'src/**/*.test.ts'",
     prepack: "npm run build"
   },
   dependencies: {
-    "@remixhq/core": "^0.1.15",
-    "@remixhq/mcp": "^0.1.15"
+    "@remixhq/core": "^0.1.17",
+    "@remixhq/mcp": "^0.1.17"
   },
   devDependencies: {
     "@types/node": "^25.4.0",