fix: address review — plan swap detection and deduplicate API calls

- Fix swap detection for "plan" pseudo-trial: `sentry trial start my-org plan`
  now correctly auto-corrects to `sentry trial start plan my-org` instead of
  giving a confusing "Unknown trial name" error
- Deduplicate getProductTrials to delegate to getCustomerTrialInfo instead of
  making its own identical API call
- Add test for plan argument swap detection

Author: BYK

src/commands/trial/start.ts

@@ -45,6 +45,16 @@ const NAMES_LIST = `${VALID_NAMES.join(", ")}, plan`;
  *
  * @returns Parsed name and optional org, plus any warning message
  */
+/**
+ * Check if a string is a valid trial name, including the "plan" pseudo-trial.
+ *
+ * Used for swap detection so `sentry trial start my-org plan` is auto-corrected
+ * to `sentry trial start plan my-org`.
+ */
+function isValidTrialArg(name: string): boolean {
+  return name === "plan" || isTrialName(name);
+}
+
 function parseTrialStartArgs(
   first: string,
   second?: string
@@ -54,8 +64,8 @@ function parseTrialStartArgs(
     return { name: first };
   }
 
-  // Two args — check for swapped order
-  const swapped = detectSwappedTrialArgs(first, second, isTrialName);
+  // Two args — check for swapped order (includes "plan" pseudo-trial)
+  const swapped = detectSwappedTrialArgs(first, second, isValidTrialArg);
   if (swapped) {
     return { name: swapped.name, org: swapped.org, warning: swapped.warning };
   }

src/lib/api/trials.ts

@@ -15,48 +15,41 @@ import { getControlSiloUrl } from "../sentry-client.js";
 import { apiRequestToRegion } from "./infrastructure.js";
 
 /**
- * Fetch all product trials for an organization.
+ * Fetch full customer trial info including plan trial status.
  *
- * Fetches customer data from the internal `/customers/{org}/` endpoint
- * and returns the `productTrials` array. This is a getsentry SaaS-only
- * endpoint — self-hosted instances will 404, which callers should handle.
+ * Returns the complete {@link CustomerTrialInfo} including both product trials
+ * and plan-level trial info (`canTrial`, `isTrial`, `trialEnd`, `planDetails`).
  *
  * @param orgSlug - Organization slug
- * @returns Array of product trials (may be empty)
+ * @returns Customer trial info with product trials, plan trial status, and plan details
  */
-export async function getProductTrials(
+export async function getCustomerTrialInfo(
   orgSlug: string
-): Promise<ProductTrial[]> {
+): Promise<CustomerTrialInfo> {
   // /customers/ is a control silo endpoint (billing), not region-scoped
   const { data } = await apiRequestToRegion<CustomerTrialInfo>(
     getControlSiloUrl(),
     `/customers/${orgSlug}/`,
     { schema: CustomerTrialInfoSchema }
   );
-  return data.productTrials ?? [];
+  return data;
 }
 
 /**
- * Fetch full customer trial info including plan trial status.
- *
- * Returns the complete {@link CustomerTrialInfo} including both product trials
- * and plan-level trial info (`canTrial`, `isTrial`, `trialEnd`, `planDetails`),
- * which needs to display plan trials alongside product trials.
+ * Fetch all product trials for an organization.
  *
- * For simpler use cases that only need product trials, use {@link getProductTrials}.
+ * Convenience wrapper around {@link getCustomerTrialInfo} that returns
+ * just the `productTrials` array. This is a getsentry SaaS-only endpoint —
+ * self-hosted instances will 404, which callers should handle.
  *
  * @param orgSlug - Organization slug
- * @returns Customer trial info with product trials, plan trial status, and plan details
+ * @returns Array of product trials (may be empty)
  */
-export async function getCustomerTrialInfo(
+export async function getProductTrials(
   orgSlug: string
-): Promise<CustomerTrialInfo> {
-  const { data } = await apiRequestToRegion<CustomerTrialInfo>(
-    getControlSiloUrl(),
-    `/customers/${orgSlug}/`,
-    { schema: CustomerTrialInfoSchema }
-  );
-  return data;
+): Promise<ProductTrial[]> {
+  const info = await getCustomerTrialInfo(orgSlug);
+  return info.productTrials ?? [];
 }
 
 /**

test/commands/trial/start.test.ts

@@ -209,6 +209,30 @@ describe("trial start command", () => {
     expect(getProductTrialsSpy).toHaveBeenCalledWith("my-org");
   });
 
+  test("detects swapped arguments for plan pseudo-trial", async () => {
+    resolveOrgSpy.mockResolvedValue({ org: "my-org" });
+    const getInfoSpy = spyOn(
+      apiClient,
+      "getCustomerTrialInfo"
+    ).mockResolvedValue({
+      productTrials: [],
+      canTrial: true,
+      isTrial: false,
+      planDetails: { name: "Developer" },
+    } as CustomerTrialInfo);
+
+    const { context } = createMockContext();
+    const func = await startCommand.loader();
+    // Swapped: org first, "plan" second
+    await func.call(context, { json: true }, "my-org", "plan");
+
+    // Should resolve correctly despite swap
+    expect(resolveOrgSpy).toHaveBeenCalledWith(
+      expect.objectContaining({ org: "my-org" })
+    );
+    getInfoSpy.mockRestore();
+  });
+
   test("starts replays trial", async () => {
     const replaysTrial: ProductTrial = {
       ...MOCK_TRIAL,