owosk 0.2.3 → 0.3.0

package/README.md

@@ -13,7 +13,7 @@ npm install -g owosk
 Or use it directly with npx:
 
 ```bash
-npx owo --help
+npx owosk --help
 ```
 
 ## Commands
@@ -23,7 +23,7 @@ npx owo --help
 Initialize a new Owostack project with a default configuration file (`owo.config.ts` or `owo.config.js`). JavaScript configs use ESM `import`/`export` syntax.
 
 ```bash
-npx owo init
+npx owosk init
 ```
 
 ### `sync`
@@ -31,7 +31,7 @@ npx owo init
 Push your local catalog configuration to the Owostack cloud.
 
 ```bash
-npx owo sync
+npx owosk sync
 ```
 
 ### `pull`
@@ -39,7 +39,7 @@ npx owo sync
 Pull existing plans and features from the cloud into your local configuration.
 
 ```bash
-npx owo pull
+npx owosk pull
 ```
 
 ### `diff`
@@ -47,7 +47,7 @@ npx owo pull
 Preview changes by comparing your local configuration with the cloud.
 
 ```bash
-npx owo diff
+npx owosk diff
 ```
 
 ### `validate`
@@ -55,7 +55,7 @@ npx owo diff
 Check your local configuration for errors without applying changes.
 
 ```bash
-npx owo validate
+npx owosk validate
 ```
 
 ### `connect`
@@ -63,7 +63,7 @@ npx owo validate
 Authenticate and connect your local environment to an organization.
 
 ```bash
-npx owo connect
+npx owosk connect
 ```
 
 ## Features

package/dist/index.js

@@ -231,19 +231,51 @@ async function fetchCreditPacks(apiKey, apiUrl) {
 // src/lib/diff.ts
 import pc2 from "picocolors";
 import * as p from "@clack/prompts";
-function normalizeFeature(pf) {
+function normalizeReset(reset) {
+  switch (reset) {
+    case "hour":
+      return "hourly";
+    case "day":
+      return "daily";
+    case "week":
+      return "weekly";
+    case "month":
+      return "monthly";
+    case "quarter":
+      return "quarterly";
+    case "year":
+    case "annually":
+      return "yearly";
+    default:
+      return reset || "monthly";
+  }
+}
+function normalizeOverage(usageModel, overage) {
+  if (usageModel === "usage_based") return "charge";
+  return overage === "charge" ? "charge" : "block";
+}
+function normalizeFeature(pf, creditSystemSlugs) {
+  const usageModel = pf.usageModel || "included";
+  const isCreditSystemFeature = creditSystemSlugs.has(pf.slug);
   return {
     slug: pf.slug,
     enabled: pf.enabled,
     limit: pf.limit ?? null,
     // Handle both SDK 'reset' and API 'resetInterval'
-    reset: pf.reset || pf.resetInterval || "monthly",
+    reset: normalizeReset(pf.reset || pf.resetInterval),
+    usageModel: isCreditSystemFeature ? "included" : usageModel,
+    pricePerUnit: isCreditSystemFeature ? null : pf.pricePerUnit ?? null,
+    billingUnits: isCreditSystemFeature ? 1 : pf.billingUnits ?? 1,
+    ratingModel: isCreditSystemFeature ? "package" : pf.ratingModel || "package",
+    tiers: isCreditSystemFeature ? null : pf.tiers ?? null,
     // Handle both SDK 'overage' and API 'overage' (same name)
-    overage: pf.overage || "block",
-    overagePrice: pf.overagePrice ?? null
+    overage: normalizeOverage(usageModel, pf.overage),
+    overagePrice: isCreditSystemFeature ? null : pf.overagePrice ?? null,
+    maxOverageUnits: isCreditSystemFeature ? null : pf.maxOverageUnits ?? null,
+    creditCost: isCreditSystemFeature ? 0 : pf.creditCost ?? 0
   };
 }
-function normalizePlan(plan) {
+function normalizePlan(plan, creditSystemSlugs) {
   return {
     slug: plan.slug,
     name: plan.name ?? null,
@@ -255,7 +287,18 @@ function normalizePlan(plan) {
     trialDays: plan.trialDays ?? 0,
     isAddon: plan.isAddon ?? false,
     autoEnable: plan.autoEnable ?? false,
-    features: (plan.features || []).map(normalizeFeature).sort((a, b) => a.slug.localeCompare(b.slug))
+    features: (plan.features || []).map((feature) => normalizeFeature(feature, creditSystemSlugs)).sort((a, b) => a.slug.localeCompare(b.slug))
+  };
+}
+function normalizeCreditSystem(cs) {
+  return {
+    slug: cs.slug,
+    name: cs.name ?? null,
+    description: cs.description ?? null,
+    features: (cs.features || []).map((feature) => ({
+      feature: feature.feature,
+      creditCost: feature.creditCost ?? 0
+    })).sort((a, b) => a.feature.localeCompare(b.feature))
   };
 }
 function normalizeCreditPack(pack) {
@@ -271,10 +314,18 @@ function normalizeCreditPack(pack) {
   };
 }
 function diffPlans(localPlans, remotePlans, localCreditSystems = [], remoteCreditSystems = [], localCreditPacks = [], remoteCreditPacks = []) {
+  const creditSystemSlugs = /* @__PURE__ */ new Set([
+    ...localCreditSystems.map((cs) => cs.slug),
+    ...remoteCreditSystems.map((cs) => cs.slug)
+  ]);
   const localMap = /* @__PURE__ */ new Map();
   const remoteMap = /* @__PURE__ */ new Map();
-  for (const p9 of localPlans) localMap.set(p9.slug, normalizePlan(p9));
-  for (const p9 of remotePlans) remoteMap.set(p9.slug, normalizePlan(p9));
+  for (const p9 of localPlans) {
+    localMap.set(p9.slug, normalizePlan(p9, creditSystemSlugs));
+  }
+  for (const p9 of remotePlans) {
+    remoteMap.set(p9.slug, normalizePlan(p9, creditSystemSlugs));
+  }
   const onlyLocal = [];
   const onlyRemote = [];
   const changed = [];
@@ -328,8 +379,15 @@ function diffPlans(localPlans, remotePlans, localCreditSystems = [], remoteCredi
           "enabled",
           "limit",
           "reset",
+          "usageModel",
+          "pricePerUnit",
+          "billingUnits",
+          "ratingModel",
+          "tiers",
           "overage",
-          "overagePrice"
+          "overagePrice",
+          "maxOverageUnits",
+          "creditCost"
         ];
         for (const ff of featureFields) {
           if (JSON.stringify(lf[ff]) !== JSON.stringify(rf[ff])) {
@@ -353,8 +411,12 @@ function diffPlans(localPlans, remotePlans, localCreditSystems = [], remoteCredi
   }
   const localCsMap = /* @__PURE__ */ new Map();
   const remoteCsMap = /* @__PURE__ */ new Map();
-  for (const cs of localCreditSystems) localCsMap.set(cs.slug, cs);
-  for (const cs of remoteCreditSystems) remoteCsMap.set(cs.slug, cs);
+  for (const cs of localCreditSystems) {
+    localCsMap.set(cs.slug, normalizeCreditSystem(cs));
+  }
+  for (const cs of remoteCreditSystems) {
+    remoteCsMap.set(cs.slug, normalizeCreditSystem(cs));
+  }
   const csOnlyLocal = [];
   const csOnlyRemote = [];
   const csChanged = [];
@@ -779,7 +841,10 @@ import * as p3 from "@clack/prompts";
 import pc4 from "picocolors";
 import { existsSync as existsSync3 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
-import { resolve as resolve2, extname as extname2, isAbsolute as isAbsolute2 } from "path";
+import { resolve as resolve2, isAbsolute as isAbsolute2 } from "path";
+
+// src/lib/catalog-import.ts
+import { extname as extname2 } from "path";
 
 // src/lib/generate.ts
 function slugToIdentifier(slug, used) {
@@ -834,6 +899,28 @@ function slugToIdentifier(slug, used) {
   used.add(candidate);
   return candidate;
 }
+function normalizeResetForCodegen(reset) {
+  switch (reset) {
+    case void 0:
+    case null:
+      return void 0;
+    case "hour":
+      return "hourly";
+    case "day":
+      return "daily";
+    case "week":
+      return "weekly";
+    case "month":
+      return "monthly";
+    case "quarter":
+      return "quarterly";
+    case "year":
+    case "annually":
+      return "yearly";
+    default:
+      return reset;
+  }
+}
 function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProvider, format = "ts") {
   const isTs = format === "ts";
   const creditSystemSlugs = new Set(creditSystems.map((cs) => cs.slug));
@@ -925,8 +1012,12 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
         const csVar = creditSystemVars.get(pf.slug);
         if (csVar && pf.enabled) {
           const opts = [];
-          if (pf.resetInterval || pf.reset)
-            opts.push(`reset: "${pf.resetInterval || pf.reset || "monthly"}"`);
+          const creditReset = normalizeResetForCodegen(
+            pf.resetInterval || pf.reset
+          );
+          if (creditReset !== void 0) {
+            opts.push(`reset: "${creditReset}"`);
+          }
           if (pf.overage) opts.push(`overage: "${pf.overage}"`);
           if (opts.length > 0) {
             featureEntries.push(
@@ -950,11 +1041,23 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
       if (pf.enabled === false) {
         const config2 = { enabled: false };
         if (pf.limit !== void 0) config2.limit = pf.limit;
-        if (pf.resetInterval || pf.reset)
-          config2.reset = pf.resetInterval || pf.reset;
+        const disabledReset = normalizeResetForCodegen(
+          pf.resetInterval || pf.reset
+        );
+        if (disabledReset !== void 0) config2.reset = disabledReset;
+        if (pf.usageModel) config2.usageModel = pf.usageModel;
+        if (pf.pricePerUnit !== void 0)
+          config2.pricePerUnit = pf.pricePerUnit;
+        if (pf.ratingModel) config2.ratingModel = pf.ratingModel;
+        if (pf.tiers !== void 0) config2.tiers = pf.tiers;
+        if (pf.billingUnits !== void 0)
+          config2.billingUnits = pf.billingUnits;
         if (pf.overage) config2.overage = pf.overage;
         if (pf.overagePrice !== void 0)
           config2.overagePrice = pf.overagePrice;
+        if (pf.maxOverageUnits !== void 0)
+          config2.maxOverageUnits = pf.maxOverageUnits;
+        if (pf.creditCost !== void 0) config2.creditCost = pf.creditCost;
         featureEntries.push(`${varName}.config(${JSON.stringify(config2)})`);
         continue;
       }
@@ -962,11 +1065,21 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
       const config = {};
       if (pf.limit !== void 0) config.limit = pf.limit;
       if (!isEntityFeature) {
-        const reset = pf.resetInterval || pf.reset || "monthly";
-        if (reset !== "none") config.reset = reset;
+        const reset = normalizeResetForCodegen(
+          pf.resetInterval || pf.reset || "monthly"
+        );
+        if (reset !== void 0) config.reset = reset;
       }
+      if (pf.usageModel) config.usageModel = pf.usageModel;
+      if (pf.pricePerUnit !== void 0) config.pricePerUnit = pf.pricePerUnit;
+      if (pf.ratingModel) config.ratingModel = pf.ratingModel;
+      if (pf.tiers !== void 0) config.tiers = pf.tiers;
+      if (pf.billingUnits !== void 0) config.billingUnits = pf.billingUnits;
       if (pf.overage) config.overage = pf.overage;
       if (pf.overagePrice !== void 0) config.overagePrice = pf.overagePrice;
+      if (pf.maxOverageUnits !== void 0)
+        config.maxOverageUnits = pf.maxOverageUnits;
+      if (pf.creditCost !== void 0) config.creditCost = pf.creditCost;
       const configKeys = Object.keys(config);
       const hasExtras = configKeys.some((k) => k !== "limit");
       if (config.limit === null && !hasExtras) {
@@ -1045,8 +1158,8 @@ function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProv
   ].filter(Boolean).join("\n");
 }
 
-// src/commands/pull.ts
-function determineFormat(fullPath) {
+// src/lib/catalog-import.ts
+function determineConfigFormat(fullPath) {
   const ext = extname2(fullPath);
   if (ext === ".ts" || ext === ".mts" || ext === ".cts") return "ts";
   if (ext === ".mjs") return "esm";
@@ -1058,6 +1171,32 @@ function determineFormat(fullPath) {
   if (ext === ".js") return "esm";
   return "ts";
 }
+async function buildRemoteCatalogSnapshot(params) {
+  const plans = await fetchPlans({
+    apiKey: params.apiKey,
+    apiUrl: params.apiUrl,
+    ...params.filters || {}
+  });
+  const creditSystems = await fetchCreditSystems(params.apiKey, params.apiUrl);
+  const creditPacks = await fetchCreditPacks(params.apiKey, params.apiUrl);
+  const providers = new Set(plans.map((plan) => plan.provider).filter(Boolean));
+  const defaultProvider = providers.size === 1 ? Array.from(providers)[0] : void 0;
+  return {
+    plans,
+    creditSystems,
+    creditPacks,
+    defaultProvider,
+    configContent: generateConfig(
+      plans,
+      creditSystems,
+      creditPacks,
+      defaultProvider,
+      params.format
+    )
+  };
+}
+
+// src/commands/pull.ts
 async function runPull(options) {
   p3.intro(pc4.bgYellow(pc4.black(" pull ")));
   let fullPath;
@@ -1080,105 +1219,53 @@ async function runPull(options) {
   const filters = configSettings.filters || {};
   let format;
   try {
-    format = determineFormat(fullPath);
+    format = determineConfigFormat(fullPath);
   } catch (e) {
     p3.log.error(pc4.red(e.message));
     process.exit(1);
   }
   const s = p3.spinner();
-  if (options.prod) {
-    p3.log.step(pc4.magenta("Production Mode: Pulling from PROD environment"));
-    const apiUrl = `${liveUrl}/api/v1`;
-    s.start(`Fetching plans from ${pc4.dim("prod")}...`);
-    const plans = await fetchPlans({
-      apiKey,
-      apiUrl,
-      ...filters
-    });
-    s.stop(`Fetched ${plans.length} plans from prod`);
-    s.start(`Fetching credit systems...`);
-    const creditSystems = await fetchCreditSystems(apiKey, apiUrl);
-    s.stop(`Fetched ${creditSystems.length} credit systems`);
-    s.start(`Fetching credit packs...`);
-    const creditPacks = await fetchCreditPacks(apiKey, apiUrl);
-    s.stop(`Fetched ${creditPacks.length} credit packs`);
-    const providers = new Set(
-      plans.map((p9) => p9.provider).filter(Boolean)
-    );
-    const defaultProvider = providers.size === 1 ? Array.from(providers)[0] : void 0;
-    const configContent = generateConfig(
-      plans,
-      creditSystems,
-      creditPacks,
-      defaultProvider,
-      format
+  const modeLabel = options.prod ? "prod" : "sandbox";
+  const modeMessage = options.prod ? pc4.magenta("Production Mode: Pulling from PROD environment") : pc4.cyan("Sandbox Mode: Pulling from SANDBOX environment");
+  const apiUrl = `${options.prod ? liveUrl : testUrl}/api/v1`;
+  p3.log.step(modeMessage);
+  s.start(`Fetching remote catalog from ${pc4.dim(modeLabel)}...`);
+  const snapshot = await buildRemoteCatalogSnapshot({
+    apiKey,
+    apiUrl,
+    format,
+    filters
+  });
+  s.stop(
+    `Fetched ${snapshot.plans.length} plans, ${snapshot.creditSystems.length} credit systems, and ${snapshot.creditPacks.length} credit packs from ${modeLabel}`
+  );
+  if (options.dryRun) {
+    p3.note(snapshot.configContent, "Generated Config (Dry Run)");
+    printPullSummary(
+      snapshot.plans,
+      snapshot.creditSystems,
+      snapshot.creditPacks
     );
-    if (options.dryRun) {
-      p3.note(configContent, "Generated Config (Dry Run)");
-      printPullSummary(plans, creditSystems, creditPacks);
-      p3.outro(pc4.yellow("Dry run complete. No changes made."));
-      return;
-    }
-    if (existsSync3(fullPath) && !options.force) {
-      const confirm4 = await p3.confirm({
-        message: `Config file already exists at ${fullPath}. Overwrite?`,
-        initialValue: false
-      });
-      if (p3.isCancel(confirm4) || !confirm4) {
-        p3.outro(pc4.yellow("Operation cancelled"));
-        process.exit(0);
-      }
-    }
-    await writeFile2(fullPath, configContent, "utf8");
-    p3.log.success(pc4.green(`Wrote configuration to ${fullPath}`));
-    printPullSummary(plans, creditSystems, creditPacks);
-  } else {
-    p3.log.step(pc4.cyan("Sandbox Mode: Pulling from SANDBOX environment"));
-    const apiUrl = `${testUrl}/api/v1`;
-    s.start(`Fetching plans from ${pc4.dim("sandbox")}...`);
-    const plans = await fetchPlans({
-      apiKey,
-      apiUrl,
-      ...filters
+    p3.outro(pc4.yellow("Dry run complete. No changes made."));
+    return;
+  }
+  if (existsSync3(fullPath) && !options.force) {
+    const confirm4 = await p3.confirm({
+      message: `Config file already exists${options.prod ? ` at ${fullPath}` : ""}. Overwrite?`,
+      initialValue: false
     });
-    s.stop(`Fetched ${plans.length} plans from sandbox`);
-    s.start(`Fetching credit systems...`);
-    const creditSystems = await fetchCreditSystems(apiKey, apiUrl);
-    s.stop(`Fetched ${creditSystems.length} credit systems`);
-    s.start(`Fetching credit packs...`);
-    const creditPacks = await fetchCreditPacks(apiKey, apiUrl);
-    s.stop(`Fetched ${creditPacks.length} credit packs`);
-    const providers = new Set(
-      plans.map((p9) => p9.provider).filter(Boolean)
-    );
-    const defaultProvider = providers.size === 1 ? Array.from(providers)[0] : void 0;
-    const configContent = generateConfig(
-      plans,
-      creditSystems,
-      creditPacks,
-      defaultProvider,
-      format
-    );
-    if (options.dryRun) {
-      p3.note(configContent, "Generated Config (Dry Run)");
-      printPullSummary(plans, creditSystems, creditPacks);
-      p3.outro(pc4.yellow("Dry run complete. No changes made."));
-      return;
-    }
-    if (existsSync3(fullPath) && !options.force) {
-      const confirm4 = await p3.confirm({
-        message: `Config file already exists. Overwrite?`,
-        initialValue: false
-      });
-      if (p3.isCancel(confirm4) || !confirm4) {
-        p3.outro(pc4.yellow("Operation cancelled"));
-        process.exit(0);
-      }
+    if (p3.isCancel(confirm4) || !confirm4) {
+      p3.outro(pc4.yellow("Operation cancelled"));
+      process.exit(0);
     }
-    await writeFile2(fullPath, configContent, "utf8");
-    p3.log.success(pc4.green(`Wrote configuration to ${fullPath}`));
-    printPullSummary(plans, creditSystems, creditPacks);
   }
+  await writeFile2(fullPath, snapshot.configContent, "utf8");
+  p3.log.success(pc4.green(`Wrote configuration to ${fullPath}`));
+  printPullSummary(
+    snapshot.plans,
+    snapshot.creditSystems,
+    snapshot.creditPacks
+  );
   p3.outro(pc4.green("Pull complete! \u2728"));
 }
 function printPullSummary(plans, creditSystems, creditPacks = []) {
@@ -1332,7 +1419,7 @@ import * as p6 from "@clack/prompts";
 import pc7 from "picocolors";
 import { existsSync as existsSync4 } from "fs";
 import { writeFile as writeFile3 } from "fs/promises";
-import { join as join2, resolve as resolve3, isAbsolute as isAbsolute3, extname as extname3 } from "path";
+import { join as join2, resolve as resolve3, isAbsolute as isAbsolute3 } from "path";
 
 // src/lib/connect.ts
 import * as p5 from "@clack/prompts";
@@ -1450,16 +1537,21 @@ async function runInit(options) {
     }
   }
   const fullPath = isAbsolute3(targetPath) ? targetPath : resolve3(process.cwd(), targetPath);
+  const configSettings = await loadConfigSettings(options.config);
+  const testUrl = getTestApiUrl(
+    configSettings.environments?.test || configSettings.apiUrl
+  );
+  const filters = configSettings.filters || {};
   let apiKey = getApiKey(options.key);
   if (!apiKey) {
     p6.log.warn(
       pc7.yellow("No API key found. Let's connect your account first.")
     );
     apiKey = await executeConnectFlow({
-      apiUrl: getApiUrl(),
-      dashboardUrl: getDashboardUrl(),
+      apiUrl: testUrl,
+      dashboardUrl: getDashboardUrl(configSettings.connect?.dashboardUrl),
       noBrowser: false,
-      timeout: 300
+      timeout: configSettings.connect?.timeout || 300
     }) || "";
     if (!apiKey) {
       p6.log.error(pc7.red("Could not obtain API key. Initialization aborted."));
@@ -1479,36 +1571,21 @@ async function runInit(options) {
   const s = p6.spinner();
   s.start("Generating project configuration...");
   try {
-    const apiUrl = `${getApiUrl()}/api/v1`;
-    const plans = await fetchPlans({ apiKey, apiUrl });
-    const creditSystems = await fetchCreditSystems(apiKey, apiUrl);
-    const ext = extname3(fullPath);
-    let format = "ts";
-    if (ext === ".ts" || ext === ".mts" || ext === ".cts") {
-      format = "ts";
-    } else if (ext === ".mjs") {
-      format = "esm";
-    } else if (ext === ".cjs") {
-      throw new Error(
-        "CommonJS config files are not supported. Use owo.config.js or owo.config.ts."
-      );
-    } else if (ext === ".js") {
-      format = "esm";
-    }
-    const configContent = generateConfig(
-      plans,
-      creditSystems,
-      [],
-      void 0,
-      format
-    );
-    await writeFile3(fullPath, configContent, "utf8");
+    const format = determineConfigFormat(fullPath);
+    const snapshot = await buildRemoteCatalogSnapshot({
+      apiKey,
+      apiUrl: `${testUrl}/api/v1`,
+      format,
+      filters
+    });
+    await writeFile3(fullPath, snapshot.configContent, "utf8");
     s.stop(pc7.green("Configuration created"));
     p6.note(
       `${pc7.dim("File:")} ${fullPath}
 ${pc7.dim("Format:")} ${format.toUpperCase()}
-${pc7.dim("Plans:")} ${plans.length} imported
-${pc7.dim("Credit Systems:")} ${creditSystems.length}`,
+${pc7.dim("Plans:")} ${snapshot.plans.length} imported
+${pc7.dim("Credit Systems:")} ${snapshot.creditSystems.length}
+${pc7.dim("Credit Packs:")} ${snapshot.creditPacks.length}`,
       "\u2728 Project Initialized"
     );
     p6.outro(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owosk",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "CLI for Owostack - sync catalog, manage billing infrastructure",
   "license": "Apache-2.0",
   "repository": {
@@ -24,8 +24,8 @@
     "commander": "^14.0.3",
     "jiti": "^2.6.1",
     "picocolors": "^1.1.1",
-    "@owostack/types": "0.2.0",
-    "owostack": "0.2.0"
+    "@owostack/types": "0.3.0",
+    "owostack": "0.3.0"
   },
   "devDependencies": {
     "@types/node": "^22.19.10",