commet 1.10.0 → 2.0.0

package/dist/index.js

@@ -24,13 +24,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 
 // src/index.ts
-var import_chalk16 = __toESM(require("chalk"));
-var import_commander13 = require("commander");
+var import_chalk14 = __toESM(require("chalk"));
+var import_commander10 = require("commander");
 
 // package.json
 var package_default = {
   name: "commet",
-  version: "1.10.0",
+  version: "2.0.0",
   description: "Commet CLI - Manage your billing platform from the command line",
   bin: {
     commet: "./bin/commet"
@@ -87,16 +87,10 @@ 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/api-key.ts
+var import_chalk2 = __toESM(require("chalk"));
 var import_commander = require("commander");
-var import_ora2 = __toESM(require("ora"));
-var import_tar = require("tar");
+var import_ora = __toESM(require("ora"));
 
 // src/utils/config.ts
 var fs = __toESM(require("fs"));
@@ -165,55 +159,353 @@ function clearProjectConfig() {
   }
 }
 
+// src/utils/telemetry.ts
+var CLI_VERSION = true ? "2.0.0" : "0.0.0";
+var TELEMETRY_URL = "https://commet.co/api/cli/telemetry";
+function detectRuntime() {
+  if ("Bun" in globalThis) {
+    const bun = globalThis.Bun;
+    if (bun && typeof bun.version === "string")
+      return { name: "bun", version: bun.version };
+  }
+  if ("Deno" in globalThis) {
+    const deno = globalThis.Deno;
+    if (deno?.version?.deno)
+      return { name: "deno", version: deno.version.deno };
+  }
+  return { name: "node", version: process.versions.node };
+}
+var cachedClientInfo = null;
+var cachedUserAgent = null;
+function collectClientInfo() {
+  const runtime = detectRuntime();
+  return {
+    sdk: "commet-cli",
+    sdkVersion: CLI_VERSION,
+    lang: "node",
+    langVersion: process.versions.node,
+    platform: process.platform,
+    arch: process.arch,
+    runtime: runtime.name,
+    runtimeVersion: runtime.version
+  };
+}
+function getClientInfoHeader() {
+  if (!cachedClientInfo) {
+    cachedClientInfo = JSON.stringify(collectClientInfo());
+  }
+  return cachedClientInfo;
+}
+function getUserAgent() {
+  if (!cachedUserAgent) {
+    const runtime = detectRuntime();
+    cachedUserAgent = `commet-cli/${CLI_VERSION} ${runtime.name}/${runtime.version} ${process.platform}/${process.arch}`;
+  }
+  return cachedUserAgent;
+}
+function isTelemetryDisabled() {
+  return process.env.COMMET_TELEMETRY_DISABLED === "1" || process.env.DO_NOT_TRACK === "1";
+}
+function resolveOrgId() {
+  if (process.env.COMMET_API_KEY) return null;
+  try {
+    const config = loadProjectConfig();
+    return config?.orgId ?? null;
+  } catch {
+    return null;
+  }
+}
+var commandStartTime = null;
+var apiRequestMade = false;
+var commandReported = false;
+function markCommandStart() {
+  commandStartTime = Date.now();
+  apiRequestMade = false;
+  commandReported = false;
+}
+function markApiRequest() {
+  apiRequestMade = true;
+}
+function sendTelemetry(payload) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 750);
+  fetch(TELEMETRY_URL, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "User-Agent": getUserAgent()
+    },
+    body: JSON.stringify(payload),
+    signal: controller.signal
+  }).catch(() => {
+  }).finally(() => clearTimeout(timeout));
+}
+function reportCommand(command, outcome, errorCode) {
+  if (commandReported) return;
+  if (isTelemetryDisabled()) return;
+  if (apiRequestMade && outcome === "success") return;
+  commandReported = true;
+  const durationMs = commandStartTime ? Date.now() - commandStartTime : null;
+  const runtime = detectRuntime();
+  const orgId = resolveOrgId();
+  sendTelemetry({
+    type: "command",
+    command,
+    outcome,
+    ...errorCode ? { errorCode } : {},
+    ...orgId ? { orgId } : {},
+    cliVersion: CLI_VERSION,
+    runtime: runtime.name,
+    runtimeVersion: runtime.version,
+    platform: process.platform,
+    arch: process.arch,
+    ...durationMs !== null ? { durationMs } : {},
+    authMode: process.env.COMMET_API_KEY ? "api_key" : "login"
+  });
+}
+function reportCrash(error) {
+  if (commandReported) return;
+  if (isTelemetryDisabled()) return;
+  commandReported = true;
+  const command = process.argv[2] || "(default)";
+  const orgId = resolveOrgId();
+  const errorName = error instanceof Error ? error.constructor.name : "UnknownError";
+  sendTelemetry({
+    type: "crash",
+    command,
+    errorName,
+    ...orgId ? { orgId } : {},
+    cliVersion: CLI_VERSION,
+    platform: process.platform,
+    arch: process.arch,
+    authMode: process.env.COMMET_API_KEY ? "api_key" : "login"
+  });
+}
+function installCrashHandler() {
+  process.on("uncaughtException", (error) => {
+    reportCrash(error);
+    console.error("Fatal:", error.message);
+    setTimeout(() => process.exit(1), 800);
+  });
+  process.on("unhandledRejection", (reason) => {
+    reportCrash(reason);
+    console.error(
+      "Fatal:",
+      reason instanceof Error ? reason.message : String(reason)
+    );
+    setTimeout(() => process.exit(1), 800);
+  });
+}
+
 // src/utils/api.ts
 var BASE_URL = "https://commet.co";
 async function apiRequest(endpoint, options = {}) {
-  const auth = loadAuth();
-  if (!auth) {
-    return { error: "Not authenticated. Run `commet login` first." };
+  const apiKey = process.env.COMMET_API_KEY;
+  const auth = apiKey ? null : loadAuth();
+  if (!apiKey && !auth) {
+    return {
+      error: {
+        code: "auth_required",
+        message: "Not authenticated. Run `commet login` first."
+      }
+    };
   }
   try {
+    markApiRequest();
     const response = await fetch(endpoint, {
       ...options,
       headers: {
         ...options.headers,
-        Authorization: `Bearer ${auth.token}`,
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        "User-Agent": getUserAgent(),
+        "commet-client-info": getClientInfoHeader(),
+        ...apiKey ? { "x-api-key": apiKey } : { Authorization: `Bearer ${auth.token}` }
       }
     });
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}));
       return {
-        error: errorData.message || errorData.error || `Request failed with status ${response.status}`
+        error: {
+          code: errorData.code ?? `http_${response.status}`,
+          message: errorData.message ?? errorData.error ?? `Request failed with status ${response.status}`
+        }
       };
     }
     const data = await response.json();
     return { data };
   } catch (error) {
     return {
-      error: error instanceof Error ? error.message : "Unknown error occurred"
+      error: {
+        code: "network_error",
+        message: error instanceof Error ? error.message : "Unknown error occurred"
+      }
     };
   }
 }
 
+// src/utils/output.ts
+var import_chalk = __toESM(require("chalk"));
+function isAgentMode(options) {
+  if (options?.output === "agent") return true;
+  const idx = process.argv.indexOf("--output");
+  return idx !== -1 && process.argv[idx + 1] === "agent";
+}
+function exitWithError(error) {
+  const command = process.argv[2] || "(default)";
+  reportCommand(command, "error", error.code);
+  if (isAgentMode()) {
+    console.log(JSON.stringify({ error }));
+  } else {
+    console.log(import_chalk.default.red(`\u2717 ${error.message}`));
+    if (error.action) {
+      console.log(import_chalk.default.dim(`Run \`${error.action}\``));
+    }
+  }
+  process.exit(1);
+}
+function requireAuth() {
+  if (process.env.COMMET_API_KEY) return;
+  if (!authExists()) {
+    exitWithError({
+      code: "auth_required",
+      message: "Not authenticated",
+      action: "commet login"
+    });
+  }
+}
+function requireOrgContext() {
+  if (process.env.COMMET_API_KEY) {
+    return { orgId: "__from_api_key__" };
+  }
+  requireAuth();
+  const projectConfig = loadProjectConfig();
+  if (!projectConfig) {
+    exitWithError({
+      code: "project_not_linked",
+      message: "No organization linked",
+      action: "commet link"
+    });
+  }
+  return { orgId: projectConfig.orgId };
+}
+
+// src/commands/api-key.ts
+var apiKeyCommand = new import_commander.Command("api-key").description(
+  "Generate an API key for the linked organization. Use it in CI with COMMET_API_KEY env var."
+).option("--name <name>", "Name for the API key", "CLI").option(
+  "--output <format>",
+  "Output format: human (default) or agent",
+  "human"
+).addHelpText(
+  "after",
+  `
+Examples:
+  $ commet api-key                    Generate a key for the linked org
+  $ commet api-key --name "GitHub CI" Name it for easy identification
+  $ commet api-key --output agent     JSON output with the key
+
+Then use it in CI:
+  $ COMMET_API_KEY=sk_... commet push --yes
+`
+).action(async (options) => {
+  const agentMode = isAgentMode(options);
+  if (process.env.COMMET_API_KEY) {
+    exitWithError({
+      code: "invalid_context",
+      message: "Cannot create API keys while using COMMET_API_KEY",
+      action: "commet login"
+    });
+  }
+  requireAuth();
+  const projectConfig = loadProjectConfig();
+  if (!projectConfig) {
+    exitWithError({
+      code: "project_not_linked",
+      message: "No organization linked",
+      action: "commet link"
+    });
+  }
+  const spinner = agentMode ? null : (0, import_ora.default)("Generating API key...").start();
+  const result = await apiRequest(
+    `${BASE_URL}/api/cli/api-keys`,
+    {
+      method: "POST",
+      body: JSON.stringify({
+        organizationId: projectConfig.orgId,
+        name: options.name
+      })
+    }
+  );
+  if (result.error || !result.data) {
+    if (agentMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail("Failed to create API key");
+      console.error(import_chalk2.default.red("Error:"), result.error?.message);
+    }
+    process.exit(1);
+  }
+  const { apiKey } = result.data;
+  const isLive = projectConfig.mode === "live";
+  if (agentMode) {
+    console.log(
+      JSON.stringify({
+        success: true,
+        apiKey,
+        mode: projectConfig.mode,
+        ...isLive ? {
+          warning: "This is a live API key. Rotate it before using in production if generated by an agent."
+        } : {}
+      })
+    );
+    return;
+  }
+  spinner?.succeed("API key created");
+  console.log("");
+  console.log(`  ${import_chalk2.default.bold(apiKey)}`);
+  console.log("");
+  console.log(import_chalk2.default.yellow("  \u26A0 This key is shown only once \u2014 copy it now."));
+  if (isLive) {
+    console.log(
+      import_chalk2.default.yellow(
+        "  \u26A0 This is a live key. Rotate it from the dashboard before production use."
+      )
+    );
+  }
+  console.log(
+    import_chalk2.default.dim("\n  Use in CI: COMMET_API_KEY=<key> commet push --yes")
+  );
+});
+
+// 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_chalk5 = __toESM(require("chalk"));
+var import_commander2 = require("commander");
+var import_ora3 = __toESM(require("ora"));
+var import_tar = require("tar");
+
 // src/utils/login-flow.ts
-var import_chalk2 = __toESM(require("chalk"));
+var import_chalk4 = __toESM(require("chalk"));
 var import_open = __toESM(require("open"));
-var import_ora = __toESM(require("ora"));
+var import_ora2 = __toESM(require("ora"));
 
 // src/utils/prompt-theme.ts
-var import_chalk = __toESM(require("chalk"));
-var commetColor = import_chalk.default.hex("#e8a07c");
+var import_chalk3 = __toESM(require("chalk"));
+var commetColor = import_chalk3.default.hex("#e8a07c");
 var promptTheme = {
   prefix: commetColor("\u276F"),
   style: {
     answer: commetColor,
-    message: import_chalk.default.bold,
-    error: import_chalk.default.red,
-    help: import_chalk.default.dim,
+    message: import_chalk3.default.bold,
+    error: import_chalk3.default.red,
+    help: import_chalk3.default.dim,
     highlight: commetColor.bold,
-    description: import_chalk.default.dim,
-    defaultAnswer: import_chalk.default.dim
+    description: import_chalk3.default.dim,
+    defaultAnswer: import_chalk3.default.dim
   }
 };
 
@@ -222,7 +514,7 @@ function sleep(ms) {
   return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function performLogin() {
-  const spinner = (0, import_ora.default)("Initiating login flow...").start();
+  const spinner = (0, import_ora2.default)("Initiating login flow...").start();
   try {
     const deviceResponse = await fetch(`${BASE_URL}/api/auth/device/code`, {
       method: "POST",
@@ -244,18 +536,18 @@ async function performLogin() {
       interval = 5
     } = deviceData;
     spinner.stop();
-    console.log(import_chalk2.default.bold("\n\u{1F510} Commet CLI Login\n"));
+    console.log(import_chalk4.default.bold("\n\u{1F510} Commet CLI Login\n"));
     console.log("Visit the following URL in your browser:");
     console.log(commetColor.underline(verification_uri_complete));
     console.log("\nOr enter this code manually:");
-    console.log(import_chalk2.default.bold.green(`  ${user_code}`));
-    console.log(import_chalk2.default.dim("\nOpening browser...\n"));
+    console.log(import_chalk4.default.bold.green(`  ${user_code}`));
+    console.log(import_chalk4.default.dim("\nOpening browser...\n"));
     try {
       await (0, import_open.default)(verification_uri_complete);
     } catch {
-      console.log(import_chalk2.default.yellow("\u26A0 Could not open browser automatically."));
+      console.log(import_chalk4.default.yellow("\u26A0 Could not open browser automatically."));
     }
-    const pollSpinner = (0, import_ora.default)("Waiting for authorization...").start();
+    const pollSpinner = (0, import_ora2.default)("Waiting for authorization...").start();
     let pollingInterval = interval;
     let attempts = 0;
     const maxAttempts = Math.floor(180 / pollingInterval);
@@ -501,22 +793,22 @@ async function installSkills(projectRoot) {
     );
     child.on("close", (code) => {
       if (code !== 0) {
-        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"));
+        console.log(import_chalk5.default.dim("  You can install them manually by running:"));
+        console.log(import_chalk5.default.dim("  npx skills add commet-labs/commet-skills"));
       }
       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) => {
   if (opts.list) {
-    console.log(import_chalk3.default.bold("\nAvailable templates:\n"));
+    console.log(import_chalk5.default.bold("\nAvailable templates:\n"));
     for (const t of TEMPLATES) {
       console.log(
-        `  ${commetColor(t.name.padEnd(14))}${import_chalk3.default.dim(t.description)}`
+        `  ${commetColor(t.name.padEnd(14))}${import_chalk5.default.dim(t.description)}`
       );
     }
     console.log();
@@ -525,9 +817,9 @@ var createCommand = new import_commander.Command("create").description("Create a
   let projectName = argName;
   if (!projectName) {
     if (!isInteractive()) {
-      console.log(import_chalk3.default.red("\u2717 Project name is required"));
+      console.log(import_chalk5.default.red("\u2717 Project name is required"));
       console.log(
-        import_chalk3.default.dim("Pass as positional argument: commet create <name>")
+        import_chalk5.default.dim("Pass as positional argument: commet create <name>")
       );
       return;
     }
@@ -537,21 +829,21 @@ var createCommand = new import_commander.Command("create").description("Create a
         theme: promptTheme
       });
     } catch {
-      console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
+      console.log(import_chalk5.default.yellow("\n\u26A0 Cancelled"));
       return;
     }
   }
   const dest = path2.resolve(projectName);
   if (fs2.existsSync(dest)) {
     console.log(
-      import_chalk3.default.red(`\u2717 Directory "${projectName}" already exists`)
+      import_chalk5.default.red(`\u2717 Directory "${projectName}" already exists`)
     );
     return;
   }
   if (!authExists()) {
     if (!isInteractive()) {
-      console.log(import_chalk3.default.red("\u2717 Not authenticated"));
-      console.log(import_chalk3.default.dim("Run `commet login` first"));
+      console.log(import_chalk5.default.red("\u2717 Not authenticated"));
+      console.log(import_chalk5.default.dim("Run `commet login` first"));
       return;
     }
     const loggedIn = await performLogin();
@@ -559,11 +851,11 @@ var createCommand = new import_commander.Command("create").description("Create a
       return;
     }
   }
-  const orgsSpinner = (0, import_ora2.default)("Fetching sandbox organizations...").start();
+  const orgsSpinner = (0, import_ora3.default)("Fetching sandbox organizations...").start();
   const orgsResult = await apiRequest(`${BASE_URL}/api/cli/organizations`);
   if (orgsResult.error || !orgsResult.data) {
     orgsSpinner.fail("Failed to fetch organizations");
-    console.log(import_chalk3.default.dim(orgsResult.error));
+    console.log(import_chalk5.default.dim(orgsResult.error));
     return;
   }
   const organizations = orgsResult.data.organizations.filter(
@@ -571,9 +863,9 @@ var createCommand = new import_commander.Command("create").description("Create a
   );
   orgsSpinner.stop();
   if (organizations.length === 0) {
-    console.log(import_chalk3.default.yellow("\u26A0 No sandbox organizations found"));
+    console.log(import_chalk5.default.yellow("\u26A0 No sandbox organizations found"));
     console.log(
-      import_chalk3.default.dim("Create an organization at https://commet.co first")
+      import_chalk5.default.dim("Create an organization at https://commet.co first")
     );
     return;
   }
@@ -583,9 +875,9 @@ var createCommand = new import_commander.Command("create").description("Create a
       (org) => org.slug === opts.org || org.id === opts.org
     );
     if (!match) {
-      console.log(import_chalk3.default.red(`\u2717 Organization "${opts.org}" not found`));
+      console.log(import_chalk5.default.red(`\u2717 Organization "${opts.org}" not found`));
       console.log(
-        import_chalk3.default.dim(
+        import_chalk5.default.dim(
           `Available: ${organizations.map((o) => o.slug).join(", ")}`
         )
       );
@@ -596,9 +888,9 @@ var createCommand = new import_commander.Command("create").description("Create a
     selectedOrg = organizations[0];
   } else {
     if (!isInteractive()) {
-      console.log(import_chalk3.default.red("\u2717 Organization is required"));
+      console.log(import_chalk5.default.red("\u2717 Organization is required"));
       console.log(
-        import_chalk3.default.dim(
+        import_chalk5.default.dim(
           `Pass --org=<slug>. Available: ${organizations.map((o) => o.slug).join(", ")}`
         )
       );
@@ -608,30 +900,30 @@ var createCommand = new import_commander.Command("create").description("Create a
       const orgId = await (0, import_prompts.select)({
         message: "Sandbox organization:",
         choices: organizations.map((org) => ({
-          name: `${org.name} ${import_chalk3.default.dim(`(${org.slug})`)}`,
+          name: `${org.name} ${import_chalk5.default.dim(`(${org.slug})`)}`,
           value: org.id
         })),
         theme: promptTheme
       });
       selectedOrg = organizations.find((org) => org.id === orgId);
     } catch {
-      console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
+      console.log(import_chalk5.default.yellow("\n\u26A0 Cancelled"));
       return;
     }
   }
   let template = TEMPLATES.find((t) => t.name === opts.template);
   if (opts.template && !template) {
-    console.log(import_chalk3.default.red(`\u2717 Unknown template "${opts.template}"`));
+    console.log(import_chalk5.default.red(`\u2717 Unknown template "${opts.template}"`));
     console.log(
-      import_chalk3.default.dim("Run `commet create --list` to see available templates")
+      import_chalk5.default.dim("Run `commet create --list` to see available templates")
     );
     return;
   }
   if (!template) {
     if (!isInteractive()) {
-      console.log(import_chalk3.default.red("\u2717 Template is required"));
+      console.log(import_chalk5.default.red("\u2717 Template is required"));
       console.log(
-        import_chalk3.default.dim(
+        import_chalk5.default.dim(
           `Pass --template=<name>. Available: ${TEMPLATES.map((t) => t.name).join(", ")}`
         )
       );
@@ -641,26 +933,26 @@ var createCommand = new import_commander.Command("create").description("Create a
       const selected = await (0, import_prompts.select)({
         message: "Billing model:",
         choices: TEMPLATES.map((t) => ({
-          name: `${t.name.padEnd(14)} ${import_chalk3.default.dim(t.description)}`,
+          name: `${t.name.padEnd(14)} ${import_chalk5.default.dim(t.description)}`,
           value: t.name
         })),
         theme: promptTheme
       });
       template = TEMPLATES.find((t) => t.name === selected);
     } catch {
-      console.log(import_chalk3.default.yellow("\n\u26A0 Cancelled"));
+      console.log(import_chalk5.default.yellow("\n\u26A0 Cancelled"));
       return;
     }
   }
   const shouldInstallSkills = await resolveSkills(opts);
-  const downloadSpinner = (0, import_ora2.default)("Downloading template...").start();
+  const downloadSpinner = (0, import_ora3.default)("Downloading template...").start();
   try {
     await downloadTemplate(template.dir, dest, opts.ref);
     downloadSpinner.succeed("Template downloaded");
   } catch (error) {
     downloadSpinner.fail("Failed to download template");
     if (error instanceof Error) {
-      console.error(import_chalk3.default.red(error.message));
+      console.error(import_chalk5.default.red(error.message));
     }
     if (fs2.existsSync(dest)) {
       fs2.rmSync(dest, { recursive: true, force: true });
@@ -669,7 +961,7 @@ var createCommand = new import_commander.Command("create").description("Create a
   }
   updatePackageJson(dest, projectName);
   copyEnvExample(dest);
-  const resolveSpinner = (0, import_ora2.default)("Resolving package versions...").start();
+  const resolveSpinner = (0, import_ora3.default)("Resolving package versions...").start();
   try {
     const count = await resolveWorkspaceDeps(dest);
     if (count > 0) {
@@ -680,14 +972,14 @@ var createCommand = new import_commander.Command("create").description("Create a
   } catch (error) {
     resolveSpinner.fail("Failed to resolve package versions");
     if (error instanceof Error) {
-      console.error(import_chalk3.default.red(error.message));
+      console.error(import_chalk5.default.red(error.message));
     }
     if (fs2.existsSync(dest)) {
       fs2.rmSync(dest, { recursive: true, force: true });
     }
     return;
   }
-  const planSpinner = (0, import_ora2.default)("Creating plans...").start();
+  const planSpinner = (0, import_ora3.default)("Creating plans...").start();
   const templateResult = await apiRequest(`${BASE_URL}/api/cli/templates`, {
     method: "POST",
     body: JSON.stringify({
@@ -697,13 +989,13 @@ var createCommand = new import_commander.Command("create").description("Create a
   });
   if (templateResult.error || !templateResult.data) {
     planSpinner.fail("Failed to create plans");
-    console.log(import_chalk3.default.dim(templateResult.error));
+    console.log(import_chalk5.default.dim(templateResult.error));
   } else {
     planSpinner.succeed(
       `Created ${templateResult.data.plansCreated} plans and ${templateResult.data.featuresCreated} features`
     );
   }
-  const keySpinner = (0, import_ora2.default)("Creating API key...").start();
+  const keySpinner = (0, import_ora3.default)("Creating API key...").start();
   const keyResult = await apiRequest(`${BASE_URL}/api/cli/api-keys`, {
     method: "POST",
     body: JSON.stringify({
@@ -713,8 +1005,8 @@ var createCommand = new import_commander.Command("create").description("Create a
   });
   if (keyResult.error || !keyResult.data) {
     keySpinner.fail("Failed to create API key");
-    console.log(import_chalk3.default.dim(keyResult.error));
-    console.log(import_chalk3.default.dim("You can create one manually in the dashboard"));
+    console.log(import_chalk5.default.dim(keyResult.error));
+    console.log(import_chalk5.default.dim("You can create one manually in the dashboard"));
   } else {
     writeApiKeyToEnv(dest, keyResult.data.apiKey);
     keySpinner.succeed("API key created and saved to .env");
@@ -723,10 +1015,10 @@ var createCommand = new import_commander.Command("create").description("Create a
   if (shouldInstallSkills) {
     await installSkills(dest);
   }
-  console.log(import_chalk3.default.green(`
+  console.log(import_chalk5.default.green(`
 \u2713 Created ${projectName}`));
-  console.log(import_chalk3.default.dim(`  Template: ${template.name}`));
-  console.log(import_chalk3.default.dim(`  Organization: ${selectedOrg.name} \xB7 sandbox`));
+  console.log(import_chalk5.default.dim(`  Template: ${template.name}`));
+  console.log(import_chalk5.default.dim(`  Organization: ${selectedOrg.name} \xB7 sandbox`));
   console.log();
   console.log(`  ${commetColor("cd")} ${projectName}`);
   console.log(`  ${commetColor("npm install")}`);
@@ -734,43 +1026,11 @@ 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_chalk6 = __toESM(require("chalk"));
 var import_commander3 = require("commander");
-var import_ora3 = __toESM(require("ora"));
+var import_ora4 = __toESM(require("ora"));
 
 // src/utils/gitignore-updater.ts
 var fs3 = __toESM(require("fs"));
@@ -806,192 +1066,199 @@ function updateGitignore(entry) {
 }
 
 // src/commands/link.ts
-var linkCommand = new import_commander3.Command("link").description("Link this project to a Commet organization").action(async () => {
-  if (!authExists()) {
-    console.log(import_chalk5.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk5.default.dim("Run `commet login` first"));
+var linkCommand = new import_commander3.Command("link").description(
+  "Link this project to a Commet organization. Re-run to switch orgs."
+).option(
+  "--org <slug-or-id>",
+  "Organization slug or ID \u2014 skips interactive selection"
+).option("--clear", "Unlink project from its organization").option(
+  "--output <format>",
+  "Output format: human (default) or agent",
+  "human"
+).addHelpText(
+  "after",
+  `
+Examples:
+  $ commet link                  Interactive \u2014 choose from a list
+  $ commet link --org acme       Non-interactive \u2014 match by slug or ID
+  $ commet link --org other      Re-run to switch organization
+  $ commet link --clear          Unlink project
+`
+).action(async (options) => {
+  const agentMode = isAgentMode(options);
+  if (options.clear) {
+    if (!projectConfigExists()) {
+      if (agentMode) {
+        console.log(JSON.stringify({ success: true, message: "Not linked" }));
+      } else {
+        console.log(
+          import_chalk6.default.yellow("\u26A0 This project is not linked to any organization")
+        );
+      }
+      return;
+    }
+    clearProjectConfig();
+    if (agentMode) {
+      console.log(JSON.stringify({ success: true, action: "unlinked" }));
+    } else {
+      console.log(import_chalk6.default.green("\u2713 Project unlinked"));
+    }
     return;
   }
-  if (projectConfigExists()) {
-    const config = loadProjectConfig();
-    console.log(import_chalk5.default.yellow("\u26A0 This project is already linked"));
-    console.log(
-      import_chalk5.default.dim(`Organization: ${config?.orgName} \xB7 ${config?.mode}`)
-    );
-    console.log(
-      import_chalk5.default.dim(
-        "\nRun `commet unlink` first if you want to change the organization"
-      )
-    );
-    return;
+  if (!authExists()) {
+    exitWithError({
+      code: "auth_required",
+      message: "Not authenticated",
+      action: "commet login"
+    });
   }
-  const spinner = (0, import_ora3.default)("Fetching organizations...").start();
+  const currentConfig = projectConfigExists() ? loadProjectConfig() : null;
+  const spinner = agentMode ? null : (0, import_ora4.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_chalk5.default.red("Error:"), result.error);
-    return;
+    if (agentMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail("Failed to fetch organizations");
+      console.error(import_chalk6.default.red("Error:"), result.error?.message);
+    }
+    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_chalk5.default.dim("Create an organization at https://commet.co first")
-    );
+    spinner?.stop();
+    if (agentMode) {
+      console.log(
+        JSON.stringify({
+          error: {
+            code: "no_organizations",
+            message: "No organizations found"
+          }
+        })
+      );
+    } else {
+      console.log(import_chalk6.default.yellow("\u26A0 No organizations found"));
+      console.log(
+        import_chalk6.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;
+  spinner?.stop();
+  let selectedOrg;
+  if (options.org) {
+    selectedOrg = organizations.find(
+      (org) => org.slug === options.org || org.id === options.org
+    );
+    if (!selectedOrg) {
+      if (agentMode) {
+        console.log(
+          JSON.stringify({
+            error: {
+              code: "org_not_found",
+              message: `Organization "${options.org}" not found`
+            },
+            organizations: organizations.map((o) => ({
+              slug: o.slug,
+              mode: o.mode
+            }))
+          })
+        );
+      } else {
+        console.log(import_chalk6.default.red(`\u2717 Organization "${options.org}" not found`));
+        console.log(import_chalk6.default.dim("\nAvailable organizations:"));
+        for (const org of organizations) {
+          console.log(import_chalk6.default.dim(`  ${org.slug} (${org.mode})`));
+        }
+      }
+      process.exit(1);
+    }
+  } else {
+    let orgId;
+    try {
+      orgId = await (0, import_prompts2.select)({
+        message: currentConfig ? `Switch from ${currentConfig.orgName}? Select new org:` : "Select organization:",
+        choices: organizations.map((org) => {
+          const isCurrent = currentConfig?.orgId === org.id;
+          const label = isCurrent ? `${org.name} ${import_chalk6.default.dim(`(${org.slug}) \xB7 ${org.mode}`)} ${import_chalk6.default.green("\u2190 current")}` : `${org.name} ${import_chalk6.default.dim(`(${org.slug}) \xB7 ${org.mode}`)}`;
+          return { name: label, value: org.id };
+        }),
+        theme: promptTheme
+      });
+    } catch (_error) {
+      console.log(import_chalk6.default.yellow("\n\u26A0 Cancelled"));
+      return;
+    }
+    selectedOrg = organizations.find((org) => org.id === orgId);
+    if (!selectedOrg) {
+      exitWithError({
+        code: "org_not_found",
+        message: "Organization not found"
+      });
+    }
   }
-  const selectedOrg = organizations.find((org) => org.id === orgId);
-  if (!selectedOrg) {
-    console.log(import_chalk5.default.red("\u2717 Organization not found"));
+  if (currentConfig?.orgId === selectedOrg.id) {
+    if (agentMode) {
+      console.log(
+        JSON.stringify({
+          success: true,
+          action: "unchanged",
+          organization: {
+            id: selectedOrg.id,
+            name: selectedOrg.name,
+            slug: selectedOrg.slug,
+            mode: selectedOrg.mode
+          }
+        })
+      );
+    } else {
+      console.log(
+        import_chalk6.default.green(
+          `\u2713 Already linked to ${selectedOrg.name} (${selectedOrg.mode})`
+        )
+      );
+    }
     return;
   }
+  const action = currentConfig ? "switched" : "linked";
   saveProjectConfig({
     orgId: selectedOrg.id,
     orgName: selectedOrg.name,
     mode: selectedOrg.mode
   });
   const gitignoreResult = updateGitignore(".commet/");
-  console.log(import_chalk5.default.green("\n\u2713 Project linked successfully"));
-  console.log(
-    import_chalk5.default.dim(`Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
-  );
-  if (gitignoreResult.success) {
-    console.log(import_chalk5.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_chalk5.default.dim("\nRun 'commet pull' to generate TypeScript types"));
-});
-
-// src/commands/list.ts
-var import_chalk6 = __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) => {
-  if (!validTypes.includes(type)) {
+  if (agentMode) {
     console.log(
-      import_chalk6.default.red('\u2717 Invalid type. Use "features", "seats", or "plans"')
+      JSON.stringify({
+        success: true,
+        action,
+        organization: {
+          id: selectedOrg.id,
+          name: selectedOrg.name,
+          slug: selectedOrg.slug,
+          mode: selectedOrg.mode
+        }
+      })
     );
-    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 (!authExists()) {
-    console.log(import_chalk6.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk6.default.dim("Run `commet login` first"));
-    return;
-  }
-  if (!projectConfigExists()) {
-    console.log(import_chalk6.default.red("\u2717 Project not linked"));
+  } else {
+    const verb = action === "switched" ? "Switched to" : "Linked to";
     console.log(
-      import_chalk6.default.dim("Run `commet link` first to connect to an organization")
+      import_chalk6.default.green(`
+\u2713 ${verb} ${selectedOrg.name} (${selectedOrg.mode})`)
     );
-    return;
-  }
-  const projectConfig = loadProjectConfig();
-  if (!projectConfig) {
-    console.log(import_chalk6.default.red("\u2717 Invalid project configuration"));
-    return;
-  }
-  const spinner = (0, import_ora4.default)(`Fetching ${type}...`).start();
-  const result = await apiRequest(
-    `${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;
-  }
-  spinner.stop();
-  if (type === "features") {
-    const { features } = result.data;
-    if (features.length === 0) {
-      console.log(import_chalk6.default.yellow("\u26A0 No features found"));
-      console.log(
-        import_chalk6.default.dim("Create features in your Commet dashboard first")
-      );
-      return;
-    }
-    console.log(import_chalk6.default.bold(`
-\u{1F4CA} 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}`));
-      if (feature.description) {
-        console.log(import_chalk6.default.dim(`  ${feature.description}`));
-      }
-      console.log("");
-    }
-  } else if (type === "seats") {
-    const { seatTypes } = result.data;
-    if (seatTypes.length === 0) {
-      console.log(import_chalk6.default.yellow("\u26A0 No seat types found"));
-      console.log(
-        import_chalk6.default.dim("Create seat types in your Commet dashboard first")
-      );
-      return;
-    }
-    console.log(import_chalk6.default.bold(`
-\u{1F4BA} Seat Types (${seatTypes.length})
-`));
-    for (const seatType of seatTypes) {
-      console.log(
-        import_chalk6.default.green(`\u2022 ${seatType.code}${seatType.isFree ? " (Free)" : ""}`)
-      );
-      console.log(import_chalk6.default.dim(`  ${seatType.name}`));
-      if (seatType.description) {
-        console.log(import_chalk6.default.dim(`  ${seatType.description}`));
-      }
-      console.log("");
-    }
-  } else {
-    const { plans } = result.data;
-    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"));
-      return;
-    }
-    console.log(import_chalk6.default.bold(`
-\u{1F4CB} 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}`));
-      if (plan.description) {
-        console.log(import_chalk6.default.dim(`  ${plan.description}`));
-      }
-      console.log("");
+    if (gitignoreResult.success && action === "linked") {
+      console.log(import_chalk6.default.green("\u2713 Updated .gitignore"));
     }
+    console.log(import_chalk6.default.dim("\nRun `commet pull` to sync your config"));
   }
 });
 
 // src/commands/listen.ts
 var import_ably = __toESM(require("ably"));
 var import_chalk7 = __toESM(require("chalk"));
-var import_commander5 = require("commander");
+var import_commander4 = 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));
@@ -1027,64 +1294,52 @@ 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_commander4.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) => {
-  const auth = loadAuth();
-  if (!auth) {
-    console.log(import_chalk7.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"));
-    process.exit(1);
-  }
+  "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 { orgId } = requireOrgContext();
   let targetUrl;
   try {
     targetUrl = resolveTargetUrl(url);
   } catch (error) {
-    console.log(
-      import_chalk7.default.red(error instanceof Error ? error.message : "Invalid URL")
-    );
-    process.exit(1);
+    exitWithError({
+      code: "invalid_url",
+      message: error instanceof Error ? error.message : "Invalid URL"
+    });
   }
-  async function fetchTokenRequest() {
-    const result = await apiRequest(
-      `${BASE_URL}/api/cli/listen/start`,
-      {
-        method: "POST",
-        body: JSON.stringify({ organizationId: projectConfig.orgId })
-      }
-    );
-    if (result.error || !result.data) {
-      console.log(import_chalk7.default.red("Failed to start listen session"));
-      if (result.error) {
-        console.log(import_chalk7.default.dim(result.error));
-      }
-      process.exit(1);
-    }
-    return result.data;
-  }
-  const initialSession = await fetchTokenRequest();
-  const { sessionId, channelName, signingSecret, tokenRequest } = initialSession;
-  async function refreshToken() {
-    const result = await apiRequest(
-      `${BASE_URL}/api/cli/listen/refresh`,
-      {
-        method: "POST",
-        body: JSON.stringify({
-          sessionId,
-          organizationId: projectConfig.orgId
-        })
-      }
-    );
-    if (result.error || !result.data) {
-      throw new Error(result.error ?? "Failed to refresh token");
+  const projectConfig = loadProjectConfig();
+  const organizationId = orgId === "__from_api_key__" ? void 0 : orgId;
+  const orgName = projectConfig?.orgName ?? "API key";
+  const startResult = await apiRequest(
+    `${BASE_URL}/api/cli/listen/start`,
+    {
+      method: "POST",
+      body: JSON.stringify({
+        ...organizationId ? { organizationId } : {}
+      })
     }
-    return result.data.tokenRequest;
+  );
+  if (startResult.error || !startResult.data) {
+    exitWithError({
+      code: "listen_failed",
+      message: "Failed to start listen session"
+    });
   }
+  const { sessionId, channelName, signingSecret, tokenRequest } = startResult.data;
   let isFirstToken = true;
   const ably = new import_ably.default.Realtime({
     authCallback: async (_tokenParams, callback) => {
@@ -1094,8 +1349,20 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
           callback(null, tokenRequest);
           return;
         }
-        const refreshed = await refreshToken();
-        callback(null, refreshed);
+        const refreshResult = await apiRequest(
+          `${BASE_URL}/api/cli/listen/refresh`,
+          {
+            method: "POST",
+            body: JSON.stringify({
+              sessionId,
+              ...organizationId ? { organizationId } : {}
+            })
+          }
+        );
+        if (refreshResult.error || !refreshResult.data) {
+          throw new Error("Failed to refresh token");
+        }
+        callback(null, refreshResult.data.tokenRequest);
       } catch (error) {
         callback(
           error instanceof Error ? error.message : "Token refresh failed",
@@ -1122,9 +1389,7 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
   });
   const channel = ably.channels.get(channelName);
   console.log("");
-  console.log(
-    import_chalk7.default.green(`  \u2713 Authenticated (org: ${projectConfig.orgName})`)
-  );
+  console.log(import_chalk7.default.green(`  \u2713 Authenticated (org: ${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}`));
@@ -1144,7 +1409,11 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
       body: JSON.stringify(payload)
     }).then((response) => {
       const ms = Math.round(performance.now() - start);
-      printEventLine({ event, statusCode: response.status, ms });
+      printEventLine({
+        event,
+        statusCode: response.status,
+        ms
+      });
     }).catch((error) => {
       const ms = Math.round(performance.now() - start);
       printEventLine({
@@ -1164,7 +1433,7 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
       method: "POST",
       body: JSON.stringify({
         sessionId,
-        organizationId: projectConfig.orgId
+        ...organizationId ? { organizationId } : {}
       })
     });
     process.exit(0);
@@ -1173,8 +1442,23 @@ var listenCommand = new import_commander5.Command("listen").description("Forward
 
 // src/commands/login.ts
 var import_chalk8 = __toESM(require("chalk"));
-var import_commander6 = require("commander");
-var loginCommand = new import_commander6.Command("login").description("Authenticate with Commet").action(async () => {
+var import_commander5 = require("commander");
+var loginCommand = new import_commander5.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 (process.env.COMMET_API_KEY) {
+    if (isAgentMode()) {
+      console.log(
+        JSON.stringify({
+          success: true,
+          message: "Using COMMET_API_KEY \u2014 login not needed"
+        })
+      );
+    } else {
+      console.log(import_chalk8.default.green("\u2713 Using COMMET_API_KEY \u2014 login not needed"));
+    }
+    return;
+  }
   if (authExists()) {
     console.log(import_chalk8.default.yellow("\u26A0 You are already logged in."));
     console.log(
@@ -1197,8 +1481,25 @@ var loginCommand = new import_commander6.Command("login").description("Authentic
 
 // src/commands/logout.ts
 var import_chalk9 = __toESM(require("chalk"));
-var import_commander7 = require("commander");
-var logoutCommand = new import_commander7.Command("logout").description("Log out of Commet").action(async () => {
+var import_commander6 = require("commander");
+var logoutCommand = new import_commander6.Command("logout").description(
+  "Log out and remove stored credentials from ~/.commet/auth.json."
+).action(async () => {
+  if (process.env.COMMET_API_KEY) {
+    if (isAgentMode()) {
+      console.log(
+        JSON.stringify({
+          success: true,
+          message: "Using COMMET_API_KEY \u2014 no session to clear"
+        })
+      );
+    } else {
+      console.log(
+        import_chalk9.default.green("\u2713 Using COMMET_API_KEY \u2014 no session to clear")
+      );
+    }
+    return;
+  }
   if (!authExists()) {
     console.log(import_chalk9.default.yellow("\u26A0 You are not logged in."));
     return;
@@ -1207,13 +1508,76 @@ var logoutCommand = new import_commander7.Command("logout").description("Log out
   console.log(import_chalk9.default.green("\u2713 Successfully logged out"));
 });
 
+// src/commands/orgs.ts
+var import_chalk10 = __toESM(require("chalk"));
+var import_commander7 = require("commander");
+var import_ora5 = __toESM(require("ora"));
+var orgsCommand = new import_commander7.Command("orgs").description(
+  "List all organizations you have access to. Shows name, slug, mode (live/sandbox), and which one is currently linked."
+).option(
+  "--output <format>",
+  "Output format: human (default) or agent",
+  "human"
+).addHelpText(
+  "after",
+  `
+Examples:
+  $ commet orgs                  Show orgs with current selection marked
+  $ commet orgs --json           JSON array for agent/CI use
+
+The slug shown here is what you pass to 'commet link --org <slug>'.
+`
+).action(async (options) => {
+  const agentMode = isAgentMode(options);
+  requireAuth();
+  const spinner = agentMode ? null : (0, import_ora5.default)("Fetching organizations...").start();
+  const result = await apiRequest(
+    `${BASE_URL}/api/cli/organizations`
+  );
+  if (result.error || !result.data) {
+    if (agentMode) {
+      console.log(JSON.stringify({ error: result.error }));
+    } else {
+      spinner?.fail("Failed to fetch organizations");
+      console.error(import_chalk10.default.red("Error:"), result.error?.message);
+    }
+    process.exit(1);
+  }
+  spinner?.stop();
+  const { organizations } = result.data;
+  if (agentMode) {
+    console.log(JSON.stringify(organizations));
+    return;
+  }
+  if (organizations.length === 0) {
+    console.log(import_chalk10.default.yellow("\u26A0 No organizations found"));
+    console.log(
+      import_chalk10.default.dim("Create an organization at https://commet.co first")
+    );
+    return;
+  }
+  const currentProject = loadProjectConfig();
+  console.log(import_chalk10.default.bold(`
+  Organizations (${organizations.length})
+`));
+  for (const org of organizations) {
+    const isCurrent = currentProject?.orgId === org.id;
+    const marker = isCurrent ? import_chalk10.default.green("\u25CF") : import_chalk10.default.dim("\u25CB");
+    const mode = org.mode === "live" ? import_chalk10.default.green(org.mode) : import_chalk10.default.yellow(org.mode);
+    console.log(
+      `  ${marker} ${org.name} ${import_chalk10.default.dim(`(${org.slug})`)} ${mode}`
+    );
+  }
+  console.log("");
+});
+
 // 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_chalk12 = __toESM(require("chalk"));
 var import_commander8 = require("commander");
-var import_ora5 = __toESM(require("ora"));
+var import_ora6 = __toESM(require("ora"));
 
 // src/utils/config-loader.ts
 var fs4 = __toESM(require("fs"));
@@ -1326,7 +1690,7 @@ function validateConfig(config, configPath) {
 }
 
 // src/utils/diff.ts
-var import_chalk10 = __toESM(require("chalk"));
+var import_chalk11 = __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]));
@@ -1413,42 +1777,42 @@ function computeDiff(config, remote) {
 }
 function formatDiff(diff) {
   const lines = [];
-  lines.push(import_chalk10.default.bold("\nFeatures:"));
+  lines.push(import_chalk11.default.bold("\nFeatures:"));
   for (const change of diff.features.changes) {
     if (change.action === "create") {
-      lines.push(import_chalk10.default.green(`  + ${change.code}`));
+      lines.push(import_chalk11.default.green(`  + ${change.code}`));
     } else if (change.action === "update") {
-      lines.push(import_chalk10.default.yellow(`  ~ ${change.code}`));
+      lines.push(import_chalk11.default.yellow(`  ~ ${change.code}`));
       for (const c of change.changes ?? []) {
-        lines.push(import_chalk10.default.dim(`      ${c}`));
+        lines.push(import_chalk11.default.dim(`      ${c}`));
       }
     } else {
-      lines.push(import_chalk10.default.dim(`    ${change.code}`));
+      lines.push(import_chalk11.default.dim(`    ${change.code}`));
     }
   }
   if (diff.features.unmanaged.length > 0) {
     lines.push(
-      import_chalk10.default.dim(
+      import_chalk11.default.dim(
         `  ? unmanaged: ${diff.features.unmanaged.join(", ")} (not in config, left as-is)`
       )
     );
   }
-  lines.push(import_chalk10.default.bold("\nPlans:"));
+  lines.push(import_chalk11.default.bold("\nPlans:"));
   for (const change of diff.plans.changes) {
     if (change.action === "create") {
-      lines.push(import_chalk10.default.green(`  + ${change.code}`));
+      lines.push(import_chalk11.default.green(`  + ${change.code}`));
     } else if (change.action === "update") {
-      lines.push(import_chalk10.default.yellow(`  ~ ${change.code}`));
+      lines.push(import_chalk11.default.yellow(`  ~ ${change.code}`));
       for (const c of change.changes ?? []) {
-        lines.push(import_chalk10.default.dim(`      ${c}`));
+        lines.push(import_chalk11.default.dim(`      ${c}`));
       }
     } else {
-      lines.push(import_chalk10.default.dim(`    ${change.code}`));
+      lines.push(import_chalk11.default.dim(`    ${change.code}`));
     }
   }
   if (diff.plans.unmanaged.length > 0) {
     lines.push(
-      import_chalk10.default.dim(
+      import_chalk11.default.dim(
         `  ? unmanaged: ${diff.plans.unmanaged.join(", ")} (not in config, left as-is)`
       )
     );
@@ -1532,47 +1896,36 @@ function generateConfigFile(features, plans) {
 }
 
 // src/commands/pull.ts
-var pullCommand = new import_commander8.Command("pull").description("Pull config from Commet and generate commet.config.ts").option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show diff without applying changes").option("--json", "Output structured JSON (no colors, no prompts)").action(async (options) => {
-  const jsonMode = options.json;
-  if (!authExists()) {
-    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);
-  }
-  if (!projectConfigExists()) {
-    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) {
-    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 = jsonMode ? null : (0, import_ora5.default)("Fetching config from remote...").start();
+var pullCommand = new import_commander8.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(
+  "--output <format>",
+  "Output format: human (default) or agent",
+  "human"
+).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 --output agent --yes   Agent/CI \u2014 structured JSON, no prompts
+  $ COMMET_API_KEY=sk_... commet pull --yes   CI pipeline
+`
+).action(async (options) => {
+  const agentMode = isAgentMode(options);
+  const { orgId } = requireOrgContext();
+  const spinner = agentMode ? null : (0, import_ora6.default)("Fetching config from remote...").start();
+  const orgQuery = orgId === "__from_api_key__" ? "" : `?orgId=${orgId}`;
   const result = await apiRequest(
-    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/pull${orgQuery}`
   );
   if (result.error || !result.data) {
-    if (jsonMode) {
+    if (agentMode) {
       console.log(JSON.stringify({ error: result.error }));
     } else {
       spinner?.fail("Failed to fetch config");
-      console.error(import_chalk11.default.red("Error:"), result.error);
+      console.error(import_chalk12.default.red("Error:"), result.error?.message);
     }
     process.exit(1);
   }
@@ -1583,7 +1936,7 @@ var pullCommand = new import_commander8.Command("pull").description("Pull config
   const existingConfigPath = findConfigFile(process.cwd());
   if (!existingConfigPath) {
     if (options.dryRun) {
-      if (jsonMode) {
+      if (agentMode) {
         console.log(
           JSON.stringify({
             action: "create",
@@ -1594,7 +1947,7 @@ var pullCommand = new import_commander8.Command("pull").description("Pull config
         );
       } else {
         console.log(
-          import_chalk11.default.green(
+          import_chalk12.default.green(
             `
 Would create commet.config.ts (${features.length} features, ${plans.length} plans)`
           )
@@ -1603,7 +1956,7 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
       return;
     }
     fs5.writeFileSync(outputPath, configContent, "utf8");
-    if (jsonMode) {
+    if (agentMode) {
       console.log(
         JSON.stringify({
           action: "create",
@@ -1613,10 +1966,9 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
         })
       );
     } else {
-      console.log(import_chalk11.default.green(`
-\u2713 Created commet.config.ts`));
+      console.log(import_chalk12.default.green("\n\u2713 Created commet.config.ts"));
       console.log(
-        import_chalk11.default.dim(`  ${features.length} features, ${plans.length} plans`)
+        import_chalk12.default.dim(`  ${features.length} features, ${plans.length} plans`)
       );
     }
     return;
@@ -1628,7 +1980,7 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
   );
   if ("parseError" in localLoaded) {
     if (options.dryRun) {
-      if (jsonMode) {
+      if (agentMode) {
         console.log(
           JSON.stringify({
             action: "overwrite",
@@ -1638,7 +1990,7 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
         );
       } else {
         console.log(
-          import_chalk11.default.yellow(
+          import_chalk12.default.yellow(
             `
 \u26A0 Local config is invalid: ${localLoaded.parseError}`
           )
@@ -1646,23 +1998,23 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
       }
       return;
     }
-    if (!options.yes && !jsonMode) {
-      console.log(import_chalk11.default.yellow(`
+    if (!options.yes && !agentMode) {
+      console.log(import_chalk12.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"));
+        console.log(import_chalk12.default.dim("Pull cancelled"));
         return;
       }
     }
     fs5.writeFileSync(outputPath, configContent, "utf8");
-    if (jsonMode) {
+    if (agentMode) {
       console.log(JSON.stringify({ action: "overwrite", applied: true }));
     } else {
-      console.log(import_chalk11.default.green("\n\u2713 Overwritten commet.config.ts"));
+      console.log(import_chalk12.default.green("\n\u2713 Overwritten commet.config.ts"));
     }
     return;
   }
@@ -1685,9 +2037,7 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
         {
           name: p.name,
           ...p.description ? { description: p.description } : {},
-          ...p.consumptionModel ? {
-            consumptionModel: p.consumptionModel
-          } : {},
+          ...p.consumptionModel ? { consumptionModel: p.consumptionModel } : {},
           ...p.isFree ? { isFree: true } : {},
           ...p.isPublic === false ? { isPublic: false } : {},
           ...p.sortOrder ? { sortOrder: p.sortOrder } : {},
@@ -1733,14 +2083,14 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
   };
   const diff = computeDiff(remoteAsConfig, localAsRemote);
   if (!diff.hasChanges && diff.features.unmanaged.length === 0 && diff.plans.unmanaged.length === 0) {
-    if (jsonMode) {
+    if (agentMode) {
       console.log(JSON.stringify({ diff, applied: false, upToDate: true }));
     } else {
-      console.log(import_chalk11.default.green("\n\u2713 Already up to date"));
+      console.log(import_chalk12.default.green("\n\u2713 Already up to date"));
     }
     return;
   }
-  if (jsonMode) {
+  if (agentMode) {
     if (options.dryRun) {
       console.log(JSON.stringify({ diff, applied: false }));
       return;
@@ -1749,77 +2099,69 @@ Would create commet.config.ts (${features.length} features, ${plans.length} plan
     console.log(formatDiff(diff));
   }
   if (options.dryRun) {
-    if (!jsonMode) {
-      console.log(import_chalk11.default.dim("\n(dry run \u2014 no changes applied)"));
+    if (!agentMode) {
+      console.log(import_chalk12.default.dim("\n(dry run \u2014 no changes applied)"));
     }
     return;
   }
-  if (!options.yes && !jsonMode) {
+  if (!options.yes && !agentMode) {
     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"));
+      console.log(import_chalk12.default.dim("Pull cancelled"));
       return;
     }
   }
   fs5.writeFileSync(outputPath, configContent, "utf8");
-  if (jsonMode) {
+  if (agentMode) {
     console.log(JSON.stringify({ diff, applied: true }));
   } else {
-    console.log(import_chalk11.default.green("\n\u2713 Updated commet.config.ts"));
+    console.log(import_chalk12.default.green("\n\u2713 Updated commet.config.ts"));
     console.log(
-      import_chalk11.default.dim(`  ${features.length} features, ${plans.length} plans`)
+      import_chalk12.default.dim(`  ${features.length} features, ${plans.length} plans`)
     );
   }
 });
 
 // src/commands/push.ts
 var import_prompts4 = require("@inquirer/prompts");
-var import_chalk12 = __toESM(require("chalk"));
+var import_chalk13 = __toESM(require("chalk"));
 var import_commander9 = require("commander");
-var import_ora6 = __toESM(require("ora"));
-var pushCommand = new import_commander9.Command("push").description("Push commet.config.ts to your Commet organization").option("-y, --yes", "Skip confirmation prompt").option("--dry-run", "Show diff without applying changes").option("--json", "Output structured JSON (no colors, no prompts)").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);
-  }
-  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_ora6.default)("Loading commet.config.ts...").start();
+var import_ora7 = __toESM(require("ora"));
+var pushCommand = new import_commander9.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(
+  "--output <format>",
+  "Output format: human (default) or agent",
+  "human"
+).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 --output agent --yes   Agent/CI \u2014 structured JSON, no prompts
+  $ COMMET_API_KEY=sk_... commet push --yes   CI pipeline
+`
+).action(async (options) => {
+  const agentMode = isAgentMode(options);
+  const { orgId } = requireOrgContext();
+  const loadSpinner = agentMode ? 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 }));
+      if (agentMode) {
+        console.log(
+          JSON.stringify({
+            error: { code: "config_invalid", message }
+          })
+        );
       } else {
         loadSpinner?.fail("Failed to load config");
-        console.error(import_chalk12.default.red(message));
+        console.error(import_chalk13.default.red(message));
       }
       return null;
     }
@@ -1827,16 +2169,17 @@ var pushCommand = new import_commander9.Command("push").description("Push commet
   if (!loaded) process.exit(1);
   const { config, configPath } = loaded;
   loadSpinner?.succeed(`Loaded ${configPath}`);
-  const fetchSpinner = jsonMode ? null : (0, import_ora6.default)("Fetching remote state...").start();
+  const fetchSpinner = agentMode ? null : (0, import_ora7.default)("Fetching remote state...").start();
+  const orgQuery = orgId === "__from_api_key__" ? "" : `?orgId=${orgId}`;
   const remoteResult = await apiRequest(
-    `${BASE_URL}/api/cli/pull?orgId=${projectConfig.orgId}`
+    `${BASE_URL}/api/cli/pull${orgQuery}`
   );
   if (remoteResult.error || !remoteResult.data) {
-    if (jsonMode) {
+    if (agentMode) {
       console.log(JSON.stringify({ error: remoteResult.error }));
     } else {
       fetchSpinner?.fail("Failed to fetch remote state");
-      console.error(import_chalk12.default.red("Error:"), remoteResult.error);
+      console.error(import_chalk13.default.red("Error:"), remoteResult.error?.message);
     }
     process.exit(1);
   }
@@ -1846,7 +2189,7 @@ var pushCommand = new import_commander9.Command("push").description("Push commet
     plans: remoteResult.data.plans
   };
   const diff = computeDiff(config, remote);
-  if (jsonMode) {
+  if (agentMode) {
     if (options.dryRun) {
       console.log(JSON.stringify({ diff, applied: false }));
       return;
@@ -1855,10 +2198,10 @@ var pushCommand = new import_commander9.Command("push").description("Push commet
     console.log(formatDiff(diff));
   }
   if (!diff.hasChanges) {
-    if (jsonMode) {
+    if (agentMode) {
       console.log(JSON.stringify({ diff, applied: false, upToDate: true }));
     } else {
-      console.log(import_chalk12.default.green("\n\u2713 Everything is up to date"));
+      console.log(import_chalk13.default.green("\n\u2713 Everything is up to date"));
     }
     return;
   }
@@ -1867,67 +2210,67 @@ var pushCommand = new import_commander9.Command("push").description("Push commet
   );
   if (typeChanges.length > 0) {
     const blockedCodes = typeChanges.map((c) => c.code);
-    if (jsonMode) {
+    if (agentMode) {
       console.log(
         JSON.stringify({
-          error: "Feature type changes blocked",
+          error: {
+            code: "type_change_blocked",
+            message: "Feature type changes must be done in the dashboard"
+          },
           blockedCodes,
           diff
         })
       );
     } else {
       console.log(
-        import_chalk12.default.red(
+        import_chalk13.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}`));
+        console.log(import_chalk13.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)"));
+    if (!agentMode) {
+      console.log(import_chalk13.default.dim("\n(dry run \u2014 no changes applied)"));
     }
     return;
   }
-  if (!options.yes && !jsonMode) {
+  if (!options.yes && !agentMode) {
     const shouldProceed = await (0, import_prompts4.confirm)({
       message: "Apply these changes?",
       default: true
     });
     if (!shouldProceed) {
-      console.log(import_chalk12.default.dim("Push cancelled"));
+      console.log(import_chalk13.default.dim("Push cancelled"));
       return;
     }
   }
-  const pushSpinner = jsonMode ? null : (0, import_ora6.default)("Pushing config...").start();
+  const pushSpinner = agentMode ? null : (0, import_ora7.default)("Pushing config...").start();
+  const pushBody = {
+    config: { features: config.features, plans: config.plans }
+  };
+  if (orgId !== "__from_api_key__") {
+    pushBody.orgId = orgId;
+  }
   const pushResult = await apiRequest(
     `${BASE_URL}/api/cli/push`,
-    {
-      method: "POST",
-      body: JSON.stringify({
-        orgId: projectConfig.orgId,
-        config: {
-          features: config.features,
-          plans: config.plans
-        }
-      })
-    }
+    { method: "POST", body: JSON.stringify(pushBody) }
   );
   if (pushResult.error || !pushResult.data) {
-    if (jsonMode) {
+    if (agentMode) {
       console.log(JSON.stringify({ error: pushResult.error }));
     } else {
       pushSpinner?.fail("Push failed");
-      console.error(import_chalk12.default.red("Error:"), pushResult.error);
+      console.error(import_chalk13.default.red("Error:"), pushResult.error?.message);
     }
     process.exit(1);
   }
   const pushOutcome = pushResult.data;
-  if (jsonMode) {
+  if (agentMode) {
     console.log(JSON.stringify({ diff, applied: true, result: pushOutcome }));
     return;
   }
@@ -1938,170 +2281,88 @@ var pushCommand = new import_commander9.Command("push").description("Push commet
   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}`));
+      console.log(import_chalk13.default.red(`  \u2717 ${error.code}: ${error.message}`));
     }
   } else {
     pushSpinner?.succeed("Push complete");
   }
   if (pushOutcome.features.created.length > 0) {
     console.log(
-      import_chalk12.default.green(
+      import_chalk13.default.green(
         `  Created features: ${pushOutcome.features.created.join(", ")}`
       )
     );
   }
   if (pushOutcome.features.updated.length > 0) {
     console.log(
-      import_chalk12.default.yellow(
+      import_chalk13.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(", ")}`)
+      import_chalk13.default.green(`  Created plans: ${pushOutcome.plans.created.join(", ")}`)
     );
   }
   if (pushOutcome.plans.updated.length > 0) {
     console.log(
-      import_chalk12.default.yellow(
+      import_chalk13.default.yellow(
         `  Updated plans: ${pushOutcome.plans.updated.join(", ")}`
       )
     );
   }
 });
 
-// src/commands/switch.ts
-var import_prompts5 = require("@inquirer/prompts");
-var import_chalk13 = __toESM(require("chalk"));
-var import_commander10 = require("commander");
-var import_ora7 = __toESM(require("ora"));
-var switchCommand = new import_commander10.Command("switch").description("Switch to a different organization").action(async () => {
-  if (!authExists()) {
-    console.log(import_chalk13.default.red("\u2717 Not authenticated"));
-    console.log(import_chalk13.default.dim("Run `commet login` first"));
-    return;
-  }
-  if (!projectConfigExists()) {
-    console.log(import_chalk13.default.yellow("\u26A0 Project not linked"));
-    console.log(
-      import_chalk13.default.dim("Run `commet link` first to connect to an organization")
-    );
-    return;
-  }
-  const spinner = (0, import_ora7.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_chalk13.default.red("Error:"), result.error);
-    return;
-  }
-  const { organizations } = result.data;
-  if (organizations.length === 0) {
-    spinner.stop();
-    console.log(import_chalk13.default.yellow("\u26A0 No organizations found"));
-    return;
-  }
-  spinner.stop();
-  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;
-  }
-  const selectedOrg = organizations.find((org) => org.id === orgId);
-  if (!selectedOrg) {
-    console.log(import_chalk13.default.red("\u2717 Organization not found"));
-    return;
-  }
-  saveProjectConfig({
-    orgId: selectedOrg.id,
-    orgName: selectedOrg.name,
-    mode: selectedOrg.mode
-  });
-  console.log(import_chalk13.default.green("\n\u2713 Switched organization successfully!"));
-  console.log(
-    import_chalk13.default.dim(`
-Organization: ${selectedOrg.name} \xB7 ${selectedOrg.mode}`)
-  );
-  console.log(
-    import_chalk13.default.dim(
-      "\nRun `commet pull` to update TypeScript types for this organization"
-    )
-  );
-});
-
-// src/commands/unlink.ts
-var import_chalk14 = __toESM(require("chalk"));
-var import_commander11 = require("commander");
-var unlinkCommand = new import_commander11.Command("unlink").description("Unlink this project from Commet").action(async () => {
-  if (!projectConfigExists()) {
-    console.log(
-      import_chalk14.default.yellow("\u26A0 This project is not linked to any organization")
-    );
-    return;
-  }
-  clearProjectConfig();
-  console.log(import_chalk14.default.green("\u2713 Project unlinked successfully"));
-  console.log(import_chalk14.default.dim("\u2713 Removed .commet/ directory"));
-  console.log(
-    import_chalk14.default.dim("\nRun `commet link` to connect to a different organization")
-  );
-});
-
-// src/commands/whoami.ts
-var import_chalk15 = __toESM(require("chalk"));
-var import_commander12 = require("commander");
-var whoamiCommand = new import_commander12.Command("whoami").description("Display current authentication and project status").action(async () => {
-  if (!authExists()) {
-    console.log(import_chalk15.default.yellow("\u26A0 Not logged in"));
-    console.log(import_chalk15.default.dim("Run `commet login` to authenticate"));
-    return;
-  }
-  console.log(import_chalk15.default.green("\u2713 Logged in"));
-  const projectConfig = loadProjectConfig();
-  if (projectConfig) {
-    console.log(import_chalk15.default.bold("\nProject:"));
-    console.log(import_chalk15.default.dim("Organization:"), projectConfig.orgName);
-    console.log(import_chalk15.default.dim("Mode:"), projectConfig.mode);
-  } else {
-    console.log(import_chalk15.default.yellow("\n\u26A0 No project linked"));
-    console.log(
-      import_chalk15.default.dim(
-        "Run `commet link` to connect this directory to an organization"
-      )
-    );
-  }
-});
-
 // src/index.ts
-var program = new import_commander13.Command();
+var program = new import_commander10.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 pull --dry-run         See what's configured
+
+For agents and CI:
+  $ commet                       JSON capabilities when piped (no args)
+  $ commet pull --output agent --yes   Structured output, no prompts
+  $ COMMET_API_KEY=sk_... commet push --yes   CI pipeline
+
+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(orgsCommand);
 program.addCommand(pushCommand);
 program.addCommand(pullCommand);
-program.addCommand(listCommand);
 program.addCommand(listenCommand);
+program.addCommand(apiKeyCommand);
+program.enablePositionalOptions().passThroughOptions().option(
+  "--output <format>",
+  "Output format: human (default) or agent",
+  "human"
+);
+program.action((options) => {
+  if (options.output === "agent") {
+    printAgentInfo();
+  } else {
+    printDefaultScreen();
+  }
+});
+program.showSuggestionAfterError();
 program.exitOverride();
+installCrashHandler();
+markCommandStart();
+var commandName = process.argv[2] || "(default)";
+program.hook("postAction", () => {
+  reportCommand(commandName, "success");
+});
 try {
   program.parse(process.argv);
 } catch (error) {
@@ -2110,10 +2371,145 @@ try {
     if (code === "commander.version" || code === "commander.help" || code === "commander.helpDisplayed") {
       process.exit(0);
     }
-    console.error(import_chalk16.default.red("Error:"), error.message);
+    reportCommand(commandName, "error", code);
+    console.error(import_chalk14.default.red("Error:"), error.message);
   }
   process.exit(1);
 }
-if (!process.argv.slice(2).length) {
-  program.outputHelp();
+function printAgentInfo() {
+  const authenticated = authExists() || !!process.env.COMMET_API_KEY;
+  const projectConfig = projectConfigExists() ? loadProjectConfig() : null;
+  const configPath = findConfigFile(process.cwd());
+  const setup = [];
+  if (!authenticated) {
+    setup.push(
+      "Not authenticated. Run 'commet login' (interactive) or set COMMET_API_KEY env var."
+    );
+  }
+  if (authenticated && !projectConfig && !process.env.COMMET_API_KEY) {
+    setup.push(
+      "No project linked. Run 'commet link --org <slug>' or 'commet orgs --json' to find 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
+    },
+    mcp: {
+      url: "https://commet.co/mcp",
+      sandbox: "https://sandbox.commet.co/mcp",
+      hint: "For full billing CRUD (plans, features, customers, subscriptions), connect to the MCP server."
+    },
+    auth: {
+      interactive: "commet login",
+      ci: "Set COMMET_API_KEY environment variable"
+    },
+    commands: {
+      pull: {
+        description: "Pull remote config and generate commet.config.ts",
+        usage: "commet pull --output agent --yes",
+        preview: "commet pull --output agent --dry-run"
+      },
+      push: {
+        description: "Push commet.config.ts to remote",
+        usage: "commet push --output agent --yes",
+        preview: "commet push --output agent --dry-run",
+        ci: "COMMET_API_KEY=sk_... commet push --yes"
+      },
+      orgs: {
+        description: "List available organizations",
+        usage: "commet orgs --output agent"
+      },
+      link: {
+        description: "Link/switch/unlink organization",
+        usage: "commet link --org <slug-or-id>",
+        clear: "commet link --clear"
+      },
+      listen: {
+        description: "Forward webhook events to local server. Long-running streaming process.",
+        usage: "commet listen <url> [--events <types>]"
+      },
+      create: {
+        description: "Scaffold a new Commet app from template",
+        usage: "commet create [name] -t <template> --org <slug> -y"
+      },
+      "api-key": {
+        description: "Generate API key for CI",
+        usage: "commet api-key --output agent"
+      },
+      login: {
+        description: "Authenticate via browser. Requires a human \u2014 opens a device-code flow.",
+        usage: "commet login"
+      },
+      logout: {
+        description: "Log out of Commet",
+        usage: "commet logout"
+      }
+    }
+  };
+  console.log(JSON.stringify(output, null, 2));
+}
+function printDefaultScreen() {
+  const version = import_chalk14.default.dim(`v${package_default.version}`);
+  console.log(`
+  ${commetColor.bold("Commet")} ${version}`);
+  console.log(import_chalk14.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_chalk14.default.green("  \u2713 Authenticated"));
+  } else {
+    console.log(
+      `  ${import_chalk14.default.yellow("\u26A0")} Not logged in ${import_chalk14.default.dim("\u2192 commet login")}`
+    );
+  }
+  if (projectConfig) {
+    console.log(
+      import_chalk14.default.green(
+        `  \u2713 ${projectConfig.orgName} ${import_chalk14.default.dim(`(${projectConfig.mode})`)}`
+      )
+    );
+    console.log(import_chalk14.default.dim(`    ${projectConfig.orgId}`));
+  } else if (authenticated) {
+    console.log(
+      `  ${import_chalk14.default.yellow("\u26A0")} No project linked ${import_chalk14.default.dim("\u2192 commet link")}`
+    );
+  }
+  if (configFile) {
+    const fileName = configFile.split("/").pop();
+    console.log(import_chalk14.default.green(`  \u2713 ${fileName}`));
+  } else if (projectConfig) {
+    console.log(
+      `  ${import_chalk14.default.yellow("\u26A0")} No config file ${import_chalk14.default.dim("\u2192 commet pull")}`
+    );
+  }
+  const cmd = (name) => commetColor(name.padEnd(22));
+  const dim = import_chalk14.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(dim("\n  Development"));
+  console.log(`    ${cmd("listen <url>")}${dim("Forward webhooks locally")}`);
+  console.log(dim("\n  Project"));
+  console.log(`    ${cmd("link")}${dim("Link / 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("api-key")}${dim("Generate API key for CI")}`);
+  console.log(`    ${cmd("login")}${dim("Authenticate")}`);
+  console.log(`    ${cmd("logout")}${dim("Log out")}`);
+  console.log(
+    dim("\n  commet --help for full reference \xB7 COMMET_API_KEY for CI\n")
+  );
 }