atmn 2.0.141 → 2.0.143

package/dist/bin.js

@@ -853,6 +853,12 @@ var API_ROUTES = [
         required: false,
         description: "Whether this feature is consumable. A consumable feature is one that periodically resets and is consumed rather than allocated (like credits, API requests, etc.). Applicable only for 'metered' features."
       },
+      {
+        name: "combine",
+        type: "string",
+        required: false,
+        description: "How grants of this feature from several plans combine. 'sum' (default) adds them up. 'max' or 'min' keeps only the highest or lowest grant among plan items with no price; priced items always add on top. Metered and credit system features only."
+      },
       {
         name: "display",
         type: "json",
@@ -944,6 +950,12 @@ var API_ROUTES = [
         required: false,
         description: "Whether this feature is consumable. A consumable feature is one that periodically resets and is consumed rather than allocated (like credits, API requests, etc.). Applicable only for 'metered' features."
       },
+      {
+        name: "combine",
+        type: "string",
+        required: false,
+        description: "How grants of this feature from several plans combine. 'sum' (default) adds them up. 'max' or 'min' keeps only the highest or lowest grant among plan items with no price; priced items always add on top. Metered and credit system features only."
+      },
       {
         name: "display",
         type: "json",
@@ -4468,6 +4480,9 @@ var LINT_RULES = {
       type: {
         enum: ["boolean", "metered", "credit_system", "ai_credit_system"]
       },
+      combine: {
+        enum: ["sum", "max", "min"]
+      },
       defaultMarkup: {
         minimum: -100
       },
@@ -4874,37 +4889,28 @@ var LINT_RULES = {
   },
   "plans.items.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -5146,37 +5152,28 @@ var LINT_RULES = {
   },
   "plans.licenses.customize.addItems.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -5491,37 +5488,28 @@ var LINT_RULES = {
   },
   "plans.variants.customize.addItems.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -5844,37 +5832,28 @@ var LINT_RULES = {
   },
   "plans.variants.customize.items.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -6140,37 +6119,28 @@ var LINT_RULES = {
   },
   "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -7756,7 +7726,7 @@ var createClient = (options) => ({
 });
 
 // src/version.ts
-var version = "2.0.141";
+var version = "2.0.143";
 
 // src/http/autumnFetch.ts
 var runtime = typeof Bun !== "undefined" ? `bun ${Bun.version}` : `node ${process.versions.node}`;
@@ -8701,6 +8671,7 @@ var COLLECTIONS = {
       "name",
       "type",
       "consumable",
+      "combine",
       "creditSchema",
       "modelMarkups",
       "defaultMarkup",
@@ -8730,6 +8701,7 @@ var COLLECTIONS = {
     ],
     paths: [
       "archived",
+      "combine",
       "consumable",
       "creditSchema",
       "creditSchema.billingUnits",
@@ -8825,6 +8797,7 @@ var COLLECTIONS = {
       "items.featureOverride.creditSchema.dimensions.*.tiers",
       "items.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "items.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "items.featureOverride.creditSchema.excluded",
       "items.featureOverride.creditSchema.meteredFeatureId",
       "items.featureOverride.creditSchema.multipliers.*.match",
       "items.featureOverride.creditSchema.tierBehavior",
@@ -8853,6 +8826,7 @@ var COLLECTIONS = {
       "licenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers",
       "licenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "licenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "licenses.customize.addItems.featureOverride.creditSchema.excluded",
       "licenses.customize.addItems.featureOverride.creditSchema.meteredFeatureId",
       "licenses.customize.addItems.featureOverride.creditSchema.multipliers.*.match",
       "licenses.customize.addItems.featureOverride.creditSchema.tierBehavior",
@@ -8896,6 +8870,7 @@ var COLLECTIONS = {
       "variants.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers",
       "variants.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "variants.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "variants.customize.addItems.featureOverride.creditSchema.excluded",
       "variants.customize.addItems.featureOverride.creditSchema.meteredFeatureId",
       "variants.customize.addItems.featureOverride.creditSchema.multipliers.*.match",
       "variants.customize.addItems.featureOverride.creditSchema.tierBehavior",
@@ -8937,6 +8912,7 @@ var COLLECTIONS = {
       "variants.customize.items.featureOverride.creditSchema.dimensions.*.tiers",
       "variants.customize.items.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "variants.customize.items.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "variants.customize.items.featureOverride.creditSchema.excluded",
       "variants.customize.items.featureOverride.creditSchema.meteredFeatureId",
       "variants.customize.items.featureOverride.creditSchema.multipliers.*.match",
       "variants.customize.items.featureOverride.creditSchema.tierBehavior",
@@ -8968,6 +8944,7 @@ var COLLECTIONS = {
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tierBehavior",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
+      "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.excluded",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.meteredFeatureId",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.multipliers.*.match",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.tierBehavior",
@@ -9070,6 +9047,7 @@ var COLLECTIONS = {
       "items.featureOverride.creditSchema.dimensions.*.tiers",
       "items.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "items.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "items.featureOverride.creditSchema.excluded",
       "items.featureOverride.creditSchema.meteredFeatureId",
       "items.featureOverride.creditSchema.multipliers",
       "items.featureOverride.creditSchema.multipliers.*.add",
@@ -9146,6 +9124,7 @@ var COLLECTIONS = {
       "licenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers",
       "licenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "licenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "licenses.customize.addItems.featureOverride.creditSchema.excluded",
       "licenses.customize.addItems.featureOverride.creditSchema.meteredFeatureId",
       "licenses.customize.addItems.featureOverride.creditSchema.multipliers",
       "licenses.customize.addItems.featureOverride.creditSchema.multipliers.*.add",
@@ -9261,6 +9240,7 @@ var COLLECTIONS = {
       "variants.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers",
       "variants.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "variants.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "variants.customize.addItems.featureOverride.creditSchema.excluded",
       "variants.customize.addItems.featureOverride.creditSchema.meteredFeatureId",
       "variants.customize.addItems.featureOverride.creditSchema.multipliers",
       "variants.customize.addItems.featureOverride.creditSchema.multipliers.*.add",
@@ -9375,6 +9355,7 @@ var COLLECTIONS = {
       "variants.customize.items.featureOverride.creditSchema.dimensions.*.tiers",
       "variants.customize.items.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "variants.customize.items.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "variants.customize.items.featureOverride.creditSchema.excluded",
       "variants.customize.items.featureOverride.creditSchema.meteredFeatureId",
       "variants.customize.items.featureOverride.creditSchema.multipliers",
       "variants.customize.items.featureOverride.creditSchema.multipliers.*.add",
@@ -9463,6 +9444,7 @@ var COLLECTIONS = {
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.creditCost",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.dimensions.*.tiers.to",
+      "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.excluded",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.meteredFeatureId",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.multipliers",
       "variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema.multipliers.*.add",
@@ -10014,16 +9996,16 @@ import { dirname as dirname4, join as join7 } from "node:path";
 import chalk3 from "chalk";
 
 // src/generated/skills.ts
-var SKILLS_VERSION = "2.0.140";
+var SKILLS_VERSION = "2.0.142";
 var SKILLS = [
   {
     name: "autumn-setup",
     description: "First-time Autumn setup — install the atmn CLI, connect to an org (sign in, or keyless with no account), turn the user's pricing into autumn.config.ts, and push it to a sandbox org. Use when the user is new to Autumn, pastes an Autumn setup prompt, or asks to set up Autumn, add billing, monetization, subscriptions, usage-based billing, pricing, or plans. If Autumn is already set up, use autumn-catalog instead.",
-    version: "2.0.140",
+    version: "2.0.142",
     markdown: `---
 name: autumn-setup
 description: First-time Autumn setup — install the atmn CLI, connect to an org (sign in, or keyless with no account), turn the user's pricing into autumn.config.ts, and push it to a sandbox org. Use when the user is new to Autumn, pastes an Autumn setup prompt, or asks to set up Autumn, add billing, monetization, subscriptions, usage-based billing, pricing, or plans. If Autumn is already set up, use autumn-catalog instead.
-version: 2.0.140
+version: 2.0.142
 ---
 
 # Setup
@@ -10181,11 +10163,11 @@ Then stop. Don't keep building, don't tour the dashboard, don't deploy anything.
   {
     name: "autumn-catalog",
     description: "Modeling a user's pricing into an Autumn catalog — deciding the structure (plans, variants, add-ons, licenses, credit systems, pooled balances) before writing config, then filling in the numbers. Use when the user describes their pricing or asks to model, change, or push a catalog.",
-    version: "2.0.140",
+    version: "2.0.142",
     markdown: `---
 name: autumn-catalog
 description: Modeling a user's pricing into an Autumn catalog — deciding the structure (plans, variants, add-ons, licenses, credit systems, pooled balances) before writing config, then filling in the numbers. Use when the user describes their pricing or asks to model, change, or push a catalog.
-version: 2.0.140
+version: 2.0.142
 ---
 
 # Catalog
@@ -14029,11 +14011,11 @@ Pitch: "Pro $20/mo or $200/yr — 1,000 messages per month either way."
   {
     name: "autumn-integrate",
     description: "Integrating Autumn into an app's backend — creating customers, billing flows (attach, checkout, upgrade, cancel), gating features with check, recording usage with track, and exposing billing data to the frontend. Use when the user asks to integrate Autumn, add billing/payments to their app, gate features, meter usage, or build checkout/upgrade flows. Requires a pushed catalog; use autumn-catalog first if plans don't exist yet.",
-    version: "2.0.140",
+    version: "2.0.142",
     markdown: `---
 name: autumn-integrate
 description: Integrating Autumn into an app's backend — creating customers, billing flows (attach, checkout, upgrade, cancel), gating features with check, recording usage with track, and exposing billing data to the frontend. Use when the user asks to integrate Autumn, add billing/payments to their app, gate features, meter usage, or build checkout/upgrade flows. Requires a pushed catalog; use autumn-catalog first if plans don't exist yet.
-version: 2.0.140
+version: 2.0.142
 ---
 
 # Integrate
@@ -18736,11 +18718,11 @@ Monitor your logs for this message. If you see it, check [status.useautumn.com](
   {
     name: "autumn-concepts",
     description: "Understanding Autumn's billing objects before acting on them — what a plan version is and what active means, when a trial starts or ends billing, how entity- and seat-scoped subscriptions differ from the customer's own, what a customize diff actually changes, and how caps, overage, and top-ups behave. Load before versioning, editing, or drafting a plan, or when a customer's state does not match the plain reading of their plan.",
-    version: "2.0.140",
+    version: "2.0.142",
     markdown: `---
 name: autumn-concepts
 description: Understanding Autumn's billing objects before acting on them — what a plan version is and what active means, when a trial starts or ends billing, how entity- and seat-scoped subscriptions differ from the customer's own, what a customize diff actually changes, and how caps, overage, and top-ups behave. Load before versioning, editing, or drafting a plan, or when a customer's state does not match the plain reading of their plan.
-version: 2.0.140
+version: 2.0.142
 ---
 
 # Concepts

package/dist/index.js

@@ -77,6 +77,9 @@ var LINT_RULES = {
       type: {
         enum: ["boolean", "metered", "credit_system", "ai_credit_system"]
       },
+      combine: {
+        enum: ["sum", "max", "min"]
+      },
       defaultMarkup: {
         minimum: -100
       },
@@ -483,37 +486,28 @@ var LINT_RULES = {
   },
   "plans.items.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -755,37 +749,28 @@ var LINT_RULES = {
   },
   "plans.licenses.customize.addItems.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -1100,37 +1085,28 @@ var LINT_RULES = {
   },
   "plans.variants.customize.addItems.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -1453,37 +1429,28 @@ var LINT_RULES = {
   },
   "plans.variants.customize.items.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }
@@ -1749,37 +1716,28 @@ var LINT_RULES = {
   },
   "plans.variants.customize.upsertLicenses.customize.addItems.featureOverride.creditSchema": {
     variants: {
-      on: "tierBehavior",
+      on: "excluded",
       byValue: {
-        graduated: {
-          required: ["meteredFeatureId", "tierBehavior", "tiers"],
+        true: {
+          required: ["excluded", "meteredFeatureId"],
           fields: {
             meteredFeatureId: {
               minLength: 1
             },
-            billingUnits: {
-              exclusiveMinimum: 0
-            },
-            tierBehavior: {
-              enum: ["graduated"]
-            },
-            tiers: {
-              minItems: 1
+            excluded: {
+              enum: [true]
             }
           }
         }
       },
       fallback: {
-        required: ["creditCost", "meteredFeatureId"],
+        required: ["meteredFeatureId"],
         fields: {
           meteredFeatureId: {
             minLength: 1
           },
           billingUnits: {
             exclusiveMinimum: 0
-          },
-          creditCost: {
-            minimum: 0
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmn",
-  "version": "2.0.141",
+  "version": "2.0.143",
   "license": "MIT",
   "description": "The CLI for Autumn — define your pricing in code, sync it to Autumn, and keep everything in version control.",
   "bin": {
@@ -49,5 +49,5 @@
     "open": "10.2.0",
     "yaml": "2.9.0"
   },
-  "gitHead": "ce44d6643bbb6f6cf2b604cf35053bf986405443"
+  "gitHead": "d926aad643467a6217e5a0d83eee7566537fd383"
 }