owosk 0.1.3 → 0.2.0

package/dist/index.js

@@ -4,8 +4,8 @@
 import { Command } from "commander";
 
 // src/commands/sync.ts
-import * as p from "@clack/prompts";
-import pc from "picocolors";
+import * as p2 from "@clack/prompts";
+import pc3 from "picocolors";
 
 // src/lib/config.ts
 import { join } from "path";
@@ -15,7 +15,7 @@ import { writeFile } from "fs/promises";
 var GLOBAL_CONFIG_DIR = join(homedir(), ".owostack");
 var GLOBAL_CONFIG_PATH = join(GLOBAL_CONFIG_DIR, "config.json");
 function getApiUrl(configUrl) {
-  return process.env.OWOSTACK_API_URL || configUrl || "https://api.owostack.com";
+  return process.env.OWOSTACK_API_URL || configUrl || "https://sandbox.owostack.com";
 }
 function getTestApiUrl(configUrl) {
   return process.env.OWOSTACK_API_TEST_URL || configUrl || "https://sandbox.owostack.com";
@@ -73,7 +73,7 @@ function resolveConfigPath(configPath) {
 async function loadOwostackFromConfig(fullPath) {
   try {
     const configModule = await jiti.import(fullPath);
-    const instance = configModule.default || configModule.owo || configModule;
+    const instance = configModule.owo || configModule.default || configModule;
     if (instance && typeof instance.sync === "function") {
       return instance;
     }
@@ -132,235 +132,649 @@ async function loadConfigSettings(configPath) {
   }
 }
 
+// src/lib/api.ts
+import pc from "picocolors";
+async function fetchPlans(options) {
+  if (!options.apiKey) {
+    console.error(
+      `
+  \u274C Missing API key. Pass --key or set OWOSTACK_SECRET_KEY.
+`
+    );
+    process.exit(1);
+  }
+  const url = new URL(`${options.apiUrl}/plans`);
+  if (options.group) url.searchParams.set("group", options.group);
+  if (options.interval) url.searchParams.set("interval", options.interval);
+  if (options.currency) url.searchParams.set("currency", options.currency);
+  if (options.includeInactive) url.searchParams.set("includeInactive", "true");
+  try {
+    const response = await fetch(url.toString(), {
+      method: "GET",
+      headers: { Authorization: `Bearer ${options.apiKey}` }
+    });
+    const data = await response.json();
+    if (!response.ok || !data?.success) {
+      const message = data?.error || data?.message || "Request failed";
+      console.error(`
+  \u274C Failed to fetch plans: ${message}
+`);
+      process.exit(1);
+    }
+    return data?.plans || [];
+  } catch (error) {
+    if (error.name === "TypeError" && error.message.includes("fetch failed")) {
+      console.error(
+        `
+  \u274C Connection failed: Could not reach the API at ${pc.cyan(options.apiUrl)}`
+      );
+      console.error(
+        `     Please check your internet connection or ensure the API is running.`
+      );
+      console.error(
+        `     You can override the API URL by setting the ${pc.bold("OWOSTACK_API_URL")} environment variable.
+`
+      );
+    } else {
+      console.error(`
+  \u274C Unexpected error: ${error.message}
+`);
+    }
+    process.exit(1);
+  }
+}
+async function fetchCreditSystems(apiKey, apiUrl) {
+  if (!apiKey) {
+    return [];
+  }
+  try {
+    const url = `${apiUrl}/credit-systems`;
+    const response = await fetch(url, {
+      method: "GET",
+      headers: { Authorization: `Bearer ${apiKey}` }
+    });
+    const data = await response.json();
+    if (!response.ok || !data?.success) {
+      return [];
+    }
+    return data?.creditSystems || [];
+  } catch {
+    return [];
+  }
+}
+async function fetchCreditPacks(apiKey, apiUrl) {
+  if (!apiKey) {
+    return [];
+  }
+  try {
+    const url = `${apiUrl}/credit-packs`;
+    const response = await fetch(url, {
+      method: "GET",
+      headers: { Authorization: `Bearer ${apiKey}` }
+    });
+    const data = await response.json();
+    if (!response.ok || !data?.success) {
+      return [];
+    }
+    return data?.data || [];
+  } catch {
+    return [];
+  }
+}
+
+// src/lib/diff.ts
+import pc2 from "picocolors";
+import * as p from "@clack/prompts";
+function normalizeFeature(pf) {
+  return {
+    slug: pf.slug,
+    enabled: pf.enabled,
+    limit: pf.limit ?? null,
+    // Handle both SDK 'reset' and API 'resetInterval'
+    reset: pf.reset || pf.resetInterval || "monthly",
+    // Handle both SDK 'overage' and API 'overage' (same name)
+    overage: pf.overage || "block",
+    overagePrice: pf.overagePrice ?? null
+  };
+}
+function normalizePlan(plan) {
+  return {
+    slug: plan.slug,
+    name: plan.name ?? null,
+    description: plan.description ?? null,
+    price: plan.price ?? 0,
+    currency: plan.currency ?? null,
+    interval: plan.interval ?? null,
+    planGroup: plan.planGroup ?? null,
+    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))
+  };
+}
+function normalizeCreditPack(pack) {
+  return {
+    slug: pack.slug,
+    name: pack.name ?? null,
+    description: pack.description ?? null,
+    credits: pack.credits ?? 0,
+    price: pack.price ?? 0,
+    currency: pack.currency ?? null,
+    creditSystem: pack.creditSystem || pack.creditSystemId || null,
+    provider: pack.provider ?? null
+  };
+}
+function diffPlans(localPlans, remotePlans, localCreditSystems = [], remoteCreditSystems = [], localCreditPacks = [], remoteCreditPacks = []) {
+  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));
+  const onlyLocal = [];
+  const onlyRemote = [];
+  const changed = [];
+  for (const slug of localMap.keys()) {
+    if (!remoteMap.has(slug)) onlyLocal.push(slug);
+  }
+  for (const slug of remoteMap.keys()) {
+    if (!localMap.has(slug)) onlyRemote.push(slug);
+  }
+  for (const slug of localMap.keys()) {
+    if (!remoteMap.has(slug)) continue;
+    const local = localMap.get(slug);
+    const remote = remoteMap.get(slug);
+    const details = [];
+    const fields = [
+      "name",
+      "description",
+      "price",
+      "currency",
+      "interval",
+      "planGroup",
+      "trialDays",
+      "isAddon",
+      "autoEnable"
+    ];
+    for (const field of fields) {
+      if (local[field] !== remote[field]) {
+        const localVal = JSON.stringify(local[field]);
+        const remoteVal = JSON.stringify(remote[field]);
+        details.push(
+          `${String(field)}: ${pc2.green(localVal)} \u2192 ${pc2.red(remoteVal)}`
+        );
+      }
+    }
+    const localFeatures = new Map(
+      local.features.map((f) => [f.slug, f])
+    );
+    const remoteFeatures = new Map(
+      remote.features.map((f) => [f.slug, f])
+    );
+    for (const fslug of localFeatures.keys()) {
+      if (!remoteFeatures.has(fslug)) {
+        details.push(`  ${pc2.green("+")} feature ${pc2.bold(fslug)}`);
+        continue;
+      }
+      const lf = localFeatures.get(fslug);
+      const rf = remoteFeatures.get(fslug);
+      if (JSON.stringify(lf) !== JSON.stringify(rf)) {
+        details.push(`  ${pc2.yellow("~")} feature ${pc2.bold(fslug)}`);
+        const featureFields = [
+          "enabled",
+          "limit",
+          "reset",
+          "overage",
+          "overagePrice"
+        ];
+        for (const ff of featureFields) {
+          if (JSON.stringify(lf[ff]) !== JSON.stringify(rf[ff])) {
+            const lv = lf[ff] === null ? "unlimited" : String(lf[ff]);
+            const rv = rf[ff] === null ? "unlimited" : String(rf[ff]);
+            details.push(
+              `      ${pc2.dim(String(ff))}: ${pc2.green(lv)} \u2192 ${pc2.red(rv)}`
+            );
+          }
+        }
+      }
+    }
+    for (const fslug of remoteFeatures.keys()) {
+      if (!localFeatures.has(fslug)) {
+        details.push(`  ${pc2.red("-")} feature ${pc2.bold(fslug)}`);
+      }
+    }
+    if (details.length > 0) {
+      changed.push({ slug, details });
+    }
+  }
+  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);
+  const csOnlyLocal = [];
+  const csOnlyRemote = [];
+  const csChanged = [];
+  for (const slug of localCsMap.keys()) {
+    if (!remoteCsMap.has(slug)) csOnlyLocal.push(slug);
+  }
+  for (const slug of remoteCsMap.keys()) {
+    if (!localCsMap.has(slug)) csOnlyRemote.push(slug);
+  }
+  for (const slug of localCsMap.keys()) {
+    if (!remoteCsMap.has(slug)) continue;
+    const local = localCsMap.get(slug);
+    const remote = remoteCsMap.get(slug);
+    const details = [];
+    if (local.name !== remote.name) {
+      details.push(
+        `name: ${pc2.green(JSON.stringify(local.name))} \u2192 ${pc2.red(JSON.stringify(remote.name))}`
+      );
+    }
+    if (local.description !== remote.description) {
+      details.push(
+        `description: ${pc2.green(JSON.stringify(local.description))} \u2192 ${pc2.red(JSON.stringify(remote.description))}`
+      );
+    }
+    const localF = new Map(
+      (local.features || []).map((f) => [f.feature, f])
+    );
+    const remoteF = new Map(
+      (remote.features || []).map((f) => [f.feature, f])
+    );
+    for (const fslug of localF.keys()) {
+      if (!remoteF.has(fslug)) {
+        details.push(`  ${pc2.green("+")} credit cost for ${pc2.bold(fslug)}`);
+        continue;
+      }
+      const lf = localF.get(fslug);
+      const rf = remoteF.get(fslug);
+      if (lf.creditCost !== rf.creditCost) {
+        details.push(
+          `  ${pc2.yellow("~")} credit cost for ${pc2.bold(fslug)}: ${pc2.green(String(lf.creditCost))} \u2192 ${pc2.red(String(rf.creditCost))}`
+        );
+      }
+    }
+    for (const fslug of remoteF.keys()) {
+      if (!localF.has(fslug)) {
+        details.push(`  ${pc2.red("-")} credit cost for ${pc2.bold(fslug)}`);
+      }
+    }
+    if (details.length > 0) {
+      csChanged.push({ slug, details });
+    }
+  }
+  const localPackMap = /* @__PURE__ */ new Map();
+  const remotePackMap = /* @__PURE__ */ new Map();
+  for (const pack of localCreditPacks)
+    localPackMap.set(pack.slug, normalizeCreditPack(pack));
+  for (const pack of remoteCreditPacks)
+    remotePackMap.set(pack.slug, normalizeCreditPack(pack));
+  const packOnlyLocal = [];
+  const packOnlyRemote = [];
+  const packChanged = [];
+  for (const slug of localPackMap.keys()) {
+    if (!remotePackMap.has(slug)) packOnlyLocal.push(slug);
+  }
+  for (const slug of remotePackMap.keys()) {
+    if (!localPackMap.has(slug)) packOnlyRemote.push(slug);
+  }
+  for (const slug of localPackMap.keys()) {
+    if (!remotePackMap.has(slug)) continue;
+    const local = localPackMap.get(slug);
+    const remote = remotePackMap.get(slug);
+    const details = [];
+    const packFields = [
+      "name",
+      "description",
+      "credits",
+      "price",
+      "currency",
+      "creditSystem",
+      "provider"
+    ];
+    for (const field of packFields) {
+      if (local[field] !== remote[field]) {
+        const localVal = JSON.stringify(local[field]);
+        const remoteVal = JSON.stringify(remote[field]);
+        details.push(
+          `${String(field)}: ${pc2.green(localVal)} \u2192 ${pc2.red(remoteVal)}`
+        );
+      }
+    }
+    if (details.length > 0) {
+      packChanged.push({ slug, details });
+    }
+  }
+  return {
+    onlyLocal,
+    onlyRemote,
+    changed,
+    creditSystems: {
+      onlyLocal: csOnlyLocal,
+      onlyRemote: csOnlyRemote,
+      changed: csChanged
+    },
+    creditPacks: {
+      onlyLocal: packOnlyLocal,
+      onlyRemote: packOnlyRemote,
+      changed: packChanged
+    }
+  };
+}
+function printDiff(diff) {
+  const hasPlanDiff = diff.onlyLocal.length > 0 || diff.onlyRemote.length > 0 || diff.changed.length > 0;
+  const hasCsDiff = diff.creditSystems.onlyLocal.length > 0 || diff.creditSystems.onlyRemote.length > 0 || diff.creditSystems.changed.length > 0;
+  const hasPackDiff = diff.creditPacks.onlyLocal.length > 0 || diff.creditPacks.onlyRemote.length > 0 || diff.creditPacks.changed.length > 0;
+  if (!hasPlanDiff && !hasCsDiff && !hasPackDiff) {
+    p.log.success(pc2.green("Everything is in sync. No differences found."));
+    return;
+  }
+  if (hasPlanDiff) {
+    const lines = [];
+    if (diff.onlyLocal.length > 0) {
+      for (const slug of diff.onlyLocal) {
+        lines.push(
+          `${pc2.green("+")} ${pc2.bold(slug)} ${pc2.dim("(local only \u2014 will be created on sync)")}`
+        );
+      }
+    }
+    if (diff.onlyRemote.length > 0) {
+      for (const slug of diff.onlyRemote) {
+        lines.push(
+          `${pc2.red("-")} ${pc2.bold(slug)} ${pc2.dim("(remote only \u2014 not in local config)")}`
+        );
+      }
+    }
+    if (diff.changed.length > 0) {
+      for (const item of diff.changed) {
+        lines.push(`${pc2.yellow("~")} ${pc2.bold(item.slug)}`);
+        for (const line of item.details) {
+          lines.push(`  ${line}`);
+        }
+      }
+    }
+    p.note(lines.join("\n"), "Plans Diff");
+  }
+  if (hasCsDiff) {
+    const csLines = [];
+    const csDiff = diff.creditSystems;
+    if (csDiff.onlyLocal.length > 0) {
+      for (const slug of csDiff.onlyLocal) {
+        csLines.push(
+          `${pc2.green("+")} ${pc2.bold(slug)} ${pc2.dim("(local only \u2014 will be created on sync)")}`
+        );
+      }
+    }
+    if (csDiff.onlyRemote.length > 0) {
+      for (const slug of csDiff.onlyRemote) {
+        csLines.push(
+          `${pc2.red("-")} ${pc2.bold(slug)} ${pc2.dim("(remote only \u2014 not in local config)")}`
+        );
+      }
+    }
+    if (csDiff.changed.length > 0) {
+      for (const item of csDiff.changed) {
+        csLines.push(`${pc2.yellow("~")} ${pc2.bold(item.slug)}`);
+        for (const line of item.details) {
+          csLines.push(`  ${line}`);
+        }
+      }
+    }
+    p.note(csLines.join("\n"), "Credit Systems Diff");
+  }
+  if (hasPackDiff) {
+    const packLines = [];
+    const packDiff = diff.creditPacks;
+    if (packDiff.onlyLocal.length > 0) {
+      for (const slug of packDiff.onlyLocal) {
+        packLines.push(
+          `${pc2.green("+")} ${pc2.bold(slug)} ${pc2.dim("(local only \u2014 will be created on sync)")}`
+        );
+      }
+    }
+    if (packDiff.onlyRemote.length > 0) {
+      for (const slug of packDiff.onlyRemote) {
+        packLines.push(
+          `${pc2.red("-")} ${pc2.bold(slug)} ${pc2.dim("(remote only \u2014 not in local config)")}`
+        );
+      }
+    }
+    if (packDiff.changed.length > 0) {
+      for (const item of packDiff.changed) {
+        packLines.push(`${pc2.yellow("~")} ${pc2.bold(item.slug)}`);
+        for (const line of item.details) {
+          packLines.push(`  ${line}`);
+        }
+      }
+    }
+    p.note(packLines.join("\n"), "Credit Packs Diff");
+  }
+  const planParts = [
+    diff.onlyLocal.length > 0 ? `${pc2.green(pc2.bold(diff.onlyLocal.length.toString()))} plans to add` : "",
+    diff.onlyRemote.length > 0 ? `${pc2.red(pc2.bold(diff.onlyRemote.length.toString()))} plans to remove` : "",
+    diff.changed.length > 0 ? `${pc2.yellow(pc2.bold(diff.changed.length.toString()))} plans modified` : ""
+  ].filter(Boolean);
+  const csParts = [
+    diff.creditSystems.onlyLocal.length > 0 ? `${pc2.green(pc2.bold(diff.creditSystems.onlyLocal.length.toString()))} systems to add` : "",
+    diff.creditSystems.onlyRemote.length > 0 ? `${pc2.red(pc2.bold(diff.creditSystems.onlyRemote.length.toString()))} systems to remove` : "",
+    diff.creditSystems.changed.length > 0 ? `${pc2.yellow(pc2.bold(diff.creditSystems.changed.length.toString()))} systems modified` : ""
+  ].filter(Boolean);
+  const packParts = [
+    diff.creditPacks.onlyLocal.length > 0 ? `${pc2.green(pc2.bold(diff.creditPacks.onlyLocal.length.toString()))} packs to add` : "",
+    diff.creditPacks.onlyRemote.length > 0 ? `${pc2.red(pc2.bold(diff.creditPacks.onlyRemote.length.toString()))} packs to remove` : "",
+    diff.creditPacks.changed.length > 0 ? `${pc2.yellow(pc2.bold(diff.creditPacks.changed.length.toString()))} packs modified` : ""
+  ].filter(Boolean);
+  const parts = [...planParts, ...csParts, ...packParts].join(pc2.dim("  \xB7  "));
+  p.log.info(parts);
+}
+
 // src/commands/sync.ts
 async function runSyncSingle(options) {
-  const { configPath, dryRun, apiUrl } = options;
+  const { configPath, dryRun, autoApprove, environment } = options;
   const apiKey = getApiKey(options.apiKey);
+  const apiUrl = `${options.apiUrl}/api/v1`;
   const fullPath = resolveConfigPath(configPath);
   if (!fullPath) {
-    p.log.error(
-      pc.red(
+    p2.log.error(
+      pc3.red(
         `Configuration file not found.${configPath ? ` looked at ${configPath}` : " searched defaults."}`
       )
     );
     process.exit(1);
   }
-  const s = p.spinner();
-  s.start(`Loading ${pc.cyan(fullPath)}`);
+  const s = p2.spinner();
+  s.start(`Loading ${pc3.cyan(fullPath)}`);
   let owo;
   try {
     owo = await loadOwostackFromConfig(fullPath);
   } catch (e) {
-    s.stop(pc.red("Failed to load configuration"));
-    p.log.error(pc.red(`Error: ${e.message}`));
-    p.note(
+    s.stop(pc3.red("Failed to load configuration"));
+    p2.log.error(pc3.red(`Error: ${e.message}`));
+    p2.note(
       `import { Owostack, metered, boolean, plan } from "owostack";
 export default new Owostack({ secretKey: "...", catalog: [...] });`,
       "Example owo.config.ts"
     );
-    p.log.info(
-      pc.dim(
+    p2.log.info(
+      pc3.dim(
         "Make sure 'owostack' is installed in your project: 'npm install owostack'"
       )
     );
     process.exit(1);
   }
   if (!owo || typeof owo.sync !== "function") {
-    s.stop(pc.red("Invalid configuration"));
-    p.log.error("Config file must export an Owostack instance.");
+    s.stop(pc3.red("Invalid configuration"));
+    p2.log.error("Config file must export an Owostack instance.");
     process.exit(1);
   }
-  s.message("Syncing with API...");
-  if (apiKey && typeof owo.setSecretKey === "function") {
-    owo.setSecretKey(apiKey);
+  s.stop("Configuration loaded");
+  const { buildSyncPayload } = await import("owostack").catch(() => ({
+    buildSyncPayload: null
+  }));
+  const localPayload = buildSyncPayload?.(owo._config.catalog);
+  s.start(`Fetching remote catalog from ${pc3.dim(environment)}...`);
+  const remotePlans = await fetchPlans({ apiKey, apiUrl });
+  const remoteCreditSystems = await fetchCreditSystems(apiKey, apiUrl);
+  const remoteCreditPacks = await fetchCreditPacks(apiKey, apiUrl);
+  s.stop("Remote catalog fetched");
+  const diff = diffPlans(
+    localPayload?.plans ?? [],
+    remotePlans,
+    localPayload?.creditSystems ?? [],
+    remoteCreditSystems,
+    localPayload?.creditPacks ?? [],
+    remoteCreditPacks
+  );
+  printDiff(diff);
+  const hasChanges = diff.onlyLocal.length > 0 || diff.onlyRemote.length > 0 || diff.changed.length > 0 || diff.creditSystems.onlyLocal.length > 0 || diff.creditSystems.onlyRemote.length > 0 || diff.creditSystems.changed.length > 0 || diff.creditPacks.onlyLocal.length > 0 || diff.creditPacks.onlyRemote.length > 0 || diff.creditPacks.changed.length > 0;
+  if (!hasChanges) {
+    p2.outro(pc3.green("Everything is already in sync! \u2728"));
+    return;
   }
-  if (apiUrl && typeof owo.setApiUrl === "function") {
-    owo.setApiUrl(apiUrl);
+  if (dryRun) {
+    p2.log.info(pc3.yellow("Dry run - no changes were applied."));
+    return;
   }
-  try {
-    if (dryRun) {
-      s.stop(pc.yellow("Dry run mode (showing catalog payload)"));
-      const { buildSyncPayload } = await import("owostack").catch(() => {
-        return { buildSyncPayload: null };
-      });
-      if (buildSyncPayload && owo._config?.catalog) {
-        const payload = buildSyncPayload(owo._config.catalog);
-        let featureSummary = payload.features.map(
-          (f) => `${pc.green("+")} ${pc.bold(f.slug)} ${pc.dim(`(${f.type})`)}`
-        ).join("\n");
-        p.note(
-          featureSummary || pc.dim("No features defined"),
-          "Features to Sync"
-        );
-        let planSummary = "";
-        for (const p_obj of payload.plans) {
-          planSummary += `${pc.green("+")} ${pc.bold(p_obj.slug)} ${pc.dim(`${p_obj.currency} ${p_obj.price}/${p_obj.interval}`)}
-`;
-          for (const f of p_obj.features) {
-            const status = f.enabled ? pc.green("\u2713") : pc.red("\u2717");
-            const configParts = [];
-            if (f.limit !== void 0)
-              configParts.push(
-                `limit: ${f.limit === null ? "unlimited" : f.limit}`
-              );
-            if (f.reset) configParts.push(`reset: ${f.reset}`);
-            if (f.overage) configParts.push(`overage: ${f.overage}`);
-            if (f.overagePrice) configParts.push(`price: ${f.overagePrice}`);
-            const configStr = configParts.length > 0 ? ` ${pc.dim(`(${configParts.join(", ")})`)}` : "";
-            planSummary += `  ${status} ${pc.dim(f.slug)}${configStr}
-`;
-          }
-          planSummary += "\n";
-        }
-        p.note(
-          planSummary.trim() || pc.dim("No plans defined"),
-          "Plans to Sync"
-        );
-      }
-      p.log.info(pc.yellow("No changes were applied to the server."));
-      return;
+  if (!autoApprove) {
+    const confirm4 = await p2.confirm({
+      message: `Proceed with sync to ${pc3.cyan(environment)}?`,
+      initialValue: false
+    });
+    if (p2.isCancel(confirm4) || !confirm4) {
+      p2.outro(pc3.yellow("Sync cancelled"));
+      process.exit(0);
     }
+  }
+  s.start(`Syncing with ${pc3.cyan(environment)}...`);
+  if (apiKey && typeof owo.setSecretKey === "function") {
+    owo.setSecretKey(apiKey);
+  }
+  if (apiUrl && typeof owo.setApiUrl === "function") {
+    owo.setApiUrl(apiUrl);
+  }
+  try {
     const result = await owo.sync();
-    s.stop(pc.green("Sync completed"));
+    s.stop(pc3.green("Sync completed"));
     if (!result.success) {
-      p.log.error(pc.red("Sync failed"));
+      p2.log.error(pc3.red("Sync failed"));
       process.exit(1);
     }
-    const fc = result.features;
-    const pc_res = result.plans;
-    let summary = [];
-    if (fc.created.length)
-      summary.push(pc.green(`+ ${fc.created.length} features`));
-    if (fc.updated.length)
-      summary.push(pc.cyan(`~ ${fc.updated.length} features`));
-    if (pc_res.created.length)
-      summary.push(pc.green(`+ ${pc_res.created.length} plans`));
-    if (pc_res.updated.length)
-      summary.push(pc.cyan(`~ ${pc_res.updated.length} plans`));
-    if (summary.length > 0) {
-      p.note(summary.join("\n"), "Changes applied");
+    const lines = [];
+    if (diff.onlyLocal.length > 0) {
+      for (const slug of diff.onlyLocal) {
+        lines.push(`${pc3.green("+")} ${pc3.bold(slug)}`);
+      }
+    }
+    if (diff.onlyRemote.length > 0) {
+      for (const slug of diff.onlyRemote) {
+        lines.push(`${pc3.red("-")} ${pc3.bold(slug)}`);
+      }
+    }
+    if (diff.changed.length > 0) {
+      for (const item of diff.changed) {
+        lines.push(`${pc3.cyan("~")} ${pc3.bold(item.slug)}`);
+        for (const detail of item.details) {
+          lines.push(`  ${detail}`);
+        }
+      }
+    }
+    if (diff.creditSystems.onlyLocal.length > 0) {
+      for (const slug of diff.creditSystems.onlyLocal) {
+        lines.push(`${pc3.green("+")} ${pc3.bold(slug)}`);
+      }
+    }
+    if (diff.creditSystems.onlyRemote.length > 0) {
+      for (const slug of diff.creditSystems.onlyRemote) {
+        lines.push(`${pc3.red("-")} ${pc3.bold(slug)}`);
+      }
+    }
+    if (diff.creditSystems.changed.length > 0) {
+      for (const item of diff.creditSystems.changed) {
+        lines.push(`${pc3.cyan("~")} ${pc3.bold(item.slug)}`);
+        for (const detail of item.details) {
+          lines.push(`  ${detail}`);
+        }
+      }
+    }
+    if (diff.creditPacks.onlyLocal.length > 0) {
+      for (const slug of diff.creditPacks.onlyLocal) {
+        lines.push(`${pc3.green("+")} ${pc3.bold(slug)}`);
+      }
+    }
+    if (diff.creditPacks.onlyRemote.length > 0) {
+      for (const slug of diff.creditPacks.onlyRemote) {
+        lines.push(`${pc3.red("-")} ${pc3.bold(slug)}`);
+      }
+    }
+    if (diff.creditPacks.changed.length > 0) {
+      for (const item of diff.creditPacks.changed) {
+        lines.push(`${pc3.cyan("~")} ${pc3.bold(item.slug)}`);
+        for (const detail of item.details) {
+          lines.push(`  ${detail}`);
+        }
+      }
+    }
+    if (lines.length > 0) {
+      p2.note(lines.join("\n"), "Changes applied");
+      const counts = [
+        diff.onlyLocal.length > 0 ? `${pc3.green(pc3.bold(diff.onlyLocal.length.toString()))} plans added` : "",
+        diff.onlyRemote.length > 0 ? `${pc3.red(pc3.bold(diff.onlyRemote.length.toString()))} plans removed` : "",
+        diff.changed.length > 0 ? `${pc3.cyan(pc3.bold(diff.changed.length.toString()))} plans modified` : "",
+        diff.creditSystems.onlyLocal.length > 0 ? `${pc3.green(pc3.bold(diff.creditSystems.onlyLocal.length.toString()))} systems added` : "",
+        diff.creditSystems.onlyRemote.length > 0 ? `${pc3.red(pc3.bold(diff.creditSystems.onlyRemote.length.toString()))} systems removed` : "",
+        diff.creditSystems.changed.length > 0 ? `${pc3.cyan(pc3.bold(diff.creditSystems.changed.length.toString()))} systems modified` : "",
+        diff.creditPacks.onlyLocal.length > 0 ? `${pc3.green(pc3.bold(diff.creditPacks.onlyLocal.length.toString()))} packs added` : "",
+        diff.creditPacks.onlyRemote.length > 0 ? `${pc3.red(pc3.bold(diff.creditPacks.onlyRemote.length.toString()))} packs removed` : "",
+        diff.creditPacks.changed.length > 0 ? `${pc3.cyan(pc3.bold(diff.creditPacks.changed.length.toString()))} packs modified` : ""
+      ].filter(Boolean).join(pc3.dim("  \xB7  "));
+      p2.log.info(counts);
     } else {
-      p.log.info(pc.dim("No changes detected. Catalog is up to date."));
+      p2.log.success(pc3.dim("No changes detected. Catalog is up to date."));
     }
-    if (result.warnings.length) {
-      p.log.warn(pc.yellow(`Warnings:
+    if (result.warnings && result.warnings.length) {
+      p2.log.warn(pc3.yellow(`Warnings:
 ${result.warnings.join("\n")}`));
     }
   } catch (e) {
-    s.stop(pc.red("Sync failed"));
-    p.log.error(e.message);
+    s.stop(pc3.red("Sync failed"));
+    p2.log.error(e.message);
     throw e;
   }
 }
 async function runSync(options) {
-  p.intro(pc.bgYellow(pc.black(" sync ")));
+  p2.intro(pc3.bgYellow(pc3.black(" sync ")));
   const configSettings = await loadConfigSettings(options.config);
-  let apiUrl = configSettings.apiUrl;
   const testUrl = getTestApiUrl(configSettings.environments?.test);
   const liveUrl = getApiUrl(configSettings.environments?.live);
   if (options.prod) {
-    p.log.step(pc.magenta("Production Mode: Syncing both environments"));
-    await runSyncSingle({
-      configPath: options.config,
-      dryRun: !!options.dryRun,
-      apiKey: options.key || "",
-      apiUrl: apiUrl || `${testUrl}/api/v1`
-    });
+    p2.log.step(pc3.magenta("Production Mode: Syncing to PROD environment"));
     await runSyncSingle({
       configPath: options.config,
       dryRun: !!options.dryRun,
+      autoApprove: !!options.yes,
       apiKey: options.key || "",
-      apiUrl: apiUrl || `${liveUrl}/api/v1`
+      apiUrl: configSettings.apiUrl || liveUrl,
+      environment: "prod"
     });
   } else {
+    p2.log.step(pc3.cyan("Sandbox Mode: Syncing to SANDBOX environment"));
     await runSyncSingle({
       configPath: options.config,
       dryRun: !!options.dryRun,
+      autoApprove: !!options.yes,
       apiKey: options.key || "",
-      apiUrl: apiUrl || `${liveUrl}/api/v1`
+      apiUrl: testUrl,
+      environment: "sandbox"
     });
   }
-  p.outro(pc.green("Done! \u2728"));
+  p2.outro(pc3.green("Done! \u2728"));
 }
 
 // src/commands/pull.ts
-import * as p2 from "@clack/prompts";
-import pc3 from "picocolors";
+import * as p3 from "@clack/prompts";
+import pc4 from "picocolors";
 import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
 import { writeFile as writeFile2 } from "fs/promises";
 import { join as join2, resolve as resolve2, extname as extname2, isAbsolute as isAbsolute2 } from "path";
 
-// src/lib/api.ts
-import pc2 from "picocolors";
-async function fetchPlans(options) {
-  if (!options.apiKey) {
-    console.error(
-      `
-  \u274C Missing API key. Pass --key or set OWOSTACK_SECRET_KEY.
-`
-    );
-    process.exit(1);
-  }
-  const url = new URL(`${options.apiUrl}/plans`);
-  if (options.group) url.searchParams.set("group", options.group);
-  if (options.interval) url.searchParams.set("interval", options.interval);
-  if (options.currency) url.searchParams.set("currency", options.currency);
-  if (options.includeInactive) url.searchParams.set("includeInactive", "true");
-  try {
-    const response = await fetch(url.toString(), {
-      method: "GET",
-      headers: { Authorization: `Bearer ${options.apiKey}` }
-    });
-    const data = await response.json();
-    if (!response.ok || !data?.success) {
-      const message = data?.error || data?.message || "Request failed";
-      console.error(`
-  \u274C Failed to fetch plans: ${message}
-`);
-      process.exit(1);
-    }
-    return data?.plans || [];
-  } catch (error) {
-    if (error.name === "TypeError" && error.message.includes("fetch failed")) {
-      console.error(
-        `
-  \u274C Connection failed: Could not reach the API at ${pc2.cyan(options.apiUrl)}`
-      );
-      console.error(
-        `     Please check your internet connection or ensure the API is running.`
-      );
-      console.error(
-        `     You can override the API URL by setting the ${pc2.bold("OWOSTACK_API_URL")} environment variable.
-`
-      );
-    } else {
-      console.error(`
-  \u274C Unexpected error: ${error.message}
-`);
-    }
-    process.exit(1);
-  }
-}
-async function fetchCreditSystems(apiKey, apiUrl) {
-  if (!apiKey) {
-    return [];
-  }
-  try {
-    const url = `${apiUrl}/credit-systems`;
-    const response = await fetch(url, {
-      method: "GET",
-      headers: { Authorization: `Bearer ${apiKey}` }
-    });
-    const data = await response.json();
-    if (!response.ok || !data?.success) {
-      return [];
-    }
-    return data?.creditSystems || [];
-  } catch {
-    return [];
-  }
-}
-
 // src/lib/generate.ts
 function slugToIdentifier(slug, used) {
   const parts = slug.replace(/[^a-zA-Z0-9]+/g, " ").trim().split(/\s+/).filter(Boolean);
@@ -414,7 +828,7 @@ function slugToIdentifier(slug, used) {
   used.add(candidate);
   return candidate;
 }
-function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts") {
+function generateConfig(plans, creditSystems = [], creditPacks = [], defaultProvider, format = "ts") {
   const isTs = format === "ts";
   const isCjs = format === "cjs";
   const creditSystemSlugs = new Set(creditSystems.map((cs) => cs.slug));
@@ -427,7 +841,8 @@ function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts
         featuresBySlug.set(f.slug, {
           slug: f.slug,
           name: f.name,
-          type: f.type || "metered"
+          type: f.type || "metered",
+          meterType: f.meterType
         });
       }
     }
@@ -450,7 +865,9 @@ function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts
     const varName = slugToIdentifier(feature.slug, usedNames);
     featureVars.set(feature.slug, varName);
     const nameArg = feature.name ? `, { name: ${JSON.stringify(feature.name)} }` : "";
-    const decl = feature.type === "boolean" ? `boolean(${JSON.stringify(feature.slug)}${nameArg})` : `metered(${JSON.stringify(feature.slug)}${nameArg})`;
+    const isEntity = feature.meterType === "non_consumable";
+    const builder = feature.type === "boolean" ? "boolean" : isEntity ? "entity" : "metered";
+    const decl = `${builder}(${JSON.stringify(feature.slug)}${nameArg})`;
     if (isCjs) {
       featureLines.push(`const ${varName} = ${decl};`);
       featureLines.push(`exports.${varName} = ${varName};`);
@@ -497,6 +914,8 @@ function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts
       configLines.push(`trialDays: ${plan.trialDays}`);
     if (plan.provider)
       configLines.push(`provider: ${JSON.stringify(plan.provider)}`);
+    if (plan.autoEnable) configLines.push(`autoEnable: true`);
+    if (plan.isAddon) configLines.push(`isAddon: true`);
     const featureEntries = [];
     for (const pf of plan.features || []) {
       if (creditSystemSlugs.has(pf.slug)) {
@@ -536,9 +955,13 @@ function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts
         featureEntries.push(`${varName}.config(${JSON.stringify(config2)})`);
         continue;
       }
+      const isEntityFeature = globalFeature?.meterType === "non_consumable";
       const config = {};
       if (pf.limit !== void 0) config.limit = pf.limit;
-      config.reset = pf.resetInterval || pf.reset || "monthly";
+      if (!isEntityFeature) {
+        const reset = pf.resetInterval || pf.reset || "monthly";
+        if (reset !== "none") config.reset = reset;
+      }
       if (pf.overage) config.overage = pf.overage;
       if (pf.overagePrice !== void 0) config.overagePrice = pf.overagePrice;
       const configKeys = Object.keys(config);
@@ -563,10 +986,39 @@ function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts
     })`
     );
   }
+  const creditPackLines = [];
+  for (const pack of creditPacks) {
+    const configLines = [];
+    configLines.push(`name: ${JSON.stringify(pack.name)}`);
+    if (pack.description)
+      configLines.push(`description: ${JSON.stringify(pack.description)}`);
+    configLines.push(`credits: ${pack.credits}`);
+    configLines.push(`price: ${pack.price}`);
+    configLines.push(`currency: ${JSON.stringify(pack.currency)}`);
+    configLines.push(
+      `creditSystem: ${JSON.stringify(pack.creditSystemId || pack.creditSystem)}`
+    );
+    if (pack.provider)
+      configLines.push(`provider: ${JSON.stringify(pack.provider)}`);
+    if (pack.metadata)
+      configLines.push(`metadata: ${JSON.stringify(pack.metadata)}`);
+    creditPackLines.push(
+      `creditPack(${JSON.stringify(pack.slug)}, {
+      ${configLines.join(",\n      ")}
+    })`
+    );
+  }
   const hasCreditSystems = creditSystemLines.length > 0;
+  const hasCreditPacks = creditPackLines.length > 0;
+  const hasEntities = Array.from(featuresBySlug.values()).some(
+    (f) => f.meterType === "non_consumable"
+  );
   const providerLine = defaultProvider ? `  provider: ${JSON.stringify(defaultProvider)},
 ` : "";
-  const imports = isCjs ? `const { Owostack, metered, boolean, creditSystem, plan } = require("owostack");` : `import { Owostack, metered, boolean, creditSystem, plan } from "owostack";`;
+  const importParts = ["Owostack", "metered", "boolean"];
+  if (hasEntities) importParts.push("entity");
+  importParts.push("creditSystem", "creditPack", "plan");
+  const imports = isCjs ? `const { ${importParts.join(", ")} } = require("owostack");` : `import { ${importParts.join(", ")} } from "owostack";`;
   const tsCheck = !isTs ? `// @ts-check` : "";
   const jsDoc = !isTs ? `/** @type {import('owostack').Owostack} */` : "";
   const owoDecl = isCjs ? "exports.owo =" : "export const owo =";
@@ -577,13 +1029,15 @@ function generateConfig(plans, creditSystems = [], defaultProvider, format = "ts
     ``,
     ...featureLines,
     ...hasCreditSystems ? ["", ...creditSystemLines] : [],
+    ...hasCreditPacks ? ["", ...creditPackLines] : [],
     ``,
     jsDoc,
     `${owoDecl} new Owostack({`,
     `  secretKey: ${secretKey},`,
     providerLine,
     `  catalog: [`,
-    `    ${planLines.join(",\n    ")}`,
+    `    ${planLines.join(",\n    ")}${hasCreditPacks ? "," : ""}`,
+    ...hasCreditPacks ? [`    ${creditPackLines.join(",\n    ")}`] : [],
     `  ],`,
     `});`,
     ``
@@ -595,8 +1049,8 @@ function getProjectInfo() {
   const cwd = process.cwd();
   let isEsm = false;
   try {
-    const pkg = JSON.parse(readFileSync2(join2(cwd, "package.json"), "utf8"));
-    isEsm = pkg.type === "module";
+    const pkg2 = JSON.parse(readFileSync2(join2(cwd, "package.json"), "utf8"));
+    isEsm = pkg2.type === "module";
   } catch {
   }
   return { isEsm };
@@ -611,15 +1065,15 @@ function determineFormat(fullPath) {
   return "ts";
 }
 async function runPull(options) {
-  p2.intro(pc3.bgYellow(pc3.black(" pull ")));
+  p3.intro(pc4.bgYellow(pc4.black(" pull ")));
   let fullPath;
   if (options.config) {
     fullPath = isAbsolute2(options.config) ? options.config : resolve2(process.cwd(), options.config);
   } else {
     const resolved = resolveConfigPath();
     if (!resolved) {
-      p2.log.error(
-        pc3.red("No configuration file found. Run 'owostack init' first.")
+      p3.log.error(
+        pc4.red("No configuration file found. Run 'owostack init' first.")
       );
       process.exit(1);
     }
@@ -627,64 +1081,73 @@ async function runPull(options) {
   }
   const apiKey = getApiKey(options.key);
   const configSettings = await loadConfigSettings(options.config);
-  const baseUrl = getApiUrl(configSettings.apiUrl);
+  const testUrl = getTestApiUrl(configSettings.environments?.test);
+  const liveUrl = getApiUrl(configSettings.environments?.live);
   const filters = configSettings.filters || {};
   const format = determineFormat(fullPath);
-  const s = p2.spinner();
+  const s = p3.spinner();
   if (options.prod) {
-    p2.log.step(pc3.magenta("Production Mode: Fetching both environments"));
-    const testUrl = getTestApiUrl(configSettings.environments?.test);
-    const liveUrl = getApiUrl(configSettings.environments?.live);
-    s.start(`Fetching from ${pc3.dim("test")}...`);
-    const testPlans = await fetchPlans({
-      apiKey,
-      apiUrl: `${testUrl}/api/v1`,
-      ...filters
-    });
-    s.stop(`Fetched ${testPlans.length} plans from test`);
-    s.start(`Fetching from ${pc3.dim("live")}...`);
-    const livePlans = await fetchPlans({
+    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: `${liveUrl}/api/v1`,
+      apiUrl,
       ...filters
     });
-    s.stop(`Fetched ${livePlans.length} plans from live`);
+    s.stop(`Fetched ${plans.length} plans from prod`);
     s.start(`Fetching credit systems...`);
-    const creditSystems = await fetchCreditSystems(apiKey, `${liveUrl}/api/v1`);
+    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(
-      livePlans.map((p9) => p9.provider).filter(Boolean)
+      plans.map((p9) => p9.provider).filter(Boolean)
     );
     const defaultProvider = providers.size === 1 ? Array.from(providers)[0] : void 0;
     const configContent = generateConfig(
-      livePlans,
+      plans,
       creditSystems,
+      creditPacks,
       defaultProvider,
       format
     );
     if (options.dryRun) {
-      p2.note(configContent, "Generated Config (Dry Run)");
-      p2.outro(pc3.yellow("Dry run complete. No changes made."));
+      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) {
-      p2.log.error(pc3.red(`Config file already exists at ${fullPath}`));
-      p2.log.info(pc3.dim("Use --force to overwrite."));
-      process.exit(1);
+      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");
-    p2.log.success(pc3.green(`Wrote configuration to ${fullPath}`));
+    p3.log.success(pc4.green(`Wrote configuration to ${fullPath}`));
+    printPullSummary(plans, creditSystems, creditPacks);
   } else {
-    s.start(`Fetching plans from ${pc3.dim(baseUrl)}...`);
+    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: `${baseUrl}/api/v1`,
+      apiUrl,
       ...filters
     });
-    s.stop(`Fetched ${plans.length} plans`);
+    s.stop(`Fetched ${plans.length} plans from sandbox`);
     s.start(`Fetching credit systems...`);
-    const creditSystems = await fetchCreditSystems(apiKey, `${baseUrl}/api/v1`);
+    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)
     );
@@ -692,166 +1155,75 @@ async function runPull(options) {
     const configContent = generateConfig(
       plans,
       creditSystems,
+      creditPacks,
       defaultProvider,
       format
     );
     if (options.dryRun) {
-      p2.note(configContent, "Generated Config (Dry Run)");
-      p2.outro(pc3.yellow("Dry run complete. No changes made."));
+      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 confirm3 = await p2.confirm({
+      const confirm4 = await p3.confirm({
         message: `Config file already exists. Overwrite?`,
         initialValue: false
       });
-      if (p2.isCancel(confirm3) || !confirm3) {
-        p2.outro(pc3.yellow("Operation cancelled"));
+      if (p3.isCancel(confirm4) || !confirm4) {
+        p3.outro(pc4.yellow("Operation cancelled"));
         process.exit(0);
       }
     }
     await writeFile2(fullPath, configContent, "utf8");
-    p2.log.success(pc3.green(`Wrote configuration to ${fullPath}`));
+    p3.log.success(pc4.green(`Wrote configuration to ${fullPath}`));
+    printPullSummary(plans, creditSystems, creditPacks);
   }
-  p2.outro(pc3.green("Pull complete! \u2728"));
-}
-
-// src/commands/diff.ts
-import * as p4 from "@clack/prompts";
-import pc5 from "picocolors";
-
-// src/lib/diff.ts
-import pc4 from "picocolors";
-import * as p3 from "@clack/prompts";
-function normalizeFeature(pf) {
-  return {
-    slug: pf.slug,
-    enabled: pf.enabled,
-    limit: pf.limit ?? null,
-    // Handle both SDK 'reset' and API 'resetInterval'
-    reset: pf.reset || pf.resetInterval || "monthly",
-    // Handle both SDK 'overage' and API 'overage' (same name)
-    overage: pf.overage || "block",
-    overagePrice: pf.overagePrice ?? null
-  };
-}
-function normalizePlan(plan) {
-  return {
-    slug: plan.slug,
-    name: plan.name ?? null,
-    description: plan.description ?? null,
-    price: plan.price ?? 0,
-    currency: plan.currency ?? null,
-    interval: plan.interval ?? null,
-    planGroup: plan.planGroup ?? null,
-    trialDays: plan.trialDays ?? 0,
-    features: (plan.features || []).map(normalizeFeature).sort((a, b) => a.slug.localeCompare(b.slug))
-  };
+  p3.outro(pc4.green("Pull complete! \u2728"));
 }
-function diffPlans(localPlans, remotePlans) {
-  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));
-  const onlyLocal = [];
-  const onlyRemote = [];
-  const changed = [];
-  for (const slug of localMap.keys()) {
-    if (!remoteMap.has(slug)) onlyLocal.push(slug);
-  }
-  for (const slug of remoteMap.keys()) {
-    if (!localMap.has(slug)) onlyRemote.push(slug);
-  }
-  for (const slug of localMap.keys()) {
-    if (!remoteMap.has(slug)) continue;
-    const local = localMap.get(slug);
-    const remote = remoteMap.get(slug);
-    const details = [];
-    const fields = [
-      "name",
-      "description",
-      "price",
-      "currency",
-      "interval",
-      "planGroup",
-      "trialDays"
-    ];
-    for (const field of fields) {
-      if (local[field] !== remote[field]) {
-        const localVal = JSON.stringify(local[field]);
-        const remoteVal = JSON.stringify(remote[field]);
-        details.push(
-          `${String(field)}: ${pc4.green(localVal)} \u2192 ${pc4.red(remoteVal)}`
-        );
-      }
-    }
-    const localFeatures = new Map(local.features.map((f) => [f.slug, f]));
-    const remoteFeatures = new Map(
-      remote.features.map((f) => [f.slug, f])
-    );
-    for (const fslug of localFeatures.keys()) {
-      if (!remoteFeatures.has(fslug)) {
-        details.push(`feature ${fslug}: ${pc4.green("[local only]")}`);
-        continue;
-      }
-      const lf = localFeatures.get(fslug);
-      const rf = remoteFeatures.get(fslug);
-      if (JSON.stringify(lf) !== JSON.stringify(rf)) {
-        details.push(`feature ${fslug}:`);
-        details.push(`  ${pc4.green(JSON.stringify(lf))}`);
-        details.push(`  ${pc4.red(JSON.stringify(rf))}`);
-      }
-    }
-    for (const fslug of remoteFeatures.keys()) {
-      if (!localFeatures.has(fslug)) {
-        details.push(`feature ${fslug}: ${pc4.red("[remote only]")}`);
-      }
-    }
-    if (details.length > 0) {
-      changed.push({ slug, details });
+function printPullSummary(plans, creditSystems, creditPacks = []) {
+  const featureSlugs = /* @__PURE__ */ new Set();
+  for (const plan of plans) {
+    for (const f of plan.features || []) {
+      featureSlugs.add(f.slug);
     }
   }
-  return { onlyLocal, onlyRemote, changed };
-}
-function printDiff(diff) {
-  if (diff.onlyLocal.length === 0 && diff.onlyRemote.length === 0 && diff.changed.length === 0) {
-    p3.log.success(pc4.green("No differences found."));
-    return;
-  }
-  if (diff.onlyLocal.length > 0) {
-    p3.note(
-      diff.onlyLocal.map((slug) => `${pc4.green("+")} ${slug}`).join("\n"),
-      "Only in Local"
+  const lines = [];
+  for (const plan of plans) {
+    const featureCount = (plan.features || []).length;
+    lines.push(
+      `${pc4.green("\u2193")} ${pc4.bold(plan.slug)} ${pc4.dim(`${plan.currency} ${plan.price}/${plan.interval}`)} ${pc4.dim(`(${featureCount} features)`)} ${plan.isAddon ? pc4.cyan("(addon)") : ""}`
     );
   }
-  if (diff.onlyRemote.length > 0) {
-    p3.note(
-      diff.onlyRemote.map((slug) => `${pc4.red("-")} ${slug}`).join("\n"),
-      "Only in Remote"
-    );
+  if (creditSystems.length > 0) {
+    lines.push("");
+    for (const cs of creditSystems) {
+      const childCount = (cs.features || []).length;
+      lines.push(
+        `${pc4.green("\u2193")} ${pc4.bold(cs.slug)} ${pc4.dim(`credit system (${childCount} features)`)}`
+      );
+    }
   }
-  if (diff.changed.length > 0) {
-    let changedText = "";
-    for (const item of diff.changed) {
-      changedText += `
-${pc4.bold(item.slug)}
-`;
-      for (const line of item.details) {
-        changedText += `  ${line}
-`;
-      }
+  if (creditPacks.length > 0) {
+    lines.push("");
+    for (const pack of creditPacks) {
+      lines.push(
+        `${pc4.green("\u2193")} ${pc4.bold(pack.slug)} ${pc4.dim(`${pack.currency} ${pack.price} for ${pack.credits} credits`)} ${pc4.cyan("(pack)")}`
+      );
     }
-    p3.note(changedText.trim(), "Changed Plans");
   }
-  const summary = [
-    diff.onlyLocal.length > 0 ? `${pc4.green(diff.onlyLocal.length.toString())} added` : "",
-    diff.onlyRemote.length > 0 ? `${pc4.red(diff.onlyRemote.length.toString())} removed` : "",
-    diff.changed.length > 0 ? `${pc4.yellow(diff.changed.length.toString())} changed` : ""
-  ].filter(Boolean).join("  ");
-  p3.log.info(summary);
+  p3.note(lines.join("\n"), "Pulled");
+  const counts = [
+    `${pc4.bold(plans.length.toString())} plans`,
+    `${pc4.bold(featureSlugs.size.toString())} features`,
+    creditSystems.length > 0 ? `${pc4.bold(creditSystems.length.toString())} credit systems` : ""
+  ].filter(Boolean).join(pc4.dim("  \xB7  "));
+  p3.log.info(counts);
 }
 
 // src/commands/diff.ts
+import * as p4 from "@clack/prompts";
+import pc5 from "picocolors";
 async function runDiff(options) {
   p4.intro(pc5.bgYellow(pc5.black(" diff ")));
   const fullPath = resolveConfigPath(options.config);
@@ -861,12 +1233,12 @@ async function runDiff(options) {
   }
   const apiKey = getApiKey(options.key);
   const configSettings = await loadConfigSettings(options.config);
-  const baseUrl = getApiUrl(configSettings.apiUrl);
+  const testUrl = getTestApiUrl(configSettings.environments?.test);
+  const liveUrl = getApiUrl(configSettings.environments?.live);
   const s = p4.spinner();
   if (options.prod) {
-    p4.log.step(pc5.magenta("Production Mode: Comparing both environments"));
-    const testUrl = getTestApiUrl(configSettings.environments?.test);
-    const liveUrl = getApiUrl(configSettings.environments?.live);
+    p4.log.step(pc5.magenta("Production Mode: Comparing with PROD environment"));
+    const apiUrl = `${liveUrl}/api/v1`;
     s.start("Loading local configuration...");
     let owo;
     try {
@@ -881,18 +1253,34 @@ async function runDiff(options) {
       );
       process.exit(1);
     }
+    if (!owo || !owo._config) {
+      s.stop(pc5.red("Invalid configuration"));
+      p4.log.error("Config file must export an Owostack instance.");
+      process.exit(1);
+    }
     s.stop("Configuration loaded");
     const { buildSyncPayload } = await import("owostack").catch(() => ({
       buildSyncPayload: null
     }));
     const localPayload = buildSyncPayload(owo._config.catalog);
-    p4.log.step(pc5.cyan(`Comparing with TEST: ${testUrl}`));
-    const testPlans = await fetchPlans({ apiKey, apiUrl: `${testUrl}/api/v1` });
-    printDiff(diffPlans(localPayload?.plans ?? [], testPlans));
-    p4.log.step(pc5.cyan(`Comparing with LIVE: ${liveUrl}`));
-    const livePlans = await fetchPlans({ apiKey, apiUrl: `${liveUrl}/api/v1` });
-    printDiff(diffPlans(localPayload?.plans ?? [], livePlans));
+    s.start(`Fetching remote catalog from ${pc5.dim("prod")}...`);
+    const livePlans = await fetchPlans({ apiKey, apiUrl });
+    const liveCreditSystems = await fetchCreditSystems(apiKey, apiUrl);
+    const liveCreditPacks = await fetchCreditPacks(apiKey, apiUrl);
+    s.stop("Remote catalog fetched");
+    printDiff(
+      diffPlans(
+        localPayload?.plans ?? [],
+        livePlans,
+        localPayload?.creditSystems ?? [],
+        liveCreditSystems,
+        localPayload?.creditPacks ?? [],
+        liveCreditPacks
+      )
+    );
   } else {
+    p4.log.step(pc5.cyan("Sandbox Mode: Comparing with SANDBOX environment"));
+    const apiUrl = `${testUrl}/api/v1`;
     s.start("Loading local configuration...");
     let owo;
     try {
@@ -907,18 +1295,34 @@ async function runDiff(options) {
       );
       process.exit(1);
     }
+    if (!owo || !owo._config) {
+      s.stop(pc5.red("Invalid configuration"));
+      p4.log.error("Config file must export an Owostack instance.");
+      process.exit(1);
+    }
     s.stop("Configuration loaded");
     const { buildSyncPayload } = await import("owostack").catch(() => ({
       buildSyncPayload: null
     }));
     const localPayload = buildSyncPayload(owo._config.catalog);
-    s.start(`Fetching remote plans from ${pc5.dim(baseUrl)}...`);
+    s.start(`Fetching remote catalog from ${pc5.dim("sandbox")}...`);
     const remotePlans = await fetchPlans({
       apiKey,
-      apiUrl: `${baseUrl}/api/v1`
+      apiUrl
     });
-    s.stop("Remote plans fetched");
-    printDiff(diffPlans(localPayload?.plans ?? [], remotePlans));
+    const remoteCreditSystems = await fetchCreditSystems(apiKey, apiUrl);
+    const remoteCreditPacks = await fetchCreditPacks(apiKey, apiUrl);
+    s.stop("Remote catalog fetched");
+    printDiff(
+      diffPlans(
+        localPayload?.plans ?? [],
+        remotePlans,
+        localPayload?.creditSystems ?? [],
+        remoteCreditSystems,
+        localPayload?.creditPacks ?? [],
+        remoteCreditPacks
+      )
+    );
   }
   p4.outro(pc5.green("Diff complete \u2728"));
 }
@@ -1033,8 +1437,8 @@ function getProjectInfo2() {
   const isTs = existsSync4(join3(cwd, "tsconfig.json"));
   let isEsm = false;
   try {
-    const pkg = JSON.parse(readFileSync3(join3(cwd, "package.json"), "utf8"));
-    isEsm = pkg.type === "module";
+    const pkg2 = JSON.parse(readFileSync3(join3(cwd, "package.json"), "utf8"));
+    isEsm = pkg2.type === "module";
   } catch {
   }
   return { isTs, isEsm };
@@ -1069,11 +1473,11 @@ async function runInit(options) {
     }
   }
   if (existsSync4(fullPath) && !options.force) {
-    const confirm3 = await p6.confirm({
+    const confirm4 = await p6.confirm({
       message: `Config file already exists at ${fullPath}. Overwrite?`,
       initialValue: false
     });
-    if (p6.isCancel(confirm3) || !confirm3) {
+    if (p6.isCancel(confirm4) || !confirm4) {
       p6.outro(pc7.yellow("Initialization cancelled"));
       process.exit(0);
     }
@@ -1081,11 +1485,9 @@ async function runInit(options) {
   const s = p6.spinner();
   s.start("Generating project configuration...");
   try {
-    const plans = await fetchPlans({ apiKey, apiUrl: `${getApiUrl()}/api/v1` });
-    const creditSystems = await fetchCreditSystems(
-      apiKey,
-      `${getApiUrl()}/api/v1`
-    );
+    const apiUrl = `${getApiUrl()}/api/v1`;
+    const plans = await fetchPlans({ apiKey, apiUrl });
+    const creditSystems = await fetchCreditSystems(apiKey, apiUrl);
     const ext = extname3(fullPath);
     const { isEsm } = getProjectInfo2();
     let format = "ts";
@@ -1176,39 +1578,51 @@ async function runValidate(options) {
     for (const f of payload.features) {
       p7.log.message(`${pc8.green("\u2713")} ${f.slug} ${pc8.dim(`(${f.type})`)}`);
     }
+    if (payload.creditSystems && payload.creditSystems.length > 0) {
+      p7.log.step(pc8.bold("Credit Systems"));
+      for (const cs of payload.creditSystems) {
+        p7.log.message(
+          `${pc8.green("\u2713")} ${pc8.bold(cs.slug)} ${pc8.dim(`(${cs.features.length} features)`)}`
+        );
+      }
+    }
     p7.log.step(pc8.bold("Plans"));
     for (const p_obj of payload.plans) {
       p7.log.message(
-        `${pc8.green("\u2713")} ${pc8.bold(p_obj.slug)} ${pc8.dim(`${p_obj.currency} ${p_obj.price} / ${p_obj.interval}`)}`
+        `${pc8.green("\u2713")} ${p_obj.isAddon ? pc8.cyan("(addon)") : ""} ${pc8.bold(p_obj.slug)} ${pc8.dim(`${p_obj.currency} ${p_obj.price} / ${p_obj.interval}`)}`
       );
     }
+    const configSettings = await loadConfigSettings(options.config);
+    const testUrl = getTestApiUrl(configSettings.environments?.test);
+    const liveUrl = getApiUrl(configSettings.environments?.live);
+    const apiKey = getApiKey();
     if (options.prod) {
-      p7.log.step(pc8.magenta("Production Mode Check"));
-      const configSettings = await loadConfigSettings(options.config);
-      const testUrl = getTestApiUrl(configSettings.environments?.test);
-      const liveUrl = getApiUrl(configSettings.environments?.live);
-      const apiKey = getApiKey();
+      p7.log.step(pc8.magenta("Production Mode: Checking PROD environment"));
+      const apiUrl = `${liveUrl}/api/v1`;
       try {
-        const testPlans = await fetchPlans({
+        const livePlans = await fetchPlans({
           apiKey,
-          apiUrl: `${testUrl}/api/v1`
+          apiUrl
         });
         p7.log.success(
-          `TEST environment accessible (${testPlans.length} remote plans)`
+          `PROD environment accessible (${livePlans.length} remote plans)`
         );
       } catch (e) {
-        p7.log.error(`TEST environment check failed: ${e.message}`);
+        p7.log.error(`PROD environment check failed: ${e.message}`);
       }
+    } else {
+      p7.log.step(pc8.cyan("Sandbox Mode: Checking SANDBOX environment"));
+      const apiUrl = `${testUrl}/api/v1`;
       try {
-        const livePlans = await fetchPlans({
+        const testPlans = await fetchPlans({
           apiKey,
-          apiUrl: `${liveUrl}/api/v1`
+          apiUrl
         });
         p7.log.success(
-          `LIVE environment accessible (${livePlans.length} remote plans)`
+          `SANDBOX environment accessible (${testPlans.length} remote plans)`
         );
       } catch (e) {
-        p7.log.error(`LIVE environment check failed: ${e.message}`);
+        p7.log.error(`SANDBOX environment check failed: ${e.message}`);
       }
     }
     p7.outro(pc8.green("Validation passed! \u2728"));
@@ -1259,25 +1673,26 @@ ${pc9.dim("Config:")} ${GLOBAL_CONFIG_PATH}`,
 // src/lib/brand.ts
 import pc10 from "picocolors";
 var OWO_ASCII = `
-   ${pc10.yellow("\u2588\u2588\u2588\u2588\u2588\u2588\u2557")}  ${pc10.white("\u2588\u2588\u2557    \u2588\u2588\u2557")}  ${pc10.yellow("\u2588\u2588\u2588\u2588\u2588\u2588\u2557")}      
-  ${pc10.yellow("\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557")} ${pc10.white("\u2588\u2588\u2551    \u2588\u2588\u2551")} ${pc10.yellow("\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557")}     
-  ${pc10.yellow("\u2588\u2588\u2551   \u2588\u2588\u2551")} ${pc10.white("\u2588\u2588\u2551 \u2588\u2557 \u2588\u2588\u2551")} ${pc10.yellow("\u2588\u2588\u2551   \u2588\u2588\u2551")}     
-  ${pc10.yellow("\u2588\u2588\u2551   \u2588\u2588\u2551")} ${pc10.white("\u2588\u2588\u2551\u2588\u2588\u2588\u2557\u2588\u2588\u2551")} ${pc10.yellow("\u2588\u2588\u2551   \u2588\u2588\u2551")}     
-  ${pc10.yellow("\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D")} ${pc10.white("\u255A\u2588\u2588\u2588\u2554\u2588\u2588\u2588\u2554\u255D")} ${pc10.yellow("\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D")}     
-   ${pc10.yellow("\u255A\u2550\u2550\u2550\u2550\u2550\u255D")}   ${pc10.white("\u255A\u2550\u2550\u255D\u255A\u2550\u2550\u255D")}   ${pc10.yellow("\u255A\u2550\u2550\u2550\u2550\u2550\u255D")}
+  ${pc10.dim("\u2591\u2591\u2588\u2588\u2588\u2591\u2591")} ${pc10.yellow("\u2591\u2591\u2591    \u2591\u2591\u2591")} ${pc10.dim("\u2591\u2591\u2588\u2588\u2588\u2591\u2591")}      
+  ${pc10.dim("\u2591\u2588   \u2588\u2591")} ${pc10.yellow("\u2591\u2588\u2591    \u2591\u2588\u2591")}  ${pc10.dim("\u2591\u2588   \u2588\u2591")}     
+  ${pc10.dim("\u2591\u2588   \u2588\u2591")} ${pc10.yellow("\u2591\u2588\u2591 \u2588\u2591 \u2591\u2588\u2591")}  ${pc10.dim("\u2591\u2588   \u2588\u2591")}     
+  ${pc10.dim("\u2591\u2591\u2588\u2588\u2588\u2591\u2591")}  ${pc10.yellow("\u2591\u2591\u2588\u2591\u2588\u2591\u2588\u2591\u2591")}  ${pc10.dim("\u2591\u2591\u2588\u2588\u2588\u2591\u2591")}     
 `;
 function printBrand() {
   console.log(OWO_ASCII);
 }
 
 // src/index.ts
+import { createRequire } from "module";
+var require2 = createRequire(import.meta.url);
+var pkg = require2("../package.json");
 var program = new Command();
 printBrand();
-program.name("owostack").description("CLI for Owostack billing infrastructure").version("0.1.0");
-program.command("sync").description("Push catalog to the API").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").option("--prod", "Execute in both test and live environments").option("--dry-run", "Show what would change without applying").action(runSync);
-program.command("pull").description("Pull plans from dashboard into owo.config.ts").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").option("--force", "Overwrite existing config file", false).option("--prod", "Execute in both test and live environments").option("--dry-run", "Show what would change without applying").action(runPull);
-program.command("diff").description("Compare local config to dashboard plans").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").option("--prod", "Execute in both test and live environments").action(runDiff);
+program.name("owostack").description("CLI for Owostack billing infrastructure").version(pkg.version).option("--prod", "Execute in production environment (default: sandbox)");
+program.command("sync").description("Push catalog to the API").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").option("--dry-run", "Show what would change without applying").option("--yes", "Auto-approve changes without interactive prompt").action((options) => runSync({ ...options, ...program.opts() }));
+program.command("pull").description("Pull plans from dashboard into owo.config.ts").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").option("--force", "Overwrite existing config file", false).option("--dry-run", "Show what would change without applying").action((options) => runPull({ ...options, ...program.opts() }));
+program.command("diff").description("Compare local config to dashboard plans").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").action((options) => runDiff({ ...options, ...program.opts() }));
 program.command("init").description("Initialize owo.config.ts from dashboard").option("--config <path>", "Path to config file").option("--key <api-key>", "API secret key").option("--force", "Overwrite existing config file", false).action(runInit);
-program.command("validate").description("Validate local config without syncing").option("--config <path>", "Path to config file").option("--prod", "Execute in both test and live environments").action(runValidate);
+program.command("validate").description("Validate local config without syncing").option("--config <path>", "Path to config file").action((options) => runValidate({ ...options, ...program.opts() }));
 program.command("connect").description("Connect CLI to dashboard via browser").option("--no-browser", "Don't open the browser automatically").action(runConnect);
 program.parse();