@zerodeploy/cli 0.1.3 → 0.1.4

package/dist/cli.js

@@ -2745,6 +2745,48 @@ import os2 from "os";
 import path2 from "path";
 
 // src/utils/errors.ts
+var ExitCode = {
+  SUCCESS: 0,
+  AUTH_ERROR: 1,
+  NOT_FOUND: 2,
+  VALIDATION_ERROR: 3,
+  RATE_LIMIT: 4,
+  SERVER_ERROR: 5,
+  NETWORK_ERROR: 6,
+  BILLING_ERROR: 7
+};
+function getExitCode(status, errorCode) {
+  if (errorCode) {
+    if (errorCode === "billing_required" || errorCode.includes("billing")) {
+      return ExitCode.BILLING_ERROR;
+    }
+    if (errorCode === "validation_error" || errorCode.includes("invalid")) {
+      return ExitCode.VALIDATION_ERROR;
+    }
+    if (errorCode === "rate_limit_exceeded" || errorCode.includes("rate_limit")) {
+      return ExitCode.RATE_LIMIT;
+    }
+  }
+  if (status === 402) {
+    return ExitCode.BILLING_ERROR;
+  }
+  if (status === 401 || status === 403) {
+    return ExitCode.AUTH_ERROR;
+  }
+  if (status === 404) {
+    return ExitCode.NOT_FOUND;
+  }
+  if (status === 422 || status === 400) {
+    return ExitCode.VALIDATION_ERROR;
+  }
+  if (status === 429) {
+    return ExitCode.RATE_LIMIT;
+  }
+  if (status >= 500) {
+    return ExitCode.SERVER_ERROR;
+  }
+  return ExitCode.AUTH_ERROR;
+}
 function parseApiError(body) {
   if (!body || typeof body !== "object") {
     return {
@@ -2809,6 +2851,18 @@ function displayError(error) {
   }
   console.error();
 }
+async function handleApiError(response) {
+  let body;
+  try {
+    body = await response.json();
+  } catch {
+    body = null;
+  }
+  const error = parseApiError(body);
+  displayError(error);
+  const exitCode = getExitCode(response.status, error.code);
+  process.exit(exitCode);
+}
 function displayNetworkError(error) {
   if (error.message.includes("fetch failed") || error.message.includes("ECONNREFUSED")) {
     displayError({
@@ -2838,15 +2892,19 @@ function displayAuthError() {
     docs: "https://zerodeploy.dev/docs/cli/auth"
   });
 }
+function handleAuthError() {
+  displayAuthError();
+  process.exit(ExitCode.AUTH_ERROR);
+}
 
 // src/auth/token.ts
 var DIR = path2.join(os2.homedir(), ".zerodeploy");
 var TOKEN_PATH = path2.join(DIR, "token");
 function saveToken(token) {
   if (!fs6.existsSync(DIR)) {
-    fs6.mkdirSync(DIR);
+    fs6.mkdirSync(DIR, { mode: 448 });
   }
-  fs6.writeFileSync(TOKEN_PATH, token, "utf8");
+  fs6.writeFileSync(TOKEN_PATH, token, { encoding: "utf8", mode: 384 });
 }
 function loadToken() {
   const envToken = process.env.ZERODEPLOY_TOKEN;
@@ -2881,8 +2939,8 @@ var loginCommand = new Command2("login").description("Login via GitHub OAuth wit
       if (!token) {
         res.writeHead(400);
         res.end("Login failed: missing token");
-        console.error("Login failed: no token received");
-        process.exit(1);
+        displayError({ code: "auth_error", message: "Login failed: no token received" });
+        process.exit(ExitCode.AUTH_ERROR);
       }
       saveToken(token);
       if (pending) {
@@ -3204,7 +3262,8 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
 var DEFAULT_OPTIONS = {
   maxRetries: 3,
   baseDelayMs: 1000,
-  maxDelayMs: 1e4
+  maxDelayMs: 1e4,
+  timeoutMs: 30000
 };
 var RETRYABLE_STATUS_CODES = new Set([
   408,
@@ -3277,8 +3336,17 @@ async function fetchWithRetry(input, init, options) {
   const opts = { ...DEFAULT_OPTIONS, ...options };
   let lastError;
   for (let attempt = 0;attempt <= opts.maxRetries; attempt++) {
+    let controller;
+    let timeoutId;
+    if (opts.timeoutMs > 0) {
+      controller = new AbortController;
+      timeoutId = setTimeout(() => controller.abort(), opts.timeoutMs);
+    }
     try {
-      const response = await fetch(input, init);
+      const fetchInit = controller ? { ...init, signal: controller.signal } : init ?? {};
+      const response = await fetch(input, fetchInit);
+      if (timeoutId)
+        clearTimeout(timeoutId);
       if (isRetryableStatus(response.status) && attempt < opts.maxRetries) {
         const headerDelay = response.status === 429 ? getDelayFromHeaders(response) : null;
         const delayMs = headerDelay ?? calculateDelay(attempt, opts.baseDelayMs, opts.maxDelayMs);
@@ -3289,6 +3357,8 @@ async function fetchWithRetry(input, init, options) {
       }
       return response;
     } catch (error) {
+      if (timeoutId)
+        clearTimeout(timeoutId);
       lastError = error instanceof Error ? error : new Error(String(error));
       if (!isRetryableError(error) || attempt >= opts.maxRetries) {
         throw lastError;
@@ -3311,6 +3381,35 @@ function formatRetryMessage(attempt, maxRetries, error) {
   return `Retry ${attempt}/${maxRetries} (${errorDesc})`;
 }
 
+// ../../packages/api-client/src/interceptors.ts
+async function applyRequestInterceptors(request, interceptors) {
+  let req = request;
+  for (const interceptor of interceptors) {
+    req = await interceptor(req);
+  }
+  return req;
+}
+async function applyResponseInterceptors(response, interceptors) {
+  let res = response;
+  for (const interceptor of interceptors) {
+    res = await interceptor(res);
+  }
+  return res;
+}
+function createInterceptedFetch(baseFetch, interceptors) {
+  return async (input, init) => {
+    let request = new Request(input, init);
+    if (interceptors.request?.length) {
+      request = await applyRequestInterceptors(request, interceptors.request);
+    }
+    let response = await baseFetch(request);
+    if (interceptors.response?.length) {
+      response = await applyResponseInterceptors(response, interceptors.response);
+    }
+    return response;
+  };
+}
+
 // ../../packages/api-client/src/index.ts
 var DEFAULT_RETRY_OPTIONS = {
   maxRetries: 3,
@@ -3329,6 +3428,10 @@ function createClient(baseUrl, token, options) {
   } else if (options?.useCredentials) {
     fetchFn = (input, init) => fetch(input, { ...init, credentials: "include" });
   }
+  if (options?.interceptors && (options.interceptors.request?.length || options.interceptors.response?.length)) {
+    const baseFetch = fetchFn || fetch;
+    fetchFn = createInterceptedFetch(baseFetch, options.interceptors);
+  }
   return hc(baseUrl, {
     headers: token ? { Authorization: `Bearer ${token}` } : undefined,
     fetch: fetchFn
@@ -3353,18 +3456,22 @@ function getClient(token, retryOptions) {
 }
 
 // src/commands/whoami.ts
-var whoamiCommand = new Command2("whoami").description("Show the currently logged-in user").action(async () => {
+var whoamiCommand = new Command2("whoami").description("Show the currently logged-in user").option("--json", "Output as JSON").action(async (options) => {
   const token = loadToken();
   if (!token) {
-    console.log("❌ You are not logged in. Run `zerodeploy login` first.");
-    process.exit(1);
+    handleAuthError();
   }
   try {
     const client = getClient(token);
     const res = await client.auth.me.$get();
-    if (!res.ok)
-      throw new Error(`API Error ${res.status}`);
+    if (!res.ok) {
+      await handleApiError(res);
+    }
     const data = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
+    }
     console.log("Logged in as:");
     console.log(`  Username: ${data.username}`);
     console.log(`  Email:    ${data.email || "(not set)"}`);
@@ -3376,8 +3483,9 @@ var whoamiCommand = new Command2("whoami").description("Show the currently logge
       console.log("   We'll email you when your account is approved.");
     }
   } catch (err) {
-    console.error("Failed to fetch user info:", err.message || err);
-    process.exit(1);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to fetch user info: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3396,19 +3504,16 @@ function formatUsageLine(label, current, max, suffix = "") {
   const percentage = Math.round(current / max * 100);
   return `  ${label.padEnd(24)} ${bar} ${current}/${max}${suffix} (${percentage}%)`;
 }
-var usageCommand = new Command2("usage").description("Show current usage and plan limits").option("--json", "Output as JSON").action(async (options) => {
+var usageCommand = new Command2("usage").description("Show current usage and limits").option("--json", "Output as JSON").action(async (options) => {
   const token = loadToken();
   if (!token) {
-    displayAuthError();
-    process.exit(1);
+    handleAuthError();
   }
   try {
     const client = getClient(token);
     const res = await client.auth.me.usage.$get();
     if (!res.ok) {
-      const body = await res.json();
-      displayError(parseApiError(body));
-      process.exit(1);
+      await handleApiError(res);
     }
     const data = await res.json();
     if (options.json) {
@@ -3416,14 +3521,12 @@ var usageCommand = new Command2("usage").description("Show current usage and pla
       return;
     }
     console.log();
-    console.log(`Plan: ${data.plan.toUpperCase()}`);
-    console.log();
     console.log("Account Usage:");
     console.log(formatUsageLine("Organizations", data.usage.orgs, data.limits.max_orgs));
     console.log(formatUsageLine("Total Sites", data.usage.sites, data.limits.max_orgs * data.limits.max_sites_per_org));
     console.log(formatUsageLine("Deployments (month)", data.usage.deployments_this_month, data.limits.max_deployments_per_month));
     console.log();
-    console.log("Plan Limits:");
+    console.log("Limits:");
     console.log(`  Sites per org:           ${data.limits.max_sites_per_org}`);
     console.log(`  Deployments per day:     ${data.limits.max_deployments_per_day}`);
     console.log(`  Deployments per month:   ${data.limits.max_deployments_per_month}`);
@@ -3448,66 +3551,71 @@ var usageCommand = new Command2("usage").description("Show current usage and pla
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     displayError({
-      code: "api_error",
+      code: "network_error",
       message: `Failed to fetch usage info: ${message}`
     });
-    process.exit(1);
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/org/list.ts
-var orgListCommand = new Command2("list").description("List your organizations").action(async () => {
+var orgListCommand = new Command2("list").description("List your organizations").option("--json", "Output as JSON").action(async (options) => {
   const token = loadToken();
   if (!token) {
-    console.log("❌ Not logged in. Run `zerodeploy login` first.");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
     const res = await client.orgs.$get();
-    if (!res.ok)
-      throw new Error(`API Error ${res.status}`);
+    if (!res.ok) {
+      await handleApiError(res);
+    }
     const { data: orgs } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(orgs, null, 2));
+      return;
+    }
     if (orgs.length === 0) {
       console.log("No organizations found.");
     } else {
       console.log("Organizations:");
       for (const o of orgs) {
-        console.log(`  ${o.slug.padEnd(20)} ${o.name} [${o.plan}]`);
+        console.log(`  ${o.slug.padEnd(20)} ${o.name}`);
       }
     }
   } catch (err) {
-    console.error("Failed to fetch orgs:", err.message || err);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to fetch orgs: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/org/create.ts
-var orgCreateCommand = new Command2("create").description("Create a new organization").argument("<name>", "Organization name").action(async (name) => {
+var orgCreateCommand = new Command2("create").description("Create a new organization").argument("<name>", "Organization name").option("--json", "Output as JSON").action(async (name, options) => {
   const token = loadToken();
   if (!token) {
-    displayAuthError();
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
     const res = await client.orgs.$post({ json: { name } });
     if (!res.ok) {
-      const body = await res.json();
-      displayError(parseApiError(body));
+      await handleApiError(res);
+    }
+    const { data: org } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(org, null, 2));
       return;
     }
-    const org = await res.json();
     console.log(`
-✅ Created org: ${org.name}`);
+Created org: ${org.name}`);
     console.log(`   Slug: ${org.slug}`);
     console.log(`   ID:   ${org.id}
 `);
   } catch (err) {
-    if (err instanceof Error) {
-      displayNetworkError(err);
-    } else {
-      displayError({ code: "unknown_error", message: "Failed to create org" });
-    }
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to create org: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3528,8 +3636,7 @@ function prompt(question) {
 var orgDeleteCommand = new Command2("delete").description("Delete an organization (must have no sites)").argument("<orgSlug>", "Organization slug").option("--force", "Skip confirmation prompt").action(async (orgSlug, options) => {
   const token = loadToken();
   if (!token) {
-    displayAuthError();
-    return;
+    handleAuthError();
   }
   if (!options.force) {
     const answer = await prompt(`Are you sure you want to delete organization "${orgSlug}"? This cannot be undone. (y/N) `);
@@ -3544,20 +3651,16 @@ var orgDeleteCommand = new Command2("delete").description("Delete an organizatio
       param: { orgSlug }
     });
     if (!res.ok) {
-      const body = await res.json();
-      displayError(parseApiError(body));
-      return;
+      await handleApiError(res);
     }
     const result = await res.json();
     console.log(`
-✅ ${result.message}
+${result.message}
 `);
   } catch (err) {
-    if (err instanceof Error) {
-      displayNetworkError(err);
-    } else {
-      displayError({ code: "unknown_error", message: "Failed to delete organization" });
-    }
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to delete organization: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3565,18 +3668,22 @@ var orgDeleteCommand = new Command2("delete").description("Delete an organizatio
 var orgCommand = new Command2("org").description("Manage organizations").addCommand(orgListCommand).addCommand(orgCreateCommand).addCommand(orgDeleteCommand);
 
 // src/commands/site/list.ts
-var siteListCommand = new Command2("list").description("List sites in an organization").argument("<orgSlug>", "Organization slug").action(async (orgSlug) => {
+var siteListCommand = new Command2("list").description("List sites in an organization").argument("<orgSlug>", "Organization slug").option("--json", "Output as JSON").action(async (orgSlug, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
     const res = await client.orgs[":orgSlug"].sites.$get({ param: { orgSlug } });
-    if (!res.ok)
-      throw new Error(`API Error ${res.status}`);
+    if (!res.ok) {
+      await handleApiError(res);
+    }
     const { data: sites } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(sites, null, 2));
+      return;
+    }
     if (sites.length === 0) {
       console.log("No sites found.");
       return;
@@ -3587,17 +3694,17 @@ var siteListCommand = new Command2("list").description("List sites in an organiz
       console.log(`  ${s.slug.padEnd(20)} ${s.name}${repo}`);
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to list sites:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to list sites: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/site/create.ts
-var siteCreateCommand = new Command2("create").description("Create a site in an organization").argument("<orgSlug>", "Organization slug").argument("<name>", "Site name").requiredOption("--subdomain <subdomain>", 'Subdomain for the site (e.g., "my-site" for my-site.zerodeploy.app)').option("--repo <owner/repo>", 'Link to GitHub repository (e.g., "vercel/next.js")').action(async (orgSlug, name, options) => {
+var siteCreateCommand = new Command2("create").description("Create a site in an organization").argument("<orgSlug>", "Organization slug").argument("<name>", "Site name").option("--subdomain <subdomain>", "Subdomain for the site (defaults to slugified name)").option("--repo <owner/repo>", 'Link to GitHub repository (e.g., "vercel/next.js")').option("--json", "Output as JSON").action(async (orgSlug, name, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3606,11 +3713,14 @@ var siteCreateCommand = new Command2("create").description("Create a site in an
       json: { name, subdomain: options.subdomain, githubRepo: options.repo }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
+    }
+    const { data: site } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(site, null, 2));
+      return;
     }
-    const site = await res.json();
-    console.log(`✅ Created site: ${site.name}`);
+    console.log(`Created site: ${site.name}`);
     console.log(`   Subdomain: ${site.subdomain}.zerodeploy.app`);
     console.log(`   Slug: ${site.slug}`);
     console.log(`   ID:   ${site.id}`);
@@ -3618,8 +3728,9 @@ var siteCreateCommand = new Command2("create").description("Create a site in an
       console.log(`   Repo: ${site.github_repo}`);
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to create site:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to create site: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3640,8 +3751,7 @@ function prompt2(question) {
 var siteDeleteCommand = new Command2("delete").description("Delete a site and all its deployments").argument("<siteSlug>", "Site slug").requiredOption("--org <orgSlug>", "Organization slug").option("--force", "Skip confirmation prompt").action(async (siteSlug, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   if (!options.force) {
     const answer = await prompt2(`Are you sure you want to delete site "${siteSlug}" and all its deployments? This cannot be undone. (y/N) `);
@@ -3656,23 +3766,22 @@ var siteDeleteCommand = new Command2("delete").description("Delete a site and al
       param: { orgSlug: options.org, siteSlug }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const result = await res.json();
-    console.log(`✅ ${result.message}`);
+    console.log(result.message);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to delete site:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to delete site: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/site/link.ts
-var siteLinkCommand = new Command2("link").description("Link a site to a GitHub repository").argument("<orgSlug>", "Organization slug").argument("<siteSlug>", "Site slug").argument("<repo>", 'GitHub repository (e.g., "owner/repo")').action(async (orgSlug, siteSlug, repo) => {
+var siteLinkCommand = new Command2("link").description("Link a site to a GitHub repository").argument("<orgSlug>", "Organization slug").argument("<siteSlug>", "Site slug").argument("<repo>", 'GitHub repository (e.g., "owner/repo")').option("--json", "Output as JSON").action(async (orgSlug, siteSlug, repo, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3681,22 +3790,24 @@ var siteLinkCommand = new Command2("link").description("Link a site to a GitHub
       json: { githubRepo: repo }
     });
     if (!res.ok) {
-      const error = await res.json();
-      console.log(`Error: ${error.error || "Failed to link repository"}`);
+      await handleApiError(res);
+    }
+    const { data: site } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(site, null, 2));
       return;
     }
-    const site = await res.json();
     console.log(`Site "${site.name}" linked to ${site.github_repo}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to link repository:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to link repository: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 var siteUnlinkCommand = new Command2("unlink").description("Unlink a site from its GitHub repository").argument("<orgSlug>", "Organization slug").argument("<siteSlug>", "Site slug").action(async (orgSlug, siteSlug) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3705,15 +3816,14 @@ var siteUnlinkCommand = new Command2("unlink").description("Unlink a site from i
       json: { githubRepo: null }
     });
     if (!res.ok) {
-      const error = await res.json();
-      console.log(`Error: ${error.error || "Failed to unlink repository"}`);
-      return;
+      await handleApiError(res);
     }
-    const site = await res.json();
+    const { data: site } = await res.json();
     console.log(`Site "${site.name}" unlinked from GitHub repository`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to unlink repository:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to unlink repository: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3721,8 +3831,7 @@ var siteUnlinkCommand = new Command2("unlink").description("Unlink a site from i
 var siteSubdomainCommand = new Command2("subdomain").description("Update the subdomain for a site").argument("<orgSlug>", "Organization slug").argument("<siteSlug>", "Site slug").argument("<subdomain>", "New subdomain").action(async (orgSlug, siteSlug, subdomain) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3731,15 +3840,15 @@ var siteSubdomainCommand = new Command2("subdomain").description("Update the sub
       json: { subdomain }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
-    const site = await res.json();
-    console.log(`✅ Updated subdomain for ${site.name}`);
+    const { data: site } = await res.json();
+    console.log(`Updated subdomain for ${site.name}`);
     console.log(`   New URL: ${site.subdomain}.zerodeploy.app`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to update subdomain:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to update subdomain: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3747,8 +3856,7 @@ var siteSubdomainCommand = new Command2("subdomain").description("Update the sub
 var siteRenameCommand = new Command2("rename").description("Rename a site").argument("<siteSlug>", "Site slug").argument("<newName>", "New name for the site").requiredOption("--org <orgSlug>", "Organization slug").action(async (siteSlug, newName, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3757,14 +3865,14 @@ var siteRenameCommand = new Command2("rename").description("Rename a site").argu
       json: { name: newName }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
-    const site = await res.json();
-    console.log(`✅ Renamed site to: ${site.name}`);
+    const { data: site } = await res.json();
+    console.log(`Renamed site to: ${site.name}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to rename site:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to rename site: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3784,16 +3892,19 @@ function formatNumber(n) {
     return (n / 1000).toFixed(1) + "K";
   return n.toString();
 }
-var siteStatsCommand = new Command2("stats").description("View site traffic analytics").argument("<site>", "Site slug").requiredOption("--org <orgSlug>", "Organization slug").option("--period <period>", "Time period: 24h, 7d, or 30d", "7d").action(async (site, options) => {
+var siteStatsCommand = new Command2("stats").description("View site traffic analytics").argument("<site>", "Site slug").requiredOption("--org <orgSlug>", "Organization slug").option("--period <period>", "Time period: 24h, 7d, or 30d", "7d").option("--json", "Output as JSON").action(async (site, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   const validPeriods = ["24h", "7d", "30d"];
   if (!validPeriods.includes(options.period)) {
-    console.error(`Invalid period. Use: ${validPeriods.join(", ")}`);
-    return;
+    displayError({
+      code: "validation_error",
+      message: `Invalid period: ${options.period}`,
+      hint: `Valid periods: ${validPeriods.join(", ")}`
+    });
+    process.exit(ExitCode.VALIDATION_ERROR);
   }
   try {
     const client = getClient(token);
@@ -3802,10 +3913,13 @@ var siteStatsCommand = new Command2("stats").description("View site traffic anal
       query: { period: options.period }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
+    }
+    const { data } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
     }
-    const data = await res.json();
     if (!data.configured) {
       console.log("Analytics not configured for this site.");
       return;
@@ -3873,8 +3987,9 @@ var siteStatsCommand = new Command2("stats").description("View site traffic anal
     }
     console.log("View detailed analytics in the dashboard.");
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to get analytics:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to get analytics: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3885,8 +4000,7 @@ var siteCommand = new Command2("site").description("Manage sites").addCommand(si
 var domainAddCommand = new Command2("add").description("Add a custom domain to a site").argument("<domain>", "Domain to add (e.g., www.example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domain, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3895,17 +4009,16 @@ var domainAddCommand = new Command2("add").description("Add a custom domain to a
       json: { domain }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
-    const data = await res.json();
+    const { data } = await res.json();
     console.log(`
-✅ Domain added: ${data.domain}`);
+Domain added: ${data.domain}`);
     console.log(`   ID: ${data.id}`);
     console.log(`   Status: ${data.verification_status}`);
     console.log();
-    console.log("\uD83D\uDCCB DNS Verification Required");
-    console.log("━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+    console.log("DNS Verification Required");
+    console.log("-------------------------");
     console.log();
     console.log("Add the following TXT record to your DNS:");
     console.log();
@@ -3917,8 +4030,9 @@ var domainAddCommand = new Command2("add").description("Add a custom domain to a
     console.log(`   zerodeploy domain verify ${data.domain} --org ${options.org} --site ${options.site}`);
     console.log();
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to add domain:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to add domain: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -3926,11 +4040,11 @@ var domainAddCommand = new Command2("add").description("Add a custom domain to a
 function formatStatus(status) {
   switch (status) {
     case "verified":
-      return "✅ verified";
+      return "verified";
     case "pending":
-      return "⏳ pending";
+      return "pending";
     case "failed":
-      return "❌ failed";
+      return "failed";
     default:
       return status;
   }
@@ -3938,18 +4052,17 @@ function formatStatus(status) {
 function formatRedirect(mode) {
   switch (mode) {
     case "www_to_apex":
-      return "www→apex";
+      return "www->apex";
     case "apex_to_www":
-      return "apex→www";
+      return "apex->www";
     default:
       return "";
   }
 }
-var domainListCommand = new Command2("list").description("List custom domains for a site").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (options) => {
+var domainListCommand = new Command2("list").description("List custom domains for a site").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--json", "Output as JSON").action(async (options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3957,10 +4070,13 @@ var domainListCommand = new Command2("list").description("List custom domains fo
       param: { orgSlug: options.org, siteSlug: options.site }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const { data: domains } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(domains, null, 2));
+      return;
+    }
     if (domains.length === 0) {
       console.log("No custom domains configured.");
       console.log();
@@ -3977,17 +4093,17 @@ var domainListCommand = new Command2("list").description("List custom domains fo
     }
     console.log();
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to list domains:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to list domains: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/domain/verify.ts
-var domainVerifyCommand = new Command2("verify").description("Verify ownership of a custom domain").argument("<domain>", "Domain to verify (e.g., www.example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domainName, options) => {
+var domainVerifyCommand = new Command2("verify").description("Verify ownership of a custom domain").argument("<domain>", "Domain to verify (e.g., www.example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--json", "Output as JSON").action(async (domainName, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -3995,39 +4111,40 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
       param: { orgSlug: options.org, siteSlug: options.site }
     });
     if (!listRes.ok) {
-      const error = await listRes.json();
-      throw new Error(error.error || `API Error ${listRes.status}`);
+      await handleApiError(listRes);
     }
     const { data: domains } = await listRes.json();
     const domain = domains.find((d) => d.domain === domainName);
     if (!domain) {
-      console.error(`
-❌ Domain not found: ${domainName}`);
-      console.log();
-      console.log("Add it first with:");
-      console.log(`  zerodeploy domain add ${domainName} --org ${options.org} --site ${options.site}`);
-      return;
+      displayError({
+        code: "not_found",
+        message: `Domain not found: ${domainName}`,
+        hint: `Add it first with:
+  zerodeploy domain add ${domainName} --org ${options.org} --site ${options.site}`
+      });
+      process.exit(ExitCode.NOT_FOUND);
     }
     const res = await client.orgs[":orgSlug"].sites[":siteSlug"].domains[":domainId"].verify.$post({
       param: { orgSlug: options.org, siteSlug: options.site, domainId: domain.id }
     });
-    const data = await res.json();
+    const { data } = await res.json();
     if (!res.ok) {
-      console.error(`
-❌ Verification failed for ${domainName}`);
-      if (data.message) {
-        console.log();
-        console.log(data.message);
-      }
-      console.log();
-      console.log("Tips:");
-      console.log("  • DNS changes can take up to 48 hours to propagate");
-      console.log(`  • Verify the TXT record is set correctly using: dig TXT _zerodeploy.${domainName}`);
-      console.log("  • Try again in a few minutes");
+      displayError({
+        code: "verification_failed",
+        message: `Verification failed for ${domainName}`,
+        hint: `Tips:
+  - DNS changes can take up to 48 hours to propagate
+  - Verify the TXT record is set correctly using: dig TXT _zerodeploy.${domainName}
+  - Try again in a few minutes`
+      });
+      process.exit(ExitCode.VALIDATION_ERROR);
+    }
+    if (options.json) {
+      console.log(JSON.stringify(data, null, 2));
       return;
     }
     console.log(`
-✅ Domain verified: ${data.domain}`);
+Domain verified: ${data.domain}`);
     console.log();
     if (data.cloudflare) {
       console.log(`   Cloudflare SSL: ${data.cloudflare.status}`);
@@ -4036,8 +4153,8 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
     const domainParts = data.domain.split(".");
     const isApexDomain = domainParts.length === 2;
     const target = `${data.siteSubdomain || "your-site"}.zerodeploy.app`;
-    console.log("\uD83D\uDCCB Final DNS Setup");
-    console.log("━━━━━━━━━━━━━━━━━━━");
+    console.log("Final DNS Setup");
+    console.log("---------------");
     console.log();
     if (isApexDomain) {
       console.log("For apex domains, DNS setup depends on your provider:");
@@ -4067,8 +4184,9 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
     console.log(`   https://${data.domain}`);
     console.log();
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to verify domain:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to verify domain: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -4076,8 +4194,7 @@ var domainVerifyCommand = new Command2("verify").description("Verify ownership o
 var domainRemoveCommand = new Command2("remove").description("Remove a custom domain from a site").argument("<domain>", "Domain to remove (e.g., www.example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (domainName, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -4085,31 +4202,31 @@ var domainRemoveCommand = new Command2("remove").description("Remove a custom do
       param: { orgSlug: options.org, siteSlug: options.site }
     });
     if (!listRes.ok) {
-      const error = await listRes.json();
-      throw new Error(error.error || `API Error ${listRes.status}`);
+      await handleApiError(listRes);
     }
     const { data: domains } = await listRes.json();
     const domain = domains.find((d) => d.domain === domainName);
     if (!domain) {
-      console.error(`
-❌ Domain not found: ${domainName}`);
-      console.log();
-      console.log("List domains with:");
-      console.log(`  zerodeploy domain list --org ${options.org} --site ${options.site}`);
-      return;
+      displayError({
+        code: "not_found",
+        message: `Domain not found: ${domainName}`,
+        hint: `List domains with:
+  zerodeploy domain list --org ${options.org} --site ${options.site}`
+      });
+      process.exit(ExitCode.NOT_FOUND);
     }
     const res = await client.orgs[":orgSlug"].sites[":siteSlug"].domains[":domainId"].$delete({
       param: { orgSlug: options.org, siteSlug: options.site, domainId: domain.id }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const data = await res.json();
-    console.log(`✅ ${data.message}`);
+    console.log(data.message);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to remove domain:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to remove domain: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -4119,24 +4236,26 @@ function formatRedirectMode(mode) {
     case "none":
       return "No redirect";
     case "www_to_apex":
-      return "www → apex (e.g., www.example.com → example.com)";
+      return "www -> apex (e.g., www.example.com -> example.com)";
     case "apex_to_www":
-      return "apex → www (e.g., example.com → www.example.com)";
+      return "apex -> www (e.g., example.com -> www.example.com)";
     default:
       return mode;
   }
 }
-var domainRedirectCommand = new Command2("redirect").description("Set redirect mode for a custom domain").argument("<domain>", "Domain name (e.g., example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").requiredOption("--mode <mode>", "Redirect mode: none, www_to_apex, or apex_to_www").action(async (domain, options) => {
+var domainRedirectCommand = new Command2("redirect").description("Set redirect mode for a custom domain").argument("<domain>", "Domain name (e.g., example.com)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").requiredOption("--mode <mode>", "Redirect mode: none, www_to_apex, or apex_to_www").option("--json", "Output as JSON").action(async (domain, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   const validModes = ["none", "www_to_apex", "apex_to_www"];
   if (!validModes.includes(options.mode)) {
-    console.error(`Invalid mode: ${options.mode}`);
-    console.error("Valid modes: none, www_to_apex, apex_to_www");
-    return;
+    displayError({
+      code: "validation_error",
+      message: `Invalid mode: ${options.mode}`,
+      hint: "Valid modes: none, www_to_apex, apex_to_www"
+    });
+    process.exit(ExitCode.VALIDATION_ERROR);
   }
   try {
     const client = getClient(token);
@@ -4144,32 +4263,38 @@ var domainRedirectCommand = new Command2("redirect").description("Set redirect m
       param: { orgSlug: options.org, siteSlug: options.site }
     });
     if (!listRes.ok) {
-      const error = await listRes.json();
-      throw new Error(error.error || `API Error ${listRes.status}`);
+      await handleApiError(listRes);
     }
     const { data: domains } = await listRes.json();
     const targetDomain = domains.find((d) => d.domain === domain.toLowerCase());
     if (!targetDomain) {
-      console.error(`Domain not found: ${domain}`);
-      console.error(`Run 'zerodeploy domain list --org ${options.org} --site ${options.site}' to see configured domains.`);
-      return;
+      displayError({
+        code: "not_found",
+        message: `Domain not found: ${domain}`,
+        hint: `Run 'zerodeploy domain list --org ${options.org} --site ${options.site}' to see configured domains.`
+      });
+      process.exit(ExitCode.NOT_FOUND);
     }
     const res = await client.orgs[":orgSlug"].sites[":siteSlug"].domains[":domainId"].redirect.$patch({
       param: { orgSlug: options.org, siteSlug: options.site, domainId: targetDomain.id },
       json: { redirectMode: options.mode }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
+    }
+    const { data } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
     }
-    const data = await res.json();
     console.log(`
-✅ Redirect mode updated for ${data.domain}`);
+Redirect mode updated for ${data.domain}`);
     console.log(`   Mode: ${formatRedirectMode(data.redirect_mode)}`);
     console.log();
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to update redirect mode:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to update redirect mode: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -4177,11 +4302,10 @@ var domainRedirectCommand = new Command2("redirect").description("Set redirect m
 var domainCommand = new Command2("domain").description("Manage custom domains").addCommand(domainAddCommand).addCommand(domainListCommand).addCommand(domainVerifyCommand).addCommand(domainRemoveCommand).addCommand(domainRedirectCommand);
 
 // src/commands/form/list.ts
-var formListCommand = new Command2("list").description("List forms for a site").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (options) => {
+var formListCommand = new Command2("list").description("List forms for a site").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--json", "Output as JSON").action(async (options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -4189,10 +4313,13 @@ var formListCommand = new Command2("list").description("List forms for a site").
       param: { orgSlug: options.org, siteSlug: options.site }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const { data: forms } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(forms, null, 2));
+      return;
+    }
     if (forms.length === 0) {
       console.log("No forms found.");
       console.log();
@@ -4211,17 +4338,17 @@ var formListCommand = new Command2("list").description("List forms for a site").
     console.log("Export submissions with:");
     console.log(`  zerodeploy form export <name> --org ${options.org} --site ${options.site}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to list forms:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to list forms: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/form/submissions.ts
-var formSubmissionsCommand = new Command2("submissions").description("View recent form submissions").argument("<name>", "Form name").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--limit <n>", "Number of submissions to show", "10").option("--offset <n>", "Offset for pagination", "0").action(async (name, options) => {
+var formSubmissionsCommand = new Command2("submissions").description("View recent form submissions").argument("<name>", "Form name").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--limit <n>", "Number of submissions to show", "10").option("--offset <n>", "Offset for pagination", "0").option("--json", "Output as JSON").action(async (name, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -4230,11 +4357,14 @@ var formSubmissionsCommand = new Command2("submissions").description("View recen
       query: { limit: options.limit, offset: options.offset }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const data = await res.json();
     const { form, submissions, total, limit, offset } = data;
+    if (options.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
+    }
     if (submissions.length === 0) {
       console.log(`No submissions found for form "${name}".`);
       return;
@@ -4278,8 +4408,9 @@ var formSubmissionsCommand = new Command2("submissions").description("View recen
     console.log("Export all to CSV with:");
     console.log(`  zerodeploy form export ${name} --org ${options.org} --site ${options.site}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to get submissions:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to get submissions: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -4289,8 +4420,7 @@ import { resolve } from "path";
 var formExportCommand = new Command2("export").description("Export form submissions as CSV").argument("<name>", "Form name").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("-o, --output <file>", "Output file path (default: <name>-submissions.csv)").action(async (name, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -4302,8 +4432,7 @@ var formExportCommand = new Command2("export").description("Export form submissi
       return;
     }
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const csv = await res.text();
     const outputPath = options.output || `${name}-submissions.csv`;
@@ -4313,8 +4442,9 @@ var formExportCommand = new Command2("export").description("Export form submissi
 `).length - 1;
     console.log(`Exported ${lineCount} submissions to ${outputPath}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to export form:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to export form: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -4335,8 +4465,7 @@ function prompt3(question) {
 var formDeleteCommand = new Command2("delete").description("Delete a form and all its submissions").argument("<name>", "Form name").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--force", "Skip confirmation prompt").action(async (name, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   if (!options.force) {
     const answer = await prompt3(`Are you sure you want to delete form "${name}" and all its submissions? This cannot be undone. (y/N) `);
@@ -4351,14 +4480,14 @@ var formDeleteCommand = new Command2("delete").description("Delete a form and al
       param: { orgSlug: options.org, siteSlug: options.site, formName: name }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const result = await res.json();
-    console.log(`✅ ${result.message}`);
+    console.log(`${result.message}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to delete form:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to delete form: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -4366,20 +4495,21 @@ var formDeleteCommand = new Command2("delete").description("Delete a form and al
 var formNotifyCommand = new Command2("notify").description("Configure email notifications for form submissions").argument("<name>", "Form name").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").option("--email <email>", "Email address to receive notifications").option("--disable", "Disable email notifications").action(async (name, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   if (options.email && options.disable) {
-    console.error("Cannot use both --email and --disable options");
-    return;
+    displayError({ code: "validation_error", message: "Cannot use both --email and --disable options" });
+    process.exit(ExitCode.VALIDATION_ERROR);
   }
   if (!options.email && !options.disable) {
-    console.error("Please specify --email <email> or --disable");
-    console.log();
-    console.log("Examples:");
-    console.log(`  zerodeploy form notify ${name} --org ${options.org} --site ${options.site} --email alerts@example.com`);
-    console.log(`  zerodeploy form notify ${name} --org ${options.org} --site ${options.site} --disable`);
-    return;
+    displayError({
+      code: "validation_error",
+      message: "Please specify --email <email> or --disable",
+      hint: `Examples:
+  zerodeploy form notify ${name} --org ${options.org} --site ${options.site} --email alerts@example.com
+  zerodeploy form notify ${name} --org ${options.org} --site ${options.site} --disable`
+    });
+    process.exit(ExitCode.VALIDATION_ERROR);
   }
   try {
     const client = getClient(token);
@@ -4389,8 +4519,7 @@ var formNotifyCommand = new Command2("notify").description("Configure email noti
       json: { notification_email: notificationEmail }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const { form } = await res.json();
     if (form.notification_email) {
@@ -4400,8 +4529,9 @@ var formNotifyCommand = new Command2("notify").description("Configure email noti
       console.log(`Email notifications disabled for form "${name}"`);
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to update form notifications:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to update form notifications: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -5261,6 +5391,109 @@ function createProgressBar(options) {
   };
 }
 
+// src/utils/ci.ts
+function detectCI() {
+  if (process.env.GITHUB_ACTIONS === "true") {
+    return {
+      name: "github-actions",
+      prNumber: extractGitHubPRNumber(),
+      prTitle: null,
+      commitSha: process.env.GITHUB_SHA || null,
+      branch: process.env.GITHUB_HEAD_REF || process.env.GITHUB_REF_NAME || null,
+      commitMessage: null
+    };
+  }
+  if (process.env.CIRCLECI === "true") {
+    return {
+      name: "circleci",
+      prNumber: extractCircleCIPRNumber(),
+      prTitle: null,
+      commitSha: process.env.CIRCLE_SHA1 || null,
+      branch: process.env.CIRCLE_BRANCH || null,
+      commitMessage: null
+    };
+  }
+  if (process.env.GITLAB_CI === "true") {
+    return {
+      name: "gitlab-ci",
+      prNumber: process.env.CI_MERGE_REQUEST_IID ? parseInt(process.env.CI_MERGE_REQUEST_IID, 10) : null,
+      prTitle: process.env.CI_MERGE_REQUEST_TITLE || null,
+      commitSha: process.env.CI_COMMIT_SHA || null,
+      branch: process.env.CI_COMMIT_REF_NAME || null,
+      commitMessage: process.env.CI_COMMIT_MESSAGE || null
+    };
+  }
+  if (process.env.BITBUCKET_BUILD_NUMBER) {
+    return {
+      name: "bitbucket-pipelines",
+      prNumber: process.env.BITBUCKET_PR_ID ? parseInt(process.env.BITBUCKET_PR_ID, 10) : null,
+      prTitle: null,
+      commitSha: process.env.BITBUCKET_COMMIT || null,
+      branch: process.env.BITBUCKET_BRANCH || null,
+      commitMessage: process.env.BITBUCKET_COMMIT_MESSAGE || null
+    };
+  }
+  if (process.env.TF_BUILD === "True") {
+    return {
+      name: "azure-pipelines",
+      prNumber: process.env.SYSTEM_PULLREQUEST_PULLREQUESTID ? parseInt(process.env.SYSTEM_PULLREQUEST_PULLREQUESTID, 10) : null,
+      prTitle: null,
+      commitSha: process.env.BUILD_SOURCEVERSION || null,
+      branch: process.env.SYSTEM_PULLREQUEST_SOURCEBRANCH || process.env.BUILD_SOURCEBRANCHNAME || null,
+      commitMessage: process.env.BUILD_SOURCEVERSIONMESSAGE || null
+    };
+  }
+  if (process.env.TRAVIS === "true") {
+    const travisPR = process.env.TRAVIS_PULL_REQUEST;
+    return {
+      name: "travis-ci",
+      prNumber: travisPR && travisPR !== "false" ? parseInt(travisPR, 10) : null,
+      prTitle: null,
+      commitSha: process.env.TRAVIS_COMMIT || null,
+      branch: process.env.TRAVIS_PULL_REQUEST_BRANCH || process.env.TRAVIS_BRANCH || null,
+      commitMessage: process.env.TRAVIS_COMMIT_MESSAGE || null
+    };
+  }
+  if (process.env.JENKINS_URL) {
+    return {
+      name: "jenkins",
+      prNumber: extractJenkinsPRNumber(),
+      prTitle: null,
+      commitSha: process.env.GIT_COMMIT || null,
+      branch: process.env.CHANGE_BRANCH || process.env.GIT_BRANCH || null,
+      commitMessage: null
+    };
+  }
+  return null;
+}
+function extractGitHubPRNumber() {
+  const ref = process.env.GITHUB_REF;
+  if (process.env.GITHUB_EVENT_NAME === "pull_request" && ref) {
+    const match = ref.match(/refs\/pull\/(\d+)/);
+    if (match?.[1])
+      return parseInt(match[1], 10);
+  }
+  return null;
+}
+function extractCircleCIPRNumber() {
+  const url = process.env.CIRCLE_PULL_REQUEST;
+  if (url) {
+    const match = url.match(/\/pull\/(\d+)/);
+    if (match?.[1])
+      return parseInt(match[1], 10);
+  }
+  return null;
+}
+function extractJenkinsPRNumber() {
+  const changeId = process.env.CHANGE_ID;
+  if (changeId) {
+    const num = parseInt(changeId, 10);
+    if (!isNaN(num))
+      return num;
+  }
+  return null;
+}
+
 // src/commands/deploy/list.ts
 var deployListCommand = new Command2("list").description("List deployments for a site").argument("<siteSlug>", "Site slug").requiredOption("--org <orgSlug>", "Organization slug").option("--limit <number>", "Number of deployments to show", "10").action(async (siteSlug, options) => {
   const token = loadToken();
@@ -5333,8 +5566,8 @@ var deployRollbackCommand = new Command2("rollback").description("Rollback to a
     }
     const result = await res.json();
     console.log(`✅ ${result.message}`);
-    console.log(`   Deployment: ${result.deployment.id}`);
-    console.log(`   URL: ${result.deployment.url}`);
+    console.log(`   Deployment: ${result.data.deployment.id}`);
+    console.log(`   URL: ${result.data.deployment.url}`);
   } catch (err) {
     console.error("Failed to rollback:", err.message);
   }
@@ -5359,8 +5592,8 @@ var deployPromoteCommand = new Command2("promote").description("Promote a previe
     }
     const result = await res.json();
     console.log("Deployment promoted to production!");
-    console.log(`   Deployment: ${result.deployment.id}`);
-    console.log(`   URL: ${result.deployment.url}`);
+    console.log(`   Deployment: ${result.data.deployment.id}`);
+    console.log(`   URL: ${result.data.deployment.url}`);
   } catch (err) {
     const message = err instanceof Error ? err.message : "Unknown error";
     console.error("Failed to promote deployment:", message);
@@ -5493,7 +5726,7 @@ async function uploadArchive(token, uploadUrl, archive, onRetry) {
   });
   return res.ok;
 }
-var deployCommand = new Command2("deploy").description("Deploy a site").argument("[site]", "Site slug").option("--org <org>", "Organization slug").option("--dir <directory>", "Directory to deploy (default: auto-detect)").option("--build", "Run build command before deploying").option("--no-build", "Skip build step").option("--build-command <command>", "Override build command").option("--install", "Run install command before building").option("--preview", "Deploy without setting as current (preview only)").option("--no-verify", "Skip deployment verification").option("--no-auto-rollback", "Disable automatic rollback on verification failure").option("--pr <number>", "PR number (for GitHub Actions)").option("--pr-title <title>", "PR title").option("--commit <sha>", "Commit SHA").option("--commit-message <message>", "Commit message").option("--branch <branch>", "Branch name").option("--github-output", "Output deployment info in GitHub Actions format").enablePositionalOptions().addCommand(deployListCommand).addCommand(deployRollbackCommand).addCommand(deployPromoteCommand).action(async (siteSlugArg, options) => {
+var deployCommand = new Command2("deploy").description("Deploy a site").argument("[site]", "Site slug").option("--org <org>", "Organization slug").option("--dir <directory>", "Directory to deploy (default: auto-detect)").option("--build", "Run build command before deploying").option("--no-build", "Skip build step").option("--build-command <command>", "Override build command").option("--install", "Run install command before building").option("--preview", "Deploy without setting as current (preview only)").option("--prod", "Force production deploy (override auto-preview for PRs)").option("--no-verify", "Skip deployment verification").option("--no-auto-rollback", "Disable automatic rollback on verification failure").option("--pr <number>", "PR number (for GitHub Actions)").option("--pr-title <title>", "PR title").option("--commit <sha>", "Commit SHA").option("--commit-message <message>", "Commit message").option("--branch <branch>", "Branch name").option("--github-output", "Output deployment info in GitHub Actions format").enablePositionalOptions().addCommand(deployListCommand).addCommand(deployRollbackCommand).addCommand(deployPromoteCommand).action(async (siteSlugArg, options) => {
   const cwd = process.cwd();
   const token = loadToken();
   if (!token) {
@@ -5539,7 +5772,7 @@ var deployCommand = new Command2("deploy").description("Deploy a site").argument
         console.log(`Error: ${error.error || "Failed to create site"}`);
         return;
       }
-      const site = await createRes.json();
+      const { data: site } = await createRes.json();
       siteSlug = site.slug;
       console.log(`Created site: ${site.subdomain}.zerodeploy.app`);
       const configPath = getConfigPath(cwd);
@@ -5669,21 +5902,43 @@ Error: Build failed`);
   console.log(`Found ${files.length} files (${formatBytes2(totalSize)})`);
   try {
     const client = getClient(token);
+    const ci = detectCI();
+    if (ci) {
+      console.log(`Detected CI: ${ci.name}`);
+      if (ci.prNumber)
+        console.log(`  PR: #${ci.prNumber}`);
+      if (ci.commitSha)
+        console.log(`  Commit: ${ci.commitSha.slice(0, 7)}`);
+      if (ci.branch)
+        console.log(`  Branch: ${ci.branch}`);
+      console.log("");
+    }
+    const isPreview = options.preview === true || !options.prod && ci?.prNumber != null;
+    if (!options.preview && !options.prod && ci?.prNumber != null) {
+      console.log("Auto-preview enabled for PR deployment");
+      console.log("  Use --prod to deploy to production instead");
+      console.log("");
+    }
     const deployPayload = { siteSlug, orgSlug };
-    if (options.pr) {
-      deployPayload.prNumber = parseInt(options.pr, 10);
+    const prNumber = options.pr ? parseInt(options.pr, 10) : ci?.prNumber;
+    if (prNumber) {
+      deployPayload.prNumber = prNumber;
     }
-    if (options.prTitle) {
-      deployPayload.prTitle = options.prTitle;
+    const prTitle = options.prTitle ?? ci?.prTitle;
+    if (prTitle) {
+      deployPayload.prTitle = prTitle;
     }
-    if (options.commit) {
-      deployPayload.commitSha = options.commit;
+    const commitSha = options.commit ?? ci?.commitSha;
+    if (commitSha) {
+      deployPayload.commitSha = commitSha;
     }
-    if (options.commitMessage) {
-      deployPayload.commitMessage = options.commitMessage;
+    const commitMessage = options.commitMessage ?? ci?.commitMessage;
+    if (commitMessage) {
+      deployPayload.commitMessage = commitMessage;
     }
-    if (options.branch) {
-      deployPayload.branch = options.branch;
+    const branch = options.branch ?? ci?.branch;
+    if (branch) {
+      deployPayload.branch = branch;
     }
     const createRes = await client.deployments.$post({
       json: deployPayload
@@ -5693,7 +5948,7 @@ Error: Build failed`);
       displayError(parseApiError(body));
       return;
     }
-    const deployment = await createRes.json();
+    const { data: deployment } = await createRes.json();
     console.log(`Created deployment: ${deployment.id}`);
     const progressBar2 = createProgressBar({ total: files.length, label: "Archiving" });
     const archive = await createTarGz(files, (current, total) => {
@@ -5720,7 +5975,7 @@ Error: Build failed`);
         "Content-Type": "application/json",
         Authorization: `Bearer ${token}`
       },
-      body: JSON.stringify({ preview: options.preview || false })
+      body: JSON.stringify({ preview: isPreview })
     }, {
       maxRetries: 3,
       onRetry: (attempt, error, delayMs) => {
@@ -5732,7 +5987,7 @@ Error: Build failed`);
       return;
     }
     finalizeSpinner.stop();
-    const verifyUrl = options.preview ? deployment.previewUrl : deployment.url;
+    const verifyUrl = isPreview ? deployment.previewUrl : deployment.url;
     let verified = false;
     if (options.verify !== false) {
       const verifySpinner = createSpinner("Verifying...");
@@ -5748,7 +6003,7 @@ Error: Build failed`);
         } else if (verification.error) {
           console.log(`  ${verification.error}`);
         }
-        if (options.autoRollback !== false && !options.preview) {
+        if (options.autoRollback !== false && !isPreview) {
           console.log("");
           console.log("Auto-rolling back to previous deployment...");
           const rollback = await autoRollback(token, orgSlug, siteSlug, deployment.id);
@@ -5771,7 +6026,7 @@ Error: Build failed`);
       }
     }
     console.log("");
-    if (options.preview) {
+    if (isPreview) {
       console.log("Preview deployment created!");
       if (verified) {
         console.log(`Preview: ${deployment.previewUrl} (verified)`);
@@ -5799,12 +6054,15 @@ Error: Build failed`);
         appendFileSync(githubOutputFile, `deployment_url=${deployment.url}
 `);
         appendFileSync(githubOutputFile, `preview_url=${deployment.previewUrl}
+`);
+        appendFileSync(githubOutputFile, `is_preview=${isPreview}
 `);
       } else {
         console.log("");
         console.log("::set-output name=deployment_id::" + deployment.id);
         console.log("::set-output name=deployment_url::" + deployment.url);
         console.log("::set-output name=preview_url::" + deployment.previewUrl);
+        console.log("::set-output name=is_preview::" + isPreview);
       }
     }
   } catch (err) {
@@ -5820,20 +6078,24 @@ Error: Build failed`);
 });
 
 // src/commands/deployments/list.ts
-var deploymentsListCommand = new Command2("list").description("List deployments for a site").argument("<site>", "Site slug").requiredOption("--org <org>", "Organization slug").action(async (site, options) => {
+var deploymentsListCommand = new Command2("list").description("List deployments for a site").argument("<site>", "Site slug").requiredOption("--org <org>", "Organization slug").option("--json", "Output as JSON").action(async (site, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
     const res = await client.orgs[":orgSlug"].sites[":siteSlug"].deployments.$get({
       param: { orgSlug: options.org, siteSlug: site }
     });
-    if (!res.ok)
-      throw new Error(`API Error ${res.status}`);
+    if (!res.ok) {
+      await handleApiError(res);
+    }
     const { data: deployments } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(deployments, null, 2));
+      return;
+    }
     if (deployments.length === 0) {
       console.log("No deployments found.");
       return;
@@ -5856,8 +6118,9 @@ var deploymentsListCommand = new Command2("list").description("List deployments
       console.log();
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to list deployments:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to list deployments: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -5873,24 +6136,23 @@ function formatBytes3(bytes) {
 function formatStatus3(status) {
   switch (status) {
     case "pending":
-      return "⏳ Pending";
+      return "Pending";
     case "uploading":
-      return "\uD83D\uDCE4 Uploading";
+      return "Uploading";
     case "processing":
-      return "⚙️  Processing";
+      return "Processing";
     case "ready":
-      return "✅ Ready";
+      return "Ready";
     case "failed":
-      return "❌ Failed";
+      return "Failed";
     default:
       return status;
   }
 }
-var deploymentsShowCommand = new Command2("show").description("View deployment details").argument("<id>", "Deployment ID (full or short)").action(async (id) => {
+var deploymentsShowCommand = new Command2("show").description("View deployment details").argument("<id>", "Deployment ID (full or short)").option("--json", "Output as JSON").action(async (id, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -5899,15 +6161,20 @@ var deploymentsShowCommand = new Command2("show").description("View deployment d
     });
     if (!res.ok) {
       if (res.status === 404) {
-        console.error(`Deployment not found: ${id}`);
-        console.log();
-        console.log("Use the full deployment ID or at least 8 characters.");
-        return;
+        displayError({
+          code: "not_found",
+          message: `Deployment not found: ${id}`,
+          hint: "Use the full deployment ID or at least 8 characters."
+        });
+        process.exit(ExitCode.NOT_FOUND);
       }
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
+    }
+    const { data: d } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(d, null, 2));
+      return;
     }
-    const d = await res.json();
     console.log("Deployment Details");
     console.log("=".repeat(50));
     console.log();
@@ -5957,8 +6224,9 @@ var deploymentsShowCommand = new Command2("show").description("View deployment d
       console.log(`  zerodeploy rollback <site> --org <org> --to ${d.id.slice(0, 8)}`);
     }
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to get deployment:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to get deployment: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
@@ -5969,8 +6237,7 @@ var deploymentsCommand = new Command2("deployments").description("Manage deploym
 var rollbackCommand = new Command2("rollback").description("Rollback a site to a previous deployment").argument("<site>", "Site slug").requiredOption("--org <org>", "Organization slug").option("--to <deploymentId>", "Deployment ID to rollback to (defaults to previous deployment)").action(async (site, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
@@ -5979,13 +6246,14 @@ var rollbackCommand = new Command2("rollback").description("Rollback a site to a
       const listRes = await client.orgs[":orgSlug"].sites[":siteSlug"].deployments.$get({
         param: { orgSlug: options.org, siteSlug: site }
       });
-      if (!listRes.ok)
-        throw new Error(`API Error ${listRes.status}`);
+      if (!listRes.ok) {
+        await handleApiError(listRes);
+      }
       const { data: deployments } = await listRes.json();
       const readyDeployments = deployments.filter((d) => d.status === "ready");
       if (readyDeployments.length < 2) {
-        console.log("No previous deployment to rollback to.");
-        return;
+        displayError({ code: "validation_error", message: "No previous deployment to rollback to." });
+        process.exit(ExitCode.VALIDATION_ERROR);
       }
       const currentIndex = readyDeployments.findIndex((d) => d.is_current);
       if (currentIndex === -1 || currentIndex >= readyDeployments.length - 1) {
@@ -5998,138 +6266,402 @@ var rollbackCommand = new Command2("rollback").description("Rollback a site to a
       param: { id: deploymentId }
     });
     if (!res.ok) {
-      const error = await res.json();
-      throw new Error(error.error || `API Error ${res.status}`);
+      await handleApiError(res);
     }
     const result = await res.json();
-    const shortId = result.deployment.id.slice(0, 8);
-    const commit = result.deployment.commit_sha ? ` (${result.deployment.commit_sha.slice(0, 7)})` : "";
+    const shortId = result.data.deployment.id.slice(0, 8);
+    const commit = result.data.deployment.commit_sha ? ` (${result.data.deployment.commit_sha.slice(0, 7)})` : "";
     console.log(`Rolled back to deployment ${shortId}${commit}`);
-    console.log(`URL: ${result.deployment.url}`);
+    console.log(`URL: ${result.data.deployment.url}`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.error("Failed to rollback:", message);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to rollback: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/token/create.ts
-var tokenCreateCommand = new Command2("create").description("Create a deploy token for a site").argument("<name>", 'Token name (e.g., "GitHub Actions")').requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (name, options) => {
+var tokenCreateCommand = new Command2("create").description("Create an API token").argument("<name>", 'Token name (e.g., "GitHub Actions", "CI Pipeline")').option("--site <siteId>", "Create a site-scoped deploy token (instead of a PAT)").option("--org <orgSlug>", "Create an org-scoped deploy token (instead of a PAT)").option("--expires <days>", "Token expiration in days (default: never)", parseInt).option("--json", "Output as JSON").action(async (name, options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
+  }
+  if (options.site && options.org) {
+    displayError({ code: "validation_error", message: "--site and --org cannot be used together" });
+    process.exit(ExitCode.VALIDATION_ERROR);
   }
   try {
     const client = getClient(token);
-    const res = await client.orgs[":orgSlug"].sites[":siteSlug"].tokens.$post({
-      param: { orgSlug: options.org, siteSlug: options.site },
-      json: { name }
-    });
+    let scopeType = "user";
+    let permissions = ["*"];
+    if (options.site) {
+      scopeType = "site";
+      permissions = ["deploy"];
+    } else if (options.org) {
+      scopeType = "org";
+      permissions = ["deploy"];
+    }
+    const body = {
+      name,
+      scope_type: scopeType,
+      permissions
+    };
+    if (options.site) {
+      body.site_id = options.site;
+    }
+    if (options.org) {
+      body.org_slug = options.org;
+    }
+    if (options.expires) {
+      body.expires_in_days = options.expires;
+    }
+    const res = await client.tokens.$post({ json: body });
     if (!res.ok) {
-      const error = await res.json();
-      console.log(`Error: ${error.error || "Failed to create token"}`);
+      await handleApiError(res);
+    }
+    const { data: result } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(result, null, 2));
       return;
     }
-    const result = await res.json();
+    let typeLabel = "Personal Access Token (PAT)";
+    if (result.scope_type === "site") {
+      typeLabel = "Site Deploy Token";
+    } else if (result.scope_type === "org") {
+      typeLabel = "Org Deploy Token";
+    }
     console.log("");
-    console.log("Deploy token created successfully!");
+    console.log(`${typeLabel} created successfully!`);
     console.log("");
-    console.log(`Name:  ${result.name}`);
-    console.log(`ID:    ${result.id}`);
+    console.log(`Name:        ${result.name}`);
+    console.log(`ID:          ${result.id}`);
+    console.log(`Prefix:      ${result.token_prefix}`);
+    console.log(`Permissions: ${result.permissions.join(", ")}`);
+    if (result.org_slug) {
+      console.log(`Org:         ${result.org_slug}`);
+    }
+    if (result.expires_at) {
+      console.log(`Expires:     ${new Date(result.expires_at).toLocaleDateString()}`);
+    }
     console.log("");
     console.log("Token (save this - it will not be shown again):");
     console.log("");
     console.log(`  ${result.token}`);
     console.log("");
-    console.log("Usage in GitHub Actions:");
-    console.log("  Add this token as a repository secret named ZERODEPLOY_TOKEN");
+    if (result.scope_type === "site" || result.scope_type === "org") {
+      console.log("Usage in GitHub Actions:");
+      console.log("  Add this token as a repository secret named ZERODEPLOY_TOKEN");
+      if (result.scope_type === "org") {
+        console.log("  This token can deploy to any site in the organization.");
+      }
+    } else {
+      console.log("Usage:");
+      console.log("  Use this token in the Authorization header:");
+      console.log("  Authorization: Bearer <token>");
+    }
     console.log("");
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.log(`Failed to create token: ${message}`);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to create token: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/token/list.ts
-var tokenListCommand = new Command2("list").description("List deploy tokens for a site").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (options) => {
+var tokenListCommand = new Command2("list").description("List API tokens").option("--site <siteId>", "Filter by site ID (for site-scoped deploy tokens)").option("--org <orgId>", "Filter by org ID (for org-scoped deploy tokens)").option("--type <type>", "Filter by type: user (PAT), site, or org (deploy tokens)", "all").option("--json", "Output as JSON").action(async (options) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
-    const res = await client.orgs[":orgSlug"].sites[":siteSlug"].tokens.$get({
-      param: { orgSlug: options.org, siteSlug: options.site }
-    });
+    const query = {};
+    if (options.type === "user") {
+      query.scope_type = "user";
+    } else if (options.type === "site") {
+      query.scope_type = "site";
+    } else if (options.type === "org") {
+      query.scope_type = "org";
+    }
+    if (options.site) {
+      query.site_id = options.site;
+    }
+    if (options.org) {
+      query.org_id = options.org;
+    }
+    const res = await client.tokens.$get({ query });
     if (!res.ok) {
-      const error = await res.json();
-      console.log(`Error: ${error.error || "Failed to list tokens"}`);
-      return;
+      await handleApiError(res);
     }
     const { data: tokens } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(tokens, null, 2));
+      return;
+    }
     if (tokens.length === 0) {
-      console.log(`No deploy tokens for ${options.org}/${options.site}`);
+      console.log("No API tokens found");
+      if (options.type !== "all") {
+        console.log(`(filtered by type: ${options.type})`);
+      }
       return;
     }
-    console.log(`Deploy tokens for ${options.org}/${options.site}:`);
+    console.log("API Tokens:");
     console.log("");
     for (const t of tokens) {
       const created = new Date(t.created_at).toLocaleDateString();
       const lastUsed = t.last_used_at ? new Date(t.last_used_at).toLocaleDateString() : "Never";
-      console.log(`  ${t.id.slice(0, 8)}  ${t.name.padEnd(20)}  Created: ${created}  Last used: ${lastUsed}`);
+      const expires = t.expires_at ? new Date(t.expires_at).toLocaleDateString() : "Never";
+      let typeLabel = "PAT";
+      if (t.scope_type === "site") {
+        typeLabel = "Site";
+      } else if (t.scope_type === "org") {
+        typeLabel = "Org";
+      }
+      const permissions = t.permissions.join(", ");
+      console.log(`  ${t.token_prefix.padEnd(14)}  ${t.name.padEnd(20)}  [${typeLabel}]`);
+      console.log(`                  Created: ${created}  Last used: ${lastUsed}  Expires: ${expires}`);
+      console.log(`                  Permissions: ${permissions}`);
+      if (t.site_id) {
+        console.log(`                  Site ID: ${t.site_id}`);
+      }
+      if (t.org_slug) {
+        console.log(`                  Org: ${t.org_slug}`);
+      }
+      console.log("");
     }
-    console.log("");
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.log(`Failed to list tokens: ${message}`);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to list tokens: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/token/delete.ts
-var tokenDeleteCommand = new Command2("delete").description("Delete a deploy token").argument("<tokenId>", "Token ID (or first 8 characters)").requiredOption("--org <orgSlug>", "Organization slug").requiredOption("--site <siteSlug>", "Site slug").action(async (tokenId, options) => {
+var tokenDeleteCommand = new Command2("delete").description("Delete an API token").argument("<tokenId>", 'Token ID or token prefix (e.g., "zd_abc12345")').action(async (tokenIdOrPrefix) => {
   const token = loadToken();
   if (!token) {
-    console.log("Not logged in. Run: zerodeploy login");
-    return;
+    handleAuthError();
   }
   try {
     const client = getClient(token);
-    let fullTokenId = tokenId;
-    if (tokenId.length < 36) {
-      const listRes = await client.orgs[":orgSlug"].sites[":siteSlug"].tokens.$get({
-        param: { orgSlug: options.org, siteSlug: options.site }
-      });
+    let fullTokenId = tokenIdOrPrefix;
+    if (tokenIdOrPrefix.length < 36) {
+      const listRes = await client.tokens.$get({ query: {} });
       if (!listRes.ok) {
-        const error = await listRes.json();
-        console.log(`Error: ${error.error || "Failed to find token"}`);
-        return;
+        await handleApiError(listRes);
       }
       const { data: tokens } = await listRes.json();
-      const match = tokens.find((t) => t.id.startsWith(tokenId));
+      const match = tokens.find((t) => t.token_prefix === tokenIdOrPrefix || t.token_prefix.startsWith(tokenIdOrPrefix) || t.id.startsWith(tokenIdOrPrefix));
       if (!match) {
-        console.log(`Error: No token found starting with "${tokenId}"`);
-        return;
+        displayError({ code: "not_found", message: `No token found matching "${tokenIdOrPrefix}"`, hint: "Use `zerodeploy token list` to see available tokens" });
+        process.exit(ExitCode.NOT_FOUND);
       }
       fullTokenId = match.id;
+      console.log(`Found token: ${match.name} (${match.token_prefix})`);
     }
-    const res = await client.orgs[":orgSlug"].sites[":siteSlug"].tokens[":tokenId"].$delete({
-      param: { orgSlug: options.org, siteSlug: options.site, tokenId: fullTokenId }
+    const res = await client.tokens[":tokenId"].$delete({
+      param: { tokenId: fullTokenId }
     });
     if (!res.ok) {
-      const error = await res.json();
-      console.log(`Error: ${error.error || "Failed to delete token"}`);
-      return;
+      await handleApiError(res);
     }
     console.log("Token deleted successfully");
   } catch (err) {
-    const message = err instanceof Error ? err.message : "Unknown error";
-    console.log(`Failed to delete token: ${message}`);
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({ code: "network_error", message: `Failed to delete token: ${message}` });
+    process.exit(ExitCode.NETWORK_ERROR);
   }
 });
 
 // src/commands/token/index.ts
-var tokenCommand = new Command2("token").description("Manage deploy tokens for CI/CD").addCommand(tokenCreateCommand).addCommand(tokenListCommand).addCommand(tokenDeleteCommand);
+var tokenCommand = new Command2("token").description("Manage API tokens (PATs and deploy tokens)").addCommand(tokenCreateCommand).addCommand(tokenListCommand).addCommand(tokenDeleteCommand);
+
+// src/commands/billing/index.ts
+function formatCents(cents) {
+  return `$${(cents / 100).toFixed(2)}`;
+}
+function formatDate(dateStr) {
+  return new Date(dateStr).toLocaleDateString("en-US", {
+    year: "numeric",
+    month: "short",
+    day: "numeric"
+  });
+}
+function formatMonth(monthStr) {
+  const [year, month] = monthStr.split("-");
+  return new Date(Number(year), Number(month) - 1).toLocaleDateString("en-US", {
+    year: "numeric",
+    month: "long"
+  });
+}
+function getReasonLabel(reason) {
+  const labels = {
+    beta_credit: "Beta Credit",
+    promo_credit: "Promotional Credit",
+    support_credit: "Support Credit",
+    refund: "Refund"
+  };
+  return labels[reason] || reason;
+}
+var billingUsageCommand = new Command2("usage").description("Show account balance and current period usage").option("--json", "Output as JSON").action(async (options) => {
+  const token = loadToken();
+  if (!token) {
+    handleAuthError();
+  }
+  try {
+    const client = getClient(token);
+    const res = await client.billing.usage.$get();
+    if (!res.ok) {
+      await handleApiError(res);
+    }
+    const { data } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
+    }
+    console.log();
+    console.log("Account Balance");
+    console.log("───────────────");
+    const balanceColor = data.balance_cents > 0 ? "\x1B[32m" : "\x1B[33m";
+    const reset = "\x1B[0m";
+    console.log(`  Balance:     ${balanceColor}${data.balance_formatted}${reset}`);
+    console.log(`  Status:      ${data.billing_status}`);
+    console.log(`  Can Deploy:  ${data.can_deploy ? "\x1B[32mYes\x1B[0m" : "\x1B[31mNo\x1B[0m"}`);
+    if (!data.can_deploy) {
+      console.log();
+      console.log("\x1B[33m  ⚠ Add balance to enable deployments\x1B[0m");
+    }
+    console.log();
+    console.log("Current Period Usage");
+    console.log("────────────────────");
+    console.log(`  Period: ${formatDate(data.current_period.start)} - ${formatDate(data.current_period.end)}`);
+    console.log();
+    const usage = data.current_period.usage;
+    const included = data.current_period.included;
+    const cost = data.current_period.estimated_cost;
+    console.log("  Resource              Used        Included    Overage");
+    console.log("  ─────────────────────────────────────────────────────");
+    console.log(`  Storage               ${usage.storage_gb.toFixed(2)} GB     ${included.storage_gb} GB       ${cost.storage_cents > 0 ? formatCents(cost.storage_cents) : "-"}`);
+    console.log(`  Requests              ${usage.requests_millions.toFixed(2)}M       ${included.requests_millions}M         ${cost.requests_cents > 0 ? formatCents(cost.requests_cents) : "-"}`);
+    console.log(`  Form Submissions      ${usage.form_submissions}          ${included.form_submissions}         ${cost.forms_cents > 0 ? formatCents(cost.forms_cents) : "-"}`);
+    console.log(`  Custom Domains        ${usage.domains_count}            ${included.domains_count}           ${cost.domains_cents > 0 ? formatCents(cost.domains_cents) : "-"}`);
+    console.log();
+    console.log(`  Base:            ${formatCents(cost.base_cents)}/month`);
+    if (cost.usage_total_cents > 0) {
+      console.log(`  Usage:           +${formatCents(cost.usage_total_cents)}`);
+    }
+    console.log(`  ─────────────────────────────────────────────────────`);
+    console.log(`  Estimated Total: ${formatCents(cost.total_cents)}`);
+    console.log();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({
+      code: "network_error",
+      message: `Failed to fetch billing info: ${message}`
+    });
+    process.exit(ExitCode.NETWORK_ERROR);
+  }
+});
+var billingBillsCommand = new Command2("bills").description("Show billing history").option("--json", "Output as JSON").option("--limit <n>", "Number of bills to show", "10").action(async (options) => {
+  const token = loadToken();
+  if (!token) {
+    handleAuthError();
+  }
+  try {
+    const client = getClient(token);
+    const res = await client.billing.bills.$get({
+      query: { limit: options.limit }
+    });
+    if (!res.ok) {
+      await handleApiError(res);
+    }
+    const { data: bills, pagination } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify({ bills, pagination }, null, 2));
+      return;
+    }
+    console.log();
+    console.log("Billing History");
+    console.log("───────────────");
+    if (bills.length === 0) {
+      console.log("  No billing history yet");
+      console.log();
+      return;
+    }
+    console.log();
+    console.log("  Period              Status      Total");
+    console.log("  ─────────────────────────────────────");
+    for (const bill of bills) {
+      const statusColor = bill.status === "paid" ? "\x1B[32m" : bill.status === "finalized" ? "\x1B[33m" : "\x1B[90m";
+      const reset = "\x1B[0m";
+      console.log(`  ${formatMonth(bill.billing_month).padEnd(18)} ${statusColor}${bill.status.padEnd(10)}${reset} ${formatCents(bill.final_amount_cents)}`);
+    }
+    console.log();
+    if (pagination.total > bills.length) {
+      console.log(`  Showing ${bills.length} of ${pagination.total} bills`);
+      console.log();
+    }
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({
+      code: "network_error",
+      message: `Failed to fetch bills: ${message}`
+    });
+    process.exit(ExitCode.NETWORK_ERROR);
+  }
+});
+var billingAdjustmentsCommand = new Command2("adjustments").description("Show balance adjustment history (credits)").option("--json", "Output as JSON").option("--limit <n>", "Number of adjustments to show", "10").action(async (options) => {
+  const token = loadToken();
+  if (!token) {
+    handleAuthError();
+  }
+  try {
+    const client = getClient(token);
+    const res = await client.billing.adjustments.$get({
+      query: { limit: options.limit }
+    });
+    if (!res.ok) {
+      await handleApiError(res);
+    }
+    const { data: adjustments, pagination } = await res.json();
+    if (options.json) {
+      console.log(JSON.stringify({ adjustments, pagination }, null, 2));
+      return;
+    }
+    console.log();
+    console.log("Balance Adjustments");
+    console.log("───────────────────");
+    if (adjustments.length === 0) {
+      console.log("  No balance adjustments yet");
+      console.log();
+      return;
+    }
+    console.log();
+    console.log("  Date          Reason              Amount");
+    console.log("  ────────────────────────────────────────");
+    for (const adj of adjustments) {
+      console.log(`  ${formatDate(adj.created_at).padEnd(12)}  ${getReasonLabel(adj.reason).padEnd(18)} \x1B[32m+${formatCents(adj.amount_cents)}\x1B[0m`);
+      if (adj.description) {
+        console.log(`                ${adj.description}`);
+      }
+    }
+    console.log();
+    if (pagination.total > adjustments.length) {
+      console.log(`  Showing ${adjustments.length} of ${pagination.total} adjustments`);
+      console.log();
+    }
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    displayError({
+      code: "network_error",
+      message: `Failed to fetch adjustments: ${message}`
+    });
+    process.exit(ExitCode.NETWORK_ERROR);
+  }
+});
+var billingCommand = new Command2("billing").description("View account balance and billing information").addCommand(billingUsageCommand).addCommand(billingBillsCommand).addCommand(billingAdjustmentsCommand).action(async () => {
+  await billingUsageCommand.parseAsync(["usage"], { from: "user" });
+});
 
 // src/commands/init.ts
 import { writeFileSync, existsSync as existsSync2 } from "node:fs";
@@ -6282,9 +6814,136 @@ var accountCommand = new Command2("account").description("Manage your ZeroDeploy
   }
 }));
 
+// src/commands/inspect.ts
+var VERSION = "0.1.3";
+function getCommandByPath(rootCommand, path3) {
+  let current = rootCommand;
+  for (const name of path3) {
+    const subcommand = current.commands.find((cmd) => cmd.name() === name);
+    if (!subcommand) {
+      return null;
+    }
+    current = subcommand;
+  }
+  return current;
+}
+function extractArguments(cmd) {
+  const args = cmd.registeredArguments || [];
+  return args.map((arg) => {
+    const metadata = {
+      name: arg.name(),
+      description: arg.description || "",
+      required: arg.required
+    };
+    if (arg.defaultValue !== undefined) {
+      metadata.default = String(arg.defaultValue);
+    }
+    return metadata;
+  });
+}
+function extractOptions(cmd) {
+  const options = cmd.options || [];
+  return options.filter((opt) => {
+    const longName = opt.long?.replace(/^--/, "") || "";
+    return longName !== "help" && longName !== "version";
+  }).map((opt) => {
+    const longName = opt.long?.replace(/^--/, "") || "";
+    const shortName = opt.short?.replace(/^-/, "");
+    const metadata = {
+      name: longName,
+      description: opt.description || "",
+      required: opt.mandatory || false
+    };
+    if (shortName) {
+      metadata.short = shortName;
+    }
+    if (opt.flags.includes("<") || opt.flags.includes("[")) {
+      metadata.type = "string";
+    } else {
+      metadata.type = "boolean";
+    }
+    if (opt.defaultValue !== undefined && opt.defaultValue !== false) {
+      metadata.default = String(opt.defaultValue);
+    }
+    return metadata;
+  });
+}
+function generateExamples(cmd, fullPath) {
+  const examples = [];
+  const cmdPath = ["zerodeploy", ...fullPath].join(" ");
+  const args = cmd.registeredArguments || [];
+  let basicExample = cmdPath;
+  for (const arg of args) {
+    if (arg.required) {
+      basicExample += ` <${arg.name()}>`;
+    }
+  }
+  if (basicExample !== cmdPath || args.length === 0) {
+    examples.push(basicExample);
+  }
+  const cmdName = fullPath[fullPath.length - 1];
+  const parentName = fullPath[fullPath.length - 2];
+  if (cmdName === "list" && parentName === "org") {
+    examples.push("zerodeploy org list");
+  } else if (cmdName === "create" && parentName === "org") {
+    examples.push("zerodeploy org create my-company");
+  } else if (cmdName === "list" && parentName === "site") {
+    examples.push("zerodeploy site list acme");
+  } else if (cmdName === "create" && parentName === "site") {
+    examples.push('zerodeploy site create acme "My Site"');
+  } else if (cmdName === "deploy") {
+    examples.push("zerodeploy deploy");
+    examples.push("zerodeploy deploy ./dist --org acme --site web");
+  }
+  return examples;
+}
+function getCommandMetadata(rootCommand, path3) {
+  if (path3.length === 0) {
+    const commands = rootCommand.commands.map((cmd2) => cmd2.name()).filter((name) => name !== "help").sort();
+    return {
+      name: "zerodeploy",
+      version: VERSION,
+      commands
+    };
+  }
+  const cmd = getCommandByPath(rootCommand, path3);
+  if (!cmd) {
+    return { error: `Command not found: ${path3.join(" ")}` };
+  }
+  const metadata = {
+    name: cmd.name(),
+    description: cmd.description() || ""
+  };
+  const subcommands = cmd.commands.map((sub) => sub.name()).filter((name) => name !== "help");
+  if (subcommands.length > 0) {
+    metadata.subcommands = subcommands.sort();
+    return metadata;
+  }
+  metadata.usage = `zerodeploy ${path3.join(" ")}` + (cmd.registeredArguments || []).map((arg) => arg.required ? ` <${arg.name()}>` : ` [${arg.name()}]`).join("");
+  const args = extractArguments(cmd);
+  if (args.length > 0) {
+    metadata.arguments = args;
+  }
+  const options = extractOptions(cmd);
+  if (options.length > 0) {
+    metadata.options = options;
+  }
+  const examples = generateExamples(cmd, path3);
+  if (examples.length > 0) {
+    metadata.examples = [...new Set(examples)];
+  }
+  return metadata;
+}
+function createInspectCommand(rootProgram) {
+  return new Command2("inspect").description("Output command metadata as JSON (for LLM/automation use)").argument("[command...]", 'Command path to inspect (e.g., "org create")').action((commandPath) => {
+    const metadata = getCommandMetadata(rootProgram, commandPath || []);
+    console.log(JSON.stringify(metadata, null, 2));
+  });
+}
+
 // src/index.ts
 var program3 = new Command;
-program3.name("zerodeploy").description("ZeroDeploy CLI").version("0.1.0").enablePositionalOptions();
+program3.name("zerodeploy").description("ZeroDeploy CLI").version("0.1.3").enablePositionalOptions();
 program3.addCommand(loginCommand);
 program3.addCommand(logoutCommand);
 program3.addCommand(whoamiCommand);
@@ -6297,6 +6956,8 @@ program3.addCommand(deployCommand);
 program3.addCommand(deploymentsCommand);
 program3.addCommand(rollbackCommand);
 program3.addCommand(tokenCommand);
+program3.addCommand(billingCommand);
 program3.addCommand(initCommand);
 program3.addCommand(accountCommand);
+program3.addCommand(createInspectCommand(program3));
 program3.parse(process.argv);