commet 1.5.0 → 1.7.0

package/dist/index.js

@@ -30,7 +30,7 @@ var import_commander11 = require("commander");
 // package.json
 var package_default = {
   name: "commet",
-  version: "1.5.0",
+  version: "1.7.0",
   description: "Commet CLI - Manage your billing platform from the command line",
   bin: {
     commet: "./bin/commet"
@@ -164,12 +164,7 @@ function clearProjectConfig() {
 }
 
 // src/utils/api.ts
-function getBaseURL(environment) {
-  if (environment === "production") {
-    return "https://commet.co";
-  }
-  return "https://sandbox.commet.co";
-}
+var BASE_URL = "https://commet.co";
 async function apiRequest(endpoint, options = {}) {
   const auth = loadAuth();
   if (!auth) {
@@ -200,17 +195,34 @@ async function apiRequest(endpoint, options = {}) {
 }
 
 // src/utils/login-flow.ts
-var import_chalk = __toESM(require("chalk"));
+var import_chalk2 = __toESM(require("chalk"));
 var import_open = __toESM(require("open"));
 var import_ora = __toESM(require("ora"));
+
+// src/utils/prompt-theme.ts
+var import_chalk = __toESM(require("chalk"));
+var commetColor = import_chalk.default.hex("#e8a07c");
+var promptTheme = {
+  prefix: commetColor("\u276F"),
+  style: {
+    answer: commetColor,
+    message: import_chalk.default.bold,
+    error: import_chalk.default.red,
+    help: import_chalk.default.dim,
+    highlight: commetColor.bold,
+    description: import_chalk.default.dim,
+    defaultAnswer: import_chalk.default.dim
+  }
+};
+
+// src/utils/login-flow.ts
 function sleep(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
-async function performLogin(environment) {
-  const baseURL = getBaseURL(environment);
+async function performLogin() {
   const spinner = (0, import_ora.default)("Initiating login flow...").start();
   try {
-    const deviceResponse = await fetch(`${baseURL}/api/auth/device/code`, {
+    const deviceResponse = await fetch(`${BASE_URL}/api/auth/device/code`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
@@ -230,16 +242,16 @@ async function performLogin(environment) {
       interval = 5
     } = deviceData;
     spinner.stop();
-    console.log(import_chalk.default.bold("\n\u{1F510} Commet CLI Login\n"));
+    console.log(import_chalk2.default.bold("\n\u{1F510} Commet CLI Login\n"));
     console.log("Visit the following URL in your browser:");
-    console.log(import_chalk.default.cyan.underline(verification_uri_complete));
+    console.log(commetColor.underline(verification_uri_complete));
     console.log("\nOr enter this code manually:");
-    console.log(import_chalk.default.bold.green(`  ${user_code}`));
-    console.log(import_chalk.default.dim("\nOpening browser...\n"));
+    console.log(import_chalk2.default.bold.green(`  ${user_code}`));
+    console.log(import_chalk2.default.dim("\nOpening browser...\n"));
     try {
       await (0, import_open.default)(verification_uri_complete);
     } catch {
-      console.log(import_chalk.default.yellow("\u26A0 Could not open browser automatically."));
+      console.log(import_chalk2.default.yellow("\u26A0 Could not open browser automatically."));
     }
     const pollSpinner = (0, import_ora.default)("Waiting for authorization...").start();
     let pollingInterval = interval;
@@ -249,7 +261,7 @@ async function performLogin(environment) {
       attempts++;
       await sleep(pollingInterval * 1e3);
       try {
-        const tokenResponse = await fetch(`${baseURL}/api/auth/device/token`, {
+        const tokenResponse = await fetch(`${BASE_URL}/api/auth/device/token`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({
@@ -261,8 +273,7 @@ async function performLogin(environment) {
         const tokenData = await tokenResponse.json();
         if (tokenData.access_token) {
           const authConfig = {
-            token: tokenData.access_token,
-            environment
+            token: tokenData.access_token
           };
           if (tokenData.refresh_token) {
             authConfig.refreshToken = tokenData.refresh_token;
@@ -304,23 +315,6 @@ async function performLogin(environment) {
   }
 }
 
-// src/utils/prompt-theme.ts
-var import_chalk2 = __toESM(require("chalk"));
-var commetColor = import_chalk2.default.hex("#5BC0B0");
-var promptTheme = {
-  prefix: commetColor("\u276F"),
-  style: {
-    answer: commetColor,
-    message: import_chalk2.default.bold,
-    error: import_chalk2.default.red,
-    help: import_chalk2.default.dim,
-    highlight: commetColor.bold,
-    // Selected option in mint
-    description: import_chalk2.default.dim,
-    defaultAnswer: import_chalk2.default.dim
-  }
-};
-
 // src/commands/create.ts
 var GITHUB_REPO = "commet-labs/commet";
 var TEMPLATES = [
@@ -462,27 +456,29 @@ function copyEnvExample(dest) {
     fs2.copyFileSync(examplePath, envPath);
   }
 }
-function writeApiKeyToEnv(dest, apiKey, environment) {
+function writeApiKeyToEnv(dest, apiKey) {
   const envPath = path2.join(dest, ".env");
   if (!fs2.existsSync(envPath)) return;
   let content = fs2.readFileSync(envPath, "utf-8");
   content = content.replace(/COMMET_API_KEY=.*/, `COMMET_API_KEY=${apiKey}`);
-  content = content.replace(
-    /COMMET_ENVIRONMENT=.*/,
-    `COMMET_ENVIRONMENT=${environment}`
-  );
   fs2.writeFileSync(envPath, content);
 }
-function linkProject(dest, orgId, orgName, environment) {
+function linkProject(dest, orgId, orgName) {
   const commetDir = path2.join(dest, ".commet");
   fs2.mkdirSync(commetDir, { recursive: true });
   fs2.writeFileSync(
     path2.join(commetDir, "config.json"),
-    JSON.stringify({ orgId, orgName, environment }, null, 2),
+    JSON.stringify({ orgId, orgName, mode: "sandbox" }, null, 2),
     "utf8"
   );
 }
-async function askSkills() {
+function isInteractive() {
+  return process.stdin.isTTY === true;
+}
+async function resolveSkills(opts) {
+  if (typeof opts.skills === "boolean") return opts.skills;
+  if (opts.yes) return true;
+  if (!isInteractive()) return false;
   try {
     return await (0, import_prompts.confirm)({
       message: `Add ${commetColor("agent skills")}?`,
@@ -513,7 +509,7 @@ async function installSkills(projectRoot) {
 var createCommand = new import_commander.Command("create").description("Create a new Commet app from a template").argument("[name]", "Project name").option(
   "-t, --template <template>",
   "Template to use (fixed, seats, metered, credits, balance-ai, balance-fixed)"
-).option("--ref <ref>", "Git ref to fetch templates from", "main").option("--list", "List available templates").action(async (argName, opts) => {
+).option("--org <slug>", "Organization slug or ID (skips selection)").option("--skills", "Install agent skills").option("--no-skills", "Skip agent skills installation").option("-y, --yes", "Accept defaults for optional prompts").option("--ref <ref>", "Git ref to fetch templates from", "main").option("--list", "List available templates").action(async (argName, opts) => {
   if (opts.list) {
     console.log(import_chalk3.default.bold("\nAvailable templates:\n"));
     for (const t of TEMPLATES) {
@@ -525,16 +521,23 @@ var createCommand = new import_commander.Command("create").description("Create a
     return;
   }
   let projectName = argName;
-  try {
-    if (!projectName) {
+  if (!projectName) {
+    if (!isInteractive()) {
+      console.log(import_chalk3.default.red("\u2717 Project name is required"));
+      console.log(
+        import_chalk3.default.dim("Pass as positional argument: commet create <name>")
+      );
+      return;
+    }
+    try {
       projectName = await (0, import_prompts.input)({
         message: "Project name:",
         theme: promptTheme
       });
+    } catch {
+      console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
+      return;
     }
-  } catch {
-    console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
-    return;
   }
   const dest = path2.resolve(projectName);
   if (fs2.existsSync(dest)) {
@@ -544,65 +547,64 @@ var createCommand = new import_commander.Command("create").description("Create a
     return;
   }
   if (!authExists()) {
-    let environment;
-    try {
-      environment = await (0, import_prompts.select)({
-        message: "Environment:",
-        choices: [
-          {
-            name: `Sandbox ${import_chalk3.default.dim("(Development)")}`,
-            value: "sandbox"
-          },
-          { name: "Production", value: "production" }
-        ],
-        default: "sandbox",
-        theme: promptTheme
-      });
-    } catch {
-      console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
+    if (!isInteractive()) {
+      console.log(import_chalk3.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk3.default.dim("Run `commet login` first"));
       return;
     }
-    const loggedIn = await performLogin(environment);
+    const loggedIn = await performLogin();
     if (!loggedIn) {
       return;
     }
   }
-  const auth = loadAuth();
-  const baseURL = getBaseURL(auth.environment);
-  if (auth.environment !== "sandbox") {
-    console.log(
-      import_chalk3.default.red(
-        "\u2717 `commet create` is only available in sandbox environment"
-      )
-    );
-    console.log(
-      import_chalk3.default.dim("Run `commet logout` and login to sandbox to use templates")
-    );
-    return;
-  }
-  const orgsSpinner = (0, import_ora2.default)("Fetching organizations...").start();
-  const orgsResult = await apiRequest(`${baseURL}/api/cli/organizations`);
+  const orgsSpinner = (0, import_ora2.default)("Fetching sandbox organizations...").start();
+  const orgsResult = await apiRequest(`${BASE_URL}/api/cli/organizations`);
   if (orgsResult.error || !orgsResult.data) {
     orgsSpinner.fail("Failed to fetch organizations");
     console.log(import_chalk3.default.dim(orgsResult.error));
     return;
   }
-  const { organizations } = orgsResult.data;
+  const organizations = orgsResult.data.organizations.filter(
+    (org) => org.mode === "sandbox"
+  );
   orgsSpinner.stop();
   if (organizations.length === 0) {
-    console.log(import_chalk3.default.yellow("\u26A0 No organizations found"));
+    console.log(import_chalk3.default.yellow("\u26A0 No sandbox organizations found"));
     console.log(
       import_chalk3.default.dim("Create an organization at https://commet.co first")
     );
     return;
   }
   let selectedOrg;
-  if (organizations.length === 1) {
+  if (opts.org) {
+    const match = organizations.find(
+      (org) => org.slug === opts.org || org.id === opts.org
+    );
+    if (!match) {
+      console.log(import_chalk3.default.red(`\u2717 Organization "${opts.org}" not found`));
+      console.log(
+        import_chalk3.default.dim(
+          `Available: ${organizations.map((o) => o.slug).join(", ")}`
+        )
+      );
+      return;
+    }
+    selectedOrg = match;
+  } else if (organizations.length === 1) {
     selectedOrg = organizations[0];
   } else {
+    if (!isInteractive()) {
+      console.log(import_chalk3.default.red("\u2717 Organization is required"));
+      console.log(
+        import_chalk3.default.dim(
+          `Pass --org=<slug>. Available: ${organizations.map((o) => o.slug).join(", ")}`
+        )
+      );
+      return;
+    }
     try {
       const orgId = await (0, import_prompts.select)({
-        message: "Organization:",
+        message: "Sandbox organization:",
         choices: organizations.map((org) => ({
           name: `${org.name} ${import_chalk3.default.dim(`(${org.slug})`)}`,
           value: org.id
@@ -623,8 +625,17 @@ var createCommand = new import_commander.Command("create").description("Create a
     );
     return;
   }
-  try {
-    if (!template) {
+  if (!template) {
+    if (!isInteractive()) {
+      console.log(import_chalk3.default.red("\u2717 Template is required"));
+      console.log(
+        import_chalk3.default.dim(
+          `Pass --template=<name>. Available: ${TEMPLATES.map((t) => t.name).join(", ")}`
+        )
+      );
+      return;
+    }
+    try {
       const selected = await (0, import_prompts.select)({
         message: "Billing model:",
         choices: TEMPLATES.map((t) => ({
@@ -634,12 +645,12 @@ var createCommand = new import_commander.Command("create").description("Create a
         theme: promptTheme
       });
       template = TEMPLATES.find((t) => t.name === selected);
+    } catch {
+      console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
+      return;
     }
-  } catch {
-    console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
-    return;
   }
-  const shouldInstallSkills = await askSkills();
+  const shouldInstallSkills = await resolveSkills(opts);
   const downloadSpinner = (0, import_ora2.default)("Downloading template...").start();
   try {
     await downloadTemplate(template.dir, dest, opts.ref);
@@ -675,7 +686,7 @@ var createCommand = new import_commander.Command("create").description("Create a
     return;
   }
   const planSpinner = (0, import_ora2.default)("Creating plans...").start();
-  const templateResult = await apiRequest(`${baseURL}/api/cli/templates`, {
+  const templateResult = await apiRequest(`${BASE_URL}/api/cli/templates`, {
     method: "POST",
     body: JSON.stringify({
       templateId: template.templateId,
@@ -691,7 +702,7 @@ var createCommand = new import_commander.Command("create").description("Create a
     );
   }
   const keySpinner = (0, import_ora2.default)("Creating API key...").start();
-  const keyResult = await apiRequest(`${baseURL}/api/cli/api-keys`, {
+  const keyResult = await apiRequest(`${BASE_URL}/api/cli/api-keys`, {
     method: "POST",
     body: JSON.stringify({
       organizationId: selectedOrg.id,
@@ -703,21 +714,21 @@ var createCommand = new import_commander.Command("create").description("Create a
     console.log(import_chalk3.default.dim(keyResult.error));
     console.log(import_chalk3.default.dim("You can create one manually in the dashboard"));
   } else {
-    writeApiKeyToEnv(dest, keyResult.data.apiKey, auth.environment);
+    writeApiKeyToEnv(dest, keyResult.data.apiKey);
     keySpinner.succeed("API key created and saved to .env");
   }
-  linkProject(dest, selectedOrg.id, selectedOrg.name, auth.environment);
+  linkProject(dest, selectedOrg.id, selectedOrg.name);
   if (shouldInstallSkills) {
     await installSkills(dest);
   }
   console.log(import_chalk3.default.green(`
 \u2713 Created ${projectName}`));
   console.log(import_chalk3.default.dim(`  Template: ${template.name}`));
-  console.log(import_chalk3.default.dim(`  Organization: ${selectedOrg.name}`));
+  console.log(import_chalk3.default.dim(`  Organization: ${selectedOrg.name} \xB7 sandbox`));
   console.log();
-  console.log(`  ${import_chalk3.default.cyan("cd")} ${projectName}`);
-  console.log(`  ${import_chalk3.default.cyan("npm install")}`);
-  console.log(`  ${import_chalk3.default.cyan("npm run dev")}`);
+  console.log(`  ${commetColor("cd")} ${projectName}`);
+  console.log(`  ${commetColor("npm install")}`);
+  console.log(`  ${commetColor("npm run dev")}`);
   console.log();
 });
 
@@ -747,7 +758,7 @@ var infoCommand = new import_commander2.Command("info").description("Display inf
   console.log(import_chalk4.default.green("\nProject: Linked \u2713"));
   console.log(import_chalk4.default.dim("  Organization:"), projectConfig.orgName);
   console.log(import_chalk4.default.dim("  Organization ID:"), projectConfig.orgId);
-  console.log(import_chalk4.default.dim("  Environment:"), projectConfig.environment);
+  console.log(import_chalk4.default.dim("  Mode:"), projectConfig.mode);
   console.log(
     import_chalk4.default.dim("\nRun `commet pull` to generate type definitions\n")
   );
@@ -803,7 +814,7 @@ var linkCommand = new import_commander3.Command("link").description("Link this p
     const config = loadProjectConfig();
     console.log(import_chalk5.default.yellow("\u26A0 This project is already linked"));
     console.log(
-      import_chalk5.default.dim(`Organization: ${config?.orgName} (${config?.environment})`)
+      import_chalk5.default.dim(`Organization: ${config?.orgName} \xB7 ${config?.mode}`)
     );
     console.log(
       import_chalk5.default.dim(
@@ -813,15 +824,8 @@ var linkCommand = new import_commander3.Command("link").description("Link this p
     return;
   }
   const spinner = (0, import_ora3.default)("Fetching organizations...").start();
-  const auth = loadAuth();
-  if (!auth) {
-    spinner.fail("Authentication error");
-    console.log(import_chalk5.default.red("\u2717 Could not load authentication"));
-    return;
-  }
-  const baseURL = getBaseURL(auth.environment);
   const result = await apiRequest(
-    `${baseURL}/api/cli/organizations`
+    `${BASE_URL}/api/cli/organizations`
   );
   if (result.error || !result.data) {
     spinner.fail("Failed to fetch organizations");
@@ -843,7 +847,7 @@ var linkCommand = new import_commander3.Command("link").description("Link this p
     orgId = await (0, import_prompts2.select)({
       message: "Select organization:",
       choices: organizations.map((org) => ({
-        name: `${org.name} ${import_chalk5.default.dim(`(${org.slug})`)}`,
+        name: `${org.name} ${import_chalk5.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
         value: org.id
       })),
       theme: promptTheme
@@ -860,12 +864,13 @@ var linkCommand = new import_commander3.Command("link").description("Link this p
   saveProjectConfig({
     orgId: selectedOrg.id,
     orgName: selectedOrg.name,
-    environment: auth.environment
+    mode: selectedOrg.mode
   });
   const gitignoreResult = updateGitignore(".commet/");
   console.log(import_chalk5.default.green("\n\u2713 Project linked successfully"));
-  console.log(import_chalk5.default.dim(`Organization: ${selectedOrg.name}`));
-  console.log(import_chalk5.default.dim(`Environment: ${auth.environment}`));
+  console.log(
+    import_chalk5.default.dim(`Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
+  );
   if (gitignoreResult.success) {
     console.log(import_chalk5.default.green("\u2713 Updated .gitignore"));
   } else {
@@ -909,9 +914,8 @@ var listCommand = new import_commander4.Command("list").description("List featur
     return;
   }
   const spinner = (0, import_ora4.default)(`Fetching ${type}...`).start();
-  const baseURL = getBaseURL(projectConfig.environment);
   const result = await apiRequest(
-    `${baseURL}/api/cli/types?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/types?orgId=${projectConfig.orgId}`
   );
   if (result.error || !result.data) {
     spinner.fail(`Failed to fetch ${type}`);
@@ -983,7 +987,6 @@ var listCommand = new import_commander4.Command("list").description("List featur
 });
 
 // src/commands/login.ts
-var import_prompts3 = require("@inquirer/prompts");
 var import_chalk7 = __toESM(require("chalk"));
 var import_commander5 = require("commander");
 var loginCommand = new import_commander5.Command("login").description("Authenticate with Commet").action(async () => {
@@ -996,28 +999,7 @@ var loginCommand = new import_commander5.Command("login").description("Authentic
     );
     return;
   }
-  let environment;
-  try {
-    environment = await (0, import_prompts3.select)({
-      message: "Select environment to login:",
-      choices: [
-        {
-          name: `Sandbox ${import_chalk7.default.dim("(Development)")}`,
-          value: "sandbox"
-        },
-        {
-          name: "Production",
-          value: "production"
-        }
-      ],
-      default: "sandbox",
-      theme: promptTheme
-    });
-  } catch {
-    console.log(import_chalk7.default.yellow("\n\u26A0 Login cancelled"));
-    return;
-  }
-  const success = await performLogin(environment);
+  const success = await performLogin();
   if (success) {
     console.log(import_chalk7.default.green("\n\u2713 Authentication complete"));
     console.log(
@@ -1169,9 +1151,8 @@ var pullCommand = new import_commander7.Command("pull").description("Pull type d
     return;
   }
   const spinner = (0, import_ora5.default)("Fetching type definitions...").start();
-  const baseURL = getBaseURL(projectConfig.environment);
   const result = await apiRequest(
-    `${baseURL}/api/cli/types?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/types?orgId=${projectConfig.orgId}`
   );
   if (result.error || !result.data) {
     spinner.fail("Failed to fetch types");
@@ -1241,7 +1222,7 @@ Output: ${outputPath}`));
 });
 
 // src/commands/switch.ts
-var import_prompts4 = require("@inquirer/prompts");
+var import_prompts3 = require("@inquirer/prompts");
 var import_chalk10 = __toESM(require("chalk"));
 var import_commander8 = require("commander");
 var import_ora6 = __toESM(require("ora"));
@@ -1259,15 +1240,8 @@ var switchCommand = new import_commander8.Command("switch").description("Switch
     return;
   }
   const spinner = (0, import_ora6.default)("Fetching organizations...").start();
-  const auth = loadAuth();
-  if (!auth) {
-    spinner.fail("Authentication error");
-    console.log(import_chalk10.default.red("\u2717 Could not load authentication"));
-    return;
-  }
-  const baseURL = getBaseURL(auth.environment);
   const result = await apiRequest(
-    `${baseURL}/api/cli/organizations`
+    `${BASE_URL}/api/cli/organizations`
   );
   if (result.error || !result.data) {
     spinner.fail("Failed to fetch organizations");
@@ -1283,10 +1257,10 @@ var switchCommand = new import_commander8.Command("switch").description("Switch
   spinner.stop();
   let orgId;
   try {
-    orgId = await (0, import_prompts4.select)({
+    orgId = await (0, import_prompts3.select)({
       message: "Select organization:",
       choices: organizations.map((org) => ({
-        name: `${org.name} ${import_chalk10.default.dim(`(${org.slug})`)}`,
+        name: `${org.name} ${import_chalk10.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
         value: org.id
       })),
       theme: promptTheme
@@ -1303,12 +1277,13 @@ var switchCommand = new import_commander8.Command("switch").description("Switch
   saveProjectConfig({
     orgId: selectedOrg.id,
     orgName: selectedOrg.name,
-    environment: auth.environment
+    mode: selectedOrg.mode
   });
   console.log(import_chalk10.default.green("\n\u2713 Switched organization successfully!"));
-  console.log(import_chalk10.default.dim("\nNew configuration:"));
-  console.log(import_chalk10.default.dim(`  Organization: ${selectedOrg.name}`));
-  console.log(import_chalk10.default.dim(`  Environment: ${auth.environment}`));
+  console.log(
+    import_chalk10.default.dim(`
+Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
+  );
   console.log(
     import_chalk10.default.dim(
       "\nRun `commet pull` to update TypeScript types for this organization"
@@ -1348,7 +1323,7 @@ var whoamiCommand = new import_commander10.Command("whoami").description("Displa
   if (projectConfig) {
     console.log(import_chalk12.default.bold("\nProject:"));
     console.log(import_chalk12.default.dim("Organization:"), projectConfig.orgName);
-    console.log(import_chalk12.default.dim("Environment:"), projectConfig.environment);
+    console.log(import_chalk12.default.dim("Mode:"), projectConfig.mode);
   } else {
     console.log(import_chalk12.default.yellow("\n\u26A0 No project linked"));
     console.log(
@@ -1379,7 +1354,8 @@ try {
   program.parse(process.argv);
 } catch (error) {
   if (error instanceof Error) {
-    if (error.message.includes("outputHelp")) {
+    const code = error.code;
+    if (code === "commander.version" || code === "commander.help" || code === "commander.helpDisplayed") {
       process.exit(0);
     }
     console.error(import_chalk13.default.red("Error:"), error.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commet",
-  "version": "1.5.0",
+  "version": "1.7.0",
   "description": "Commet CLI - Manage your billing platform from the command line",
   "bin": {
     "commet": "./bin/commet"