feat(cli): add orgs list and activate the Free plan in projects create

Mono-RevId: c4c0a14ad8d9eb58850c8e3a69d05ccb5149f6fd

Author: carderne

.changeset/cli-orgs-list.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Add `trigger.dev orgs list` to show the organizations you belong to, with their slugs and IDs. Use the slug with `trigger.dev projects create --org`, including for organizations that don't have any projects yet. `trigger.dev projects create` now activates the Free plan for organizations that don't have a plan yet, matching `trigger.dev init`.

packages/cli-v3/src/commands/init.ts

@@ -40,6 +40,7 @@ import {
   writeConfigHasSeenMCPInstallPrompt,
 } from "../utilities/configFiles.js";
 import { installMcpServer } from "./install-mcp.js";
+import { createProjectWithFreePlanFallback } from "./projects/common.js";
 import { installSkillsFromInit, markSkillsPromptSeen } from "./skills.js";
 
 const cliVersion = VERSION as string;
@@ -937,18 +938,7 @@ async function createFirstProject(apiClient: CliApiClient, options: SelectProjec
       "--project-name is required to create a project when using --yes",
       { label: "Project names", minLength: 1, maxLength: 255 }
     ));
-  let projectResponse = await apiClient.createProject(orgParam, { name: projectName });
-
-  if (!projectResponse.success && projectResponse.statusCode === 402) {
-    const planResponse = await apiClient.activateFreePlan(orgParam);
-
-    if (!planResponse.success) {
-      throw new Error(`Failed to activate the Free plan: ${planResponse.error}`);
-    }
-
-    log.success("Activated the Free plan");
-    projectResponse = await apiClient.createProject(orgParam, { name: projectName });
-  }
+  const projectResponse = await createProjectWithFreePlanFallback(apiClient, orgParam, projectName);
 
   if (!projectResponse.success) {
     throw new Error(`Failed to create project: ${projectResponse.error}`);

packages/cli-v3/src/commands/orgs/index.ts

@@ -1,8 +1,10 @@
 import type { Command } from "commander";
 import { configureOrgsCreateCommand } from "./create.js";
+import { configureOrgsListCommand } from "./list.js";
 
 export function configureOrgsCommand(program: Command) {
   const orgs = program.command("orgs").description("Manage Trigger.dev organizations");
 
+  configureOrgsListCommand(orgs);
   configureOrgsCreateCommand(orgs);
 }

packages/cli-v3/src/commands/orgs/list.ts

@@ -0,0 +1,59 @@
+import { intro, outro } from "@clack/prompts";
+import type { Command } from "commander";
+import {
+  CommonCommandOptions,
+  commonOptions,
+  handleTelemetry,
+  wrapCommandAction,
+} from "../../cli/common.js";
+import { printStandloneInitialBanner } from "../../utilities/initialBanner.js";
+import { logger } from "../../utilities/logger.js";
+import { getPatApiClient } from "../projects/common.js";
+
+export function configureOrgsListCommand(program: Command) {
+  return commonOptions(
+    program
+      .command("list")
+      .description("List the Trigger.dev organizations you belong to")
+      .action(async (options) => {
+        await handleTelemetry(async () => {
+          await printStandloneInitialBanner(true, options.profile);
+          await orgsListCommand(options);
+        });
+      })
+  );
+}
+
+async function orgsListCommand(options: unknown) {
+  return await wrapCommandAction(
+    "orgsListCommand",
+    CommonCommandOptions,
+    options,
+    async (opts) => await listOrgs(opts)
+  );
+}
+
+async function listOrgs(options: CommonCommandOptions) {
+  intro("Listing organizations");
+
+  const apiClient = await getPatApiClient(options);
+  const response = await apiClient.getOrgs();
+
+  if (!response.success) {
+    throw new Error(`Failed to list organizations: ${response.error}`);
+  }
+
+  if (response.data.length === 0) {
+    outro("No organizations found. Create one with `trigger.dev orgs create`.");
+    return;
+  }
+
+  logger.table(
+    response.data.map((org) => ({
+      name: org.title,
+      slug: org.slug,
+      id: org.id,
+      created: org.createdAt.toLocaleString(),
+    }))
+  );
+}

packages/cli-v3/src/commands/projects/common.test.ts

@@ -0,0 +1,69 @@
+import { describe, expect, it, vi } from "vitest";
+import type { CliApiClient } from "../../apiClient.js";
+import { createProjectWithFreePlanFallback } from "./common.js";
+
+const project = { name: "My project", externalRef: "proj_123" };
+const planRequired = {
+  success: false,
+  statusCode: 402,
+  error: "You must select a plan for this organization before creating projects.",
+};
+
+function fakeClient(
+  createResponses: unknown[],
+  activateResponse: unknown = { success: true, data: { plan: "free" } }
+) {
+  const createProject = vi.fn();
+  for (const response of createResponses) createProject.mockResolvedValueOnce(response);
+  const activateFreePlan = vi.fn().mockResolvedValue(activateResponse);
+  return {
+    client: { createProject, activateFreePlan } as unknown as CliApiClient,
+    createProject,
+    activateFreePlan,
+  };
+}
+
+describe("createProjectWithFreePlanFallback", () => {
+  it("does not activate a plan when the project is created", async () => {
+    const { client, activateFreePlan } = fakeClient([{ success: true, data: project }]);
+
+    const response = await createProjectWithFreePlanFallback(client, "acme", "My project");
+
+    expect(response.success).toBe(true);
+    expect(activateFreePlan).not.toHaveBeenCalled();
+  });
+
+  it("activates the Free plan and retries when a plan is required", async () => {
+    const { client, createProject } = fakeClient([planRequired, { success: true, data: project }]);
+
+    const response = await createProjectWithFreePlanFallback(client, "acme", "My project");
+
+    expect(response.success).toBe(true);
+    expect(createProject).toHaveBeenCalledTimes(2);
+  });
+
+  it("retries when another command already activated the organization", async () => {
+    const { client } = fakeClient([planRequired, { success: true, data: project }], {
+      success: false,
+      statusCode: 409,
+      error: "Organization is already activated",
+    });
+
+    const response = await createProjectWithFreePlanFallback(client, "acme", "My project");
+
+    expect(response.success).toBe(true);
+  });
+
+  it("returns the plan error when activation is unavailable", async () => {
+    const { client, createProject } = fakeClient([planRequired], {
+      success: false,
+      statusCode: 404,
+      error: "Not found",
+    });
+
+    const response = await createProjectWithFreePlanFallback(client, "acme", "My project");
+
+    expect(response).toEqual(planRequired);
+    expect(createProject).toHaveBeenCalledTimes(1);
+  });
+});

packages/cli-v3/src/commands/projects/common.ts

@@ -1,5 +1,7 @@
+import { log } from "@clack/prompts";
 import { CliApiClient } from "../../apiClient.js";
 import type { CommonCommandOptions } from "../../cli/common.js";
+import { logger } from "../../utilities/logger.js";
 import { login } from "../login.js";
 
 export async function getPatApiClient(options: CommonCommandOptions) {
@@ -18,3 +20,34 @@ export async function getPatApiClient(options: CommonCommandOptions) {
 
   return new CliApiClient(authorization.auth.apiUrl, authorization.auth.accessToken);
 }
+
+const PLAN_REQUIRED_STATUS = 402;
+const ALREADY_ACTIVATED_STATUS = 409;
+
+/**
+ * Creates a project, activating the Free plan first if the organization has no plan yet.
+ * If activation isn't possible (self-hosted, no billing permission), the original
+ * "select a plan" error is returned so the user knows what to do.
+ */
+export async function createProjectWithFreePlanFallback(
+  apiClient: CliApiClient,
+  orgParam: string,
+  name: string
+) {
+  const response = await apiClient.createProject(orgParam, { name });
+
+  if (response.success || response.statusCode !== PLAN_REQUIRED_STATUS) {
+    return response;
+  }
+
+  const planResponse = await apiClient.activateFreePlan(orgParam);
+
+  if (planResponse.success) {
+    log.success("Activated the Free plan");
+  } else if (planResponse.statusCode !== ALREADY_ACTIVATED_STATUS) {
+    logger.debug("Failed to activate the Free plan", { error: planResponse.error });
+    return response;
+  }
+
+  return await apiClient.createProject(orgParam, { name });
+}

packages/cli-v3/src/commands/projects/create.ts

@@ -10,7 +10,7 @@ import {
   wrapCommandAction,
 } from "../../cli/common.js";
 import { printStandloneInitialBanner } from "../../utilities/initialBanner.js";
-import { getPatApiClient } from "./common.js";
+import { createProjectWithFreePlanFallback, getPatApiClient } from "./common.js";
 
 const ProjectsCreateCommandOptions = CommonCommandOptions.extend({
   org: z.string().optional(),
@@ -52,7 +52,7 @@ async function createProject(options: ProjectsCreateCommandOptions) {
   const org = options.org ?? (await promptForOrg(apiClient));
   const name = options.name ?? (await promptForName());
 
-  const response = await apiClient.createProject(org, { name });
+  const response = await createProjectWithFreePlanFallback(apiClient, org, name);
 
   if (!response.success) {
     throw new Error(`Failed to create project: ${response.error}`);