diff --git a/src/components/agent-setup-button.tsx b/src/components/agent-setup-button.tsx
index d26c3fe65..cdcce657c 100644
--- a/src/components/agent-setup-button.tsx
+++ b/src/components/agent-setup-button.tsx
@@ -15,15 +15,16 @@ import { createPortal } from "react-dom";
 
 /**
  * Kept in sync with the copy-prompt on the docs landing page
- * (upstash/docs → introduction.mdx). It tells the agent to install the plugin
- * itself rather than hand the reader a command to run.
+ * (upstash/docs → introduction.mdx) and the console's agent setup menu. It
+ * tells the agent to run `upstash setup` itself rather than hand the reader a
+ * command to run.
  */
 export const AGENT_SETUP_PROMPT =
-  "Set up Upstash in my coding agent using the official Upstash instructions, and run the commands yourself instead of asking me to. If you are Claude Code, install the Upstash plugin — it bundles the Upstash skills (https://upstash.com/docs/agent-resources/skills) and the remote MCP server over OAuth — by running `claude plugin marketplace add upstash/skills` then `claude plugin install upstash@upstash`, and tell me to run `/reload-plugins`. If you are OpenAI Codex, install the same plugin with `codex plugin marketplace add upstash/skills` then `codex plugin add upstash@upstash`. For any other agent, install the skills with `npx -y skills add upstash/skills --global`, then add the remote MCP server https://mcp.upstash.com/mcp to your MCP config (it authenticates over OAuth on first use); see https://upstash.com/docs/agent-resources/clients for the exact location. When done, verify the skills and MCP server are installed and tell me whether a restart is needed.";
+  "Set up Upstash in my coding agent using the official Upstash instructions, and run the commands yourself instead of asking me to. Run `npx -y upstash setup --yes` with the flag for the agent you are (`--claude`, `--codex`, `--cursor`, `--gemini`, `--vscode`, `--copilot` or `--opencode`). It installs the Upstash plugin where your agent supports plugins, and otherwise adds the remote MCP server https://mcp.upstash.com/mcp plus the Upstash skills (https://upstash.com/docs/agent-resources/skills); the MCP server authenticates over OAuth on first use. If you are not one of those agents, install the skills with `npx -y skills add upstash/skills --global` and add the remote MCP server to your MCP config; see https://upstash.com/docs/agent-resources/clients for the exact location. When done, tell me what was installed and whether I need to restart or reload (in Claude Code, `/reload-plugins`).";
 
 type SetupOption = {
   id: string;
-  label: string;
+  label: React.ReactNode;
   value: string;
 };
 
@@ -33,6 +34,12 @@ type SetupOption = {
  * last menu row links to.
  */
 const SETUP_OPTIONS: SetupOption[] = [
+  {
+    id: "command",
+    // The command itself, so the reader sees what they are copying.
+    label: <code className="font-mono">npx upstash</code>,
+    value: "npx upstash",
+  },
   {
     id: "prompt",
     label: "Copy setup prompt",
diff --git a/src/components/home/agents/index.tsx b/src/components/home/agents/index.tsx
index 600dc743f..220fbc7a6 100644
--- a/src/components/home/agents/index.tsx
+++ b/src/components/home/agents/index.tsx
@@ -13,7 +13,7 @@ import { ReactNode } from "react";
 const UPSTASH_SKILL_COMMAND =
   "npx skills add https://github.com/upstash/skills --skill upstash";
 
-const CLI_COMMAND = "npm i -g @upstash/cli";
+const CLI_COMMAND = "npm i -g upstash";
 
 const SKILL_AGENTS = ["Claude Code", "OpenAI Codex", "Cursor"];