clishop 0.3.0 → 1.0.0

package/README.md

@@ -16,6 +16,7 @@
 ## Works with
 
 <p>
+  <img alt="VS Code" src="https://img.shields.io/badge/VS%20Code-Copilot-007ACC?style=for-the-badge&logo=visualstudiocode&logoColor=white" />
   <img alt="Claude" src="https://img.shields.io/badge/Claude-Supported-7C3AED?style=for-the-badge&logo=anthropic&logoColor=white" />
   <img alt="GPT" src="https://img.shields.io/badge/GPT-Supported-10A37F?style=for-the-badge&logo=openai&logoColor=white" />
   <img alt="Gemini" src="https://img.shields.io/badge/Gemini-Supported-4285F4?style=for-the-badge&logo=googlegemini&logoColor=white" />
@@ -32,15 +33,56 @@ Built for the [Model Context Protocol (MCP)](https://modelcontextprotocol.io/) e
 
 ## MCP Server
 
-CLISHOP ships as a native MCP server. Every Claude Desktop, Cursor, Windsurf, or other MCP-compatible client gets access to 19 shopping tools out of the box.
+CLISHOP ships as a native MCP server. VS Code (GitHub Copilot), Claude Desktop, Cursor, Windsurf, and any MCP-compatible client gets access to 19 shopping tools out of the box.
 
-### Claude Desktop
+Install globally and run the dedicated binary:
 
-Add to `claude_desktop_config.json`:
+```bash
+npm install -g clishop
+clishop-mcp
+```
+
+Or run without installing:
+
+```bash
+npx -y clishop --mcp
+```
+
+### VS Code (GitHub Copilot)
+
+Add to `.vscode/mcp.json` in your workspace:
 
 ```json
 {
-  "mcpServers": {
+  "servers": {
+    "clishop": {
+      "command": "clishop-mcp",
+      "args": []
+    }
+  }
+}
+```
+
+Or add to your VS Code `settings.json`:
+
+```json
+{
+  "mcp": {
+    "servers": {
+      "clishop": {
+        "command": "clishop-mcp",
+        "args": []
+      }
+    }
+  }
+}
+```
+
+If you don't have clishop installed globally, use npx instead:
+
+```json
+{
+  "servers": {
     "clishop": {
       "command": "npx",
       "args": ["-y", "clishop", "--mcp"]
@@ -49,7 +91,9 @@ Add to `claude_desktop_config.json`:
 }
 ```
 
-Or if installed globally:
+### Claude Desktop
+
+Add to `claude_desktop_config.json`:
 
 ```json
 {
@@ -61,6 +105,19 @@ Or if installed globally:
 }
 ```
 
+Or if not installed globally:
+
+```json
+{
+  "mcpServers": {
+    "clishop": {
+      "command": "npx",
+      "args": ["-y", "clishop", "--mcp"]
+    }
+  }
+}
+```
+
 ### Cursor
 
 Add to `.cursor/mcp.json`:
@@ -69,8 +126,7 @@ Add to `.cursor/mcp.json`:
 {
   "mcpServers": {
     "clishop": {
-      "command": "npx",
-      "args": ["-y", "clishop", "--mcp"]
+      "command": "clishop-mcp"
     }
   }
 }
@@ -84,8 +140,7 @@ Add to `~/.windsurf/mcp.json`:
 {
   "mcpServers": {
     "clishop": {
-      "command": "npx",
-      "args": ["-y", "clishop", "--mcp"]
+      "command": "clishop-mcp"
     }
   }
 }

package/dist/{chunk-RHBOI27D.js → chunk-CVK6G342.js}

@@ -1,6 +1,6 @@
 import {
   getApiBaseUrl
-} from "./chunk-ZF3JIQRK.js";
+} from "./chunk-X3H7SYR4.js";
 
 // src/auth.ts
 import keytar from "keytar";
@@ -155,6 +155,22 @@ function getApiClient() {
   );
   return client;
 }
+async function ensureAgentOnBackend(agentName, maxOrderAmountInCents, requireConfirmation = true) {
+  const api = getApiClient();
+  try {
+    const res = await api.get("/agents");
+    const agents = res.data.agents || [];
+    const exists = agents.some((a) => a.name === agentName);
+    if (!exists) {
+      await api.post("/agents", {
+        name: agentName,
+        maxOrderAmountInCents: maxOrderAmountInCents || void 0,
+        requireConfirmation
+      });
+    }
+  } catch {
+  }
+}
 function handleApiError(error) {
   if (axios2.isAxiosError(error)) {
     const data = error.response?.data;
@@ -188,5 +204,6 @@ export {
   register,
   logout,
   getApiClient,
+  ensureAgentOnBackend,
   handleApiError
 };

package/dist/{chunk-ZF3JIQRK.js → chunk-X3H7SYR4.js}

@@ -92,6 +92,18 @@ function deleteAgent(name) {
 function listAgents() {
   return Object.values(config.store.agents);
 }
+function resetAgents() {
+  config.set("agents", {
+    default: {
+      name: "default",
+      requireConfirmation: true,
+      maxOrderAmount: 500,
+      allowedCategories: [],
+      blockedCategories: []
+    }
+  });
+  config.set("activeAgent", "default");
+}
 
 export {
   __export,
@@ -104,5 +116,6 @@ export {
   createAgent,
   updateAgent,
   deleteAgent,
-  listAgents
+  listAgents,
+  resetAgents
 };

package/dist/{config-63FY6NWX.js → config-WZBIQWME.js}

@@ -7,9 +7,10 @@ import {
   getApiBaseUrl,
   getConfig,
   listAgents,
+  resetAgents,
   setActiveAgent,
   updateAgent
-} from "./chunk-ZF3JIQRK.js";
+} from "./chunk-X3H7SYR4.js";
 export {
   DEFAULT_API_BASE_URL,
   createAgent,
@@ -19,6 +20,7 @@ export {
   getApiBaseUrl,
   getConfig,
   listAgents,
+  resetAgents,
   setActiveAgent,
   updateAgent
 };

package/dist/index.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import {
+  ensureAgentOnBackend,
   getApiClient,
   getUserInfo,
   handleApiError,
@@ -7,7 +8,7 @@ import {
   login,
   logout,
   register
-} from "./chunk-RHBOI27D.js";
+} from "./chunk-CVK6G342.js";
 import {
   createAgent,
   deleteAgent,
@@ -17,7 +18,7 @@ import {
   listAgents,
   setActiveAgent,
   updateAgent
-} from "./chunk-ZF3JIQRK.js";
+} from "./chunk-X3H7SYR4.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -43,12 +44,12 @@ function registerAuthCommands(program2) {
         return;
       }
       if (await isLoggedIn()) {
-        const user2 = await getUserInfo();
+        const user = await getUserInfo();
         const { confirm } = await inquirer.prompt([
           {
             type: "confirm",
             name: "confirm",
-            message: `You are already logged in as ${chalk.cyan(user2?.email || "unknown")}. Log in as a different user?`,
+            message: `You are already logged in as ${chalk.cyan(user?.email || "unknown")}. Log in as a different user?`,
             default: false
           }
         ]);
@@ -77,8 +78,14 @@ function registerAuthCommands(program2) {
         password = password || answers.password;
       }
       const spinner = ora("Logging in...").start();
-      const user = await login(email, password);
-      spinner.succeed(chalk.green(`Logged in as ${chalk.bold(user.name)} (${user.email})`));
+      try {
+        const user = await login(email, password);
+        spinner.succeed(chalk.green(`Logged in as ${chalk.bold(user.name)} (${user.email})`));
+      } catch (loginErr) {
+        const msg = loginErr?.response?.data?.message || loginErr.message;
+        spinner.fail(chalk.red(`Login failed: ${msg}`));
+        process.exitCode = 1;
+      }
     } catch (error) {
       const msg = error?.response?.data?.message || error.message;
       console.error(chalk.red(`
@@ -110,8 +117,14 @@ function registerAuthCommands(program2) {
         return;
       }
       const spinner = ora("Creating account...").start();
-      const user = await register(answers.email, answers.password, answers.name);
-      spinner.succeed(chalk.green(`Account created! Welcome, ${chalk.bold(user.name)}.`));
+      try {
+        const user = await register(answers.email, answers.password, answers.name);
+        spinner.succeed(chalk.green(`Account created! Welcome, ${chalk.bold(user.name)}.`));
+      } catch (regErr) {
+        const msg = regErr?.response?.data?.message || regErr.message;
+        spinner.fail(chalk.red(`Registration failed: ${msg}`));
+        process.exitCode = 1;
+      }
     } catch (error) {
       const msg = error?.response?.data?.message || error.message;
       console.error(chalk.red(`
@@ -122,7 +135,19 @@ function registerAuthCommands(program2) {
   program2.command("logout").description("Log out of your CLISHOP account").action(async () => {
     const spinner = ora("Logging out...").start();
     await logout();
-    spinner.succeed(chalk.green("Logged out."));
+    const config = getConfig();
+    config.set("agents", {
+      default: {
+        name: "default",
+        requireConfirmation: true,
+        maxOrderAmount: 500,
+        allowedCategories: [],
+        blockedCategories: []
+      }
+    });
+    config.set("activeAgent", "default");
+    config.set("setupCompleted", false);
+    spinner.succeed(chalk.green("Logged out. Local config reset."));
   });
   program2.command("whoami").description("Show the currently logged-in user").action(async () => {
     if (!await isLoggedIn()) {
@@ -377,6 +402,7 @@ function registerAddressCommands(program2) {
   address.command("list").alias("ls").description("List all addresses for the active agent").action(async () => {
     try {
       const agent = getActiveAgent();
+      await ensureAgentOnBackend(agent.name);
       const spinner = ora2("Fetching addresses...").start();
       const api = getApiClient();
       const res = await api.get("/addresses", {
@@ -403,7 +429,6 @@ Addresses for agent "${agent.name}":
         console.log(`    ${addr.country}`);
         if (addr.recipientPhone) console.log(`    ${chalk3.dim("Phone:")} ${addr.recipientPhone}`);
         if (addr.vatNumber) console.log(`    ${chalk3.dim("VAT:")} ${addr.vatNumber}`);
-        if (addr.taxId) console.log(`    ${chalk3.dim("Tax ID:")} ${addr.taxId}`);
         if (addr.instructions) console.log(`    ${chalk3.dim("Instructions:")} ${addr.instructions}`);
         console.log();
       }
@@ -416,7 +441,12 @@ Addresses for agent "${agent.name}":
       const agent = getActiveAgent();
       const answers = await inquirer3.prompt([
         { type: "input", name: "label", message: "Label (e.g. Home, Office):" },
-        { type: "input", name: "recipientName", message: "Recipient name (optional):" },
+        {
+          type: "input",
+          name: "recipientName",
+          message: "Recipient name:",
+          validate: (v) => v.trim() ? true : "Recipient name is required"
+        },
         { type: "input", name: "recipientPhone", message: "Recipient phone (optional):" },
         {
           type: "input",
@@ -452,7 +482,7 @@ Addresses for agent "${agent.name}":
           default: false
         }
       ]);
-      let companyAnswers = { companyName: "", vatNumber: "", taxId: "" };
+      let companyAnswers = { companyName: "", vatNumber: "" };
       if (answers.isCompany) {
         companyAnswers = await inquirer3.prompt([
           {
@@ -461,8 +491,7 @@ Addresses for agent "${agent.name}":
             message: "Company name:",
             validate: (v) => v.trim() ? true : "Required for company addresses"
           },
-          { type: "input", name: "vatNumber", message: "VAT number (optional):" },
-          { type: "input", name: "taxId", message: "Tax ID / EIN (optional):" }
+          { type: "input", name: "vatNumber", message: "VAT number (optional):" }
         ]);
       }
       const { setDefault } = await inquirer3.prompt([
@@ -474,6 +503,7 @@ Addresses for agent "${agent.name}":
         }
       ]);
       const spinner = ora2("Saving address...").start();
+      await ensureAgentOnBackend(agent.name);
       const api = getApiClient();
       const res = await api.post("/addresses", {
         agent: agent.name,
@@ -482,7 +512,6 @@ Addresses for agent "${agent.name}":
         recipientPhone: answers.recipientPhone || void 0,
         companyName: companyAnswers.companyName || void 0,
         vatNumber: companyAnswers.vatNumber || void 0,
-        taxId: companyAnswers.taxId || void 0,
         line1: answers.line1,
         line2: answers.line2 || void 0,
         city: answers.city,
@@ -539,6 +568,7 @@ function registerPaymentCommands(program2) {
   payment.command("list").alias("ls").description("List payment methods for the active agent").action(async () => {
     try {
       const agent = getActiveAgent();
+      await ensureAgentOnBackend(agent.name);
       const spinner = ora3("Fetching payment methods...").start();
       const api = getApiClient();
       const res = await api.get("/payment-methods", {
@@ -567,6 +597,7 @@ Payment methods for agent "${agent.name}":
   payment.command("add").description("Add a payment method (opens browser for secure entry)").action(async () => {
     try {
       const agent = getActiveAgent();
+      await ensureAgentOnBackend(agent.name);
       const spinner = ora3("Requesting secure payment setup link...").start();
       const api = getApiClient();
       const res = await api.post("/payment-methods/setup", {
@@ -1056,6 +1087,13 @@ function registerSearchCommands(program2) {
           } catch {
           }
         }
+        if (!shipToCountry) {
+          const savedCountry = getConfig().get("defaultCountry");
+          if (savedCountry) {
+            shipToCountry = savedCountry;
+            spinner.text = `Searching for "${query}" (delivering to: ${shipToCountry})...`;
+          }
+        }
       }
       const forceExtended = opts.extendedSearch === true;
       const disableExtended = opts.extendedSearch === false;
@@ -1359,6 +1397,20 @@ Results for "${query}" \u2014 ${result.total} found (page ${result.page})
           }
           console.log();
         }
+        const cacheItems = allProducts.filter((p) => p.id).map((p) => ({
+          id: p.id,
+          name: p.name,
+          priceInCents: p.priceInCents,
+          currency: p.currency,
+          isExtended: p.isExtended
+        }));
+        getConfig().set("lastSearchResults", cacheItems);
+        if (cacheItems.length > 0) {
+          console.log(
+            chalk5.dim("  \u{1F4A1} ") + chalk5.white("Buy a result by number: ") + chalk5.cyan("clishop buy 1") + chalk5.dim(" (buys the first result)")
+          );
+          console.log();
+        }
       }
       const hasExtendedProducts = extended?.products?.length > 0;
       if (opts.interactive && allProducts.length > 0) {
@@ -1604,9 +1656,29 @@ var STATUS_COLORS = {
 };
 function registerOrderCommands(program2) {
   const order = program2.command("order").description("Place and manage orders");
-  program2.command("buy <productId>").description("Quick-buy a product").option("-q, --quantity <qty>", "Quantity", parseInt, 1).option("--address <id>", "Shipping address ID (uses agent default if omitted)").option("--payment <id>", "Payment method ID (uses agent default if omitted)").option("-y, --yes", "Skip confirmation prompt").action(async (productId, opts) => {
+  program2.command("buy <productIdOrNumber>").description("Quick-buy a product (use product ID or search result number like 1, 2, 3)").option("-q, --quantity <qty>", "Quantity", parseInt, 1).option("--address <id>", "Shipping address ID (uses agent default if omitted)").option("--payment <id>", "Payment method ID (uses agent default if omitted)").option("-y, --yes", "Skip confirmation prompt").action(async (productIdOrNumber, opts) => {
     try {
       const agent = getActiveAgent();
+      let productId = productIdOrNumber;
+      const asNumber = parseInt(productIdOrNumber, 10);
+      if (!isNaN(asNumber) && asNumber > 0 && String(asNumber) === productIdOrNumber.trim()) {
+        const cached = getConfig().get("lastSearchResults") || [];
+        if (cached.length === 0) {
+          console.error(chalk6.red("\n\u2717 No recent search results. Run a search first: clishop search <query>"));
+          process.exitCode = 1;
+          return;
+        }
+        const index = asNumber - 1;
+        if (index < 0 || index >= cached.length) {
+          console.error(chalk6.red(`
+\u2717 Result #${asNumber} doesn't exist. Last search had ${cached.length} result(s).`));
+          process.exitCode = 1;
+          return;
+        }
+        productId = cached[index].id;
+        console.log(chalk6.dim(`  Resolved #${asNumber} \u2192 ${cached[index].name} (${productId})
+`));
+      }
       const addressId = opts.address || agent.defaultAddressId;
       const paymentId = opts.payment || agent.defaultPaymentMethodId;
       if (!addressId) {
@@ -2469,6 +2541,7 @@ function registerStatusCommand(program2) {
 import chalk11 from "chalk";
 import ora9 from "ora";
 import inquirer7 from "inquirer";
+import open2 from "open";
 function divider(color = chalk11.cyan) {
   console.log("  " + color("\u2500".repeat(48)));
 }
@@ -2511,6 +2584,62 @@ async function runSetupWizard() {
     chalk11.dim("  It only takes a minute. You can re-run it anytime with:")
   );
   console.log(chalk11.dim("  ") + chalk11.white("clishop setup"));
+  console.log();
+  console.log(
+    chalk11.bold.yellow("  \u{1F4CB} PATH Setup")
+  );
+  console.log(
+    chalk11.dim("  Make sure clishop is in your PATH so your AI agents can use it.")
+  );
+  console.log(
+    chalk11.dim("  If you installed via npm globally (") + chalk11.white("npm i -g clishop") + chalk11.dim("), it should already be available.")
+  );
+  console.log(
+    chalk11.dim("  Verify with: ") + chalk11.white("clishop --version")
+  );
+  console.log(
+    chalk11.dim("  If not, add the npm global bin to your PATH:")
+  );
+  console.log(
+    chalk11.dim("    macOS/Linux: ") + chalk11.white('export PATH="$(npm config get prefix)/bin:$PATH"')
+  );
+  console.log(
+    chalk11.dim("    Windows:     ") + chalk11.white("npm config get prefix") + chalk11.dim(" \u2192 add that path to your system PATH")
+  );
+  console.log();
+  const { setupMethod } = await inquirer7.prompt([
+    {
+      type: "select",
+      name: "setupMethod",
+      message: "How would you like to configure CLISHOP?",
+      choices: [
+        { name: "Here in the CLI", value: "cli" },
+        { name: "On the website (opens browser)", value: "web" }
+      ]
+    }
+  ]);
+  if (setupMethod === "web") {
+    const webSetupUrl = "https://clishop.ai/setup";
+    console.log();
+    console.log(chalk11.bold("  Opening the setup wizard on the website..."));
+    console.log();
+    console.log("  " + chalk11.cyan.underline(webSetupUrl));
+    console.log();
+    console.log(
+      chalk11.dim("  Complete the setup there, then return here and run:")
+    );
+    console.log(chalk11.dim("  ") + chalk11.white("clishop login"));
+    console.log();
+    try {
+      await open2(webSetupUrl);
+    } catch {
+      console.log(
+        chalk11.yellow("  Could not open browser automatically. Please visit the link above.")
+      );
+    }
+    config.set("setupCompleted", true);
+    return;
+  }
   stepHeader(1, 6, "Account");
   let loggedIn = await isLoggedIn();
   let isNewAccount = false;
@@ -2665,7 +2794,71 @@ async function runSetupWizard() {
       }
     }
   }
-  stepHeader(2, 6, "Monthly Spending Limit");
+  stepHeader(2, 6, "Agent");
+  console.log(
+    chalk11.dim(
+      "  Agents are safety profiles that control per-order limits and categories."
+    )
+  );
+  console.log(
+    chalk11.dim("  A default agent is ready. You can customize it or create a new one.")
+  );
+  console.log();
+  const { agentChoice } = await inquirer7.prompt([
+    {
+      type: "confirm",
+      name: "agentChoice",
+      message: "Configure a custom agent?",
+      default: false
+    }
+  ]);
+  if (agentChoice) {
+    const answers = await inquirer7.prompt([
+      {
+        type: "input",
+        name: "name",
+        message: "Agent name:",
+        validate: (v) => v.trim() ? true : "Name is required"
+      },
+      {
+        type: "number",
+        name: "maxOrderAmount",
+        message: "Max order amount ($):",
+        default: 500
+      },
+      {
+        type: "confirm",
+        name: "requireConfirmation",
+        message: "Require confirmation before ordering?",
+        default: true
+      }
+    ]);
+    try {
+      const agent = createAgent(answers.name.trim(), {
+        maxOrderAmount: answers.maxOrderAmount,
+        requireConfirmation: answers.requireConfirmation
+      });
+      setActiveAgent(agent.name);
+      const syncSpinner = ora9("Syncing agent to backend...").start();
+      await ensureAgentOnBackend(
+        agent.name,
+        agent.maxOrderAmount ? agent.maxOrderAmount * 100 : void 0,
+        agent.requireConfirmation
+      );
+      syncSpinner.succeed(
+        chalk11.green(
+          `Agent "${chalk11.bold(agent.name)}" created and set as active.`
+        )
+      );
+    } catch (error) {
+      console.error(chalk11.red(`
+  \u2717 ${error.message}`));
+      console.log(chalk11.dim("  Continuing with the default agent."));
+    }
+  } else {
+    console.log(chalk11.green("  \u2713 Using default agent."));
+  }
+  stepHeader(3, 6, "Monthly Spending Limit");
   if (isNewAccount) {
     console.log(
       chalk11.green("  \u2713 Spending limit was set during registration.")
@@ -2745,70 +2938,15 @@ async function runSetupWizard() {
       );
     }
   }
-  stepHeader(3, 6, "Agent (optional)");
-  const activeAgent = getActiveAgent();
+  stepHeader(4, 6, "Shipping Address");
   console.log(
     chalk11.dim(
-      `  A default agent is ready ($${activeAgent.maxOrderAmount} limit, confirmation on).`
+      "  Add an address so products can be delivered to you."
     )
   );
-  console.log(
-    chalk11.dim("  Agents control spending limits and category restrictions.")
-  );
-  console.log();
-  const { agentChoice } = await inquirer7.prompt([
-    {
-      type: "confirm",
-      name: "agentChoice",
-      message: "Configure a custom agent?",
-      default: false
-    }
-  ]);
-  if (agentChoice) {
-    const answers = await inquirer7.prompt([
-      {
-        type: "input",
-        name: "name",
-        message: "Agent name:",
-        validate: (v) => v.trim() ? true : "Name is required"
-      },
-      {
-        type: "number",
-        name: "maxOrderAmount",
-        message: "Max order amount ($):",
-        default: 500
-      },
-      {
-        type: "confirm",
-        name: "requireConfirmation",
-        message: "Require confirmation before ordering?",
-        default: true
-      }
-    ]);
-    try {
-      const agent = createAgent(answers.name.trim(), {
-        maxOrderAmount: answers.maxOrderAmount,
-        requireConfirmation: answers.requireConfirmation
-      });
-      setActiveAgent(agent.name);
-      console.log(
-        chalk11.green(
-          `
-  \u2713 Agent "${chalk11.bold(agent.name)}" created and set as active.`
-        )
-      );
-    } catch (error) {
-      console.error(chalk11.red(`
-  \u2717 ${error.message}`));
-      console.log(chalk11.dim("  Continuing with the default agent."));
-    }
-  } else {
-    console.log(chalk11.green("  \u2713 Using default agent."));
-  }
-  stepHeader(4, 6, "Shipping Address");
   console.log(
     chalk11.dim(
-      "  Add an address so products can be delivered to you."
+      "  A shipping country is required for product searches to work correctly."
     )
   );
   console.log();
@@ -2821,6 +2959,7 @@ async function runSetupWizard() {
     }
   ]);
   let addressCity = "";
+  let addressCountry = "";
   if (addAddress) {
     const addr = await inquirer7.prompt([
       {
@@ -2832,7 +2971,8 @@ async function runSetupWizard() {
       {
         type: "input",
         name: "recipientName",
-        message: "Recipient name (optional):"
+        message: "Recipient name:",
+        validate: (v) => v.trim() ? true : "Recipient name is required"
       },
       {
         type: "input",
@@ -2885,7 +3025,7 @@ async function runSetupWizard() {
         default: false
       }
     ]);
-    let companyInfo = { companyName: "", vatNumber: "", taxId: "" };
+    let companyInfo = { companyName: "", vatNumber: "" };
     if (addr.isCompany) {
       companyInfo = await inquirer7.prompt([
         {
@@ -2898,19 +3038,16 @@ async function runSetupWizard() {
           type: "input",
           name: "vatNumber",
           message: "VAT number (optional):"
-        },
-        {
-          type: "input",
-          name: "taxId",
-          message: "Tax ID / EIN (optional):"
         }
       ]);
     }
     addressCity = addr.city;
+    addressCountry = addr.country;
     const spinner = ora9("Saving address...").start();
     try {
       const api = getApiClient();
       const agent = getActiveAgent();
+      await ensureAgentOnBackend(agent.name);
       const res = await api.post("/addresses", {
         agent: agent.name,
         label: addr.label,
@@ -2918,7 +3055,6 @@ async function runSetupWizard() {
         recipientPhone: addr.recipientPhone || void 0,
         companyName: companyInfo.companyName || void 0,
         vatNumber: companyInfo.vatNumber || void 0,
-        taxId: companyInfo.taxId || void 0,
         line1: addr.line1,
         line2: addr.line2 || void 0,
         city: addr.city,
@@ -2946,9 +3082,29 @@ async function runSetupWizard() {
       );
     }
   } else {
+    console.log();
+    console.log(
+      chalk11.yellow(
+        "  \u26A0 A country is required for product searches to show relevant results."
+      )
+    );
+    console.log();
+    const { country } = await inquirer7.prompt([
+      {
+        type: "input",
+        name: "country",
+        message: "Which country should we search products for? (e.g. US, NL, DE):",
+        validate: (v) => v.trim() ? true : "Country is required for searches to work"
+      }
+    ]);
+    addressCountry = country.trim();
+    config.set("defaultCountry", addressCountry);
+    console.log(
+      chalk11.green(`  \u2713 Country set to "${addressCountry}" for product searches.`)
+    );
     console.log(
       chalk11.dim(
-        "\n  You can add one later with: " + chalk11.white("clishop address add")
+        "\n  You can add a full address later with: " + chalk11.white("clishop address add")
       )
     );
   }
@@ -2975,6 +3131,7 @@ async function runSetupWizard() {
     try {
       const api = getApiClient();
       const agent = getActiveAgent();
+      await ensureAgentOnBackend(agent.name);
       const res = await api.post("/payment-methods/setup", {
         agent: agent.name
       });
@@ -2994,6 +3151,11 @@ async function runSetupWizard() {
           "  Once done, verify with: " + chalk11.white("clishop payment list")
         )
       );
+      try {
+        await open2(setupUrl);
+        console.log(chalk11.dim("  (Browser opened automatically)"));
+      } catch {
+      }
     } catch (error) {
       spinner.fail(
         chalk11.red(
@@ -3020,6 +3182,12 @@ async function runSetupWizard() {
         `  Let's find something! Products can be shipped to ${chalk11.white(addressCity)}.`
       )
     );
+  } else if (addressCountry) {
+    console.log(
+      chalk11.dim(
+        `  Let's find something! Searching products available in ${chalk11.white(addressCountry)}.`
+      )
+    );
   } else {
     console.log(chalk11.dim("  Let's find something to order!"));
   }
@@ -3036,43 +3204,87 @@ async function runSetupWizard() {
     const spinner = ora9(`Searching for "${searchQuery}"...`).start();
     try {
       const api = getApiClient();
+      const searchParams = {
+        q: searchQuery,
+        page: 1,
+        pageSize: 5,
+        extendedSearch: true,
+        extendedTimeout: 30
+      };
+      if (addressCountry) {
+        searchParams.country = addressCountry;
+      }
+      if (addressCity) {
+        searchParams.city = addressCity;
+      }
+      spinner.text = `Searching for "${searchQuery}" (extended search across all stores)...`;
       const res = await api.get("/products/search", {
-        params: { q: searchQuery, page: 1, pageSize: 5 }
+        params: searchParams,
+        timeout: 35e3
       });
       spinner.stop();
       const result = res.data;
-      if (result.products.length === 0) {
+      const extended = result.extended;
+      const allProducts = [
+        ...result.products || [],
+        ...extended?.products || []
+      ];
+      if (allProducts.length === 0) {
         console.log(
           chalk11.yellow(
             `
-  No results for "${searchQuery}". Try other terms later!`
+  No results for "${searchQuery}".`
           )
         );
+        if (!addressCountry) {
+          console.log(
+            chalk11.yellow(
+              "  This might be because no shipping country was configured."
+            )
+          );
+          console.log(
+            chalk11.dim(
+              "  Add a shipping address with: " + chalk11.white("clishop address add")
+            )
+          );
+        } else {
+          console.log(
+            chalk11.dim("  Try other search terms later!")
+          );
+        }
       } else {
+        const totalCount = (result.total || 0) + (extended?.total || 0);
         console.log(
           chalk11.bold(
             `
-  Found ${result.total} result${result.total !== 1 ? "s" : ""} for "${searchQuery}":
+  Found ${totalCount} result${totalCount !== 1 ? "s" : ""} for "${searchQuery}":
 `
           )
         );
-        for (const p of result.products) {
+        for (let i = 0; i < Math.min(allProducts.length, 5); i++) {
+          const p = allProducts[i];
           const price = formatPrice4(p.priceInCents, p.currency || "USD");
-          const stock = p.inStock ? chalk11.green("In Stock") : chalk11.red("Out of Stock");
+          const stock = p.inStock !== false ? chalk11.green("In Stock") : chalk11.red("Out of Stock");
+          const num = i + 1;
           console.log(
-            `  ${chalk11.bold.cyan(p.name)}  ${chalk11.bold.white(price)}  ${stock}`
-          );
-          console.log(chalk11.dim(`  ID: ${p.id}`));
-          console.log(
-            chalk11.dim(
-              `  ${p.description.length > 100 ? p.description.slice(0, 100) + "..." : p.description}`
-            )
+            `  ${chalk11.dim(`[${num}]`)} ${chalk11.bold.cyan(p.name)}  ${chalk11.bold.white(price)}  ${stock}`
           );
+          console.log(chalk11.dim(`      ID: ${p.id}`));
+          if (p.description) {
+            console.log(
+              chalk11.dim(
+                `      ${p.description.length > 100 ? p.description.slice(0, 100) + "..." : p.description}`
+              )
+            );
+          }
           console.log();
         }
         console.log(
           chalk11.dim("  Buy a product with: ") + chalk11.white("clishop buy <product-id>")
         );
+        console.log(
+          chalk11.dim("  Or search again with: ") + chalk11.white("clishop search <query>")
+        );
       }
     } catch (error) {
       spinner.fail(
@@ -4077,7 +4289,7 @@ function registerFeedbackCommands(program2) {
 
 // src/index.ts
 var program = new Command();
-program.name("clishop").version("0.3.0").description(
+program.name("clishop").version("0.3.1").description(
   chalk15.bold("CLISHOP") + ' \u2014 Order anything from your terminal.\n\n  Use agents to set safety limits, addresses, and payment methods.\n  The "default" agent is used when no agent is specified.'
 ).option("--agent <name>", "Use a specific agent for this command").hook("preAction", (thisCommand) => {
   const agentOpt = thisCommand.opts().agent;

package/dist/mcp.js

@@ -3,12 +3,12 @@ import {
   getApiClient,
   getUserInfo,
   isLoggedIn
-} from "./chunk-RHBOI27D.js";
+} from "./chunk-CVK6G342.js";
 import {
   __export,
   getActiveAgent,
   getConfig
-} from "./chunk-ZF3JIQRK.js";
+} from "./chunk-X3H7SYR4.js";
 
 // src/mcp.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -13810,7 +13810,7 @@ function safeCall(fn) {
 var server = new McpServer(
   {
     name: "clishop",
-    version: "0.3.0"
+    version: "0.3.1"
   },
   {
     capabilities: {
@@ -14100,7 +14100,7 @@ server.registerTool("add_address", {
       instructions: args.instructions || void 0
     });
     if (args.setDefault && res.data.address?.id) {
-      const { updateAgent } = await import("./config-63FY6NWX.js");
+      const { updateAgent } = await import("./config-WZBIQWME.js");
       updateAgent(agent.name, { defaultAddressId: res.data.address.id });
     }
     return res.data;
@@ -14291,7 +14291,7 @@ server.registerTool("list_agents", {
   }
 }, async () => {
   return safeCall(async () => {
-    const { listAgents, getConfig: getConfig2 } = await import("./config-63FY6NWX.js");
+    const { listAgents, getConfig: getConfig2 } = await import("./config-WZBIQWME.js");
     const agents = listAgents();
     const active = getConfig2().get("activeAgent");
     return { agents, activeAgent: active };

package/package.json

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

package/server.json

@@ -6,24 +6,18 @@
     "url": "https://github.com/DavooxBv2/CLISHOP",
     "source": "github"
   },
-  "version": "0.2.1",
+  "version": "0.3.0",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "clishop",
-      "version": "0.2.1",
+      "version": "0.3.0",
+      "runtime": "node",
+      "args": ["--mcp"],
       "transport": {
         "type": "stdio"
       },
-      "environmentVariables": [
-        {
-          "description": "CLISHOP API key for authentication",
-          "isRequired": true,
-          "format": "string",
-          "isSecret": true,
-          "name": "CLISHOP_API_KEY"
-        }
-      ]
+      "environmentVariables": []
     }
   ]
 }