@remixhq/cli 0.1.11 → 0.1.13

package/dist/cli.js

@@ -1923,6 +1923,9 @@ function buildKeyName(params) {
   const ts = Math.floor(Date.now() / 1e3);
   return `cli_${user}_${hostname}_${ts}`;
 }
+function buildDashboardAppUrl(appId) {
+  return `https://dashboard.remix.one/apps/${encodeURIComponent(appId)}`;
+}
 async function initLocal(params) {
   await ensureAuth({ yes: params.yes, json: params.json });
   const cfg = await resolveConfig({ yes: params.yes });
@@ -1992,6 +1995,7 @@ async function initLocal(params) {
   });
   return {
     appId: imported.appId,
+    dashboardUrl: buildDashboardAppUrl(imported.appId),
     uploadId: imported.uploadId,
     projectId: imported.projectId,
     threadId: imported.threadId,
@@ -2018,6 +2022,7 @@ function registerInitCommands(program) {
       return;
     }
     console.log(pc9.green(`Completed. appId=${res.appId}`));
+    console.log(pc9.dim(`Dashboard: ${res.dashboardUrl}`));
     if (res.status) console.log(pc9.dim(`Status: ${res.status}`));
   });
 }
@@ -2027,10 +2032,14 @@ import fs15 from "fs/promises";
 import path13 from "path";
 import pc10 from "picocolors";
 import {
+  collabListMembers as collabListMembersCore,
+  collabUpdateMemberRole as collabUpdateMemberRoleCore,
+  getMemberRolesForScope,
   collabAdd as collabAddCore,
   collabRecordTurn as collabRecordTurnCore,
   collabApprove as collabApproveCore,
-  collabInbox as collabInboxCore,
+  collabCheckout as collabCheckoutCore,
+  collabListMergeRequests as collabListMergeRequestsCore,
   collabInit as collabInitCore,
   collabInvite as collabInviteCore,
   collabList as collabListCore,
@@ -2065,6 +2074,13 @@ function printResultWarnings(json, value) {
     console.log(pc10.yellow(warning));
   }
 }
+function printMergeRequests(result, json) {
+  if (json) return;
+  const items = Array.isArray(result.mergeRequests) ? result.mergeRequests : [];
+  for (const mr of items) {
+    console.log(`${mr.id}  ${mr.status}  ${mr.title ?? "(untitled)"}`);
+  }
+}
 async function createCollabApi(params) {
   await ensureAuth({ yes: params.yes, json: params.json });
   const cfg = await resolveConfig({ yes: params.yes });
@@ -2132,6 +2148,7 @@ async function collabInit(params) {
     } else {
       console.log(pc10.green(`Initialized repository in Remix. appId=${result.appId}`));
     }
+    console.log(pc10.dim(`Dashboard: ${result.dashboardUrl}`));
     printResultWarnings(params.json, result);
   }
   return result;
@@ -2242,7 +2259,24 @@ async function collabRemix(params) {
     appId: params.appId,
     name: params.name
   });
-  if (!params.json) console.log(pc10.green(`Created remix. appId=${result.appId} path=${result.repoRoot}`));
+  if (!params.json) {
+    console.log(pc10.green(`Created remix. appId=${result.appId} path=${result.repoRoot}`));
+    console.log(pc10.dim(`Dashboard: ${result.dashboardUrl}`));
+  }
+  return result;
+}
+async function collabCheckout(params) {
+  const api = await createCollabApi(params);
+  const result = await collabCheckoutCore({
+    api,
+    cwd: params.cwd,
+    outputDir: params.outputDir ?? null,
+    appId: params.appId
+  });
+  if (!params.json) {
+    console.log(pc10.green(`Checked out app. appId=${result.appId} path=${result.repoRoot}`));
+    console.log(pc10.dim(`Dashboard: ${result.dashboardUrl}`));
+  }
   return result;
 }
 async function collabAdd(params) {
@@ -2425,15 +2459,39 @@ async function collabRequestMerge(params) {
   if (!params.json) console.log(pc10.green(`Opened merge request. id=${result.id}`));
   return result;
 }
-async function collabInbox(params) {
+async function collabReviewQueue(params) {
   const api = await createCollabApi(params);
-  const result = await collabInboxCore({ api });
-  if (!params.json) {
-    const items = Array.isArray(result.mergeRequests) ? result.mergeRequests : result.mergeRequests ? Object.values(result.mergeRequests).flat() : [];
-    for (const mr of items) {
-      console.log(`${mr.id}  ${mr.status}  ${mr.title ?? "(untitled)"}`);
-    }
-  }
+  const result = await collabListMergeRequestsCore({
+    api,
+    queue: "reviewable",
+    status: params.status ?? "open",
+    kind: params.kind ?? "merge"
+  });
+  printMergeRequests(result, params.json);
+  return result;
+}
+async function collabMyMergeRequests(params) {
+  const api = await createCollabApi(params);
+  const result = await collabListMergeRequestsCore({
+    api,
+    queue: "created_by_me",
+    status: params.status ?? "open",
+    kind: params.kind ?? "merge"
+  });
+  printMergeRequests(result, params.json);
+  return result;
+}
+async function collabListAppMergeRequests(params) {
+  const api = await createCollabApi(params);
+  const result = await collabListMergeRequestsCore({
+    api,
+    cwd: params.cwd,
+    appId: params.appId ?? null,
+    queue: params.queue,
+    status: params.status ?? "open",
+    kind: params.kind ?? "merge"
+  });
+  printMergeRequests(result, params.json);
   return result;
 }
 async function collabView(params) {
@@ -2563,6 +2621,50 @@ async function collabInviteRevoke(params) {
   if (!params.json) console.log(pc10.green(`Revoked ${params.scope} invite. id=${params.inviteId}`));
   return result;
 }
+async function collabMembersList(params) {
+  const api = await createCollabApi(params);
+  const result = await collabListMembersCore({
+    api,
+    cwd: params.cwd,
+    scope: params.scope,
+    targetId: params.targetId ?? null
+  });
+  if (!params.json) {
+    for (const member of result.members) {
+      console.log(
+        `${String(member.userId ?? "")}  role=${String(member.role ?? "")}  invitedBy=${String(member.invitedBy ?? "")}`
+      );
+    }
+  }
+  return result;
+}
+async function collabMembersUpdate(params) {
+  const normalizedRole = params.role.trim().toLowerCase();
+  if (!getMemberRolesForScope(params.scope).includes(normalizedRole)) {
+    throw new CliError(`Invalid ${params.scope} member role.`, {
+      exitCode: 2,
+      hint: `Allowed roles: ${getMemberRolesForScope(params.scope).join(", ")}`
+    });
+  }
+  const api = await createCollabApi(params);
+  const result = await collabUpdateMemberRoleCore({
+    api,
+    cwd: params.cwd,
+    scope: params.scope,
+    targetId: params.targetId ?? null,
+    userId: params.userId,
+    role: normalizedRole
+  });
+  if (!params.json) {
+    const member = result.member;
+    console.log(
+      pc10.green(
+        `Updated ${result.scopeType} member. userId=${String(member.userId ?? params.userId)} role=${String(member.role ?? normalizedRole)}`
+      )
+    );
+  }
+  return result;
+}
 
 // src/services/memory.ts
 import pc11 from "picocolors";
@@ -2785,6 +2887,20 @@ function parseInviteScope(value) {
   if (normalized === "app") return "app";
   throw new Error("scope must be one of: organization, project, app");
 }
+function parseMergeRequestKind(value) {
+  const normalized = String(value).trim().toLowerCase();
+  if (normalized === "merge" || normalized === "sync" || normalized === "all") {
+    return normalized;
+  }
+  throw new Error("kind must be one of: merge, sync, all");
+}
+function parseAppMergeRequestQueue(value) {
+  const normalized = String(value).trim().toLowerCase();
+  if (normalized === "app_reviewable" || normalized === "app_outgoing" || normalized === "app_related_visible") {
+    return normalized;
+  }
+  throw new Error("queue must be one of: app_reviewable, app_outgoing, app_related_visible");
+}
 function registerCollabCommands(program) {
   const collab = program.command("collab").description("Generic collaboration workflow for any software repository");
   const memory = collab.command("memory").description("Inspect collaboration memory for the current bound repository or an explicit app");
@@ -2858,6 +2974,16 @@ function registerCollabCommands(program) {
     });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
+  collab.command("checkout <appId>").description("Check out an existing Remix app as-is into a new local checkout").option("--output-dir <path>", "Exact destination path for the checked out app").option("--cwd <path>", "Parent directory where the checked out app will be created when --output-dir is not provided").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (appId, opts) => {
+    const result = await collabCheckout({
+      cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
+      outputDir: opts.outputDir ? String(opts.outputDir) : null,
+      appId: appId ? String(appId) : null,
+      json: Boolean(opts.json),
+      yes: Boolean(opts.yes || opts.nonInteractive)
+    });
+    if (opts.json) console.log(JSON.stringify(result, null, 2));
+  });
   collab.command("remix <appId>").description("Create a remix/fork and materialize a new local checkout").option("--name <name>", "Optional name for the remix").option("--output-dir <path>", "Exact destination path for the new remix checkout").option("--cwd <path>", "Parent directory where the new remix checkout will be created when --output-dir is not provided").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (appId, opts) => {
     const result = await collabRemix({
       cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
@@ -2922,7 +3048,7 @@ function registerCollabCommands(program) {
     });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
-  collab.command("sync-upstream").description("Sync upstream changes into the current remix and update the local checkout").option("--cwd <path>", "Working directory for repository detection").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
+  collab.command("sync-upstream").description("Create an upstream catch-up sync for the current remix, then update the local checkout").option("--cwd <path>", "Working directory for repository detection").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
     const result = await collabSyncUpstream({
       cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
       json: Boolean(opts.json),
@@ -2930,7 +3056,7 @@ function registerCollabCommands(program) {
     });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
-  collab.command("request-merge").description("Open a merge request from the current remix to its upstream app").option("--yes", "Run non-interactively", false).option("--cwd <path>", "Working directory for repository detection").option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
+  collab.command("request-merge").description("Open a prompt-backed merge request from the current remix to its upstream app").option("--yes", "Run non-interactively", false).option("--cwd <path>", "Working directory for repository detection").option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
     const result = await collabRequestMerge({
       cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
       json: Boolean(opts.json),
@@ -2938,11 +3064,41 @@ function registerCollabCommands(program) {
     });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
-  collab.command("inbox").description("List open merge requests available for review").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
-    const result = await collabInbox({ json: Boolean(opts.json), yes: Boolean(opts.yes || opts.nonInteractive) });
+  collab.command("review-queue").description("List reviewable merge requests available to the current user").option("--status <status>", "Filter merge requests by status").option("--kind <kind>", "Filter merge requests by kind (merge|sync|all)", parseMergeRequestKind).option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
+    const result = await collabReviewQueue({
+      status: opts.status ? String(opts.status) : void 0,
+      kind: opts.kind,
+      json: Boolean(opts.json),
+      yes: Boolean(opts.yes || opts.nonInteractive)
+    });
+    if (opts.json) console.log(JSON.stringify(result, null, 2));
+  });
+  collab.command("my-merge-requests").description("List merge requests created by the current user").option("--status <status>", "Filter merge requests by status").option("--kind <kind>", "Filter merge requests by kind (merge|sync|all)", parseMergeRequestKind).option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
+    const result = await collabMyMergeRequests({
+      status: opts.status ? String(opts.status) : void 0,
+      kind: opts.kind,
+      json: Boolean(opts.json),
+      yes: Boolean(opts.yes || opts.nonInteractive)
+    });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
-  collab.command("view <mrId>").description("View merge request prompts and diffs").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (mrId, opts) => {
+  collab.command("list-app-merge-requests").description("List merge requests for the current bound app or an explicit app").requiredOption(
+    "--queue <queue>",
+    "App-scoped queue (app_reviewable|app_outgoing|app_related_visible)",
+    parseAppMergeRequestQueue
+  ).option("--cwd <path>", "Working directory for repository detection").option("--app-id <id>", "Explicit app id instead of the current bound repository").option("--status <status>", "Filter merge requests by status").option("--kind <kind>", "Filter merge requests by kind (merge|sync|all)", parseMergeRequestKind).option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
+    const result = await collabListAppMergeRequests({
+      cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
+      appId: opts.appId ? String(opts.appId) : null,
+      queue: opts.queue,
+      status: opts.status ? String(opts.status) : void 0,
+      kind: opts.kind,
+      json: Boolean(opts.json),
+      yes: Boolean(opts.yes || opts.nonInteractive)
+    });
+    if (opts.json) console.log(JSON.stringify(result, null, 2));
+  });
+  collab.command("view <mrId>").description("View merge request review groups and diffs").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (mrId, opts) => {
     const result = await collabView({
       mrId: String(mrId),
       json: Boolean(opts.json),
@@ -2950,7 +3106,7 @@ function registerCollabCommands(program) {
     });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
-  collab.command("approve <mrId>").description("Approve a merge request").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--remote-only", "Approve remotely and wait for merge completion without touching the local repo", false).option("--sync-target-repo", "Approve, wait for merge completion, and sync the current target repo checkout", false).option("--allow-branch-mismatch", "Allow syncing the target repo from a branch that does not match the checkout's preferred Remix branch", false).option("--json", "Output JSON", false).action(async (mrId, opts) => {
+  collab.command("approve <mrId>").description("Approve a merge request or upstream sync request").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--remote-only", "Approve remotely and wait for merge completion without touching the local repo", false).option("--sync-target-repo", "Approve, wait for merge completion, and sync the current target repo checkout", false).option("--allow-branch-mismatch", "Allow syncing the target repo from a branch that does not match the checkout's preferred Remix branch", false).option("--json", "Output JSON", false).action(async (mrId, opts) => {
     const result = await collabApprove({
       mrId: String(mrId),
       cwd: process.cwd(),
@@ -3017,6 +3173,29 @@ function registerCollabCommands(program) {
     });
     if (opts.json) console.log(JSON.stringify(result, null, 2));
   });
+  const members = collab.command("members").description("List members and update membership roles");
+  members.command("list").description("List members for an organization, project, or app").option("--scope <scope>", "Membership scope (organization|project|app)", parseInviteScope, "project").option("--target-id <id>", "Explicit organization/project/app id instead of using the current repository binding").option("--cwd <path>", "Working directory for repository detection").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (opts) => {
+    const result = await collabMembersList({
+      cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
+      scope: parseInviteScope(String(opts.scope ?? "project")),
+      targetId: opts.targetId ? String(opts.targetId) : null,
+      json: Boolean(opts.json),
+      yes: Boolean(opts.yes || opts.nonInteractive)
+    });
+    if (opts.json) console.log(JSON.stringify(result, null, 2));
+  });
+  members.command("update <userId>").description("Update a member role for an organization, project, or app").requiredOption("--role <role>", "Role for the membership").option("--scope <scope>", "Membership scope (organization|project|app)", parseInviteScope, "project").option("--target-id <id>", "Explicit organization/project/app id instead of using the current repository binding").option("--cwd <path>", "Working directory for repository detection").option("--yes", "Run non-interactively", false).option("--non-interactive", "Run non-interactively", false).option("--json", "Output JSON", false).action(async (userId, opts) => {
+    const result = await collabMembersUpdate({
+      cwd: opts.cwd ? String(opts.cwd) : process.cwd(),
+      scope: parseInviteScope(String(opts.scope ?? "project")),
+      userId: String(userId),
+      role: String(opts.role),
+      targetId: opts.targetId ? String(opts.targetId) : null,
+      json: Boolean(opts.json),
+      yes: Boolean(opts.yes || opts.nonInteractive)
+    });
+    if (opts.json) console.log(JSON.stringify(result, null, 2));
+  });
 }
 
 // src/cli.ts