clishop 1.5.2 → 1.5.4

package/README.md

@@ -33,7 +33,7 @@ CLISHOP is an open-source CLI that lets AI agents and humans search for products
 
 - One query searches every store in the network. Results are filtered to what actually ships to your address.
 - Set spending caps per order, require email confirmation before anything ships, or let it go through automatically — your call.
-- Ships as a native [MCP server](https://modelcontextprotocol.io/) with 44 tools. Works with VS Code Copilot, Claude, Cursor, Windsurf, and anything else that speaks MCP.
+- Ships as a native [MCP server](https://modelcontextprotocol.io/) with 46 tools. Works with VS Code Copilot, Claude, Cursor, Windsurf, and anything else that speaks MCP.
 - Can't find what you need? Post an advertise request and let vendors compete to fulfill it.
 - Support tickets, product reviews, store reviews — all from the terminal.
 - Anyone can sell on CLISHOP by deploying a [Dark Store](https://github.com/DavooxBv2/CLISHOP-DARKSTORE). No website needed.
@@ -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:
 
@@ -196,17 +184,17 @@ npm run lint                         # Type-check
 
 ## MCP Server
 
-CLISHOP ships as a native MCP server with 44 tools. Any MCP-compatible client gets shopping capabilities out of the box.
+CLISHOP ships as a native MCP server with 46 tools. Any MCP-compatible client gets shopping capabilities out of the box.
 
 ```bash
 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;
@@ -846,24 +845,51 @@ function printSetupLink(message, setupUrl) {
 function printSetupEmailInstructions() {
   console.log(chalk4.yellow("  Email is required to start setup."));
   console.log();
-  console.log(chalk4.dim("  Human-friendly:"));
-  console.log(chalk4.white("    clishop setup user@example.com"));
-  console.log();
-  console.log(chalk4.dim("  Agent-safe JSON:"));
+  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) {
@@ -884,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}`));
@@ -947,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;
@@ -1046,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) => {
@@ -1076,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();
@@ -1102,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.2"}`));
-  console.log(chalk4.dim(`      Build: ${"2026-04-04T20:51:01.276Z"}`));
+  console.log(chalk4.dim(`      npm:   v${"1.5.4"}`));
+  console.log(chalk4.dim(`      Build: ${"2026-04-05T11:19:52.708Z"}`));
   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"));
@@ -1128,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"}`));
@@ -1138,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."));
@@ -1151,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
@@ -1219,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(`
@@ -1235,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);
@@ -1252,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();
@@ -1299,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",
@@ -2092,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",
@@ -2328,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);
 }
@@ -2406,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;
       }
@@ -2467,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",
@@ -2614,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",
@@ -2636,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;
@@ -2689,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",
@@ -2698,7 +2668,7 @@ function registerReviewCommands(program2) {
           }
         ]);
         if (!wantReview) continue;
-        const answers = await inquirer6.prompt([
+        const answers = await inquirer5.prompt([
           {
             type: "select",
             name: "rating",
@@ -2729,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",
@@ -2738,7 +2708,7 @@ function registerReviewCommands(program2) {
           }
         ]);
         if (wantStoreReview) {
-          const storeAnswers = await inquirer6.prompt([
+          const storeAnswers = await inquirer5.prompt([
             {
               type: "select",
               name: "rating",
@@ -2798,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",
@@ -2831,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",
@@ -2933,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",
@@ -3245,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;
@@ -3269,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);
 }
@@ -3293,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",
@@ -3340,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",
@@ -3349,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",
@@ -3358,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",
@@ -3379,7 +3349,7 @@ function registerAdvertiseCommands(program2) {
           }
         ]);
         if (currencyAnswer.currency === "OTHER") {
-          const customCurrency = await inquirer7.prompt([
+          const customCurrency = await inquirer6.prompt([
             {
               type: "input",
               name: "code",
@@ -3392,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",
@@ -3431,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",
@@ -3465,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",
@@ -3479,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();
@@ -3732,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",
@@ -3753,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",
@@ -3772,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",
@@ -3794,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" },
@@ -3828,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",
@@ -3959,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",
@@ -3984,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",
@@ -4006,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,
@@ -4039,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",
@@ -4111,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",
@@ -4291,11 +4261,10 @@ function registerDoctorCommand(program2) {
 
 // src/index.ts
 var program = new Command();
-program.name("clishop").version("1.5.2").description(
+program.name("clishop").version("1.5.4").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) => {
@@ -4340,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,
@@ -13813,7 +13813,7 @@ function safeCall(fn) {
 var server = new McpServer(
   {
     name: "clishop",
-    version: "1.2.3"
+    version: "1.5.4"
   },
   {
     capabilities: {
@@ -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/openclaw/.mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "clishop": {
+      "command": "npx",
+      "args": ["-y", "clishop", "--mcp"]
+    }
+  }
+}

package/openclaw/skills/clishop/SKILL.md

@@ -0,0 +1,150 @@
+---
+name: clishop
+description: "Order anything from your terminal — search products, compare prices across stores, place orders, manage addresses and payments. Built for AI agents and humans."
+---
+
+# CLISHOP — Buy anything from your terminal
+
+CLISHOP is an open-source MCP server and CLI that lets AI agents search for products across multiple stores, compare prices, and place real orders — all from the terminal.
+
+**46 MCP tools** for the full shopping lifecycle: search → compare → buy → track → review → return.
+
+## Installation
+
+```bash
+npm install -g clishop
+```
+
+Use the email-first setup command:
+
+```bash
+clishop setup start --email user@example.com --json
+```
+
+Then search products, and only add an address or payment method when the user is ready to buy.
+
+### MCP Server
+
+```bash
+clishop-mcp              # If installed globally
+npx -y clishop --mcp     # Without installing
+```
+
+## Tools
+
+| Tool | Description | Read-only |
+|------|-------------|-----------|
+| `setup` | Create or sign in with an email address (completes immediately) | ❌ |
+| `setup_status` | Check a legacy setup session by setup_id | ✅ |
+| `search_products` | Search across all connected stores with filters (price, brand, category, shipping, ratings) | ✅ |
+| `get_product` | Get detailed info about a specific product | ✅ |
+| `buy_product` | Place an order (respects agent safety limits) | ❌ |
+| `list_orders` | List orders, optionally filtered by status | ✅ |
+| `get_order` | Full order details including tracking and shipments | ✅ |
+| `cancel_order` | Cancel a pending or confirmed order | ❌ |
+| `list_addresses` | List saved shipping addresses | ✅ |
+| `add_address` | Add a new shipping address | ❌ |
+| `remove_address` | Remove a saved address | ❌ |
+| `set_default_address` | Set the default shipping address for the active agent | ❌ |
+| `list_payment_methods` | List saved payment methods | ✅ |
+| `remove_payment_method` | Remove a saved payment method | ❌ |
+| `set_default_payment_method` | Set the default payment method for the active agent | ❌ |
+| `list_stores` | Browse available stores | ✅ |
+| `get_store` | View store details | ✅ |
+| `store_catalog` | Browse a store's product catalog | ✅ |
+| `account_status` | Full account overview (user, agents, addresses, payments) | ✅ |
+| `list_agents` | List safety profiles (spending limits, allowed categories) | ✅ |
+| `get_agent` | View details of a specific agent | ✅ |
+| `create_agent` | Create a new agent (safety profile) with spending limits | ❌ |
+| `update_agent` | Update an agent's settings (limits, categories, defaults) | ❌ |
+| `switch_agent` | Switch the active agent | ❌ |
+| `get_spending_limit` | View the current monthly spending limit | ✅ |
+| `set_spending_limit` | Change the monthly spending limit | ❌ |
+| `add_product_review` | Write a product review (1-10 rating) | ❌ |
+| `add_store_review` | Write a store review (1-10 rating) | ❌ |
+| `list_reviews` | List all your product and store reviews | ✅ |
+| `get_product_rating` | View rating details for a product | ✅ |
+| `get_store_rating` | View rating details for a store | ✅ |
+| `delete_review` | Delete one of your reviews | ❌ |
+| `create_advertise_request` | Post a request for vendors to bid on | ❌ |
+| `list_advertise_requests` | List your advertised requests | ✅ |
+| `get_advertise_request` | View an advertised request and its bids | ✅ |
+| `accept_advertise_bid` | Accept a vendor's bid | ❌ |
+| `reject_advertise_bid` | Reject a vendor's bid | ❌ |
+| `cancel_advertise_request` | Cancel an open advertised request | ❌ |
+| `create_support_ticket` | Create a support ticket for an order | ❌ |
+| `list_support_tickets` | List support tickets | ✅ |
+| `get_support_ticket` | View a support ticket and its message history | ✅ |
+| `reply_to_support_ticket` | Send a reply to a support ticket | ❌ |
+| `close_support_ticket` | Close a resolved support ticket | ❌ |
+| `submit_feedback` | Report a bug or suggest an improvement | ❌ |
+| `list_feedback` | List your submitted bug reports and suggestions | ✅ |
+| `get_feedback` | View details of a specific feedback item | ✅ |
+
+## External Endpoints
+
+All network requests go to the CLISHOP API:
+
+| Endpoint | Method | Data sent | Purpose |
+|----------|--------|-----------|---------|
+| `/auth/setup-link` | POST | Email address | Create account / sign in |
+| `/products/search` | GET | Search query, filters (category, brand, price range, country) | Product search |
+| `/products/:id` | GET | Product ID | Product details |
+| `/products/extended/:id` | GET | Product ID | Extended product lookup across vendor stores |
+| `/orders` | GET | Status filter, page | List user's orders |
+| `/orders` | POST | Product ID, quantity, address ID, payment ID, agent name | Place an order |
+| `/orders/:id` | GET | Order ID | Order details |
+| `/orders/:id/tracking` | GET | Order ID | Shipment tracking |
+| `/orders/:id/cancel` | POST | Order ID | Cancel an order |
+| `/addresses` | GET | Agent name | List addresses |
+| `/addresses` | POST | Full address fields (name, street, city, country, etc.) | Add address |
+| `/addresses/:id` | DELETE | Address ID | Remove address |
+| `/payment-methods` | GET | Agent name | List payment methods |
+| `/payment-methods/:id` | DELETE | Payment method ID | Remove payment method |
+| `/stores` | GET | Query, filters | Browse stores |
+| `/stores/:id` | GET | Store ID/slug | Store details |
+| `/stores/:id/products` | GET | Query, filters | Store catalog |
+| `/agents` | GET | — | List agents |
+| `/spending-limit` | GET/PATCH | Limit in cents | Get/set spending limit |
+| `/products/:id/reviews` | POST | Rating, title, body | Product review |
+| `/stores/:id/reviews` | POST | Rating, title, body | Store review |
+| `/reviews/mine` | GET | — | List own reviews |
+| `/products/:id/rating` | GET | — | Product rating details |
+| `/stores/:id/rating` | GET | — | Store rating details |
+| `/advertise` | GET/POST | Title, description, brand, quantity, max bid price | Advertise requests |
+| `/advertise/:id` | GET | — | Advertise request details |
+| `/advertise/:id/bids/:id/accept` | POST | — | Accept bid |
+| `/advertise/:id/bids/:id/reject` | POST | — | Reject bid |
+| `/advertise/:id/cancel` | POST | — | Cancel advertise request |
+| `/support` | GET/POST | Ticket details or status filter | Support tickets |
+| `/support/:id` | GET | — | Support ticket details |
+| `/support/:id/reply` | POST | Message | Reply to support ticket |
+| `/support/:id/status` | PATCH | Status | Close support ticket |
+| `/feedback` | GET/POST | Feedback type, title, description | Feedback |
+| `/feedback/:id` | GET | — | Feedback details |
+
+All requests are sent over **HTTPS** to `https://clishop-backend.vercel.app/api`.
+
+## Security & Privacy
+
+- **Authentication:** Session tokens are stored in the OS keychain via [keytar](https://github.com/nicknisi/keytar), never in plain-text config files.
+- **No local data collection:** CLISHOP does not collect analytics, telemetry, or tracking data locally.
+- **Agent safety profiles:** Spending limits (`maxOrderAmount`), category allow/block lists, and confirmation requirements are enforced client-side before any order is placed.
+- **Data sent to API:** Only the data required for each operation (search queries, addresses, order details) is sent to the CLISHOP backend API. No additional metadata is collected.
+- **Vendor stores:** When extended search is enabled, the CLISHOP backend fans out search queries to registered vendor Dark Stores in real-time. Product data flows through the CLISHOP API — the CLI never contacts vendor stores directly.
+
+## Trust Statement
+
+By using this skill, your search queries, shipping addresses, payment method references, and order details are sent to the CLISHOP API (`clishop-backend.vercel.app`). The API acts as a gateway to registered vendor stores. No data is sold or shared with third parties beyond what is necessary to fulfill orders.
+
+## Model Invocation Note
+
+This skill is designed for autonomous invocation by AI agents via the Model Context Protocol (MCP). When an MCP client (e.g. Claude Desktop, Cursor, VS Code Copilot) calls these tools, the agent may search for products, place orders, and manage account data on the user's behalf — subject to the safety thresholds configured in the user's agent profile.
+
+## Links
+
+- 🌐 [clishop.ai](https://clishop.ai)
+- 📖 [Docs](https://clishop.ai/docs)
+- 💬 [Discord](https://discord.gg/vwXMbzD4bx)
+- 🏪 [Dark Store template](https://github.com/DavooxBv2/CLISHOP-DARKSTORE)
+- 📦 [npm](https://www.npmjs.com/package/clishop)

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "clishop",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "mcpName": "io.github.StefDCL/clishop",
   "description": "CLISHOP — Order anything from your terminal",
   "main": "dist/index.js",
   "files": [
-    "dist"
+    "dist",
+    "openclaw",
+    "server.json"
   ],
   "bin": {
     "clishop": "dist/index.js",

package/server.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
+  "name": "io.github.StefDCL/clishop",
+  "description": "Order anything from your terminal — search, buy, track, and manage via MCP tools.",
+  "repository": {
+    "url": "https://github.com/DavooxBv2/CLISHOP",
+    "source": "github"
+  },
+  "version": "1.5.4",
+  "packages": [
+    {
+      "registryType": "npm",
+      "identifier": "clishop",
+      "version": "1.5.4",
+      "runtime": "node",
+      "args": ["--mcp"],
+      "transport": {
+        "type": "stdio"
+      },
+      "environmentVariables": []
+    }
+  ]
+}