@remixhq/mcp 0.1.2 → 0.1.5

package/dist/cli.js

@@ -408,6 +408,14 @@ function makeErrorResult(envelope) {
 // src/contracts/collab.ts
 var genericRecordSchema = z2.record(z2.string(), z2.unknown());
 var genericArraySchema = z2.array(genericRecordSchema);
+var mergeRequestQueueSchema = z2.enum([
+  "reviewable",
+  "created_by_me",
+  "app_reviewable",
+  "app_outgoing",
+  "app_related_visible"
+]);
+var appScopedMergeRequestQueueSchema = z2.enum(["app_reviewable", "app_outgoing", "app_related_visible"]);
 var statusInputSchema = {
   ...commonRequestFieldsSchema,
   includeRemote: z2.boolean().optional()
@@ -455,10 +463,24 @@ var applyInputSchema = {
 var requestMergeInputSchema = {
   ...commonRequestFieldsSchema
 };
-var inboxInputSchema = {
+var reviewQueueInputSchema = {
   requestId: z2.string().trim().min(1).optional(),
   outputMode: z2.enum(["summary", "full"]).optional(),
-  status: z2.string().trim().min(1).optional()
+  status: z2.string().trim().min(1).optional(),
+  kind: z2.enum(["merge", "sync", "all"]).optional()
+};
+var myMergeRequestsInputSchema = {
+  requestId: z2.string().trim().min(1).optional(),
+  outputMode: z2.enum(["summary", "full"]).optional(),
+  status: z2.string().trim().min(1).optional(),
+  kind: z2.enum(["merge", "sync", "all"]).optional()
+};
+var appMergeRequestsInputSchema = {
+  ...commonRequestFieldsSchema,
+  queue: appScopedMergeRequestQueueSchema,
+  appId: z2.string().trim().min(1).optional(),
+  status: z2.string().trim().min(1).optional(),
+  kind: z2.enum(["merge", "sync", "all"]).optional()
 };
 var viewMergeRequestInputSchema = {
   requestId: z2.string().trim().min(1).optional(),
@@ -515,7 +537,9 @@ var addDataSchema = z2.object({
 var recordTurnDataSchema = genericRecordSchema;
 var syncDataSchema = genericRecordSchema;
 var requestMergeDataSchema = genericRecordSchema;
-var inboxDataSchema = z2.object({
+var mergeRequestQueueDataSchema = z2.object({
+  queue: mergeRequestQueueSchema,
+  appId: z2.string().nullable(),
   mergeRequests: z2.array(genericRecordSchema)
 });
 var viewMergeRequestDataSchema = genericRecordSchema;
@@ -532,7 +556,7 @@ var addSuccessSchema = makeSuccessSchema(addDataSchema);
 var recordTurnSuccessSchema = makeSuccessSchema(recordTurnDataSchema);
 var syncSuccessSchema = makeSuccessSchema(syncDataSchema);
 var requestMergeSuccessSchema = makeSuccessSchema(requestMergeDataSchema);
-var inboxSuccessSchema = makeSuccessSchema(inboxDataSchema);
+var mergeRequestQueueSuccessSchema = makeSuccessSchema(mergeRequestQueueDataSchema);
 var viewMergeRequestSuccessSchema = makeSuccessSchema(viewMergeRequestDataSchema);
 var approveSuccessSchema = makeSuccessSchema(approveDataSchema);
 var rejectSuccessSchema = makeSuccessSchema(rejectDataSchema);
@@ -545,7 +569,7 @@ import {
   collabAdd as coreCollabAdd,
   collabRecordTurn as coreCollabRecordTurn,
   collabApprove as coreCollabApprove,
-  collabInbox as coreCollabInbox,
+  collabListMergeRequests as coreCollabListMergeRequests,
   collabInit as coreCollabInit,
   collabInvite as coreCollabInvite,
   collabReconcile as coreCollabReconcile,
@@ -565,13 +589,6 @@ function unwrapResponseObject(resp, label) {
   }
   return obj;
 }
-function normalizeMergeRequestsPayload(payload) {
-  if (Array.isArray(payload)) return payload;
-  if (!payload || typeof payload !== "object") return [];
-  return Object.values(payload).flatMap(
-    (value) => Array.isArray(value) ? value : []
-  );
-}
 function getRiskLevel(status) {
   if (status.recommendedAction === "reconcile") return "high";
   if (status.recommendedAction === "sync" || status.remote.incomingOpenMergeRequestCount) return "medium";
@@ -581,18 +598,18 @@ function getRiskLevel(status) {
 function getRecommendedNextActions(status) {
   if (status.repo.branchMismatch) {
     return [
-      `Switch to the preferred branch (${status.binding.preferredBranch ?? "configured in the binding"}) before mutating Remix state, or rerun with allowBranchMismatch=true if intentional.`
+      `Switch to the preferred branch (${status.binding.preferredBranch ?? "configured in the binding"}) before using Remix mutation tools, or rerun with allowBranchMismatch=true if this deviation is intentional.`
     ];
   }
   switch (status.recommendedAction) {
     case "init":
-      return ["Run remix_collab_init to bind the repository to Remix."];
+      return ["Run remix_collab_init to bind the repository to Remix before using any Remix collaboration mutation flow."];
     case "sync":
-      return ["Run remix_collab_sync_preview, then remix_collab_sync_apply if the preview is acceptable."];
+      return ["Run remix_collab_sync_preview, then remix_collab_sync_apply if the preview is acceptable. Use this instead of raw git pull or rebase for bound-repo alignment."];
     case "reconcile":
-      return ["Run remix_collab_reconcile_preview before attempting remix_collab_reconcile_apply."];
-    case "review_inbox":
-      return ["Run remix_collab_inbox to inspect open merge requests."];
+      return ["Run remix_collab_reconcile_preview before attempting remix_collab_reconcile_apply. Reconcile is the explicit Remix recovery path when fast-forward sync is no longer possible."];
+    case "review_queue":
+      return ["Run remix_collab_review_queue to inspect reviewable merge requests instead of using local git merge flows."];
     default:
       return [];
   }
@@ -650,7 +667,7 @@ async function initCollab(params) {
   return {
     data: result,
     warnings: collectResultWarnings(result),
-    recommendedNextActions: ["Run remix_collab_status to inspect sync and merge readiness."],
+    recommendedNextActions: ["Run remix_collab_status to inspect sync, reconcile, and merge-request readiness before mutating bound-repo state."],
     logContext: {
       repoRoot: result.repoRoot,
       appId: result.appId
@@ -680,7 +697,7 @@ async function remixCollab(params) {
   return {
     data: result,
     warnings: collectResultWarnings(result),
-    recommendedNextActions: ["Run remix_collab_status inside the remix checkout to inspect its state."],
+    recommendedNextActions: ["Run remix_collab_status inside the remix checkout before using Remix mutation tools there."],
     logContext: {
       repoRoot: result.repoRoot,
       appId: result.appId
@@ -765,7 +782,7 @@ async function syncCollab(params) {
   return {
     data: result,
     warnings: collectResultWarnings(result),
-    recommendedNextActions: params.dryRun ? ["Run remix_collab_sync_apply with confirm=true to apply this fast-forward update."] : [],
+    recommendedNextActions: params.dryRun ? ["Run remix_collab_sync_apply with confirm=true to apply this fast-forward update instead of using raw git pull or rebase."] : [],
     logContext: {
       repoRoot: result.repoRoot
     }
@@ -780,25 +797,73 @@ async function requestMerge(params) {
   return {
     data: result,
     warnings: [],
-    recommendedNextActions: result.id ? [`Run remix_collab_view_merge_request with mrId=${String(result.id)} to inspect the request.`] : [],
+    recommendedNextActions: result.id ? [`Run remix_collab_view_merge_request with mrId=${String(result.id)} to inspect the request before deciding whether to approve or reject it.`] : [],
     logContext: {
       mrId: typeof result.id === "string" ? result.id : null
     }
   };
 }
-async function inbox(params) {
+async function reviewQueue(params) {
   const api = await createCollabApiClient();
-  const result = await coreCollabInbox({ api });
-  const mergeRequests = normalizeMergeRequestsPayload(result.mergeRequests).filter(
-    (mr) => params.status ? String(mr.status ?? "") === params.status : true
-  );
+  const result = await coreCollabListMergeRequests({
+    api,
+    queue: "reviewable",
+    status: params.status ?? "open",
+    kind: params.kind ?? "merge"
+  });
+  return {
+    data: {
+      queue: result.queue,
+      appId: result.appId,
+      mergeRequests: result.mergeRequests
+    },
+    warnings: [],
+    recommendedNextActions: [],
+    logContext: {}
+  };
+}
+async function myMergeRequests(params) {
+  const api = await createCollabApiClient();
+  const result = await coreCollabListMergeRequests({
+    api,
+    queue: "created_by_me",
+    status: params.status ?? "open",
+    kind: params.kind ?? "merge"
+  });
   return {
-    data: { mergeRequests },
+    data: {
+      queue: result.queue,
+      appId: result.appId,
+      mergeRequests: result.mergeRequests
+    },
     warnings: [],
     recommendedNextActions: [],
     logContext: {}
   };
 }
+async function listAppMergeRequests(params) {
+  const api = await createCollabApiClient();
+  const result = await coreCollabListMergeRequests({
+    api,
+    cwd: params.cwd,
+    appId: params.appId,
+    queue: params.queue,
+    status: params.status ?? "open",
+    kind: params.kind ?? "merge"
+  });
+  return {
+    data: {
+      queue: result.queue,
+      appId: result.appId,
+      mergeRequests: result.mergeRequests
+    },
+    warnings: [],
+    recommendedNextActions: [],
+    logContext: {
+      appId: result.appId
+    }
+  };
+}
 async function viewMergeRequest(params) {
   const api = await createCollabApiClient();
   const review = await coreCollabView({
@@ -887,7 +952,7 @@ async function reconcile(params) {
   return {
     data: result,
     warnings: collectWarnings(result.warnings),
-    recommendedNextActions: params.dryRun ? ["Run remix_collab_reconcile_apply with confirm=true only if the preview is acceptable."] : [],
+    recommendedNextActions: params.dryRun ? ["Run remix_collab_reconcile_apply with confirm=true only if the preview is acceptable. Do not replace this with raw git history-rewrite commands."] : [],
     risks: params.dryRun ? ["Reconcile apply rewrites local history and creates a backup branch."] : [],
     logContext: {
       repoRoot: result.repoRoot ?? null
@@ -942,7 +1007,7 @@ function buildSuccessEnvelope(tool, requestId, result) {
   };
 }
 function deriveErrorRisks(tool, normalized) {
-  if (tool === "remix_collab_add" && normalized.message === "Change step succeeded remotely, but automatic local sync failed.") {
+  if ((tool === "remix_collab_add" || tool === "remix_collab_add_change_step") && normalized.message === "Change step succeeded remotely, but automatic local sync failed.") {
     return ["The change step succeeded remotely, but the local repository may need manual recovery or a follow-up sync."];
   }
   if (normalized.code === "DESTRUCTIVE_OPERATION_BLOCKED") {
@@ -1022,7 +1087,7 @@ function registerTool(server, context, params) {
 function registerCollabTools(server, context) {
   registerTool(server, context, {
     name: "remix_collab_status",
-    description: "Summarize repository binding, worktree state, merge request counts, and sync or reconcile readiness.",
+    description: "Required first read for a bound repository: summarize binding, worktree state, merge request counts, and sync or reconcile readiness before Remix mutations.",
     access: "read",
     inputSchema: statusInputSchema,
     outputSchema: statusSuccessSchema,
@@ -1081,7 +1146,33 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_add",
-    description: "Record one collaboration change step for the current bound repository, using the live worktree by default.",
+    description: "Authoritative way to record completed code changes for the current bound repository, using the live worktree diff by default instead of raw git commit or push.",
+    access: "local_write",
+    inputSchema: addInputSchema,
+    outputSchema: addSuccessSchema,
+    run: async (args) => {
+      const input = z3.object(addInputSchema).parse(args);
+      const cwd = resolvePolicyCwd(context.policy, input.cwd);
+      const diffSource = input.diffSource ?? "worktree";
+      if (diffSource === "external") {
+        const externalDiff = input.externalDiff ?? "";
+        assertDiffWithinLimit(context.policy, externalDiff);
+      }
+      return addCollabStep({
+        cwd,
+        prompt: input.prompt,
+        assistantResponse: input.assistantResponse,
+        diffSource,
+        externalDiff: input.externalDiff,
+        allowBranchMismatch: input.allowBranchMismatch ?? false,
+        idempotencyKey: input.idempotencyKey,
+        agent: context.agentMetadata
+      });
+    }
+  });
+  registerTool(server, context, {
+    name: "remix_collab_add_change_step",
+    description: "Alias of remix_collab_add with a more explicit name: record a code-diff change step for the current bound repository.",
     access: "local_write",
     inputSchema: addInputSchema,
     outputSchema: addSuccessSchema,
@@ -1107,7 +1198,26 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_record_turn",
-    description: "Record one no-diff collaboration turn for the current bound repository after a completed assistant response.",
+    description: "Record one no-diff collaboration turn for the current bound repository after a completed assistant response. This is for prompt/response history only and will fail if the worktree has code changes.",
+    access: "remote_write",
+    inputSchema: recordTurnInputSchema,
+    outputSchema: recordTurnSuccessSchema,
+    run: async (args) => {
+      const input = z3.object(recordTurnInputSchema).parse(args);
+      const cwd = resolvePolicyCwd(context.policy, input.cwd);
+      return recordCollabTurn({
+        cwd,
+        prompt: input.prompt,
+        assistantResponse: input.assistantResponse,
+        allowBranchMismatch: input.allowBranchMismatch ?? false,
+        idempotencyKey: input.idempotencyKey,
+        agent: context.agentMetadata
+      });
+    }
+  });
+  registerTool(server, context, {
+    name: "remix_collab_record_no_diff_turn",
+    description: "Alias of remix_collab_record_turn with a more explicit name: record a prompt/response turn only when the worktree has no code diff.",
     access: "remote_write",
     inputSchema: recordTurnInputSchema,
     outputSchema: recordTurnSuccessSchema,
@@ -1126,7 +1236,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_sync_preview",
-    description: "Preview whether the current bound repository can be fast-forward synced to the Remix app state.",
+    description: "Preview whether the current bound repository can be fast-forward synced to the Remix app state. Use this instead of raw git pull or rebase for bound-repo alignment.",
     access: "read",
     inputSchema: previewInputSchema,
     outputSchema: syncSuccessSchema,
@@ -1138,7 +1248,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_sync_apply",
-    description: "Fast-forward sync the current bound repository to the Remix app state.",
+    description: "Fast-forward sync the current bound repository to the Remix app state. This is the Remix-native replacement for raw git pull or rebase in a bound repo.",
     access: "local_write",
     inputSchema: applyInputSchema,
     outputSchema: syncSuccessSchema,
@@ -1151,7 +1261,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_request_merge",
-    description: "Open a merge request from the current bound repository to its upstream app.",
+    description: "Open a Remix merge request from the current bound repository to its upstream app instead of merging locally with raw git.",
     access: "remote_write",
     inputSchema: requestMergeInputSchema,
     outputSchema: requestMergeSuccessSchema,
@@ -1162,19 +1272,48 @@ function registerCollabTools(server, context) {
     }
   });
   registerTool(server, context, {
-    name: "remix_collab_inbox",
-    description: "List merge requests available for review.",
+    name: "remix_collab_review_queue",
+    description: "List reviewable merge requests: open requests the current user can actively approve or reject on target apps they administer or maintain. Optional `status` filters the results; optional `kind` defaults to `merge`.",
     access: "read",
-    inputSchema: inboxInputSchema,
-    outputSchema: inboxSuccessSchema,
+    inputSchema: reviewQueueInputSchema,
+    outputSchema: mergeRequestQueueSuccessSchema,
     run: async (args) => {
-      const input = z3.object(inboxInputSchema).parse(args);
-      return inbox({ status: input.status });
+      const input = z3.object(reviewQueueInputSchema).parse(args);
+      return reviewQueue({ status: input.status, kind: input.kind });
+    }
+  });
+  registerTool(server, context, {
+    name: "remix_collab_my_merge_requests",
+    description: "List merge requests created by the current user across all apps visible to that user, not just the current bound checkout. This still works even when the user is not a reviewer on the target app. Optional `status` filters the results; optional `kind` defaults to `merge`.",
+    access: "read",
+    inputSchema: myMergeRequestsInputSchema,
+    outputSchema: mergeRequestQueueSuccessSchema,
+    run: async (args) => {
+      const input = z3.object(myMergeRequestsInputSchema).parse(args);
+      return myMergeRequests({ status: input.status, kind: input.kind });
+    }
+  });
+  registerTool(server, context, {
+    name: "remix_collab_list_app_merge_requests",
+    description: "List app-scoped merge requests for the current bound checkout or an explicit `appId`. Required `queue` must be one of: `app_reviewable` (incoming requests this app can review), `app_outgoing` (requests created from this app), or `app_related_visible` (all open visible requests where this app is either source or target). Optional `status` filters the results; optional `kind` defaults to `merge`.",
+    access: "read",
+    inputSchema: appMergeRequestsInputSchema,
+    outputSchema: mergeRequestQueueSuccessSchema,
+    run: async (args) => {
+      const input = z3.object(appMergeRequestsInputSchema).parse(args);
+      const cwd = input.cwd ? resolvePolicyCwd(context.policy, input.cwd) : void 0;
+      return listAppMergeRequests({
+        cwd,
+        appId: input.appId,
+        queue: input.queue,
+        status: input.status,
+        kind: input.kind
+      });
     }
   });
   registerTool(server, context, {
     name: "remix_collab_view_merge_request",
-    description: "View merge request metadata, prompts, change steps, and optionally a bounded unified diff.",
+    description: "View Remix merge request metadata, prompts, change steps, and optionally a bounded unified diff before approval or rejection.",
     access: "read",
     inputSchema: viewMergeRequestInputSchema,
     outputSchema: viewMergeRequestSuccessSchema,
@@ -1189,7 +1328,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_approve_remote",
-    description: "Approve a merge request remotely and wait for terminal completion without mutating the local repository.",
+    description: "Approve a merge request remotely and wait for terminal completion without mutating the local repository, preserving Remix as the merge authority.",
     access: "remote_write",
     inputSchema: approveInputSchema,
     outputSchema: approveSuccessSchema,
@@ -1205,7 +1344,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_approve_and_sync_target",
-    description: "Approve a merge request, wait for completion, and sync the target repository locally.",
+    description: "Approve a merge request, wait for completion, and sync the target repository locally through Remix rather than a local git merge flow.",
     access: "local_write",
     inputSchema: approveInputSchema,
     outputSchema: approveSuccessSchema,
@@ -1235,7 +1374,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_sync_upstream",
-    description: "Sync upstream changes into the current remix and update the local checkout.",
+    description: "Sync upstream changes into the current remix and update the local checkout through Remix-native lineage management rather than raw git pull or merge.",
     access: "local_write",
     inputSchema: applyInputSchema,
     outputSchema: syncUpstreamSuccessSchema,
@@ -1248,7 +1387,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_reconcile_preview",
-    description: "Preview reconcile readiness when the local repository cannot be fast-forward synced.",
+    description: "Preview reconcile readiness when the local repository cannot be fast-forward synced. Use this before any explicit Remix history-repair workflow.",
     access: "read",
     inputSchema: previewInputSchema,
     outputSchema: reconcileSuccessSchema,
@@ -1260,7 +1399,7 @@ function registerCollabTools(server, context) {
   });
   registerTool(server, context, {
     name: "remix_collab_reconcile_apply",
-    description: "Reconcile divergent local history against the bound Remix app and update the local checkout.",
+    description: "Reconcile divergent local history against the bound Remix app and update the local checkout. This is the explicit Remix recovery path for divergent history.",
     access: "local_write",
     inputSchema: applyInputSchema,
     outputSchema: reconcileSuccessSchema,
@@ -1387,7 +1526,7 @@ function buildSearchNextActions(result) {
     ];
   }
   const actions = [
-    "Review the top matched memory items before falling back to raw git history so you keep the reasoning context in view."
+    "Review the top matched memory items before reaching for raw git so the relevant Remix reasoning context stays in view."
   ];
   const changeStepId = getFirstChangeStepId(result.items);
   if (changeStepId) {
@@ -1422,7 +1561,7 @@ function buildTimelineNextActions(result) {
 }
 function buildChangeStepDiffNextActions(changeStepId) {
   return [
-    `Inspect the stored diff for \`changeStepId=${changeStepId}\`, then use raw git only if you still need exact repository-level commit or ancestry details.`
+    `Inspect the stored diff for \`changeStepId=${changeStepId}\`, then use raw git only if you still need exact repository-level commit, blame, ancestry, or raw patch details.`
   ];
 }
 function unwrapResponseObject2(resp, label) {
@@ -1616,7 +1755,7 @@ function registerTool2(server, context, params) {
 function registerMemoryTools(server, context) {
   registerTool2(server, context, {
     name: "remix_collab_memory_summary",
-    description: "First read for a bound app's current collaboration state, recent reasoning context, and merge or reconcile history before deeper inspection.",
+    description: "First read for a bound app's current collaboration state, recent reasoning context, and merge or reconcile history before deeper inspection or any raw git history lookup.",
     access: "read",
     inputSchema: memorySummaryInputSchema,
     outputSchema: memorySummarySuccessSchema,
@@ -1631,7 +1770,7 @@ function registerMemoryTools(server, context) {
   });
   registerTool2(server, context, {
     name: "remix_collab_memory_search",
-    description: "Default tool for why/history/failed-attempt/user-intent questions. Search prompts, diffs, merge activity, reconciles, and other historical context before using raw git history.",
+    description: "Default tool for why/history/failed-attempt/user-intent questions. Search prompts, diffs, merge activity, reconciles, and other historical context before using raw git for exact repository facts.",
     access: "read",
     inputSchema: memorySearchInputSchema,
     outputSchema: memorySearchSuccessSchema,
@@ -1652,7 +1791,7 @@ function registerMemoryTools(server, context) {
   });
   registerTool2(server, context, {
     name: "remix_collab_memory_timeline",
-    description: "Chronological view of collaboration memory for understanding what happened and in what order, with optional filters for bounded historical inspection.",
+    description: "Chronological view of collaboration memory for understanding what happened and in what order, with optional filters for bounded historical inspection before any exact-facts raw git follow-up.",
     access: "read",
     inputSchema: memoryTimelineInputSchema,
     outputSchema: memoryTimelineSuccessSchema,
@@ -1672,7 +1811,7 @@ function registerMemoryTools(server, context) {
   });
   registerTool2(server, context, {
     name: "remix_collab_memory_change_step_diff",
-    description: "Second-hop expansion tool that fetches the full stored diff for a specific change step after memory search, timeline, or review work has identified the relevant `changeStepId`.",
+    description: "Second-hop expansion tool that fetches the full stored diff for a specific change step after memory search, timeline, or review work has identified the relevant `changeStepId`, keeping historical inspection inside Remix before raw git fallback.",
     access: "read",
     inputSchema: changeStepDiffInputSchema,
     outputSchema: changeStepDiffSuccessSchema,