@remixhq/claude-plugin 0.1.23 → 0.1.25

package/dist/index.js

@@ -3,7 +3,7 @@
 // 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",
@@ -41,8 +41,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",

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.23\",\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.18\",\n    \"@remixhq/mcp\": \"^0.1.18\"\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.25\",\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.20\",\n    \"@remixhq/mcp\": \"^0.1.20\"\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

@@ -22359,6 +22359,15 @@ function shouldRequireRemoteLaneForCurrentBranch(params) {
   if (params.currentBranch === defaultBranch) return false;
   return !params.binding.laneId || params.binding.currentAppId === params.binding.upstreamAppId;
 }
+function resolveLaneLookupProjectId(params) {
+  const currentBranch = normalizeBranchName2(params.currentBranch);
+  const defaultBranch = normalizeBranchName2(params.defaultBranch);
+  const localProjectId = params.localBinding.projectId ?? null;
+  if (currentBranch && currentBranch !== defaultBranch && localProjectId) {
+    return localProjectId;
+  }
+  return params.explicitRootProjectId ?? (params.requireRemoteLane ? void 0 : localProjectId ?? params.fallbackProjectId ?? void 0);
+}
 async function persistResolvedLane(repoRoot, binding) {
   await writeCollabBinding(repoRoot, {
     projectId: binding.projectId,
@@ -22437,7 +22446,14 @@ async function resolveActiveLaneBindingUncached(params, state) {
       };
     }
     const laneResp2 = await params.api.resolveProjectLaneBinding({
-      projectId: state.explicitRootBinding?.projectId ?? (requireRemoteLane ? void 0 : localBinding.projectId ?? state.projectId ?? void 0),
+      projectId: resolveLaneLookupProjectId({
+        explicitRootProjectId: state.explicitRootBinding?.projectId,
+        localBinding,
+        currentBranch,
+        defaultBranch: state.defaultBranch,
+        requireRemoteLane,
+        fallbackProjectId: state.projectId
+      }),
       repoFingerprint: state.repoFingerprint ?? void 0,
       remoteUrl: state.remoteUrl ?? void 0,
       defaultBranch: state.defaultBranch ?? void 0,
@@ -23288,6 +23304,59 @@ function buildWorkspaceMetadata(params) {
   }
   return metadata;
 }
+async function findExistingChangeStepByIdempotency(params) {
+  const idempotencyKey = params.idempotencyKey?.trim();
+  if (!idempotencyKey) return null;
+  const resp = await params.api.listChangeSteps(params.appId, { limit: 1, idempotencyKey });
+  const responseObject = unwrapResponseObject(
+    resp,
+    "change step list"
+  );
+  const steps = Array.isArray(responseObject) ? responseObject : Array.isArray(responseObject.items) ? responseObject.items : [];
+  return steps.find((step) => step.idempotencyKey === idempotencyKey) ?? null;
+}
+async function writeBaselineFromSucceededChangeStep(params) {
+  const nextServerHeadHash = typeof params.changeStep.headCommitHash === "string" ? params.changeStep.headCommitHash.trim() : "";
+  if (!nextServerHeadHash) {
+    throw buildFinalizeCliError({
+      message: "Backend returned a succeeded change step without a head commit hash.",
+      exitCode: 1,
+      hint: "This is a backend invariant violation; retry will not help. Run `remix collab status` before trying again.",
+      disposition: "terminal",
+      reason: "missing_head_commit_hash"
+    });
+  }
+  let nextServerRevisionId = typeof params.changeStep.resultRevisionId === "string" ? params.changeStep.resultRevisionId.trim() : "";
+  let nextServerTreeHash = null;
+  if (!nextServerRevisionId) {
+    const freshHeadResp = await params.api.getAppHead(params.job.currentAppId);
+    const freshHead = unwrapResponseObject(freshHeadResp, "app head");
+    if (freshHead.headCommitHash !== nextServerHeadHash || !freshHead.headRevisionId) {
+      throw buildFinalizeCliError({
+        message: "Backend returned a succeeded change step without a matching result revision.",
+        exitCode: 1,
+        hint: "The local baseline was not advanced because the post-step revision could not be verified. Restart the backend/CLI and retry after checking `remix collab status`.",
+        disposition: "terminal",
+        reason: "missing_result_revision_id"
+      });
+    }
+    nextServerRevisionId = freshHead.headRevisionId;
+    nextServerTreeHash = freshHead.treeHash ?? null;
+  }
+  await writeLocalBaseline({
+    repoRoot: params.job.repoRoot,
+    repoFingerprint: params.job.repoFingerprint,
+    laneId: params.job.laneId,
+    currentAppId: params.job.currentAppId,
+    branchName: params.job.branchName,
+    lastSnapshotId: params.snapshot.id,
+    lastSnapshotHash: params.snapshot.snapshotHash,
+    lastServerRevisionId: nextServerRevisionId,
+    lastServerTreeHash: nextServerTreeHash,
+    lastServerHeadHash: nextServerHeadHash,
+    lastSeenLocalCommitHash: params.snapshot.localCommitHash
+  });
+}
 async function harvestPreTurnEvents(repoRoot, fromCommit, toCommit) {
   if (!toCommit) return null;
   try {
@@ -23473,6 +23542,34 @@ async function processClaimedPendingFinalizeJobInner(params) {
     });
   }
   const replayNeeded = appHead.headCommitHash !== submissionBaseHeadHash || baselineDrifted;
+  if (replayNeeded) {
+    const existingChangeStep = await findExistingChangeStepByIdempotency({
+      api: params.api,
+      appId: job.currentAppId,
+      idempotencyKey: job.idempotencyKey
+    });
+    if (existingChangeStep) {
+      const changeStep2 = existingChangeStep.status === "succeeded" ? existingChangeStep : await pollChangeStep(params.api, job.currentAppId, existingChangeStep.id);
+      invalidateAppHeadCache(job.currentAppId);
+      invalidateAppDeltaCacheForApp(job.currentAppId);
+      await writeBaselineFromSucceededChangeStep({ api: params.api, job, snapshot, changeStep: changeStep2 });
+      await updatePendingFinalizeJob(job.id, {
+        status: "completed",
+        metadata: { changeStepId: String(changeStep2.id ?? "") }
+      });
+      return {
+        mode: "changed_turn",
+        idempotencyKey: job.idempotencyKey ?? "",
+        queued: false,
+        jobId: job.id,
+        repoState,
+        changeStep: changeStep2,
+        collabTurn: null,
+        autoSync: null,
+        warnings: []
+      };
+    }
+  }
   if (replayNeeded) {
     try {
       const replayResp = await params.api.startChangeStepReplay(job.currentAppId, {
@@ -23570,46 +23667,7 @@ async function processClaimedPendingFinalizeJobInner(params) {
   const changeStep = await pollChangeStep(params.api, job.currentAppId, String(createdStep.id));
   invalidateAppHeadCache(job.currentAppId);
   invalidateAppDeltaCacheForApp(job.currentAppId);
-  const nextServerHeadHash = typeof changeStep.headCommitHash === "string" ? changeStep.headCommitHash.trim() : "";
-  if (!nextServerHeadHash) {
-    throw buildFinalizeCliError({
-      message: "Backend returned a succeeded change step without a head commit hash.",
-      exitCode: 1,
-      hint: "This is a backend invariant violation; retry will not help. 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 ?? "") }
@@ -24751,27 +24809,21 @@ async function trySeedEquivalentBranchBaseline(params) {
     branchName: params.branchName,
     persistBlobs: false
   });
-  if (inspection.snapshotHash !== defaultBaseline.lastSnapshotHash) {
+  if (inspection.snapshotHash !== defaultBaseline.lastSnapshotHash && inspection.localCommitHash !== defaultBaseline.lastSeenLocalCommitHash) {
     return null;
   }
-  const snapshot = await captureLocalSnapshot({
-    repoRoot: params.repoRoot,
-    repoFingerprint: params.repoFingerprint,
-    laneId: params.laneId,
-    branchName: params.branchName
-  });
   await writeLocalBaseline({
     repoRoot: params.repoRoot,
     repoFingerprint: params.repoFingerprint,
     laneId: params.laneId,
     currentAppId: params.currentAppId,
     branchName: params.branchName,
-    lastSnapshotId: snapshot.id,
-    lastSnapshotHash: snapshot.snapshotHash,
+    lastSnapshotId: defaultBaseline.lastSnapshotId,
+    lastSnapshotHash: defaultBaseline.lastSnapshotHash,
     lastServerRevisionId: params.appHeadRevisionId,
     lastServerTreeHash: params.appTreeHash,
     lastServerHeadHash: params.appHeadHash,
-    lastSeenLocalCommitHash: snapshot.localCommitHash
+    lastSeenLocalCommitHash: inspection.localCommitHash
   });
   return "seeded";
 }
@@ -24820,6 +24872,21 @@ async function resolveInitBaselineStatus(params) {
     });
     const delta = unwrapResponseObject(deltaResp, "app delta");
     if (delta.status === "up_to_date" || delta.status === "delta_ready") {
+      const equivalentBaseline = await trySeedEquivalentBranchBaseline({
+        repoRoot: params.repoRoot,
+        repoFingerprint: params.repoFingerprint,
+        laneId: params.laneId,
+        currentAppId: params.currentAppId,
+        upstreamAppId: params.upstreamAppId ?? null,
+        branchName: params.branchName,
+        defaultBranch: params.defaultBranch,
+        appHeadHash: appHead.headCommitHash,
+        appHeadRevisionId: appHead.headRevisionId ?? null,
+        appTreeHash: appHead.treeHash ?? null
+      });
+      if (equivalentBaseline) {
+        return equivalentBaseline;
+      }
       return "requires_sync";
     }
     if (delta.status === "content_equivalent") {
@@ -24936,6 +25003,7 @@ async function collabInit(params) {
                 upstreamAppId: existingBinding.upstreamAppId ?? existingBinding.currentAppId,
                 dashboardUrl: buildDashboardAppUrl(existingBinding.currentAppId),
                 bindingPath: getCollabBindingPath(repoRoot),
+                repoFingerprint: existingBinding.repoFingerprint ?? repoFingerprint,
                 bindingMode: existingBinding.bindingMode,
                 createdCanonicalFamily: false,
                 remoteUrl: existingBinding.remoteUrl ?? remoteUrl,
@@ -24952,6 +25020,7 @@ async function collabInit(params) {
               upstreamAppId: "",
               dashboardUrl: "",
               bindingPath: getCollabBindingPath(repoRoot),
+              repoFingerprint,
               bindingMode: "lane",
               createdCanonicalFamily: false,
               remoteUrl,
@@ -25052,6 +25121,7 @@ async function collabInit(params) {
           upstreamAppId: boundUpstreamAppId2,
           bindingPath: import_path11.default.join(repoRoot, ".remix", "config.json"),
           repoRoot,
+          repoFingerprint,
           bindingMode: defaultBranch && branchName !== defaultBranch ? "lane" : "explicit_root",
           createdCanonicalFamily: false,
           baselineStatus: await resolveInitBaselineStatus({
@@ -25164,6 +25234,7 @@ async function collabInit(params) {
           upstreamAppId: boundUpstreamAppId2,
           bindingPath: bindingPath2,
           repoRoot,
+          repoFingerprint,
           bindingMode: "lane",
           createdCanonicalFamily: false,
           baselineStatus: await resolveInitBaselineStatus({
@@ -25294,6 +25365,7 @@ async function collabInit(params) {
             upstreamAppId: boundUpstreamAppId2,
             bindingPath: bindingPath2,
             repoRoot,
+            repoFingerprint,
             bindingMode: "lane",
             createdCanonicalFamily: false,
             baselineStatus: await resolveInitBaselineStatus({
@@ -25514,6 +25586,7 @@ async function collabInit(params) {
             upstreamAppId: boundUpstreamAppId2,
             dashboardUrl: buildDashboardAppUrl(boundCurrentAppId2),
             bindingPath: bindingPath2,
+            repoFingerprint,
             bindingMode: bindingMode2,
             createdCanonicalFamily: Boolean(params.forceNew),
             remoteUrl,
@@ -25696,6 +25769,7 @@ async function collabInit(params) {
         upstreamAppId: boundUpstreamAppId,
         bindingPath,
         repoRoot,
+        repoFingerprint,
         bindingMode,
         createdCanonicalFamily: Boolean(params.forceNew),
         baselineStatus,
@@ -35127,7 +35201,7 @@ var EMPTY_COMPLETION_RESULT = {
   }
 };
 
-// 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;
@@ -35321,6 +35395,14 @@ function createApiClient(config2, opts) {
       method: "POST",
       body: JSON.stringify(payload)
     }),
+    listChangeSteps: (appId, params) => {
+      const qs = new URLSearchParams();
+      if (params?.limit !== void 0) qs.set("limit", String(params.limit));
+      if (params?.offset !== void 0) qs.set("offset", String(params.offset));
+      if (params?.idempotencyKey) qs.set("idempotencyKey", params.idempotencyKey);
+      const suffix = qs.toString() ? `?${qs.toString()}` : "";
+      return request(`/v1/apps/${encodeURIComponent(appId)}/change-steps${suffix}`, { method: "GET" });
+    },
     createCollabTurn: (appId, payload) => request(`/v1/apps/${encodeURIComponent(appId)}/collab-turns`, {
       method: "POST",
       body: JSON.stringify(payload)
@@ -55767,7 +55849,9 @@ async function resolveConfig(_opts) {
 // node_modules/@remixhq/mcp/dist/index.js
 var import_path15 = __toESM(require("path"), 1);
 var import_child_process = require("child_process");
+var import_crypto9 = require("crypto");
 var import_fs3 = require("fs");
+var import_os8 = __toESM(require("os"), 1);
 var import_path16 = __toESM(require("path"), 1);
 async function createRemixTokenProvider(config2) {
   const resolvedConfig = config2 ?? await resolveConfig();
@@ -55997,6 +56081,15 @@ function normalizeByMessage(err) {
       category: "remote_state"
     });
   }
+  if (statusCode === 409) {
+    return makeNormalized({
+      code: ERROR_CODES.REMOTE_ERROR,
+      message,
+      hint,
+      retryable: true,
+      category: "remote_state"
+    });
+  }
   if (message.includes("Timed out") || message.includes("failed") || message.includes("error state")) {
     return makeNormalized({
       code: ERROR_CODES.REMOTE_ERROR,
@@ -56160,7 +56253,6 @@ function makeSuccessResult2(envelope) {
 function makeErrorResult(envelope) {
   return {
     content: [{ type: "text", text: toJsonText(envelope) }],
-    structuredContent: envelope,
     isError: true
   };
 }
@@ -57411,11 +57503,30 @@ async function accessDebug(params) {
     }
   };
 }
-var MARKER_REL_PATH = import_path16.default.join(".remix", ".history-imported");
-var LOG_REL_PATH = import_path16.default.join(".remix", "history-import.log");
-function shouldAutoSpawnHistoryImport(repoRoot) {
+var LEGACY_MARKER_REL_PATH = import_path16.default.join(".remix", ".history-imported");
+function collabStateRoot() {
+  const configured = process.env.REMIX_COLLAB_STATE_ROOT?.trim();
+  return configured || import_path16.default.join(import_os8.default.homedir(), ".remix", "collab-state");
+}
+function sha256Hex3(value) {
+  return (0, import_crypto9.createHash)("sha256").update(value).digest("hex");
+}
+function autoSpawnMarkerPath(repoRoot, repoFingerprint) {
+  const identityKey = typeof repoFingerprint === "string" && repoFingerprint.trim() ? `repoFingerprint:${repoFingerprint.trim()}` : `repoRoot:${repoRoot}`;
+  return import_path16.default.join(collabStateRoot(), "history-import", sha256Hex3(identityKey), "history-imported.json");
+}
+function fallbackRepoRootMarkerPath(repoRoot) {
+  return autoSpawnMarkerPath(repoRoot, null);
+}
+function legacyLocalRepoRootMarkerPath(repoRoot) {
+  return import_path16.default.join(collabStateRoot(), "history-import", sha256Hex3(repoRoot), "history-imported.json");
+}
+function legacyAutoSpawnMarkerPath(repoRoot) {
+  return import_path16.default.join(repoRoot, LEGACY_MARKER_REL_PATH);
+}
+function shouldAutoSpawnHistoryImport(repoRoot, repoFingerprint) {
   try {
-    return !(0, import_fs3.existsSync)(import_path16.default.join(repoRoot, MARKER_REL_PATH));
+    return !(0, import_fs3.existsSync)(autoSpawnMarkerPath(repoRoot, repoFingerprint)) && !(0, import_fs3.existsSync)(fallbackRepoRootMarkerPath(repoRoot)) && !(0, import_fs3.existsSync)(legacyLocalRepoRootMarkerPath(repoRoot)) && !(0, import_fs3.existsSync)(legacyAutoSpawnMarkerPath(repoRoot));
   } catch {
     return false;
   }
@@ -57424,14 +57535,6 @@ function isAutoSpawnEligibleBindingMode(bindingMode) {
   return bindingMode === "explicit_root";
 }
 function spawnHistoryImportDetached(repoRoot, options) {
-  const remixDir = import_path16.default.join(repoRoot, ".remix");
-  try {
-    (0, import_fs3.mkdirSync)(remixDir, { recursive: true });
-  } catch {
-  }
-  const logPath = import_path16.default.join(repoRoot, LOG_REL_PATH);
-  const out = (0, import_fs3.openSync)(logPath, "a");
-  const err = (0, import_fs3.openSync)(logPath, "a");
   const child = (0, import_child_process.spawn)(
     "remix",
     [
@@ -57448,12 +57551,12 @@ function spawnHistoryImportDetached(repoRoot, options) {
     ],
     {
       detached: true,
-      stdio: ["ignore", out, err],
+      stdio: "ignore",
       env: { ...process.env, REMIX_HISTORY_AUTO_SPAWN: "1" }
     }
   );
   child.unref();
-  return { pid: child.pid, logPath };
+  return { pid: child.pid };
 }
 function getAnnotations(access, options) {
   if (access === "read") {
@@ -57508,6 +57611,24 @@ function buildErrorEnvelope(tool, requestId, error2) {
     recommendedNextActions
   };
 }
+function buildOutputValidationErrorEnvelope(tool, requestId, error2) {
+  return {
+    schemaVersion: SCHEMA_VERSION,
+    ok: false,
+    tool,
+    requestId: requestId ?? null,
+    error: {
+      code: ERROR_CODES.INTERNAL_ERROR,
+      message: "Tool output failed validation against its declared MCP schema.",
+      hint: error2.issues.map((issue2) => `${issue2.path.join(".") || "output"}: ${issue2.message}`).join("; "),
+      retryable: false,
+      category: "internal"
+    },
+    warnings: [],
+    risks: ["The MCP server returned an output shape that did not match the tool descriptor."],
+    recommendedNextActions: ["Report this MCP schema mismatch with the tool name and error hint."]
+  };
+}
 function registerTool(server, context, params) {
   const errorSchema = makeErrorSchema();
   server.registerTool(
@@ -57526,7 +57647,20 @@ function registerTool(server, context, params) {
         assertToolAccess(context.policy, params.access);
         const result = await params.run(rawArgs);
         const envelope = buildSuccessEnvelope(params.name, requestId, result);
-        params.outputSchema.parse(envelope);
+        const parsedEnvelope = params.outputSchema.safeParse(envelope);
+        if (!parsedEnvelope.success) {
+          const errorEnvelope = buildOutputValidationErrorEnvelope(params.name, requestId, parsedEnvelope.error);
+          context.logger.log({
+            level: "error",
+            message: "tool_output_validation_failed",
+            tool: params.name,
+            requestId: errorEnvelope.requestId,
+            durationMs: Date.now() - startedAt,
+            result: "error",
+            errorCode: errorEnvelope.error.code
+          });
+          return makeErrorResult(errorEnvelope);
+        }
         context.logger.log({
           level: "info",
           message: "tool_completed",
@@ -57590,12 +57724,14 @@ function registerCollabTools(server, context) {
       try {
         const repoRoot = result && typeof result === "object" && "data" in result && result.data && typeof result.data.repoRoot === "string" ? result.data.repoRoot : null;
         const bindingMode = result && typeof result === "object" && "data" in result && result.data && typeof result.data.bindingMode === "string" ? result.data.bindingMode : null;
-        if (repoRoot && isAutoSpawnEligibleBindingMode(bindingMode) && shouldAutoSpawnHistoryImport(repoRoot)) {
+        const resultData = result && typeof result === "object" && "data" in result && result.data && typeof result.data === "object" ? result.data : null;
+        const repoFingerprint = typeof resultData?.repoFingerprint === "string" ? resultData.repoFingerprint : null;
+        if (repoRoot && isAutoSpawnEligibleBindingMode(bindingMode) && shouldAutoSpawnHistoryImport(repoRoot, repoFingerprint)) {
           const cutoffAt = (/* @__PURE__ */ new Date()).toISOString();
           const spawned = spawnHistoryImportDetached(repoRoot, { cutoffAt });
           context.logger.log({
             level: "info",
-            message: `history_import_auto_spawned pid=${spawned.pid ?? "?"} log=${spawned.logPath} cutoffAt=${cutoffAt}`,
+            message: `history_import_auto_spawned pid=${spawned.pid ?? "?"} cutoffAt=${cutoffAt}`,
             tool: "remix_collab_init",
             repoRoot
           });
@@ -59629,7 +59765,7 @@ async function listPendingTurnStateSummaries() {
 // 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",
@@ -59667,8 +59803,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",