clishop 1.5.1 → 1.5.3

package/README.md

@@ -76,33 +76,21 @@ npm link
 
 You can create your account on [clishop.ai](https://clishop.ai) or do everything from the CLI.
 
-### Human-friendly setup
+### Setup
 
-```bash
-clishop setup
-```
-
-This starts the interactive setup flow, creates a resumable setup session, shows a secure payment link, and waits for completion.
+Setup only needs an email address. Search first, then add your address and payment method when you're ready to buy.
 
-### Agent-safe setup
-
-For OpenClaw, MCP clients, Claude-style shells, and other tool runners, use the explicit setup session commands instead of scraping terminal output:
+For OpenClaw, MCP clients, Claude-style shells, and other tool runners, use:
 
 ```bash
 clishop setup start --email user@example.com --json
-clishop setup status --setup-id <setup_id> --json
-clishop setup wait --setup-id <setup_id> --timeout 300 --json
-clishop setup cancel --setup-id <setup_id> --json
 ```
 
-`setup start` returns immediately with:
-
-- `setup_id`: the resumable setup session handle for the agent
-- `setup_url`: the link the human must open in a browser
-- `expires_at`: when the session expires
-- `poll_after_seconds`: suggested polling interval
+`setup start` returns immediately with account-ready status and stores auth locally.
 
-The agent sends `setup_url` to the human and keeps `setup_id` locally for `status`, `wait`, or `cancel`.
+- Search products right away with `clishop search <query>`
+- Add a shipping address later with `clishop address add`
+- Add a payment method later with `clishop payment add`
 
 After setup is complete, add a shipping address and start ordering:
 
@@ -203,10 +191,10 @@ clishop-mcp              # If installed globally
 npx -y clishop --mcp     # Without installing
 ```
 
-The MCP onboarding tools now follow the same resumable setup session model:
+The MCP onboarding tools now follow the same email-first model:
 
-- `setup` starts the session and returns `setup_id` plus `setup_url`
-- `setup_status` checks progress and finalizes auth when setup is complete
+- `setup` creates the account immediately from the email address
+- `setup_status` remains available only for legacy setup IDs
 
 See the [MCP setup guides](https://clishop.ai/docs#mcp-overview) for VS Code, Claude Desktop, Cursor, and Windsurf configuration.
 

package/dist/{chunk-EM4ZGZOU.js → chunk-UO2N5F5R.js}

@@ -155,10 +155,27 @@ async function postSetupRequest(path, body) {
 }
 async function startSetupSession(email) {
   const data = await postSetupRequest("/auth/setup-link", { email });
-  if (!data.setupUrl || !(data.setupId || data.deviceCode) || !data.expiresIn || !data.pollInterval) {
+  const setupId = data.setupId || data.deviceCode || data.user?.id;
+  if (data.token && data.refreshToken && data.user && setupId) {
+    await storeAuthFromSetup({
+      token: data.token,
+      refreshToken: data.refreshToken,
+      user: data.user
+    });
+    return {
+      ok: true,
+      setup_id: setupId,
+      status: "completed",
+      next_action: "search_products",
+      expires_at: data.expiresAt,
+      poll_after_seconds: 0,
+      account_id: data.accountId || data.user.id,
+      human_message: data.humanMessage || "Account ready. Search now, then add address and payment when you are ready to buy."
+    };
+  }
+  if (!data.setupUrl || !setupId || !data.expiresIn || !data.pollInterval) {
     throw new Error(data?.message || "Failed to create setup session.");
   }
-  const setupId = data.setupId || data.deviceCode;
   const expiresAt = data.expiresAt || new Date(Date.now() + data.expiresIn * 1e3).toISOString();
   return {
     ok: true,

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   resolveBackend,
   startSetupSession,
   waitForSetupSession
-} from "./chunk-EM4ZGZOU.js";
+} from "./chunk-UO2N5F5R.js";
 import {
   createAgent,
   deleteAgent,
@@ -785,7 +785,6 @@ import ora3 from "ora";
 
 // src/commands/setup.ts
 import chalk4 from "chalk";
-import inquirer3 from "inquirer";
 import open from "open";
 import { execFileSync } from "child_process";
 var DEFAULT_SETUP_TIMEOUT_MS = 30 * 60 * 1e3;
@@ -816,9 +815,6 @@ function divider(color = chalk4.cyan) {
 function writeJson(payload) {
   process.stdout.write(JSON.stringify(payload, null, 2) + "\n");
 }
-function isInteractiveSession() {
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
-}
 function isLikelyEmail(value) {
   return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value.trim());
 }
@@ -846,17 +842,54 @@ function printSetupLink(message, setupUrl) {
   console.log("  " + setupUrl);
   console.log();
 }
+function printSetupEmailInstructions() {
+  console.log(chalk4.yellow("  Email is required to start setup."));
+  console.log();
+  console.log(chalk4.dim("  Start setup with:"));
+  console.log(chalk4.white("    clishop setup start --email user@example.com --json"));
+  console.log();
+}
 function printSetupStartResult(result) {
+  if (result.status === "completed") {
+    console.log();
+    console.log(chalk4.bold("  Account created."));
+    if (result.account_id) {
+      console.log(chalk4.dim(`  Account: ${result.account_id}`));
+    }
+    console.log();
+    console.log(chalk4.dim(result.human_message));
+    console.log();
+    return;
+  }
   console.log();
   console.log(chalk4.bold("  Setup session created."));
   console.log(chalk4.dim(`  Setup ID: ${result.setup_id}`));
-  console.log(chalk4.dim(`  Expires:  ${new Date(result.expires_at).toLocaleString()}`));
+  if (result.expires_at) {
+    console.log(chalk4.dim(`  Expires:  ${new Date(result.expires_at).toLocaleString()}`));
+  }
   printSetupLink("Give this link to your human to configure the payment method:", result.setup_url);
   console.log(chalk4.dim("  Check progress later with:"));
   console.log(chalk4.white(`    clishop setup status --setup-id ${result.setup_id}`));
   console.log(chalk4.white(`    clishop setup wait --setup-id ${result.setup_id}`));
   console.log();
 }
+function printSetupReadyBanner(userLabel) {
+  console.log();
+  divider(chalk4.green);
+  console.log();
+  console.log(chalk4.bold.green(`  \u2713 Account ready${userLabel ? ` for ${userLabel}` : ""}`));
+  console.log();
+  console.log(chalk4.dim("  Search first. Add an address and payment method only when you're ready to buy."));
+  console.log();
+  console.log(chalk4.dim("  Next steps:"));
+  console.log(chalk4.white("    clishop search <query>  ") + chalk4.dim("Search for products"));
+  console.log(chalk4.white("    clishop address add     ") + chalk4.dim("Add a shipping address later"));
+  console.log(chalk4.white("    clishop payment add     ") + chalk4.dim("Add a payment method when needed"));
+  console.log(chalk4.white("    clishop buy <id>        ") + chalk4.dim("Buy after choosing address + payment"));
+  console.log();
+  divider(chalk4.green);
+  console.log();
+}
 function printSetupStatusResult(result) {
   console.log();
   if (!result.ok) {
@@ -877,7 +910,7 @@ function printSetupStatusResult(result) {
       console.log();
       break;
     case "completed":
-      console.log(chalk4.green("  \u2713 Payment linked and account activated!"));
+      console.log(chalk4.green("  \u2713 Setup complete."));
       console.log(chalk4.dim(`  Setup ID: ${result.setup_id}`));
       if (result.account_id) {
         console.log(chalk4.dim(`  Account:  ${result.account_id}`));
@@ -940,6 +973,9 @@ async function runSetupStartCommand(email, json = false) {
   }
   try {
     const result = await startSetupSession(normalizedEmail);
+    if (result.ok && result.status === "completed") {
+      getConfig().set("setupCompleted", true);
+    }
     if (json) {
       writeJson(sanitizeSetupPayload(result));
       return;
@@ -1039,10 +1075,10 @@ async function runSetupWaitCommand(setupId, timeoutSeconds, json = false) {
   }
 }
 function registerSetupCommand(program2) {
-  const setup = program2.command("setup").description("Set up your CLISHOP account or manage setup sessions").argument("[email]", "Email address for the human-friendly wrapper").action(async (email) => {
+  const setup = program2.command("setup").description("Create your CLISHOP account or manage legacy setup sessions").argument("[email]", "Email address").action(async (email) => {
     await runSetupWizard(email);
   });
-  setup.command("start").description("Create a setup session and return immediately").requiredOption("--email <email>", "Email address").option("--json", "Output machine-readable JSON").action(async (opts) => {
+  setup.command("start").description("Create your account and return immediately").requiredOption("--email <email>", "Email address").option("--json", "Output machine-readable JSON").action(async (opts) => {
     await runSetupStartCommand(opts.email, opts.json);
   });
   setup.command("status").description("Check the status of a setup session").requiredOption("--setup-id <setupId>", "Setup session ID").option("--json", "Output machine-readable JSON").action(async (opts) => {
@@ -1069,25 +1105,8 @@ async function runSetupWizard(emailArg, { json = false } = {}) {
   const loggedIn = await isLoggedIn();
   if (loggedIn) {
     const user = await getUserInfo();
-    try {
-      const api = getApiClient();
-      const agent = getActiveAgent();
-      const pmRes = await api.get("/payment-methods", { params: { agent: agent.name } });
-      const methods = pmRes.data.paymentMethods || [];
-      if (methods.length > 0) {
-        console.log();
-        console.log(chalk4.green(`  \u2713 Already set up as ${chalk4.bold(user?.name || user?.email || "unknown")} with a payment method linked.`));
-        console.log(chalk4.dim("  Nothing to do. Run ") + chalk4.white("clishop search <query>") + chalk4.dim(" to get started."));
-        console.log();
-        return;
-      }
-    } catch {
-    }
-    console.log();
-    console.log(chalk4.green(`  \u2713 Logged in as ${chalk4.bold(user?.name || user?.email || "unknown")}`));
-    console.log(chalk4.dim("  No payment method linked yet. Let's fix that."));
-    console.log();
-    await runPaymentLinkFlow(config);
+    config.set("setupCompleted", true);
+    printSetupReadyBanner(user?.name || user?.email || "unknown");
     return;
   }
   console.log();
@@ -1095,14 +1114,14 @@ async function runSetupWizard(emailArg, { json = false } = {}) {
   console.log();
   console.log(chalk4.bold.cyan("      W E L C O M E   T O   C L I S H O P"));
   console.log(chalk4.dim("      Order anything from your terminal."));
-  console.log(chalk4.dim(`      npm:   v${"1.5.1"}`));
-  console.log(chalk4.dim(`      Build: ${"2026-04-04T20:33:18.769Z"}`));
+  console.log(chalk4.dim(`      npm:   v${"1.5.3"}`));
+  console.log(chalk4.dim(`      Build: ${"2026-04-04T21:38:36.646Z"}`));
   console.log();
   divider(chalk4.cyan);
   console.log();
-  console.log(chalk4.dim("  Set up your account in one step. You'll get a link to"));
-  console.log(chalk4.dim("  securely link your payment method in the browser."));
-  console.log(chalk4.dim("  Your AI agent can then add addresses and place orders for you."));
+  console.log(chalk4.dim("  Set up your account with your email first."));
+  console.log(chalk4.dim("  Search for products right away."));
+  console.log(chalk4.dim("  Add your address and payment method later, only when you're ready to buy."));
   console.log();
   console.log(chalk4.dim("  By creating an account you agree to the CLISHOP"));
   console.log(chalk4.dim("  Terms & Conditions: ") + chalk4.cyan.underline("https://clishop.ai/terms"));
@@ -1110,15 +1129,9 @@ async function runSetupWizard(emailArg, { json = false } = {}) {
   console.log();
   let email = emailArg?.trim();
   if (!email) {
-    if (!isInteractiveSession()) {
-      console.error(chalk4.red("\n\u2717 Email is required in non-interactive mode. Use: clishop setup start --email <email> --json\n"));
-      process.exitCode = 1;
-      return;
-    }
-    const answers = await inquirer3.prompt([
-      { type: "input", name: "email", message: "Email:" }
-    ]);
-    email = answers.email?.trim();
+    printSetupEmailInstructions();
+    process.exitCode = 1;
+    return;
   }
   if (!email || !isLikelyEmail(email)) {
     console.error(chalk4.red("\n\u2717 A valid email address is required.\n"));
@@ -1127,7 +1140,7 @@ async function runSetupWizard(emailArg, { json = false } = {}) {
   }
   let startResult;
   try {
-    console.log(chalk4.dim("  Creating your account and payment link..."));
+    console.log(chalk4.dim("  Creating your account..."));
     startResult = await startSetupSession(email);
   } catch (error) {
     console.log(chalk4.red(`  \u2717 Setup failed: ${error?.message || "Unknown error"}`));
@@ -1137,6 +1150,11 @@ async function runSetupWizard(emailArg, { json = false } = {}) {
     process.exitCode = 1;
     return;
   }
+  if (startResult.status === "completed") {
+    config.set("setupCompleted", true);
+    printSetupReadyBanner(email);
+    return;
+  }
   printSetupStartResult(startResult);
   console.log(chalk4.dim("  Waiting for you to complete payment setup..."));
   console.log(chalk4.dim("  You can resume later with the setup ID shown above."));
@@ -1150,57 +1168,7 @@ async function runSetupWizard(emailArg, { json = false } = {}) {
     return;
   }
   config.set("setupCompleted", true);
-  console.log();
-  divider(chalk4.green);
-  console.log();
-  console.log(chalk4.bold.green("  \u2713 You're all set!"));
-  console.log();
-  console.log(chalk4.dim("  Your agent can now add addresses and place orders."));
-  console.log(chalk4.dim("  To add a shipping address manually:"));
-  console.log(chalk4.white("    clishop address add"));
-  console.log();
-  console.log(chalk4.dim("  Here are some commands to get you started:"));
-  console.log();
-  console.log(chalk4.white("    clishop search <query>  ") + chalk4.dim("Search for products"));
-  console.log(chalk4.white("    clishop buy <id>        ") + chalk4.dim("Quick-buy a product"));
-  console.log(chalk4.white("    clishop order list      ") + chalk4.dim("View your orders"));
-  console.log(chalk4.white("    clishop --help          ") + chalk4.dim("See all commands"));
-  console.log();
-  divider(chalk4.green);
-  console.log();
-}
-async function runPaymentLinkFlow(config) {
-  console.log(chalk4.dim("  Requesting secure payment setup link..."));
-  try {
-    const api = getApiClient();
-    const agent = getActiveAgent();
-    await ensureAgentOnBackend(agent.name);
-    const res = await api.post("/payment-methods/setup", { agent: agent.name });
-    const { setupUrl } = res.data;
-    printSetupLink("Open this link to link your payment method:", setupUrl);
-    const opened = await openBrowser(setupUrl);
-    if (opened) {
-      console.log(chalk4.dim("  (Browser opened automatically)"));
-    }
-    console.log();
-    await inquirer3.prompt([
-      { type: "input", name: "done", message: "Press Enter after completing payment setup in your browser..." }
-    ]);
-    console.log(chalk4.dim("  Checking for your payment method..."));
-    const pmRes = await api.get("/payment-methods", { params: { agent: agent.name } });
-    const methods = pmRes.data.paymentMethods || [];
-    if (methods.length > 0) {
-      const latest = methods[methods.length - 1];
-      updateAgent(agent.name, { defaultPaymentMethodId: latest.id });
-      console.log(chalk4.green(`  \u2713 Payment method "${latest.label}" linked and set as default.`));
-      config.set("setupCompleted", true);
-    } else {
-      console.log(chalk4.yellow("  \u26A0 No payment method found yet. Run ") + chalk4.white("clishop setup") + chalk4.yellow(" to try again."));
-    }
-  } catch (error) {
-    console.log(chalk4.red(`  \u2717 Could not get setup link: ${error?.response?.data?.message || error.message}`));
-  }
-  console.log();
+  printSetupReadyBanner(email);
 }
 
 // src/commands/payment.ts
@@ -1218,7 +1186,7 @@ function registerPaymentCommands(program2) {
       spinner.stop();
       const methods = res.data.paymentMethods;
       if (methods.length === 0) {
-        console.log(chalk5.yellow("\nNo payment methods found. Run: clishop setup\n"));
+        console.log(chalk5.yellow("\nNo payment methods found. Run: clishop payment add\n"));
         return;
       }
       console.log(chalk5.bold(`
@@ -1234,7 +1202,7 @@ Payment methods for agent "${agent.name}":
       handleApiError(error);
     }
   });
-  payment.command("add").description("Add an additional payment method (opens browser). First-time setup? Use 'clishop setup' instead.").action(async () => {
+  payment.command("add").description("Add a payment method (opens browser)").action(async () => {
     try {
       const agent = getActiveAgent();
       await ensureAgentOnBackend(agent.name);
@@ -1251,8 +1219,8 @@ Payment methods for agent "${agent.name}":
 `));
       console.log(chalk5.dim("The CLI never collects raw card details. Payment is set up via the secure web portal."));
       console.log(chalk5.dim("Press Enter after completing the setup in your browser.\n"));
-      const inquirer10 = (await import("inquirer")).default;
-      await inquirer10.prompt([
+      const inquirer9 = (await import("inquirer")).default;
+      await inquirer9.prompt([
         { type: "input", name: "done", message: "Press Enter when done..." }
       ]);
       const checkSpinner = ora3("Checking for your payment method...").start();
@@ -1298,7 +1266,7 @@ Payment methods for agent "${agent.name}":
 // src/commands/search.ts
 import chalk6 from "chalk";
 import ora4 from "ora";
-import inquirer4 from "inquirer";
+import inquirer3 from "inquirer";
 function formatPrice(cents, currency) {
   return new Intl.NumberFormat("en-US", {
     style: "currency",
@@ -2091,7 +2059,7 @@ Results for "${query}" \u2014 ${result.total} found (page ${result.page})
               short: p.name.length > 40 ? p.name.slice(0, 37) + "..." : p.name
             };
           });
-          const { selectedIds } = await inquirer4.prompt([
+          const { selectedIds } = await inquirer3.prompt([
             {
               type: "checkbox",
               name: "selectedIds",
@@ -2327,7 +2295,7 @@ Product Information \u2014 ${total} result(s)
 // src/commands/order.ts
 import chalk7 from "chalk";
 import ora5 from "ora";
-import inquirer5 from "inquirer";
+import inquirer4 from "inquirer";
 function formatPrice2(cents, currency) {
   return new Intl.NumberFormat("en-US", { style: "currency", currency }).format(cents / 100);
 }
@@ -2405,7 +2373,10 @@ function registerOrderCommands(program2) {
         return;
       }
       if (!paymentId) {
-        console.error(chalk7.red("\n\u2717 No payment method linked. Run: clishop setup"));
+        console.error(chalk7.red("\n\u2717 No payment method linked for this agent."));
+        console.error();
+        console.error(chalk7.dim("  Add one when you're ready to buy with:"));
+        console.error(chalk7.white("    clishop payment add"));
         process.exitCode = 1;
         return;
       }
@@ -2466,7 +2437,7 @@ function registerOrderCommands(program2) {
         console.log(`    Total:    ${chalk7.bold(formatPrice2(totalCents, product.currency))}`);
         console.log(`    Agent:    ${agent.name}`);
         console.log();
-        const { confirm } = await inquirer5.prompt([
+        const { confirm } = await inquirer4.prompt([
           {
             type: "confirm",
             name: "confirm",
@@ -2613,7 +2584,7 @@ function registerOrderCommands(program2) {
   });
   order.command("cancel <id>").description("Cancel an order").action(async (id) => {
     try {
-      const { confirm } = await inquirer5.prompt([
+      const { confirm } = await inquirer4.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -2635,7 +2606,7 @@ function registerOrderCommands(program2) {
 // src/commands/review.ts
 import chalk8 from "chalk";
 import ora6 from "ora";
-import inquirer6 from "inquirer";
+import inquirer5 from "inquirer";
 function renderStars2(rating) {
   const filled = Math.round(rating);
   const empty = 10 - filled;
@@ -2688,7 +2659,7 @@ function registerReviewCommands(program2) {
       let storeReview = void 0;
       for (const item of unreviewedItems) {
         console.log(chalk8.bold(`  Product: ${item.productName}`));
-        const { wantReview } = await inquirer6.prompt([
+        const { wantReview } = await inquirer5.prompt([
           {
             type: "confirm",
             name: "wantReview",
@@ -2697,7 +2668,7 @@ function registerReviewCommands(program2) {
           }
         ]);
         if (!wantReview) continue;
-        const answers = await inquirer6.prompt([
+        const answers = await inquirer5.prompt([
           {
             type: "select",
             name: "rating",
@@ -2728,7 +2699,7 @@ function registerReviewCommands(program2) {
       }
       if (!storeAlreadyReviewed) {
         console.log(chalk8.bold(`  Store: ${reviewable.store.name}`));
-        const { wantStoreReview } = await inquirer6.prompt([
+        const { wantStoreReview } = await inquirer5.prompt([
           {
             type: "confirm",
             name: "wantStoreReview",
@@ -2737,7 +2708,7 @@ function registerReviewCommands(program2) {
           }
         ]);
         if (wantStoreReview) {
-          const storeAnswers = await inquirer6.prompt([
+          const storeAnswers = await inquirer5.prompt([
             {
               type: "select",
               name: "rating",
@@ -2797,7 +2768,7 @@ function registerReviewCommands(program2) {
   });
   review.command("add <productId>").description("Write a review for a product").option("--order <orderId>", "Associate with an order").action(async (productId, opts) => {
     try {
-      const answers = await inquirer6.prompt([
+      const answers = await inquirer5.prompt([
         {
           type: "select",
           name: "rating",
@@ -2830,7 +2801,7 @@ function registerReviewCommands(program2) {
   });
   review.command("store <storeId>").description("Write a review for a store").option("--order <orderId>", "Associate with an order").action(async (storeId, opts) => {
     try {
-      const answers = await inquirer6.prompt([
+      const answers = await inquirer5.prompt([
         {
           type: "select",
           name: "rating",
@@ -2932,7 +2903,7 @@ function registerReviewCommands(program2) {
   });
   review.command("delete <reviewId>").alias("rm").description("Delete one of your reviews").option("--store", "Delete a store review").action(async (reviewId, opts) => {
     try {
-      const { confirm } = await inquirer6.prompt([
+      const { confirm } = await inquirer5.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -3244,7 +3215,7 @@ function registerStatusCommand(program2) {
         console.log();
         console.log(chalk11.bold(`     \u{1F4B3} Payment Methods (${agent.paymentMethods.length})`));
         if (agent.paymentMethods.length === 0) {
-          console.log(chalk11.dim("        None \u2014 run: clishop setup"));
+          console.log(chalk11.dim("        None \u2014 run: clishop payment add"));
         } else {
           for (const pm of agent.paymentMethods) {
             const isDefault = pm.id === agent.defaultPaymentMethodId;
@@ -3268,7 +3239,7 @@ function registerStatusCommand(program2) {
 // src/commands/advertise.ts
 import chalk12 from "chalk";
 import ora9 from "ora";
-import inquirer7 from "inquirer";
+import inquirer6 from "inquirer";
 function formatPrice4(cents, currency) {
   return new Intl.NumberFormat("en-US", { style: "currency", currency }).format(cents / 100);
 }
@@ -3292,7 +3263,7 @@ function registerAdvertiseCommands(program2) {
       const agent = getActiveAgent();
       console.log(chalk12.bold("\n  \u{1F4E2} Advertise a Request\n"));
       console.log(chalk12.dim("  Can't find what you need? Describe it and vendors will bid to fulfill it.\n"));
-      const answers = await inquirer7.prompt([
+      const answers = await inquirer6.prompt([
         {
           type: "input",
           name: "title",
@@ -3339,7 +3310,7 @@ function registerAdvertiseCommands(program2) {
       ]);
       let recurringNote;
       if (answers.recurring) {
-        const recAnswer = await inquirer7.prompt([
+        const recAnswer = await inquirer6.prompt([
           {
             type: "input",
             name: "recurringNote",
@@ -3348,7 +3319,7 @@ function registerAdvertiseCommands(program2) {
         ]);
         recurringNote = recAnswer.recurringNote || void 0;
       }
-      const priceAnswers = await inquirer7.prompt([
+      const priceAnswers = await inquirer6.prompt([
         {
           type: "input",
           name: "bidPrice",
@@ -3357,7 +3328,7 @@ function registerAdvertiseCommands(program2) {
       ]);
       let currency = "USD";
       if (priceAnswers.bidPrice && parseFloat(priceAnswers.bidPrice) > 0) {
-        const currencyAnswer = await inquirer7.prompt([
+        const currencyAnswer = await inquirer6.prompt([
           {
             type: "list",
             name: "currency",
@@ -3378,7 +3349,7 @@ function registerAdvertiseCommands(program2) {
           }
         ]);
         if (currencyAnswer.currency === "OTHER") {
-          const customCurrency = await inquirer7.prompt([
+          const customCurrency = await inquirer6.prompt([
             {
               type: "input",
               name: "code",
@@ -3391,14 +3362,14 @@ function registerAdvertiseCommands(program2) {
           currency = currencyAnswer.currency;
         }
       }
-      const speedAnswer = await inquirer7.prompt([
+      const speedAnswer = await inquirer6.prompt([
         {
           type: "input",
           name: "speedDays",
           message: "Desired delivery speed in days (optional):"
         }
       ]);
-      const returnAnswers = await inquirer7.prompt([
+      const returnAnswers = await inquirer6.prompt([
         {
           type: "confirm",
           name: "freeReturns",
@@ -3430,7 +3401,7 @@ function registerAdvertiseCommands(program2) {
           addrChoices.push({ name: chalk12.dim(skipOption), value: skipOption });
           const defaultAddr = addresses.find((a) => a.id === agent.defaultAddressId);
           const defaultDisplay = defaultAddr ? `${defaultAddr.label} \u2014 ${defaultAddr.line1}` : "";
-          const { selectedAddress } = await inquirer7.prompt([
+          const { selectedAddress } = await inquirer6.prompt([
             {
               type: "list",
               name: "selectedAddress",
@@ -3464,7 +3435,7 @@ function registerAdvertiseCommands(program2) {
               // Default: all user's payment methods selected
             }))
           ];
-          const { selectedPayments } = await inquirer7.prompt([
+          const { selectedPayments } = await inquirer6.prompt([
             {
               type: "checkbox",
               name: "selectedPayments",
@@ -3478,7 +3449,7 @@ function registerAdvertiseCommands(program2) {
             paymentMethods = JSON.stringify(selectedPayments);
           }
         } else {
-          console.log(chalk12.dim("  No payment methods found. Run: clishop setup"));
+          console.log(chalk12.dim("  No payment methods found. Run: clishop payment add"));
         }
       } catch {
         paySpinner.stop();
@@ -3731,7 +3702,7 @@ function registerAdvertiseCommands(program2) {
       if (bid.shippingDays != null) console.log(`    Delivery: ${bid.shippingDays}-day`);
       if (bid.note) console.log(`    Note:     ${bid.note}`);
       console.log();
-      const { confirm } = await inquirer7.prompt([
+      const { confirm } = await inquirer6.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -3752,7 +3723,7 @@ function registerAdvertiseCommands(program2) {
   });
   advertise.command("reject <advertiseId> <bidId>").description("Reject a vendor's bid").action(async (advertiseId, bidId) => {
     try {
-      const { confirm } = await inquirer7.prompt([
+      const { confirm } = await inquirer6.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -3771,7 +3742,7 @@ function registerAdvertiseCommands(program2) {
   });
   advertise.command("cancel <id>").description("Cancel an advertised request").action(async (id) => {
     try {
-      const { confirm } = await inquirer7.prompt([
+      const { confirm } = await inquirer6.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -3793,7 +3764,7 @@ function registerAdvertiseCommands(program2) {
 // src/commands/support.ts
 import chalk13 from "chalk";
 import ora10 from "ora";
-import inquirer8 from "inquirer";
+import inquirer7 from "inquirer";
 var CATEGORY_CHOICES = [
   { name: "General question", value: "general" },
   { name: "Damaged item", value: "damaged" },
@@ -3827,7 +3798,7 @@ function registerSupportCommands(program2) {
   const support = program2.command("support").description("Manage support tickets for orders");
   support.command("create <orderId>").alias("new").description("Create a support ticket for an order").action(async (orderId) => {
     try {
-      const answers = await inquirer8.prompt([
+      const answers = await inquirer7.prompt([
         {
           type: "select",
           name: "category",
@@ -3958,7 +3929,7 @@ function registerSupportCommands(program2) {
   });
   support.command("reply <ticketId>").description("Reply to a support ticket").action(async (ticketId) => {
     try {
-      const { message } = await inquirer8.prompt([
+      const { message } = await inquirer7.prompt([
         {
           type: "editor",
           name: "message",
@@ -3983,7 +3954,7 @@ function registerSupportCommands(program2) {
   });
   support.command("close <ticketId>").description("Close a resolved ticket").action(async (ticketId) => {
     try {
-      const { confirm } = await inquirer8.prompt([
+      const { confirm } = await inquirer7.prompt([
         {
           type: "confirm",
           name: "confirm",
@@ -4005,7 +3976,7 @@ function registerSupportCommands(program2) {
 // src/commands/feedback.ts
 import chalk14 from "chalk";
 import ora11 from "ora";
-import inquirer9 from "inquirer";
+import inquirer8 from "inquirer";
 var STATUS_COLORS4 = {
   open: chalk14.green,
   acknowledged: chalk14.cyan,
@@ -4038,7 +4009,7 @@ function registerFeedbackCommands(program2) {
       if (!title || !description || !stepsToReproduce || !actualBehavior || !expectedBehavior) {
         console.log(chalk14.bold("\n\u{1F41B} Report a Bug\n"));
         console.log(chalk14.dim("Help us fix issues by describing what went wrong.\n"));
-        const answers = await inquirer9.prompt([
+        const answers = await inquirer8.prompt([
           ...!title ? [{
             type: "input",
             name: "title",
@@ -4110,7 +4081,7 @@ function registerFeedbackCommands(program2) {
       if (!title || !description) {
         console.log(chalk14.bold("\n\u{1F4A1} Suggest an Improvement\n"));
         console.log(chalk14.dim("Tell us how we can make CLISHOP better.\n"));
-        const answers = await inquirer9.prompt([
+        const answers = await inquirer8.prompt([
           ...!title ? [{
             type: "input",
             name: "title",
@@ -4290,11 +4261,10 @@ function registerDoctorCommand(program2) {
 
 // src/index.ts
 var program = new Command();
-program.name("clishop").version("1.5.1").description(
+program.name("clishop").version("1.5.3").description(
   chalk16.bold("CLISHOP") + ` \u2014 Order anything from your terminal.
 
-  Run 'clishop setup' for the human-friendly flow, or
-  'clishop setup start --email <email> --json' for agent-safe setup.
+  Run 'clishop setup <email>' or 'clishop setup start --email <email> --json' to create your account.
   Use agents to set safety limits, addresses, and payment methods.
   The "default" agent is used when no agent is specified.`
 ).option("--agent <name>", "Use a specific agent for this command").hook("preAction", (thisCommand) => {
@@ -4339,7 +4309,7 @@ async function main() {
       }
       console.error(
         chalk16.yellow(
-          "CLISHOP setup is incomplete. Run 'clishop setup start --email <email> --json' in non-interactive environments."
+          "CLISHOP setup is incomplete. Run 'clishop setup start --email <email> --json' in non-interactive environments, or 'clishop setup <email>' in the CLI."
         )
       );
       process.exit(1);

package/dist/mcp.js

@@ -6,7 +6,7 @@ import {
   getUserInfo,
   isLoggedIn,
   startSetupSession
-} from "./chunk-EM4ZGZOU.js";
+} from "./chunk-UO2N5F5R.js";
 import {
   __export,
   getActiveAgent,
@@ -13823,7 +13823,7 @@ var server = new McpServer(
 );
 server.registerTool("setup", {
   title: "Setup",
-  description: "Start a resumable setup session. Returns a setup URL for the human and a setup_id for the agent to check later. After the human completes the link, call setup_status with the returned setup_id.",
+  description: "Create or sign in a CLISHOP account using an email address. Setup now completes immediately; add address and payment later when the user is ready to buy.",
   inputSchema: {
     email: external_exports.string().email().describe("User's email address")
   },
@@ -13835,15 +13835,18 @@ server.registerTool("setup", {
 }, async (args) => {
   return safeCall(async () => {
     const data = await startSetupSession(args.email);
+    if (data.ok && data.status === "completed") {
+      getConfig().set("setupCompleted", true);
+    }
     return {
       ...data,
-      message: "Give this link to your human to configure their payment method in the browser. Then call setup_status with the setup_id to check when they're done."
+      message: data.status === "completed" ? "Account ready. Search products now. Only add address and payment once the user decides to buy." : "Legacy setup session created. Call setup_status with the setup_id if you still need to wait for completion."
     };
   });
 });
 server.registerTool("setup_status", {
   title: "Setup Status",
-  description: "Check the current setup state using the setup_id returned by the setup tool. If setup is complete, auth is stored locally so later CLISHOP calls can proceed.",
+  description: "Check a legacy setup session by setup_id. Modern email-only setup completes immediately and usually does not need this tool.",
   inputSchema: {
     setupId: external_exports.string().describe("The setup_id returned by the setup tool")
   },
@@ -13994,7 +13997,7 @@ server.registerTool("buy_product", {
       throw new Error("No shipping address set. Add one first via the add_address tool.");
     }
     if (!paymentId) {
-      throw new Error("No payment method linked. Use the setup tool to onboard the user first.");
+      throw new Error("No payment method linked. Add one with the payment method tools before placing the order.");
     }
     const api = getApiClient();
     let product;
@@ -14330,7 +14333,7 @@ server.registerTool("account_status", {
   return safeCall(async () => {
     const loggedIn = await isLoggedIn();
     if (!loggedIn) {
-      return { loggedIn: false, message: "Not set up yet. Use the setup tool to onboard the user with a payment link." };
+      return { loggedIn: false, message: "Not set up yet. Use the setup tool with an email address to create the account." };
     }
     const api = getApiClient();
     const cfg = getConfig();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clishop",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "mcpName": "io.github.StefDCL/clishop",
   "description": "CLISHOP — Order anything from your terminal",
   "main": "dist/index.js",