@remixhq/mcp 0.1.17 → 0.1.19

package/dist/cli.js

@@ -255,6 +255,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,
@@ -431,7 +440,6 @@ function makeSuccessResult(envelope) {
 function makeErrorResult(envelope) {
   return {
     content: [{ type: "text", text: toJsonText(envelope) }],
-    structuredContent: envelope,
     isError: true
   };
 }
@@ -510,9 +518,6 @@ var applyInputSchema = {
   confirm: z2.boolean(),
   allowBranchMismatch: z2.boolean().optional()
 };
-var reAnchorInputSchema = {
-  ...applyInputSchema
-};
 var requestMergeInputSchema = {
   ...commonRequestFieldsSchema
 };
@@ -625,7 +630,7 @@ var initSyncDataSchema = z2.object({
   repoRoot: z2.string(),
   bindingMode: z2.enum(["legacy", "lane", "explicit_root"]).optional(),
   createdCanonicalFamily: z2.boolean().optional(),
-  baselineStatus: z2.enum(["seeded", "existing", "requires_re_anchor", "requires_sync"]).optional()
+  baselineStatus: z2.enum(["seeded", "existing", "baseline_missing", "requires_sync"]).optional()
 });
 var initQueuedDataSchema = z2.object({
   queued: z2.literal(true),
@@ -673,7 +678,6 @@ var drainFinalizeQueueDataSchema = z2.object({
   results: z2.array(genericRecordSchema)
 });
 var syncDataSchema = genericRecordSchema;
-var reAnchorDataSchema = genericRecordSchema;
 var requestMergeDataSchema = genericRecordSchema;
 var mergeRequestQueueDataSchema = z2.object({
   queue: mergeRequestQueueSchema,
@@ -749,7 +753,6 @@ var addSuccessSchema = makeSuccessSchema(addDataSchema);
 var recordTurnSuccessSchema = makeSuccessSchema(recordTurnDataSchema);
 var drainFinalizeQueueSuccessSchema = makeSuccessSchema(drainFinalizeQueueDataSchema);
 var syncSuccessSchema = makeSuccessSchema(syncDataSchema);
-var reAnchorSuccessSchema = makeSuccessSchema(reAnchorDataSchema);
 var requestMergeSuccessSchema = makeSuccessSchema(requestMergeDataSchema);
 var mergeRequestQueueSuccessSchema = makeSuccessSchema(mergeRequestQueueDataSchema);
 var viewMergeRequestSuccessSchema = makeSuccessSchema(viewMergeRequestDataSchema);
@@ -776,7 +779,6 @@ import {
   collabCheckout as coreCollabCheckout,
   collabListMergeRequests as coreCollabListMergeRequests,
   collabInit as coreCollabInit,
-  collabReAnchor as coreCollabReAnchor,
   collabInvite as coreCollabInvite,
   collabReconcile as coreCollabReconcile,
   collabReject as coreCollabReject,
@@ -791,7 +793,7 @@ import { findGitRoot } from "@remixhq/core/repo";
 function getRiskLevel(status) {
   if (status.recommendedAction === "reconcile") return "high";
   if (status.recommendedAction === "choose_family" || status.recommendedAction === "await_finalize") return "medium";
-  if (status.recommendedAction === "pull" || status.recommendedAction === "re_anchor" || status.remote.incomingOpenMergeRequestCount) {
+  if (status.recommendedAction === "pull" || status.remote.incomingOpenMergeRequestCount) {
     return "medium";
   }
   if (status.repo.branchMismatch || !status.repo.isGitRepo || !status.binding.isBound || !status.repo.worktree.isClean) return "medium";
@@ -808,10 +810,6 @@ function getRecommendedNextActions(status) {
       return ["Run remix_collab_init to bind the repository to Remix before using any Remix collaboration mutation flow."];
     case "pull":
       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, automatic hook recording can capture completed turns."
-      ];
     case "record":
       return [
         "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."
@@ -896,8 +894,8 @@ async function initCollab(params) {
   return {
     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, automatic hook recording can capture completed turns."
+    recommendedNextActions: syncResult.baselineStatus === "baseline_missing" ? [
+      "This checkout has no local Remix revision baseline yet. Run remix_collab_init or remix_collab_sync_preview/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."],
@@ -1000,26 +998,6 @@ async function syncCollab(params) {
     }
   };
 }
-async function reAnchor(params) {
-  const api = await createCollabApiClient();
-  const result = await coreCollabReAnchor({
-    api,
-    cwd: params.cwd,
-    dryRun: params.dryRun,
-    allowBranchMismatch: params.allowBranchMismatch ?? false
-  });
-  return {
-    data: result,
-    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 automatic hook recording for ordinary local content changes."
-    ] : [],
-    logContext: {
-      repoRoot: result.repoRoot,
-      appId: result.currentAppId
-    }
-  };
-}
 async function requestMerge(params) {
   const api = await createCollabApiClient();
   const drainWarnings = await drainBeforeMutation(api);
@@ -1756,7 +1734,10 @@ function shouldAutoSpawnHistoryImport(repoRoot) {
     return false;
   }
 }
-function spawnHistoryImportDetached(repoRoot) {
+function isAutoSpawnEligibleBindingMode(bindingMode) {
+  return bindingMode === "explicit_root";
+}
+function spawnHistoryImportDetached(repoRoot, options) {
   const remixDir = path2.join(repoRoot, ".remix");
   try {
     mkdirSync(remixDir, { recursive: true });
@@ -1772,6 +1753,8 @@ function spawnHistoryImportDetached(repoRoot) {
       "import",
       "--repo",
       repoRoot,
+      "--before",
+      options.cutoffAt,
       // Include prompt text for parity with the CLI auto-spawn path:
       // first-time UX is a lot worse if the dashboard renders every
       // historical row as "(prompt not uploaded)".
@@ -1841,6 +1824,24 @@ function buildErrorEnvelope(tool, requestId, error) {
     recommendedNextActions
   };
 }
+function buildOutputValidationErrorEnvelope(tool, requestId, error) {
+  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: error.issues.map((issue) => `${issue.path.join(".") || "output"}: ${issue.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(
@@ -1859,7 +1860,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",
@@ -1922,11 +1936,13 @@ 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;
-        if (repoRoot && shouldAutoSpawnHistoryImport(repoRoot)) {
-          const spawned = spawnHistoryImportDetached(repoRoot);
+        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 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}`,
+            message: `history_import_auto_spawned pid=${spawned.pid ?? "?"} log=${spawned.logPath} cutoffAt=${cutoffAt}`,
             tool: "remix_collab_init",
             repoRoot
           });
@@ -2030,31 +2046,6 @@ function registerCollabTools(server, context) {
       return syncCollab({ cwd, dryRun: false, allowBranchMismatch: input.allowBranchMismatch ?? false });
     }
   });
-  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 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,
-    run: async (args) => {
-      const input = z3.object(previewInputSchema).parse(args);
-      const cwd = resolvePolicyCwd(context.policy, input.cwd);
-      return reAnchor({ cwd, dryRun: true });
-    }
-  });
-  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 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,
-    run: async (args) => {
-      const input = z3.object(reAnchorInputSchema).parse(args);
-      assertConfirm(input.confirm, "remix_collab_re_anchor_apply");
-      const cwd = resolvePolicyCwd(context.policy, input.cwd);
-      return reAnchor({ cwd, dryRun: false, allowBranchMismatch: input.allowBranchMismatch ?? false });
-    }
-  });
   registerTool(server, context, {
     name: "remix_collab_request_merge",
     description: "Open a prompt-backed Remix merge request from the current bound repository to its upstream app instead of merging locally with raw git.",