commet 2.2.0 → 2.2.1

package/dist/index.js

@@ -30,7 +30,7 @@ var import_commander11 = require("commander");
 // package.json
 var package_default = {
   name: "commet",
-  version: "2.2.0",
+  version: "2.2.1",
   description: "Commet CLI - Manage your billing platform from the command line",
   bin: {
     commet: "./bin/commet"
@@ -91,7 +91,9 @@ var package_default = {
 // src/commands/api-key.ts
 var import_chalk2 = __toESM(require("chalk"));
 var import_commander = require("commander");
-var import_ora = __toESM(require("ora"));
+
+// src/utils/output.ts
+var import_chalk = __toESM(require("chalk"));
 
 // src/utils/config.ts
 var fs = __toESM(require("fs"));
@@ -161,7 +163,7 @@ function clearProjectConfig() {
 }
 
 // src/utils/telemetry.ts
-var CLI_VERSION = true ? "2.2.0" : "0.0.0";
+var CLI_VERSION = true ? "2.2.1" : "0.0.0";
 var TELEMETRY_URL = "https://commet.co/api/cli/telemetry";
 function detectRuntime() {
   if ("Bun" in globalThis) {
@@ -298,54 +300,7 @@ function installCrashHandler() {
   });
 }
 
-// src/utils/api.ts
-var BASE_URL = "https://commet.co";
-async function apiRequest(endpoint, options = {}) {
-  const apiKey = process.env.COMMET_API_KEY;
-  const auth = apiKey ? null : loadAuth();
-  if (!apiKey && !auth) {
-    return {
-      error: {
-        code: "auth_required",
-        message: "Not authenticated. Run `commet login` first."
-      }
-    };
-  }
-  try {
-    markApiRequest();
-    const response = await fetch(endpoint, {
-      ...options,
-      headers: {
-        ...options.headers,
-        "Content-Type": "application/json",
-        "User-Agent": getUserAgent(),
-        "commet-client-info": getClientInfoHeader(),
-        ...apiKey ? { "x-api-key": apiKey } : { Authorization: `Bearer ${auth.token}` }
-      }
-    });
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}));
-      return {
-        error: {
-          code: errorData.code ?? `http_${response.status}`,
-          message: errorData.message ?? errorData.error ?? `Request failed with status ${response.status}`
-        }
-      };
-    }
-    const data = await response.json();
-    return { data };
-  } catch (error) {
-    return {
-      error: {
-        code: "network_error",
-        message: error instanceof Error ? error.message : "Unknown error occurred"
-      }
-    };
-  }
-}
-
 // src/utils/output.ts
-var import_chalk = __toESM(require("chalk"));
 function isAgentMode(options) {
   if (options?.output === "agent") return true;
   const idx = process.argv.indexOf("--output");
@@ -391,103 +346,27 @@ function requireOrgContext() {
 }
 
 // src/commands/api-key.ts
-var apiKeyCommand = new import_commander.Command("api-key").description(
-  "Generate an API key for the linked organization. Use it in CI with COMMET_API_KEY env var."
-).option("--name <name>", "Name for the API key", "CLI").option(
-  "--output <format>",
-  "Output format: human (default) or agent",
-  "human"
-).addHelpText(
-  "after",
-  `
-Examples:
-  $ commet api-key                    Generate a key for the linked org
-  $ commet api-key --name "GitHub CI" Name it for easy identification
-  $ commet api-key --output agent     JSON output with the key
-
-Then use it in CI:
-  $ COMMET_API_KEY=ck_... commet push --yes
-`
-).action(async (options) => {
-  const agentMode = isAgentMode(options);
-  if (agentMode) {
+var apiKeyCommand = new import_commander.Command("api-key").description("Deprecated \u2014 use 'commet api-keys create' instead").allowUnknownOption().allowExcessArguments().helpOption(false).action((options) => {
+  if (isAgentMode(options)) {
     console.log(
       JSON.stringify({
         deprecated: true,
-        replacement: "commet api-keys create"
+        replacement: "commet api-keys create",
+        message: "This command has been removed. Use 'commet api-keys create' instead."
       })
     );
   } else {
+    console.log(import_chalk2.default.yellow("\n  \u26A0 'commet api-key' has been removed.\n"));
     console.log(
-      import_chalk2.default.yellow("\u26A0 Deprecated: use 'commet api-keys create' instead")
-    );
-  }
-  if (process.env.COMMET_API_KEY) {
-    exitWithError({
-      code: "invalid_context",
-      message: "Cannot create API keys while using COMMET_API_KEY",
-      action: "commet login"
-    });
-  }
-  requireAuth();
-  const projectConfig = loadProjectConfig();
-  if (!projectConfig) {
-    exitWithError({
-      code: "project_not_linked",
-      message: "No organization linked",
-      action: "commet link"
-    });
-  }
-  const spinner = agentMode ? null : (0, import_ora.default)("Generating API key...").start();
-  const result = await apiRequest(
-    `${BASE_URL}/api/cli/api-keys`,
-    {
-      method: "POST",
-      body: JSON.stringify({
-        organizationId: projectConfig.orgId,
-        name: options.name
-      })
-    }
-  );
-  if (result.error || !result.data) {
-    if (agentMode) {
-      console.log(JSON.stringify({ error: result.error }));
-    } else {
-      spinner?.fail("Failed to create API key");
-      console.error(import_chalk2.default.red("Error:"), result.error?.message);
-    }
-    process.exit(1);
-  }
-  const { apiKey } = result.data;
-  const isLive = projectConfig.mode === "live";
-  if (agentMode) {
-    console.log(
-      JSON.stringify({
-        success: true,
-        apiKey,
-        mode: projectConfig.mode,
-        ...isLive ? {
-          warning: "This is a live API key. Rotate it before using in production if generated by an agent."
-        } : {}
-      })
+      `  Use ${import_chalk2.default.bold("commet api-keys create --name <name>")} instead.
+`
     );
-    return;
-  }
-  spinner?.succeed("API key created");
-  console.log("");
-  console.log(`  ${import_chalk2.default.bold(apiKey)}`);
-  console.log("");
-  console.log(import_chalk2.default.yellow("  \u26A0 This key is shown only once \u2014 copy it now."));
-  if (isLive) {
     console.log(
-      import_chalk2.default.yellow(
-        "  \u26A0 This is a live key. Rotate it from the dashboard before production use."
-      )
+      `  Run ${import_chalk2.default.dim("commet api-keys --help")} for all options.
+`
     );
   }
-  console.log(
-    import_chalk2.default.dim("\n  Use in CI: COMMET_API_KEY=<key> commet push --yes")
-  );
+  process.exit(0);
 });
 
 // src/commands/create.ts
@@ -498,13 +377,59 @@ var path2 = __toESM(require("path"));
 var import_prompts = require("@inquirer/prompts");
 var import_chalk5 = __toESM(require("chalk"));
 var import_commander2 = require("commander");
-var import_ora3 = __toESM(require("ora"));
+var import_ora2 = __toESM(require("ora"));
 var import_tar = require("tar");
 
+// src/utils/api.ts
+var BASE_URL = "https://commet.co";
+async function apiRequest(endpoint, options = {}) {
+  const apiKey = process.env.COMMET_API_KEY;
+  const auth = apiKey ? null : loadAuth();
+  if (!apiKey && !auth) {
+    return {
+      error: {
+        code: "auth_required",
+        message: "Not authenticated. Run `commet login` first."
+      }
+    };
+  }
+  try {
+    markApiRequest();
+    const response = await fetch(endpoint, {
+      ...options,
+      headers: {
+        ...options.headers,
+        "Content-Type": "application/json",
+        "User-Agent": getUserAgent(),
+        "commet-client-info": getClientInfoHeader(),
+        ...apiKey ? { "x-api-key": apiKey } : { Authorization: `Bearer ${auth.token}` }
+      }
+    });
+    if (!response.ok) {
+      const errorData = await response.json().catch(() => ({}));
+      return {
+        error: {
+          code: errorData.code ?? `http_${response.status}`,
+          message: errorData.message ?? errorData.error ?? `Request failed with status ${response.status}`
+        }
+      };
+    }
+    const data = await response.json();
+    return { data };
+  } catch (error) {
+    return {
+      error: {
+        code: "network_error",
+        message: error instanceof Error ? error.message : "Unknown error occurred"
+      }
+    };
+  }
+}
+
 // src/utils/login-flow.ts
 var import_chalk4 = __toESM(require("chalk"));
 var import_open = __toESM(require("open"));
-var import_ora2 = __toESM(require("ora"));
+var import_ora = __toESM(require("ora"));
 
 // src/utils/prompt-theme.ts
 var import_chalk3 = __toESM(require("chalk"));
@@ -527,7 +452,7 @@ function sleep(ms) {
   return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function performLogin() {
-  const spinner = (0, import_ora2.default)("Initiating login flow...").start();
+  const spinner = (0, import_ora.default)("Initiating login flow...").start();
   try {
     const deviceResponse = await fetch(`${BASE_URL}/api/auth/device/code`, {
       method: "POST",
@@ -560,7 +485,7 @@ async function performLogin() {
     } catch {
       console.log(import_chalk4.default.yellow("\u26A0 Could not open browser automatically."));
     }
-    const pollSpinner = (0, import_ora2.default)("Waiting for authorization...").start();
+    const pollSpinner = (0, import_ora.default)("Waiting for authorization...").start();
     let pollingInterval = interval;
     let attempts = 0;
     const maxAttempts = Math.floor(180 / pollingInterval);
@@ -864,7 +789,7 @@ var createCommand = new import_commander2.Command("create").description("Create
       return;
     }
   }
-  const orgsSpinner = (0, import_ora3.default)("Fetching sandbox organizations...").start();
+  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");
@@ -958,7 +883,7 @@ var createCommand = new import_commander2.Command("create").description("Create
     }
   }
   const shouldInstallSkills = await resolveSkills(opts);
-  const downloadSpinner = (0, import_ora3.default)("Downloading template...").start();
+  const downloadSpinner = (0, import_ora2.default)("Downloading template...").start();
   try {
     await downloadTemplate(template.dir, dest, opts.ref);
     downloadSpinner.succeed("Template downloaded");
@@ -974,7 +899,7 @@ var createCommand = new import_commander2.Command("create").description("Create
   }
   updatePackageJson(dest, projectName);
   copyEnvExample(dest);
-  const resolveSpinner = (0, import_ora3.default)("Resolving package versions...").start();
+  const resolveSpinner = (0, import_ora2.default)("Resolving package versions...").start();
   try {
     const count = await resolveWorkspaceDeps(dest);
     if (count > 0) {
@@ -992,7 +917,7 @@ var createCommand = new import_commander2.Command("create").description("Create
     }
     return;
   }
-  const planSpinner = (0, import_ora3.default)("Creating plans...").start();
+  const planSpinner = (0, import_ora2.default)("Creating plans...").start();
   const templateResult = await apiRequest(`${BASE_URL}/api/cli/templates`, {
     method: "POST",
     body: JSON.stringify({
@@ -1008,7 +933,7 @@ var createCommand = new import_commander2.Command("create").description("Create
       `Created ${templateResult.data.plansCreated} plans and ${templateResult.data.featuresCreated} features`
     );
   }
-  const keySpinner = (0, import_ora3.default)("Creating API key...").start();
+  const keySpinner = (0, import_ora2.default)("Creating API key...").start();
   const keyResult = await apiRequest(`${BASE_URL}/api/cli/api-keys`, {
     method: "POST",
     body: JSON.stringify({
@@ -1043,7 +968,7 @@ var createCommand = new import_commander2.Command("create").description("Create
 var import_prompts2 = require("@inquirer/prompts");
 var import_chalk6 = __toESM(require("chalk"));
 var import_commander3 = require("commander");
-var import_ora4 = __toESM(require("ora"));
+var import_ora3 = __toESM(require("ora"));
 
 // src/utils/gitignore-updater.ts
 var fs3 = __toESM(require("fs"));
@@ -1126,7 +1051,7 @@ Examples:
     });
   }
   const currentConfig = projectConfigExists() ? loadProjectConfig() : null;
-  const spinner = agentMode ? null : (0, import_ora4.default)("Fetching organizations...").start();
+  const spinner = agentMode ? null : (0, import_ora3.default)("Fetching organizations...").start();
   const result = await apiRequest(
     `${BASE_URL}/api/cli/organizations`
   );
@@ -1556,7 +1481,7 @@ var logoutCommand = new import_commander6.Command("logout").description(
 // src/commands/orgs.ts
 var import_chalk10 = __toESM(require("chalk"));
 var import_commander7 = require("commander");
-var import_ora5 = __toESM(require("ora"));
+var import_ora4 = __toESM(require("ora"));
 var orgsCommand = new import_commander7.Command("orgs").description(
   "List all organizations you have access to. Shows name, slug, mode (live/sandbox), and which one is currently linked."
 ).option(
@@ -1575,7 +1500,7 @@ The slug shown here is what you pass to 'commet link --org <slug>'.
 ).action(async (options) => {
   const agentMode = isAgentMode(options);
   requireAuth();
-  const spinner = agentMode ? null : (0, import_ora5.default)("Fetching organizations...").start();
+  const spinner = agentMode ? null : (0, import_ora4.default)("Fetching organizations...").start();
   const result = await apiRequest(
     `${BASE_URL}/api/cli/organizations`
   );
@@ -1622,7 +1547,7 @@ var path5 = __toESM(require("path"));
 var import_prompts3 = require("@inquirer/prompts");
 var import_chalk12 = __toESM(require("chalk"));
 var import_commander8 = require("commander");
-var import_ora6 = __toESM(require("ora"));
+var import_ora5 = __toESM(require("ora"));
 
 // src/utils/config-loader.ts
 var fs4 = __toESM(require("fs"));
@@ -1960,7 +1885,7 @@ Examples:
 ).action(async (options) => {
   const agentMode = isAgentMode(options);
   const { orgId } = requireOrgContext();
-  const spinner = agentMode ? null : (0, import_ora6.default)("Fetching config from remote...").start();
+  const spinner = agentMode ? null : (0, import_ora5.default)("Fetching config from remote...").start();
   const orgQuery = orgId === "__from_api_key__" ? "" : `?orgId=${orgId}`;
   const result = await apiRequest(
     `${BASE_URL}/api/cli/pull${orgQuery}`
@@ -2174,7 +2099,7 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
 var import_prompts4 = require("@inquirer/prompts");
 var import_chalk13 = __toESM(require("chalk"));
 var import_commander9 = require("commander");
-var import_ora7 = __toESM(require("ora"));
+var import_ora6 = __toESM(require("ora"));
 var pushCommand = new import_commander9.Command("push").description(
   "Push your local commet.config.ts to Commet. Creates or updates features and plans to match your config file."
 ).option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show what would change without pushing").option(
@@ -2194,7 +2119,7 @@ Examples:
 ).action(async (options) => {
   const agentMode = isAgentMode(options);
   const { orgId } = requireOrgContext();
-  const loadSpinner = agentMode ? null : (0, import_ora7.default)("Loading commet.config.ts...").start();
+  const loadSpinner = agentMode ? null : (0, import_ora6.default)("Loading commet.config.ts...").start();
   const loaded = await loadBillingConfig(process.cwd()).catch(
     (error) => {
       const message = error instanceof Error ? error.message : String(error);
@@ -2214,7 +2139,7 @@ Examples:
   if (!loaded) process.exit(1);
   const { config, configPath } = loaded;
   loadSpinner?.succeed(`Loaded ${configPath}`);
-  const fetchSpinner = agentMode ? null : (0, import_ora7.default)("Fetching remote state...").start();
+  const fetchSpinner = agentMode ? null : (0, import_ora6.default)("Fetching remote state...").start();
   const orgQuery = orgId === "__from_api_key__" ? "" : `?orgId=${orgId}`;
   const remoteResult = await apiRequest(
     `${BASE_URL}/api/cli/pull${orgQuery}`
@@ -2294,7 +2219,7 @@ Examples:
       return;
     }
   }
-  const pushSpinner = agentMode ? null : (0, import_ora7.default)("Pushing config...").start();
+  const pushSpinner = agentMode ? null : (0, import_ora6.default)("Pushing config...").start();
   const pushBody = {
     config: { features: config.features, plans: config.plans }
   };
@@ -2363,7 +2288,7 @@ Examples:
 var import_node2 = require("@commet/node");
 var import_chalk14 = __toESM(require("chalk"));
 var import_commander10 = require("commander");
-var import_ora8 = __toESM(require("ora"));
+var import_ora7 = __toESM(require("ora"));
 
 // src/utils/sdk.ts
 var import_node = require("@commet/node");
@@ -2401,7 +2326,7 @@ function createResourceCommand(def) {
     }
     subcommand.action(async (options) => {
       const agentMode = isAgentMode(options);
-      const spinner = agentMode ? null : (0, import_ora8.default)(`Running ${def.name} ${actionName}...`).start();
+      const spinner = agentMode ? null : (0, import_ora7.default)(`Running ${def.name} ${actionName}...`).start();
       try {
         const client = createSdkClient();
         const resource = client[def.sdkProperty];
@@ -4912,7 +4837,7 @@ program.addCommand(orgsCommand);
 program.addCommand(pushCommand);
 program.addCommand(pullCommand);
 program.addCommand(listenCommand);
-program.addCommand(apiKeyCommand);
+program.addCommand(apiKeyCommand, { hidden: true });
 for (const def of resourceDefinitions) {
   program.addCommand(createResourceCommand(def));
 }
@@ -5018,10 +4943,6 @@ function printAgentInfo() {
         description: "Scaffold a new Commet app from template",
         usage: "commet create [name] -t <template> --org <slug> -y"
       },
-      "api-key": {
-        description: "Generate API key for CI",
-        usage: "commet api-key --output agent"
-      },
       login: {
         description: "Authenticate via browser. Requires a human \u2014 opens a device-code flow.",
         usage: "commet login"
@@ -5086,7 +5007,6 @@ function printDefaultScreen() {
   }
   console.log(dim("\n  Setup"));
   console.log(`    ${cmd("create")}${dim("Scaffold a new Commet app")}`);
-  console.log(`    ${cmd("api-key")}${dim("Generate API key for CI")}`);
   console.log(`    ${cmd("login")}${dim("Authenticate")}`);
   console.log(`    ${cmd("logout")}${dim("Log out")}`);
   console.log(

package/package.json

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