atmn 1.1.18 → 1.1.20

package/dist/cli.js

@@ -45772,30 +45772,16 @@ async function startCallbackServer(port, onCallback, onListening) {
     server.listen(port, onListening);
   });
 }
+function buildCliOAuthScopes() {
+  return CLI_SCOPE_REQUESTS.flatMap(({ resource, actions }) => actions.map((action) => `${resource}:${action}`));
+}
 async function startOAuthFlow(clientId, options) {
   const codeVerifier = generateCodeVerifier();
   const state = generateState();
   for (const port of OAUTH_PORTS) {
     const redirectUri = getOAuthRedirectUri(port);
     const client = new OAuth2Client(clientId, null, redirectUri);
-    const authUrl = client.createAuthorizationURLWithPKCE(getAuthorizationEndpoint(), state, CodeChallengeMethod.S256, codeVerifier, [
-      ...[
-        {
-          resource: "customers",
-          actions: ["create", "read", "list", "update", "delete"]
-        },
-        {
-          resource: "features",
-          actions: ["create", "read", "list", "update", "delete"]
-        },
-        {
-          resource: "plans",
-          actions: ["create", "read", "list", "update", "delete"]
-        },
-        { resource: "apiKeys", actions: ["create", "read"] },
-        { resource: "organisation", actions: ["read"] }
-      ].flatMap(({ resource, actions }) => actions.map((action) => `${resource}:${action}`))
-    ]);
+    const authUrl = client.createAuthorizationURLWithPKCE(getAuthorizationEndpoint(), state, CodeChallengeMethod.S256, codeVerifier, buildCliOAuthScopes());
     authUrl.searchParams.set("prompt", "consent");
     const result2 = await startCallbackServer(port, async (url) => {
       const error = url.searchParams.get("error");
@@ -45872,12 +45858,29 @@ async function getApiKeysWithToken(accessToken) {
     orgId: data.org_id
   };
 }
-var getAuthorizationEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/authorize`, getTokenEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/token`;
+var getAuthorizationEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/authorize`, getTokenEndpoint = () => `${getBackendUrl()}/api/auth/oauth2/token`, CLI_SCOPE_REQUESTS;
 var init_oauth = __esm(() => {
   init_dist8();
   init_open();
   init_backendUrl();
   init_constants();
+  CLI_SCOPE_REQUESTS = [
+    {
+      resource: "customers",
+      actions: ["create", "read", "list", "update", "delete"]
+    },
+    {
+      resource: "features",
+      actions: ["create", "read", "list", "update", "delete"]
+    },
+    {
+      resource: "plans",
+      actions: ["create", "read", "list", "update", "delete"]
+    },
+    { resource: "rewards", actions: ["read", "write"] },
+    { resource: "apiKeys", actions: ["create", "read"] },
+    { resource: "organisation", actions: ["read"] }
+  ];
 });
 
 // src/lib/api/client.ts
@@ -47088,11 +47091,22 @@ var init_apiToSdk = __esm(() => {
 
 // src/lib/transforms/inPlaceUpdate/parseConfig.ts
 import { readFileSync as readFileSync3 } from "node:fs";
-function extractId(lines) {
+function extractIdentity({
+  identitiesByTypeAndVarName,
+  lines,
+  type,
+  varName
+}) {
   const joined = lines.join(`
 `);
-  const match = joined.match(/id:\s*['"]([^'"]+)['"]/);
-  return match ? match[1] ?? null : null;
+  const mapped = type && varName ? identitiesByTypeAndVarName?.get(type)?.get(varName) : undefined;
+  const id = joined.match(/id:\s*['"]([^'"]+)['"]/)?.[1];
+  if (!id)
+    return mapped ?? null;
+  if (mapped?.id === id)
+    return mapped;
+  const version = joined.match(/id:\s*['"][^'"]+['"]\s*,?\s*version:\s*(\d+)/)?.[1];
+  return { id, version: version === undefined ? undefined : Number(version) };
 }
 function extractVarName(line) {
   const match = line.match(/export\s+const\s+(\w+)\s*=/);
@@ -47122,7 +47136,10 @@ function determineEntityType(lines) {
   }
   return null;
 }
-function parseExistingConfig(configPath) {
+function parseExistingConfig({
+  configPath,
+  identitiesByTypeAndVarName
+}) {
   const source = readFileSync3(configPath, "utf-8");
   const lines = source.split(`
 `);
@@ -47138,7 +47155,7 @@ function parseExistingConfig(configPath) {
     }
     if (trimmed.startsWith("import ")) {
       const startLine = i;
-      while (i < lines.length && !lines[i].includes(";")) {
+      while (i < lines.length && !/(?:["'];?|;)\s*(?:\/\/.*|\/\*.*)?$/.test(lines[i])) {
         i++;
       }
       const endLine = i;
@@ -47191,18 +47208,30 @@ function parseExistingConfig(configPath) {
             depth--;
           }
         }
-        if (foundStart && depth === 0 && currentLine.includes(";")) {
+        if (foundStart && depth === 0) {
           break;
         }
         i++;
       }
       const endLine = i;
       const blockLines = lines.slice(startLine, endLine + 1);
-      const id = extractId(blockLines);
       const entityType = determineEntityType(blockLines);
-      if (id && entityType && varName) {
+      const blockSource = blockLines.join(`
+`);
+      const declaration = entityType && varName && isResourceExpression(blockSource) ? {
+        requiresRuntimeIdentity: !/id:\s*['"][^'"]+['"]/.test(blockSource),
+        type: entityType,
+        varName
+      } : undefined;
+      const identity2 = extractIdentity({
+        identitiesByTypeAndVarName,
+        lines: blockLines,
+        type: entityType,
+        varName
+      });
+      if (identity2 && entityType && varName) {
         const entity = {
-          id,
+          ...identity2,
           type: entityType,
           varName,
           startLine,
@@ -47214,6 +47243,7 @@ function parseExistingConfig(configPath) {
           startLine,
           endLine,
           lines: blockLines,
+          declaration,
           entity
         });
         entities.push(entity);
@@ -47222,7 +47252,8 @@ function parseExistingConfig(configPath) {
           type: "other",
           startLine,
           endLine,
-          lines: blockLines
+          lines: blockLines,
+          declaration
         });
       }
       i++;
@@ -47243,6 +47274,7 @@ function parseExistingConfig(configPath) {
     source
   };
 }
+var isResourceExpression = (source) => /=\s*(?:feature|plan|referralProgram|reward)\s*\(/.test(source) || /=\s*\w+\.variant\s*\(/.test(source);
 var init_parseConfig = () => {};
 
 // src/lib/config/loadConfig.ts
@@ -47250,7 +47282,7 @@ import { existsSync as existsSync4 } from "node:fs";
 import { resolve as resolve3 } from "node:path";
 import { pathToFileURL } from "node:url";
 import createJiti from "jiti";
-var DEFAULT_REWARD_EXPORT_ERROR = "Rewards and referral programs must be named reward() and referralProgram() exports; move them out of the default export before pulling or pushing.", importConfig = async ({
+var DEFAULT_REWARD_EXPORT_ERROR = "Rewards and referral programs must be named reward() and referralProgram() exports; move them out of the default export before pulling or pushing.", loadConfigModule = async ({
   cwd: cwd2
 }) => {
   const configPath = resolveConfigPath(cwd2);
@@ -47260,7 +47292,7 @@ var DEFAULT_REWARD_EXPORT_ERROR = "Rewards and referral programs must be named r
 }, loadConfig = async ({
   cwd: cwd2 = process.cwd()
 } = {}) => {
-  const mod = await importConfig({ cwd: cwd2 });
+  const mod = await loadConfigModule({ cwd: cwd2 });
   const config = {
     features: [],
     plans: [],
@@ -47410,7 +47442,10 @@ function formatValue(value) {
   }
   return String(value);
 }
-var upperFirst2 = (value) => value.charAt(0).toUpperCase() + value.slice(1), allocateVarNames = ({
+var upperFirst2 = (value) => value.charAt(0).toUpperCase() + value.slice(1), versionedCodegenId = ({
+  id,
+  version
+}) => version === undefined ? id : `${id}-v-${version}`, allocateVarNames = ({
   ids,
   candidate,
   suffix,
@@ -47779,7 +47814,7 @@ function generatePlanWithVariantsCode({
     variant,
     features,
     featureVarMap,
-    varNameOverride: variantVarMap.get(variant.id)
+    varNameOverride: variantVarMap.get(versionedCodegenId(variant))
   }));
   return [basePlanCode, ...variantCodes].join(`
 
@@ -47796,10 +47831,31 @@ async function updateConfigInPlace({
   if (!existsSync5(configPath)) {
     throw new Error(`Config file not found: ${configPath}`);
   }
-  const parsed = parseExistingConfig(configPath);
+  let parsed = parseExistingConfig({ configPath });
   const hasDefaultResources = /\bexport\s+default\b/.test(parsed.source) && /\b(?:rewards|referralPrograms)\b/.test(parsed.source);
   if (hasDefaultResources)
     throw new Error(DEFAULT_REWARD_EXPORT_ERROR);
+  const versionedIdsByType = new Map([
+    ["plan", versionedIds(plans)],
+    ["variant", versionedIds(plans.flatMap((plan) => plan.variants ?? []))]
+  ]);
+  const runtimeDeclarations = parsed.blocks.flatMap(({ declaration, entity }) => declaration && (declaration.requiresRuntimeIdentity || entity && versionedIdsByType.get(entity.type)?.has(entity.id)) ? [declaration] : []);
+  if (runtimeDeclarations.length) {
+    const mod = await loadConfigModule({ cwd: cwd2 });
+    const identitiesByTypeAndVarName = new Map;
+    for (const declaration of runtimeDeclarations) {
+      const value = mod[declaration.varName];
+      if (typeof value?.id !== "string")
+        throw new Error(`Could not resolve the ID of export '${declaration.varName}'.`);
+      const identities = identitiesByTypeAndVarName.get(declaration.type) ?? new Map;
+      identities.set(declaration.varName, {
+        id: value.id,
+        version: typeof value.version === "number" ? value.version : undefined
+      });
+      identitiesByTypeAndVarName.set(declaration.type, identities);
+    }
+    parsed = parseExistingConfig({ configPath, identitiesByTypeAndVarName });
+  }
   const requiredImports = [
     ...plans.some((plan) => plan.billingControls) ? ["billingControls"] : [],
     ...rewards?.length ? ["reward"] : [],
@@ -47814,17 +47870,17 @@ async function updateConfigInPlace({
     plansDeleted: 0
   };
   const apiFeatureMap = new Map(features.map((f) => [f.id, f]));
-  const apiPlanMap = new Map(plans.map((p) => [p.id, p]));
+  const apiPlanMap = new Map(plans.map((p) => [versionedCodegenId(p), p]));
   const apiRewardMap = new Map((rewards ?? []).map((reward) => [reward.id, reward]));
   const apiReferralProgramMap = new Map((referralPrograms ?? []).map((program2) => [program2.id, program2]));
-  const apiVariantMap = new Map(plans.flatMap((plan) => (plan.variants ?? []).map((variant) => [variant.id, variant])));
+  const apiVariantMap = new Map(plans.flatMap((plan) => (plan.variants ?? []).map((variant) => [versionedCodegenId(variant), variant])));
   const featureVarMap = new Map;
   const existingVariantVarMap = new Map;
   for (const entity of parsed.entities) {
     if (entity.type === "feature") {
       featureVarMap.set(entity.id, entity.varName);
     } else if (entity.type === "variant") {
-      existingVariantVarMap.set(entity.id, entity.varName);
+      existingVariantVarMap.set(versionedCodegenId(entity), entity.varName);
     }
   }
   const existingVarNames = new Set([...parsed.source.matchAll(/export\s+const\s+([\w$]+)\s*=/g)].flatMap(([, varName]) => varName ? [varName] : []));
@@ -47839,8 +47895,8 @@ async function updateConfigInPlace({
     newFeatureVarMap.set(id, varName);
     featureVarMap.set(id, varName);
   }
-  const existingPlanIds = new Set(parsed.entities.filter((e) => e.type === "plan").map((e) => e.id));
-  const newPlanIds = plans.filter((p) => !existingPlanIds.has(p.id)).map((p) => p.id);
+  const existingPlanIds = new Set(parsed.entities.filter((e) => e.type === "plan").map(versionedCodegenId));
+  const newPlanIds = plans.filter((p) => !existingPlanIds.has(versionedCodegenId(p))).map(versionedCodegenId);
   const newPlanVarMap = new Map;
   for (const id of newPlanIds) {
     const varName = claimVarName({
@@ -47851,17 +47907,17 @@ async function updateConfigInPlace({
     newPlanVarMap.set(id, varName);
   }
   const variantVarMap = new Map;
-  for (const id of apiVariantMap.keys()) {
-    if (existingVariantVarMap.has(id)) {
-      variantVarMap.set(id, existingVariantVarMap.get(id));
+  for (const key of apiVariantMap.keys()) {
+    if (existingVariantVarMap.has(key)) {
+      variantVarMap.set(key, existingVariantVarMap.get(key));
       continue;
     }
     const varName = claimVarName({
-      candidate: variantIdToVarName(id),
+      candidate: variantIdToVarName(key),
       suffix: "Variant",
       usedNames: existingVarNames
     });
-    variantVarMap.set(id, varName);
+    variantVarMap.set(key, varName);
   }
   const newRewardVarMap = new Map;
   for (const { id } of rewards ?? []) {
@@ -47941,7 +47997,8 @@ async function updateConfigInPlace({
           result2.featuresDeleted++;
         }
       } else if (entity.type === "plan") {
-        const apiPlan = apiPlanMap.get(entity.id);
+        const planKey2 = versionedCodegenId(entity);
+        const apiPlan = apiPlanMap.get(planKey2);
         if (apiPlan) {
           const newCode = generatePlanWithVariantsCode({
             featureVarMap,
@@ -47951,14 +48008,14 @@ async function updateConfigInPlace({
             variantVarMap
           });
           outputBlocks.push(newCode);
-          matchedPlanIds.add(entity.id);
+          matchedPlanIds.add(planKey2);
           lastPlanBlockIndex = outputBlocks.length - 1;
           result2.plansUpdated++;
         } else {
           result2.plansDeleted++;
         }
       } else if (entity.type === "variant") {
-        if (!apiVariantMap.has(entity.id)) {
+        if (!apiVariantMap.has(versionedCodegenId(entity))) {
           result2.plansDeleted++;
         }
       } else if (entity.type === "reward") {
@@ -48053,13 +48110,13 @@ ${newFeatureCode}`);
     }
     result2.featuresAdded = newFeatures.length;
   }
-  const newPlans = plans.filter((p) => !matchedPlanIds.has(p.id));
+  const newPlans = plans.filter((p) => !matchedPlanIds.has(versionedCodegenId(p)));
   if (newPlans.length > 0) {
     const newPlanCode = newPlans.map((p) => generatePlanWithVariantsCode({
       featureVarMap,
       features,
       plan: p,
-      planVarName: newPlanVarMap.get(p.id),
+      planVarName: newPlanVarMap.get(versionedCodegenId(p)),
       variantVarMap
     })).join(`
 
@@ -48119,7 +48176,7 @@ ${newReferralPrograms.map((program2) => buildReferralProgramCode(program2, newRe
   writeFileSync2(configPath, output, "utf-8");
   return result2;
 }
-var ensureAtmnImports = (importText, imports) => imports.reduce((text, name) => new RegExp(`\\b${name}\\b`).test(text) ? text : text.replace(/\{/, `{ ${name},`), importText);
+var ensureAtmnImports = (importText, imports) => imports.reduce((text, name) => new RegExp(`\\b${name}\\b`).test(text) ? text : text.replace(/\{/, `{ ${name},`), importText), versionedIds = (resources) => new Set(resources.flatMap(({ id, version }) => version === undefined ? [] : [id]));
 var init_updateConfig = __esm(() => {
   init_loadConfig();
   init_env();
@@ -48193,10 +48250,6 @@ function buildConfigFile(features, plans, rewards = [], referralPrograms = []) {
   return sections.join(`
 `);
 }
-var versionedCodegenId = ({
-  id,
-  version
-}) => version === undefined ? id : `${id}-v-${version}`;
 var init_configFile = __esm(() => {
   init_feature2();
   init_plan2();
@@ -48433,7 +48486,7 @@ var init_pull = __esm(() => {
 });
 
 // src/lib/version.ts
-var APP_VERSION = "1.1.18";
+var APP_VERSION = "1.1.20";
 
 // ../../node_modules/.bun/@tanstack+query-core@5.101.1/node_modules/@tanstack/query-core/build/modern/subscribable.js
 var Subscribable = class {
@@ -92314,17 +92367,13 @@ var init_cusEntTable = __esm(() => {
       name: "customer_entitlements_entitlement_id_fkey"
     }).onUpdate("cascade").onDelete("cascade"),
     index("idx_customer_entitlements_product_id").on(table3.customer_product_id),
-    index("idx_customer_entitlements_internal_customer_id").using("hash", table3.internal_customer_id),
     index("idx_customer_entitlements_internal_customer_id_btree").on(table3.internal_customer_id),
     index("idx_customer_entitlements_entitlement_id").on(table3.entitlement_id),
     index("idx_customer_entitlements_internal_feature_id_c").on(sql`${table3.internal_feature_id} COLLATE "C"`).concurrently(),
     index("idx_ce_internal_feature_id").on(table3.internal_feature_id).concurrently(),
     index("idx_ce_customer_product_id_c").on(sql`${table3.customer_product_id} COLLATE "C"`).concurrently(),
-    index("idx_ce_loose_next_reset").on(table3.next_reset_at).where(sql`${table3.customer_product_id} IS NULL`).concurrently(),
-    index("idx_customer_entitlements_nonnull_entity_by_id").on(table3.id).where(sql`${table3.internal_entity_id} IS NOT NULL`).concurrently(),
     index("idx_customer_entitlements_internal_entity_id").using("hash", table3.internal_entity_id),
     index("idx_customer_entitlements_on_next_reset_at").on(table3.next_reset_at),
-    index("idx_customer_entitlements_separate_interval_reset").on(table3.next_reset_at, table3.id).where(sql`${table3.separate_interval} = true AND ${table3.next_reset_at} IS NOT NULL`).concurrently(),
     index("idx_customer_entitlements_loose_customer_expires").on(table3.internal_customer_id, table3.expires_at).where(sql`${table3.customer_product_id} IS NULL`),
     index("idx_customer_entitlements_next_reset_not_expired").on(table3.next_reset_at).where(sql`${table3.expired} IS NOT TRUE AND ${table3.next_reset_at} IS NOT NULL`).concurrently(),
     index("idx_customer_entitlements_pooled_contribution").on(table3.pooled_contribution_id).where(sql`${table3.pooled_contribution_id} IS NOT NULL`).concurrently(),
@@ -105883,7 +105932,7 @@ var init_usageLimit = __esm(() => {
     exports_external.string().min(1).max(USAGE_LIMIT_FILTER_MAX_VALUE_LENGTH),
     exports_external.number(),
     exports_external.boolean()
-  ]).transform(String);
+  ]).transform(String).pipe(exports_external.string());
   UsageLimitFilterSchema = exports_external.object({
     properties: exports_external.record(exports_external.string().min(1).max(USAGE_LIMIT_FILTER_MAX_KEY_LENGTH), UsageLimitFilterValueSchema).meta({
       description: "Event property equality conditions. A usage event counts toward this cap only when every listed property matches (AND)."
@@ -116319,16 +116368,64 @@ var init_V0_2_CusProductChange = __esm(() => {
   init_utils11();
 });
 
+// ../../shared/models/orgModels/orgConfig.ts
+var InvoicePaymentMethodSchema, OrgConfigSchema;
+var init_orgConfig = __esm(() => {
+  init_v4();
+  init_usageAlert();
+  InvoicePaymentMethodSchema = exports_external.enum([
+    "card",
+    "customer_balance",
+    "us_bank_account",
+    "sepa_debit",
+    "bacs_debit",
+    "acss_debit",
+    "link"
+  ]);
+  OrgConfigSchema = exports_external.object({
+    usage_alerts: exports_external.array(DbUsageAlertSchema).optional().default([]),
+    sandbox_usage_alerts: exports_external.array(DbUsageAlertSchema).optional().default([]),
+    bill_upgrade_immediately: exports_external.boolean().default(true),
+    convert_to_charge_automatically: exports_external.boolean().default(true),
+    anchor_start_of_month: exports_external.boolean().default(false),
+    cancel_on_past_due: exports_external.boolean().default(false),
+    prorate_unused: exports_external.boolean().default(true),
+    checkout_on_failed_payment: exports_external.boolean().default(true),
+    reverse_deduction_order: exports_external.boolean().default(false),
+    include_past_due: exports_external.boolean().default(true),
+    sync_status: exports_external.boolean().default(true),
+    merge_billing_cycles: exports_external.boolean().default(true),
+    multiple_trials: exports_external.boolean().default(false),
+    allow_paid_default: exports_external.boolean().default(false),
+    cache_customer: exports_external.boolean().default(false),
+    invoice_memos: exports_external.boolean().default(false),
+    entity_product: exports_external.boolean().default(false),
+    void_invoices_on_subscription_deletion: exports_external.boolean().default(false),
+    default_applies_to_entities: exports_external.boolean().default(false),
+    disable_overage_billing: exports_external.boolean().default(false),
+    disable_stripe_writes: exports_external.boolean().default(false),
+    disabled_auto_topup: exports_external.boolean().default(false),
+    persist_free_overage: exports_external.boolean().default(false),
+    dryrun_autotopups: exports_external.boolean().default(false),
+    forward_customer_metadata: exports_external.boolean().default(false),
+    automatic_tax: exports_external.boolean().default(false),
+    multi_currency: exports_external.boolean().default(false),
+    allowed_payment_methods: exports_external.array(InvoicePaymentMethodSchema).min(1).nullish()
+  });
+});
+
 // ../../shared/models/billingModels/context/billingContext.ts
 var InvoiceModeSchema, BillingVersion;
 var init_billingContext = __esm(() => {
+  init_orgConfig();
   init_v4();
   InvoiceModeSchema = exports_external.object({
     finalizeInvoice: exports_external.boolean().default(false),
     enableProductImmediately: exports_external.boolean().default(true),
     footer: exports_external.string().optional(),
     memo: exports_external.string().optional(),
-    daysUntilDue: exports_external.number().optional()
+    daysUntilDue: exports_external.number().optional(),
+    paymentMethodTypes: exports_external.array(InvoicePaymentMethodSchema).optional()
   });
   ((BillingVersion2) => {
     BillingVersion2["V1"] = "v1";
@@ -120990,7 +121087,8 @@ var init_attachParamsV0 = __esm(() => {
     carry_over_usages: exports_external.object({
       enabled: exports_external.boolean(),
       feature_ids: exports_external.array(exports_external.string()).optional()
-    }).optional()
+    }).optional(),
+    remove_plan_ids: exports_external.array(exports_external.string()).optional()
   });
 });
 
@@ -121140,6 +121238,9 @@ var init_attachParamsV1 = __esm(() => {
     }),
     currency: CurrencyCodeSchema.optional().meta({
       description: "Currency to bill this attach in (e.g. usd, eur). Must match the customer's currency if they are already locked to one, and the plan must offer a paid price in it. Defaults to the customer's currency, then the org default."
+    }),
+    remove_plan_ids: exports_external.array(exports_external.string()).optional().meta({
+      description: "Plan IDs to expire on the customer as part of this attach. Each must be an active plan billed on the same subscription as the attach (or a free plan); plans on a separate subscription are rejected."
     })
   });
 });
@@ -121440,7 +121541,7 @@ var init_eventsAggregateResponseV0 = __esm(() => {
 });
 
 // ../../shared/api/events/aggregate/eventsAggregateResponseV1.ts
-var EventAggregateListItemV1Schema, EventAggregateTotalItemSchema, EventsAggregateResponseV1Schema;
+var EventAggregateListItemV1Schema, EventAggregateTotalItemSchema, DeductionBalanceSchema, DeductionFeatureSchema, DeductionPeriodSchema, EventsAggregateResponseV1Schema;
 var init_eventsAggregateResponseV1 = __esm(() => {
   init_v4();
   EventAggregateListItemV1Schema = exports_external.object({
@@ -121458,12 +121559,57 @@ var init_eventsAggregateResponseV1 = __esm(() => {
     count: exports_external.number().meta({ description: "Number of events for this feature" }),
     sum: exports_external.number().meta({ description: "Sum of event values for this feature" })
   });
+  DeductionBalanceSchema = exports_external.object({
+    balance_id: exports_external.string().meta({
+      description: "ID of the balance row drawn from (customer_entitlement or rollover)."
+    }),
+    entity_id: exports_external.string().nullable().meta({
+      description: "Entity that owns this balance, or null when it is customer-level and shared."
+    }),
+    plan_id: exports_external.string().nullable().meta({
+      description: "Plan the balance came with. Null for balances created outside a plan."
+    }),
+    reset: exports_external.object({
+      interval: exports_external.string(),
+      resets_at: exports_external.number().nullable()
+    }).nullable().meta({ description: "Reset config for this balance, captured at deduction time." }),
+    credit_cost: exports_external.number().nullable().meta({
+      description: "Multiplier applied converting the tracked feature into this balance. Null when 1:1, or when the query spans sources converting at different rates."
+    }),
+    deducted: exports_external.number(),
+    events: exports_external.number()
+  });
+  DeductionFeatureSchema = exports_external.object({
+    feature_type: exports_external.enum(["metered", "credit_system"]).meta({
+      description: "credit_system means `deducted` is credits; metered means it is that feature's own amount."
+    }),
+    deducted: exports_external.number(),
+    events: exports_external.number(),
+    balances: exports_external.array(DeductionBalanceSchema)
+  });
+  DeductionPeriodSchema = exports_external.object({
+    period: exports_external.number().meta({
+      description: "Unix timestamp (epoch ms), same basis as `list`."
+    }),
+    values: exports_external.record(exports_external.string(), DeductionFeatureSchema).meta({
+      description: "Keyed by the feature that OWNS the balance drawn from, not the feature that was tracked."
+    }),
+    grouped_values: exports_external.record(exports_external.string(), exports_external.record(exports_external.string(), exports_external.object({
+      deducted: exports_external.number(),
+      credit_cost: exports_external.number().nullable().optional()
+    }))).optional().meta({
+      description: "Present only when group_by is used. Keyed by balance_id, then by group value — the only way to attribute a shared balance to the entity that spent from it."
+    })
+  });
   EventsAggregateResponseV1Schema = exports_external.object({
     list: exports_external.array(EventAggregateListItemV1Schema).meta({
       description: "Array of time periods with aggregated values"
     }),
     total: exports_external.record(exports_external.string(), EventAggregateTotalItemSchema).meta({
       description: "Total aggregations per feature. Keys are feature IDs, values contain count and sum."
+    }),
+    deductions: exports_external.array(DeductionPeriodSchema).optional().meta({
+      description: 'Per-balance breakdown of what was consumed. Present only when aggregate_on is "deducted".'
     })
   });
 });
@@ -122148,6 +122294,11 @@ var init_customerProductsToStripeSubscriptionIds = __esm(() => {
   init_shared2();
 });
 
+// ../../shared/utils/cusProductUtils/convertCusProduct/customerProductToApiSubscriptionStatus.ts
+var init_customerProductToApiSubscriptionStatus = __esm(() => {
+  init_cusProductEnums();
+});
+
 // ../../shared/utils/cusProductUtils/convertCusProduct/customerProductToReplacementKey.ts
 var init_customerProductToReplacementKey = __esm(() => {
   init_classifyProductUtils();
@@ -122618,6 +122769,7 @@ var init_cusProductUtils2 = __esm(() => {
   init_cusProductToConvertedFeatureOptions();
   init_customerProductsToRecurringActiveAndScheduled();
   init_customerProductsToStripeSubscriptionIds();
+  init_customerProductToApiSubscriptionStatus();
   init_customerProductToEffectivePrices();
   init_customerProductToReplacementKey();
   init_cusProductConstants();
@@ -122858,7 +123010,6 @@ var init_classifyItemUtils = __esm(() => {
   init_productItemModels();
   init_convertItemUtils();
 });
-
 // ../../shared/utils/productV2Utils/productItemUtils/sortPlanItems.ts
 var init_sortPlanItems = __esm(() => {
   init_productItemModels();
@@ -123356,6 +123507,98 @@ var init_planParamsV1ToProductV2 = __esm(() => {
   init_planParamsV1ToProductItems();
 });
 
+// ../../shared/api/products/components/planChange/planItemChangeV0.ts
+var PlanItemChangeV0Schema;
+var init_planItemChangeV0 = __esm(() => {
+  init_v4();
+  init_apiPlanItemV1();
+  PlanItemChangeV0Schema = exports_external.object({
+    action: exports_external.enum(["created", "deleted"]).meta({
+      description: "Whether the item was added to or removed from the plan."
+    }),
+    feature_id: exports_external.string().meta({
+      description: "The ID of the feature that was added or removed."
+    }),
+    item: ApiPlanItemV1Schema.meta({
+      description: "The plan item snapshot that was added or removed."
+    })
+  });
+});
+
+// ../../shared/api/products/components/planChange/planPreviousAttributesV0.ts
+var PlanPreviousAttributesV0Schema;
+var init_planPreviousAttributesV0 = __esm(() => {
+  init_customerBillingControls();
+  init_apiPlanV1();
+  init_apiFreeTrialV2();
+  PlanPreviousAttributesV0Schema = ApiPlanV1Schema.pick({
+    id: true,
+    name: true,
+    description: true,
+    group: true,
+    add_on: true,
+    auto_enable: true,
+    config: true
+  }).partial().extend({
+    free_trial: ApiFreeTrialV2Schema.nullable().optional().meta({
+      description: "Previous free trial when it changed. Null when the plan had none."
+    }),
+    billing_controls: CustomerBillingControlsSchema.nullable().optional().meta({
+      description: "Previous billing controls when they changed. Null when unset."
+    })
+  });
+});
+
+// ../../shared/api/products/components/planChange/planChangeV0.ts
+var PlanPriceChangeV0Schema, PlanFreeTrialChangeV0Schema, PlanChangeV0Schema;
+var init_planChangeV0 = __esm(() => {
+  init_v4();
+  init_apiPlanV1();
+  init_apiFreeTrialV2();
+  init_planItemChangeV0();
+  init_planPreviousAttributesV0();
+  PlanPriceChangeV0Schema = exports_external.object({
+    previous: ApiPlanV1Schema.shape.price.meta({
+      description: "The plan's price before the change."
+    }),
+    current: ApiPlanV1Schema.shape.price.meta({
+      description: "The plan's price after the change."
+    })
+  });
+  PlanFreeTrialChangeV0Schema = exports_external.object({
+    previous: ApiFreeTrialV2Schema.nullable().meta({
+      description: "The plan's free trial before the change. Null when none."
+    }),
+    current: ApiFreeTrialV2Schema.nullable().meta({
+      description: "The plan's free trial after the change. Null when none."
+    })
+  });
+  PlanChangeV0Schema = exports_external.object({
+    plan: ApiPlanV1Schema.optional().meta({
+      description: "The plan after the change. Omitted unless the caller expands it."
+    }),
+    previous_attributes: PlanPreviousAttributesV0Schema.nullable().meta({
+      description: "Sparse map of scalar plan fields that changed, holding their previous values. Null when the plan is new."
+    }),
+    price_change: PlanPriceChangeV0Schema.optional().meta({
+      description: "Present when the plan's price changed."
+    }),
+    free_trial_change: PlanFreeTrialChangeV0Schema.optional().meta({
+      description: "Present when the plan's free trial changed."
+    }),
+    item_changes: exports_external.array(PlanItemChangeV0Schema).default([]).meta({
+      description: "Feature items added to or removed from the plan."
+    })
+  });
+});
+
+// ../../shared/api/products/components/planChange/index.ts
+var init_planChange = __esm(() => {
+  init_planChangeV0();
+  init_planItemChangeV0();
+  init_planPreviousAttributesV0();
+});
+
 // ../../shared/api/products/crud/createVariantParamsV2.ts
 var CreateVariantParamsV2Schema;
 var init_createVariantParamsV2 = __esm(() => {
@@ -124233,6 +124476,7 @@ var init_products2 = __esm(() => {
   init_basePriceToProductItem();
   init_billingMethod();
   init_display();
+  init_planChange();
   init_planExpand();
   init_crud3();
   init_items();
@@ -125221,17 +125465,22 @@ var init_checkoutResponseV0 = __esm(() => {
 });
 
 // ../../shared/api/billing/common/customerPlanChange.ts
-var PlanChangeActionEnum, SubscriptionStatusEnum, PurchaseStatusEnum, SubscriptionSnapshotSchema, PurchaseSnapshotSchema, CustomerPlanItemChangeSchema, CustomerPlanChangeSchema;
+var PlanChangeActionEnum, SubscriptionStatusEnum, PurchaseStatusEnum, SubscriptionSnapshotSchema, PurchaseSnapshotSchema, CustomerPlanPreviousAttributesSchema, CustomerPlanChangeSchema;
 var init_customerPlanChange = __esm(() => {
+  init_planChangeV0();
+  init_planItemChangeV0();
   init_v4();
-  init_apiPlanItemV1();
   PlanChangeActionEnum = exports_external.enum([
     "activated",
     "scheduled",
     "updated",
     "expired"
   ]);
-  SubscriptionStatusEnum = exports_external.enum(["active", "scheduled", "expired"]);
+  SubscriptionStatusEnum = exports_external.enum([
+    "active",
+    "scheduled",
+    "expired"
+  ]);
   PurchaseStatusEnum = exports_external.enum(["active", "scheduled", "expired"]);
   SubscriptionSnapshotSchema = exports_external.object({
     plan_id: exports_external.string().meta({
@@ -125273,17 +125522,13 @@ var init_customerPlanChange = __esm(() => {
       description: "When the purchase ends, in milliseconds since the Unix epoch, or null if no expiry is set."
     })
   });
-  CustomerPlanItemChangeSchema = exports_external.object({
-    action: exports_external.enum(["created", "deleted"]).meta({
-      description: "Whether the feature was added to or removed from the plan."
-    }),
-    feature_id: exports_external.string().meta({
-      description: "The ID of the feature that was added or removed."
-    }),
-    item: ApiPlanItemV1Schema.meta({
-      description: "The item snapshot that was added or removed."
-    })
-  });
+  CustomerPlanPreviousAttributesSchema = SubscriptionSnapshotSchema.pick({
+    status: true,
+    past_due: true,
+    canceled_at: true,
+    expires_at: true,
+    trial_ends_at: true
+  }).partial();
   CustomerPlanChangeSchema = exports_external.object({
     action: PlanChangeActionEnum.meta({
       description: "The lifecycle action applied to this plan: activated (newly active on the customer), scheduled (queued for a future start), updated (mutated in place), or expired (ended)."
@@ -125294,11 +125539,15 @@ var init_customerPlanChange = __esm(() => {
     purchase: PurchaseSnapshotSchema.optional().meta({
       description: "The purchase as it stands after this change. Present when the plan is a one-off purchase."
     }),
-    previous_attributes: exports_external.record(exports_external.string(), exports_external.unknown()).nullable().meta({
-      description: "Sparse map of scalar fields whose values changed, holding their previous values. Null when the plan is newly activated or scheduled."
+    previous_attributes: CustomerPlanPreviousAttributesSchema.nullable().meta({
+      description: "Sparse map of lifecycle scalar fields whose values changed, holding their previous values. Null when the plan is newly activated or scheduled, or when no lifecycle field changed."
+    }),
+    plan_change: PlanChangeV0Schema.optional().meta({
+      description: "Content-level change to the plan definition for this customer plan (items, base price, free trial)."
     }),
-    item_changes: exports_external.array(CustomerPlanItemChangeSchema).default([]).meta({
-      description: "Features that were added to or removed from this plan. Only populated for updated plans."
+    item_changes: exports_external.array(PlanItemChangeV0Schema).default([]).meta({
+      deprecated: true,
+      description: "Deprecated — use plan_change.item_changes. Features that were added to or removed from this plan."
     })
   });
 });
@@ -125403,6 +125652,34 @@ var init_common3 = __esm(() => {
   init_transitionRules();
 });
 
+// ../../shared/api/billing/components/billingChanges/previewBalanceChange.ts
+var PreviewBalanceSchema, PreviewBalanceChangeSchema;
+var init_previewBalanceChange = __esm(() => {
+  init_v4();
+  PreviewBalanceSchema = exports_external.object({
+    granted: exports_external.number(),
+    remaining: exports_external.number(),
+    usage: exports_external.number(),
+    unlimited: exports_external.boolean(),
+    next_reset_at: exports_external.number().nullable()
+  });
+  PreviewBalanceChangeSchema = exports_external.object({
+    feature_id: exports_external.string(),
+    balance: PreviewBalanceSchema,
+    previous_attributes: exports_external.record(exports_external.string(), exports_external.unknown()).default({})
+  });
+});
+
+// ../../shared/api/billing/components/billingChanges/previewFlagChange.ts
+var PreviewFlagChangeSchema;
+var init_previewFlagChange = __esm(() => {
+  init_v4();
+  PreviewFlagChangeSchema = exports_external.object({
+    action: exports_external.enum(["created", "deleted"]),
+    feature_id: exports_external.string()
+  });
+});
+
 // ../../shared/api/billing/dfu/dfuFlashParams.ts
 var ProcessorTypeSchema, FlashCustomerDataSchema, FlashProcessorIdentitySchema, FlashLinkSchema, FlashStartingAfterSchema, FlashBalanceFilterSchema, FlashRolloverSchema, FlashBalanceSchema, FlashFeatureQuantitySchema, FlashPlanSchema, FlashPhaseSchema, FlashBillableSchema, FlashEntitySchema, DfuFlashParamsSchema, DfuFlashedPlanSchema, DfuFlashResultSchema;
 var init_dfuFlashParams = __esm(() => {
@@ -125884,7 +126161,7 @@ var init_syncProposalsV2 = __esm(() => {
 });
 
 // ../../shared/api/billing/verify/verifyParamsV1.ts
-var VerifyParamsV1Schema, ItemMismatchReasonSchema, message, severity, ItemMismatchSchema, BasePriceMismatchSchema, PrepaidQuantityMismatchSchema, PrepaidPriceMismatchSchema, ScheduleMismatchSchema, CancelStateMismatchSchema, RewardMismatchSchema, StripeSubNotInAutumnMismatchSchema, StaleSubscriptionLinkMismatchSchema, ExpectedStateErrorMismatchSchema, SubscriptionMismatchSchema, SubscriptionVerifyResultSchema, VerifyResponseSchema;
+var VerifyParamsV1Schema, ItemMismatchReasonSchema, message, severity, ItemMismatchSchema, BasePriceMismatchSchema, PrepaidQuantityMismatchSchema, PrepaidPriceMismatchSchema, ScheduleMismatchSchema, CancelStateMismatchSchema, RewardMismatchSchema, StripeSubNotInAutumnMismatchSchema, StaleSubscriptionLinkMismatchSchema, ExpectedStateErrorMismatchSchema, SharedStripeCustomerMismatchSchema, SubscriptionMismatchSchema, SubscriptionVerifyResultSchema, VerifyResponseSchema;
 var init_verifyParamsV1 = __esm(() => {
   init_v4();
   VerifyParamsV1Schema = exports_external.object({
@@ -126009,6 +126286,13 @@ var init_verifyParamsV1 = __esm(() => {
     severity,
     error: exports_external.string()
   });
+  SharedStripeCustomerMismatchSchema = exports_external.object({
+    type: exports_external.literal("shared_stripe_customer"),
+    message,
+    severity,
+    stripe_customer_id: exports_external.string(),
+    other_customer_ids: exports_external.array(exports_external.string())
+  });
   SubscriptionMismatchSchema = exports_external.discriminatedUnion("type", [
     BasePriceMismatchSchema,
     ItemMismatchSchema,
@@ -126019,7 +126303,8 @@ var init_verifyParamsV1 = __esm(() => {
     RewardMismatchSchema,
     StripeSubNotInAutumnMismatchSchema,
     StaleSubscriptionLinkMismatchSchema,
-    ExpectedStateErrorMismatchSchema
+    ExpectedStateErrorMismatchSchema,
+    SharedStripeCustomerMismatchSchema
   ]);
   SubscriptionVerifyResultSchema = exports_external.object({
     stripe_subscription_id: exports_external.string(),
@@ -126028,6 +126313,7 @@ var init_verifyParamsV1 = __esm(() => {
   });
   VerifyResponseSchema = exports_external.object({
     customer_id: exports_external.string(),
+    customer_mismatches: exports_external.array(SubscriptionMismatchSchema),
     subscriptions: exports_external.array(SubscriptionVerifyResultSchema)
   });
 });
@@ -126043,6 +126329,8 @@ var init_billing = __esm(() => {
   init_checkoutParamsV0();
   init_checkoutResponseV0();
   init_common3();
+  init_previewBalanceChange();
+  init_previewFlagChange();
   init_createScheduleParamsV0();
   init_createScheduleResponse();
   init_dfuFlashParams();
@@ -126296,6 +126584,9 @@ var init_eventsAggregateParams = __esm(() => {
     }),
     max_groups: exports_external.number().int().min(1).max(250).optional().meta({
       description: "Maximum number of distinct group values to return per time bin when using group_by. Remaining values are bundled into an 'Other' bucket. Defaults to 9"
+    }),
+    aggregate_on: exports_external.enum(["deducted"]).optional().meta({
+      description: 'Set to "deducted" to additionally return a per-balance breakdown of what each event consumed, under `deductions`. Purely additive: `list` and `total` are unchanged. Requires customer_id.'
     })
   });
   EventsAggregateParamsSchema = ExtEventsAggregateParamsSchema.refine((data) => {
@@ -132868,42 +133159,6 @@ var init_idempotencyConfig = __esm(() => {
   });
 });
 
-// ../../shared/models/orgModels/orgConfig.ts
-var OrgConfigSchema;
-var init_orgConfig = __esm(() => {
-  init_v4();
-  init_usageAlert();
-  OrgConfigSchema = exports_external.object({
-    usage_alerts: exports_external.array(DbUsageAlertSchema).optional().default([]),
-    sandbox_usage_alerts: exports_external.array(DbUsageAlertSchema).optional().default([]),
-    bill_upgrade_immediately: exports_external.boolean().default(true),
-    convert_to_charge_automatically: exports_external.boolean().default(true),
-    anchor_start_of_month: exports_external.boolean().default(false),
-    cancel_on_past_due: exports_external.boolean().default(false),
-    prorate_unused: exports_external.boolean().default(true),
-    checkout_on_failed_payment: exports_external.boolean().default(true),
-    reverse_deduction_order: exports_external.boolean().default(false),
-    include_past_due: exports_external.boolean().default(true),
-    sync_status: exports_external.boolean().default(true),
-    merge_billing_cycles: exports_external.boolean().default(true),
-    multiple_trials: exports_external.boolean().default(false),
-    allow_paid_default: exports_external.boolean().default(false),
-    cache_customer: exports_external.boolean().default(false),
-    invoice_memos: exports_external.boolean().default(false),
-    entity_product: exports_external.boolean().default(false),
-    void_invoices_on_subscription_deletion: exports_external.boolean().default(false),
-    default_applies_to_entities: exports_external.boolean().default(false),
-    disable_overage_billing: exports_external.boolean().default(false),
-    disable_stripe_writes: exports_external.boolean().default(false),
-    disabled_auto_topup: exports_external.boolean().default(false),
-    persist_free_overage: exports_external.boolean().default(false),
-    dryrun_autotopups: exports_external.boolean().default(false),
-    forward_customer_metadata: exports_external.boolean().default(false),
-    automatic_tax: exports_external.boolean().default(false),
-    multi_currency: exports_external.boolean().default(false)
-  });
-});
-
 // ../../shared/models/orgModels/frontendOrg.ts
 var FrontendOrgSchema;
 var init_frontendOrg = __esm(() => {
@@ -133656,7 +133911,7 @@ var init_error3 = __esm(() => {
   };
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/access/access.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/access/access.mjs
 function unknownResourceResponse(requestedResource) {
   return {
     success: false,
@@ -133745,12 +134000,12 @@ var init_access = __esm(() => {
   init_error3();
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/access/index.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/access/index.mjs
 var init_access2 = __esm(() => {
   init_access();
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/organization/access/statement.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/organization/access/statement.mjs
 var defaultStatements, defaultAc, adminAc, ownerAc, memberAc;
 var init_statement = __esm(() => {
   init_access();
@@ -133824,7 +134079,7 @@ var init_statement = __esm(() => {
   });
 });
 
-// ../../node_modules/.bun/better-auth@1.6.25+57303eab17c2f44f/node_modules/better-auth/dist/plugins/organization/access/index.mjs
+// ../../node_modules/.bun/better-auth@1.6.25+fdfecc926c70e080/node_modules/better-auth/dist/plugins/organization/access/index.mjs
 var init_access3 = __esm(() => {
   init_statement();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atmn",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "license": "MIT",
   "bin": {
     "atmn": "dist/cli.js"
@@ -34,7 +34,7 @@
     "build": "bun run bun.config.ts",
     "dev": "nodemon -e ts,tsx --watch src --ignore dist --exec \"bun run bun.config.ts\"",
     "dev:bun": "bun run dev.ts",
-    "test": "bun test test/*.test.ts test/codegen test/nuke test/pull test/push test/workflow",
+    "test": "bun test test/*.test.ts test/auth test/codegen test/nuke test/pull test/push test/workflow",
     "test:integration": "cd ../../server && ENV_FILE=.env infisical run --env=dev --recursive -- bun test --timeout 0 ../packages/atmn/test/integration",
     "test:integration:cli": "cd ../../server && ENV_FILE=.env infisical run --env=dev --recursive -- bun ../packages/atmn/test/integration/cli.ts",
     "test:unit": "bun test test/codegen",