commet 1.9.0 → 1.10.0

package/dist/index.js

@@ -24,13 +24,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var import_chalk14 = __toESM(require("chalk"));
-var import_commander12 = require("commander");
+var import_chalk16 = __toESM(require("chalk"));
+var import_commander13 = require("commander");
 
 // package.json
 var package_default = {
   name: "commet",
-  version: "1.9.0",
+  version: "1.10.0",
   description: "Commet CLI - Manage your billing platform from the command line",
   bin: {
     commet: "./bin/commet"
@@ -57,17 +57,18 @@ var package_default = {
   author: "Commet Team",
   license: "MIT",
   dependencies: {
-    "@inquirer/prompts": "8.0.1",
+    "@inquirer/prompts": "8.4.3",
     ably: "^2.21.0",
     chalk: "5.6.2",
-    commander: "14.0.2",
+    commander: "14.0.3",
+    jiti: "^2.7.0",
     "jsonc-parser": "3.3.1",
     open: "11.0.0",
-    ora: "9.0.0",
+    ora: "9.4.0",
     tar: "^7.5.13"
   },
   devDependencies: {
-    "@types/node": "24.10.1",
+    "@types/node": "24.12.4",
     tsup: "8.5.1",
     typescript: "5.9.3"
   },
@@ -218,7 +219,7 @@ var promptTheme = {
 
 // src/utils/login-flow.ts
 function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function performLogin() {
   const spinner = (0, import_ora.default)("Initiating login flow...").start();
@@ -492,7 +493,7 @@ async function resolveSkills(opts) {
 }
 async function installSkills(projectRoot) {
   const npx = process.platform === "win32" ? "npx.cmd" : "npx";
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const child = (0, import_node_child_process.spawn)(
       npx,
       ["-y", "--loglevel=error", "skills", "add", "commet-labs/commet-skills"],
@@ -503,7 +504,7 @@ async function installSkills(projectRoot) {
         console.log(import_chalk3.default.dim("  You can install them manually by running:"));
         console.log(import_chalk3.default.dim("  npx skills add commet-labs/commet-skills"));
       }
-      resolve3();
+      resolve4();
     });
   });
 }
@@ -916,7 +917,7 @@ var listCommand = new import_commander4.Command("list").description("List featur
   }
   const spinner = (0, import_ora4.default)(`Fetching ${type}...`).start();
   const result = await apiRequest(
-    `${BASE_URL}/api/cli/types?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
   );
   if (result.error || !result.data) {
     spinner.fail(`Failed to fetch ${type}`);
@@ -1207,255 +1208,820 @@ var logoutCommand = new import_commander7.Command("logout").description("Log out
 });
 
 // src/commands/pull.ts
-var fs6 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
-var import_chalk10 = __toESM(require("chalk"));
+var fs5 = __toESM(require("fs"));
+var path5 = __toESM(require("path"));
+var import_prompts3 = require("@inquirer/prompts");
+var import_chalk11 = __toESM(require("chalk"));
 var import_commander8 = require("commander");
 var import_ora5 = __toESM(require("ora"));
 
-// src/utils/environment-validator.ts
+// src/utils/config-loader.ts
 var fs4 = __toESM(require("fs"));
 var path4 = __toESM(require("path"));
-function validateTypeScriptProject() {
-  const cwd = process.cwd();
-  const tsconfigPath = path4.join(cwd, "tsconfig.json");
-  if (!fs4.existsSync(tsconfigPath)) {
-    return false;
+var import_jiti = require("jiti");
+var CONFIG_NAMES = [
+  "commet.config.ts",
+  "commet.config.js",
+  "commet.config.mjs"
+];
+function findConfigFile(cwd) {
+  for (const name of CONFIG_NAMES) {
+    const fullPath = path4.resolve(cwd, name);
+    if (fs4.existsSync(fullPath)) {
+      return fullPath;
+    }
   }
-  try {
-    const content = fs4.readFileSync(tsconfigPath, "utf8");
-    JSON.parse(content);
-    return true;
-  } catch (_error) {
-    return false;
+  return null;
+}
+async function loadBillingConfig(cwd) {
+  const configPath = findConfigFile(cwd);
+  if (!configPath) {
+    throw new Error(
+      `No commet.config.ts found in ${cwd}. Create one with defineConfig() or run 'commet pull' to generate it.`
+    );
+  }
+  const jiti = (0, import_jiti.createJiti)(configPath, { interopDefault: true });
+  const mod = await jiti.import(configPath);
+  if (!mod || typeof mod !== "object") {
+    throw new Error(`${configPath}: failed to load config module`);
   }
+  const moduleRecord = mod;
+  if (!moduleRecord.default) {
+    throw new Error(
+      `${configPath}: must use \`export default defineConfig({...})\``
+    );
+  }
+  const config = moduleRecord.default;
+  validateConfig(config, configPath);
+  return { config, configPath };
 }
-
-// src/utils/generator.ts
-function generateTypes(seatTypes, features, plans) {
-  const seatTypeUnion = seatTypes.length > 0 ? seatTypes.map((s) => `"${s.code}"`).join(" | ") : "string";
-  const planCodeUnion = plans.length > 0 ? plans.map((p) => `"${p.code}"`).join(" | ") : "string";
-  const featureCodeUnion = features.length > 0 ? features.map((f) => `"${f.code}"`).join(" | ") : "string";
-  const seatComments = seatTypes.map(
-    (s) => ` * - "${s.code}": ${s.name}${s.description ? ` - ${s.description}` : ""} ${s.isFree ? "(Free)" : ""}`
-  ).join("\n");
-  const planComments = plans.map(
-    (p) => ` * - "${p.code}": ${p.name}${p.description ? ` - ${p.description}` : ""}`
-  ).join("\n");
-  const featureComments = features.map(
-    (f) => ` * - "${f.code}": ${f.name} (${f.type})${f.description ? ` - ${f.description}` : ""}`
-  ).join("\n");
-  return `// Auto-generated by Commet CLI
-// Do not edit this file manually - run 'commet pull' to update
-
-/**
- * This augments the Commet SDK with your organization's
- * feature codes, seat types, and plan codes for autocomplete.
- *
- * Features available in your organization:
-${featureComments || " * (none)"}
- *
- * Seat types available in your organization:
-${seatComments || " * (none)"}
- *
- * Plans available in your organization:
-${planComments || " * (none)"}
- *
- */
-declare module '@commet/node' {
-  interface CommetGeneratedTypes {
-    seatType: ${seatTypeUnion};
-    planCode: ${planCodeUnion};
-    featureCode: ${featureCodeUnion};
+var VALID_FEATURE_TYPES = /* @__PURE__ */ new Set(["boolean", "usage", "seats"]);
+var VALID_INTERVALS = /* @__PURE__ */ new Set([
+  "weekly",
+  "monthly",
+  "quarterly",
+  "yearly",
+  "one_time"
+]);
+function validateConfig(config, configPath) {
+  if (!config || typeof config !== "object") {
+    throw new Error(`${configPath}: config must be an object`);
+  }
+  if (!config.features || typeof config.features !== "object") {
+    throw new Error(`${configPath}: config.features must be an object`);
+  }
+  if (!config.plans || typeof config.plans !== "object") {
+    throw new Error(`${configPath}: config.plans must be an object`);
+  }
+  for (const [code, feature] of Object.entries(config.features)) {
+    if (!feature.name || typeof feature.name !== "string") {
+      throw new Error(`Feature "${code}": name is required`);
+    }
+    if (!VALID_FEATURE_TYPES.has(feature.type)) {
+      throw new Error(
+        `Feature "${code}": type must be one of: boolean, usage, seats`
+      );
+    }
+  }
+  for (const [code, plan] of Object.entries(config.plans)) {
+    if (!plan.name || typeof plan.name !== "string") {
+      throw new Error(`Plan "${code}": name is required`);
+    }
+    if (!Array.isArray(plan.prices)) {
+      throw new Error(`Plan "${code}": prices must be an array`);
+    }
+    for (const price of plan.prices) {
+      if (!VALID_INTERVALS.has(price.interval)) {
+        throw new Error(
+          `Plan "${code}": price interval "${price.interval}" is not valid`
+        );
+      }
+      if (typeof price.amount !== "number") {
+        throw new Error(`Plan "${code}": price amount must be a number`);
+      }
+    }
+    if (plan.prices.length > 0) {
+      if (!plan.defaultInterval) {
+        throw new Error(
+          `Plan "${code}": defaultInterval is required when prices are defined`
+        );
+      }
+      const priceIntervals = new Set(plan.prices.map((p) => p.interval));
+      if (!priceIntervals.has(plan.defaultInterval)) {
+        throw new Error(
+          `Plan "${code}": defaultInterval "${plan.defaultInterval}" does not match any price interval (${[...priceIntervals].join(", ")})`
+        );
+      }
+    }
+    if (plan.features) {
+      for (const featureCode of Object.keys(plan.features)) {
+        if (!config.features[featureCode]) {
+          throw new Error(
+            `Plan "${code}": references feature "${featureCode}" which is not defined in config.features`
+          );
+        }
+      }
+    }
   }
 }
 
-export {};
-`;
+// src/utils/diff.ts
+var import_chalk10 = __toESM(require("chalk"));
+function computeDiff(config, remote) {
+  const remoteFeatureMap = new Map(remote.features.map((f) => [f.code, f]));
+  const remotePlanMap = new Map(remote.plans.map((p) => [p.code, p]));
+  const featureChanges = [];
+  for (const [code, localFeature] of Object.entries(config.features)) {
+    const remoteFeature = remoteFeatureMap.get(code);
+    if (!remoteFeature) {
+      featureChanges.push({ code, action: "create" });
+      continue;
+    }
+    const changes = [];
+    if (remoteFeature.name !== localFeature.name) {
+      changes.push(`name: "${remoteFeature.name}" \u2192 "${localFeature.name}"`);
+    }
+    if (remoteFeature.type !== localFeature.type) {
+      changes.push(
+        `type: "${remoteFeature.type}" \u2192 "${localFeature.type}" (BLOCKED)`
+      );
+    }
+    if ("unitName" in localFeature && (remoteFeature.unitName ?? void 0) !== localFeature.unitName) {
+      changes.push(
+        `unitName: "${remoteFeature.unitName ?? ""}" \u2192 "${localFeature.unitName}"`
+      );
+    }
+    featureChanges.push(
+      changes.length > 0 ? { code, action: "update", changes } : { code, action: "unchanged" }
+    );
+  }
+  const unmanagedFeatures = remote.features.filter((f) => !config.features[f.code]).map((f) => f.code);
+  const planChanges = [];
+  for (const [code, localPlan] of Object.entries(config.plans)) {
+    const remotePlan = remotePlanMap.get(code);
+    if (!remotePlan) {
+      planChanges.push({ code, action: "create" });
+      continue;
+    }
+    const changes = [];
+    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;
+    if (localPlan.defaultInterval && remoteDefaultInterval !== localPlan.defaultInterval) {
+      changes.push(
+        `defaultInterval: "${remoteDefaultInterval ?? "none"}" \u2192 "${localPlan.defaultInterval}"`
+      );
+    }
+    const localPriceMap = new Map(localPlan.prices.map((p) => [p.interval, p]));
+    const remotePriceMap = new Map(
+      remotePlan.prices.map((p) => [p.billingInterval, p])
+    );
+    for (const [interval, localPrice] of localPriceMap) {
+      const remotePrice = remotePriceMap.get(interval);
+      if (!remotePrice) {
+        changes.push(
+          `price ${interval}: new ($${(localPrice.amount / 1e4).toFixed(2)})`
+        );
+      } else if (remotePrice.price !== localPrice.amount) {
+        changes.push(
+          `price ${interval}: $${(remotePrice.price / 1e4).toFixed(2)} \u2192 $${(localPrice.amount / 1e4).toFixed(2)}`
+        );
+      }
+    }
+    if (localPlan.features) {
+      const remotePlanFeatureMap = new Map(
+        remotePlan.features.map((f) => [f.featureCode, f])
+      );
+      for (const featureCode of Object.keys(localPlan.features)) {
+        if (!remotePlanFeatureMap.has(featureCode)) {
+          changes.push(`feature ${featureCode}: new`);
+        }
+      }
+    }
+    planChanges.push(
+      changes.length > 0 ? { code, action: "update", changes } : { code, action: "unchanged" }
+    );
+  }
+  const unmanagedPlans = remote.plans.filter((p) => !config.plans[p.code]).map((p) => p.code);
+  const hasChanges = featureChanges.some((c) => c.action !== "unchanged") || planChanges.some((c) => c.action !== "unchanged");
+  return {
+    features: { changes: featureChanges, unmanaged: unmanagedFeatures },
+    plans: { changes: planChanges, unmanaged: unmanagedPlans },
+    hasChanges
+  };
 }
-
-// src/utils/tsconfig-updater.ts
-var fs5 = __toESM(require("fs"));
-var path5 = __toESM(require("path"));
-var import_jsonc_parser = require("jsonc-parser");
-function updateTsConfig(entry) {
-  const cwd = process.cwd();
-  const tsconfigPath = path5.join(cwd, "tsconfig.json");
-  try {
-    if (!fs5.existsSync(tsconfigPath)) {
-      return {
-        success: false,
-        error: "tsconfig.json not found"
-      };
+function formatDiff(diff) {
+  const lines = [];
+  lines.push(import_chalk10.default.bold("\nFeatures:"));
+  for (const change of diff.features.changes) {
+    if (change.action === "create") {
+      lines.push(import_chalk10.default.green(`  + ${change.code}`));
+    } else if (change.action === "update") {
+      lines.push(import_chalk10.default.yellow(`  ~ ${change.code}`));
+      for (const c of change.changes ?? []) {
+        lines.push(import_chalk10.default.dim(`      ${c}`));
+      }
+    } else {
+      lines.push(import_chalk10.default.dim(`    ${change.code}`));
     }
-    const content = fs5.readFileSync(tsconfigPath, "utf8");
-    const config = (0, import_jsonc_parser.parse)(content);
-    if (config.include && Array.isArray(config.include)) {
-      if (config.include.includes(entry)) {
-        return { success: true };
+  }
+  if (diff.features.unmanaged.length > 0) {
+    lines.push(
+      import_chalk10.default.dim(
+        `  ? unmanaged: ${diff.features.unmanaged.join(", ")} (not in config, left as-is)`
+      )
+    );
+  }
+  lines.push(import_chalk10.default.bold("\nPlans:"));
+  for (const change of diff.plans.changes) {
+    if (change.action === "create") {
+      lines.push(import_chalk10.default.green(`  + ${change.code}`));
+    } else if (change.action === "update") {
+      lines.push(import_chalk10.default.yellow(`  ~ ${change.code}`));
+      for (const c of change.changes ?? []) {
+        lines.push(import_chalk10.default.dim(`      ${c}`));
       }
+    } else {
+      lines.push(import_chalk10.default.dim(`    ${change.code}`));
     }
-    const currentInclude = config.include || [];
-    const newInclude = [...currentInclude, entry];
-    const edits = (0, import_jsonc_parser.modify)(content, ["include"], newInclude, {
-      formattingOptions: {
-        insertSpaces: true,
-        tabSize: 2
+  }
+  if (diff.plans.unmanaged.length > 0) {
+    lines.push(
+      import_chalk10.default.dim(
+        `  ? unmanaged: ${diff.plans.unmanaged.join(", ")} (not in config, left as-is)`
+      )
+    );
+  }
+  return lines.join("\n");
+}
+
+// src/utils/generator.ts
+function generateConfigFile(features, plans) {
+  const lines = [];
+  lines.push('import { defineConfig } from "@commet/node";');
+  lines.push("");
+  lines.push("export default defineConfig({");
+  lines.push("  features: {");
+  for (const f of features) {
+    const parts = [`name: "${f.name}"`, `type: "${f.type}"`];
+    if (f.unitName) parts.push(`unitName: "${f.unitName}"`);
+    if (f.description) parts.push(`description: "${f.description}"`);
+    lines.push(`    ${f.code}: { ${parts.join(", ")} },`);
+  }
+  lines.push("  },");
+  lines.push("  plans: {");
+  for (const p of plans) {
+    lines.push(`    ${p.code}: {`);
+    lines.push(`      name: "${p.name}",`);
+    if (p.description) lines.push(`      description: "${p.description}",`);
+    if (p.consumptionModel)
+      lines.push(`      consumptionModel: "${p.consumptionModel}",`);
+    if (p.isFree) lines.push("      isFree: true,");
+    if (p.isPublic === false) lines.push("      isPublic: false,");
+    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;
+    if (defaultInterval)
+      lines.push(`      defaultInterval: "${defaultInterval}",`);
+    if (prices.length === 0) {
+      lines.push("      prices: [],");
+    } else {
+      lines.push("      prices: [");
+      for (const price of prices) {
+        const priceParts = [
+          `interval: "${price.billingInterval}"`,
+          `amount: ${price.price}`
+        ];
+        if (price.trialDays) priceParts.push(`trialDays: ${price.trialDays}`);
+        lines.push(`        { ${priceParts.join(", ")} },`);
       }
-    });
-    const updatedContent = (0, import_jsonc_parser.applyEdits)(content, edits);
-    fs5.writeFileSync(tsconfigPath, updatedContent, "utf8");
-    return { success: true };
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : "Unknown error updating tsconfig.json"
-    };
+      lines.push("      ],");
+    }
+    const planFeatures = p.features ?? [];
+    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},`);
+        } else {
+          const parts = [];
+          if (pf.includedAmount) parts.push(`included: ${pf.includedAmount}`);
+          if (pf.unlimited) parts.push("unlimited: true");
+          if (pf.overageEnabled && pf.overageUnitPrice) {
+            parts.push(`overage: { unitPrice: ${pf.overageUnitPrice} }`);
+          }
+          if (parts.length > 0) {
+            lines.push(`        ${pf.featureCode}: { ${parts.join(", ")} },`);
+          } else {
+            lines.push(`        ${pf.featureCode}: {},`);
+          }
+        }
+      }
+      lines.push("      },");
+    }
+    lines.push("    },");
   }
+  lines.push("  },");
+  lines.push("});");
+  lines.push("");
+  return lines.join("\n");
 }
 
 // src/commands/pull.ts
-var pullCommand = new import_commander8.Command("pull").description("Pull type definitions from Commet").action(async () => {
+var pullCommand = new import_commander8.Command("pull").description("Pull config from Commet and generate commet.config.ts").option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show diff without applying changes").option("--json", "Output structured JSON (no colors, no prompts)").action(async (options) => {
+  const jsonMode = options.json;
   if (!authExists()) {
-    console.log(import_chalk10.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk10.default.dim("Run `commet login` first"));
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Not authenticated" }));
+    } else {
+      console.log(import_chalk11.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk11.default.dim("Run `commet login` first"));
+    }
+    process.exit(1);
   }
-  const hasTsConfig = validateTypeScriptProject();
   if (!projectConfigExists()) {
-    console.log(import_chalk10.default.red("\u2717 Project not linked"));
-    console.log(
-      import_chalk10.default.dim("Run `commet link` first to connect to an organization")
-    );
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Project not linked" }));
+    } else {
+      console.log(import_chalk11.default.red("\u2717 Project not linked"));
+      console.log(
+        import_chalk11.default.dim("Run `commet link` first to connect to an organization")
+      );
+    }
+    process.exit(1);
   }
   const projectConfig = loadProjectConfig();
   if (!projectConfig) {
-    console.log(import_chalk10.default.red("\u2717 Invalid project configuration"));
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Invalid project configuration" }));
+    } else {
+      console.log(import_chalk11.default.red("\u2717 Invalid project configuration"));
+    }
+    process.exit(1);
   }
-  const spinner = (0, import_ora5.default)("Fetching type definitions...").start();
+  const spinner = jsonMode ? null : (0, import_ora5.default)("Fetching config from remote...").start();
   const result = await apiRequest(
-    `${BASE_URL}/api/cli/types?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
   );
   if (result.error || !result.data) {
-    spinner.fail("Failed to fetch types");
-    console.error(import_chalk10.default.red("Error:"), result.error);
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail("Failed to fetch config");
+      console.error(import_chalk11.default.red("Error:"), result.error);
+    }
+    process.exit(1);
   }
-  const { seatTypes, features, plans } = result.data;
-  const typeDefinitions = generateTypes(seatTypes, features, plans);
-  const commetDir = path6.resolve(process.cwd(), ".commet");
-  const outputPath = path6.join(commetDir, "types.d.ts");
-  fs6.mkdirSync(commetDir, { recursive: true });
-  fs6.writeFileSync(outputPath, typeDefinitions, "utf8");
-  spinner.succeed("Type definitions generated!");
-  if (hasTsConfig) {
-    const tsconfigResult = updateTsConfig(".commet/types.d.ts");
-    if (tsconfigResult.success) {
-      console.log(import_chalk10.default.green("\u2713 Updated tsconfig.json"));
+  spinner?.succeed("Remote state fetched");
+  const { features, plans } = result.data;
+  const configContent = generateConfigFile(features, plans);
+  const outputPath = path5.resolve(process.cwd(), "commet.config.ts");
+  const existingConfigPath = findConfigFile(process.cwd());
+  if (!existingConfigPath) {
+    if (options.dryRun) {
+      if (jsonMode) {
+        console.log(
+          JSON.stringify({
+            action: "create",
+            features: features.length,
+            plans: plans.length,
+            applied: false
+          })
+        );
+      } else {
+        console.log(
+          import_chalk11.default.green(
+            `
+Would create commet.config.ts (${features.length} features, ${plans.length} plans)`
+          )
+        );
+      }
+      return;
+    }
+    fs5.writeFileSync(outputPath, configContent, "utf8");
+    if (jsonMode) {
+      console.log(
+        JSON.stringify({
+          action: "create",
+          features: features.length,
+          plans: plans.length,
+          applied: true
+        })
+      );
     } else {
-      console.log(import_chalk10.default.yellow("\u26A0 Could not update tsconfig.json"));
+      console.log(import_chalk11.default.green(`
+\u2713 Created commet.config.ts`));
       console.log(
-        import_chalk10.default.dim(
-          'Add ".commet/types.d.ts" to your tsconfig.json include array'
-        )
+        import_chalk11.default.dim(`  ${features.length} features, ${plans.length} plans`)
       );
     }
+    return;
+  }
+  const localLoaded = await loadBillingConfig(process.cwd()).catch(
+    (error) => ({
+      parseError: error instanceof Error ? error.message : String(error)
+    })
+  );
+  if ("parseError" in localLoaded) {
+    if (options.dryRun) {
+      if (jsonMode) {
+        console.log(
+          JSON.stringify({
+            action: "overwrite",
+            reason: localLoaded.parseError,
+            applied: false
+          })
+        );
+      } else {
+        console.log(
+          import_chalk11.default.yellow(
+            `
+\u26A0 Local config is invalid: ${localLoaded.parseError}`
+          )
+        );
+      }
+      return;
+    }
+    if (!options.yes && !jsonMode) {
+      console.log(import_chalk11.default.yellow(`
+\u26A0 ${localLoaded.parseError}`));
+      const shouldProceed = await (0, import_prompts3.confirm)({
+        message: "Overwrite with remote?",
+        default: true
+      });
+      if (!shouldProceed) {
+        console.log(import_chalk11.default.dim("Pull cancelled"));
+        return;
+      }
+    }
+    fs5.writeFileSync(outputPath, configContent, "utf8");
+    if (jsonMode) {
+      console.log(JSON.stringify({ action: "overwrite", applied: true }));
+    } else {
+      console.log(import_chalk11.default.green("\n\u2713 Overwritten commet.config.ts"));
+    }
+    return;
+  }
+  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 } : {}
+        }
+      ])
+    ),
+    plans: Object.fromEntries(
+      plans.map((p) => [
+        p.code,
+        {
+          name: p.name,
+          ...p.description ? { description: p.description } : {},
+          ...p.consumptionModel ? {
+            consumptionModel: p.consumptionModel
+          } : {},
+          ...p.isFree ? { isFree: true } : {},
+          ...p.isPublic === false ? { isPublic: false } : {},
+          ...p.sortOrder ? { sortOrder: p.sortOrder } : {},
+          ...(() => {
+            const planPrices = p.prices ?? [];
+            const defaultPrice = planPrices.find((pr) => pr.isDefault);
+            const defaultInterval = defaultPrice?.billingInterval ?? planPrices[0]?.billingInterval;
+            return defaultInterval ? { defaultInterval } : {};
+          })(),
+          prices: (p.prices ?? []).map((pr) => ({
+            interval: pr.billingInterval,
+            amount: pr.price,
+            ...pr.trialDays ? { trialDays: pr.trialDays } : {}
+          }))
+        }
+      ])
+    )
+  };
+  const localAsRemote = {
+    features: Object.entries(localConfig.features).map(([code, f]) => ({
+      code,
+      name: f.name,
+      type: f.type,
+      description: f.description ?? null,
+      unitName: f.unitName ?? 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
+      })),
+      features: []
+    }))
+  };
+  const diff = computeDiff(remoteAsConfig, localAsRemote);
+  if (!diff.hasChanges && diff.features.unmanaged.length === 0 && diff.plans.unmanaged.length === 0) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ diff, applied: false, upToDate: true }));
+    } else {
+      console.log(import_chalk11.default.green("\n\u2713 Already up to date"));
+    }
+    return;
+  }
+  if (jsonMode) {
+    if (options.dryRun) {
+      console.log(JSON.stringify({ diff, applied: false }));
+      return;
+    }
   } else {
-    console.log(import_chalk10.default.yellow("\u26A0 No tsconfig.json found"));
+    console.log(formatDiff(diff));
+  }
+  if (options.dryRun) {
+    if (!jsonMode) {
+      console.log(import_chalk11.default.dim("\n(dry run \u2014 no changes applied)"));
+    }
+    return;
+  }
+  if (!options.yes && !jsonMode) {
+    const shouldProceed = await (0, import_prompts3.confirm)({
+      message: "Overwrite commet.config.ts with remote state?",
+      default: true
+    });
+    if (!shouldProceed) {
+      console.log(import_chalk11.default.dim("Pull cancelled"));
+      return;
+    }
+  }
+  fs5.writeFileSync(outputPath, configContent, "utf8");
+  if (jsonMode) {
+    console.log(JSON.stringify({ diff, applied: true }));
+  } else {
+    console.log(import_chalk11.default.green("\n\u2713 Updated commet.config.ts"));
     console.log(
-      import_chalk10.default.dim(
-        'Add ".commet/types.d.ts" to your tsconfig.json to enable types'
-      )
+      import_chalk11.default.dim(`  ${features.length} features, ${plans.length} plans`)
     );
   }
-  const gitignoreResult = updateGitignore(".commet/");
-  if (gitignoreResult.success) {
-    console.log(import_chalk10.default.green("\u2713 Updated .gitignore"));
-  } else {
-    console.log(import_chalk10.default.yellow("\u26A0 No .gitignore found"));
-    console.log(import_chalk10.default.dim("Add .commet/ to your .gitignore file"));
+});
+
+// src/commands/push.ts
+var import_prompts4 = require("@inquirer/prompts");
+var import_chalk12 = __toESM(require("chalk"));
+var import_commander9 = require("commander");
+var import_ora6 = __toESM(require("ora"));
+var pushCommand = new import_commander9.Command("push").description("Push commet.config.ts to your Commet organization").option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show diff without applying changes").option("--json", "Output structured JSON (no colors, no prompts)").action(async (options) => {
+  const jsonMode = options.json;
+  if (!authExists()) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Not authenticated" }));
+    } else {
+      console.log(import_chalk12.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk12.default.dim("Run `commet login` first"));
+    }
+    process.exit(1);
   }
-  console.log(import_chalk10.default.green("\nSuccess!"));
-  console.log(import_chalk10.default.dim("\nGenerated types:"));
-  console.log(
-    import_chalk10.default.dim(
-      `  Features: ${features.length > 0 ? features.map((f) => f.code).join(", ") : "none"}`
-    )
+  if (!projectConfigExists()) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Project not linked" }));
+    } else {
+      console.log(import_chalk12.default.red("\u2717 Project not linked"));
+      console.log(
+        import_chalk12.default.dim("Run `commet link` first to connect to an organization")
+      );
+    }
+    process.exit(1);
+  }
+  const projectConfig = loadProjectConfig();
+  if (!projectConfig) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Invalid project configuration" }));
+    } else {
+      console.log(import_chalk12.default.red("\u2717 Invalid project configuration"));
+    }
+    process.exit(1);
+  }
+  const loadSpinner = jsonMode ? 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);
+      if (jsonMode) {
+        console.log(JSON.stringify({ error: message }));
+      } else {
+        loadSpinner?.fail("Failed to load config");
+        console.error(import_chalk12.default.red(message));
+      }
+      return null;
+    }
   );
-  console.log(
-    import_chalk10.default.dim(
-      `  Seat types: ${seatTypes.length > 0 ? seatTypes.map((s) => s.code).join(", ") : "none"}`
-    )
+  if (!loaded) process.exit(1);
+  const { config, configPath } = loaded;
+  loadSpinner?.succeed(`Loaded ${configPath}`);
+  const fetchSpinner = jsonMode ? null : (0, import_ora6.default)("Fetching remote state...").start();
+  const remoteResult = await apiRequest(
+    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
   );
-  console.log(
-    import_chalk10.default.dim(
-      `  Plans: ${plans.length > 0 ? plans.map((p) => p.code).join(", ") : "none"}`
-    )
+  if (remoteResult.error || !remoteResult.data) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: remoteResult.error }));
+    } else {
+      fetchSpinner?.fail("Failed to fetch remote state");
+      console.error(import_chalk12.default.red("Error:"), remoteResult.error);
+    }
+    process.exit(1);
+  }
+  fetchSpinner?.succeed("Remote state fetched");
+  const remote = {
+    features: remoteResult.data.features,
+    plans: remoteResult.data.plans
+  };
+  const diff = computeDiff(config, remote);
+  if (jsonMode) {
+    if (options.dryRun) {
+      console.log(JSON.stringify({ diff, applied: false }));
+      return;
+    }
+  } else {
+    console.log(formatDiff(diff));
+  }
+  if (!diff.hasChanges) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ diff, applied: false, upToDate: true }));
+    } else {
+      console.log(import_chalk12.default.green("\n\u2713 Everything is up to date"));
+    }
+    return;
+  }
+  const typeChanges = diff.features.changes.filter(
+    (c) => c.action === "update" && c.changes?.some((ch) => ch.includes("BLOCKED"))
+  );
+  if (typeChanges.length > 0) {
+    const blockedCodes = typeChanges.map((c) => c.code);
+    if (jsonMode) {
+      console.log(
+        JSON.stringify({
+          error: "Feature type changes blocked",
+          blockedCodes,
+          diff
+        })
+      );
+    } else {
+      console.log(
+        import_chalk12.default.red(
+          "\n\u2717 Cannot change feature types. Update them in the dashboard:"
+        )
+      );
+      for (const change of typeChanges) {
+        console.log(import_chalk12.default.red(`  - ${change.code}`));
+      }
+    }
+    process.exit(1);
+  }
+  if (options.dryRun) {
+    if (!jsonMode) {
+      console.log(import_chalk12.default.dim("\n(dry run \u2014 no changes applied)"));
+    }
+    return;
+  }
+  if (!options.yes && !jsonMode) {
+    const shouldProceed = await (0, import_prompts4.confirm)({
+      message: "Apply these changes?",
+      default: true
+    });
+    if (!shouldProceed) {
+      console.log(import_chalk12.default.dim("Push cancelled"));
+      return;
+    }
+  }
+  const pushSpinner = jsonMode ? null : (0, import_ora6.default)("Pushing config...").start();
+  const pushResult = await apiRequest(
+    `${BASE_URL}/api/cli/push`,
+    {
+      method: "POST",
+      body: JSON.stringify({
+        orgId: projectConfig.orgId,
+        config: {
+          features: config.features,
+          plans: config.plans
+        }
+      })
+    }
   );
-  console.log(import_chalk10.default.dim(`
-Output: ${outputPath}`));
-  if (seatTypes.length === 0 && plans.length === 0 && features.length === 0) {
+  if (pushResult.error || !pushResult.data) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: pushResult.error }));
+    } else {
+      pushSpinner?.fail("Push failed");
+      console.error(import_chalk12.default.red("Error:"), pushResult.error);
+    }
+    process.exit(1);
+  }
+  const pushOutcome = pushResult.data;
+  if (jsonMode) {
+    console.log(JSON.stringify({ diff, applied: true, result: pushOutcome }));
+    return;
+  }
+  const errors = [
+    ...pushOutcome.features.errors,
+    ...pushOutcome.plans.errors
+  ];
+  if (errors.length > 0) {
+    pushSpinner?.warn("Push completed with errors");
+    for (const error of errors) {
+      console.log(import_chalk12.default.red(`  \u2717 ${error.code}: ${error.message}`));
+    }
+  } else {
+    pushSpinner?.succeed("Push complete");
+  }
+  if (pushOutcome.features.created.length > 0) {
+    console.log(
+      import_chalk12.default.green(
+        `  Created features: ${pushOutcome.features.created.join(", ")}`
+      )
+    );
+  }
+  if (pushOutcome.features.updated.length > 0) {
+    console.log(
+      import_chalk12.default.yellow(
+        `  Updated features: ${pushOutcome.features.updated.join(", ")}`
+      )
+    );
+  }
+  if (pushOutcome.plans.created.length > 0) {
     console.log(
-      import_chalk10.default.yellow(
-        "\n\u26A0 No types found. Create features, seat types, and plans in your Commet dashboard."
+      import_chalk12.default.green(`  Created plans: ${pushOutcome.plans.created.join(", ")}`)
+    );
+  }
+  if (pushOutcome.plans.updated.length > 0) {
+    console.log(
+      import_chalk12.default.yellow(
+        `  Updated plans: ${pushOutcome.plans.updated.join(", ")}`
       )
     );
   }
 });
 
 // src/commands/switch.ts
-var import_prompts3 = require("@inquirer/prompts");
-var import_chalk11 = __toESM(require("chalk"));
-var import_commander9 = require("commander");
-var import_ora6 = __toESM(require("ora"));
-var switchCommand = new import_commander9.Command("switch").description("Switch to a different organization").action(async () => {
+var import_prompts5 = require("@inquirer/prompts");
+var import_chalk13 = __toESM(require("chalk"));
+var import_commander10 = require("commander");
+var import_ora7 = __toESM(require("ora"));
+var switchCommand = new import_commander10.Command("switch").description("Switch to a different organization").action(async () => {
   if (!authExists()) {
-    console.log(import_chalk11.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk11.default.dim("Run `commet login` first"));
+    console.log(import_chalk13.default.red("\u2717 Not authenticated"));
+    console.log(import_chalk13.default.dim("Run `commet login` first"));
     return;
   }
   if (!projectConfigExists()) {
-    console.log(import_chalk11.default.yellow("\u26A0 Project not linked"));
+    console.log(import_chalk13.default.yellow("\u26A0 Project not linked"));
     console.log(
-      import_chalk11.default.dim("Run `commet link` first to connect to an organization")
+      import_chalk13.default.dim("Run `commet link` first to connect to an organization")
     );
     return;
   }
-  const spinner = (0, import_ora6.default)("Fetching organizations...").start();
+  const spinner = (0, import_ora7.default)("Fetching organizations...").start();
   const result = await apiRequest(
     `${BASE_URL}/api/cli/organizations`
   );
   if (result.error || !result.data) {
     spinner.fail("Failed to fetch organizations");
-    console.error(import_chalk11.default.red("Error:"), result.error);
+    console.error(import_chalk13.default.red("Error:"), result.error);
     return;
   }
   const { organizations } = result.data;
   if (organizations.length === 0) {
     spinner.stop();
-    console.log(import_chalk11.default.yellow("\u26A0 No organizations found"));
+    console.log(import_chalk13.default.yellow("\u26A0 No organizations found"));
     return;
   }
   spinner.stop();
   let orgId;
   try {
-    orgId = await (0, import_prompts3.select)({
+    orgId = await (0, import_prompts5.select)({
       message: "Select organization:",
       choices: organizations.map((org) => ({
-        name: `${org.name} ${import_chalk11.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
+        name: `${org.name} ${import_chalk13.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
         value: org.id
       })),
       theme: promptTheme
     });
   } catch (_error) {
-    console.log(import_chalk11.default.yellow("\n\u26A0 Switch cancelled"));
+    console.log(import_chalk13.default.yellow("\n\u26A0 Switch cancelled"));
     return;
   }
   const selectedOrg = organizations.find((org) => org.id === orgId);
   if (!selectedOrg) {
-    console.log(import_chalk11.default.red("\u2717 Organization not found"));
+    console.log(import_chalk13.default.red("\u2717 Organization not found"));
     return;
   }
   saveProjectConfig({
@@ -1463,55 +2029,55 @@ var switchCommand = new import_commander9.Command("switch").description("Switch
     orgName: selectedOrg.name,
     mode: selectedOrg.mode
   });
-  console.log(import_chalk11.default.green("\n\u2713 Switched organization successfully!"));
+  console.log(import_chalk13.default.green("\n\u2713 Switched organization successfully!"));
   console.log(
-    import_chalk11.default.dim(`
+    import_chalk13.default.dim(`
 Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
   );
   console.log(
-    import_chalk11.default.dim(
+    import_chalk13.default.dim(
       "\nRun `commet pull` to update TypeScript types for this organization"
     )
   );
 });
 
 // src/commands/unlink.ts
-var import_chalk12 = __toESM(require("chalk"));
-var import_commander10 = require("commander");
-var unlinkCommand = new import_commander10.Command("unlink").description("Unlink this project from Commet").action(async () => {
+var import_chalk14 = __toESM(require("chalk"));
+var import_commander11 = require("commander");
+var unlinkCommand = new import_commander11.Command("unlink").description("Unlink this project from Commet").action(async () => {
   if (!projectConfigExists()) {
     console.log(
-      import_chalk12.default.yellow("\u26A0 This project is not linked to any organization")
+      import_chalk14.default.yellow("\u26A0 This project is not linked to any organization")
     );
     return;
   }
   clearProjectConfig();
-  console.log(import_chalk12.default.green("\u2713 Project unlinked successfully"));
-  console.log(import_chalk12.default.dim("\u2713 Removed .commet/ directory"));
+  console.log(import_chalk14.default.green("\u2713 Project unlinked successfully"));
+  console.log(import_chalk14.default.dim("\u2713 Removed .commet/ directory"));
   console.log(
-    import_chalk12.default.dim("\nRun `commet link` to connect to a different organization")
+    import_chalk14.default.dim("\nRun `commet link` to connect to a different organization")
   );
 });
 
 // src/commands/whoami.ts
-var import_chalk13 = __toESM(require("chalk"));
-var import_commander11 = require("commander");
-var whoamiCommand = new import_commander11.Command("whoami").description("Display current authentication and project status").action(async () => {
+var import_chalk15 = __toESM(require("chalk"));
+var import_commander12 = require("commander");
+var whoamiCommand = new import_commander12.Command("whoami").description("Display current authentication and project status").action(async () => {
   if (!authExists()) {
-    console.log(import_chalk13.default.yellow("\u26A0 Not logged in"));
-    console.log(import_chalk13.default.dim("Run `commet login` to authenticate"));
+    console.log(import_chalk15.default.yellow("\u26A0 Not logged in"));
+    console.log(import_chalk15.default.dim("Run `commet login` to authenticate"));
     return;
   }
-  console.log(import_chalk13.default.green("\u2713 Logged in"));
+  console.log(import_chalk15.default.green("\u2713 Logged in"));
   const projectConfig = loadProjectConfig();
   if (projectConfig) {
-    console.log(import_chalk13.default.bold("\nProject:"));
-    console.log(import_chalk13.default.dim("Organization:"), projectConfig.orgName);
-    console.log(import_chalk13.default.dim("Mode:"), projectConfig.mode);
+    console.log(import_chalk15.default.bold("\nProject:"));
+    console.log(import_chalk15.default.dim("Organization:"), projectConfig.orgName);
+    console.log(import_chalk15.default.dim("Mode:"), projectConfig.mode);
   } else {
-    console.log(import_chalk13.default.yellow("\n\u26A0 No project linked"));
+    console.log(import_chalk15.default.yellow("\n\u26A0 No project linked"));
     console.log(
-      import_chalk13.default.dim(
+      import_chalk15.default.dim(
         "Run `commet link` to connect this directory to an organization"
       )
     );
@@ -1519,7 +2085,7 @@ var whoamiCommand = new import_commander11.Command("whoami").description("Displa
 });
 
 // src/index.ts
-var program = new import_commander12.Command();
+var program = new import_commander13.Command();
 program.name("commet").description(
   "Commet CLI - Manage your billing platform from the command line"
 ).version(package_default.version);
@@ -1531,6 +2097,7 @@ program.addCommand(linkCommand);
 program.addCommand(unlinkCommand);
 program.addCommand(switchCommand);
 program.addCommand(infoCommand);
+program.addCommand(pushCommand);
 program.addCommand(pullCommand);
 program.addCommand(listCommand);
 program.addCommand(listenCommand);
@@ -1543,7 +2110,7 @@ try {
     if (code === "commander.version" || code === "commander.help" || code === "commander.helpDisplayed") {
       process.exit(0);
     }
-    console.error(import_chalk14.default.red("Error:"), error.message);
+    console.error(import_chalk16.default.red("Error:"), error.message);
   }
   process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commet",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Commet CLI - Manage your billing platform from the command line",
   "bin": {
     "commet": "./bin/commet"
@@ -19,17 +19,18 @@
   "author": "Commet Team",
   "license": "MIT",
   "dependencies": {
-    "@inquirer/prompts": "8.0.1",
+    "@inquirer/prompts": "8.4.3",
     "ably": "^2.21.0",
     "chalk": "5.6.2",
-    "commander": "14.0.2",
+    "commander": "14.0.3",
+    "jiti": "^2.7.0",
     "jsonc-parser": "3.3.1",
     "open": "11.0.0",
-    "ora": "9.0.0",
+    "ora": "9.4.0",
     "tar": "^7.5.13"
   },
   "devDependencies": {
-    "@types/node": "24.10.1",
+    "@types/node": "24.12.4",
     "tsup": "8.5.1",
     "typescript": "5.9.3"
   },