commet 2.2.8 → 3.0.0

package/README.md

@@ -46,12 +46,12 @@ const commet = new Commet({ apiKey: '...' });
 
 await commet.usage.track({
   feature: 'api_calls', // Autocomplete works!
-  externalId: 'user_123'
+  customerId: 'cus_123'
 });
 
 await commet.subscriptions.create({
   planCode: 'pro', // Autocomplete with your plans!
-  externalId: 'user_123'
+  customerId: 'cus_123'
 });
 ```
 
@@ -61,11 +61,13 @@ await commet.subscriptions.create({
 commet login           # Authenticate with Commet
 commet logout          # Remove credentials
 commet link            # Link project to organization
-commet pull            # Generate TypeScript types
-commet info            # Show project status
-commet list features   # List features
-commet list seats      # List seat types
-commet list plans      # List plans
+commet orgs            # List your organizations
+commet pull            # Fetch billing config and generate commet.config.ts
+commet push            # Push commet.config.ts to Commet
+commet listen <url>    # Forward webhook events to your local server
+commet features list   # List the feature catalog
+commet plans list      # List plans
+commet customers list  # List customers
 ```
 
 ## Documentation

package/dist/index.js

@@ -30,7 +30,7 @@ var import_commander11 = require("commander");
 // package.json
 var package_default = {
   name: "commet",
-  version: "2.2.8",
+  version: "3.0.0",
   description: "Commet CLI - Manage your billing platform from the command line",
   bin: {
     commet: "./bin/commet"
@@ -163,7 +163,7 @@ function clearProjectConfig() {
 }
 
 // src/utils/telemetry.ts
-var CLI_VERSION = true ? "2.2.8" : "0.0.0";
+var CLI_VERSION = true ? "3.0.0" : "0.0.0";
 var TELEMETRY_URL = "https://commet.co/api/cli/telemetry";
 function detectRuntime() {
   if ("Bun" in globalThis) {
@@ -1703,7 +1703,8 @@ function computeDiff(config, remote) {
     if (remotePlan.name !== localPlan.name) {
       changes.push(`name: "${remotePlan.name}" \u2192 "${localPlan.name}"`);
     }
-    const remoteDefaultInterval = remotePlan.defaultInterval ?? remotePlan.prices.find((p) => p.isDefault)?.billingInterval ?? null;
+    const remotePrices = remotePlan.prices ?? [];
+    const remoteDefaultInterval = remotePrices.find((p) => p.isDefault)?.billingInterval ?? null;
     if (localPlan.defaultInterval && remoteDefaultInterval !== localPlan.defaultInterval) {
       changes.push(
         `defaultInterval: "${remoteDefaultInterval ?? "none"}" \u2192 "${localPlan.defaultInterval}"`
@@ -1711,7 +1712,7 @@ function computeDiff(config, remote) {
     }
     const localPriceMap = new Map(localPlan.prices.map((p) => [p.interval, p]));
     const remotePriceMap = new Map(
-      remotePlan.prices.map((p) => [p.billingInterval, p])
+      remotePrices.map((p) => [p.billingInterval, p])
     );
     for (const [interval, localPrice] of localPriceMap) {
       const remotePrice = remotePriceMap.get(interval);
@@ -1727,7 +1728,7 @@ function computeDiff(config, remote) {
     }
     if (localPlan.features) {
       const remotePlanFeatureMap = new Map(
-        remotePlan.features.map((f) => [f.featureCode, f])
+        (remotePlan.features ?? []).map((f) => [f.code, f])
       );
       for (const featureCode of Object.keys(localPlan.features)) {
         if (!remotePlanFeatureMap.has(featureCode)) {
@@ -1818,7 +1819,7 @@ function generateConfigFile(features, plans) {
     if (p.sortOrder != null && p.sortOrder !== 0)
       lines.push(`      sortOrder: ${p.sortOrder},`);
     const prices = p.prices ?? [];
-    const defaultInterval = p.defaultInterval ?? prices.find((pr) => pr.isDefault)?.billingInterval ?? prices[0]?.billingInterval;
+    const defaultInterval = prices.find((pr) => pr.isDefault)?.billingInterval ?? prices[0]?.billingInterval;
     if (defaultInterval)
       lines.push(`      defaultInterval: "${defaultInterval}",`);
     if (prices.length === 0) {
@@ -1839,21 +1840,21 @@ function generateConfigFile(features, plans) {
     if (planFeatures.length > 0) {
       lines.push("      features: {");
       for (const pf of planFeatures) {
-        const featureDef = features.find((f) => f.code === pf.featureCode);
-        const isBoolean = featureDef?.type === "boolean";
-        if (isBoolean) {
-          lines.push(`        ${pf.featureCode}: ${pf.enabled ?? true},`);
+        const isSimpleBoolean = pf.includedAmount == null && !pf.unlimited && !pf.overage?.enabled;
+        if (isSimpleBoolean) {
+          lines.push(`        ${pf.code}: ${pf.enabled},`);
         } else {
           const parts = [];
-          if (pf.includedAmount) parts.push(`included: ${pf.includedAmount}`);
+          if (pf.includedAmount != null)
+            parts.push(`included: ${pf.includedAmount}`);
           if (pf.unlimited) parts.push("unlimited: true");
-          if (pf.overageEnabled && pf.overageUnitPrice) {
-            parts.push(`overage: { unitPrice: ${pf.overageUnitPrice} }`);
+          if (pf.overage?.enabled && pf.overage.unitPrice != null) {
+            parts.push(`overage: { unitPrice: ${pf.overage.unitPrice} }`);
           }
           if (parts.length > 0) {
-            lines.push(`        ${pf.featureCode}: { ${parts.join(", ")} },`);
+            lines.push(`        ${pf.code}: { ${parts.join(", ")} },`);
           } else {
-            lines.push(`        ${pf.featureCode}: {},`);
+            lines.push(`        ${pf.code}: {},`);
           }
         }
       }
@@ -1867,7 +1868,69 @@ function generateConfigFile(features, plans) {
   return lines.join("\n");
 }
 
+// src/utils/sdk.ts
+var import_node = require("@commet/node");
+function createSdkClient() {
+  const envKey = process.env.COMMET_API_KEY;
+  if (envKey) {
+    return new import_node.Commet({ apiKey: envKey });
+  }
+  const config = loadProjectConfig();
+  if (config?.apiKey) {
+    return new import_node.Commet({ apiKey: config.apiKey });
+  }
+  exitWithError({
+    code: "api_key_required",
+    message: "No API key found. Set COMMET_API_KEY env var, or run `commet link` to auto-generate one.",
+    action: "commet link"
+  });
+}
+async function fetchRemoteState(commet) {
+  const featuresResponse = await commet.features.list();
+  if (!featuresResponse.success || !featuresResponse.data) {
+    return {
+      error: {
+        code: "fetch_features_failed",
+        message: featuresResponse.error?.message ?? "Failed to fetch features"
+      }
+    };
+  }
+  const plansResponse = await commet.plans.list({ includePrivate: "true" });
+  if (!plansResponse.success || !plansResponse.data) {
+    return {
+      error: {
+        code: "fetch_plans_failed",
+        message: plansResponse.error?.message ?? "Failed to fetch plans"
+      }
+    };
+  }
+  return { features: featuresResponse.data, plans: plansResponse.data };
+}
+
 // src/commands/pull.ts
+function toFeatureDef(feature) {
+  if (feature.type === "boolean") {
+    return {
+      name: feature.name,
+      type: "boolean",
+      ...feature.description ? { description: feature.description } : {}
+    };
+  }
+  if (feature.type === "seats") {
+    return {
+      name: feature.name,
+      type: "seats",
+      ...feature.unitName ? { unitName: feature.unitName } : {},
+      ...feature.description ? { description: feature.description } : {}
+    };
+  }
+  return {
+    name: feature.name,
+    type: "usage",
+    ...feature.unitName ? { unitName: feature.unitName } : {},
+    ...feature.description ? { description: feature.description } : {}
+  };
+}
 var pullCommand = new import_commander8.Command("pull").description(
   "Fetch your billing config from Commet and generate (or update) commet.config.ts with features and plans."
 ).option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show what would change without writing any files").option(
@@ -1886,23 +1949,21 @@ Examples:
 `
 ).action(async (options) => {
   const agentMode = isAgentMode(options);
-  const { orgId } = requireOrgContext();
+  requireOrgContext();
   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}`
-  );
-  if (result.error || !result.data) {
+  const commet = createSdkClient();
+  const remoteState = await fetchRemoteState(commet);
+  if ("error" in remoteState) {
     if (agentMode) {
-      console.log(JSON.stringify({ error: result.error }));
+      console.log(JSON.stringify({ error: remoteState.error }));
     } else {
       spinner?.fail("Failed to fetch config");
-      console.error(import_chalk12.default.red("Error:"), result.error?.message);
+      console.error(import_chalk12.default.red("Error:"), remoteState.error.message);
     }
     process.exit(1);
   }
   spinner?.succeed("Remote state fetched");
-  const { features, plans } = result.data;
+  const { features, plans } = remoteState;
   const configContent = generateConfigFile(features, plans);
   const outputPath = path5.resolve(process.cwd(), "commet.config.ts");
   const existingConfigPath = findConfigFile(process.cwd());
@@ -1993,15 +2054,7 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
   const localConfig = localLoaded.config;
   const remoteAsConfig = {
     features: Object.fromEntries(
-      features.map((f) => [
-        f.code,
-        {
-          name: f.name,
-          type: f.type,
-          ...f.unitName ? { unitName: f.unitName } : {},
-          ...f.description ? { description: f.description } : {}
-        }
-      ])
+      features.map((f) => [f.code, toFeatureDef(f)])
     ),
     plans: Object.fromEntries(
       plans.map((p) => [
@@ -2033,24 +2086,18 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
       code,
       name: f.name,
       type: f.type,
-      description: f.description ?? null,
-      unitName: f.unitName ?? null
+      unitName: "unitName" in f ? f.unitName ?? null : null
     })),
     plans: Object.entries(localConfig.plans).map(([code, p]) => ({
       code,
       name: p.name,
-      description: p.description ?? null,
-      consumptionModel: p.consumptionModel ?? null,
-      defaultInterval: p.defaultInterval ?? null,
-      isFree: p.isFree,
-      isPublic: p.isPublic,
-      sortOrder: p.sortOrder,
       prices: p.prices.map((pr) => ({
         billingInterval: pr.interval,
-        price: pr.amount,
-        trialDays: pr.trialDays ?? null
+        price: pr.amount
       })),
-      features: []
+      features: p.features ? Object.keys(p.features).map((featureCode) => ({
+        code: featureCode
+      })) : []
     }))
   };
   const diff = computeDiff(remoteAsConfig, localAsRemote);
@@ -2142,25 +2189,19 @@ Examples:
   const { config, configPath } = loaded;
   loadSpinner?.succeed(`Loaded ${configPath}`);
   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}`
-  );
-  if (remoteResult.error || !remoteResult.data) {
+  const commet = createSdkClient();
+  const remoteState = await fetchRemoteState(commet);
+  if ("error" in remoteState) {
     if (agentMode) {
-      console.log(JSON.stringify({ error: remoteResult.error }));
+      console.log(JSON.stringify({ error: remoteState.error }));
     } else {
       fetchSpinner?.fail("Failed to fetch remote state");
-      console.error(import_chalk13.default.red("Error:"), remoteResult.error?.message);
+      console.error(import_chalk13.default.red("Error:"), remoteState.error.message);
     }
     process.exit(1);
   }
   fetchSpinner?.succeed("Remote state fetched");
-  const remote = {
-    features: remoteResult.data.features,
-    plans: remoteResult.data.plans
-  };
-  const diff = computeDiff(config, remote);
+  const diff = computeDiff(config, remoteState);
   if (agentMode) {
     if (options.dryRun) {
       console.log(JSON.stringify({ diff, applied: false }));
@@ -2291,26 +2332,6 @@ var import_node2 = require("@commet/node");
 var import_chalk14 = __toESM(require("chalk"));
 var import_commander10 = require("commander");
 var import_ora7 = __toESM(require("ora"));
-
-// src/utils/sdk.ts
-var import_node = require("@commet/node");
-function createSdkClient() {
-  const envKey = process.env.COMMET_API_KEY;
-  if (envKey) {
-    return new import_node.Commet({ apiKey: envKey });
-  }
-  const config = loadProjectConfig();
-  if (config?.apiKey) {
-    return new import_node.Commet({ apiKey: config.apiKey });
-  }
-  exitWithError({
-    code: "api_key_required",
-    message: "No API key found. Set COMMET_API_KEY env var, or run `commet link` to auto-generate one.",
-    action: "commet link"
-  });
-}
-
-// src/commands/resources/factory.ts
 function createResourceCommand(def) {
   const command = new import_commander10.Command(def.name).description(def.description);
   for (const [actionName, actionDef] of Object.entries(def.actions)) {
@@ -3464,19 +3485,18 @@ var plansResource = {
 };
 var featuresResource = {
   name: "features",
-  description: "Manage features and check feature access",
+  description: "Manage the feature catalog",
   sdkProperty: "features",
   actions: {
+    list: {
+      method: "list",
+      description: "List every feature in the organization catalog",
+      params: []
+    },
     get: {
       method: "get",
-      description: "Get feature access for a customer",
+      description: "Get a feature definition from the catalog by code",
       params: [
-        {
-          flag: "--customer-id <id>",
-          description: "Customer ID",
-          required: true,
-          sdkKey: "customerId"
-        },
         {
           flag: "--code <code>",
           description: "Feature code",
@@ -3485,36 +3505,6 @@ var featuresResource = {
         }
       ]
     },
-    "can-use": {
-      method: "canUse",
-      description: "Check if a customer can use a feature",
-      params: [
-        {
-          flag: "--customer-id <id>",
-          description: "Customer ID",
-          required: true,
-          sdkKey: "customerId"
-        },
-        {
-          flag: "--code <code>",
-          description: "Feature code",
-          required: true,
-          sdkKey: "code"
-        }
-      ]
-    },
-    list: {
-      method: "list",
-      description: "List features for a customer",
-      params: [
-        {
-          flag: "--customer-id <id>",
-          description: "Customer ID",
-          required: true,
-          sdkKey: "customerId"
-        }
-      ]
-    },
     create: {
       method: "create",
       description: "Create a feature",
@@ -3590,6 +3580,61 @@ var featuresResource = {
     }
   }
 };
+var featureAccessResource = {
+  name: "feature-access",
+  description: "Check a customer's feature access and usage",
+  sdkProperty: "featureAccess",
+  actions: {
+    list: {
+      method: "list",
+      description: "List feature access for a customer",
+      params: [
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID",
+          required: true,
+          sdkKey: "customerId"
+        }
+      ]
+    },
+    get: {
+      method: "get",
+      description: "Get feature access details for a customer",
+      params: [
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID",
+          required: true,
+          sdkKey: "customerId"
+        },
+        {
+          flag: "--code <code>",
+          description: "Feature code",
+          required: true,
+          sdkKey: "code"
+        }
+      ]
+    },
+    "can-use": {
+      method: "canUse",
+      description: "Check if a customer can use one more unit of a feature",
+      params: [
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID",
+          required: true,
+          sdkKey: "customerId"
+        },
+        {
+          flag: "--code <code>",
+          description: "Feature code",
+          required: true,
+          sdkKey: "code"
+        }
+      ]
+    }
+  }
+};
 var seatsResource = {
   name: "seats",
   description: "Manage seat allocations",
@@ -4784,11 +4829,291 @@ var planGroupsResource = {
     }
   }
 };
+var payoutsResource = {
+  name: "payouts",
+  description: "Manage payouts",
+  sdkProperty: "payouts",
+  actions: {
+    request: {
+      method: "request",
+      description: "Request a payout of available balance",
+      params: [
+        {
+          flag: "--amount <n>",
+          description: "Amount in cents (USD, minimum 1000)",
+          required: true,
+          parse: parseNumber,
+          sdkKey: "amount"
+        },
+        {
+          flag: "--description <desc>",
+          description: "Payout description",
+          sdkKey: "description"
+        }
+      ]
+    },
+    "add-bank-account": {
+      method: "addBankAccount",
+      description: "Add a destination bank account to the payout account",
+      params: [
+        {
+          flag: "--account-number <number>",
+          description: "Bank account number",
+          required: true,
+          sdkKey: "accountNumber"
+        },
+        {
+          flag: "--account-holder-name <name>",
+          description: "Account holder name",
+          required: true,
+          sdkKey: "accountHolderName"
+        },
+        {
+          flag: "--routing-number <number>",
+          description: "Routing number",
+          sdkKey: "routingNumber"
+        },
+        {
+          flag: "--account-type <type>",
+          description: "Account type: checking or savings",
+          sdkKey: "accountType"
+        },
+        {
+          flag: "--set-default <bool>",
+          description: "Set as default bank account",
+          parse: parseBool,
+          sdkKey: "setDefault"
+        }
+      ]
+    },
+    "complete-verification": {
+      method: "completeVerification",
+      description: "Provision the payout account with the full KYC payload",
+      params: [
+        {
+          flag: "--email <email>",
+          description: "Contact email",
+          required: true,
+          sdkKey: "email"
+        },
+        {
+          flag: "--business-type <type>",
+          description: "Business type: individual or company",
+          required: true,
+          sdkKey: "businessType"
+        },
+        {
+          flag: "--business-url <url>",
+          description: "Business website URL",
+          required: true,
+          sdkKey: "businessUrl"
+        },
+        {
+          flag: "--document-url <url>",
+          description: "Identity document URL",
+          required: true,
+          sdkKey: "documentUrl"
+        },
+        {
+          flag: "--bank <json>",
+          description: "Bank account (JSON: {accountNumber, accountHolderName, ...})",
+          required: true,
+          parse: parseJson,
+          sdkKey: "bank"
+        },
+        {
+          flag: "--individual <json>",
+          description: "Individual KYC details (JSON, individual businesses)",
+          parse: parseJson,
+          sdkKey: "individual"
+        },
+        {
+          flag: "--company <json>",
+          description: "Company KYC details (JSON, company businesses)",
+          parse: parseJson,
+          sdkKey: "company"
+        }
+      ]
+    }
+  }
+};
+var testClockResource = {
+  name: "test-clock",
+  description: "Control the sandbox test clock",
+  sdkProperty: "testClock",
+  actions: {
+    get: {
+      method: "get",
+      description: "Get the current test clock state (sandbox only)",
+      params: []
+    },
+    advance: {
+      method: "advance",
+      description: "Move the test clock forward (sandbox only)",
+      params: [
+        {
+          flag: "--advance-days <n>",
+          description: "Days to move the clock forward",
+          parse: parseNumber,
+          sdkKey: "advanceDays"
+        },
+        {
+          flag: "--frozen-time <ts>",
+          description: "Absolute instant to move to (ISO 8601)",
+          sdkKey: "frozenTime"
+        }
+      ]
+    },
+    "process-billing": {
+      method: "processBilling",
+      description: "Enqueue billing cycles for customers due at the simulated time (sandbox only)",
+      params: []
+    }
+  }
+};
+var quotaResource = {
+  name: "quota",
+  description: "Manage quota allowances",
+  sdkProperty: "quota",
+  actions: {
+    add: {
+      method: "add",
+      description: "Add to a customer's quota allowance for a feature",
+      params: [
+        {
+          flag: "--feature-code <code>",
+          description: "Feature code",
+          required: true,
+          sdkKey: "featureCode"
+        },
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID (provide this or --external-id)",
+          sdkKey: "customerId"
+        },
+        {
+          flag: "--external-id <id>",
+          description: "Customer external ID (provide this or --customer-id)",
+          sdkKey: "externalId"
+        },
+        {
+          flag: "--count <n>",
+          description: "Amount to add (defaults to 1)",
+          parse: parseNumber,
+          sdkKey: "count"
+        },
+        {
+          flag: "--idempotency-key <key>",
+          description: "Idempotency key for deduplication",
+          sdkKey: "idempotencyKey"
+        }
+      ]
+    },
+    set: {
+      method: "set",
+      description: "Set a customer's quota allowance to an exact value",
+      params: [
+        {
+          flag: "--feature-code <code>",
+          description: "Feature code",
+          required: true,
+          sdkKey: "featureCode"
+        },
+        {
+          flag: "--count <n>",
+          description: "Exact allowance value",
+          required: true,
+          parse: parseNumber,
+          sdkKey: "count"
+        },
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID (provide this or --external-id)",
+          sdkKey: "customerId"
+        },
+        {
+          flag: "--external-id <id>",
+          description: "Customer external ID (provide this or --customer-id)",
+          sdkKey: "externalId"
+        },
+        {
+          flag: "--idempotency-key <key>",
+          description: "Idempotency key for deduplication",
+          sdkKey: "idempotencyKey"
+        }
+      ]
+    },
+    remove: {
+      method: "remove",
+      description: "Remove from a customer's quota allowance for a feature",
+      params: [
+        {
+          flag: "--feature-code <code>",
+          description: "Feature code",
+          required: true,
+          sdkKey: "featureCode"
+        },
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID (provide this or --external-id)",
+          sdkKey: "customerId"
+        },
+        {
+          flag: "--external-id <id>",
+          description: "Customer external ID (provide this or --customer-id)",
+          sdkKey: "externalId"
+        },
+        {
+          flag: "--count <n>",
+          description: "Amount to remove (defaults to 1)",
+          parse: parseNumber,
+          sdkKey: "count"
+        },
+        {
+          flag: "--idempotency-key <key>",
+          description: "Idempotency key for deduplication",
+          sdkKey: "idempotencyKey"
+        }
+      ]
+    },
+    get: {
+      method: "get",
+      description: "Get the quota allowance for a specific feature",
+      params: [
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID",
+          required: true,
+          sdkKey: "customerId"
+        },
+        {
+          flag: "--feature-code <code>",
+          description: "Feature code",
+          required: true,
+          sdkKey: "featureCode"
+        }
+      ]
+    },
+    "get-all": {
+      method: "getAll",
+      description: "Get all quota allowances for a customer",
+      params: [
+        {
+          flag: "--customer-id <id>",
+          description: "Customer ID",
+          required: true,
+          sdkKey: "customerId"
+        }
+      ]
+    }
+  }
+};
 var resourceDefinitions = [
   customersResource,
   subscriptionsResource,
   plansResource,
   featuresResource,
+  featureAccessResource,
   seatsResource,
   usageResource,
   portalResource,
@@ -4799,7 +5124,10 @@ var resourceDefinitions = [
   invoicesResource,
   transactionsResource,
   promoCodesResource,
-  planGroupsResource
+  planGroupsResource,
+  payoutsResource,
+  testClockResource,
+  quotaResource
 ];
 
 // src/utils/update-check.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commet",
-  "version": "2.2.8",
+  "version": "3.0.0",
   "description": "Commet CLI - Manage your billing platform from the command line",
   "bin": {
     "commet": "./bin/commet"
@@ -28,7 +28,7 @@
     "open": "11.0.0",
     "ora": "9.4.0",
     "tar": "^7.5.13",
-    "@commet/node": "5.5.1"
+    "@commet/node": "7.0.0"
   },
   "devDependencies": {
     "@types/node": "24.12.4",