@better-webhook/cli 0.3.0 → 0.3.1

package/dist/index.cjs

@@ -1,5 +1,27 @@
 #!/usr/bin/env node
 "use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 
 // src/index.ts
 var import_commander4 = require("commander");
@@ -7,33 +29,11 @@ var import_commander4 = require("commander");
 // src/commands/webhooks.ts
 var import_commander = require("commander");
 var import_path2 = require("path");
-var import_fs3 = require("fs");
+var import_fs2 = require("fs");
 
 // src/utils/index.ts
 var import_fs = require("fs");
 var import_path = require("path");
-function findWebhooksDir(cwd) {
-  return (0, import_path.resolve)(cwd, ".webhooks");
-}
-function listWebhookFiles(dir) {
-  return listJsonFiles(dir);
-}
-function findCapturesDir(cwd) {
-  return (0, import_path.resolve)(cwd, ".webhook-captures");
-}
-function listJsonFiles(dir) {
-  try {
-    const entries = (0, import_fs.readdirSync)(dir);
-    return entries.filter(
-      (e) => (0, import_fs.statSync)((0, import_path.join)(dir, e)).isFile() && (0, import_path.extname)(e) === ".json"
-    );
-  } catch {
-    return [];
-  }
-}
-
-// src/loader.ts
-var import_fs2 = require("fs");
 
 // src/schema.ts
 var import_zod = require("zod");
@@ -69,24 +69,7 @@ ${issues}`);
   return parsed.data;
 }
 
-// src/loader.ts
-function loadWebhookFile(path) {
-  let rawContent;
-  try {
-    rawContent = (0, import_fs2.readFileSync)(path, "utf8");
-  } catch (e) {
-    throw new Error(`Failed to read file ${path}: ${e.message}`);
-  }
-  let json;
-  try {
-    json = JSON.parse(rawContent);
-  } catch (e) {
-    throw new Error(`Invalid JSON in file ${path}: ${e.message}`);
-  }
-  return validateWebhookJSON(json, path);
-}
-
-// src/http.ts
+// src/utils/http.ts
 var import_undici = require("undici");
 async function executeWebhook(def) {
   const headerMap = {};
@@ -122,16 +105,58 @@ async function executeWebhook(def) {
   };
 }
 
+// src/utils/index.ts
+function findWebhooksDir(cwd) {
+  return (0, import_path.resolve)(cwd, ".webhooks");
+}
+function listWebhookFiles(dir) {
+  return listJsonFiles(dir);
+}
+function findCapturesDir(cwd) {
+  return (0, import_path.resolve)(cwd, ".webhook-captures");
+}
+function listJsonFiles(dir) {
+  try {
+    const entries = (0, import_fs.readdirSync)(dir);
+    return entries.filter(
+      (e) => (0, import_fs.statSync)((0, import_path.join)(dir, e)).isFile() && (0, import_path.extname)(e) === ".json"
+    );
+  } catch {
+    return [];
+  }
+}
+function loadWebhookFile(path) {
+  let rawContent;
+  try {
+    rawContent = (0, import_fs.readFileSync)(path, "utf8");
+  } catch (e) {
+    throw new Error(`Failed to read file ${path}: ${e.message}`);
+  }
+  let json;
+  try {
+    json = JSON.parse(rawContent);
+  } catch (e) {
+    throw new Error(`Invalid JSON in file ${path}: ${e.message}`);
+  }
+  return validateWebhookJSON(json, path);
+}
+
 // src/commands/webhooks.ts
-var import_fs4 = require("fs");
+var import_fs3 = require("fs");
 var import_undici2 = require("undici");
+
+// src/config.ts
 var TEMPLATE_REPO_BASE = "https://raw.githubusercontent.com/endalk200/better-webhook/main";
 var TEMPLATES = {
   "stripe-invoice.payment_succeeded": "templates/stripe-invoice.payment_succeeded.json"
 };
+
+// src/commands/webhooks.ts
+var import_prompts = __toESM(require("prompts"), 1);
+var import_ora = __toESM(require("ora"), 1);
 function statExists(p) {
   try {
-    (0, import_fs3.statSync)(p);
+    (0, import_fs2.statSync)(p);
     return true;
   } catch {
     return false;
@@ -142,27 +167,127 @@ var listCommand = new import_commander.Command().name("list").description("List
   const dir = findWebhooksDir(cwd);
   const files = listWebhookFiles(dir);
   if (!files.length) {
-    console.log("No webhook definitions found in .webhooks");
+    console.log("\u{1F4ED} No webhook definitions found in .webhooks directory.");
+    console.log("\u{1F4A1} Create webhook files or download templates with:");
+    console.log("   better-webhook webhooks download --all");
     return;
   }
-  files.forEach((f) => console.log((0, import_path2.basename)(f, ".json")));
+  console.log("Available webhook definitions:");
+  files.forEach((f) => console.log(`  \u2022 ${(0, import_path2.basename)(f, ".json")}`));
 });
-var runCommand = new import_commander.Command().name("run").argument("<nameOrPath>", "Webhook name (in .webhooks) or path to JSON file").description(
+var runCommand = new import_commander.Command().name("run").argument(
+  "[nameOrPath]",
+  "Webhook name (in .webhooks) or path to JSON file (optional - will prompt if not provided)"
+).description(
   "Run a webhook by name (in .webhooks) or by providing a path to a JSON file"
-).option("-u, --url <url>", "Override destination URL").option("-m, --method <method>", "Override HTTP method").action(async (nameOrPath, options) => {
+).option("-u, --url <url>", "Override destination URL").option("-m, --method <method>", "Override HTTP method").action(async (nameOrPath, options = {}) => {
   const cwd = process.cwd();
+  const webhooksDir = findWebhooksDir(cwd);
+  let selectedNameOrPath = nameOrPath;
+  if (!selectedNameOrPath) {
+    const spinner = (0, import_ora.default)("Loading available webhooks...").start();
+    const localFiles = listWebhookFiles(webhooksDir);
+    const templates = Object.keys(TEMPLATES);
+    spinner.stop();
+    if (localFiles.length === 0 && templates.length === 0) {
+      console.log("\u{1F4ED} No webhook definitions found.");
+      console.log(
+        "\u{1F4A1} Create webhook files in .webhooks directory or download templates with:"
+      );
+      console.log("   better-webhook webhooks download --all");
+      return;
+    }
+    const choices = [];
+    if (localFiles.length > 0) {
+      choices.push(
+        {
+          title: "--- Local Webhooks (.webhooks) ---",
+          description: "",
+          value: "",
+          type: "separator"
+        },
+        ...localFiles.map((file) => ({
+          title: (0, import_path2.basename)(file, ".json"),
+          description: `Local file: ${file}`,
+          value: (0, import_path2.basename)(file, ".json"),
+          type: "local"
+        }))
+      );
+    }
+    if (templates.length > 0) {
+      choices.push(
+        {
+          title: "--- Available Templates ---",
+          description: "",
+          value: "",
+          type: "separator"
+        },
+        ...templates.map((template) => ({
+          title: template,
+          description: `Template: ${TEMPLATES[template]}`,
+          value: template,
+          type: "template"
+        }))
+      );
+    }
+    const response = await (0, import_prompts.default)({
+      type: "select",
+      name: "webhook",
+      message: "Select a webhook to run:",
+      choices: choices.filter((choice) => choice.value !== ""),
+      // Remove separators for selection
+      initial: 0
+    });
+    if (!response.webhook) {
+      console.log("\u274C No webhook selected. Exiting.");
+      process.exitCode = 1;
+      return;
+    }
+    selectedNameOrPath = response.webhook;
+    if (selectedNameOrPath && templates.includes(selectedNameOrPath)) {
+      const downloadSpinner = (0, import_ora.default)(
+        `Downloading template: ${selectedNameOrPath}...`
+      ).start();
+      try {
+        const rel = TEMPLATES[selectedNameOrPath];
+        const rawUrl = `${TEMPLATE_REPO_BASE}/${rel}`;
+        const { statusCode, body } = await (0, import_undici2.request)(rawUrl);
+        if (statusCode !== 200) {
+          throw new Error(`HTTP ${statusCode}`);
+        }
+        const text = await body.text();
+        const json = JSON.parse(text);
+        validateWebhookJSON(json, rawUrl);
+        (0, import_fs3.mkdirSync)(webhooksDir, { recursive: true });
+        const fileName = (0, import_path2.basename)(rel);
+        const destPath = (0, import_path2.join)(webhooksDir, fileName);
+        (0, import_fs3.writeFileSync)(destPath, JSON.stringify(json, null, 2));
+        selectedNameOrPath = (0, import_path2.basename)(fileName, ".json");
+        downloadSpinner.succeed(`Downloaded template: ${selectedNameOrPath}`);
+      } catch (error) {
+        downloadSpinner.fail(`Failed to download template: ${error.message}`);
+        process.exitCode = 1;
+        return;
+      }
+    }
+  }
+  if (!selectedNameOrPath) {
+    console.error("\u274C No webhook selected.");
+    process.exitCode = 1;
+    return;
+  }
   let filePath;
-  if (nameOrPath.endsWith(".json") && !nameOrPath.includes("/") && !nameOrPath.startsWith(".")) {
-    filePath = (0, import_path2.join)(findWebhooksDir(cwd), nameOrPath);
+  if (selectedNameOrPath.endsWith(".json") && !selectedNameOrPath.includes("/") && !selectedNameOrPath.startsWith(".")) {
+    filePath = (0, import_path2.join)(webhooksDir, selectedNameOrPath);
   } else {
     const candidate = (0, import_path2.join)(
-      findWebhooksDir(cwd),
-      nameOrPath + (nameOrPath.endsWith(".json") ? "" : ".json")
+      webhooksDir,
+      selectedNameOrPath + (selectedNameOrPath.endsWith(".json") ? "" : ".json")
     );
     if (statExists(candidate)) {
       filePath = candidate;
     } else {
-      filePath = (0, import_path2.resolve)(cwd, nameOrPath);
+      filePath = (0, import_path2.resolve)(cwd, selectedNameOrPath);
     }
   }
   if (!statExists(filePath)) {
@@ -181,8 +306,12 @@ var runCommand = new import_commander.Command().name("run").argument("<nameOrPat
   if (options.url) def = { ...def, url: options.url };
   if (options.method)
     def = { ...def, method: options.method.toUpperCase() };
+  const executeSpinner = (0, import_ora.default)(
+    `Executing webhook: ${(0, import_path2.basename)(filePath, ".json")}...`
+  ).start();
   try {
     const result = await executeWebhook(def);
+    executeSpinner.succeed("Webhook executed successfully!");
     console.log("Status:", result.status);
     console.log("Headers:");
     for (const [k, v] of Object.entries(result.headers)) {
@@ -196,7 +325,8 @@ var runCommand = new import_commander.Command().name("run").argument("<nameOrPat
       console.log(result.bodyText);
     }
   } catch (err) {
-    console.error("Request failed:", err.message);
+    executeSpinner.fail("Request failed");
+    console.error("Error:", err.message);
     process.exitCode = 1;
   }
 });
@@ -211,7 +341,7 @@ var downloadCommand = new import_commander.Command().name("download").argument("
     }
     const cwd = process.cwd();
     const dir = findWebhooksDir(cwd);
-    (0, import_fs4.mkdirSync)(dir, { recursive: true });
+    (0, import_fs3.mkdirSync)(dir, { recursive: true });
     const toDownload = opts.all ? Object.keys(TEMPLATES) : name ? [name] : [];
     if (!toDownload.length) {
       console.log("Available templates:");
@@ -254,13 +384,13 @@ var downloadCommand = new import_commander.Command().name("download").argument("
         }
         const fileName = (0, import_path2.basename)(rel);
         const destPath = (0, import_path2.join)(dir, fileName);
-        if ((0, import_fs4.existsSync)(destPath) && !opts.force) {
+        if ((0, import_fs3.existsSync)(destPath) && !opts.force) {
           console.log(
             `Skipping existing file ${fileName} (use --force to overwrite)`
           );
           continue;
         }
-        (0, import_fs4.writeFileSync)(destPath, JSON.stringify(json, null, 2));
+        (0, import_fs3.writeFileSync)(destPath, JSON.stringify(json, null, 2));
         console.log(`Downloaded ${templateName} -> .webhooks/${fileName}`);
       } catch (e) {
         console.error(`Error downloading ${templateName}: ${e.message}`);
@@ -272,12 +402,12 @@ var webhooks = new import_commander.Command().name("webhooks").description("Mana
 
 // src/commands/capture.ts
 var import_commander2 = require("commander");
-var import_fs7 = require("fs");
+var import_fs6 = require("fs");
 var import_path5 = require("path");
 
 // src/capture.ts
 var import_http2 = require("http");
-var import_fs5 = require("fs");
+var import_fs4 = require("fs");
 var import_path3 = require("path");
 var import_crypto = require("crypto");
 var WebhookCaptureServer = class {
@@ -285,8 +415,8 @@ var WebhookCaptureServer = class {
   capturesDir;
   constructor(capturesDir) {
     this.capturesDir = capturesDir;
-    if (!(0, import_fs5.existsSync)(capturesDir)) {
-      (0, import_fs5.mkdirSync)(capturesDir, { recursive: true });
+    if (!(0, import_fs4.existsSync)(capturesDir)) {
+      (0, import_fs4.mkdirSync)(capturesDir, { recursive: true });
     }
   }
   start(startPort = 3001, maxAttempts = 20) {
@@ -408,7 +538,7 @@ var WebhookCaptureServer = class {
     const filename = `${timestamp.replace(/[:.]/g, "-")}_${id}.json`;
     const filepath = (0, import_path3.join)(this.capturesDir, filename);
     try {
-      (0, import_fs5.writeFileSync)(filepath, JSON.stringify(captured, null, 2));
+      (0, import_fs4.writeFileSync)(filepath, JSON.stringify(captured, null, 2));
       console.log(
         `\u{1F4E6} Captured ${req.method} ${urlParts.pathname} -> ${filename}`
       );
@@ -440,7 +570,7 @@ var WebhookCaptureServer = class {
 };
 
 // src/replay.ts
-var import_fs6 = require("fs");
+var import_fs5 = require("fs");
 var import_path4 = require("path");
 var WebhookReplayer = class {
   constructor(capturesDir) {
@@ -482,7 +612,7 @@ var WebhookReplayer = class {
       filepath = (0, import_path4.join)(this.capturesDir, files[0] ?? "");
     }
     try {
-      const content = (0, import_fs6.readFileSync)(filepath, "utf8");
+      const content = (0, import_fs5.readFileSync)(filepath, "utf8");
       return JSON.parse(content);
     } catch (error) {
       throw new Error(
@@ -626,9 +756,9 @@ var templateCommand = new import_commander2.Command().name("template").argument(
         templateName = `captured_${date}_${pathPart}_${capture2.id}`;
       }
       const outputDir = options?.outputDir ? (0, import_path5.resolve)(cwd, options.outputDir) : findWebhooksDir(cwd);
-      (0, import_fs7.mkdirSync)(outputDir, { recursive: true });
+      (0, import_fs6.mkdirSync)(outputDir, { recursive: true });
       const templatePath = (0, import_path5.join)(outputDir, `${templateName}.json`);
-      (0, import_fs7.writeFileSync)(templatePath, JSON.stringify(template, null, 2));
+      (0, import_fs6.writeFileSync)(templatePath, JSON.stringify(template, null, 2));
       console.log(`\u2705 Template created: ${templatePath}`);
       console.log(
         `\u{1F504} Run it with: better-webhook webhooks run ${templateName}`
@@ -666,7 +796,15 @@ var capture = new import_commander2.Command().name("capture").description(
 
 // src/commands/replay.ts
 var import_commander3 = require("commander");
-var replay = new import_commander3.Command().name("replay").argument("<captureId>", "ID of the captured webhook to replay").argument("<targetUrl>", "Target URL to replay the webhook to").description("Replay a captured webhook to a target URL").option("-m, --method <method>", "Override HTTP method").option(
+var import_prompts2 = __toESM(require("prompts"), 1);
+var import_ora2 = __toESM(require("ora"), 1);
+var replay = new import_commander3.Command().name("replay").argument(
+  "[captureId]",
+  "ID of the captured webhook to replay (optional - will prompt if not provided)"
+).argument(
+  "[targetUrl]",
+  "Target URL to replay the webhook to (optional - will prompt if not provided)"
+).description("Replay a captured webhook to a target URL").option("-m, --method <method>", "Override HTTP method").option(
   "-H, --header <header>",
   "Add custom header (format: key:value)",
   (value, previous) => {
@@ -681,15 +819,77 @@ var replay = new import_commander3.Command().name("replay").argument("<captureId
   },
   []
 ).action(
-  async (captureId, targetUrl, options) => {
+  async (captureId, targetUrl, options = {}) => {
     const cwd = process.cwd();
     const capturesDir = findCapturesDir(cwd);
     const replayer = new WebhookReplayer(capturesDir);
-    try {
-      const result = await replayer.replay(captureId, targetUrl, {
-        method: options.method,
-        headers: options.header
+    const spinner = (0, import_ora2.default)("Loading captured webhooks...").start();
+    const captured = replayer.listCaptured();
+    spinner.stop();
+    if (captured.length === 0) {
+      console.log("\u{1F4ED} No captured webhooks found.");
+      console.log(
+        "\u{1F4A1} Run 'better-webhook capture' to start capturing webhooks first."
+      );
+      return;
+    }
+    let selectedCaptureId = captureId;
+    let selectedTargetUrl = targetUrl;
+    if (!selectedCaptureId) {
+      const choices = captured.map((c) => {
+        const date = new Date(c.capture.timestamp).toLocaleString();
+        const bodySize = c.capture.rawBody?.length ?? 0;
+        return {
+          title: `${c.capture.id} - ${c.capture.method} ${c.capture.url}`,
+          description: `${date} | Body: ${bodySize} bytes`,
+          value: c.capture.id
+        };
+      });
+      const response = await (0, import_prompts2.default)({
+        type: "select",
+        name: "captureId",
+        message: "Select a captured webhook to replay:",
+        choices,
+        initial: 0
+      });
+      if (!response.captureId) {
+        console.log("\u274C No webhook selected. Exiting.");
+        process.exitCode = 1;
+        return;
+      }
+      selectedCaptureId = response.captureId;
+    }
+    if (!selectedTargetUrl) {
+      const response = await (0, import_prompts2.default)({
+        type: "text",
+        name: "targetUrl",
+        message: "Enter the target URL to replay to:",
+        initial: "http://localhost:3000/webhook",
+        validate: (value) => {
+          try {
+            new URL(value);
+            return true;
+          } catch {
+            return "Please enter a valid URL";
+          }
+        }
       });
+      if (!response.targetUrl) {
+        console.log("\u274C No target URL provided. Exiting.");
+        process.exitCode = 1;
+        return;
+      }
+      selectedTargetUrl = response.targetUrl;
+    }
+    try {
+      const result = await replayer.replay(
+        selectedCaptureId,
+        selectedTargetUrl,
+        {
+          method: options.method,
+          headers: options.header
+        }
+      );
       console.log("\u2705 Replay completed successfully!");
       console.log("Status:", result.status);
       console.log("Headers:");

package/dist/index.js

@@ -9,30 +9,8 @@ import { join as join2, resolve as resolve2, basename } from "path";
 import { statSync as statSync2 } from "fs";
 
 // src/utils/index.ts
-import { readdirSync, statSync } from "fs";
+import { readdirSync, readFileSync, statSync } from "fs";
 import { join, resolve, extname } from "path";
-function findWebhooksDir(cwd) {
-  return resolve(cwd, ".webhooks");
-}
-function listWebhookFiles(dir) {
-  return listJsonFiles(dir);
-}
-function findCapturesDir(cwd) {
-  return resolve(cwd, ".webhook-captures");
-}
-function listJsonFiles(dir) {
-  try {
-    const entries = readdirSync(dir);
-    return entries.filter(
-      (e) => statSync(join(dir, e)).isFile() && extname(e) === ".json"
-    );
-  } catch {
-    return [];
-  }
-}
-
-// src/loader.ts
-import { readFileSync } from "fs";
 
 // src/schema.ts
 import { z } from "zod";
@@ -68,24 +46,7 @@ ${issues}`);
   return parsed.data;
 }
 
-// src/loader.ts
-function loadWebhookFile(path) {
-  let rawContent;
-  try {
-    rawContent = readFileSync(path, "utf8");
-  } catch (e) {
-    throw new Error(`Failed to read file ${path}: ${e.message}`);
-  }
-  let json;
-  try {
-    json = JSON.parse(rawContent);
-  } catch (e) {
-    throw new Error(`Invalid JSON in file ${path}: ${e.message}`);
-  }
-  return validateWebhookJSON(json, path);
-}
-
-// src/http.ts
+// src/utils/http.ts
 import { request } from "undici";
 async function executeWebhook(def) {
   const headerMap = {};
@@ -121,13 +82,55 @@ async function executeWebhook(def) {
   };
 }
 
+// src/utils/index.ts
+function findWebhooksDir(cwd) {
+  return resolve(cwd, ".webhooks");
+}
+function listWebhookFiles(dir) {
+  return listJsonFiles(dir);
+}
+function findCapturesDir(cwd) {
+  return resolve(cwd, ".webhook-captures");
+}
+function listJsonFiles(dir) {
+  try {
+    const entries = readdirSync(dir);
+    return entries.filter(
+      (e) => statSync(join(dir, e)).isFile() && extname(e) === ".json"
+    );
+  } catch {
+    return [];
+  }
+}
+function loadWebhookFile(path) {
+  let rawContent;
+  try {
+    rawContent = readFileSync(path, "utf8");
+  } catch (e) {
+    throw new Error(`Failed to read file ${path}: ${e.message}`);
+  }
+  let json;
+  try {
+    json = JSON.parse(rawContent);
+  } catch (e) {
+    throw new Error(`Invalid JSON in file ${path}: ${e.message}`);
+  }
+  return validateWebhookJSON(json, path);
+}
+
 // src/commands/webhooks.ts
 import { mkdirSync, writeFileSync, existsSync } from "fs";
 import { request as request2 } from "undici";
+
+// src/config.ts
 var TEMPLATE_REPO_BASE = "https://raw.githubusercontent.com/endalk200/better-webhook/main";
 var TEMPLATES = {
   "stripe-invoice.payment_succeeded": "templates/stripe-invoice.payment_succeeded.json"
 };
+
+// src/commands/webhooks.ts
+import prompts from "prompts";
+import ora from "ora";
 function statExists(p) {
   try {
     statSync2(p);
@@ -141,27 +144,127 @@ var listCommand = new Command().name("list").description("List available webhook
   const dir = findWebhooksDir(cwd);
   const files = listWebhookFiles(dir);
   if (!files.length) {
-    console.log("No webhook definitions found in .webhooks");
+    console.log("\u{1F4ED} No webhook definitions found in .webhooks directory.");
+    console.log("\u{1F4A1} Create webhook files or download templates with:");
+    console.log("   better-webhook webhooks download --all");
     return;
   }
-  files.forEach((f) => console.log(basename(f, ".json")));
+  console.log("Available webhook definitions:");
+  files.forEach((f) => console.log(`  \u2022 ${basename(f, ".json")}`));
 });
-var runCommand = new Command().name("run").argument("<nameOrPath>", "Webhook name (in .webhooks) or path to JSON file").description(
+var runCommand = new Command().name("run").argument(
+  "[nameOrPath]",
+  "Webhook name (in .webhooks) or path to JSON file (optional - will prompt if not provided)"
+).description(
   "Run a webhook by name (in .webhooks) or by providing a path to a JSON file"
-).option("-u, --url <url>", "Override destination URL").option("-m, --method <method>", "Override HTTP method").action(async (nameOrPath, options) => {
+).option("-u, --url <url>", "Override destination URL").option("-m, --method <method>", "Override HTTP method").action(async (nameOrPath, options = {}) => {
   const cwd = process.cwd();
+  const webhooksDir = findWebhooksDir(cwd);
+  let selectedNameOrPath = nameOrPath;
+  if (!selectedNameOrPath) {
+    const spinner = ora("Loading available webhooks...").start();
+    const localFiles = listWebhookFiles(webhooksDir);
+    const templates = Object.keys(TEMPLATES);
+    spinner.stop();
+    if (localFiles.length === 0 && templates.length === 0) {
+      console.log("\u{1F4ED} No webhook definitions found.");
+      console.log(
+        "\u{1F4A1} Create webhook files in .webhooks directory or download templates with:"
+      );
+      console.log("   better-webhook webhooks download --all");
+      return;
+    }
+    const choices = [];
+    if (localFiles.length > 0) {
+      choices.push(
+        {
+          title: "--- Local Webhooks (.webhooks) ---",
+          description: "",
+          value: "",
+          type: "separator"
+        },
+        ...localFiles.map((file) => ({
+          title: basename(file, ".json"),
+          description: `Local file: ${file}`,
+          value: basename(file, ".json"),
+          type: "local"
+        }))
+      );
+    }
+    if (templates.length > 0) {
+      choices.push(
+        {
+          title: "--- Available Templates ---",
+          description: "",
+          value: "",
+          type: "separator"
+        },
+        ...templates.map((template) => ({
+          title: template,
+          description: `Template: ${TEMPLATES[template]}`,
+          value: template,
+          type: "template"
+        }))
+      );
+    }
+    const response = await prompts({
+      type: "select",
+      name: "webhook",
+      message: "Select a webhook to run:",
+      choices: choices.filter((choice) => choice.value !== ""),
+      // Remove separators for selection
+      initial: 0
+    });
+    if (!response.webhook) {
+      console.log("\u274C No webhook selected. Exiting.");
+      process.exitCode = 1;
+      return;
+    }
+    selectedNameOrPath = response.webhook;
+    if (selectedNameOrPath && templates.includes(selectedNameOrPath)) {
+      const downloadSpinner = ora(
+        `Downloading template: ${selectedNameOrPath}...`
+      ).start();
+      try {
+        const rel = TEMPLATES[selectedNameOrPath];
+        const rawUrl = `${TEMPLATE_REPO_BASE}/${rel}`;
+        const { statusCode, body } = await request2(rawUrl);
+        if (statusCode !== 200) {
+          throw new Error(`HTTP ${statusCode}`);
+        }
+        const text = await body.text();
+        const json = JSON.parse(text);
+        validateWebhookJSON(json, rawUrl);
+        mkdirSync(webhooksDir, { recursive: true });
+        const fileName = basename(rel);
+        const destPath = join2(webhooksDir, fileName);
+        writeFileSync(destPath, JSON.stringify(json, null, 2));
+        selectedNameOrPath = basename(fileName, ".json");
+        downloadSpinner.succeed(`Downloaded template: ${selectedNameOrPath}`);
+      } catch (error) {
+        downloadSpinner.fail(`Failed to download template: ${error.message}`);
+        process.exitCode = 1;
+        return;
+      }
+    }
+  }
+  if (!selectedNameOrPath) {
+    console.error("\u274C No webhook selected.");
+    process.exitCode = 1;
+    return;
+  }
   let filePath;
-  if (nameOrPath.endsWith(".json") && !nameOrPath.includes("/") && !nameOrPath.startsWith(".")) {
-    filePath = join2(findWebhooksDir(cwd), nameOrPath);
+  if (selectedNameOrPath.endsWith(".json") && !selectedNameOrPath.includes("/") && !selectedNameOrPath.startsWith(".")) {
+    filePath = join2(webhooksDir, selectedNameOrPath);
   } else {
     const candidate = join2(
-      findWebhooksDir(cwd),
-      nameOrPath + (nameOrPath.endsWith(".json") ? "" : ".json")
+      webhooksDir,
+      selectedNameOrPath + (selectedNameOrPath.endsWith(".json") ? "" : ".json")
     );
     if (statExists(candidate)) {
       filePath = candidate;
     } else {
-      filePath = resolve2(cwd, nameOrPath);
+      filePath = resolve2(cwd, selectedNameOrPath);
     }
   }
   if (!statExists(filePath)) {
@@ -180,8 +283,12 @@ var runCommand = new Command().name("run").argument("<nameOrPath>", "Webhook nam
   if (options.url) def = { ...def, url: options.url };
   if (options.method)
     def = { ...def, method: options.method.toUpperCase() };
+  const executeSpinner = ora(
+    `Executing webhook: ${basename(filePath, ".json")}...`
+  ).start();
   try {
     const result = await executeWebhook(def);
+    executeSpinner.succeed("Webhook executed successfully!");
     console.log("Status:", result.status);
     console.log("Headers:");
     for (const [k, v] of Object.entries(result.headers)) {
@@ -195,7 +302,8 @@ var runCommand = new Command().name("run").argument("<nameOrPath>", "Webhook nam
       console.log(result.bodyText);
     }
   } catch (err) {
-    console.error("Request failed:", err.message);
+    executeSpinner.fail("Request failed");
+    console.error("Error:", err.message);
     process.exitCode = 1;
   }
 });
@@ -665,7 +773,15 @@ var capture = new Command2().name("capture").description(
 
 // src/commands/replay.ts
 import { Command as Command3 } from "commander";
-var replay = new Command3().name("replay").argument("<captureId>", "ID of the captured webhook to replay").argument("<targetUrl>", "Target URL to replay the webhook to").description("Replay a captured webhook to a target URL").option("-m, --method <method>", "Override HTTP method").option(
+import prompts2 from "prompts";
+import ora2 from "ora";
+var replay = new Command3().name("replay").argument(
+  "[captureId]",
+  "ID of the captured webhook to replay (optional - will prompt if not provided)"
+).argument(
+  "[targetUrl]",
+  "Target URL to replay the webhook to (optional - will prompt if not provided)"
+).description("Replay a captured webhook to a target URL").option("-m, --method <method>", "Override HTTP method").option(
   "-H, --header <header>",
   "Add custom header (format: key:value)",
   (value, previous) => {
@@ -680,15 +796,77 @@ var replay = new Command3().name("replay").argument("<captureId>", "ID of the ca
   },
   []
 ).action(
-  async (captureId, targetUrl, options) => {
+  async (captureId, targetUrl, options = {}) => {
     const cwd = process.cwd();
     const capturesDir = findCapturesDir(cwd);
     const replayer = new WebhookReplayer(capturesDir);
-    try {
-      const result = await replayer.replay(captureId, targetUrl, {
-        method: options.method,
-        headers: options.header
+    const spinner = ora2("Loading captured webhooks...").start();
+    const captured = replayer.listCaptured();
+    spinner.stop();
+    if (captured.length === 0) {
+      console.log("\u{1F4ED} No captured webhooks found.");
+      console.log(
+        "\u{1F4A1} Run 'better-webhook capture' to start capturing webhooks first."
+      );
+      return;
+    }
+    let selectedCaptureId = captureId;
+    let selectedTargetUrl = targetUrl;
+    if (!selectedCaptureId) {
+      const choices = captured.map((c) => {
+        const date = new Date(c.capture.timestamp).toLocaleString();
+        const bodySize = c.capture.rawBody?.length ?? 0;
+        return {
+          title: `${c.capture.id} - ${c.capture.method} ${c.capture.url}`,
+          description: `${date} | Body: ${bodySize} bytes`,
+          value: c.capture.id
+        };
+      });
+      const response = await prompts2({
+        type: "select",
+        name: "captureId",
+        message: "Select a captured webhook to replay:",
+        choices,
+        initial: 0
       });
+      if (!response.captureId) {
+        console.log("\u274C No webhook selected. Exiting.");
+        process.exitCode = 1;
+        return;
+      }
+      selectedCaptureId = response.captureId;
+    }
+    if (!selectedTargetUrl) {
+      const response = await prompts2({
+        type: "text",
+        name: "targetUrl",
+        message: "Enter the target URL to replay to:",
+        initial: "http://localhost:3000/webhook",
+        validate: (value) => {
+          try {
+            new URL(value);
+            return true;
+          } catch {
+            return "Please enter a valid URL";
+          }
+        }
+      });
+      if (!response.targetUrl) {
+        console.log("\u274C No target URL provided. Exiting.");
+        process.exitCode = 1;
+        return;
+      }
+      selectedTargetUrl = response.targetUrl;
+    }
+    try {
+      const result = await replayer.replay(
+        selectedCaptureId,
+        selectedTargetUrl,
+        {
+          method: options.method,
+          headers: options.header
+        }
+      );
       console.log("\u2705 Replay completed successfully!");
       console.log("Status:", result.status);
       console.log("Headers:");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-webhook/cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "CLI for developing and replaying webhook payloads locally.",
   "type": "module",
   "bin": {
@@ -45,18 +45,22 @@
   },
   "dependencies": {
     "commander": "^14.0.1",
+    "ora": "^9.0.0",
+    "prompts": "^2.4.2",
     "undici": "^7.16.0",
     "zod": "^4.1.8"
   },
   "devDependencies": {
     "@types/node": "^24.3.1",
+    "@types/prompts": "^2.4.9",
     "tsup": "^8.5.0",
     "tsx": "^4.19.2",
     "typescript": "^5.6.3",
     "@better-webhook/typescript-config": "0.0.0"
   },
   "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch"
+    "build": "tsup --format cjs,esm --dts",
+    "dev": "tsup --watch",
+    "lint": "tsc"
   }
 }