feat(clients): Phase 3 — regenerate choice + remove redundant Cursor bridge card

Autonomous decisions:
- Two secondary buttons (Rotate key / New client) — clearer than a single Regenerate that opens a sub-choice; both paths stay one click from the Cursor result view.
- Kept cursorBridge.* keys still referenced by the modal; removed only card-only keys (title, description, gatewayStopped, regenerate).
- E2E TC-CL-003 switches to Generic tab first — modal defaults to Cursor tab since Phase 2, so raw-key assertion requires the tab switch.

Signed-off-by: crimsonsunset <jsangio1@gmail.com>

Author: crimsonsunset

apps/desktop/src/features/clients/ClientsPage.tsx

@@ -42,7 +42,6 @@ import {
 } from '@/lib/api/gateway';
 import { RegisterApiKeyClientModal } from './RegisterApiKeyClientModal';
 import { ClientApiKeysSection } from './ClientApiKeysSection';
-import { CursorBridgeSection } from './CursorBridgeSection';
 import {
   isStarterFeatureSet,
   listFeatureSetsBySpace,
@@ -349,12 +348,6 @@ export default function ClientsPage() {
 
       <div className="flex-1 overflow-auto px-8 py-8">
         <div className="mx-auto max-w-[2000px] space-y-8">
-          <CursorBridgeSection
-            gatewayUrl={gatewayStatus.url || 'http://localhost:45818'}
-            gatewayRunning={gatewayStatus.running}
-            onRegistered={() => void refreshClients()}
-          />
-
           {isLoading ? (
             <div className="flex h-64 items-center justify-center">
               <Loader2 className="text-primary-500 h-8 w-8 animate-spin" />

apps/desktop/src/features/clients/CursorBridgeSection.tsx

@@ -20,7 +20,11 @@ import {
   X,
 } from 'lucide-react';
 import { Button, Card, CardContent, CardDescription, CardHeader, CardTitle, SearchableSelect } from '@mcpmux/ui';
-import { registerApiKeyClient, type RegisteredApiKeyClient } from '@/lib/api/gateway';
+import {
+  createClientApiKey,
+  registerApiKeyClient,
+  type RegisteredApiKeyClient,
+} from '@/lib/api/gateway';
 import {
   createMachine,
   getHostname,
@@ -192,9 +196,28 @@ export function RegisterApiKeyClientModal({
   };
 
   /**
-   * Regenerate Cursor snippet by minting a new client (same as legacy CursorBridgeSection).
+   * Rotate the existing session client's API key and rebuild the Cursor snippet.
+   */
+  const handleRotateKey = async () => {
+    if (!result) return;
+
+    setIsSubmitting(true);
+    setError(null);
+    try {
+      const rotated = await createClientApiKey(result.clientId);
+      setResult(rotated);
+      setCursorSnippet(buildCursorBridgeMcpJson(rotated.apiKey, gatewayUrl));
+    } catch (e) {
+      setError(e instanceof Error ? e.message : String(e));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  /**
+   * Mint a fresh client for the Cursor preset, leaving the prior session client intact.
    */
-  const handleRegenerateCursor = async () => {
+  const handleNewClient = async () => {
     const client = await mintClient();
     if (!client) return;
 
@@ -339,20 +362,47 @@ export function RegisterApiKeyClientModal({
                   </p>
                 </div>
 
+                {error && (
+                  <p
+                    className="text-sm text-red-600 dark:text-red-400"
+                    data-testid="cursor-bridge-error"
+                  >
+                    {error}
+                  </p>
+                )}
+
+                <p className="text-xs text-[rgb(var(--muted))]">
+                  {t('registerModal.cursor.regenerateHint')}
+                </p>
+
                 <div className="flex flex-wrap justify-end gap-2">
                   <Button
                     variant="secondary"
                     size="md"
-                    onClick={() => void handleRegenerateCursor()}
+                    onClick={() => void handleRotateKey()}
+                    disabled={isSubmitting}
+                    data-testid="register-api-key-rotate-key"
+                  >
+                    {isSubmitting ? (
+                      <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                    ) : (
+                      <KeyRound className="mr-2 h-4 w-4" />
+                    )}
+                    {t('registerModal.cursor.rotateKey')}
+                  </Button>
+                  <Button
+                    variant="secondary"
+                    size="md"
+                    onClick={() => void handleNewClient()}
                     disabled={isSubmitting}
-                    data-testid="cursor-bridge-regenerate"
+                    data-testid="register-api-key-new-client"
                   >
                     {isSubmitting ? (
                       <Loader2 className="mr-2 h-4 w-4 animate-spin" />
                     ) : (
                       <KeyRound className="mr-2 h-4 w-4" />
                     )}
-                    {t('cursorBridge.regenerate')}
+                    {t('registerModal.cursor.newClient')}
                   </Button>
                   <Button
                     variant="primary"

apps/desktop/src/features/clients/RegisterApiKeyClientModal.tsx

@@ -178,21 +178,20 @@
       }
     },
     "cursor": {
-      "resultTitle": "Cursor config ready"
+      "resultTitle": "Cursor config ready",
+      "regenerateHint": "Need a new key? Rotate keeps the same client; New client creates a separate connection you can revoke later.",
+      "rotateKey": "Rotate key",
+      "newClient": "New client"
     }
   },
   "cursorBridge": {
-    "title": "Global Cursor setup (no per-repo files)",
-    "description": "Paste one config into ~/.cursor/mcp.json. Each Cursor window sends its own workspace folder via mcp-remote — no per-repo .cursor/mcp.json files needed.",
-    "gatewayStopped": "Start the gateway from the Dashboard before generating a config.",
     "generateHint": "Creates a dedicated API-key client and builds the full ~/.cursor/mcp.json snippet with the key embedded.",
     "generate": "Generate global config",
     "generating": "Generating…",
-    "regenerate": "Generate new key",
     "pasteInto": "Paste into ~/.cursor/mcp.json",
     "copy": "Copy config",
     "copied": "Copied",
-    "keyOnceWarning": "The API key is shown only in this snippet. Store it in ~/.cursor/mcp.json now — McpMux cannot display it again. Regenerating creates a new key.",
+    "keyOnceWarning": "The API key is shown only in this snippet. Store it in ~/.cursor/mcp.json now — McpMux cannot display it again.",
     "fallbackNote": "Per-repo install via Workspaces remains available if you prefer not to use npx/mcp-remote."
   }
 }

apps/desktop/src/locales/en/clients.json

@@ -70,6 +70,10 @@ describe('Connections - Page shell', () => {
     await registerBtn.click();
     await browser.pause(800);
 
+    const genericTab = await byTestId('register-api-key-tab-generic');
+    await genericTab.click();
+    await browser.pause(300);
+
     const nameInput = await byTestId('register-api-key-name');
     await nameInput.setValue('e2e-headless-bot');