@revstackhq/cli 0.0.0-dev-20260226063200 → 0.0.0-dev-20260227092523

package/.turbo/turbo-build.log

@@ -1,36 +1,48 @@
-[?9001h[?1004h[?25l> @revstackhq/cli@0.0.0-dev-20260226063200 build C:\Users\flava\OneDrive\Desktop\Work\revstack-os\packages\cli
-> tsup]0;C:\WINDOWS\system32\cmd.exe[?25hCLI Building entry: src/cli.ts, src/commands/init.ts, src/commands/login.ts, src/commands/logout.ts, src/commands/pull.ts, src/commands/push.ts, src/utils/auth.ts, src/utils/config-loader.ts
+[?9001h[?1004h[?25l> @revstackhq/cli@0.0.0-dev-20260227092523 build C:\Users\flava\OneDrive\Desktop\Work\revstack-os\packages\cli
+> tsup]0;C:\WINDOWS\system32\cmd.exe[?25hCLI Building entry: src/cli.ts, src/commands/init.ts, src/commands/login.ts, src/commands/logout.ts, src/commands/pull.ts, src/commands/push.ts, src/utils/auth.ts, src/utils/config-loader.ts, src/commands/templates/b2b-saas.ts, src/commands/templates/index.ts, src/commands/templates/starter.ts, src/commands/templates/usage-based.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.1
-CLI Using tsup config: C:\Users\flava\OneDrive\Desktop\Work\revstack-os\packages\cli\tsup.config.ts
-CLI Target: node18
+CLI Using tsup config: C:\Users\flava\OneDrive\Desktop\Work\revstack-os\packages\cli\tsup.config.ts
+CLI Target: node18
 CLI Cleaning output folder
 ESM Build start
-ESM dist\cli.js                     18.36 KB
-ESM dist\commands\logout.js         1.15 KB
-ESM dist\commands\init.js           5.14 KB
-ESM dist\commands\login.js          1.42 KB
-ESM dist\utils\auth.js              971.00 B
-ESM dist\commands\pull.js           6.22 KB
-ESM dist\utils\config-loader.js     1.05 KB
-ESM dist\commands\push.js           5.31 KB
-ESM dist\cli.js.map                 41.02 KB
-ESM dist\commands\logout.js.map     3.17 KB
-ESM dist\commands\init.js.map       9.92 KB
-ESM dist\commands\login.js.map      3.89 KB
-ESM dist\utils\auth.js.map          2.36 KB
-ESM dist\utils\config-loader.js.map 2.66 KB
-ESM dist\commands\pull.js.map       14.72 KB
-ESM dist\commands\push.js.map       13.64 KB
-ESM ⚡️ Build success in 101ms
+ESM dist\cli.js                                25.74 KB
+ESM dist\commands\templates\b2b-saas.js        2.85 KB
+ESM dist\commands\login.js                     1.42 KB
+ESM dist\commands\init.js                      11.53 KB
+ESM dist\utils\config-loader.js                1.05 KB
+ESM dist\utils\auth.js                         971.00 B
+ESM dist\commands\logout.js                    1.17 KB
+ESM dist\commands\pull.js                      6.22 KB
+ESM dist\commands\push.js                      6.27 KB
+ESM dist\commands\templates\starter.js         2.27 KB
+ESM dist\commands\templates\usage-based.js     2.02 KB
+ESM dist\commands\templates\index.js           7.09 KB
+ESM dist\cli.js.map                            50.88 KB
+ESM dist\commands\login.js.map                 3.70 KB
+ESM dist\commands\templates\b2b-saas.js.map    3.84 KB
+ESM dist\commands\init.js.map                  19.25 KB
+ESM dist\utils\config-loader.js.map            2.55 KB
+ESM dist\commands\logout.js.map                3.03 KB
+ESM dist\utils\auth.js.map                     2.24 KB
+ESM dist\commands\pull.js.map                  14.06 KB
+ESM dist\commands\templates\usage-based.js.map 2.75 KB
+ESM dist\commands\templates\starter.js.map     3.21 KB
+ESM dist\commands\push.js.map                  14.83 KB
+ESM dist\commands\templates\index.js.map       10.15 KB
+ESM ⚡️ Build success in 81ms
 DTS Build start
-DTS ⚡️ Build success in 4049ms
-DTS dist\cli.d.ts                 13.00 B
-DTS dist\commands\init.d.ts       353.00 B
-DTS dist\commands\login.d.ts      288.00 B
-DTS dist\commands\logout.d.ts     192.00 B
-DTS dist\commands\pull.d.ts       334.00 B
-DTS dist\commands\push.d.ts       328.00 B
-DTS dist\utils\auth.d.ts          637.00 B
-DTS dist\utils\config-loader.d.ts 566.00 B
+DTS ⚡️ Build success in 7779ms
+DTS dist\cli.d.ts                            13.00 B
+DTS dist\commands\init.d.ts                  353.00 B
+DTS dist\commands\login.d.ts                 288.00 B
+DTS dist\commands\logout.d.ts                192.00 B
+DTS dist\commands\pull.d.ts                  334.00 B
+DTS dist\commands\push.d.ts                  328.00 B
+DTS dist\utils\auth.d.ts                     637.00 B
+DTS dist\utils\config-loader.d.ts            566.00 B
+DTS dist\commands\templates\b2b-saas.d.ts    108.00 B
+DTS dist\commands\templates\index.d.ts       144.00 B
+DTS dist\commands\templates\usage-based.d.ts 114.00 B
+DTS dist\commands\templates\starter.d.ts     208.00 B
 [?9001l[?1004l

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @revstackhq/cli
 
+## 0.0.0-dev-20260227092523
+
+### Minor Changes
+
+- implement modular enterprise configuration structure and interactive addons in init command
+
+## 0.0.0-dev-20260226064743
+
+### Patch Changes
+
+- fix: respect snapshot releases during core package scaffold
+
+## 0.0.0-dev-20260226064458
+
+### Patch Changes
+
+- fix: format console output line breaks correctly in init command
+
 ## 0.0.0-dev-20260226063200
 
 ### Patch Changes

package/README.md

@@ -32,12 +32,14 @@ Scaffold a new `revstack.config.ts` in your project root:
 revstack init
 ```
 
-This creates a starter config with example plans and features using the type-safe helpers from `@revstackhq/core`:
+This creates a `revstack/` directory and a `revstack.config.ts` file in your project root, scaffolding a starter config with example plans and features using type-safe helpers from `@revstackhq/core`:
+
+**`revstack/features.ts`**
 
 ```typescript
-import { defineConfig, definePlan, defineFeature } from "@revstackhq/core";
+import { defineFeature } from "@revstackhq/core";
 
-const features = {
+export const features = {
   seats: defineFeature({
     name: "Seats",
     type: "static",
@@ -49,44 +51,62 @@ const features = {
     unit_type: "count",
   }),
 };
+```
+
+**`revstack/plans.ts`**
+
+```typescript
+import { definePlan } from "@revstackhq/core";
+import { features } from "./features";
+
+export const plans = {
+  // DO NOT DELETE: Automatically created default plan for guests.
+  default: definePlan<typeof features>({
+    name: "Default",
+    description: "Automatically created default plan for guests.",
+    is_default: true,
+    is_public: false,
+    type: "free",
+    features: {},
+  }),
+  pro: definePlan<typeof features>({
+    name: "Pro",
+    description: "For professional teams.",
+    is_default: false,
+    is_public: true,
+    type: "paid",
+    prices: [
+      {
+        amount: 2900,
+        currency: "USD",
+        billing_interval: "monthly",
+        trial_period_days: 14,
+      },
+      {
+        amount: 29000,
+        currency: "USD",
+        billing_interval: "yearly",
+        trial_period_days: 14,
+      },
+    ],
+    features: {
+      seats: { value_limit: 5, is_hard_limit: true },
+      ai_tokens: { value_limit: 1000, reset_period: "monthly" },
+    },
+  }),
+};
+```
+
+**`revstack.config.ts`**
+
+```typescript
+import { defineConfig } from "@revstackhq/core";
+import { features } from "./revstack/features";
+import { plans } from "./revstack/plans";
 
 export default defineConfig({
   features,
-  plans: {
-    default: definePlan<typeof features>({
-      name: "Default",
-      description: "Automatically created default plan for guests.",
-      is_default: true,
-      is_public: false,
-      type: "free",
-      features: {},
-    }),
-    pro: definePlan<typeof features>({
-      name: "Pro",
-      description: "For professional teams.",
-      is_default: false,
-      is_public: true,
-      type: "paid",
-      prices: [
-        {
-          amount: 2900,
-          currency: "USD",
-          billing_interval: "monthly",
-          trial_period_days: 14,
-        },
-        {
-          amount: 29000,
-          currency: "USD",
-          billing_interval: "yearly",
-          trial_period_days: 14,
-        },
-      ],
-      features: {
-        seats: { value_limit: 5, is_hard_limit: true },
-        ai_tokens: { value_limit: 1000, reset_period: "monthly" },
-      },
-    }),
-  },
+  plans,
 });
 ```
 

package/dist/cli.js

@@ -75,7 +75,9 @@ var logoutCommand = new Command2("logout").description("Clear stored Revstack cr
   }
   clearApiKey();
   console.log(
-    "\n" + chalk2.green("  \u2714 Successfully logged out.\n") + chalk2.dim("    Credentials removed from ~/.revstack/credentials.json\n")
+    "\n" + chalk2.green("  \u2714 Successfully logged out.\n") + chalk2.dim(
+      "    Credentials removed from ~/.revstack/credentials.json\n"
+    )
   );
 });
 
@@ -85,23 +87,47 @@ import chalk3 from "chalk";
 import fs2 from "fs";
 import path2 from "path";
 import { spawnSync } from "child_process";
+import { fileURLToPath } from "url";
 import ora from "ora";
-var STARTER_FEATURES = `import { defineFeature } from "@revstackhq/core";
+
+// src/commands/templates/starter.ts
+var starter = {
+  features: `import { defineFeature } from "@revstackhq/core";
 
 export const features = {
-  seats: defineFeature({
-    name: "Seats",
-    type: "static",
-    unit_type: "count",
-  }),
-  ai_tokens: defineFeature({
-    name: "AI Tokens",
-    type: "metered",
-    unit_type: "count",
+  seats: defineFeature({ name: "Seats", type: "static", unit_type: "count" }),
+  priority_support: defineFeature({ name: "Priority Support", type: "boolean", unit_type: "custom" }),
+};
+`,
+  addons: `import { defineAddon } from "@revstackhq/core";
+import { features } from "./features";
+
+export const addons = {
+  extra_seats: defineAddon<typeof features>({
+    name: "5 Extra Seats",
+    description: "Add 5 more team members to your workspace.",
+    type: "recurring",
+    prices: [
+      { amount: 1500, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {
+      seats: { value_limit: 5, type: "increment", is_hard_limit: false },
+    }
   }),
+  vip_support: defineAddon<typeof features>({
+    name: "Priority Support",
+    description: "24/7 Slack channel support.",
+    type: "recurring",
+    prices: [
+      { amount: 9900, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {
+      priority_support: { has_access: true },
+    }
+  })
 };
-`;
-var STARTER_PLANS = `import { definePlan } from "@revstackhq/core";
+`,
+  plans: `import { definePlan } from "@revstackhq/core";
 import { features } from "./features";
 
 export const plans = {
@@ -120,54 +146,260 @@ export const plans = {
     is_default: false,
     is_public: true,
     type: "paid",
+    available_addons: ["extra_seats", "vip_support"],
     prices: [
-      {
-        amount: 2900,
-        currency: "USD",
-        billing_interval: "monthly",
-        trial_period_days: 14,
-      },
-      {
-        amount: 29000,
-        currency: "USD",
-        billing_interval: "yearly",
-        trial_period_days: 14,
-      }
+      { amount: 2900, currency: "USD", billing_interval: "monthly", trial_period_days: 14 }
     ],
     features: {
       seats: { value_limit: 5, is_hard_limit: true },
-      ai_tokens: { value_limit: 1000, reset_period: "monthly" },
     },
   }),
 };
-`;
-var STARTER_CONFIG = `import { defineConfig } from "@revstackhq/core";
-import { features } from "./revstack/features";
-import { plans } from "./revstack/plans";
+`,
+  index: `import { defineConfig } from "@revstackhq/core";
+import { features } from "./features";
+import { addons } from "./addons";
+import { plans } from "./plans";
 
 export default defineConfig({
   features,
+  addons,
   plans,
 });
-`;
-var initCommand = new Command3("init").description("Scaffold a new revstack.config.ts in the current directory").action(async () => {
+`,
+  root: `import config from "./revstack";
+
+export default config;
+`
+};
+
+// src/commands/templates/b2b-saas.ts
+var b2bSaas = {
+  features: `import { defineFeature } from "@revstackhq/core";
+
+export const features = {
+  active_users: defineFeature({ name: "Active Users", type: "static", unit_type: "count" }),
+  api_access: defineFeature({ name: "API Access", type: "boolean", unit_type: "custom" }),
+  custom_domain: defineFeature({ name: "Custom Domain", type: "boolean", unit_type: "custom" }),
+};
+`,
+  addons: `import { defineAddon } from "@revstackhq/core";
+import { features } from "./features";
+
+export const addons = {
+  extra_users: defineAddon<typeof features>({
+    name: "10 Extra Users",
+    description: "Add 10 more active users to your workspace.",
+    type: "recurring",
+    prices: [
+      { amount: 5000, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {
+      active_users: { value_limit: 10, type: "increment", is_hard_limit: true },
+    }
+  }),
+  dedicated_support: defineAddon<typeof features>({
+    name: "Dedicated Support",
+    description: "Enterprise SLA with 1-hour response time.",
+    type: "recurring",
+    prices: [
+      { amount: 49900, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {}
+  })
+};
+`,
+  plans: `import { definePlan } from "@revstackhq/core";
+import { features } from "./features";
+
+export const plans = {
+  default: definePlan<typeof features>({
+    name: "Default",
+    description: "Automatically created default plan for guests.",
+    is_default: true,
+    is_public: false,
+    type: "free",
+    features: {},
+  }),
+  startup: definePlan<typeof features>({
+    name: "Startup",
+    description: "For small teams getting started.",
+    is_default: false,
+    is_public: true,
+    type: "paid",
+    available_addons: ["extra_users"],
+    prices: [
+      { amount: 9900, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {
+      active_users: { value_limit: 10, is_hard_limit: true },
+      api_access: { value_bool: false },
+      custom_domain: { value_bool: false },
+    },
+  }),
+  enterprise: definePlan<typeof features>({
+    name: "Enterprise",
+    description: "Advanced features for scale.",
+    is_default: false,
+    is_public: true,
+    type: "paid",
+    available_addons: ["extra_users", "dedicated_support"],
+    prices: [
+      { amount: 49900, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {
+      active_users: { value_limit: 100, is_hard_limit: false },
+      api_access: { value_bool: true },
+      custom_domain: { value_bool: true },
+    },
+  }),
+};
+`,
+  index: `import { defineConfig } from "@revstackhq/core";
+import { features } from "./features";
+import { addons } from "./addons";
+import { plans } from "./plans";
+
+export default defineConfig({
+  features,
+  addons,
+  plans,
+});
+`,
+  root: `import config from "./revstack";
+
+export default config;
+`
+};
+
+// src/commands/templates/usage-based.ts
+var usageBased = {
+  features: `import { defineFeature } from "@revstackhq/core";
+
+export const features = {
+  api_requests: defineFeature({ name: "API Requests", type: "metered", unit_type: "requests" }),
+  storage_gb: defineFeature({ name: "Storage (GB)", type: "metered", unit_type: "custom" }),
+};
+`,
+  addons: `import { defineAddon } from "@revstackhq/core";
+import { features } from "./features";
+
+export const addons = {
+  premium_support: defineAddon<typeof features>({
+    name: "Premium Support",
+    description: "24/7 dedicated support.",
+    type: "recurring",
+    prices: [
+      { amount: 20000, currency: "USD", billing_interval: "monthly" }
+    ],
+    features: {}
+  })
+};
+`,
+  plans: `import { definePlan } from "@revstackhq/core";
+import { features } from "./features";
+
+export const plans = {
+  default: definePlan<typeof features>({
+    name: "Default",
+    description: "Automatically created default plan for guests.",
+    is_default: true,
+    is_public: false,
+    type: "free",
+    features: {},
+  }),
+  pay_as_you_go: definePlan<typeof features>({
+    name: "Pay As You Go",
+    description: "Flexible usage-based pricing.",
+    is_default: false,
+    is_public: true,
+    type: "paid",
+    available_addons: ["premium_support"],
+    prices: [
+      { amount: 0, currency: "USD", billing_interval: "monthly" } // Base platform fee
+    ],
+    features: {
+      api_requests: { value_limit: 10000, is_hard_limit: false, reset_period: "monthly" }, // 10k free requests per month
+      storage_gb: { value_limit: 5, is_hard_limit: false, reset_period: "never" }, // 5GB free storage lifetime
+    },
+  }),
+};
+`,
+  index: `import { defineConfig } from "@revstackhq/core";
+import { features } from "./features";
+import { addons } from "./addons";
+import { plans } from "./plans";
+
+export default defineConfig({
+  features,
+  addons,
+  plans,
+});
+`,
+  root: `import config from "./revstack";
+
+export default config;
+`
+};
+
+// src/commands/templates/index.ts
+var TEMPLATES = {
+  starter,
+  "b2b-saas": b2bSaas,
+  "usage-based": usageBased
+};
+
+// src/commands/init.ts
+var initCommand = new Command3("init").description("Scaffold a new revstack.config.ts in the current directory").option(
+  "-t, --template <name>",
+  "Choose a starting template (starter, b2b-saas, usage-based)",
+  "starter"
+).action(async (options) => {
+  const templateName = options.template || "starter";
+  const template = TEMPLATES[templateName];
+  if (!template) {
+    console.log(
+      chalk3.red(
+        `
+  \u2716 Unknown template "${templateName}". Available templates: ${Object.keys(TEMPLATES).join(", ")}
+`
+      )
+    );
+    process.exit(1);
+  }
   const cwd = process.cwd();
   const configPath = path2.resolve(cwd, "revstack.config.ts");
-  const revstackDir = path2.resolve(cwd, "revstack");
-  const featuresPath = path2.resolve(revstackDir, "features.ts");
-  const plansPath = path2.resolve(revstackDir, "plans.ts");
   if (fs2.existsSync(configPath)) {
     console.log(
       "\n" + chalk3.yellow("  \u26A0 revstack.config.ts already exists.\n") + chalk3.dim("    Delete it first if you want to start fresh.\n")
     );
     process.exit(1);
   }
+  const revstackDir = path2.resolve(cwd, "revstack");
   if (!fs2.existsSync(revstackDir)) {
     fs2.mkdirSync(revstackDir, { recursive: true });
   }
-  fs2.writeFileSync(featuresPath, STARTER_FEATURES, "utf-8");
-  fs2.writeFileSync(plansPath, STARTER_PLANS, "utf-8");
-  fs2.writeFileSync(configPath, STARTER_CONFIG, "utf-8");
+  fs2.writeFileSync(
+    path2.resolve(revstackDir, "features.ts"),
+    template.features,
+    "utf-8"
+  );
+  fs2.writeFileSync(
+    path2.resolve(revstackDir, "addons.ts"),
+    template.addons,
+    "utf-8"
+  );
+  fs2.writeFileSync(
+    path2.resolve(revstackDir, "plans.ts"),
+    template.plans,
+    "utf-8"
+  );
+  fs2.writeFileSync(
+    path2.resolve(revstackDir, "index.ts"),
+    template.index,
+    "utf-8"
+  );
+  fs2.writeFileSync(configPath, template.root, "utf-8");
   let packageManager = "npm";
   if (fs2.existsSync(path2.resolve(cwd, "pnpm-lock.yaml"))) {
     packageManager = "pnpm";
@@ -186,8 +418,15 @@ var initCommand = new Command3("init").description("Scaffold a new revstack.conf
   const spinner = ora("Installing @revstackhq/core...").start();
   let installFailed = false;
   try {
-    const pkgVersion = process.env.npm_package_version || "dev";
-    const tag = pkgVersion.includes("dev") ? "@dev" : "@latest";
+    const cliDir = path2.dirname(fileURLToPath(import.meta.url));
+    const pkgJsonPath = path2.resolve(cliDir, "../../package.json");
+    let cliVersion = "dev";
+    try {
+      const pkgData = fs2.readFileSync(pkgJsonPath, "utf-8");
+      cliVersion = JSON.parse(pkgData).version;
+    } catch (e) {
+    }
+    const tag = cliVersion.includes("dev") ? `@${cliVersion}` : "@latest";
     const pkgName = `@revstackhq/core${tag}`;
     const installArgs = packageManager === "yarn" ? ["add", pkgName] : packageManager === "pnpm" ? ["add", pkgName] : ["install", pkgName];
     let result = spawnSync(packageManager, installArgs, { cwd, shell: true });
@@ -217,9 +456,9 @@ var initCommand = new Command3("init").description("Scaffold a new revstack.conf
     );
   }
   console.log(
-    "\n" + chalk3.green("  \u2714 Created revstack config structure\n") + "\n" + chalk3.dim("    Includes the ") + chalk3.white("Default Guest Plan") + chalk3.dim(" (required by Revstack).\n") + "\\n" + chalk3.dim("    Next steps:\\n") + (installFailed ? chalk3.dim("    0. ") + chalk3.white(
-      "Run " + chalk3.bold(packageManager + " install @revstackhq/core") + " manually\\n"
-    ) : "") + chalk3.dim("    1. ") + chalk3.white("Edit the config to match your billing model\\n") + chalk3.dim("    2. ") + chalk3.white("Run ") + chalk3.bold("revstack login") + chalk3.white(" to authenticate\\n") + chalk3.dim("    3. ") + chalk3.white("Run ") + chalk3.bold("revstack push") + chalk3.white(" to deploy\\n")
+    "\n" + chalk3.green("  \u2714 Created revstack config structure\n") + "\n" + chalk3.dim("    Includes the ") + chalk3.white("Default Guest Plan") + chalk3.dim(" (required by Revstack).\n") + "\n" + chalk3.dim("    Next steps:\n") + (installFailed ? chalk3.dim("    0. ") + chalk3.white(
+      "Run " + chalk3.bold(packageManager + " install @revstackhq/core") + " manually\n"
+    ) : "") + chalk3.dim("    1. ") + chalk3.white("Edit the config to match your billing model\n") + chalk3.dim("    2. ") + chalk3.white("Run ") + chalk3.bold("revstack login") + chalk3.white(" to authenticate\n") + chalk3.dim("    3. ") + chalk3.white("Run ") + chalk3.bold("revstack push") + chalk3.white(" to deploy\n")
   );
 });
 
@@ -258,6 +497,7 @@ async function loadLocalConfig(cwd) {
 }
 
 // src/commands/push.ts
+import { validateConfig, RevstackValidationError } from "@revstackhq/core";
 var API_BASE = "https://app.revstack.dev";
 var DIFF_ICONS = {
   added: chalk5.green("  + "),
@@ -300,6 +540,37 @@ function requireAuth() {
 var pushCommand = new Command4("push").description("Push your local billing config to Revstack Cloud").option("-e, --env <environment>", "Target environment", "test").action(async (options) => {
   const apiKey = requireAuth();
   const config = await loadLocalConfig(process.cwd());
+  const validationSpinner = ora2({
+    text: "Validating billing configuration...",
+    prefixText: " "
+  }).start();
+  try {
+    validateConfig(config);
+    validationSpinner.succeed("Configuration validated");
+  } catch (error) {
+    if (error instanceof RevstackValidationError || error?.name === "RevstackValidationError") {
+      validationSpinner.fail("Configuration invalid");
+      console.error(
+        chalk5.red(
+          "\n  \u2716 The billing configuration contains business logic errors:\n"
+        )
+      );
+      for (const err of error.errors || []) {
+        console.error(chalk5.red(`    \u2022 ${err}`));
+      }
+      console.log();
+      process.exit(1);
+    }
+    validationSpinner.fail("Validation failed");
+    console.error(
+      chalk5.red(
+        `
+  An unexpected error occurred during validation: ${error?.message || String(error)}
+`
+      )
+    );
+    process.exit(1);
+  }
   const spinner = ora2({
     text: "Calculating diff...",
     prefixText: " "