commet 1.9.1 → 1.11.0

package/dist/index.js

@@ -24,13 +24,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var import_chalk14 = __toESM(require("chalk"));
-var import_commander12 = require("commander");
+var import_chalk15 = __toESM(require("chalk"));
+var import_commander13 = require("commander");
 
 // package.json
 var package_default = {
   name: "commet",
-  version: "1.9.1",
+  version: "1.11.0",
   description: "Commet CLI - Manage your billing platform from the command line",
   bin: {
     commet: "./bin/commet"
@@ -61,6 +61,7 @@ var package_default = {
     ably: "^2.21.0",
     chalk: "5.6.2",
     commander: "14.0.3",
+    jiti: "^2.7.0",
     "jsonc-parser": "3.3.1",
     open: "11.0.0",
     ora: "9.4.0",
@@ -86,16 +87,8 @@ var package_default = {
   }
 };
 
-// src/commands/create.ts
-var import_node_child_process = require("child_process");
-var fs2 = __toESM(require("fs"));
-var os2 = __toESM(require("os"));
-var path2 = __toESM(require("path"));
-var import_prompts = require("@inquirer/prompts");
-var import_chalk3 = __toESM(require("chalk"));
+// src/commands/agent-info.ts
 var import_commander = require("commander");
-var import_ora2 = __toESM(require("ora"));
-var import_tar = require("tar");
 
 // src/utils/config.ts
 var fs = __toESM(require("fs"));
@@ -164,6 +157,211 @@ function clearProjectConfig() {
   }
 }
 
+// src/utils/config-loader.ts
+var fs2 = __toESM(require("fs"));
+var path2 = __toESM(require("path"));
+var import_jiti = require("jiti");
+var CONFIG_NAMES = [
+  "commet.config.ts",
+  "commet.config.js",
+  "commet.config.mjs"
+];
+function findConfigFile(cwd) {
+  for (const name of CONFIG_NAMES) {
+    const fullPath = path2.resolve(cwd, name);
+    if (fs2.existsSync(fullPath)) {
+      return fullPath;
+    }
+  }
+  return null;
+}
+async function loadBillingConfig(cwd) {
+  const configPath = findConfigFile(cwd);
+  if (!configPath) {
+    throw new Error(
+      `No commet.config.ts found in ${cwd}. Create one with defineConfig() or run 'commet pull' to generate it.`
+    );
+  }
+  const jiti = (0, import_jiti.createJiti)(configPath, { interopDefault: true });
+  const mod = await jiti.import(configPath);
+  if (!mod || typeof mod !== "object") {
+    throw new Error(`${configPath}: failed to load config module`);
+  }
+  const moduleRecord = mod;
+  if (!moduleRecord.default) {
+    throw new Error(
+      `${configPath}: must use \`export default defineConfig({...})\``
+    );
+  }
+  const config = moduleRecord.default;
+  validateConfig(config, configPath);
+  return { config, configPath };
+}
+var VALID_FEATURE_TYPES = /* @__PURE__ */ new Set(["boolean", "usage", "seats"]);
+var VALID_INTERVALS = /* @__PURE__ */ new Set([
+  "weekly",
+  "monthly",
+  "quarterly",
+  "yearly",
+  "one_time"
+]);
+function validateConfig(config, configPath) {
+  if (!config || typeof config !== "object") {
+    throw new Error(`${configPath}: config must be an object`);
+  }
+  if (!config.features || typeof config.features !== "object") {
+    throw new Error(`${configPath}: config.features must be an object`);
+  }
+  if (!config.plans || typeof config.plans !== "object") {
+    throw new Error(`${configPath}: config.plans must be an object`);
+  }
+  for (const [code, feature] of Object.entries(config.features)) {
+    if (!feature.name || typeof feature.name !== "string") {
+      throw new Error(`Feature "${code}": name is required`);
+    }
+    if (!VALID_FEATURE_TYPES.has(feature.type)) {
+      throw new Error(
+        `Feature "${code}": type must be one of: boolean, usage, seats`
+      );
+    }
+  }
+  for (const [code, plan] of Object.entries(config.plans)) {
+    if (!plan.name || typeof plan.name !== "string") {
+      throw new Error(`Plan "${code}": name is required`);
+    }
+    if (!Array.isArray(plan.prices)) {
+      throw new Error(`Plan "${code}": prices must be an array`);
+    }
+    for (const price of plan.prices) {
+      if (!VALID_INTERVALS.has(price.interval)) {
+        throw new Error(
+          `Plan "${code}": price interval "${price.interval}" is not valid`
+        );
+      }
+      if (typeof price.amount !== "number") {
+        throw new Error(`Plan "${code}": price amount must be a number`);
+      }
+    }
+    if (plan.prices.length > 0) {
+      if (!plan.defaultInterval) {
+        throw new Error(
+          `Plan "${code}": defaultInterval is required when prices are defined`
+        );
+      }
+      const priceIntervals = new Set(plan.prices.map((p) => p.interval));
+      if (!priceIntervals.has(plan.defaultInterval)) {
+        throw new Error(
+          `Plan "${code}": defaultInterval "${plan.defaultInterval}" does not match any price interval (${[...priceIntervals].join(", ")})`
+        );
+      }
+    }
+    if (plan.features) {
+      for (const featureCode of Object.keys(plan.features)) {
+        if (!config.features[featureCode]) {
+          throw new Error(
+            `Plan "${code}": references feature "${featureCode}" which is not defined in config.features`
+          );
+        }
+      }
+    }
+  }
+}
+
+// src/commands/agent-info.ts
+var agentInfoCommand = new import_commander.Command("agent-info").description(
+  "Print project status and CLI capabilities as JSON. Designed for AI agents and CI pipelines \u2014 run this first to discover what commands are available and how to call them non-interactively."
+).action(() => {
+  const authenticated = authExists();
+  const projectConfig = projectConfigExists() ? loadProjectConfig() : null;
+  const configPath = findConfigFile(process.cwd());
+  const setup = [];
+  if (!authenticated) {
+    setup.push(
+      "Not authenticated. A human must run 'commet login' in a terminal with browser access \u2014 this is the only interactive step."
+    );
+  }
+  if (authenticated && !projectConfig) {
+    setup.push(
+      "No project linked. Run 'commet link --org <slug>' or 'commet orgs --json' to find available organizations."
+    );
+  }
+  const output = {
+    version: package_default.version,
+    authenticated,
+    ...setup.length > 0 ? { setup } : {},
+    project: projectConfig ? {
+      linked: true,
+      orgId: projectConfig.orgId,
+      orgName: projectConfig.orgName,
+      mode: projectConfig.mode
+    } : { linked: false },
+    config: {
+      exists: configPath !== null,
+      path: configPath?.split("/").pop() ?? null
+    },
+    commands: {
+      pull: {
+        description: "Pull remote config and generate commet.config.ts",
+        usage: "commet pull --json --yes",
+        preview: "commet pull --json --dry-run"
+      },
+      push: {
+        description: "Push commet.config.ts to remote",
+        usage: "commet push --json --yes",
+        preview: "commet push --json --dry-run"
+      },
+      list: {
+        description: "List resources from remote",
+        usage: "commet list <features|plans|seats> --json"
+      },
+      orgs: {
+        description: "List available organizations",
+        usage: "commet orgs --json"
+      },
+      link: {
+        description: "Link project to an organization",
+        usage: "commet link --org <slug-or-id>"
+      },
+      switch: {
+        description: "Switch to a different organization",
+        usage: "commet switch --org <slug-or-id>"
+      },
+      listen: {
+        description: "Forward webhook events to local server. Long-running streaming process \u2014 run in background.",
+        usage: "commet listen <url> [--events <types>]"
+      },
+      create: {
+        description: "Scaffold a new Commet app from template",
+        usage: "commet create [name] -t <template> --org <slug> -y"
+      },
+      unlink: {
+        description: "Unlink project from organization",
+        usage: "commet unlink"
+      },
+      login: {
+        description: "Authenticate via browser. Requires a human \u2014 opens a device-code flow that must be confirmed in a browser.",
+        usage: "commet login"
+      },
+      logout: {
+        description: "Log out of Commet",
+        usage: "commet logout"
+      }
+    }
+  };
+  console.log(JSON.stringify(output, null, 2));
+});
+
+// src/commands/create.ts
+var import_node_child_process = require("child_process");
+var fs3 = __toESM(require("fs"));
+var os2 = __toESM(require("os"));
+var path3 = __toESM(require("path"));
+var import_prompts = require("@inquirer/prompts");
+var import_chalk3 = __toESM(require("chalk"));
+var import_commander2 = require("commander");
+var import_ora2 = __toESM(require("ora"));
+var import_tar = require("tar");
+
 // src/utils/api.ts
 var BASE_URL = "https://commet.co";
 async function apiRequest(endpoint, options = {}) {
@@ -218,7 +416,7 @@ var promptTheme = {
 
 // src/utils/login-flow.ts
 function sleep(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function performLogin() {
   const spinner = (0, import_ora.default)("Initiating login flow...").start();
@@ -362,11 +560,11 @@ async function downloadTemplate(templateDir, dest, ref) {
   if (!response.ok) {
     throw new Error(`Failed to download (HTTP ${response.status})`);
   }
-  const tempFile = path2.join(os2.tmpdir(), `commet-${Date.now()}.tar.gz`);
+  const tempFile = path3.join(os2.tmpdir(), `commet-${Date.now()}.tar.gz`);
   try {
     const buffer = Buffer.from(await response.arrayBuffer());
-    fs2.writeFileSync(tempFile, buffer);
-    fs2.mkdirSync(dest, { recursive: true });
+    fs3.writeFileSync(tempFile, buffer);
+    fs3.mkdirSync(dest, { recursive: true });
     await (0, import_tar.extract)({
       file: tempFile,
       cwd: dest,
@@ -377,22 +575,22 @@ async function downloadTemplate(templateDir, dest, ref) {
       }
     });
   } finally {
-    if (fs2.existsSync(tempFile)) {
-      fs2.unlinkSync(tempFile);
+    if (fs3.existsSync(tempFile)) {
+      fs3.unlinkSync(tempFile);
     }
   }
-  const files = fs2.readdirSync(dest);
+  const files = fs3.readdirSync(dest);
   if (files.length === 0) {
     throw new Error(`Template "${templateDir}" not found in repository`);
   }
 }
 function updatePackageJson(dest, projectName) {
-  const pkgPath = path2.join(dest, "package.json");
-  const pkg = JSON.parse(fs2.readFileSync(pkgPath, "utf-8"));
+  const pkgPath = path3.join(dest, "package.json");
+  const pkg = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"));
   pkg.name = projectName;
   pkg.version = "0.0.1";
   pkg.private = true;
-  fs2.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
+  fs3.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
 `);
 }
 async function fetchLatestVersion(packageName) {
@@ -408,8 +606,8 @@ async function fetchLatestVersion(packageName) {
   return data.version;
 }
 async function resolveWorkspaceDeps(dest) {
-  const pkgPath = path2.join(dest, "package.json");
-  const pkg = JSON.parse(fs2.readFileSync(pkgPath, "utf-8"));
+  const pkgPath = path3.join(dest, "package.json");
+  const pkg = JSON.parse(fs3.readFileSync(pkgPath, "utf-8"));
   const depSections = [
     "dependencies",
     "devDependencies",
@@ -446,29 +644,29 @@ async function resolveWorkspaceDeps(dest) {
       pkg[section][name] = version;
     }
   }
-  fs2.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
+  fs3.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
 `);
   return workspaceDeps.size;
 }
 function copyEnvExample(dest) {
-  const examplePath = path2.join(dest, ".env.example");
-  const envPath = path2.join(dest, ".env");
-  if (fs2.existsSync(examplePath)) {
-    fs2.copyFileSync(examplePath, envPath);
+  const examplePath = path3.join(dest, ".env.example");
+  const envPath = path3.join(dest, ".env");
+  if (fs3.existsSync(examplePath)) {
+    fs3.copyFileSync(examplePath, envPath);
   }
 }
 function writeApiKeyToEnv(dest, apiKey) {
-  const envPath = path2.join(dest, ".env");
-  if (!fs2.existsSync(envPath)) return;
-  let content = fs2.readFileSync(envPath, "utf-8");
+  const envPath = path3.join(dest, ".env");
+  if (!fs3.existsSync(envPath)) return;
+  let content = fs3.readFileSync(envPath, "utf-8");
   content = content.replace(/COMMET_API_KEY=.*/, `COMMET_API_KEY=${apiKey}`);
-  fs2.writeFileSync(envPath, content);
+  fs3.writeFileSync(envPath, content);
 }
 function linkProject(dest, orgId, orgName) {
-  const commetDir = path2.join(dest, ".commet");
-  fs2.mkdirSync(commetDir, { recursive: true });
-  fs2.writeFileSync(
-    path2.join(commetDir, "config.json"),
+  const commetDir = path3.join(dest, ".commet");
+  fs3.mkdirSync(commetDir, { recursive: true });
+  fs3.writeFileSync(
+    path3.join(commetDir, "config.json"),
     JSON.stringify({ orgId, orgName, mode: "sandbox" }, null, 2),
     "utf8"
   );
@@ -492,7 +690,7 @@ async function resolveSkills(opts) {
 }
 async function installSkills(projectRoot) {
   const npx = process.platform === "win32" ? "npx.cmd" : "npx";
-  return new Promise((resolve3) => {
+  return new Promise((resolve4) => {
     const child = (0, import_node_child_process.spawn)(
       npx,
       ["-y", "--loglevel=error", "skills", "add", "commet-labs/commet-skills"],
@@ -503,11 +701,11 @@ async function installSkills(projectRoot) {
         console.log(import_chalk3.default.dim("  You can install them manually by running:"));
         console.log(import_chalk3.default.dim("  npx skills add commet-labs/commet-skills"));
       }
-      resolve3();
+      resolve4();
     });
   });
 }
-var createCommand = new import_commander.Command("create").description("Create a new Commet app from a template").argument("[name]", "Project name").option(
+var createCommand = new import_commander2.Command("create").description("Create a new Commet app from a template").argument("[name]", "Project name").option(
   "-t, --template <template>",
   "Template to use (fixed, seats, metered, credits, balance-ai, balance-fixed)"
 ).option("--org <slug>", "Organization slug or ID (skips selection)").option("--skills", "Install agent skills").option("--no-skills", "Skip agent skills installation").option("-y, --yes", "Accept defaults for optional prompts").option("--ref <ref>", "Git ref to fetch templates from", "main").option("--list", "List available templates").action(async (argName, opts) => {
@@ -540,8 +738,8 @@ var createCommand = new import_commander.Command("create").description("Create a
       return;
     }
   }
-  const dest = path2.resolve(projectName);
-  if (fs2.existsSync(dest)) {
+  const dest = path3.resolve(projectName);
+  if (fs3.existsSync(dest)) {
     console.log(
       import_chalk3.default.red(`\u2717 Directory "${projectName}" already exists`)
     );
@@ -661,8 +859,8 @@ var createCommand = new import_commander.Command("create").description("Create a
     if (error instanceof Error) {
       console.error(import_chalk3.default.red(error.message));
     }
-    if (fs2.existsSync(dest)) {
-      fs2.rmSync(dest, { recursive: true, force: true });
+    if (fs3.existsSync(dest)) {
+      fs3.rmSync(dest, { recursive: true, force: true });
     }
     return;
   }
@@ -681,8 +879,8 @@ var createCommand = new import_commander.Command("create").description("Create a
     if (error instanceof Error) {
       console.error(import_chalk3.default.red(error.message));
     }
-    if (fs2.existsSync(dest)) {
-      fs2.rmSync(dest, { recursive: true, force: true });
+    if (fs3.existsSync(dest)) {
+      fs3.rmSync(dest, { recursive: true, force: true });
     }
     return;
   }
@@ -733,54 +931,22 @@ var createCommand = new import_commander.Command("create").description("Create a
   console.log();
 });
 
-// src/commands/info.ts
-var import_chalk4 = __toESM(require("chalk"));
-var import_commander2 = require("commander");
-var infoCommand = new import_commander2.Command("info").description("Display information about the current project").action(async () => {
-  console.log(import_chalk4.default.bold("\n\u{1F4E6} Project Information\n"));
-  if (!authExists()) {
-    console.log(import_chalk4.default.yellow("Authentication: Not logged in"));
-    console.log(import_chalk4.default.dim("Run `commet login` to authenticate\n"));
-    return;
-  }
-  console.log(import_chalk4.default.green("Authentication: Logged in \u2713"));
-  if (!projectConfigExists()) {
-    console.log(import_chalk4.default.yellow("\nProject: Not linked"));
-    console.log(
-      import_chalk4.default.dim("Run `commet link` to connect to an organization\n")
-    );
-    return;
-  }
-  const projectConfig = loadProjectConfig();
-  if (!projectConfig) {
-    console.log(import_chalk4.default.red("\nProject: Invalid configuration"));
-    return;
-  }
-  console.log(import_chalk4.default.green("\nProject: Linked \u2713"));
-  console.log(import_chalk4.default.dim("  Organization:"), projectConfig.orgName);
-  console.log(import_chalk4.default.dim("  Organization ID:"), projectConfig.orgId);
-  console.log(import_chalk4.default.dim("  Mode:"), projectConfig.mode);
-  console.log(
-    import_chalk4.default.dim("\nRun `commet pull` to generate type definitions\n")
-  );
-});
-
 // src/commands/link.ts
 var import_prompts2 = require("@inquirer/prompts");
-var import_chalk5 = __toESM(require("chalk"));
+var import_chalk4 = __toESM(require("chalk"));
 var import_commander3 = require("commander");
 var import_ora3 = __toESM(require("ora"));
 
 // src/utils/gitignore-updater.ts
-var fs3 = __toESM(require("fs"));
-var path3 = __toESM(require("path"));
+var fs4 = __toESM(require("fs"));
+var path4 = __toESM(require("path"));
 function updateGitignore(entry) {
   const cwd = process.cwd();
-  const gitignorePath = path3.join(cwd, ".gitignore");
+  const gitignorePath = path4.join(cwd, ".gitignore");
   try {
     let content = "";
-    if (fs3.existsSync(gitignorePath)) {
-      content = fs3.readFileSync(gitignorePath, "utf8");
+    if (fs4.existsSync(gitignorePath)) {
+      content = fs4.readFileSync(gitignorePath, "utf8");
       const lines = content.split("\n");
       for (const line of lines) {
         const trimmed = line.trim();
@@ -794,7 +960,7 @@ function updateGitignore(entry) {
     }
     content += `${entry}
 `;
-    fs3.writeFileSync(gitignorePath, content, "utf8");
+    fs4.writeFileSync(gitignorePath, content, "utf8");
     return { success: true };
   } catch (error) {
     return {
@@ -805,20 +971,34 @@ function updateGitignore(entry) {
 }
 
 // src/commands/link.ts
-var linkCommand = new import_commander3.Command("link").description("Link this project to a Commet organization").action(async () => {
+var linkCommand = new import_commander3.Command("link").description(
+  "Link this project directory to a Commet organization. Creates .commet/config.json with the selected org."
+).option(
+  "--org <slug-or-id>",
+  "Organization slug or ID \u2014 skips interactive selection"
+).addHelpText(
+  "after",
+  `
+Examples:
+  $ commet link                  Interactive \u2014 choose from a list
+  $ commet link --org acme       Non-interactive \u2014 match by slug or ID
+
+Use 'commet orgs' to see available organizations and their slugs.
+`
+).action(async (options) => {
   if (!authExists()) {
-    console.log(import_chalk5.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk5.default.dim("Run `commet login` first"));
-    return;
+    console.log(import_chalk4.default.red("\u2717 Not authenticated"));
+    console.log(import_chalk4.default.dim("Run `commet login` first"));
+    process.exit(1);
   }
   if (projectConfigExists()) {
     const config = loadProjectConfig();
-    console.log(import_chalk5.default.yellow("\u26A0 This project is already linked"));
+    console.log(import_chalk4.default.yellow("\u26A0 This project is already linked"));
     console.log(
-      import_chalk5.default.dim(`Organization: ${config?.orgName} \xB7 ${config?.mode}`)
+      import_chalk4.default.dim(`Organization: ${config?.orgName} \xB7 ${config?.mode}`)
     );
     console.log(
-      import_chalk5.default.dim(
+      import_chalk4.default.dim(
         "\nRun `commet unlink` first if you want to change the organization"
       )
     );
@@ -830,37 +1010,52 @@ var linkCommand = new import_commander3.Command("link").description("Link this p
   );
   if (result.error || !result.data) {
     spinner.fail("Failed to fetch organizations");
-    console.error(import_chalk5.default.red("Error:"), result.error);
-    return;
+    console.error(import_chalk4.default.red("Error:"), result.error);
+    process.exit(1);
   }
   const { organizations } = result.data;
   if (organizations.length === 0) {
     spinner.stop();
-    console.log(import_chalk5.default.yellow("\u26A0 No organizations found"));
+    console.log(import_chalk4.default.yellow("\u26A0 No organizations found"));
     console.log(
-      import_chalk5.default.dim("Create an organization at https://commet.co first")
+      import_chalk4.default.dim("Create an organization at https://commet.co first")
     );
     return;
   }
   spinner.stop();
-  let orgId;
-  try {
-    orgId = await (0, import_prompts2.select)({
-      message: "Select organization:",
-      choices: organizations.map((org) => ({
-        name: `${org.name} ${import_chalk5.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
-        value: org.id
-      })),
-      theme: promptTheme
-    });
-  } catch (_error) {
-    console.log(import_chalk5.default.yellow("\n\u26A0 Link cancelled"));
-    return;
-  }
-  const selectedOrg = organizations.find((org) => org.id === orgId);
-  if (!selectedOrg) {
-    console.log(import_chalk5.default.red("\u2717 Organization not found"));
-    return;
+  let selectedOrg;
+  if (options.org) {
+    selectedOrg = organizations.find(
+      (org) => org.slug === options.org || org.id === options.org
+    );
+    if (!selectedOrg) {
+      console.log(import_chalk4.default.red(`\u2717 Organization "${options.org}" not found`));
+      console.log(import_chalk4.default.dim("\nAvailable organizations:"));
+      for (const org of organizations) {
+        console.log(import_chalk4.default.dim(`  ${org.slug} (${org.mode})`));
+      }
+      process.exit(1);
+    }
+  } else {
+    let orgId;
+    try {
+      orgId = await (0, import_prompts2.select)({
+        message: "Select organization:",
+        choices: organizations.map((org) => ({
+          name: `${org.name} ${import_chalk4.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
+          value: org.id
+        })),
+        theme: promptTheme
+      });
+    } catch (_error) {
+      console.log(import_chalk4.default.yellow("\n\u26A0 Link cancelled"));
+      return;
+    }
+    selectedOrg = organizations.find((org) => org.id === orgId);
+    if (!selectedOrg) {
+      console.log(import_chalk4.default.red("\u2717 Organization not found"));
+      process.exit(1);
+    }
   }
   saveProjectConfig({
     orgId: selectedOrg.id,
@@ -868,119 +1063,171 @@ var linkCommand = new import_commander3.Command("link").description("Link this p
     mode: selectedOrg.mode
   });
   const gitignoreResult = updateGitignore(".commet/");
-  console.log(import_chalk5.default.green("\n\u2713 Project linked successfully"));
+  console.log(import_chalk4.default.green("\n\u2713 Project linked successfully"));
   console.log(
-    import_chalk5.default.dim(`Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
+    import_chalk4.default.dim(`Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
   );
   if (gitignoreResult.success) {
-    console.log(import_chalk5.default.green("\u2713 Updated .gitignore"));
+    console.log(import_chalk4.default.green("\u2713 Updated .gitignore"));
   } else {
-    console.log(import_chalk5.default.yellow("\u26A0 No .gitignore found"));
-    console.log(import_chalk5.default.dim("Add .commet/ to your .gitignore file"));
+    console.log(import_chalk4.default.yellow("\u26A0 No .gitignore found"));
+    console.log(import_chalk4.default.dim("Add .commet/ to your .gitignore file"));
   }
-  console.log(import_chalk5.default.dim("\nRun 'commet pull' to generate TypeScript types"));
+  console.log(import_chalk4.default.dim("\nRun 'commet pull' to generate TypeScript types"));
 });
 
 // src/commands/list.ts
-var import_chalk6 = __toESM(require("chalk"));
+var import_chalk5 = __toESM(require("chalk"));
 var import_commander4 = require("commander");
 var import_ora4 = __toESM(require("ora"));
 var validTypes = ["features", "seats", "plans"];
-var listCommand = new import_commander4.Command("list").description("List features, seat types, or plans").argument("<type>", "Type to list (features, seats, or plans)").action(async (type) => {
+var listCommand = new import_commander4.Command("list").description(
+  "List resources from your linked organization. Shows features, seat types, or plans currently configured on remote."
+).argument("<type>", "What to list: features, seats, or plans").option("--json", "Output as JSON array").addHelpText(
+  "after",
+  `
+Examples:
+  $ commet list features         Show all features with type and description
+  $ commet list plans            Show all plans
+  $ commet list seats            Show all seat types
+  $ commet list features --json  JSON array for agent/CI use
+`
+).action(async (type, options) => {
+  const jsonMode = options.json;
   if (!validTypes.includes(type)) {
-    console.log(
-      import_chalk6.default.red('\u2717 Invalid type. Use "features", "seats", or "plans"')
-    );
-    console.log(import_chalk6.default.dim("\nExamples:"));
-    console.log(import_chalk6.default.dim("  commet list features"));
-    console.log(import_chalk6.default.dim("  commet list seats"));
-    console.log(import_chalk6.default.dim("  commet list plans"));
-    return;
+    if (jsonMode) {
+      console.log(
+        JSON.stringify({
+          error: `Invalid type "${type}". Use: features, seats, or plans`
+        })
+      );
+    } else {
+      console.log(
+        import_chalk5.default.red('\u2717 Invalid type. Use "features", "seats", or "plans"')
+      );
+      console.log(import_chalk5.default.dim("\nExamples:"));
+      console.log(import_chalk5.default.dim("  commet list features"));
+      console.log(import_chalk5.default.dim("  commet list seats"));
+      console.log(import_chalk5.default.dim("  commet list plans"));
+    }
+    process.exit(1);
   }
   if (!authExists()) {
-    console.log(import_chalk6.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk6.default.dim("Run `commet login` first"));
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Not authenticated" }));
+    } else {
+      console.log(import_chalk5.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk5.default.dim("Run `commet login` first"));
+    }
+    process.exit(1);
   }
   if (!projectConfigExists()) {
-    console.log(import_chalk6.default.red("\u2717 Project not linked"));
-    console.log(
-      import_chalk6.default.dim("Run `commet link` first to connect to an organization")
-    );
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Project not linked" }));
+    } else {
+      console.log(import_chalk5.default.red("\u2717 Project not linked"));
+      console.log(
+        import_chalk5.default.dim("Run `commet link` first to connect to an organization")
+      );
+    }
+    process.exit(1);
   }
   const projectConfig = loadProjectConfig();
   if (!projectConfig) {
-    console.log(import_chalk6.default.red("\u2717 Invalid project configuration"));
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Invalid project configuration" }));
+    } else {
+      console.log(import_chalk5.default.red("\u2717 Invalid project configuration"));
+    }
+    process.exit(1);
   }
-  const spinner = (0, import_ora4.default)(`Fetching ${type}...`).start();
+  const spinner = jsonMode ? null : (0, import_ora4.default)(`Fetching ${type}...`).start();
   const result = await apiRequest(
-    `${BASE_URL}/api/cli/types?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
   );
   if (result.error || !result.data) {
-    spinner.fail(`Failed to fetch ${type}`);
-    console.error(import_chalk6.default.red("Error:"), result.error);
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail(`Failed to fetch ${type}`);
+      console.error(import_chalk5.default.red("Error:"), result.error);
+    }
+    process.exit(1);
   }
-  spinner.stop();
+  spinner?.stop();
   if (type === "features") {
     const { features } = result.data;
+    if (jsonMode) {
+      console.log(JSON.stringify(features));
+      return;
+    }
     if (features.length === 0) {
-      console.log(import_chalk6.default.yellow("\u26A0 No features found"));
+      console.log(import_chalk5.default.yellow("\u26A0 No features found"));
       console.log(
-        import_chalk6.default.dim("Create features in your Commet dashboard first")
+        import_chalk5.default.dim("Create features in your Commet dashboard first")
       );
       return;
     }
-    console.log(import_chalk6.default.bold(`
-\u{1F4CA} Features (${features.length})
+    console.log(import_chalk5.default.bold(`
+  Features (${features.length})
 `));
     for (const feature of features) {
-      console.log(import_chalk6.default.green(`\u2022 ${feature.code} (${feature.type})`));
-      console.log(import_chalk6.default.dim(`  ${feature.name}`));
+      console.log(
+        import_chalk5.default.green(`  ${feature.code} ${import_chalk5.default.dim(`(${feature.type})`)}`)
+      );
+      console.log(import_chalk5.default.dim(`    ${feature.name}`));
       if (feature.description) {
-        console.log(import_chalk6.default.dim(`  ${feature.description}`));
+        console.log(import_chalk5.default.dim(`    ${feature.description}`));
       }
       console.log("");
     }
   } else if (type === "seats") {
     const { seatTypes } = result.data;
+    if (jsonMode) {
+      console.log(JSON.stringify(seatTypes));
+      return;
+    }
     if (seatTypes.length === 0) {
-      console.log(import_chalk6.default.yellow("\u26A0 No seat types found"));
+      console.log(import_chalk5.default.yellow("\u26A0 No seat types found"));
       console.log(
-        import_chalk6.default.dim("Create seat types in your Commet dashboard first")
+        import_chalk5.default.dim("Create seat types in your Commet dashboard first")
       );
       return;
     }
-    console.log(import_chalk6.default.bold(`
-\u{1F4BA} Seat Types (${seatTypes.length})
+    console.log(import_chalk5.default.bold(`
+  Seat Types (${seatTypes.length})
 `));
     for (const seatType of seatTypes) {
       console.log(
-        import_chalk6.default.green(`\u2022 ${seatType.code}${seatType.isFree ? " (Free)" : ""}`)
+        import_chalk5.default.green(
+          `  ${seatType.code}${seatType.isFree ? import_chalk5.default.dim(" (free)") : ""}`
+        )
       );
-      console.log(import_chalk6.default.dim(`  ${seatType.name}`));
+      console.log(import_chalk5.default.dim(`    ${seatType.name}`));
       if (seatType.description) {
-        console.log(import_chalk6.default.dim(`  ${seatType.description}`));
+        console.log(import_chalk5.default.dim(`    ${seatType.description}`));
       }
       console.log("");
     }
   } else {
     const { plans } = result.data;
+    if (jsonMode) {
+      console.log(JSON.stringify(plans));
+      return;
+    }
     if (plans.length === 0) {
-      console.log(import_chalk6.default.yellow("\u26A0 No plans found"));
-      console.log(import_chalk6.default.dim("Create plans in your Commet dashboard first"));
+      console.log(import_chalk5.default.yellow("\u26A0 No plans found"));
+      console.log(import_chalk5.default.dim("Create plans in your Commet dashboard first"));
       return;
     }
-    console.log(import_chalk6.default.bold(`
-\u{1F4CB} Plans (${plans.length})
+    console.log(import_chalk5.default.bold(`
+  Plans (${plans.length})
 `));
     for (const plan of plans) {
-      console.log(import_chalk6.default.green(`\u2022 ${plan.code}`));
-      console.log(import_chalk6.default.dim(`  ${plan.name}`));
+      console.log(import_chalk5.default.green(`  ${plan.code}`));
+      console.log(import_chalk5.default.dim(`    ${plan.name}`));
       if (plan.description) {
-        console.log(import_chalk6.default.dim(`  ${plan.description}`));
+        console.log(import_chalk5.default.dim(`    ${plan.description}`));
       }
       console.log("");
     }
@@ -989,21 +1236,21 @@ var listCommand = new import_commander4.Command("list").description("List featur
 
 // src/commands/listen.ts
 var import_ably = __toESM(require("ably"));
-var import_chalk7 = __toESM(require("chalk"));
+var import_chalk6 = __toESM(require("chalk"));
 var import_commander5 = require("commander");
 function printEventLine(line) {
   const time = (/* @__PURE__ */ new Date()).toLocaleTimeString("en-US", { hour12: false });
-  const eventName = import_chalk7.default.yellow(line.event.padEnd(28));
-  const timing = import_chalk7.default.dim(`(${line.ms}ms)`);
+  const eventName = import_chalk6.default.yellow(line.event.padEnd(28));
+  const timing = import_chalk6.default.dim(`(${line.ms}ms)`);
   if ("error" in line) {
     console.log(
-      `  ${import_chalk7.default.dim(time)}  ${eventName} \u2192  ${import_chalk7.default.red("Error")}    ${timing}`
+      `  ${import_chalk6.default.dim(time)}  ${eventName} \u2192  ${import_chalk6.default.red("Error")}    ${timing}`
     );
-    console.log(`  ${" ".repeat(12)}${import_chalk7.default.red(line.error)}`);
+    console.log(`  ${" ".repeat(12)}${import_chalk6.default.red(line.error)}`);
     return;
   }
-  const status = line.statusCode < 400 ? import_chalk7.default.green(`${line.statusCode} OK`) : import_chalk7.default.red(`${line.statusCode} Error`);
-  console.log(`  ${import_chalk7.default.dim(time)}  ${eventName} \u2192  ${status}  ${timing}`);
+  const status = line.statusCode < 400 ? import_chalk6.default.green(`${line.statusCode} OK`) : import_chalk6.default.red(`${line.statusCode} Error`);
+  console.log(`  ${import_chalk6.default.dim(time)}  ${eventName} \u2192  ${status}  ${timing}`);
 }
 function isListenMessage(data) {
   if (typeof data !== "object" || data === null) return false;
@@ -1026,18 +1273,31 @@ function resolveTargetUrl(input2) {
   }
   return parsed.toString();
 }
-var listenCommand = new import_commander5.Command("listen").description("Forward webhook events to your local server").argument(
+var listenCommand = new import_commander5.Command("listen").description(
+  "Forward webhook events from Commet to your local server in real time. Opens a persistent connection and replays every event as an HTTP POST to your URL."
+).argument(
   "<url>",
-  "URL to forward to (e.g. localhost:3000, local.commet.co:3010/webhooks, or just a port)"
-).option("--events <types>", "Comma-separated event types to filter").action(async (url, options) => {
+  "Target URL \u2014 a port (3000), host:port (localhost:3000), or full URL"
+).option(
+  "--events <types>",
+  "Only forward these event types (comma-separated)"
+).addHelpText(
+  "after",
+  `
+Examples:
+  $ commet listen 3000                          Forward to http://localhost:3000/
+  $ commet listen localhost:3000/webhooks        Forward to a specific path
+  $ commet listen 3000 --events invoice.paid     Only forward invoice.paid events
+`
+).action(async (url, options) => {
   const auth = loadAuth();
   if (!auth) {
-    console.log(import_chalk7.default.red("Not authenticated. Run: commet login"));
+    console.log(import_chalk6.default.red("Not authenticated. Run: commet login"));
     process.exit(1);
   }
   const projectConfig = loadProjectConfig();
   if (!projectConfig) {
-    console.log(import_chalk7.default.red("No project linked. Run: commet link"));
+    console.log(import_chalk6.default.red("No project linked. Run: commet link"));
     process.exit(1);
   }
   let targetUrl;
@@ -1045,7 +1305,7 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
     targetUrl = resolveTargetUrl(url);
   } catch (error) {
     console.log(
-      import_chalk7.default.red(error instanceof Error ? error.message : "Invalid URL")
+      import_chalk6.default.red(error instanceof Error ? error.message : "Invalid URL")
     );
     process.exit(1);
   }
@@ -1058,9 +1318,9 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
       }
     );
     if (result.error || !result.data) {
-      console.log(import_chalk7.default.red("Failed to start listen session"));
+      console.log(import_chalk6.default.red("Failed to start listen session"));
       if (result.error) {
-        console.log(import_chalk7.default.dim(result.error));
+        console.log(import_chalk6.default.dim(result.error));
       }
       process.exit(1);
     }
@@ -1106,27 +1366,27 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
   let wasConnected = false;
   ably.connection.on("connected", () => {
     if (wasConnected) {
-      console.log(import_chalk7.default.green("  \u2713 Reconnected"));
+      console.log(import_chalk6.default.green("  \u2713 Reconnected"));
     }
     wasConnected = true;
   });
   ably.connection.on("disconnected", () => {
-    console.log(import_chalk7.default.yellow("\n  \u26A0 Disconnected. Reconnecting..."));
+    console.log(import_chalk6.default.yellow("\n  \u26A0 Disconnected. Reconnecting..."));
   });
   ably.connection.on("failed", () => {
     console.log(
-      import_chalk7.default.red("\n  \u2717 Connection failed. Check your authentication.")
+      import_chalk6.default.red("\n  \u2717 Connection failed. Check your authentication.")
     );
     process.exit(1);
   });
   const channel = ably.channels.get(channelName);
   console.log("");
   console.log(
-    import_chalk7.default.green(`  \u2713 Authenticated (org: ${projectConfig.orgName})`)
+    import_chalk6.default.green(`  \u2713 Authenticated (org: ${projectConfig.orgName})`)
   );
-  console.log(import_chalk7.default.green("  \u2713 Connected to Commet webhook stream"));
-  console.log(import_chalk7.default.cyan(`  \u27F6 Forwarding to ${targetUrl}`));
-  console.log(import_chalk7.default.dim(`  \u27F6 Signing secret: ${signingSecret}`));
+  console.log(import_chalk6.default.green("  \u2713 Connected to Commet webhook stream"));
+  console.log(import_chalk6.default.cyan(`  \u27F6 Forwarding to ${targetUrl}`));
+  console.log(import_chalk6.default.dim(`  \u27F6 Signing secret: ${signingSecret}`));
   console.log("");
   console.log("  Ready! Listening for webhook events...");
   console.log("");
@@ -1157,7 +1417,7 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
   process.on("SIGINT", async () => {
     if (isShuttingDown) return;
     isShuttingDown = true;
-    console.log(import_chalk7.default.dim("\n  Disconnecting..."));
+    console.log(import_chalk6.default.dim("\n  Disconnecting..."));
     ably.close();
     await apiRequest(`${BASE_URL}/api/cli/listen/stop`, {
       method: "POST",
@@ -1171,13 +1431,15 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
 });
 
 // src/commands/login.ts
-var import_chalk8 = __toESM(require("chalk"));
+var import_chalk7 = __toESM(require("chalk"));
 var import_commander6 = require("commander");
-var loginCommand = new import_commander6.Command("login").description("Authenticate with Commet").action(async () => {
+var loginCommand = new import_commander6.Command("login").description(
+  "Authenticate with Commet via browser. Opens a device-code flow \u2014 you confirm in the browser and the CLI stores your token locally at ~/.commet/auth.json."
+).action(async () => {
   if (authExists()) {
-    console.log(import_chalk8.default.yellow("\u26A0 You are already logged in."));
+    console.log(import_chalk7.default.yellow("\u26A0 You are already logged in."));
     console.log(
-      import_chalk8.default.dim(
+      import_chalk7.default.dim(
         "Run `commet logout` first if you want to login with a different account."
       )
     );
@@ -1185,9 +1447,9 @@ var loginCommand = new import_commander6.Command("login").description("Authentic
   }
   const success = await performLogin();
   if (success) {
-    console.log(import_chalk8.default.green("\n\u2713 Authentication complete"));
+    console.log(import_chalk7.default.green("\n\u2713 Authentication complete"));
     console.log(
-      import_chalk8.default.dim(
+      import_chalk7.default.dim(
         "\nNext steps:\n  1. Run `commet link` to connect a project\n  2. Run `commet pull` to generate types\n"
       )
     );
@@ -1195,345 +1457,919 @@ var loginCommand = new import_commander6.Command("login").description("Authentic
 });
 
 // src/commands/logout.ts
-var import_chalk9 = __toESM(require("chalk"));
+var import_chalk8 = __toESM(require("chalk"));
 var import_commander7 = require("commander");
-var logoutCommand = new import_commander7.Command("logout").description("Log out of Commet").action(async () => {
+var logoutCommand = new import_commander7.Command("logout").description(
+  "Log out and remove stored credentials from ~/.commet/auth.json."
+).action(async () => {
   if (!authExists()) {
-    console.log(import_chalk9.default.yellow("\u26A0 You are not logged in."));
+    console.log(import_chalk8.default.yellow("\u26A0 You are not logged in."));
     return;
   }
   clearAuth();
-  console.log(import_chalk9.default.green("\u2713 Successfully logged out"));
+  console.log(import_chalk8.default.green("\u2713 Successfully logged out"));
 });
 
-// src/commands/pull.ts
-var fs6 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
-var import_chalk10 = __toESM(require("chalk"));
+// src/commands/orgs.ts
+var import_chalk9 = __toESM(require("chalk"));
 var import_commander8 = require("commander");
 var import_ora5 = __toESM(require("ora"));
+var orgsCommand = new import_commander8.Command("orgs").description(
+  "List all organizations you have access to. Shows name, slug, mode (live/sandbox), and which one is currently linked."
+).option("--json", "Output as JSON array").addHelpText(
+  "after",
+  `
+Examples:
+  $ commet orgs                  Show orgs with current selection marked
+  $ commet orgs --json           JSON array for agent/CI use
 
-// src/utils/environment-validator.ts
-var fs4 = __toESM(require("fs"));
-var path4 = __toESM(require("path"));
-function validateTypeScriptProject() {
-  const cwd = process.cwd();
-  const tsconfigPath = path4.join(cwd, "tsconfig.json");
-  if (!fs4.existsSync(tsconfigPath)) {
-    return false;
+The slug shown here is what you pass to 'commet link --org <slug>'.
+`
+).action(async (options) => {
+  const jsonMode = options.json;
+  if (!authExists()) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Not authenticated" }));
+    } else {
+      console.log(import_chalk9.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk9.default.dim("Run `commet login` first"));
+    }
+    process.exit(1);
   }
-  try {
-    const content = fs4.readFileSync(tsconfigPath, "utf8");
-    JSON.parse(content);
-    return true;
-  } catch (_error) {
-    return false;
+  const spinner = jsonMode ? null : (0, import_ora5.default)("Fetching organizations...").start();
+  const result = await apiRequest(
+    `${BASE_URL}/api/cli/organizations`
+  );
+  if (result.error || !result.data) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail("Failed to fetch organizations");
+      console.error(import_chalk9.default.red("Error:"), result.error);
+    }
+    process.exit(1);
   }
-}
+  spinner?.stop();
+  const { organizations } = result.data;
+  if (jsonMode) {
+    console.log(JSON.stringify(organizations));
+    return;
+  }
+  if (organizations.length === 0) {
+    console.log(import_chalk9.default.yellow("\u26A0 No organizations found"));
+    console.log(
+      import_chalk9.default.dim("Create an organization at https://commet.co first")
+    );
+    return;
+  }
+  const currentProject = loadProjectConfig();
+  console.log(import_chalk9.default.bold(`
+  Organizations (${organizations.length})
+`));
+  for (const org of organizations) {
+    const isCurrent = currentProject?.orgId === org.id;
+    const marker = isCurrent ? import_chalk9.default.green("\u25CF") : import_chalk9.default.dim("\u25CB");
+    const mode = org.mode === "live" ? import_chalk9.default.green(org.mode) : import_chalk9.default.yellow(org.mode);
+    console.log(
+      `  ${marker} ${org.name} ${import_chalk9.default.dim(`(${org.slug})`)} ${mode}`
+    );
+  }
+  console.log("");
+});
 
-// src/utils/generator.ts
-function generateTypes(seatTypes, features, plans) {
-  const seatTypeUnion = seatTypes.length > 0 ? seatTypes.map((s) => `"${s.code}"`).join(" | ") : "string";
-  const planCodeUnion = plans.length > 0 ? plans.map((p) => `"${p.code}"`).join(" | ") : "string";
-  const featureCodeUnion = features.length > 0 ? features.map((f) => `"${f.code}"`).join(" | ") : "string";
-  const seatComments = seatTypes.map(
-    (s) => ` * - "${s.code}": ${s.name}${s.description ? ` - ${s.description}` : ""} ${s.isFree ? "(Free)" : ""}`
-  ).join("\n");
-  const planComments = plans.map(
-    (p) => ` * - "${p.code}": ${p.name}${p.description ? ` - ${p.description}` : ""}`
-  ).join("\n");
-  const featureComments = features.map(
-    (f) => ` * - "${f.code}": ${f.name} (${f.type})${f.description ? ` - ${f.description}` : ""}`
-  ).join("\n");
-  return `// Auto-generated by Commet CLI
-// Do not edit this file manually - run 'commet pull' to update
+// src/commands/pull.ts
+var fs5 = __toESM(require("fs"));
+var path5 = __toESM(require("path"));
+var import_prompts3 = require("@inquirer/prompts");
+var import_chalk11 = __toESM(require("chalk"));
+var import_commander9 = require("commander");
+var import_ora6 = __toESM(require("ora"));
 
-/**
- * This augments the Commet SDK with your organization's
- * feature codes, seat types, and plan codes for autocomplete.
- *
- * Features available in your organization:
-${featureComments || " * (none)"}
- *
- * Seat types available in your organization:
-${seatComments || " * (none)"}
- *
- * Plans available in your organization:
-${planComments || " * (none)"}
- *
- */
-declare module '@commet/node' {
-  interface CommetGeneratedTypes {
-    seatType: ${seatTypeUnion};
-    planCode: ${planCodeUnion};
-    featureCode: ${featureCodeUnion};
+// src/utils/diff.ts
+var import_chalk10 = __toESM(require("chalk"));
+function computeDiff(config, remote) {
+  const remoteFeatureMap = new Map(remote.features.map((f) => [f.code, f]));
+  const remotePlanMap = new Map(remote.plans.map((p) => [p.code, p]));
+  const featureChanges = [];
+  for (const [code, localFeature] of Object.entries(config.features)) {
+    const remoteFeature = remoteFeatureMap.get(code);
+    if (!remoteFeature) {
+      featureChanges.push({ code, action: "create" });
+      continue;
+    }
+    const changes = [];
+    if (remoteFeature.name !== localFeature.name) {
+      changes.push(`name: "${remoteFeature.name}" \u2192 "${localFeature.name}"`);
+    }
+    if (remoteFeature.type !== localFeature.type) {
+      changes.push(
+        `type: "${remoteFeature.type}" \u2192 "${localFeature.type}" (BLOCKED)`
+      );
+    }
+    if ("unitName" in localFeature && (remoteFeature.unitName ?? void 0) !== localFeature.unitName) {
+      changes.push(
+        `unitName: "${remoteFeature.unitName ?? ""}" \u2192 "${localFeature.unitName}"`
+      );
+    }
+    featureChanges.push(
+      changes.length > 0 ? { code, action: "update", changes } : { code, action: "unchanged" }
+    );
   }
+  const unmanagedFeatures = remote.features.filter((f) => !config.features[f.code]).map((f) => f.code);
+  const planChanges = [];
+  for (const [code, localPlan] of Object.entries(config.plans)) {
+    const remotePlan = remotePlanMap.get(code);
+    if (!remotePlan) {
+      planChanges.push({ code, action: "create" });
+      continue;
+    }
+    const changes = [];
+    if (remotePlan.name !== localPlan.name) {
+      changes.push(`name: "${remotePlan.name}" \u2192 "${localPlan.name}"`);
+    }
+    const remoteDefaultInterval = remotePlan.defaultInterval ?? remotePlan.prices.find((p) => p.isDefault)?.billingInterval ?? null;
+    if (localPlan.defaultInterval && remoteDefaultInterval !== localPlan.defaultInterval) {
+      changes.push(
+        `defaultInterval: "${remoteDefaultInterval ?? "none"}" \u2192 "${localPlan.defaultInterval}"`
+      );
+    }
+    const localPriceMap = new Map(localPlan.prices.map((p) => [p.interval, p]));
+    const remotePriceMap = new Map(
+      remotePlan.prices.map((p) => [p.billingInterval, p])
+    );
+    for (const [interval, localPrice] of localPriceMap) {
+      const remotePrice = remotePriceMap.get(interval);
+      if (!remotePrice) {
+        changes.push(
+          `price ${interval}: new ($${(localPrice.amount / 1e4).toFixed(2)})`
+        );
+      } else if (remotePrice.price !== localPrice.amount) {
+        changes.push(
+          `price ${interval}: $${(remotePrice.price / 1e4).toFixed(2)} \u2192 $${(localPrice.amount / 1e4).toFixed(2)}`
+        );
+      }
+    }
+    if (localPlan.features) {
+      const remotePlanFeatureMap = new Map(
+        remotePlan.features.map((f) => [f.featureCode, f])
+      );
+      for (const featureCode of Object.keys(localPlan.features)) {
+        if (!remotePlanFeatureMap.has(featureCode)) {
+          changes.push(`feature ${featureCode}: new`);
+        }
+      }
+    }
+    planChanges.push(
+      changes.length > 0 ? { code, action: "update", changes } : { code, action: "unchanged" }
+    );
+  }
+  const unmanagedPlans = remote.plans.filter((p) => !config.plans[p.code]).map((p) => p.code);
+  const hasChanges = featureChanges.some((c) => c.action !== "unchanged") || planChanges.some((c) => c.action !== "unchanged");
+  return {
+    features: { changes: featureChanges, unmanaged: unmanagedFeatures },
+    plans: { changes: planChanges, unmanaged: unmanagedPlans },
+    hasChanges
+  };
 }
-
-export {};
-`;
+function formatDiff(diff) {
+  const lines = [];
+  lines.push(import_chalk10.default.bold("\nFeatures:"));
+  for (const change of diff.features.changes) {
+    if (change.action === "create") {
+      lines.push(import_chalk10.default.green(`  + ${change.code}`));
+    } else if (change.action === "update") {
+      lines.push(import_chalk10.default.yellow(`  ~ ${change.code}`));
+      for (const c of change.changes ?? []) {
+        lines.push(import_chalk10.default.dim(`      ${c}`));
+      }
+    } else {
+      lines.push(import_chalk10.default.dim(`    ${change.code}`));
+    }
+  }
+  if (diff.features.unmanaged.length > 0) {
+    lines.push(
+      import_chalk10.default.dim(
+        `  ? unmanaged: ${diff.features.unmanaged.join(", ")} (not in config, left as-is)`
+      )
+    );
+  }
+  lines.push(import_chalk10.default.bold("\nPlans:"));
+  for (const change of diff.plans.changes) {
+    if (change.action === "create") {
+      lines.push(import_chalk10.default.green(`  + ${change.code}`));
+    } else if (change.action === "update") {
+      lines.push(import_chalk10.default.yellow(`  ~ ${change.code}`));
+      for (const c of change.changes ?? []) {
+        lines.push(import_chalk10.default.dim(`      ${c}`));
+      }
+    } else {
+      lines.push(import_chalk10.default.dim(`    ${change.code}`));
+    }
+  }
+  if (diff.plans.unmanaged.length > 0) {
+    lines.push(
+      import_chalk10.default.dim(
+        `  ? unmanaged: ${diff.plans.unmanaged.join(", ")} (not in config, left as-is)`
+      )
+    );
+  }
+  return lines.join("\n");
 }
 
-// src/utils/tsconfig-updater.ts
-var fs5 = __toESM(require("fs"));
-var path5 = __toESM(require("path"));
-var import_jsonc_parser = require("jsonc-parser");
-function updateTsConfig(entry) {
-  const cwd = process.cwd();
-  const tsconfigPath = path5.join(cwd, "tsconfig.json");
-  try {
-    if (!fs5.existsSync(tsconfigPath)) {
-      return {
-        success: false,
-        error: "tsconfig.json not found"
-      };
-    }
-    const content = fs5.readFileSync(tsconfigPath, "utf8");
-    const config = (0, import_jsonc_parser.parse)(content);
-    if (config.include && Array.isArray(config.include)) {
-      if (config.include.includes(entry)) {
-        return { success: true };
+// src/utils/generator.ts
+function generateConfigFile(features, plans) {
+  const lines = [];
+  lines.push('import { defineConfig } from "@commet/node";');
+  lines.push("");
+  lines.push("export default defineConfig({");
+  lines.push("  features: {");
+  for (const f of features) {
+    const parts = [`name: "${f.name}"`, `type: "${f.type}"`];
+    if (f.unitName) parts.push(`unitName: "${f.unitName}"`);
+    if (f.description) parts.push(`description: "${f.description}"`);
+    lines.push(`    ${f.code}: { ${parts.join(", ")} },`);
+  }
+  lines.push("  },");
+  lines.push("  plans: {");
+  for (const p of plans) {
+    lines.push(`    ${p.code}: {`);
+    lines.push(`      name: "${p.name}",`);
+    if (p.description) lines.push(`      description: "${p.description}",`);
+    if (p.consumptionModel)
+      lines.push(`      consumptionModel: "${p.consumptionModel}",`);
+    if (p.isFree) lines.push("      isFree: true,");
+    if (p.isPublic === false) lines.push("      isPublic: false,");
+    if (p.sortOrder != null && p.sortOrder !== 0)
+      lines.push(`      sortOrder: ${p.sortOrder},`);
+    const prices = p.prices ?? [];
+    const defaultInterval = p.defaultInterval ?? prices.find((pr) => pr.isDefault)?.billingInterval ?? prices[0]?.billingInterval;
+    if (defaultInterval)
+      lines.push(`      defaultInterval: "${defaultInterval}",`);
+    if (prices.length === 0) {
+      lines.push("      prices: [],");
+    } else {
+      lines.push("      prices: [");
+      for (const price of prices) {
+        const priceParts = [
+          `interval: "${price.billingInterval}"`,
+          `amount: ${price.price}`
+        ];
+        if (price.trialDays) priceParts.push(`trialDays: ${price.trialDays}`);
+        lines.push(`        { ${priceParts.join(", ")} },`);
       }
+      lines.push("      ],");
     }
-    const currentInclude = config.include || [];
-    const newInclude = [...currentInclude, entry];
-    const edits = (0, import_jsonc_parser.modify)(content, ["include"], newInclude, {
-      formattingOptions: {
-        insertSpaces: true,
-        tabSize: 2
+    const planFeatures = p.features ?? [];
+    if (planFeatures.length > 0) {
+      lines.push("      features: {");
+      for (const pf of planFeatures) {
+        const featureDef = features.find((f) => f.code === pf.featureCode);
+        const isBoolean = featureDef?.type === "boolean";
+        if (isBoolean) {
+          lines.push(`        ${pf.featureCode}: ${pf.enabled ?? true},`);
+        } else {
+          const parts = [];
+          if (pf.includedAmount) parts.push(`included: ${pf.includedAmount}`);
+          if (pf.unlimited) parts.push("unlimited: true");
+          if (pf.overageEnabled && pf.overageUnitPrice) {
+            parts.push(`overage: { unitPrice: ${pf.overageUnitPrice} }`);
+          }
+          if (parts.length > 0) {
+            lines.push(`        ${pf.featureCode}: { ${parts.join(", ")} },`);
+          } else {
+            lines.push(`        ${pf.featureCode}: {},`);
+          }
+        }
       }
-    });
-    const updatedContent = (0, import_jsonc_parser.applyEdits)(content, edits);
-    fs5.writeFileSync(tsconfigPath, updatedContent, "utf8");
-    return { success: true };
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : "Unknown error updating tsconfig.json"
-    };
+      lines.push("      },");
+    }
+    lines.push("    },");
   }
+  lines.push("  },");
+  lines.push("});");
+  lines.push("");
+  return lines.join("\n");
 }
 
 // src/commands/pull.ts
-var pullCommand = new import_commander8.Command("pull").description("Pull type definitions from Commet").action(async () => {
+var pullCommand = new import_commander9.Command("pull").description(
+  "Fetch your billing config from Commet and generate (or update) commet.config.ts with features and plans."
+).option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show what would change without writing any files").option("--json", "Output structured JSON (no colors, no prompts)").addHelpText(
+  "after",
+  `
+Examples:
+  $ commet pull                  Interactive \u2014 shows diff, asks to confirm
+  $ commet pull --dry-run        Preview changes without applying
+  $ commet pull --yes            Apply without confirmation
+  $ commet pull --json --yes     Agent/CI \u2014 structured JSON, no prompts
+`
+).action(async (options) => {
+  const jsonMode = options.json;
   if (!authExists()) {
-    console.log(import_chalk10.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk10.default.dim("Run `commet login` first"));
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Not authenticated" }));
+    } else {
+      console.log(import_chalk11.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk11.default.dim("Run `commet login` first"));
+    }
+    process.exit(1);
   }
-  const hasTsConfig = validateTypeScriptProject();
   if (!projectConfigExists()) {
-    console.log(import_chalk10.default.red("\u2717 Project not linked"));
-    console.log(
-      import_chalk10.default.dim("Run `commet link` first to connect to an organization")
-    );
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Project not linked" }));
+    } else {
+      console.log(import_chalk11.default.red("\u2717 Project not linked"));
+      console.log(
+        import_chalk11.default.dim("Run `commet link` first to connect to an organization")
+      );
+    }
+    process.exit(1);
   }
   const projectConfig = loadProjectConfig();
   if (!projectConfig) {
-    console.log(import_chalk10.default.red("\u2717 Invalid project configuration"));
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Invalid project configuration" }));
+    } else {
+      console.log(import_chalk11.default.red("\u2717 Invalid project configuration"));
+    }
+    process.exit(1);
   }
-  const spinner = (0, import_ora5.default)("Fetching type definitions...").start();
+  const spinner = jsonMode ? null : (0, import_ora6.default)("Fetching config from remote...").start();
   const result = await apiRequest(
-    `${BASE_URL}/api/cli/types?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
   );
   if (result.error || !result.data) {
-    spinner.fail("Failed to fetch types");
-    console.error(import_chalk10.default.red("Error:"), result.error);
-    return;
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail("Failed to fetch config");
+      console.error(import_chalk11.default.red("Error:"), result.error);
+    }
+    process.exit(1);
   }
-  const { seatTypes, features, plans } = result.data;
-  const typeDefinitions = generateTypes(seatTypes, features, plans);
-  const commetDir = path6.resolve(process.cwd(), ".commet");
-  const outputPath = path6.join(commetDir, "types.d.ts");
-  fs6.mkdirSync(commetDir, { recursive: true });
-  fs6.writeFileSync(outputPath, typeDefinitions, "utf8");
-  spinner.succeed("Type definitions generated!");
-  if (hasTsConfig) {
-    const tsconfigResult = updateTsConfig(".commet/types.d.ts");
-    if (tsconfigResult.success) {
-      console.log(import_chalk10.default.green("\u2713 Updated tsconfig.json"));
+  spinner?.succeed("Remote state fetched");
+  const { features, plans } = result.data;
+  const configContent = generateConfigFile(features, plans);
+  const outputPath = path5.resolve(process.cwd(), "commet.config.ts");
+  const existingConfigPath = findConfigFile(process.cwd());
+  if (!existingConfigPath) {
+    if (options.dryRun) {
+      if (jsonMode) {
+        console.log(
+          JSON.stringify({
+            action: "create",
+            features: features.length,
+            plans: plans.length,
+            applied: false
+          })
+        );
+      } else {
+        console.log(
+          import_chalk11.default.green(
+            `
+Would create commet.config.ts (${features.length} features, ${plans.length} plans)`
+          )
+        );
+      }
+      return;
+    }
+    fs5.writeFileSync(outputPath, configContent, "utf8");
+    if (jsonMode) {
+      console.log(
+        JSON.stringify({
+          action: "create",
+          features: features.length,
+          plans: plans.length,
+          applied: true
+        })
+      );
     } else {
-      console.log(import_chalk10.default.yellow("\u26A0 Could not update tsconfig.json"));
+      console.log(import_chalk11.default.green(`
+\u2713 Created commet.config.ts`));
       console.log(
-        import_chalk10.default.dim(
-          'Add ".commet/types.d.ts" to your tsconfig.json include array'
-        )
+        import_chalk11.default.dim(`  ${features.length} features, ${plans.length} plans`)
       );
     }
+    return;
+  }
+  const localLoaded = await loadBillingConfig(process.cwd()).catch(
+    (error) => ({
+      parseError: error instanceof Error ? error.message : String(error)
+    })
+  );
+  if ("parseError" in localLoaded) {
+    if (options.dryRun) {
+      if (jsonMode) {
+        console.log(
+          JSON.stringify({
+            action: "overwrite",
+            reason: localLoaded.parseError,
+            applied: false
+          })
+        );
+      } else {
+        console.log(
+          import_chalk11.default.yellow(
+            `
+\u26A0 Local config is invalid: ${localLoaded.parseError}`
+          )
+        );
+      }
+      return;
+    }
+    if (!options.yes && !jsonMode) {
+      console.log(import_chalk11.default.yellow(`
+\u26A0 ${localLoaded.parseError}`));
+      const shouldProceed = await (0, import_prompts3.confirm)({
+        message: "Overwrite with remote?",
+        default: true
+      });
+      if (!shouldProceed) {
+        console.log(import_chalk11.default.dim("Pull cancelled"));
+        return;
+      }
+    }
+    fs5.writeFileSync(outputPath, configContent, "utf8");
+    if (jsonMode) {
+      console.log(JSON.stringify({ action: "overwrite", applied: true }));
+    } else {
+      console.log(import_chalk11.default.green("\n\u2713 Overwritten commet.config.ts"));
+    }
+    return;
+  }
+  const localConfig = localLoaded.config;
+  const remoteAsConfig = {
+    features: Object.fromEntries(
+      features.map((f) => [
+        f.code,
+        {
+          name: f.name,
+          type: f.type,
+          ...f.unitName ? { unitName: f.unitName } : {},
+          ...f.description ? { description: f.description } : {}
+        }
+      ])
+    ),
+    plans: Object.fromEntries(
+      plans.map((p) => [
+        p.code,
+        {
+          name: p.name,
+          ...p.description ? { description: p.description } : {},
+          ...p.consumptionModel ? {
+            consumptionModel: p.consumptionModel
+          } : {},
+          ...p.isFree ? { isFree: true } : {},
+          ...p.isPublic === false ? { isPublic: false } : {},
+          ...p.sortOrder ? { sortOrder: p.sortOrder } : {},
+          ...(() => {
+            const planPrices = p.prices ?? [];
+            const defaultPrice = planPrices.find((pr) => pr.isDefault);
+            const defaultInterval = defaultPrice?.billingInterval ?? planPrices[0]?.billingInterval;
+            return defaultInterval ? { defaultInterval } : {};
+          })(),
+          prices: (p.prices ?? []).map((pr) => ({
+            interval: pr.billingInterval,
+            amount: pr.price,
+            ...pr.trialDays ? { trialDays: pr.trialDays } : {}
+          }))
+        }
+      ])
+    )
+  };
+  const localAsRemote = {
+    features: Object.entries(localConfig.features).map(([code, f]) => ({
+      code,
+      name: f.name,
+      type: f.type,
+      description: f.description ?? null,
+      unitName: f.unitName ?? null
+    })),
+    plans: Object.entries(localConfig.plans).map(([code, p]) => ({
+      code,
+      name: p.name,
+      description: p.description ?? null,
+      consumptionModel: p.consumptionModel ?? null,
+      defaultInterval: p.defaultInterval ?? null,
+      isFree: p.isFree,
+      isPublic: p.isPublic,
+      sortOrder: p.sortOrder,
+      prices: p.prices.map((pr) => ({
+        billingInterval: pr.interval,
+        price: pr.amount,
+        trialDays: pr.trialDays ?? null
+      })),
+      features: []
+    }))
+  };
+  const diff = computeDiff(remoteAsConfig, localAsRemote);
+  if (!diff.hasChanges && diff.features.unmanaged.length === 0 && diff.plans.unmanaged.length === 0) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ diff, applied: false, upToDate: true }));
+    } else {
+      console.log(import_chalk11.default.green("\n\u2713 Already up to date"));
+    }
+    return;
+  }
+  if (jsonMode) {
+    if (options.dryRun) {
+      console.log(JSON.stringify({ diff, applied: false }));
+      return;
+    }
+  } else {
+    console.log(formatDiff(diff));
+  }
+  if (options.dryRun) {
+    if (!jsonMode) {
+      console.log(import_chalk11.default.dim("\n(dry run \u2014 no changes applied)"));
+    }
+    return;
+  }
+  if (!options.yes && !jsonMode) {
+    const shouldProceed = await (0, import_prompts3.confirm)({
+      message: "Overwrite commet.config.ts with remote state?",
+      default: true
+    });
+    if (!shouldProceed) {
+      console.log(import_chalk11.default.dim("Pull cancelled"));
+      return;
+    }
+  }
+  fs5.writeFileSync(outputPath, configContent, "utf8");
+  if (jsonMode) {
+    console.log(JSON.stringify({ diff, applied: true }));
   } else {
-    console.log(import_chalk10.default.yellow("\u26A0 No tsconfig.json found"));
+    console.log(import_chalk11.default.green("\n\u2713 Updated commet.config.ts"));
     console.log(
-      import_chalk10.default.dim(
-        'Add ".commet/types.d.ts" to your tsconfig.json to enable types'
-      )
+      import_chalk11.default.dim(`  ${features.length} features, ${plans.length} plans`)
     );
   }
-  const gitignoreResult = updateGitignore(".commet/");
-  if (gitignoreResult.success) {
-    console.log(import_chalk10.default.green("\u2713 Updated .gitignore"));
-  } else {
-    console.log(import_chalk10.default.yellow("\u26A0 No .gitignore found"));
-    console.log(import_chalk10.default.dim("Add .commet/ to your .gitignore file"));
+});
+
+// src/commands/push.ts
+var import_prompts4 = require("@inquirer/prompts");
+var import_chalk12 = __toESM(require("chalk"));
+var import_commander10 = require("commander");
+var import_ora7 = __toESM(require("ora"));
+var pushCommand = new import_commander10.Command("push").description(
+  "Push your local commet.config.ts to Commet. Creates or updates features and plans to match your config file."
+).option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show what would change without pushing").option("--json", "Output structured JSON (no colors, no prompts)").addHelpText(
+  "after",
+  `
+Examples:
+  $ commet push                  Interactive \u2014 shows diff, asks to confirm
+  $ commet push --dry-run        Preview what would change on remote
+  $ commet push --yes            Push without confirmation
+  $ commet push --json --yes     Agent/CI \u2014 structured JSON, no prompts
+
+Notes:
+  Feature types (boolean, usage, seats) cannot be changed via push.
+  Resources in remote but not in your config are left as-is (not deleted).
+`
+).action(async (options) => {
+  const jsonMode = options.json;
+  if (!authExists()) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Not authenticated" }));
+    } else {
+      console.log(import_chalk12.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk12.default.dim("Run `commet login` first"));
+    }
+    process.exit(1);
   }
-  console.log(import_chalk10.default.green("\nSuccess!"));
-  console.log(import_chalk10.default.dim("\nGenerated types:"));
-  console.log(
-    import_chalk10.default.dim(
-      `  Features: ${features.length > 0 ? features.map((f) => f.code).join(", ") : "none"}`
-    )
+  if (!projectConfigExists()) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Project not linked" }));
+    } else {
+      console.log(import_chalk12.default.red("\u2717 Project not linked"));
+      console.log(
+        import_chalk12.default.dim("Run `commet link` first to connect to an organization")
+      );
+    }
+    process.exit(1);
+  }
+  const projectConfig = loadProjectConfig();
+  if (!projectConfig) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Invalid project configuration" }));
+    } else {
+      console.log(import_chalk12.default.red("\u2717 Invalid project configuration"));
+    }
+    process.exit(1);
+  }
+  const loadSpinner = jsonMode ? null : (0, import_ora7.default)("Loading commet.config.ts...").start();
+  const loaded = await loadBillingConfig(process.cwd()).catch(
+    (error) => {
+      const message = error instanceof Error ? error.message : String(error);
+      if (jsonMode) {
+        console.log(JSON.stringify({ error: message }));
+      } else {
+        loadSpinner?.fail("Failed to load config");
+        console.error(import_chalk12.default.red(message));
+      }
+      return null;
+    }
   );
-  console.log(
-    import_chalk10.default.dim(
-      `  Seat types: ${seatTypes.length > 0 ? seatTypes.map((s) => s.code).join(", ") : "none"}`
-    )
+  if (!loaded) process.exit(1);
+  const { config, configPath } = loaded;
+  loadSpinner?.succeed(`Loaded ${configPath}`);
+  const fetchSpinner = jsonMode ? null : (0, import_ora7.default)("Fetching remote state...").start();
+  const remoteResult = await apiRequest(
+    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
   );
-  console.log(
-    import_chalk10.default.dim(
-      `  Plans: ${plans.length > 0 ? plans.map((p) => p.code).join(", ") : "none"}`
-    )
+  if (remoteResult.error || !remoteResult.data) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: remoteResult.error }));
+    } else {
+      fetchSpinner?.fail("Failed to fetch remote state");
+      console.error(import_chalk12.default.red("Error:"), remoteResult.error);
+    }
+    process.exit(1);
+  }
+  fetchSpinner?.succeed("Remote state fetched");
+  const remote = {
+    features: remoteResult.data.features,
+    plans: remoteResult.data.plans
+  };
+  const diff = computeDiff(config, remote);
+  if (jsonMode) {
+    if (options.dryRun) {
+      console.log(JSON.stringify({ diff, applied: false }));
+      return;
+    }
+  } else {
+    console.log(formatDiff(diff));
+  }
+  if (!diff.hasChanges) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ diff, applied: false, upToDate: true }));
+    } else {
+      console.log(import_chalk12.default.green("\n\u2713 Everything is up to date"));
+    }
+    return;
+  }
+  const typeChanges = diff.features.changes.filter(
+    (c) => c.action === "update" && c.changes?.some((ch) => ch.includes("BLOCKED"))
+  );
+  if (typeChanges.length > 0) {
+    const blockedCodes = typeChanges.map((c) => c.code);
+    if (jsonMode) {
+      console.log(
+        JSON.stringify({
+          error: "Feature type changes blocked",
+          blockedCodes,
+          diff
+        })
+      );
+    } else {
+      console.log(
+        import_chalk12.default.red(
+          "\n\u2717 Cannot change feature types. Update them in the dashboard:"
+        )
+      );
+      for (const change of typeChanges) {
+        console.log(import_chalk12.default.red(`  - ${change.code}`));
+      }
+    }
+    process.exit(1);
+  }
+  if (options.dryRun) {
+    if (!jsonMode) {
+      console.log(import_chalk12.default.dim("\n(dry run \u2014 no changes applied)"));
+    }
+    return;
+  }
+  if (!options.yes && !jsonMode) {
+    const shouldProceed = await (0, import_prompts4.confirm)({
+      message: "Apply these changes?",
+      default: true
+    });
+    if (!shouldProceed) {
+      console.log(import_chalk12.default.dim("Push cancelled"));
+      return;
+    }
+  }
+  const pushSpinner = jsonMode ? null : (0, import_ora7.default)("Pushing config...").start();
+  const pushResult = await apiRequest(
+    `${BASE_URL}/api/cli/push`,
+    {
+      method: "POST",
+      body: JSON.stringify({
+        orgId: projectConfig.orgId,
+        config: {
+          features: config.features,
+          plans: config.plans
+        }
+      })
+    }
   );
-  console.log(import_chalk10.default.dim(`
-Output: ${outputPath}`));
-  if (seatTypes.length === 0 && plans.length === 0 && features.length === 0) {
+  if (pushResult.error || !pushResult.data) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: pushResult.error }));
+    } else {
+      pushSpinner?.fail("Push failed");
+      console.error(import_chalk12.default.red("Error:"), pushResult.error);
+    }
+    process.exit(1);
+  }
+  const pushOutcome = pushResult.data;
+  if (jsonMode) {
+    console.log(JSON.stringify({ diff, applied: true, result: pushOutcome }));
+    return;
+  }
+  const errors = [
+    ...pushOutcome.features.errors,
+    ...pushOutcome.plans.errors
+  ];
+  if (errors.length > 0) {
+    pushSpinner?.warn("Push completed with errors");
+    for (const error of errors) {
+      console.log(import_chalk12.default.red(`  \u2717 ${error.code}: ${error.message}`));
+    }
+  } else {
+    pushSpinner?.succeed("Push complete");
+  }
+  if (pushOutcome.features.created.length > 0) {
+    console.log(
+      import_chalk12.default.green(
+        `  Created features: ${pushOutcome.features.created.join(", ")}`
+      )
+    );
+  }
+  if (pushOutcome.features.updated.length > 0) {
+    console.log(
+      import_chalk12.default.yellow(
+        `  Updated features: ${pushOutcome.features.updated.join(", ")}`
+      )
+    );
+  }
+  if (pushOutcome.plans.created.length > 0) {
+    console.log(
+      import_chalk12.default.green(`  Created plans: ${pushOutcome.plans.created.join(", ")}`)
+    );
+  }
+  if (pushOutcome.plans.updated.length > 0) {
     console.log(
-      import_chalk10.default.yellow(
-        "\n\u26A0 No types found. Create features, seat types, and plans in your Commet dashboard."
+      import_chalk12.default.yellow(
+        `  Updated plans: ${pushOutcome.plans.updated.join(", ")}`
       )
     );
   }
 });
 
 // src/commands/switch.ts
-var import_prompts3 = require("@inquirer/prompts");
-var import_chalk11 = __toESM(require("chalk"));
-var import_commander9 = require("commander");
-var import_ora6 = __toESM(require("ora"));
-var switchCommand = new import_commander9.Command("switch").description("Switch to a different organization").action(async () => {
+var import_prompts5 = require("@inquirer/prompts");
+var import_chalk13 = __toESM(require("chalk"));
+var import_commander11 = require("commander");
+var import_ora8 = __toESM(require("ora"));
+var switchCommand = new import_commander11.Command("switch").description(
+  "Switch this project to a different organization. Updates .commet/config.json with the new org."
+).option(
+  "--org <slug-or-id>",
+  "Organization slug or ID \u2014 skips interactive selection"
+).addHelpText(
+  "after",
+  `
+Examples:
+  $ commet switch                Interactive \u2014 choose from a list
+  $ commet switch --org acme     Non-interactive \u2014 match by slug or ID
+
+Use 'commet orgs' to see available organizations and their slugs.
+After switching, run 'commet pull' to update your config file.
+`
+).action(async (options) => {
   if (!authExists()) {
-    console.log(import_chalk11.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk11.default.dim("Run `commet login` first"));
-    return;
+    console.log(import_chalk13.default.red("\u2717 Not authenticated"));
+    console.log(import_chalk13.default.dim("Run `commet login` first"));
+    process.exit(1);
   }
   if (!projectConfigExists()) {
-    console.log(import_chalk11.default.yellow("\u26A0 Project not linked"));
+    console.log(import_chalk13.default.yellow("\u26A0 Project not linked"));
     console.log(
-      import_chalk11.default.dim("Run `commet link` first to connect to an organization")
+      import_chalk13.default.dim("Run `commet link` first to connect to an organization")
     );
-    return;
+    process.exit(1);
   }
-  const spinner = (0, import_ora6.default)("Fetching organizations...").start();
+  const spinner = (0, import_ora8.default)("Fetching organizations...").start();
   const result = await apiRequest(
     `${BASE_URL}/api/cli/organizations`
   );
   if (result.error || !result.data) {
     spinner.fail("Failed to fetch organizations");
-    console.error(import_chalk11.default.red("Error:"), result.error);
-    return;
+    console.error(import_chalk13.default.red("Error:"), result.error);
+    process.exit(1);
   }
   const { organizations } = result.data;
   if (organizations.length === 0) {
     spinner.stop();
-    console.log(import_chalk11.default.yellow("\u26A0 No organizations found"));
-    return;
+    console.log(import_chalk13.default.yellow("\u26A0 No organizations found"));
+    process.exit(1);
   }
   spinner.stop();
-  let orgId;
-  try {
-    orgId = await (0, import_prompts3.select)({
-      message: "Select organization:",
-      choices: organizations.map((org) => ({
-        name: `${org.name} ${import_chalk11.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
-        value: org.id
-      })),
-      theme: promptTheme
-    });
-  } catch (_error) {
-    console.log(import_chalk11.default.yellow("\n\u26A0 Switch cancelled"));
-    return;
-  }
-  const selectedOrg = organizations.find((org) => org.id === orgId);
-  if (!selectedOrg) {
-    console.log(import_chalk11.default.red("\u2717 Organization not found"));
-    return;
+  let selectedOrg;
+  if (options.org) {
+    selectedOrg = organizations.find(
+      (org) => org.slug === options.org || org.id === options.org
+    );
+    if (!selectedOrg) {
+      console.log(import_chalk13.default.red(`\u2717 Organization "${options.org}" not found`));
+      console.log(import_chalk13.default.dim("\nAvailable organizations:"));
+      for (const org of organizations) {
+        console.log(import_chalk13.default.dim(`  ${org.slug} (${org.mode})`));
+      }
+      process.exit(1);
+    }
+  } else {
+    let orgId;
+    try {
+      orgId = await (0, import_prompts5.select)({
+        message: "Select organization:",
+        choices: organizations.map((org) => ({
+          name: `${org.name} ${import_chalk13.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`,
+          value: org.id
+        })),
+        theme: promptTheme
+      });
+    } catch (_error) {
+      console.log(import_chalk13.default.yellow("\n\u26A0 Switch cancelled"));
+      return;
+    }
+    selectedOrg = organizations.find((org) => org.id === orgId);
+    if (!selectedOrg) {
+      console.log(import_chalk13.default.red("\u2717 Organization not found"));
+      process.exit(1);
+    }
   }
   saveProjectConfig({
     orgId: selectedOrg.id,
     orgName: selectedOrg.name,
     mode: selectedOrg.mode
   });
-  console.log(import_chalk11.default.green("\n\u2713 Switched organization successfully!"));
+  console.log(import_chalk13.default.green("\n\u2713 Switched organization"));
   console.log(
-    import_chalk11.default.dim(`
-Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
+    import_chalk13.default.dim(`Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
   );
   console.log(
-    import_chalk11.default.dim(
+    import_chalk13.default.dim(
       "\nRun `commet pull` to update TypeScript types for this organization"
     )
   );
 });
 
 // src/commands/unlink.ts
-var import_chalk12 = __toESM(require("chalk"));
-var import_commander10 = require("commander");
-var unlinkCommand = new import_commander10.Command("unlink").description("Unlink this project from Commet").action(async () => {
+var import_chalk14 = __toESM(require("chalk"));
+var import_commander12 = require("commander");
+var unlinkCommand = new import_commander12.Command("unlink").description(
+  "Unlink this project from its organization. Removes the .commet/ directory. Does not delete anything on remote."
+).action(async () => {
   if (!projectConfigExists()) {
     console.log(
-      import_chalk12.default.yellow("\u26A0 This project is not linked to any organization")
+      import_chalk14.default.yellow("\u26A0 This project is not linked to any organization")
     );
     return;
   }
   clearProjectConfig();
-  console.log(import_chalk12.default.green("\u2713 Project unlinked successfully"));
-  console.log(import_chalk12.default.dim("\u2713 Removed .commet/ directory"));
+  console.log(import_chalk14.default.green("\u2713 Project unlinked successfully"));
+  console.log(import_chalk14.default.dim("\u2713 Removed .commet/ directory"));
   console.log(
-    import_chalk12.default.dim("\nRun `commet link` to connect to a different organization")
+    import_chalk14.default.dim("\nRun `commet link` to connect to a different organization")
   );
 });
 
-// src/commands/whoami.ts
-var import_chalk13 = __toESM(require("chalk"));
-var import_commander11 = require("commander");
-var whoamiCommand = new import_commander11.Command("whoami").description("Display current authentication and project status").action(async () => {
-  if (!authExists()) {
-    console.log(import_chalk13.default.yellow("\u26A0 Not logged in"));
-    console.log(import_chalk13.default.dim("Run `commet login` to authenticate"));
-    return;
-  }
-  console.log(import_chalk13.default.green("\u2713 Logged in"));
-  const projectConfig = loadProjectConfig();
-  if (projectConfig) {
-    console.log(import_chalk13.default.bold("\nProject:"));
-    console.log(import_chalk13.default.dim("Organization:"), projectConfig.orgName);
-    console.log(import_chalk13.default.dim("Mode:"), projectConfig.mode);
-  } else {
-    console.log(import_chalk13.default.yellow("\n\u26A0 No project linked"));
-    console.log(
-      import_chalk13.default.dim(
-        "Run `commet link` to connect this directory to an organization"
-      )
-    );
-  }
-});
-
 // src/index.ts
-var program = new import_commander12.Command();
+var program = new import_commander13.Command();
 program.name("commet").description(
-  "Commet CLI - Manage your billing platform from the command line"
-).version(package_default.version);
+  "Commet CLI \u2014 billing infrastructure as code.\nManage features, plans, and billing config from the command line."
+).version(package_default.version).addHelpText(
+  "after",
+  `
+Workflow:
+  $ commet pull                  Sync remote \u2192 commet.config.ts
+  $ commet push                  Push local changes \u2192 remote
+  $ commet list features         See what's configured
+
+For agents and CI:
+  $ commet agent-info            JSON with status + every command's usage
+  $ commet pull --json --yes     Structured output, no prompts
+  $ commet orgs --json           List orgs as JSON
+  $ commet link --org <slug>     Link without interactive selection
+
+Run commet <command> --help for detailed usage and examples.
+`
+);
 program.addCommand(createCommand);
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
-program.addCommand(whoamiCommand);
 program.addCommand(linkCommand);
 program.addCommand(unlinkCommand);
 program.addCommand(switchCommand);
-program.addCommand(infoCommand);
+program.addCommand(agentInfoCommand);
+program.addCommand(orgsCommand);
+program.addCommand(pushCommand);
 program.addCommand(pullCommand);
 program.addCommand(listCommand);
 program.addCommand(listenCommand);
+program.showSuggestionAfterError();
 program.exitOverride();
 try {
   program.parse(process.argv);
@@ -1543,10 +2379,69 @@ try {
     if (code === "commander.version" || code === "commander.help" || code === "commander.helpDisplayed") {
       process.exit(0);
     }
-    console.error(import_chalk14.default.red("Error:"), error.message);
+    console.error(import_chalk15.default.red("Error:"), error.message);
   }
   process.exit(1);
 }
 if (!process.argv.slice(2).length) {
-  program.outputHelp();
+  printDefaultScreen();
+}
+function printDefaultScreen() {
+  const version = import_chalk15.default.dim(`v${package_default.version}`);
+  console.log(`
+  ${commetColor.bold("Commet")} ${version}`);
+  console.log(import_chalk15.default.dim("  Billing infrastructure as code\n"));
+  const authenticated = authExists();
+  const projectConfig = projectConfigExists() ? loadProjectConfig() : null;
+  const configFile = findConfigFile(process.cwd());
+  if (authenticated) {
+    console.log(import_chalk15.default.green("  \u2713 Authenticated"));
+  } else {
+    console.log(
+      `  ${import_chalk15.default.yellow("\u26A0")} Not logged in ${import_chalk15.default.dim("\u2192 commet login")}`
+    );
+  }
+  if (projectConfig) {
+    console.log(
+      import_chalk15.default.green(
+        `  \u2713 ${projectConfig.orgName} ${import_chalk15.default.dim(`(${projectConfig.mode})`)}`
+      )
+    );
+    console.log(import_chalk15.default.dim(`    ${projectConfig.orgId}`));
+  } else if (authenticated) {
+    console.log(
+      `  ${import_chalk15.default.yellow("\u26A0")} No project linked ${import_chalk15.default.dim("\u2192 commet link")}`
+    );
+  }
+  if (configFile) {
+    const fileName = configFile.split("/").pop();
+    console.log(import_chalk15.default.green(`  \u2713 ${fileName}`));
+  } else if (projectConfig) {
+    console.log(
+      `  ${import_chalk15.default.yellow("\u26A0")} No config file ${import_chalk15.default.dim("\u2192 commet pull")}`
+    );
+  }
+  const cmd = (name) => commetColor(name.padEnd(22));
+  const dim = import_chalk15.default.dim;
+  console.log(dim("\n  Config"));
+  console.log(`    ${cmd("pull")}${dim("Sync remote \u2192 commet.config.ts")}`);
+  console.log(`    ${cmd("push")}${dim("Sync commet.config.ts \u2192 remote")}`);
+  console.log(
+    `    ${cmd("list <type>")}${dim("List features, plans, or seats")}`
+  );
+  console.log(dim("\n  Development"));
+  console.log(`    ${cmd("listen <url>")}${dim("Forward webhooks locally")}`);
+  console.log(dim("\n  Project"));
+  console.log(`    ${cmd("link")}${dim("Link to an organization")}`);
+  console.log(`    ${cmd("switch")}${dim("Switch organization")}`);
+  console.log(`    ${cmd("orgs")}${dim("List organizations")}`);
+  console.log(dim("\n  Setup"));
+  console.log(`    ${cmd("create")}${dim("Scaffold a new Commet app")}`);
+  console.log(`    ${cmd("login")}${dim("Authenticate")}`);
+  console.log(`    ${cmd("logout")}${dim("Log out")}`);
+  console.log(
+    dim(
+      "\n  commet --help for full reference \xB7 commet agent-info for agents/CI\n"
+    )
+  );
 }