From b847df70fce47656c9d02cf796070cc28c6e29d3 Mon Sep 17 00:00:00 2001
From: Algis Dumbris <a.dumbris@gmail.com>
Date: Tue, 29 Sep 2026 14:59:01 +0300
Subject: [PATCH 1/3] fix(catalog): emit added_server_name from CLI search/show
 and retire legacy AddServerModal

---
 ROADMAP.md                                    |    2 +-
 cmd/mcpproxy/catalog_cmd.go                   |   59 +-
 cmd/mcpproxy/catalog_cmd_test.go              |   73 +-
 frontend/src/components/AddServerModal.vue    | 1256 -----------------
 frontend/src/components/AuthErrorModal.vue    |    4 +-
 .../add-server-duplicate-endpoint.spec.ts     |  273 ----
 frontend/tests/unit/add-server-manual.spec.ts |   48 +
 ...-server-modal-protocol-and-handoff.spec.ts |  213 ---
 .../tests/unit/add-server-trust-mode.spec.ts  |  212 ---
 frontend/tests/unit/modal-a11y.spec.ts        |  126 +-
 .../onboarding-wizard-client-paths.spec.ts    |    1 -
 .../onboarding-wizard-dismiss-race.spec.ts    |    2 -
 ...rding-wizard-import-conflict-toast.spec.ts |    1 -
 .../onboarding-wizard-import-footer.spec.ts   |    5 -
 .../onboarding-wizard-import-rows.spec.ts     |    1 -
 .../onboarding-wizard-inline-review.spec.ts   |    1 -
 .../onboarding-wizard-servers-step.spec.ts    |    3 -
 ...nboarding-wizard-skip-reason-label.spec.ts |    1 -
 ...nboarding-wizard-usable-completion.spec.ts |    1 -
 .../onboarding-wizard-verify-hints.spec.ts    |    1 -
 .../unit/servers-first-run-empty.spec.ts      |    5 -
 .../unit/telemetry-banner-wizard.spec.ts      |    2 -
 frontend/tests/unit/z-index-scale.spec.ts     |    1 -
 specs/109-ux-navigation-consistency/tasks.md  |    2 +-
 24 files changed, 158 insertions(+), 2135 deletions(-)
 delete mode 100644 frontend/src/components/AddServerModal.vue
 delete mode 100644 frontend/tests/unit/add-server-duplicate-endpoint.spec.ts
 delete mode 100644 frontend/tests/unit/add-server-modal-protocol-and-handoff.spec.ts
 delete mode 100644 frontend/tests/unit/add-server-trust-mode.spec.ts

diff --git a/ROADMAP.md b/ROADMAP.md
index 677f89a60..70f661135 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1036,5 +1036,5 @@ Legend: `shipped` ≥95% checked · `in-flight` 1–94% · `drafted` 0% · `—`
 | [106-security-residual-fixes](./specs/106-security-residual-fixes/) | `shipped` | 18/19 (95%) |
 | [107-server-edition-sso-hardening](./specs/107-server-edition-sso-hardening/) | `shipped` | 126/126 (100%) |
 | [108-profiles-v3](./specs/108-profiles-v3/) | `in-flight` | 23/153 (15%) |
-| [109-ux-navigation-consistency](./specs/109-ux-navigation-consistency/) | `in-flight` | 35/180 (19%) |
+| [109-ux-navigation-consistency](./specs/109-ux-navigation-consistency/) | `in-flight` | 36/180 (20%) |
 | [110-catalog-popularity](./specs/110-catalog-popularity/) | `in-flight` | 19/23 (83%) |
diff --git a/cmd/mcpproxy/catalog_cmd.go b/cmd/mcpproxy/catalog_cmd.go
index 4d84d11db..8ccc8e4cc 100644
--- a/cmd/mcpproxy/catalog_cmd.go
+++ b/cmd/mcpproxy/catalog_cmd.go
@@ -155,8 +155,7 @@ func newCatalogShowCmd() *cobra.Command {
 			}
 
 			hit := registries.BuildCatalogHit(reg, *entry)
-			result := registries.ToCatalogResult(hit, catalogAddedFromConfig(cfg)(hit))
-			return renderCatalogShow(formatter, result)
+			return renderCatalogShow(formatter, catalogResultForConfig(cfg, hit))
 		},
 	}
 	return cmd
@@ -273,33 +272,43 @@ func catalogSearchInProcess(ctx context.Context, cfg *config.Config, q, source,
 	// httpapi.handleCatalogSearch).
 	hits, sections, unavailable := registries.SearchAll(ctx, q, tag, limit, registries.SearchOptions{Source: source})
 
-	added := catalogAddedFromConfig(cfg)
 	resp := &cliclient.CatalogSearchResponse{Query: q, Unavailable: unavailable}
 	if resp.Unavailable == nil {
 		resp.Unavailable = []registries.SourceError{}
 	}
 	for _, h := range hits {
-		resp.Results = append(resp.Results, registries.ToCatalogResult(h, added(h)))
+		resp.Results = append(resp.Results, catalogResultForConfig(cfg, h))
 	}
 	if sections != nil {
 		resp.Sections = &cliclient.CatalogSections{}
 		for _, h := range sections.Official {
-			resp.Sections.Official = append(resp.Sections.Official, registries.ToCatalogResult(h, added(h)))
+			resp.Sections.Official = append(resp.Sections.Official, catalogResultForConfig(cfg, h))
 		}
 		for _, h := range sections.Popular {
-			resp.Sections.Popular = append(resp.Sections.Popular, registries.ToCatalogResult(h, added(h)))
+			resp.Sections.Popular = append(resp.Sections.Popular, catalogResultForConfig(cfg, h))
 		}
 	}
 	return resp, nil
 }
 
-// catalogAddedFromConfig returns a predicate reporting whether a catalog hit
-// matches an already-configured server (contracts/rest-api.md#catalog "added"):
-// a registry-sourced server also needs a matching source, a manual add
-// matches on install target alone.
-func catalogAddedFromConfig(cfg *config.Config) func(registries.CatalogHit) bool {
-	byRegistryAndTarget := make(map[string]bool)
-	byTargetOnly := make(map[string]bool)
+// catalogResultForConfig builds a CatalogResult for hit, joining it against the
+// loaded config the way REST does: Added, plus AddedServerName when exactly one
+// configured server matches.
+func catalogResultForConfig(cfg *config.Config, hit registries.CatalogHit) registries.CatalogResult {
+	isAdded, name := catalogAddedFromConfig(cfg)(hit)
+	result := registries.ToCatalogResult(hit, isAdded)
+	result.AddedServerName = name
+	return result
+}
+
+// catalogAddedFromConfig returns a resolver reporting whether a catalog hit
+// matches an already-configured server (contracts/rest-api.md#catalog "added")
+// and, only for a unique match, that server's name (mirrors
+// httpapi.catalogAddedResolver): a registry-sourced server also needs a
+// matching source, a manual add matches on install target alone.
+func catalogAddedFromConfig(cfg *config.Config) func(registries.CatalogHit) (bool, string) {
+	byRegistryAndTarget := make(map[string][]string)
+	byTargetOnly := make(map[string][]string)
 	if cfg != nil {
 		for _, s := range cfg.Servers {
 			if s == nil {
@@ -308,21 +317,33 @@ func catalogAddedFromConfig(cfg *config.Config) func(registries.CatalogHit) bool
 			target := catalogInstallTargetForConfigServer(s)
 			if s.SourceRegistryID == "" {
 				// Manual add: matches any source by install target alone.
-				byTargetOnly[target] = true
+				byTargetOnly[target] = append(byTargetOnly[target], s.Name)
 			} else {
 				// Registry-sourced: must also match its own source, so it
 				// never falsely matches a different source's identical
 				// install target (contracts/rest-api.md#catalog "added").
-				byRegistryAndTarget[s.SourceRegistryID+"\x00"+target] = true
+				key := s.SourceRegistryID + "\x00" + target
+				byRegistryAndTarget[key] = append(byRegistryAndTarget[key], s.Name)
 			}
 		}
 	}
-	return func(h registries.CatalogHit) bool {
+	return func(h registries.CatalogHit) (bool, string) {
 		target := registries.CatalogInstallTarget(registries.ToCatalogResult(h, false).Install)
-		if byRegistryAndTarget[h.Source+"\x00"+target] {
-			return true
+		names := append([]string(nil), byRegistryAndTarget[h.Source+"\x00"+target]...)
+		names = append(names, byTargetOnly[target]...)
+		if len(names) == 0 {
+			return false, ""
+		}
+		// De-duplicate defensively so a malformed legacy configuration with a
+		// repeated name is not reported as ambiguous.
+		unique := make(map[string]struct{}, len(names))
+		for _, name := range names {
+			unique[name] = struct{}{}
+		}
+		if len(unique) == 1 {
+			return true, names[0]
 		}
-		return byTargetOnly[target]
+		return true, ""
 	}
 }
 
diff --git a/cmd/mcpproxy/catalog_cmd_test.go b/cmd/mcpproxy/catalog_cmd_test.go
index 50c439b04..37290a409 100644
--- a/cmd/mcpproxy/catalog_cmd_test.go
+++ b/cmd/mcpproxy/catalog_cmd_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -38,34 +39,73 @@ func TestParseCatalogRef_RejectsMissingSlash(t *testing.T) {
 
 // TestCatalogAddedFromConfig pins the join rule (contracts/rest-api.md#catalog
 // "added"): a registry-sourced configured server needs source AND install
-// target; a manual add matches on install target alone.
+// target; a manual add matches on install target alone. The resolver also
+// reports the server name, but only for a unique match (REST parity).
 func TestCatalogAddedFromConfig(t *testing.T) {
 	cfg := &config.Config{
 		Servers: []*config.ServerConfig{
 			{Name: "manual", URL: "https://manual.example.com/mcp"},
 			{Name: "from-official", Command: "npx", Args: []string{"server-x"}, SourceRegistryID: "official"},
+			{Name: "dup-a", Command: "npx", Args: []string{"server-dup"}},
+			{Name: "dup-b", Command: "npx", Args: []string{"server-dup"}},
 		},
 	}
 	added := catalogAddedFromConfig(cfg)
 
 	manualHit := registries.CatalogHit{Source: "smithery", Entry: registries.ServerEntry{ID: "m", URL: "https://manual.example.com/mcp"}}
-	if !added(manualHit) {
-		t.Error("expected a manual add to match by install target regardless of source")
+	if ok, name := added(manualHit); !ok || name != "manual" {
+		t.Errorf("expected a manual add to match by install target regardless of source, got (%v, %q)", ok, name)
 	}
 
 	officialHit := registries.CatalogHit{Source: "official", Entry: registries.ServerEntry{ID: "x", InstallCmd: "npx server-x"}}
-	if !added(officialHit) {
-		t.Error("expected the registry-sourced server to match its own source + target")
+	if ok, name := added(officialHit); !ok || name != "from-official" {
+		t.Errorf("expected the registry-sourced server to match its own source + target, got (%v, %q)", ok, name)
 	}
 
 	wrongSourceHit := registries.CatalogHit{Source: "smithery", Entry: registries.ServerEntry{ID: "x", InstallCmd: "npx server-x"}}
-	if added(wrongSourceHit) {
-		t.Error("a registry-sourced configured server must not match a different source with the same target")
+	if ok, name := added(wrongSourceHit); ok || name != "" {
+		t.Errorf("a registry-sourced configured server must not match a different source with the same target, got (%v, %q)", ok, name)
 	}
 
 	noMatchHit := registries.CatalogHit{Source: "official", Entry: registries.ServerEntry{ID: "y", InstallCmd: "npx server-y"}}
-	if added(noMatchHit) {
-		t.Error("expected no match for an unrelated entry")
+	if ok, name := added(noMatchHit); ok || name != "" {
+		t.Errorf("expected no match for an unrelated entry, got (%v, %q)", ok, name)
+	}
+
+	ambiguousHit := registries.CatalogHit{Source: "official", Entry: registries.ServerEntry{ID: "d", InstallCmd: "npx server-dup"}}
+	if ok, name := added(ambiguousHit); !ok || name != "" {
+		t.Errorf("expected added=true with no name when two servers match, got (%v, %q)", ok, name)
+	}
+}
+
+// TestCatalogSearchInProcess_AddedServerName pins CLI/REST parity: the offline
+// search path emits added_server_name for a uniquely matched configured server.
+func TestCatalogSearchInProcess_AddedServerName(t *testing.T) {
+	withCatalogCLIFixture(t, `[{"id":"gh","name":"GitHub Tool","description":"desc","url":"https://x.example.com/mcp"}]`)
+	cfg := &config.Config{Servers: []*config.ServerConfig{{Name: "my-gh", URL: "https://x.example.com/mcp"}}}
+
+	resp, err := catalogSearchInProcess(context.Background(), cfg, "GitHub", "", "", 10)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if len(resp.Results) != 1 {
+		t.Fatalf("expected 1 result, got %+v", resp.Results)
+	}
+	if !resp.Results[0].Added || resp.Results[0].AddedServerName != "my-gh" {
+		t.Errorf("expected added=true added_server_name=my-gh, got %+v", resp.Results[0])
+	}
+
+	empty, err := catalogSearchInProcess(context.Background(), cfg, "", "", "", 10)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if empty.Sections == nil {
+		t.Fatal("expected sections for an empty query")
+	}
+	for _, r := range append(append([]registries.CatalogResult{}, empty.Sections.Official...), empty.Sections.Popular...) {
+		if r.ID == "gh" && r.AddedServerName != "my-gh" {
+			t.Errorf("section entry missing added_server_name: %+v", r)
+		}
 	}
 }
 
@@ -207,6 +247,21 @@ func TestCatalogShow(t *testing.T) {
 	}
 }
 
+// TestCatalogResultForConfig pins that 'catalog show' builds its result with
+// the added_server_name join, like REST.
+func TestCatalogResultForConfig(t *testing.T) {
+	cfg := &config.Config{Servers: []*config.ServerConfig{{Name: "my-gh", URL: "https://x.example.com/mcp"}}}
+	hit := registries.CatalogHit{Source: "official", Entry: registries.ServerEntry{ID: "gh", URL: "https://x.example.com/mcp"}}
+	result := catalogResultForConfig(cfg, hit)
+	if !result.Added || result.AddedServerName != "my-gh" {
+		t.Errorf("expected added=true added_server_name=my-gh, got %+v", result)
+	}
+	data, err := json.Marshal(result)
+	if err != nil || !strings.Contains(string(data), `"added_server_name":"my-gh"`) {
+		t.Errorf("expected added_server_name in JSON, got %s (err %v)", data, err)
+	}
+}
+
 // TestPrintCatalogDeprecationNotice pins FR-066: 'registry search'/'registry
 // add' print a deprecation note pointing at the 'catalog' equivalent.
 func TestPrintCatalogDeprecationNotice(t *testing.T) {
diff --git a/frontend/src/components/AddServerModal.vue b/frontend/src/components/AddServerModal.vue
deleted file mode 100644
index 4b26ec8e1..000000000
--- a/frontend/src/components/AddServerModal.vue
+++ /dev/null
@@ -1,1256 +0,0 @@
-<template>
-  <dialog ref="nativeDialogEl" class="modal" data-test="add-server-modal">
-    <!--
-      UX audit F6: the box is a flex column with its own scroll region so the
-      submit row stays pinned to the bottom instead of falling below the fold,
-      and it carries the ARIA dialog contract (role/aria-modal/labelledby) that
-      `<dialog open>` does not provide on its own.
-    -->
-    <div
-      ref="dialogRef"
-      class="modal-box max-w-3xl flex flex-col max-h-[85vh] p-0 overflow-hidden"
-      role="dialog"
-      aria-modal="true"
-      aria-labelledby="add-server-modal-title"
-      data-test="add-server-modal-box"
-    >
-      <!-- Header -->
-      <div class="flex items-start justify-between gap-4 px-6 pt-6 pb-4">
-        <h3 id="add-server-modal-title" class="font-bold text-lg">Add New Server</h3>
-        <button
-          type="button"
-          class="btn btn-sm btn-circle btn-ghost"
-          data-modal-close-button
-          data-test="add-server-modal-close"
-          aria-label="Close"
-          @click="handleClose"
-        >
-          ✕
-        </button>
-      </div>
-
-      <!-- Tab Selection -->
-      <div class="tabs tabs-box mx-6 mb-4">
-        <a
-          :class="['tab', activeTab === 'manual' ? 'tab-active' : '']"
-          @click="activeTab = 'manual'"
-        >
-          Manual
-        </a>
-        <a
-          :class="['tab', activeTab === 'import' ? 'tab-active' : '']"
-          @click="activeTab = 'import'"
-        >
-          Import
-        </a>
-      </div>
-
-      <!-- Manual Tab -->
-      <div v-if="activeTab === 'manual'" class="flex flex-col flex-1 min-h-0">
-        <form @submit.prevent="handleSubmit" class="flex flex-col flex-1 min-h-0">
-          <div class="flex-1 min-h-0 overflow-y-auto px-6 pb-4" data-test="add-server-modal-body">
-          <!-- Server Type Selection -->
-          <div class="form-control mb-4">
-            <label class="label">
-              <span class="label-text font-semibold">Server Type</span>
-            </label>
-            <div class="flex gap-4">
-              <label class="flex items-center space-x-2 cursor-pointer">
-                <input
-                  type="radio"
-                  name="serverType"
-                  value="stdio"
-                  v-model="formData.type"
-                  class="radio radio-primary"
-                />
-                <span>stdio (Local Command)</span>
-              </label>
-              <label class="flex items-center space-x-2 cursor-pointer">
-                <input
-                  type="radio"
-                  name="serverType"
-                  value="http"
-                  v-model="formData.type"
-                  class="radio radio-primary"
-                />
-                <span>HTTP/HTTPS (Remote)</span>
-              </label>
-            </div>
-          </div>
-
-          <!-- Common Fields -->
-          <div class="form-control mb-4">
-            <label class="label">
-              <span class="label-text font-semibold">Server Name</span>
-            </label>
-            <input
-              type="text"
-              v-model="formData.name"
-              placeholder="e.g., github-server"
-              class="input input-bordered"
-              required
-            />
-          </div>
-
-          <!-- HTTP/HTTPS Fields -->
-          <div v-if="formData.type === 'http'" class="space-y-4">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text font-semibold">URL</span>
-              </label>
-              <input
-                type="url"
-                v-model="formData.url"
-                placeholder="https://api.example.com/mcp"
-                class="input input-bordered"
-                required
-              />
-            </div>
-          </div>
-
-          <!-- stdio Fields -->
-          <div v-if="formData.type === 'stdio'" class="space-y-4">
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text font-semibold">Command</span>
-              </label>
-              <select v-model="formData.command" class="select select-bordered" aria-label="Command" required>
-                <option value="">Select command</option>
-                <option value="npx">npx (Node.js)</option>
-                <option value="uvx">uvx (Python)</option>
-                <option value="node">node</option>
-                <option value="python">python</option>
-                <option value="custom">Custom command</option>
-              </select>
-            </div>
-
-            <div v-if="formData.command === 'custom'" class="form-control">
-              <label class="label">
-                <span class="label-text font-semibold">Custom Command Path</span>
-              </label>
-              <input
-                type="text"
-                v-model="formData.customCommand"
-                placeholder="/usr/local/bin/my-mcp-server"
-                class="input input-bordered"
-                required
-              />
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text font-semibold">Arguments</span>
-                <div class="flex items-center gap-2">
-                  <span class="label-text-alt">One per line</span>
-                  <div class="tooltip tooltip-left" data-tip="You can use Secrets to store sensitive argument values">
-                    <svg class="w-4 h-4 opacity-60" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                    </svg>
-                  </div>
-                </div>
-              </label>
-              <textarea
-                v-model="formData.argsText"
-                placeholder="@modelcontextprotocol/server-filesystem"
-                class="textarea textarea-bordered h-24"
-                rows="3"
-              ></textarea>
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text font-semibold">Environment Variables</span>
-                <div class="flex items-center gap-2">
-                  <span class="label-text-alt">KEY=value format, one per line</span>
-                  <div class="tooltip tooltip-left" data-tip="You can use Secrets to store sensitive values like API keys">
-                    <svg class="w-4 h-4 opacity-60" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                    </svg>
-                  </div>
-                </div>
-              </label>
-              <textarea
-                v-model="formData.envText"
-                placeholder="API_KEY=your-key&#10;DEBUG=true"
-                class="textarea textarea-bordered h-24"
-                rows="3"
-              ></textarea>
-            </div>
-
-            <div class="form-control">
-              <label class="label">
-                <span class="label-text font-semibold">Working Directory (Optional)</span>
-              </label>
-              <input
-                type="text"
-                v-model="formData.workingDir"
-                placeholder="/path/to/project"
-                class="input input-bordered"
-              />
-            </div>
-          </div>
-
-          <!-- UX audit F09: adding a second entry for an endpoint that is
-               already configured is legitimate (different headers, a different
-               OAuth identity) but is usually a mistake — and until now nothing
-               said so. The first the user heard of it was the scanner calling
-               the NEW server dangerous, because two entries on one endpoint
-               expose byte-identical tool names and descriptions and
-               detect.shadowing.cross_server reads that as impersonation.
-               This is the observation that should have come first: neutral,
-               non-blocking, and naming the server it collides with.
-
-               The consequences are stated CONDITIONALLY, and that is not
-               hedging for its own sake — neither is guaranteed by endpoint
-               equality. A second entry may carry different credentials or a
-               different OAuth identity (the legitimate reason to make one) and
-               so expose a different toolset entirely; and even on identical
-               tools the clone check needs three tokens in BOTH descriptions
-               plus 85%/70% token overlap to fire
-               (internal/security/detect/checks/shadowing.go cloneDescriptions),
-               so short or empty descriptions never match. Promising a scanner
-               verdict this form cannot compute would be the same unfounded
-               claim this whole change exists to remove. -->
-          <p
-            v-if="duplicateEndpointServer"
-            data-test="addserver-duplicate-endpoint"
-            class="text-sm text-base-content/70 flex items-start gap-2 mt-2"
-          >
-            <span aria-hidden="true">ℹ</span>
-            <span>
-              <code class="font-mono">{{ duplicateEndpointServer.name }}</code> is already
-              configured at this endpoint. Adding a second entry is allowed — both will be
-              listed. If they turn out to expose the same tools, those tools will appear
-              twice and the security scan may flag each as a possible clone of the other.
-            </span>
-          </p>
-
-          <!-- Toggles Section -->
-          <div class="divider mt-6">Options</div>
-
-          <div class="space-y-3" data-test="addserver-options">
-            <!-- Enabled -->
-            <div class="form-control">
-              <label class="flex items-center gap-3 cursor-pointer py-1">
-                <input
-                  type="checkbox"
-                  v-model="formData.enabled"
-                  class="toggle toggle-primary"
-                />
-                <span class="label-text font-semibold">Enabled</span>
-                <div class="tooltip tooltip-right before:whitespace-normal before:w-56 before:max-w-[14rem]" data-tip="Start this server immediately after adding">
-                  <svg class="w-4 h-4 opacity-60" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                  </svg>
-                </div>
-              </label>
-            </div>
-
-            <!--
-              Isolated (Docker) — stdio only. Isolation is structurally
-              impossible for a URL upstream (internal/config/isolation_resolve.go
-              resolves IsolationSourceNotStdio when Command is empty), so the
-              control is noise rather than a choice there. This v-if is
-              PRESENTATION ONLY: the watcher on formData.type still clears
-              `isolated`, and handleSubmit still only writes isolation_json in
-              the stdio branch. Both guards stay.
-            -->
-            <div v-if="formData.type === 'stdio'" class="form-control">
-              <label class="flex items-center gap-3 cursor-pointer py-1">
-                <input
-                  type="checkbox"
-                  v-model="formData.isolated"
-                  class="toggle toggle-info"
-                />
-                <span class="label-text font-semibold">Docker Isolation</span>
-                <div class="tooltip tooltip-right before:whitespace-normal before:w-56 before:max-w-[14rem]" data-tip="Run stdio server in isolated Docker container for enhanced security (stdio only)">
-                  <svg class="w-4 h-4 opacity-60" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                  </svg>
-                </div>
-              </label>
-            </div>
-
-            <!--
-              Trust mode (spec 088 FR-006): replaces the old independent
-              "Quarantined" checkbox. The chosen mode decides admission —
-              auto is admitted straight away, scan|manual are quarantined on
-              add — so the request omits `quarantined` entirely and lets the
-              backend derive it. Shipping both controls would let the operator
-              contradict the mode.
-            -->
-            <div class="form-control pt-2" data-test="addserver-trust-mode">
-              <label class="label">
-                <span class="label-text font-semibold">Trust Mode</span>
-                <span class="label-text-alt">Decides quarantine on add and tool-change approval</span>
-              </label>
-              <TrustModeSelector v-model="formData.trustMode" name="addserver-trust-mode" />
-            </div>
-          </div>
-
-          <!-- Error Display -->
-          <div v-if="error" class="alert alert-error mt-4">
-            <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-            </svg>
-            <span>{{ error }}</span>
-          </div>
-          </div>
-
-          <!-- Actions (sticky footer — F6) -->
-          <div
-            class="modal-action mt-0 px-6 py-4 border-t border-base-300 bg-base-100"
-            data-test="add-server-modal-footer"
-          >
-            <button type="button" @click="handleClose" class="btn btn-ghost">Cancel</button>
-            <button type="submit" class="btn btn-primary" :disabled="loading">
-              <span v-if="loading" class="loading loading-spinner loading-sm"></span>
-              {{ loading ? 'Adding...' : 'Add Server' }}
-            </button>
-          </div>
-        </form>
-      </div>
-
-      <!-- Import Tab -->
-      <div v-if="activeTab === 'import'" class="flex flex-col flex-1 min-h-0">
-        <div class="flex-1 min-h-0 overflow-y-auto px-6 pb-4">
-        <!-- Input Method Tabs -->
-        <div class="flex gap-2 mb-4">
-          <button
-            :class="['btn btn-sm', importMode === 'file' ? 'btn-primary' : 'btn-outline']"
-            @click="importMode = 'file'"
-          >
-            Upload File
-          </button>
-          <button
-            :class="['btn btn-sm', importMode === 'paste' ? 'btn-primary' : 'btn-outline']"
-            @click="importMode = 'paste'"
-          >
-            Paste Content
-          </button>
-        </div>
-
-        <!-- File Upload -->
-        <div v-if="importMode === 'file'" class="form-control mb-4">
-          <label class="label">
-            <span class="label-text font-semibold">Configuration File</span>
-          </label>
-          <input
-            type="file"
-            accept=".json,.toml"
-            @change="handleFileSelect"
-            class="file-input file-input-bordered w-full"
-          />
-          <label class="label">
-            <span class="label-text-alt">Supports Claude Desktop, Claude Code, Cursor IDE, Codex CLI, and Gemini CLI configs</span>
-          </label>
-
-          <!-- Canonical Config Paths Hint Panel -->
-          <div v-if="canonicalPaths.length > 0" class="mt-3 p-3 bg-base-200 rounded-lg">
-            <div class="text-sm font-semibold mb-2 flex items-center gap-2">
-              <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-              </svg>
-              Quick Import - Found Configs
-            </div>
-            <div class="space-y-2">
-              <div
-                v-for="config in canonicalPaths"
-                :key="config.path"
-                class="flex items-center justify-between p-2 rounded"
-                :class="config.exists ? 'bg-success/10 border border-success/30' : 'bg-base-300/50'"
-              >
-                <div class="flex-1 min-w-0">
-                  <div class="flex items-center gap-2">
-                    <span class="font-medium text-sm">{{ config.name }}</span>
-                    <span
-                      v-if="config.exists"
-                      class="badge badge-success badge-xs"
-                    >Found</span>
-                    <span
-                      v-else
-                      class="badge badge-ghost badge-xs"
-                    >Not found</span>
-                  </div>
-                  <div class="text-xs text-base-content/60 truncate" :title="config.path">
-                    {{ config.path }}
-                  </div>
-                </div>
-                <button
-                  v-if="config.exists"
-                  @click="importFromCanonicalPath(config)"
-                  class="btn btn-primary btn-xs ml-2"
-                  :disabled="importingCanonicalPath === config.path"
-                >
-                  <span v-if="importingCanonicalPath === config.path" class="loading loading-spinner loading-xs"></span>
-                  <span v-else>Import</span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- Paste Content -->
-        <div v-if="importMode === 'paste'" class="form-control mb-4">
-          <label class="label">
-            <span class="label-text font-semibold">Configuration Content</span>
-          </label>
-          <!-- Editor with line numbers -->
-          <div :class="['flex border rounded-lg overflow-hidden h-48', validationError ? 'border-error' : 'border-base-300']">
-            <!-- Line numbers gutter -->
-            <div
-              ref="lineNumbersRef"
-              class="bg-base-200 text-base-content/50 text-right select-none py-2 px-2 font-mono text-sm overflow-hidden border-r border-base-300"
-              style="min-width: 3rem;"
-            >
-              <div v-for="n in lineCount" :key="n" class="leading-[1.5rem]" :class="{'text-error font-bold': validationError?.line === n}">
-                {{ n }}
-              </div>
-            </div>
-            <!-- Textarea -->
-            <textarea
-              ref="textareaRef"
-              v-model="importContent"
-              placeholder='Paste JSON or TOML configuration here...
-
-Example (Claude Desktop):
-{
-  "mcpServers": {
-    "github": {
-      "command": "uvx",
-      "args": ["mcp-server-github"]
-    }
-  }
-}'
-              class="flex-1 bg-base-100 font-mono text-sm resize-none border-0 focus:outline-none py-2 px-3 leading-[1.5rem]"
-              @input="debouncePreview"
-              @scroll="syncScroll"
-            ></textarea>
-          </div>
-          <!-- Validation Error Display -->
-          <div v-if="validationError" class="mt-2 p-3 bg-error/10 border border-error/30 rounded-lg">
-            <div class="flex items-start gap-2 text-error">
-              <svg class="w-5 h-5 shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-              </svg>
-              <div>
-                <div class="font-semibold">Invalid JSON Syntax</div>
-                <div class="text-sm mt-1">{{ validationError.message }}</div>
-                <div v-if="validationError.line" class="text-xs mt-1 opacity-70">
-                  Line {{ validationError.line }}<span v-if="validationError.column">, Column {{ validationError.column }}</span>
-                </div>
-                <div v-if="validationError.hint" class="text-xs mt-2 text-warning">
-                  <strong>Hint:</strong> {{ validationError.hint }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- Format Hint -->
-        <div class="form-control mb-4">
-          <label class="label">
-            <span class="label-text font-semibold">Format (Optional)</span>
-          </label>
-          <select v-model="importFormat" class="select select-bordered select-sm">
-            <option value="">Auto-detect</option>
-            <option value="claude-desktop">Claude Desktop</option>
-            <option value="claude-code">Claude Code</option>
-            <option value="cursor">Cursor IDE</option>
-            <option value="codex">Codex CLI (TOML)</option>
-            <option value="gemini">Gemini CLI</option>
-          </select>
-        </div>
-
-        <!-- Preview Loading -->
-        <div v-if="previewLoading" class="flex justify-center py-4">
-          <span class="loading loading-spinner loading-md"></span>
-          <span class="ml-2">Loading preview...</span>
-        </div>
-
-        <!-- Preview Results -->
-        <div v-if="previewResult && !previewLoading" class="space-y-4">
-          <!-- Format Detection -->
-          <div class="alert alert-info">
-            <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-            </svg>
-            <span>Detected format: <strong>{{ previewResult.format_name }}</strong></span>
-          </div>
-
-          <!-- Summary -->
-          <div class="stats shadow w-full">
-            <div class="stat">
-              <div class="stat-title">Total</div>
-              <div class="stat-value text-lg">{{ previewResult.summary.total }}</div>
-            </div>
-            <div class="stat">
-              <div class="stat-title">Will Import</div>
-              <div class="stat-value text-lg text-success">{{ previewResult.summary.imported }}</div>
-            </div>
-            <div v-if="previewResult.summary.skipped > 0" class="stat">
-              <div class="stat-title">Skipped</div>
-              <div class="stat-value text-lg text-warning">{{ previewResult.summary.skipped }}</div>
-            </div>
-          </div>
-
-          <!-- Warnings -->
-          <div v-if="previewResult.warnings?.length > 0" class="alert alert-warning">
-            <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-            </svg>
-            <div>
-              <div class="font-bold">Warnings</div>
-              <ul class="text-sm mt-1">
-                <li v-for="(warning, idx) in previewResult.warnings" :key="idx">{{ warning }}</li>
-              </ul>
-            </div>
-          </div>
-
-          <!-- Server Selection -->
-          <div v-if="previewResult.imported.length > 0" class="space-y-2">
-            <div class="flex justify-between items-center">
-              <span class="font-semibold">Servers to Import</span>
-              <label class="flex items-center gap-2 cursor-pointer">
-                <input
-                  type="checkbox"
-                  class="checkbox checkbox-sm"
-                  :checked="allServersSelected"
-                  @change="toggleAllServers"
-                />
-                <span class="text-sm">Select All</span>
-              </label>
-            </div>
-            <div class="max-h-64 overflow-y-auto space-y-2">
-              <div
-                v-for="server in previewResult.imported"
-                :key="server.name"
-                class="flex items-center gap-3 p-3 bg-base-200 rounded-lg"
-              >
-                <input
-                  type="checkbox"
-                  class="checkbox checkbox-primary"
-                  :checked="selectedServers.has(server.name)"
-                  @change="toggleServer(server.name)"
-                />
-                <div class="flex-1">
-                  <div class="font-medium">{{ server.name }}</div>
-                  <div class="text-sm opacity-70">
-                    <span class="badge badge-sm mr-1">{{ server.protocol }}</span>
-                    <span v-if="server.command">{{ server.command }} {{ server.args?.join(' ') }}</span>
-                    <span v-else-if="server.url">{{ server.url }}</span>
-                  </div>
-                  <div v-if="server.warnings?.length" class="text-xs text-warning mt-1">
-                    {{ server.warnings.join(', ') }}
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- Skipped Servers -->
-          <div v-if="previewResult.skipped?.length > 0" class="collapse collapse-arrow bg-base-200">
-            <input type="checkbox" />
-            <div class="collapse-title font-medium">
-              Skipped Servers ({{ previewResult.skipped.length }})
-            </div>
-            <div class="collapse-content">
-              <div v-for="server in previewResult.skipped" :key="server.name" class="py-2 border-b border-base-300 last:border-0">
-                <div class="font-medium">{{ server.name }}</div>
-                <div class="text-sm text-warning">{{ skipReasonLabel(server.reason) }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- Error Display -->
-        <div v-if="importError" class="alert alert-error mt-4">
-          <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-          </svg>
-          <span>{{ importError }}</span>
-        </div>
-
-        <!-- Critical Warnings Display -->
-        <div v-if="selectedServersWithCriticalWarnings.length > 0" class="alert alert-error mt-4">
-          <svg class="w-5 h-5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
-          </svg>
-          <div>
-            <div class="font-bold">Cannot import servers with critical errors</div>
-            <ul class="text-sm mt-1 list-disc list-inside">
-              <li v-for="server in selectedServersWithCriticalWarnings" :key="server.name">
-                <strong>{{ server.name }}:</strong> {{ server.warnings?.filter(w => /missing (command|url) field/i.test(w)).join(', ') }}
-              </li>
-            </ul>
-            <div class="text-sm mt-2">Deselect these servers or fix the configuration before importing.</div>
-          </div>
-        </div>
-        </div>
-
-        <!-- Actions (sticky footer — F6) -->
-        <div class="modal-action mt-0 px-6 py-4 border-t border-base-300 bg-base-100">
-          <button type="button" @click="handleClose" class="btn btn-ghost">Cancel</button>
-          <button
-            @click="handleImport"
-            class="btn btn-primary"
-            :disabled="importLoading || !canImport"
-          >
-            <span v-if="importLoading" class="loading loading-spinner loading-sm"></span>
-            {{ importLoading ? 'Importing...' : `Import ${selectedServers.size} Server${selectedServers.size !== 1 ? 's' : ''}` }}
-          </button>
-        </div>
-      </div>
-    </div>
-    <form method="dialog" class="modal-backdrop" @click="handleClose">
-      <button>close</button>
-    </form>
-  </dialog>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, watch, computed, onMounted } from 'vue'
-import { useServersStore } from '@/stores/servers'
-import { useSystemStore } from '@/stores/system'
-import api, { type CanonicalConfigPath } from '@/services/api'
-import TrustModeSelector from '@/components/TrustModeSelector.vue'
-import { useModalA11y } from '@/composables/useModalA11y'
-import { useDialogOpen } from '@/composables/useDialogOpen'
-import type { TrustMode } from '@/utils/trustMode'
-import { skipReasonLabel } from '@/utils/importSkipReason'
-import type { ImportResponse, ImportedServer } from '@/types'
-
-interface Props {
-  show: boolean
-}
-
-interface Emits {
-  (e: 'close'): void
-  // The single-server add names what it created so the consumer can hand off to
-  // that server's detail view — where connect/scan/review/approve actually
-  // happens. The bulk/import path emits no name (there is no single
-  // destination), which is what keeps consumers on the list they were reading.
-  (e: 'added', serverName?: string): void
-}
-
-const props = defineProps<Props>()
-const emit = defineEmits<Emits>()
-
-// UX audit F6: Escape closes, focus enters the dialog on open and is trapped
-// inside it, and returns to the trigger on close.
-const { dialogRef } = useModalA11y(() => props.show, () => handleClose())
-// Spec 109 FR-055: the <dialog> itself opens via showModal() (top layer),
-// separate from dialogRef above (the inner .modal-box, used for focus trap).
-const { dialogEl: nativeDialogEl } = useDialogOpen(() => props.show, () => handleClose())
-
-const serversStore = useServersStore()
-const systemStore = useSystemStore()
-
-// Tab state
-const activeTab = ref<'manual' | 'import'>('manual')
-
-// Manual form state
-const formData = reactive({
-  type: 'stdio' as 'stdio' | 'http',
-  name: '',
-  url: '',
-  command: '',
-  customCommand: '',
-  argsText: '',
-  envText: '',
-  workingDir: '',
-  enabled: true,
-  // Manual = the secure default (quarantined on add, every tool change held).
-  trustMode: 'manual' as TrustMode,
-  isolated: false
-})
-
-const loading = ref(false)
-const error = ref('')
-
-// Import state
-const importMode = ref<'file' | 'paste'>('file')
-const importContent = ref('')
-const importFormat = ref('')
-const importFile = ref<File | null>(null)
-const previewLoading = ref(false)
-const previewResult = ref<ImportResponse | null>(null)
-const importError = ref('')
-const importLoading = ref(false)
-const selectedServers = ref<Set<string>>(new Set())
-const validationError = ref<{ message: string; line?: number; column?: number; hint?: string } | null>(null)
-
-// Canonical config paths for quick import
-const canonicalPaths = ref<CanonicalConfigPath[]>([])
-const importingCanonicalPath = ref<string | null>(null)
-// Track the active canonical path when importing (to use correct API in handleImport)
-const activeCanonicalImport = ref<{ path: string; format: string } | null>(null)
-
-// Editor refs for line numbers
-const textareaRef = ref<HTMLTextAreaElement | null>(null)
-const lineNumbersRef = ref<HTMLDivElement | null>(null)
-
-// Debounce timer for preview
-let previewTimer: ReturnType<typeof setTimeout> | null = null
-
-// Computed
-
-// Protocol values the backend accepts are `stdio | http | sse |
-// streamable-http | auto` (config.go validProtocols) and the REST payload
-// echoes the configured string verbatim, so it may also be absent. Only the
-// http FAMILY is enumerated; everything else stays eligible for a stdio match.
-const HTTP_FAMILY_PROTOCOLS = new Set<string>(['http', 'sse', 'streamable-http'])
-
-// UX audit F09. The endpoint the manual form currently describes, already
-// belongs to a configured server — or null. Advisory only: nothing here gates
-// submit, merges, or reuses an existing entry.
-//
-// Every "duplicate" guard in the backend keys on the server NAME
-// (internal/server/server.go, internal/config/config.go, internal/configimport),
-// so a second entry on one endpoint is accepted in silence and only surfaces
-// later as a hard-tier detect.shadowing.cross_server "possible impersonation"
-// finding on the new server. This covers the Web-UI door only; the MCP
-// `upstream_servers add`, CLI and import doors still say nothing.
-//
-// Matching is exact string equality after trim, deliberately. Case folding,
-// trailing-slash normalisation and query stripping are each a judgement call
-// about what "the same endpoint" means, and none has been made; exact match
-// catches the real case (a copy-pasted URL) and cannot accuse the wrong server.
-// It can MISS: the server list masks credential-shaped url/command/args values
-// (internal/oauth/serverfields.go), so a secret-bearing endpoint never matches.
-// A hint, not a guarantee — which is why the copy claims nothing more.
-//
-// The endpoint is the WHOLE launch identity, not just the head of it: url for
-// http, and command + the full args list + working_dir for stdio. Review
-// round 1 caught both halves of that being too loose — a stdio entry with a
-// stale `url` matched an http form and named the wrong server, and two
-// same-command entries in different directories read as duplicates.
-const duplicateEndpointServer = computed(() => {
-  // `servers` starts empty, so without `loaded` an unfetched list is
-  // indistinguishable from "no duplicates" and the note would be silently
-  // wrong on a cold open.
-  if (!serversStore.loaded) return null
-
-  if (formData.type === 'http') {
-    const url = formData.url.trim()
-    if (!url) return null
-    // The transport guard is NEGATIVE on purpose: it excludes the opposite
-    // family only, so `sse`, `streamable-http`, `auto` and an absent protocol
-    // all stay eligible. A positive `protocol === formData.type` filter would
-    // MISS the case this whole note exists for — the existing entry is
-    // commonly recorded as `streamable-http` while this modal always sends
-    // `http` (handleSubmit: `protocol: formData.type`).
-    return (
-      serversStore.servers.find(
-        s => s.protocol !== 'stdio' && (s.url ?? '').trim() === url,
-      ) ?? null
-    )
-  }
-
-  const command = (formData.command === 'custom' ? formData.customCommand : formData.command).trim()
-  if (!command) return null
-  const args = parseArgs()
-  // working_dir is part of the endpoint this form describes — handleSubmit
-  // sends it on every stdio add — so `node server.js` in two different
-  // directories is two different programs with two different toolsets, not a
-  // duplicate. Comparing trimmed strings makes an absent value equal to a
-  // blank field, which is the same endpoint.
-  const workingDir = formData.workingDir.trim()
-  return (
-    serversStore.servers.find(s => {
-      if (HTTP_FAMILY_PROTOCOLS.has(s.protocol)) return false
-      if ((s.command ?? '').trim() !== command) return false
-      if ((s.working_dir ?? '').trim() !== workingDir) return false
-      const existing = s.args ?? []
-      return existing.length === args.length && existing.every((a, i) => a === args[i])
-    }) ?? null
-  )
-})
-
-const lineCount = computed(() => {
-  if (!importContent.value) return 10 // Show at least 10 lines for placeholder
-  return Math.max(importContent.value.split('\n').length, 10)
-})
-
-const allServersSelected = computed(() => {
-  if (!previewResult.value?.imported.length) return false
-  return previewResult.value.imported.every(s => selectedServers.value.has(s.name))
-})
-
-// Critical warnings that indicate the server won't work
-const criticalWarningPatterns = [
-  /missing command field/i,
-  /missing url field/i,
-]
-
-// Check if a server has critical warnings that should block import
-function hasCriticalWarnings(server: ImportedServer): boolean {
-  if (!server.warnings?.length) return false
-  return server.warnings.some(warning =>
-    criticalWarningPatterns.some(pattern => pattern.test(warning))
-  )
-}
-
-// Get selected servers that have critical warnings
-const selectedServersWithCriticalWarnings = computed(() => {
-  if (!previewResult.value?.imported) return []
-  return previewResult.value.imported.filter(s =>
-    selectedServers.value.has(s.name) && hasCriticalWarnings(s)
-  )
-})
-
-const canImport = computed(() => {
-  // Must have preview result and selected servers
-  if (!previewResult.value || selectedServers.value.size === 0) return false
-  // Cannot import if any selected server has critical warnings
-  return selectedServersWithCriticalWarnings.value.length === 0
-})
-
-// Watchers
-watch(() => formData.type, (newType) => {
-  if (newType !== 'stdio') {
-    formData.isolated = false
-  }
-})
-
-watch(() => props.show, (newShow) => {
-  if (newShow) {
-    // Reset to manual tab when opening
-    activeTab.value = 'manual'
-  }
-})
-
-// Watch for import content changes to trigger preview
-watch(importContent, () => {
-  if (importMode.value === 'paste' && importContent.value.trim()) {
-    debouncePreview()
-  }
-})
-
-watch(importFormat, () => {
-  if (importContent.value.trim() || importFile.value) {
-    triggerPreview()
-  }
-})
-
-// Methods - Manual form
-function parseArgs(): string[] {
-  if (!formData.argsText.trim()) return []
-  return formData.argsText.split('\n').map(line => line.trim()).filter(line => line)
-}
-
-function parseEnv(): Record<string, string> {
-  if (!formData.envText.trim()) return {}
-  const env: Record<string, string> = {}
-  formData.envText.split('\n').forEach(line => {
-    const trimmed = line.trim()
-    if (!trimmed) return
-    const [key, ...valueParts] = trimmed.split('=')
-    if (key && valueParts.length > 0) {
-      env[key.trim()] = valueParts.join('=').trim()
-    }
-  })
-  return env
-}
-
-// Content validation
-function validateContent(content: string): { valid: boolean; error?: { message: string; line?: number; column?: number; hint?: string } } {
-  const trimmed = content.trim()
-  if (!trimmed) {
-    return { valid: true }
-  }
-
-  // Check if it looks like TOML (starts with [ or has = without :)
-  const looksLikeToml = trimmed.startsWith('[') || (trimmed.includes('=') && !trimmed.includes(':'))
-  if (looksLikeToml) {
-    // TOML validation is harder client-side, let the server handle it
-    return { valid: true }
-  }
-
-  // Try to parse as JSON
-  try {
-    JSON.parse(trimmed)
-    return { valid: true }
-  } catch (e) {
-    if (e instanceof SyntaxError) {
-      const errorMsg = e.message
-      let line: number | undefined
-      let column: number | undefined
-      let hint: string | undefined
-
-      // Extract position from error message (varies by browser)
-      // Chrome: "... at position N"
-      // Firefox: "... at line N column M"
-      const posMatch = errorMsg.match(/position (\d+)/)
-      const lineColMatch = errorMsg.match(/line (\d+) column (\d+)/)
-
-      if (lineColMatch) {
-        line = parseInt(lineColMatch[1], 10)
-        column = parseInt(lineColMatch[2], 10)
-      } else if (posMatch) {
-        // Convert position to line/column
-        const pos = parseInt(posMatch[1], 10)
-        const lines = trimmed.substring(0, pos).split('\n')
-        line = lines.length
-        column = lines[lines.length - 1].length + 1
-      }
-
-      // Provide helpful hints for common errors
-      if (errorMsg.includes('Unexpected token') || errorMsg.includes('Expected')) {
-        // Check for trailing comma
-        if (trimmed.match(/,\s*[}\]]/)) {
-          hint = 'Check for trailing commas before closing braces or brackets (e.g., "value",} should be "value"})'
-        }
-        // Check for unescaped backslash
-        else if (trimmed.includes('\\') && !trimmed.includes('\\\\') && !trimmed.match(/\\[nrt"\\\/bfu]/)) {
-          hint = 'Check for unescaped backslashes. In JSON, backslashes must be escaped as \\\\ (e.g., "C:\\\\" instead of "C:\\")'
-        }
-        // Check for single quotes
-        else if (trimmed.includes("'")) {
-          hint = 'JSON requires double quotes for strings. Replace single quotes with double quotes.'
-        }
-      }
-
-      // Clean up the error message for display
-      let cleanMessage = errorMsg
-        .replace(/^JSON\.parse: /, '')
-        .replace(/^Unexpected token/, 'Unexpected character')
-        .replace(/ in JSON at position \d+$/, '')
-
-      return {
-        valid: false,
-        error: {
-          message: cleanMessage,
-          line,
-          column,
-          hint
-        }
-      }
-    }
-    return {
-      valid: false,
-      error: { message: 'Invalid content format' }
-    }
-  }
-}
-
-async function handleSubmit() {
-  error.value = ''
-  loading.value = true
-
-  try {
-    const command = formData.command === 'custom' ? formData.customCommand : formData.command
-    const args = parseArgs()
-    const env = parseEnv()
-
-    // FR-006: send the trust mode and OMIT `quarantined` — the backend derives
-    // admission from the mode (QuarantineDefaultForServer) and treats an
-    // explicit `quarantined` as an override applied after that derivation.
-    const serverData: any = {
-      operation: 'add',
-      name: formData.name,
-      protocol: formData.type,
-      enabled: formData.enabled,
-      trust_mode: formData.trustMode
-    }
-
-    if (formData.type === 'http') {
-      serverData.url = formData.url
-    } else {
-      serverData.command = command
-      if (args.length > 0) {
-        serverData.args_json = JSON.stringify(args)
-      }
-      if (Object.keys(env).length > 0) {
-        serverData.env_json = JSON.stringify(env)
-      }
-      if (formData.workingDir) {
-        serverData.working_dir = formData.workingDir
-      }
-      if (formData.isolated) {
-        serverData.isolation_json = JSON.stringify({ enabled: true })
-      }
-    }
-
-    await serversStore.addServer(serverData)
-
-    systemStore.addToast({
-      type: 'success',
-      title: 'Server Added',
-      message: `${formData.name} has been added successfully`
-    })
-
-    // Emit the name that was SENT (the serverData snapshot), never the live
-    // formData.name. Two reasons, both real:
-    //  - The name input carries no disabled binding and Cancel stays live while
-    //    `loading` is true, so the field is editable across the await above.
-    //    Re-reading it here can name a server that was never created and strand
-    //    the consumer on ServerDetail's "Server not found".
-    //  - handleClose() below blanks formData.name outright.
-    emit('added', serverData.name)
-    handleClose()
-  } catch (err) {
-    error.value = err instanceof Error ? err.message : 'Failed to add server'
-  } finally {
-    loading.value = false
-  }
-}
-
-// Methods - Import
-function handleFileSelect(event: Event) {
-  const input = event.target as HTMLInputElement
-  if (input.files && input.files.length > 0) {
-    importFile.value = input.files[0]
-    triggerPreview()
-  }
-}
-
-function debouncePreview() {
-  if (previewTimer) {
-    clearTimeout(previewTimer)
-  }
-  previewTimer = setTimeout(() => {
-    triggerPreview()
-  }, 500)
-}
-
-// Sync scroll between textarea and line numbers
-function syncScroll() {
-  if (textareaRef.value && lineNumbersRef.value) {
-    lineNumbersRef.value.scrollTop = textareaRef.value.scrollTop
-  }
-}
-
-async function triggerPreview() {
-  importError.value = ''
-  previewResult.value = null
-  selectedServers.value.clear()
-  validationError.value = null
-  // Clear canonical import when doing file/paste preview
-  activeCanonicalImport.value = null
-
-  if (importMode.value === 'file' && importFile.value) {
-    await previewFromFile()
-  } else if (importMode.value === 'paste' && importContent.value.trim()) {
-    await previewFromContent()
-  }
-}
-
-async function previewFromFile() {
-  if (!importFile.value) return
-
-  previewLoading.value = true
-  try {
-    const response = await api.importServersFromFile(importFile.value, {
-      format: importFormat.value || undefined,
-      preview: true
-    })
-
-    if (response.success && response.data) {
-      previewResult.value = response.data
-      // Select all servers by default
-      response.data.imported.forEach((s: ImportedServer) => selectedServers.value.add(s.name))
-    } else {
-      importError.value = response.error || 'Failed to preview import'
-    }
-  } catch (err) {
-    importError.value = err instanceof Error ? err.message : 'Failed to preview import'
-  } finally {
-    previewLoading.value = false
-  }
-}
-
-async function previewFromContent() {
-  if (!importContent.value.trim()) return
-
-  // Validate content first (client-side)
-  const validation = validateContent(importContent.value)
-  if (!validation.valid) {
-    validationError.value = validation.error || { message: 'Invalid content' }
-    previewResult.value = null
-    return
-  }
-
-  // Clear validation error if content is valid
-  validationError.value = null
-
-  previewLoading.value = true
-  try {
-    const response = await api.importServersFromJSON({
-      content: importContent.value,
-      format: importFormat.value || undefined,
-      preview: true
-    })
-
-    if (response.success && response.data) {
-      previewResult.value = response.data
-      // Select all servers by default
-      response.data.imported.forEach((s: ImportedServer) => selectedServers.value.add(s.name))
-    } else {
-      importError.value = response.error || 'Failed to preview import'
-    }
-  } catch (err) {
-    importError.value = err instanceof Error ? err.message : 'Failed to preview import'
-  } finally {
-    previewLoading.value = false
-  }
-}
-
-function toggleServer(name: string) {
-  if (selectedServers.value.has(name)) {
-    selectedServers.value.delete(name)
-  } else {
-    selectedServers.value.add(name)
-  }
-}
-
-function toggleAllServers() {
-  if (allServersSelected.value) {
-    selectedServers.value.clear()
-  } else {
-    previewResult.value?.imported.forEach(s => selectedServers.value.add(s.name))
-  }
-}
-
-async function handleImport() {
-  if (!previewResult.value || selectedServers.value.size === 0) return
-
-  importLoading.value = true
-  importError.value = ''
-
-  try {
-    const serverNames = Array.from(selectedServers.value)
-
-    let response
-    if (activeCanonicalImport.value) {
-      // Import from canonical path (e.g., Claude Desktop config)
-      response = await api.importServersFromPath({
-        path: activeCanonicalImport.value.path,
-        format: activeCanonicalImport.value.format,
-        server_names: serverNames,
-        preview: false
-      })
-    } else if (importMode.value === 'file' && importFile.value) {
-      response = await api.importServersFromFile(importFile.value, {
-        format: importFormat.value || undefined,
-        server_names: serverNames,
-        preview: false
-      })
-    } else {
-      response = await api.importServersFromJSON({
-        content: importContent.value,
-        format: importFormat.value || undefined,
-        server_names: serverNames,
-        preview: false
-      })
-    }
-
-    if (response.success && response.data) {
-      const count = response.data.summary.imported
-      systemStore.addToast({
-        type: 'success',
-        title: 'Import Successful',
-        message: `${count} server${count !== 1 ? 's' : ''} imported successfully`
-      })
-
-      emit('added')
-      handleClose()
-    } else {
-      importError.value = response.error || 'Failed to import servers'
-    }
-  } catch (err) {
-    importError.value = err instanceof Error ? err.message : 'Failed to import servers'
-  } finally {
-    importLoading.value = false
-  }
-}
-
-// Load canonical config paths for quick import hints
-async function loadCanonicalPaths() {
-  try {
-    const response = await api.getCanonicalConfigPaths()
-    if (response.success && response.data) {
-      // Sort by existence (found configs first), then by name
-      canonicalPaths.value = response.data.paths.sort((a, b) => {
-        if (a.exists !== b.exists) return a.exists ? -1 : 1
-        return a.name.localeCompare(b.name)
-      })
-    }
-  } catch (err) {
-    console.error('Failed to load canonical config paths:', err)
-  }
-}
-
-// Import from a canonical config path
-async function importFromCanonicalPath(config: CanonicalConfigPath) {
-  importingCanonicalPath.value = config.path
-  importError.value = ''
-
-  try {
-    // First, preview the import
-    const previewResponse = await api.importServersFromPath({
-      path: config.path,
-      format: config.format,
-      preview: true
-    })
-
-    if (!previewResponse.success || !previewResponse.data) {
-      importError.value = previewResponse.error || 'Failed to preview import'
-      return
-    }
-
-    // Show preview result
-    previewResult.value = previewResponse.data
-
-    // Store the canonical path info for use in handleImport
-    activeCanonicalImport.value = { path: config.path, format: config.format }
-
-    // Select all servers by default
-    selectedServers.value.clear()
-    previewResponse.data.imported.forEach(s => selectedServers.value.add(s.name))
-  } catch (err) {
-    importError.value = err instanceof Error ? err.message : 'Failed to import from config'
-  } finally {
-    importingCanonicalPath.value = null
-  }
-}
-
-// Load canonical paths when component mounts or when switching to import mode
-watch(() => props.show, (newVal) => {
-  if (newVal) {
-    loadCanonicalPaths()
-  }
-})
-
-function handleClose() {
-  // Reset manual form
-  formData.type = 'stdio'
-  formData.name = ''
-  formData.url = ''
-  formData.command = ''
-  formData.customCommand = ''
-  formData.argsText = ''
-  formData.envText = ''
-  formData.workingDir = ''
-  formData.enabled = true
-  formData.trustMode = 'manual'
-  formData.isolated = false
-  error.value = ''
-
-  // Reset import state
-  importMode.value = 'file'
-  importContent.value = ''
-  importFormat.value = ''
-  importFile.value = null
-  previewResult.value = null
-  importError.value = ''
-  validationError.value = null
-  selectedServers.value.clear()
-  activeCanonicalImport.value = null
-
-  // Reset tab
-  activeTab.value = 'manual'
-
-  emit('close')
-}
-</script>
diff --git a/frontend/src/components/AuthErrorModal.vue b/frontend/src/components/AuthErrorModal.vue
index cc581d45d..0eb80fe95 100644
--- a/frontend/src/components/AuthErrorModal.vue
+++ b/frontend/src/components/AuthErrorModal.vue
@@ -108,7 +108,7 @@
       </div>
     </div>
     <!-- Deliberately no `<form method="dialog" class="modal-backdrop">` click
-         catcher here (contrast with AddSecretModal/AddServerModal/ConnectModal/
+         catcher here (contrast with AddSecretModal/ConnectModal/
          OnboardingWizard): clicking outside must not dismiss this modal, same
          as before the FR-055 top-layer migration. The dim backdrop itself
          still renders — `showModal()` promotes this dialog to the browser's
@@ -147,7 +147,7 @@ const props = withDefaults(defineProps<Props>(), {
 const emit = defineEmits<Emits>()
 
 // Spec 109 FR-055 (review round 6, finding 3): promote to the browser's top
-// layer via showModal(), same as AddSecretModal/AddServerModal/ConnectModal/
+// layer via showModal(), same as AddSecretModal/ConnectModal/
 // OnboardingWizard, so a background 401 raised while one of those is open
 // paints above it instead of underneath its backdrop. Escape and the Tab trap
 // route through handleClose below, which already gates on `canClose` — so
diff --git a/frontend/tests/unit/add-server-duplicate-endpoint.spec.ts b/frontend/tests/unit/add-server-duplicate-endpoint.spec.ts
deleted file mode 100644
index fdf20b79c..000000000
--- a/frontend/tests/unit/add-server-duplicate-endpoint.spec.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { mount } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import AddServerModal from '@/components/AddServerModal.vue'
-import { useServersStore } from '@/stores/servers'
-import api from '@/services/api'
-
-// UX audit F09. Adding a second upstream that points at an endpoint the user
-// has ALREADY configured is a configuration mistake, but nothing said so at add
-// time: every "duplicate" check in the tree keys on the server NAME only
-// (internal/server/server.go `server '%s' already exists`,
-// internal/config/config.go `duplicate server name`, internal/configimport
-// `already_exists`). The add succeeded silently, and the first thing the user
-// heard about it was the scanner reporting the new server as DANGEROUS —
-// detect.shadowing.cross_server fires one hard-tier "possible impersonation"
-// finding per tool, because two entries on one endpoint expose byte-identical
-// tool names AND descriptions.
-//
-// This panel is the observation the user should have had first: neutral, at
-// add time, and NON-BLOCKING. Submit stays enabled, nothing is merged, nothing
-// is reused — a second entry on one endpoint is legitimate (different headers,
-// different OAuth identity), it is just rarely what someone means.
-//
-// Matching is exact string equality after trim, deliberately. Case folding,
-// trailing-slash normalisation and query stripping are all judgement calls
-// about what "the same endpoint" means; exact match catches the real case (a
-// copy-pasted URL) and cannot produce a false accusation. It can MISS — the
-// list payload masks credential-shaped url/args values
-// (internal/oauth/serverfields.go), so a secret-bearing endpoint simply does
-// not match — which is why the copy is a hint, not a guarantee.
-
-vi.mock('@/services/api', () => ({
-  default: {
-    callTool: vi.fn(),
-    getServers: vi.fn(),
-    getCanonicalConfigPaths: vi.fn(),
-    importServersFromFile: vi.fn(),
-    importServersFromJSON: vi.fn(),
-    importServersFromPath: vi.fn(),
-  },
-}))
-
-const mockedApi = api as unknown as {
-  callTool: ReturnType<typeof vi.fn>
-  getServers: ReturnType<typeof vi.fn>
-  getCanonicalConfigPaths: ReturnType<typeof vi.fn>
-}
-
-const NOTE = '[data-test="addserver-duplicate-endpoint"]'
-
-function seedServers(servers: Array<Record<string, unknown>>, loaded = true) {
-  const store = useServersStore()
-  store.servers = servers as never
-  store.loaded = loaded
-  return store
-}
-
-function mountModal() {
-  return mount(AddServerModal, { props: { show: true } })
-}
-
-type Wrapper = ReturnType<typeof mountModal>
-
-async function selectHttp(wrapper: Wrapper) {
-  await wrapper.findAll('input[type="radio"][name="serverType"]')[1].setValue(true)
-}
-
-const HTTP_SERVER = {
-  id: 'context7',
-  name: 'context7',
-  protocol: 'http',
-  url: 'https://mcp.context7.com/mcp',
-  enabled: true,
-  quarantined: false,
-  connected: true,
-  status: 'ready',
-  reconnect_count: 0,
-  tool_count: 2,
-  created: '2026-09-05T00:00:00Z',
-  updated: '2026-09-05T00:00:00Z',
-}
-
-const STDIO_SERVER = {
-  id: 'files',
-  name: 'files',
-  protocol: 'stdio',
-  command: 'npx',
-  args: ['@modelcontextprotocol/server-filesystem', '/tmp'],
-  enabled: true,
-  quarantined: false,
-  connected: true,
-  status: 'ready',
-  reconnect_count: 0,
-  tool_count: 3,
-  created: '2026-09-05T00:00:00Z',
-  updated: '2026-09-05T00:00:00Z',
-}
-
-describe('AddServerModal — duplicate endpoint observation (F09)', () => {
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    vi.clearAllMocks()
-    mockedApi.callTool.mockResolvedValue({ success: true })
-    mockedApi.getServers.mockResolvedValue({ success: true, data: { servers: [] } })
-    mockedApi.getCanonicalConfigPaths.mockResolvedValue({ success: true, data: { paths: [] } })
-  })
-
-  // Both halves bite: an empty form field must not match a server that simply
-  // has no value for that field. STDIO_SERVER carries no `url` and HTTP_SERVER
-  // carries no `command`, so dropping the empty-input guard makes each of these
-  // pair up with '' and fire on an untouched form.
-  it('says nothing while the URL field is empty', async () => {
-    seedServers([HTTP_SERVER, STDIO_SERVER])
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-  })
-
-  it('says nothing while no command has been chosen', () => {
-    seedServers([HTTP_SERVER, STDIO_SERVER])
-    const wrapper = mountModal()
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-  })
-
-  it('names the server already configured at the typed URL', async () => {
-    seedServers([HTTP_SERVER])
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="url"]').setValue('https://mcp.context7.com/mcp')
-
-    const note = wrapper.get(NOTE)
-    expect(note.text()).toContain('context7')
-    expect(note.text()).toContain('already configured at this endpoint')
-  })
-
-  // Round-2 cross-model review. The note used to promise the consequences
-  // outright — "their tools will appear twice, and the security scan WILL flag
-  // each as a possible clone of the other" — and endpoint equality establishes
-  // neither. A second entry may carry different credentials or a different
-  // OAuth identity (the legitimate reason to add one) and expose a different
-  // toolset entirely; and even on identical tools the clone check needs three
-  // tokens in BOTH descriptions plus 85%/70% token overlap to fire
-  // (internal/security/detect/checks/shadowing.go cloneDescriptions), so short
-  // or empty descriptions never match. A form that cannot run the scanner must
-  // not predict its verdict.
-  it('states the consequences conditionally — it cannot predict the scan', async () => {
-    seedServers([HTTP_SERVER])
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="url"]').setValue('https://mcp.context7.com/mcp')
-
-    const text = wrapper.get(NOTE).text()
-    // The one thing endpoint equality DOES establish.
-    expect(text).toContain('both will be listed')
-    // Hedged, not promised.
-    expect(text).toMatch(/if they/i)
-    expect(text).toContain('may flag')
-    expect(text).not.toContain('will flag')
-    expect(text).not.toContain('their tools will appear twice')
-  })
-
-  it('keeps the note advisory: submit stays enabled and it is not an error', async () => {
-    seedServers([HTTP_SERVER])
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="text"]').setValue('context7-docs')
-    await wrapper.find('input[type="url"]').setValue('https://mcp.context7.com/mcp')
-
-    const submit = wrapper.get('[data-test="add-server-modal-box"] button[type="submit"]')
-    expect(submit.attributes('disabled')).toBeUndefined()
-    // Neutral note, not an alert-error: this is a configuration observation,
-    // never a threat claim.
-    expect(wrapper.get(NOTE).classes()).not.toContain('alert-error')
-  })
-
-  it('ignores surrounding whitespace but not a differing path', async () => {
-    seedServers([HTTP_SERVER])
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-
-    await wrapper.find('input[type="url"]').setValue('  https://mcp.context7.com/mcp  ')
-    expect(wrapper.find(NOTE).exists()).toBe(true)
-
-    // Exact match only — a trailing slash is a different string, and inventing
-    // a normalisation policy here would be a guess.
-    await wrapper.find('input[type="url"]').setValue('https://mcp.context7.com/mcp/')
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-  })
-
-  it('stays silent until the server list has actually been loaded', async () => {
-    seedServers([HTTP_SERVER], false)
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="url"]').setValue('https://mcp.context7.com/mcp')
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-  })
-
-  it('matches a stdio server on command AND the full argument list', async () => {
-    seedServers([STDIO_SERVER])
-    const wrapper = mountModal()
-
-    await wrapper.find('select').setValue('npx')
-    await wrapper
-      .find('textarea')
-      .setValue('@modelcontextprotocol/server-filesystem\n/tmp')
-    const note = wrapper.get(NOTE)
-    expect(note.text()).toContain('files')
-
-    // A different argument list is a different endpoint.
-    await wrapper
-      .find('textarea')
-      .setValue('@modelcontextprotocol/server-filesystem\n/var')
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-  })
-
-  // The modal itself SENDS working_dir on every stdio add (handleSubmit builds
-  // `serverData.working_dir`), so it is part of the endpoint this form
-  // describes. `node server.js` in /projects/a and the same line in
-  // /projects/b are two different programs exposing two different toolsets —
-  // naming one as "already configured at this endpoint" is the false
-  // accusation the exact-match rule exists to avoid, and the copy's claim that
-  // "the security scan will flag each as a possible clone" would be wrong too.
-  it('treats a different working directory as a different endpoint', async () => {
-    seedServers([{ ...STDIO_SERVER, working_dir: '/projects/a' }])
-    const wrapper = mountModal()
-
-    await wrapper.find('select').setValue('npx')
-    await wrapper
-      .find('textarea')
-      .setValue('@modelcontextprotocol/server-filesystem\n/tmp')
-    await wrapper.find('input[placeholder="/path/to/project"]').setValue('/projects/b')
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-
-    await wrapper.find('input[placeholder="/path/to/project"]').setValue('/projects/a')
-    expect(wrapper.get(NOTE).text()).toContain('files')
-  })
-
-  // A hand-edited config can leave the other transport's fields populated on a
-  // server (converting an entry from http to stdio and not deleting `url`, or
-  // the reverse). Matching a populated-but-inactive field would name a server
-  // that is not at the typed endpoint at all. The guard is deliberately
-  // NEGATIVE — it excludes the opposite family only — so `streamable-http`,
-  // `sse`, `auto` and an absent protocol all stay eligible for a URL match,
-  // which is exactly the shape the real repro has (an existing entry recorded
-  // as `streamable-http` while this modal always sends `http`).
-  it('ignores a field left over from the other transport', async () => {
-    seedServers([
-      { ...STDIO_SERVER, url: 'https://mcp.context7.com/mcp' },
-      { ...HTTP_SERVER, name: 'ctx-streamable', protocol: 'streamable-http' },
-    ])
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="url"]').setValue('https://mcp.context7.com/mcp')
-
-    // The stdio server's stale `url` must not match; the streamable-http one must.
-    expect(wrapper.get(NOTE).text()).toContain('ctx-streamable')
-    expect(wrapper.get(NOTE).text()).not.toContain('files')
-  })
-
-  it('does not match an http server against a stdio form, or vice versa', async () => {
-    seedServers([HTTP_SERVER, STDIO_SERVER])
-    const wrapper = mountModal()
-
-    // stdio form, http server configured: the url must not be consulted.
-    await wrapper.find('select').setValue('npx')
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-
-    // http form, stdio server configured.
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="url"]').setValue('npx')
-    expect(wrapper.find(NOTE).exists()).toBe(false)
-  })
-})
diff --git a/frontend/tests/unit/add-server-manual.spec.ts b/frontend/tests/unit/add-server-manual.spec.ts
index e03c75524..d0340c685 100644
--- a/frontend/tests/unit/add-server-manual.spec.ts
+++ b/frontend/tests/unit/add-server-manual.spec.ts
@@ -11,6 +11,7 @@ vi.mock('@/services/api', () => ({
     setSecret: vi.fn(),
     deleteSecret: vi.fn(),
     callTool: vi.fn(),
+    getServers: vi.fn(),
   },
 }))
 import api from '@/services/api'
@@ -41,6 +42,7 @@ describe('ManualServerForm', () => {
     vi.mocked(api.setSecret).mockReset()
     vi.mocked(api.deleteSecret).mockReset()
     vi.mocked(api.callTool).mockReset()
+    vi.mocked(api.getServers).mockReset()
   })
 
   // Review round 1: resolveSecretFields's returned writtenRefs were computed
@@ -70,4 +72,50 @@ describe('ManualServerForm', () => {
     expect(wrapper.find('[data-test="manual-error"]').text()).toContain('already exists')
     expect(api.deleteSecret).toHaveBeenCalledWith('github-env-github-token')
   })
+
+  // Migrated from the retired AddServerModal spec (Spec 109 T108a): the
+  // protocol-conditional payload must not leak the other transport's fields.
+  it('submits stdio fields only for a stdio server, and names the server it added', async () => {
+    vi.mocked(api.callTool).mockResolvedValue({ success: true, data: {} })
+    vi.mocked(api.getServers).mockResolvedValue({ success: true, data: { servers: [] } })
+    const wrapper = await mountManual()
+
+    await wrapper.find('[data-test="manual-name-input"]').setValue('fs-server')
+    await wrapper.find('[data-test="manual-command-input"]').setValue('npx')
+    await wrapper.find('[data-test="manual-args-input"]').setValue('-y  @scope/server /tmp')
+    await wrapper.find('[data-test="manual-server-form"]').trigger('submit')
+    await flushPromises()
+
+    expect(api.callTool).toHaveBeenCalledWith('upstream_servers', {
+      operation: 'add',
+      name: 'fs-server',
+      protocol: 'stdio',
+      enabled: true,
+      command: 'npx',
+      args_json: JSON.stringify(['-y', '@scope/server', '/tmp']),
+    })
+    expect(wrapper.emitted('added')).toEqual([['fs-server']])
+  })
+
+  it('submits url only for an http server, and names the server it added', async () => {
+    vi.mocked(api.callTool).mockResolvedValue({ success: true, data: {} })
+    vi.mocked(api.getServers).mockResolvedValue({ success: true, data: { servers: [] } })
+    const wrapper = await mountManual()
+
+    await wrapper.find('[data-test="manual-name-input"]').setValue('remote')
+    await wrapper.find('[data-test="manual-type-http"]').setValue(true)
+    await wrapper.find('[data-test="manual-url-input"]').setValue('https://api.example.com/mcp')
+    await wrapper.find('[data-test="manual-server-form"]').trigger('submit')
+    await flushPromises()
+
+    expect(wrapper.find('[data-test="manual-command-input"]').exists()).toBe(false)
+    expect(api.callTool).toHaveBeenCalledWith('upstream_servers', {
+      operation: 'add',
+      name: 'remote',
+      protocol: 'http',
+      enabled: true,
+      url: 'https://api.example.com/mcp',
+    })
+    expect(wrapper.emitted('added')).toEqual([['remote']])
+  })
 })
diff --git a/frontend/tests/unit/add-server-modal-protocol-and-handoff.spec.ts b/frontend/tests/unit/add-server-modal-protocol-and-handoff.spec.ts
deleted file mode 100644
index 6ee812b3b..000000000
--- a/frontend/tests/unit/add-server-modal-protocol-and-handoff.spec.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { mount, flushPromises } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import AddServerModal from '@/components/AddServerModal.vue'
-import api from '@/services/api'
-
-// UX audit F07. Three defects on the Add New Server modal, all cosmetic-or-flow
-// only — no payload, predicate or security surface changes:
-//
-//  1. The Docker Isolation toggle was rendered DISABLED for an http upstream.
-//     Isolation is structurally impossible there (internal/config/
-//     isolation_resolve.go returns IsolationSourceNotStdio when Command == ""),
-//     so the control is noise, not a choice. Hide it instead of disabling it.
-//  2. "Idle on Inactivity" was a permanently-disabled "Coming soon" placeholder
-//     with no backend field and no read in handleSubmit — pure attention cost.
-//  3. On save the user was left where they were, while the real activation work
-//     (connect, scan, review, approve) waited on the server-detail page. The
-//     modal now names the server it added so the CONSUMER can hand off; the
-//     bulk/import path stays payload-free so it keeps its list-refresh flow.
-//
-// The name payload is the serverData snapshot, never the live formData.name:
-// the name input is not disabled while the add is in flight, so re-reading the
-// reactive field after the await can publish a name that was never sent.
-
-vi.mock('@/services/api', () => ({
-  default: {
-    callTool: vi.fn(),
-    getServers: vi.fn(),
-    getCanonicalConfigPaths: vi.fn(),
-    importServersFromFile: vi.fn(),
-    importServersFromJSON: vi.fn(),
-    importServersFromPath: vi.fn(),
-  },
-}))
-
-const mockedApi = api as unknown as {
-  callTool: ReturnType<typeof vi.fn>
-  getServers: ReturnType<typeof vi.fn>
-  getCanonicalConfigPaths: ReturnType<typeof vi.fn>
-  importServersFromJSON: ReturnType<typeof vi.fn>
-}
-
-function mountModal() {
-  return mount(AddServerModal, { props: { show: true } })
-}
-
-type Wrapper = ReturnType<typeof mountModal>
-
-function optionsText(wrapper: Wrapper): string {
-  const options = wrapper.find('[data-test="addserver-options"]')
-  expect(options.exists()).toBe(true)
-  return options.text()
-}
-
-async function selectHttp(wrapper: Wrapper) {
-  await wrapper.findAll('input[type="radio"][name="serverType"]')[1].setValue(true)
-}
-
-async function submitManual(wrapper: Wrapper) {
-  await wrapper.find('[data-test="add-server-modal-box"] form').trigger('submit')
-  await flushPromises()
-}
-
-const PREVIEW = {
-  format: 'claude-desktop',
-  format_name: 'Claude Desktop',
-  summary: { total: 1, imported: 1, skipped: 0, failed: 0 },
-  imported: [
-    {
-      name: 'imported-one',
-      protocol: 'stdio',
-      command: 'uvx',
-      source_format: 'claude-desktop',
-      original_name: 'imported-one',
-    },
-  ],
-  skipped: [],
-  failed: [],
-  warnings: [],
-}
-
-describe('AddServerModal — protocol-conditional isolation + post-add hand-off (F07)', () => {
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    vi.clearAllMocks()
-    mockedApi.callTool.mockResolvedValue({ success: true })
-    mockedApi.getServers.mockResolvedValue({ success: true, data: { servers: [] } })
-    mockedApi.getCanonicalConfigPaths.mockResolvedValue({ success: true, data: { paths: [] } })
-    mockedApi.importServersFromJSON.mockResolvedValue({ success: true, data: PREVIEW })
-  })
-
-  it('offers the Docker Isolation toggle for a stdio server', () => {
-    const wrapper = mountModal()
-    expect(optionsText(wrapper)).toContain('Docker Isolation')
-  })
-
-  it('hides the Docker Isolation toggle for an http server rather than disabling it', async () => {
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-
-    const text = optionsText(wrapper)
-    expect(text).not.toContain('Docker Isolation')
-    // Nothing disabled-but-visible is left behind in the Options block either.
-    const disabled = wrapper
-      .find('[data-test="addserver-options"]')
-      .findAll('input[disabled], input:disabled')
-    expect(disabled).toHaveLength(0)
-    // The toggles that DO apply to an http upstream are untouched.
-    expect(text).toContain('Enabled')
-  })
-
-  it('drops the dead "Idle on Inactivity" placeholder from the Options block', () => {
-    const wrapper = mountModal()
-    const text = optionsText(wrapper)
-    expect(text).not.toContain('Idle on Inactivity')
-    expect(text).not.toContain('Coming soon')
-  })
-
-  it('names the server it added so the consumer can hand off (stdio)', async () => {
-    const wrapper = mountModal()
-    await wrapper.find('input[type="text"]').setValue('fs-server')
-    await wrapper.find('select').setValue('npx')
-    await submitManual(wrapper)
-
-    expect(mockedApi.callTool).toHaveBeenCalledTimes(1)
-    const added = wrapper.emitted('added')
-    expect(added).toBeTruthy()
-    expect(added).toHaveLength(1)
-    expect(added![0]).toEqual(['fs-server'])
-  })
-
-  it('names the server it added so the consumer can hand off (http)', async () => {
-    const wrapper = mountModal()
-    await selectHttp(wrapper)
-    await wrapper.find('input[type="text"]').setValue('remote-mcp')
-    await wrapper.find('input[type="url"]').setValue('https://api.example.com/mcp')
-    await submitManual(wrapper)
-
-    const added = wrapper.emitted('added')
-    expect(added![0]).toEqual(['remote-mcp'])
-  })
-
-  it('never publishes a blank name that the form reset left behind', async () => {
-    const wrapper = mountModal()
-    await wrapper.find('input[type="text"]').setValue('survives-the-reset')
-    await wrapper.find('select').setValue('npx')
-    await submitManual(wrapper)
-
-    // handleSubmit emits the serverData snapshot, so handleClose() blanking
-    // formData.name cannot reach the payload. This guards the regression class
-    // where the emit goes back to reading the live field: reading it after
-    // handleClose() publishes '', which every consumer's `if (serverName)`
-    // then swallows, losing the hand-off silently rather than loudly.
-    expect(wrapper.emitted('added')![0][0]).toBe('survives-the-reset')
-    expect(wrapper.emitted('added')![0][0]).not.toBe('')
-  })
-
-  it('emits the name that was SENT, not one edited while the add was in flight', async () => {
-    let release!: (value: unknown) => void
-    mockedApi.callTool.mockReturnValueOnce(
-      new Promise((resolve) => {
-        release = resolve
-      }),
-    )
-
-    const wrapper = mountModal()
-    await wrapper.find('input[type="text"]').setValue('alpha')
-    await wrapper.find('select').setValue('npx')
-    await wrapper.find('[data-test="add-server-modal-box"] form').trigger('submit')
-
-    // The add is in flight. Only the submit button is :disabled by `loading` --
-    // the name input carries no disabled binding and Cancel is live -- so the
-    // field is still editable across the await.
-    await wrapper.find('input[type="text"]').setValue('beta')
-    release({ success: true })
-    await flushPromises()
-
-    // Re-reading the reactive formData.name after the await would publish
-    // 'beta' and strand the consumer on ServerDetail's "Server not found" for
-    // a server that was never created: the request carried 'alpha'.
-    expect(mockedApi.callTool.mock.calls[0][1].name).toBe('alpha')
-    expect(wrapper.emitted('added')![0]).toEqual(['alpha'])
-  })
-
-  it('leaves the bulk/import path payload-free so consumers keep the list view', async () => {
-    const wrapper = mountModal()
-    await wrapper.findAll('.tabs .tab')[1].trigger('click')
-    await flushPromises()
-
-    // Paste mode, then set the format — its watcher previews immediately,
-    // bypassing the 500 ms debounce on the textarea.
-    const pasteBtn = wrapper.findAll('button').find((b) => b.text() === 'Paste Content')
-    expect(pasteBtn).toBeTruthy()
-    await pasteBtn!.trigger('click')
-    await wrapper.find('textarea').setValue('{"mcpServers":{"imported-one":{"command":"uvx"}}}')
-    await wrapper.find('select').setValue('claude-desktop')
-    await flushPromises()
-
-    const importBtn = wrapper
-      .findAll('[data-test="add-server-modal-box"] button')
-      .find((b) => b.text().includes('Import 1 Server'))
-    expect(importBtn).toBeTruthy()
-    await importBtn!.trigger('click')
-    await flushPromises()
-
-    const added = wrapper.emitted('added')
-    expect(added).toBeTruthy()
-    expect(added).toHaveLength(1)
-    // No name → the consumer must NOT navigate; a bulk import has no single
-    // destination and the user stays on the list they were reading.
-    expect(added![0]).toEqual([])
-  })
-})
diff --git a/frontend/tests/unit/add-server-trust-mode.spec.ts b/frontend/tests/unit/add-server-trust-mode.spec.ts
deleted file mode 100644
index 704ea2ecb..000000000
--- a/frontend/tests/unit/add-server-trust-mode.spec.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { mount, flushPromises } from '@vue/test-utils'
-import { createPinia, setActivePinia } from 'pinia'
-import AddServerModal from '@/components/AddServerModal.vue'
-import api from '@/services/api'
-
-// Spec 088 US1 / FR-006 (research D6): the add-server form chooses the trust
-// mode at add time — "manual" preselected as the safe default — and the request
-// body carries `trust_mode` while OMITTING `quarantined` entirely. The backend
-// derives admission from the trust mode (`QuarantineDefaultForServer`) and
-// treats an explicit `quarantined` as an override applied AFTER that
-// derivation, so shipping both controls lets the operator contradict the mode
-// semantics. The independent quarantine checkbox is therefore removed from the
-// manual-entry tab; the Import tab (and registry/onboarding paths) are
-// untouched and keep their existing safe defaults.
-
-vi.mock('@/services/api', () => ({
-  default: {
-    callTool: vi.fn(),
-    getServers: vi.fn(),
-    getCanonicalConfigPaths: vi.fn(),
-    importServersFromFile: vi.fn(),
-    importServersFromJSON: vi.fn(),
-    importServersFromPath: vi.fn(),
-  },
-}))
-
-const mockedApi = api as unknown as {
-  callTool: ReturnType<typeof vi.fn>
-  getServers: ReturnType<typeof vi.fn>
-  getCanonicalConfigPaths: ReturnType<typeof vi.fn>
-}
-
-const OPTION = (mode: string) => `[data-test="trust-mode-option-${mode}"]`
-const RADIO = (mode: string) => `${OPTION(mode)} input[type="radio"]`
-
-function mountModal() {
-  return mount(AddServerModal, { props: { show: true } })
-}
-
-type Wrapper = ReturnType<typeof mountModal>
-
-/** The payload the modal hands to the servers store → `upstream_servers` add. */
-function submittedPayload(): Record<string, unknown> {
-  expect(mockedApi.callTool).toHaveBeenCalledTimes(1)
-  const [tool, payload] = mockedApi.callTool.mock.calls[0]
-  expect(tool).toBe('upstream_servers')
-  return payload as Record<string, unknown>
-}
-
-async function fillMinimalStdio(wrapper: Wrapper, name = 'demo-server') {
-  await wrapper.find('input[type="text"]').setValue(name)
-  await wrapper.find('select').setValue('npx')
-}
-
-async function submit(wrapper: Wrapper) {
-  await wrapper.find('[data-test="add-server-modal-box"] form').trigger('submit')
-  await flushPromises()
-}
-
-async function chooseMode(wrapper: Wrapper, mode: 'auto' | 'scan' | 'manual') {
-  await wrapper.find(RADIO(mode)).setValue(true)
-  const confirm = wrapper.find('[data-test="trust-mode-auto-confirm-accept"]')
-  if (confirm.exists()) await confirm.trigger('click')
-}
-
-function isChecked(wrapper: Wrapper, mode: string) {
-  return (wrapper.find(RADIO(mode)).element as HTMLInputElement).checked
-}
-
-describe('AddServerModal — trust mode replaces the quarantine checkbox (FR-006)', () => {
-  beforeEach(() => {
-    setActivePinia(createPinia())
-    vi.clearAllMocks()
-    mockedApi.callTool.mockResolvedValue({ success: true })
-    mockedApi.getServers.mockResolvedValue({ success: true, data: { servers: [] } })
-    mockedApi.getCanonicalConfigPaths.mockResolvedValue({ success: true, data: { paths: [] } })
-  })
-
-  it('renders the trust-mode selector on the manual-entry tab', () => {
-    const wrapper = mountModal()
-    expect(wrapper.find('[data-test="addserver-trust-mode"]').exists()).toBe(true)
-    expect(wrapper.find('[data-test="trust-mode-selector"]').exists()).toBe(true)
-    expect(wrapper.findAll('[data-test^="trust-mode-option-"]')).toHaveLength(3)
-  })
-
-  it('preselects manual — the safe default — before the operator touches anything', () => {
-    const wrapper = mountModal()
-    expect(isChecked(wrapper, 'manual')).toBe(true)
-    expect(isChecked(wrapper, 'scan')).toBe(false)
-    expect(isChecked(wrapper, 'auto')).toBe(false)
-  })
-
-  it('no independent quarantine checkbox remains anywhere on the manual-entry tab', () => {
-    const wrapper = mountModal()
-    const options = wrapper.find('[data-test="addserver-options"]')
-    expect(options.exists()).toBe(true)
-    // The old control was a `toggle-warning` checkbox labelled "Quarantined".
-    expect(options.findAll('input.toggle-warning')).toHaveLength(0)
-    const labels = wrapper.findAll('label').map((l) => l.text())
-    expect(labels.some((t) => /^\s*Quarantined/.test(t))).toBe(false)
-    // Toggles the form still owns are untouched.
-    expect(options.text()).toContain('Enabled')
-    expect(options.text()).toContain('Docker Isolation')
-  })
-
-  it('submits trust_mode and OMITS quarantined entirely (backend derives admission)', async () => {
-    const wrapper = mountModal()
-    await fillMinimalStdio(wrapper)
-    await submit(wrapper)
-
-    const payload = submittedPayload()
-    expect(payload.trust_mode).toBe('manual')
-    expect(payload).not.toHaveProperty('quarantined')
-    expect(Object.keys(payload)).not.toContain('quarantined')
-  })
-
-  it('submits the operator-chosen scan mode', async () => {
-    const wrapper = mountModal()
-    await fillMinimalStdio(wrapper)
-    await chooseMode(wrapper, 'scan')
-    await submit(wrapper)
-
-    const payload = submittedPayload()
-    expect(payload.trust_mode).toBe('scan')
-    expect(payload).not.toHaveProperty('quarantined')
-  })
-
-  it('submits auto only after its warning is acknowledged (FR-003 gate survives)', async () => {
-    const wrapper = mountModal()
-    await fillMinimalStdio(wrapper)
-
-    await wrapper.find(RADIO('auto')).setValue(true)
-    expect(wrapper.find('[data-test="trust-mode-auto-confirm"]').exists()).toBe(true)
-
-    // Cancelling leaves the safe default in place.
-    await wrapper.find('[data-test="trust-mode-auto-confirm-cancel"]').trigger('click')
-    await submit(wrapper)
-    expect(submittedPayload().trust_mode).toBe('manual')
-
-    vi.clearAllMocks()
-    mockedApi.callTool.mockResolvedValue({ success: true })
-    mockedApi.getServers.mockResolvedValue({ success: true, data: { servers: [] } })
-
-    const wrapper2 = mountModal()
-    await fillMinimalStdio(wrapper2)
-    await chooseMode(wrapper2, 'auto')
-    await submit(wrapper2)
-    const payload = submittedPayload()
-    expect(payload.trust_mode).toBe('auto')
-    expect(payload).not.toHaveProperty('quarantined')
-  })
-
-  it('keeps the rest of the manual submit payload unchanged (stdio)', async () => {
-    const wrapper = mountModal()
-    await wrapper.find('input[type="text"]').setValue('fs-server')
-    await wrapper.find('select').setValue('npx')
-    const textareas = wrapper.findAll('textarea')
-    await textareas[0].setValue('@modelcontextprotocol/server-filesystem\n')
-    await textareas[1].setValue('API_KEY=secret')
-    await submit(wrapper)
-
-    const payload = submittedPayload()
-    expect(payload.operation).toBe('add')
-    expect(payload.name).toBe('fs-server')
-    expect(payload.protocol).toBe('stdio')
-    expect(payload.enabled).toBe(true)
-    expect(payload.command).toBe('npx')
-    expect(payload.args_json).toBe(JSON.stringify(['@modelcontextprotocol/server-filesystem']))
-    expect(payload.env_json).toBe(JSON.stringify({ API_KEY: 'secret' }))
-  })
-
-  it('keeps the rest of the manual submit payload unchanged (http)', async () => {
-    const wrapper = mountModal()
-    await wrapper.findAll('input[type="radio"][name="serverType"]')[1].setValue(true)
-    await wrapper.find('input[type="text"]').setValue('remote')
-    await wrapper.find('input[type="url"]').setValue('https://api.example.com/mcp')
-    await chooseMode(wrapper, 'scan')
-    await submit(wrapper)
-
-    const payload = submittedPayload()
-    expect(payload.protocol).toBe('http')
-    expect(payload.url).toBe('https://api.example.com/mcp')
-    expect(payload.trust_mode).toBe('scan')
-    expect(payload).not.toHaveProperty('quarantined')
-  })
-
-  it('resets the trust mode back to manual when the form is closed', async () => {
-    const wrapper = mountModal()
-    await chooseMode(wrapper, 'scan')
-    expect(isChecked(wrapper, 'scan')).toBe(true)
-
-    await wrapper.find('[data-test="add-server-modal-box"] .modal-action .btn-ghost').trigger('click')
-    await flushPromises()
-
-    expect(wrapper.emitted('close')).toBeTruthy()
-    expect(isChecked(wrapper, 'manual')).toBe(true)
-    expect(isChecked(wrapper, 'scan')).toBe(false)
-  })
-
-  it('leaves the Import tab free of the trust-mode control (other add paths unchanged)', async () => {
-    const wrapper = mountModal()
-    await wrapper.findAll('.tabs .tab')[1].trigger('click')
-    await flushPromises()
-
-    expect(wrapper.find('[data-test="addserver-options"]').exists()).toBe(false)
-    expect(wrapper.find('[data-test="addserver-trust-mode"]').exists()).toBe(false)
-    expect(wrapper.find('[data-test="trust-mode-selector"]').exists()).toBe(false)
-    // The import surface itself still renders.
-    expect(wrapper.text()).toContain('Upload File')
-  })
-})
diff --git a/frontend/tests/unit/modal-a11y.spec.ts b/frontend/tests/unit/modal-a11y.spec.ts
index 242318975..5de8a245e 100644
--- a/frontend/tests/unit/modal-a11y.spec.ts
+++ b/frontend/tests/unit/modal-a11y.spec.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { mount, flushPromises } from '@vue/test-utils'
 import { createPinia, setActivePinia } from 'pinia'
-import AddServerModal from '@/components/AddServerModal.vue'
 import AddSecretModal from '@/components/AddSecretModal.vue'
 
 vi.mock('@/services/api', () => ({
@@ -23,127 +22,6 @@ describe('modal accessibility (UX audit F6)', () => {
     document.body.innerHTML = ''
   })
 
-  describe('AddServerModal', () => {
-    it('carries the ARIA dialog contract', async () => {
-      const wrapper = mount(AddServerModal, {
-        props: { show: true },
-        attachTo: document.body,
-      })
-      await flushPromises()
-
-      const box = wrapper.find('[data-test="add-server-modal-box"]')
-      expect(box.attributes('role')).toBe('dialog')
-      expect(box.attributes('aria-modal')).toBe('true')
-      const labelledBy = box.attributes('aria-labelledby')
-      expect(labelledBy).toBeTruthy()
-      expect(wrapper.find(`#${labelledBy}`).text()).toContain('Add New Server')
-
-      wrapper.unmount()
-    })
-
-    it('keeps the submit row out of the scrolling body so it cannot fall below the fold', async () => {
-      const wrapper = mount(AddServerModal, { props: { show: true }, attachTo: document.body })
-      await flushPromises()
-
-      const body = wrapper.find('[data-test="add-server-modal-body"]')
-      const footer = wrapper.find('[data-test="add-server-modal-footer"]')
-      expect(body.exists()).toBe(true)
-      expect(footer.exists()).toBe(true)
-      // The scroll region is the body only; the footer is a sibling of it.
-      expect(body.classes()).toContain('overflow-y-auto')
-      expect(body.element.contains(footer.element)).toBe(false)
-      expect(footer.text()).toContain('Add Server')
-
-      wrapper.unmount()
-    })
-
-    it('has a header close affordance', async () => {
-      const wrapper = mount(AddServerModal, { props: { show: true }, attachTo: document.body })
-      await flushPromises()
-
-      const close = wrapper.find('[data-test="add-server-modal-close"]')
-      expect(close.exists()).toBe(true)
-      expect(close.attributes('aria-label')).toBe('Close')
-      await close.trigger('click')
-      expect(wrapper.emitted('close')).toBeTruthy()
-
-      wrapper.unmount()
-    })
-
-    it('moves focus into the dialog when it opens', async () => {
-      const trigger = document.createElement('button')
-      document.body.appendChild(trigger)
-      trigger.focus()
-      expect(document.activeElement).toBe(trigger)
-
-      const wrapper = mount(AddServerModal, { props: { show: false }, attachTo: document.body })
-      await wrapper.setProps({ show: true })
-      await flushPromises()
-
-      const box = wrapper.find('[data-test="add-server-modal-box"]').element
-      expect(box.contains(document.activeElement)).toBe(true)
-      // The header ✕ is skipped — focus lands on the form, not on "close".
-      expect((document.activeElement as HTMLElement).dataset.modalCloseButton).toBeUndefined()
-
-      wrapper.unmount()
-    })
-
-    it('closes on Escape', async () => {
-      const wrapper = mount(AddServerModal, { props: { show: true }, attachTo: document.body })
-      await flushPromises()
-
-      pressEscape()
-      expect(wrapper.emitted('close')).toBeTruthy()
-
-      wrapper.unmount()
-    })
-
-    it('does not close on Escape while hidden', async () => {
-      const wrapper = mount(AddServerModal, { props: { show: false }, attachTo: document.body })
-      await flushPromises()
-
-      pressEscape()
-      expect(wrapper.emitted('close')).toBeFalsy()
-
-      wrapper.unmount()
-    })
-
-    it('restores focus to the trigger when it closes', async () => {
-      const trigger = document.createElement('button')
-      document.body.appendChild(trigger)
-      trigger.focus()
-
-      const wrapper = mount(AddServerModal, { props: { show: false }, attachTo: document.body })
-      await wrapper.setProps({ show: true })
-      await flushPromises()
-      expect(document.activeElement).not.toBe(trigger)
-
-      await wrapper.setProps({ show: false })
-      await flushPromises()
-      expect(document.activeElement).toBe(trigger)
-
-      wrapper.unmount()
-    })
-
-    it('traps Tab inside the dialog', async () => {
-      const outside = document.createElement('button')
-      document.body.appendChild(outside)
-
-      const wrapper = mount(AddServerModal, { props: { show: true }, attachTo: document.body })
-      await flushPromises()
-
-      const box = wrapper.find('[data-test="add-server-modal-box"]').element as HTMLElement
-      // Focus escaped to a control behind the modal: Tab must pull it back in.
-      outside.focus()
-      const evt = new KeyboardEvent('keydown', { key: 'Tab', bubbles: true, cancelable: true })
-      document.dispatchEvent(evt)
-      expect(evt.defaultPrevented).toBe(true)
-      expect(box.contains(document.activeElement)).toBe(true)
-
-      wrapper.unmount()
-    })
-  })
-
   describe('AddSecretModal', () => {
     it('carries the ARIA dialog contract and closes on Escape', async () => {
       const wrapper = mount(AddSecretModal, { props: { show: true }, attachTo: document.body })
@@ -163,7 +41,7 @@ describe('modal accessibility (UX audit F6)', () => {
     // stop sibling listeners on the same node — so without a topmost check two
     // open modals would both close on one Escape.
     it('only the topmost modal reacts to Escape', async () => {
-      const under = mount(AddServerModal, { props: { show: true }, attachTo: document.body })
+      const under = mount(AddSecretModal, { props: { show: true }, attachTo: document.body })
       await flushPromises()
       const over = mount(AddSecretModal, { props: { show: true }, attachTo: document.body })
       await flushPromises()
@@ -190,7 +68,7 @@ describe('modal accessibility (UX audit F6)', () => {
       document.body.appendChild(underTrigger)
       underTrigger.focus()
 
-      const under = mount(AddServerModal, { props: { show: false }, attachTo: document.body })
+      const under = mount(AddSecretModal, { props: { show: false }, attachTo: document.body })
       await under.setProps({ show: true })
       await flushPromises()
 
diff --git a/frontend/tests/unit/onboarding-wizard-client-paths.spec.ts b/frontend/tests/unit/onboarding-wizard-client-paths.spec.ts
index bea2d419c..03452d09b 100644
--- a/frontend/tests/unit/onboarding-wizard-client-paths.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-client-paths.spec.ts
@@ -62,7 +62,6 @@ async function mountOnClients(clients: any[]) {
       plugins: [router],
       stubs: {
         RouterLink: { template: '<a><slot /></a>' },
-        AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
       },
     },
   })
diff --git a/frontend/tests/unit/onboarding-wizard-dismiss-race.spec.ts b/frontend/tests/unit/onboarding-wizard-dismiss-race.spec.ts
index 7a326e6a2..09beb59a8 100644
--- a/frontend/tests/unit/onboarding-wizard-dismiss-race.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-dismiss-race.spec.ts
@@ -69,7 +69,6 @@ describe('OnboardingWizard dismiss() race (review round 2, finding 2)', () => {
       global: {
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { template: '<div />' },
         },
       },
     })
@@ -98,7 +97,6 @@ describe('OnboardingWizard dismiss() race (review round 2, finding 2)', () => {
       global: {
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { template: '<div />' },
         },
       },
     })
diff --git a/frontend/tests/unit/onboarding-wizard-import-conflict-toast.spec.ts b/frontend/tests/unit/onboarding-wizard-import-conflict-toast.spec.ts
index f4b7ca28a..07742d1ee 100644
--- a/frontend/tests/unit/onboarding-wizard-import-conflict-toast.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-import-conflict-toast.spec.ts
@@ -108,7 +108,6 @@ describe('OnboardingWizard bulk-import conflict toast (review round 3)', () => {
         plugins: [router],
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
         },
       },
     })
diff --git a/frontend/tests/unit/onboarding-wizard-import-footer.spec.ts b/frontend/tests/unit/onboarding-wizard-import-footer.spec.ts
index 26bde6505..f1d135b56 100644
--- a/frontend/tests/unit/onboarding-wizard-import-footer.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-import-footer.spec.ts
@@ -80,11 +80,6 @@ async function openServersTab(importable: string[]) {
       plugins: [router],
       stubs: {
         RouterLink: { template: '<a><slot /></a>' },
-        AddServerModal: {
-          name: 'AddServerModal',
-          props: ['show'],
-          template: '<div class="add-server-modal" :data-show="String(show)" />',
-        },
       },
     },
   })
diff --git a/frontend/tests/unit/onboarding-wizard-import-rows.spec.ts b/frontend/tests/unit/onboarding-wizard-import-rows.spec.ts
index d2fffb481..0e90e5931 100644
--- a/frontend/tests/unit/onboarding-wizard-import-rows.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-import-rows.spec.ts
@@ -69,7 +69,6 @@ async function openServersTabWithRows(imported: any[]) {
       plugins: [router],
       stubs: {
         RouterLink: { template: '<a><slot /></a>' },
-        AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
       },
     },
   })
diff --git a/frontend/tests/unit/onboarding-wizard-inline-review.spec.ts b/frontend/tests/unit/onboarding-wizard-inline-review.spec.ts
index 75d27f11a..15cef770e 100644
--- a/frontend/tests/unit/onboarding-wizard-inline-review.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-inline-review.spec.ts
@@ -91,7 +91,6 @@ async function mountWizard() {
     global: {
       plugins: [router],
       stubs: {
-        AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
       },
     },
   })
diff --git a/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts b/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts
index 84ba31a3c..0d9b1b5b5 100644
--- a/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts
@@ -311,7 +311,6 @@ describe('OnboardingWizard mounted already-open', () => {
         plugins: [router],
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
         },
       },
     })
@@ -349,7 +348,6 @@ describe('OnboardingWizard mounted already-open', () => {
         plugins: [router],
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
         },
       },
     })
@@ -391,7 +389,6 @@ describe('OnboardingWizard mounted already-open', () => {
         plugins: [router],
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
         },
       },
     })
diff --git a/frontend/tests/unit/onboarding-wizard-skip-reason-label.spec.ts b/frontend/tests/unit/onboarding-wizard-skip-reason-label.spec.ts
index 55f20ef8e..b97e02cad 100644
--- a/frontend/tests/unit/onboarding-wizard-skip-reason-label.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-skip-reason-label.spec.ts
@@ -81,7 +81,6 @@ async function openServersTabWithApplyResult(applyData: Record<string, unknown>)
       plugins: [router],
       stubs: {
         RouterLink: { template: '<a><slot /></a>' },
-        AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
       },
     },
   })
diff --git a/frontend/tests/unit/onboarding-wizard-usable-completion.spec.ts b/frontend/tests/unit/onboarding-wizard-usable-completion.spec.ts
index 621e5cb21..4448388b6 100644
--- a/frontend/tests/unit/onboarding-wizard-usable-completion.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-usable-completion.spec.ts
@@ -68,7 +68,6 @@ async function mountWizard() {
       plugins: [router],
       stubs: {
         RouterLink: { template: '<a><slot /></a>' },
-        AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
       },
     },
   })
diff --git a/frontend/tests/unit/onboarding-wizard-verify-hints.spec.ts b/frontend/tests/unit/onboarding-wizard-verify-hints.spec.ts
index 02e46b79f..5e0569653 100644
--- a/frontend/tests/unit/onboarding-wizard-verify-hints.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-verify-hints.spec.ts
@@ -68,7 +68,6 @@ async function mountOnVerify(clients: any[] = []) {
       plugins: [router],
       stubs: {
         RouterLink: { template: '<a><slot /></a>' },
-        AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
       },
     },
   })
diff --git a/frontend/tests/unit/servers-first-run-empty.spec.ts b/frontend/tests/unit/servers-first-run-empty.spec.ts
index 1ef217e52..49b969431 100644
--- a/frontend/tests/unit/servers-first-run-empty.spec.ts
+++ b/frontend/tests/unit/servers-first-run-empty.spec.ts
@@ -69,11 +69,6 @@ async function mountServers() {
       plugins: [createPinia(), router],
       stubs: {
         ServerCard: { template: '<div class="server-card" />' },
-        AddServerModal: {
-          name: 'AddServerModal',
-          props: ['show'],
-          template: '<div class="add-server-modal" :data-show="String(show)" />',
-        },
         CollapsibleHintsPanel: true,
       },
     },
diff --git a/frontend/tests/unit/telemetry-banner-wizard.spec.ts b/frontend/tests/unit/telemetry-banner-wizard.spec.ts
index c0bbd6ca5..b4608aa0e 100644
--- a/frontend/tests/unit/telemetry-banner-wizard.spec.ts
+++ b/frontend/tests/unit/telemetry-banner-wizard.spec.ts
@@ -135,7 +135,6 @@ describe('OnboardingWizard Verify step telemetry one-liner (Spec 109-b FR-044)',
         plugins: [router],
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
         },
       },
     })
@@ -223,7 +222,6 @@ describe('Telemetry notice dismissal is shared across mounted surfaces (Spec 109
         plugins: [router],
         stubs: {
           RouterLink: { template: '<a><slot /></a>' },
-          AddServerModal: { name: 'AddServerModal', props: ['show'], template: '<div />' },
         },
       },
     })
diff --git a/frontend/tests/unit/z-index-scale.spec.ts b/frontend/tests/unit/z-index-scale.spec.ts
index 30276add5..af0bd2d70 100644
--- a/frontend/tests/unit/z-index-scale.spec.ts
+++ b/frontend/tests/unit/z-index-scale.spec.ts
@@ -105,7 +105,6 @@ describe('every <dialog class="modal"> drives its open state imperatively', () =
     '../../src/components/OnboardingWizard.vue',
     '../../src/components/ConnectModal.vue',
     '../../src/components/AddSecretModal.vue',
-    '../../src/components/AddServerModal.vue',
     '../../src/components/CatalogSourcesSettings.vue',
     '../../src/components/CatalogSearch.vue',
     '../../src/views/teams/UserTokens.vue',
diff --git a/specs/109-ux-navigation-consistency/tasks.md b/specs/109-ux-navigation-consistency/tasks.md
index aa4c8c1bf..c78b2f4f1 100644
--- a/specs/109-ux-navigation-consistency/tasks.md
+++ b/specs/109-ux-navigation-consistency/tasks.md
@@ -233,7 +233,7 @@ description: "Task list for Spec 109 — Navigation, scope filters and cross-sur
 - [ ] T106 [US5] CLI `catalog_cmd.go`; `upstream_cmd.go` secret flags; `registry_cmd.go` deprecation
 - [ ] T107 [US5] MCP `search_servers` (`registry` optional → `SearchAll`; fields; wording) and `list_registries` wording in `internal/server/mcp.go`
 - [x] T108 [US5] Web: `views/AddServer.vue` (`/add-server`, tabs Catalog · Paste · Import · Manual selected by `?tab=`; `?source=` is the catalog-source filter only) with `components/CatalogSearch.vue`, `PasteServer.vue`, `SecretToggle.vue`; the Manual form is shared, generic Add Server entry points route to `/add-server`, and the onboarding wizard keeps manual add inline to preserve guided completion; `/repositories` redirect; Settings → Catalog sources (moved from `Repositories.vue`). The unreferenced legacy `AddServerModal.vue` source and its modal-specific tests remain as a cleanup follow-up; there are no production callers.
-- [ ] T108a [P] Remove unreferenced `AddServerModal.vue` and retire its modal-specific tests. Deferred to the post-merge follow-up issue for PR #1400: no production code imports the component, the catalog-first flows use `ManualServerForm` and `ImportServersPanel`, and deleting/migrating its modal-specific test coverage is cleanup rather than a remaining user-facing gap.
+- [x] T108a [P] Remove unreferenced `AddServerModal.vue` and retire its modal-specific tests. Deferred to the post-merge follow-up issue #1407 for PR #1400 and completed there: no production code imports the component, the catalog-first flows use `ManualServerForm` and `ImportServersPanel`, and deleting/migrating its modal-specific test coverage is cleanup rather than a remaining user-facing gap.
 - [ ] T109 [US5] macOS: `Views/AddServerView.swift` tabs incl. `CatalogView.swift` (from `RegistriesView`/`ServerBrowseView`) and Paste; secret toggle (Swift port of `RefName`, checked against `ref_names.json` in `CatalogTests.swift`); remove the Registries sidebar item; Settings → Catalog Sources
 
 - [ ] T109a [US5] SC-011 catalog half: `internal/registries/catalog_bench_test.go` with three stub sources (two answering in 50 ms, one that never answers). The per-source timeout is a `SearchAll` option (`SourceTimeout`, default 5 s, the only production value); the test sets it to 500 ms so 20 runs stay fast, and asserts p95 of `SearchAll` ≤ timeout + 500 ms (the same 0.5 s overhead budget SC-011 allows over the 5 s default), that the answering sources' results are returned, and that the hung source is listed in `unavailable`

From ba3821d7cac685eae8d527b13861bff1d0581c0b Mon Sep 17 00:00:00 2001
From: Algis Dumbris <a.dumbris@gmail.com>
Date: Tue, 29 Sep 2026 18:28:22 +0300
Subject: [PATCH 2/3] fix(ui): preserve trust mode on manual server add

---
 frontend/src/components/ManualServerForm.vue  | 25 +++++++++++++++-
 frontend/src/components/TrustModeSelector.vue |  6 ++++
 frontend/tests/unit/add-server-manual.spec.ts | 29 +++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ManualServerForm.vue b/frontend/src/components/ManualServerForm.vue
index 10effbc12..fa3f7f508 100644
--- a/frontend/src/components/ManualServerForm.vue
+++ b/frontend/src/components/ManualServerForm.vue
@@ -79,9 +79,26 @@
       </div>
     </template>
 
+    <div class="form-control mb-4 pt-2" data-test="manual-trust-mode">
+      <label class="label">
+        <span class="label-text font-semibold">Trust mode</span>
+        <span class="label-text-alt">Decides quarantine on add and tool-change approval</span>
+      </label>
+      <TrustModeSelector
+        v-model="trustMode"
+        name="manual-server-trust-mode"
+        @confirmation-pending="trustModeConfirmationPending = $event"
+      />
+    </div>
+
     <div v-if="error" class="alert alert-error text-sm mb-4" data-test="manual-error">{{ error }}</div>
 
-    <button type="submit" class="btn btn-primary" :disabled="submitting" data-test="manual-submit">
+    <button
+      type="submit"
+      class="btn btn-primary"
+      :disabled="submitting || trustModeConfirmationPending"
+      data-test="manual-submit"
+    >
       {{ submitting ? 'Adding…' : 'Add to MCPProxy' }}
     </button>
   </form>
@@ -92,9 +109,11 @@ import { ref, reactive, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import api from '@/services/api'
 import SecretToggle from '@/components/SecretToggle.vue'
+import TrustModeSelector from '@/components/TrustModeSelector.vue'
 import { resolveSecretFields, rollbackSecrets } from '@/composables/useSecretFields'
 import { useServersStore } from '@/stores/servers'
 import { serverDetailPath } from '@/utils/serverRoute'
+import type { TrustMode } from '@/utils/trustMode'
 
 const props = withDefaults(defineProps<{ navigateAfterAdd?: boolean }>(), {
   navigateAfterAdd: true,
@@ -106,6 +125,8 @@ const serversStore = useServersStore()
 
 const name = ref('')
 const protocol = ref<'stdio' | 'http'>('stdio')
+const trustMode = ref<TrustMode>('manual')
+const trustModeConfirmationPending = ref(false)
 const url = ref('')
 const command = ref('')
 const argsText = ref('')
@@ -129,6 +150,7 @@ function parseArgs(): string[] {
 }
 
 async function handleSubmit() {
+  if (trustModeConfirmationPending.value) return
   error.value = null
   submitting.value = true
   // Populated only once resolveSecretFields has returned successfully, so
@@ -148,6 +170,7 @@ async function handleSubmit() {
       name: name.value,
       protocol: protocol.value,
       enabled: true,
+      trust_mode: trustMode.value,
     }
     if (protocol.value === 'http') {
       serverData.url = url.value
diff --git a/frontend/src/components/TrustModeSelector.vue b/frontend/src/components/TrustModeSelector.vue
index fb92c08eb..a243d5fe7 100644
--- a/frontend/src/components/TrustModeSelector.vue
+++ b/frontend/src/components/TrustModeSelector.vue
@@ -103,6 +103,7 @@ const props = defineProps<{
 
 const emit = defineEmits<{
   (e: 'update:modelValue', mode: TrustMode): void
+  (e: 'confirmation-pending', pending: boolean): void
 }>()
 
 const uid = getCurrentInstance()?.uid ?? 0
@@ -123,6 +124,7 @@ watch(
   () => props.modelValue,
   () => {
     pendingWarnMode.value = null
+    emit('confirmation-pending', false)
   }
 )
 
@@ -135,19 +137,23 @@ function onSelect(mode: TrustMode) {
   const meta = TRUST_MODES.find((m) => m.mode === mode)
   if (meta?.warnsOnSelect) {
     pendingWarnMode.value = mode
+    emit('confirmation-pending', true)
     return
   }
   pendingWarnMode.value = null
+  emit('confirmation-pending', false)
   emit('update:modelValue', mode)
 }
 
 function confirmPending() {
   const mode = pendingWarnMode.value
   pendingWarnMode.value = null
+  emit('confirmation-pending', false)
   if (mode) emit('update:modelValue', mode)
 }
 
 function cancelPending() {
   pendingWarnMode.value = null
+  emit('confirmation-pending', false)
 }
 </script>
diff --git a/frontend/tests/unit/add-server-manual.spec.ts b/frontend/tests/unit/add-server-manual.spec.ts
index d0340c685..97c26c931 100644
--- a/frontend/tests/unit/add-server-manual.spec.ts
+++ b/frontend/tests/unit/add-server-manual.spec.ts
@@ -91,6 +91,7 @@ describe('ManualServerForm', () => {
       name: 'fs-server',
       protocol: 'stdio',
       enabled: true,
+      trust_mode: 'manual',
       command: 'npx',
       args_json: JSON.stringify(['-y', '@scope/server', '/tmp']),
     })
@@ -114,8 +115,36 @@ describe('ManualServerForm', () => {
       name: 'remote',
       protocol: 'http',
       enabled: true,
+      trust_mode: 'manual',
       url: 'https://api.example.com/mcp',
     })
     expect(wrapper.emitted('added')).toEqual([['remote']])
   })
+
+  it('requires confirmation before adding with auto trust mode and submits the chosen mode', async () => {
+    vi.mocked(api.callTool).mockResolvedValue({ success: true, data: {} })
+    vi.mocked(api.getServers).mockResolvedValue({ success: true, data: { servers: [] } })
+    const wrapper = await mountManual()
+
+    await wrapper.find('[data-test="manual-name-input"]').setValue('trusted-server')
+    await wrapper.find('[data-test="manual-command-input"]').setValue('npx')
+    await wrapper.find('[data-test="trust-mode-option-auto"] input').setValue(true)
+
+    expect(wrapper.find('[data-test="trust-mode-auto-confirm"]').exists()).toBe(true)
+    expect(wrapper.find('[data-test="manual-submit"]').attributes('disabled')).toBeDefined()
+    await wrapper.find('[data-test="manual-server-form"]').trigger('submit')
+    await flushPromises()
+    expect(api.callTool).not.toHaveBeenCalled()
+
+    await wrapper.find('[data-test="trust-mode-auto-confirm-accept"]').trigger('click')
+    expect(wrapper.find('[data-test="manual-submit"]').attributes('disabled')).toBeUndefined()
+    await wrapper.find('[data-test="manual-server-form"]').trigger('submit')
+    await flushPromises()
+
+    expect(api.callTool).toHaveBeenCalledWith('upstream_servers', expect.objectContaining({
+      operation: 'add',
+      name: 'trusted-server',
+      trust_mode: 'auto',
+    }))
+  })
 })

From 1f5a1d12496e02940538a0db8d90cd3493f687b1 Mon Sep 17 00:00:00 2001
From: Algis Dumbris <a.dumbris@gmail.com>
Date: Tue, 29 Sep 2026 18:35:30 +0300
Subject: [PATCH 3/3] fix(ui): clear trust confirmation and keep onboarding
 safe

---
 frontend/src/components/ManualServerForm.vue  |  8 +++++--
 frontend/src/components/OnboardingWizard.vue  |  4 ++--
 frontend/src/components/TrustModeSelector.vue |  1 +
 frontend/tests/unit/add-server-manual.spec.ts | 23 +++++++++++++++++++
 .../onboarding-wizard-servers-step.spec.ts    | 13 +++++++++--
 .../tests/unit/trust-mode-selector.spec.ts    | 12 ++++++++++
 6 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/ManualServerForm.vue b/frontend/src/components/ManualServerForm.vue
index fa3f7f508..0399195aa 100644
--- a/frontend/src/components/ManualServerForm.vue
+++ b/frontend/src/components/ManualServerForm.vue
@@ -79,7 +79,7 @@
       </div>
     </template>
 
-    <div class="form-control mb-4 pt-2" data-test="manual-trust-mode">
+    <div v-if="props.allowTrustModeSelection" class="form-control mb-4 pt-2" data-test="manual-trust-mode">
       <label class="label">
         <span class="label-text font-semibold">Trust mode</span>
         <span class="label-text-alt">Decides quarantine on add and tool-change approval</span>
@@ -115,8 +115,12 @@ import { useServersStore } from '@/stores/servers'
 import { serverDetailPath } from '@/utils/serverRoute'
 import type { TrustMode } from '@/utils/trustMode'
 
-const props = withDefaults(defineProps<{ navigateAfterAdd?: boolean }>(), {
+const props = withDefaults(defineProps<{
+  navigateAfterAdd?: boolean
+  allowTrustModeSelection?: boolean
+}>(), {
   navigateAfterAdd: true,
+  allowTrustModeSelection: true,
 })
 const emit = defineEmits<{ added: [name: string] }>()
 
diff --git a/frontend/src/components/OnboardingWizard.vue b/frontend/src/components/OnboardingWizard.vue
index a138fbf83..096f15ae5 100644
--- a/frontend/src/components/OnboardingWizard.vue
+++ b/frontend/src/components/OnboardingWizard.vue
@@ -261,7 +261,7 @@
               </button>
             </div>
             <div v-if="addServerOpen" class="text-left mt-4" data-test="wizard-manual-form">
-              <ManualServerForm :navigate-after-add="false" @added="onServerAdded" />
+              <ManualServerForm :navigate-after-add="false" :allow-trust-mode-selection="false" @added="onServerAdded" />
             </div>
             <p v-if="serverAddedJustNow" class="text-xs text-success mt-3">
               ✓ Server added — it's currently in quarantine. Review it in the Review queue after this wizard.
@@ -390,7 +390,7 @@
                 Open the add-server form
               </button>
               <div v-else data-test="wizard-manual-form">
-                <ManualServerForm :navigate-after-add="false" @added="onServerAdded" />
+                <ManualServerForm :navigate-after-add="false" :allow-trust-mode-selection="false" @added="onServerAdded" />
               </div>
               <p v-if="serverAddedJustNow" class="text-xs text-success mt-2">
                 ✓ Server added — it's currently in quarantine. Review it in the Review queue after this wizard.
diff --git a/frontend/src/components/TrustModeSelector.vue b/frontend/src/components/TrustModeSelector.vue
index a243d5fe7..c7aa08318 100644
--- a/frontend/src/components/TrustModeSelector.vue
+++ b/frontend/src/components/TrustModeSelector.vue
@@ -132,6 +132,7 @@ function onSelect(mode: TrustMode) {
   if (mode === state.value.effective) {
     // Already in effect — nothing to warn about and nothing to save.
     pendingWarnMode.value = null
+    emit('confirmation-pending', false)
     return
   }
   const meta = TRUST_MODES.find((m) => m.mode === mode)
diff --git a/frontend/tests/unit/add-server-manual.spec.ts b/frontend/tests/unit/add-server-manual.spec.ts
index 97c26c931..c4c586d9a 100644
--- a/frontend/tests/unit/add-server-manual.spec.ts
+++ b/frontend/tests/unit/add-server-manual.spec.ts
@@ -147,4 +147,27 @@ describe('ManualServerForm', () => {
       trust_mode: 'auto',
     }))
   })
+
+  it('re-enables submit when the operator returns to Manual while Auto confirmation is pending', async () => {
+    vi.mocked(api.callTool).mockResolvedValue({ success: true, data: {} })
+    vi.mocked(api.getServers).mockResolvedValue({ success: true, data: { servers: [] } })
+    const wrapper = await mountManual()
+
+    await wrapper.find('[data-test="manual-name-input"]').setValue('manual-server')
+    await wrapper.find('[data-test="manual-command-input"]').setValue('npx')
+    await wrapper.find('[data-test="trust-mode-option-auto"] input').setValue(true)
+    expect(wrapper.find('[data-test="manual-submit"]').attributes('disabled')).toBeDefined()
+
+    await wrapper.find('[data-test="trust-mode-option-manual"] input').setValue(true)
+    expect(wrapper.find('[data-test="trust-mode-auto-confirm"]').exists()).toBe(false)
+    expect(wrapper.find('[data-test="manual-submit"]').attributes('disabled')).toBeUndefined()
+
+    await wrapper.find('[data-test="manual-server-form"]').trigger('submit')
+    await flushPromises()
+    expect(api.callTool).toHaveBeenCalledWith('upstream_servers', expect.objectContaining({
+      operation: 'add',
+      name: 'manual-server',
+      trust_mode: 'manual',
+    }))
+  })
 })
diff --git a/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts b/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts
index 0d9b1b5b5..be9281e87 100644
--- a/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts
+++ b/frontend/tests/unit/onboarding-wizard-servers-step.spec.ts
@@ -92,9 +92,9 @@ async function openServersTab(importable: string[]) {
         RouterLink: { template: '<a><slot /></a>' },
         ManualServerForm: {
           name: 'ManualServerForm',
-          props: ['navigateAfterAdd'],
+          props: ['navigateAfterAdd', 'allowTrustModeSelection'],
           emits: ['added'],
-          template: '<div class="manual-server-form-stub" :data-navigate-after-add="String(navigateAfterAdd)" />',
+          template: '<div class="manual-server-form-stub" :data-navigate-after-add="String(navigateAfterAdd)" :data-allow-trust-mode-selection="String(allowTrustModeSelection)" />',
         },
       },
     },
@@ -136,6 +136,7 @@ describe('OnboardingWizard servers step (F19)', () => {
       await wrapper.find('[data-test="nothing-to-import-manual"]').trigger('click')
       expect(wrapper.find('[data-test="wizard-manual-form"] .manual-server-form-stub').exists()).toBe(true)
       expect(wrapper.find('.manual-server-form-stub').attributes('data-navigate-after-add')).toBe('false')
+      expect(wrapper.find('.manual-server-form-stub').attributes('data-allow-trust-mode-selection')).toBe('false')
       expect(wrapper.emitted('close')).toBeFalsy()
       expect(router.currentRoute.value.path).toBe('/')
     })
@@ -250,6 +251,14 @@ describe('OnboardingWizard servers step (F19)', () => {
       expect(wrapper.find('[data-test="wizard-back"]').exists()).toBe(true)
     })
 
+    it('keeps the optional manual-add form locked to its secure Manual trust mode', async () => {
+      const { wrapper } = await openServersTab(['memory'])
+      await wrapper.find('[data-test="manual-add-details"] summary').trigger('click')
+      await wrapper.find('[data-test="add-server-button"]').trigger('click')
+
+      expect(wrapper.find('.manual-server-form-stub').attributes('data-allow-trust-mode-selection')).toBe('false')
+    })
+
     it('keeps a Close, so the step is never a trap', async () => {
       // A step whose only exits are "import" strands the user, and the
       // committed e2e sweep dismisses an auto-opened wizard through exactly
diff --git a/frontend/tests/unit/trust-mode-selector.spec.ts b/frontend/tests/unit/trust-mode-selector.spec.ts
index c22d92cba..df15e520a 100644
--- a/frontend/tests/unit/trust-mode-selector.spec.ts
+++ b/frontend/tests/unit/trust-mode-selector.spec.ts
@@ -180,6 +180,18 @@ describe('TrustModeSelector — auto requires an acknowledged warning (FR-003)',
     expect(wrapper.emitted('update:modelValue')).toBeUndefined()
   })
 
+  it('clears the pending confirmation state when reselecting the effective mode', async () => {
+    const wrapper = mountSelector('manual')
+    await select(wrapper, 'auto')
+    expect(wrapper.emitted('confirmation-pending')?.at(-1)).toEqual([true])
+
+    await select(wrapper, 'manual')
+
+    expect(wrapper.find('[data-test="trust-mode-auto-confirm"]').exists()).toBe(false)
+    expect(wrapper.emitted('confirmation-pending')?.at(-1)).toEqual([false])
+    expect(wrapper.emitted('update:modelValue')).toBeUndefined()
+  })
+
   it('the confirmation warns about BOTH unscanned tool changes and unscanned admission', async () => {
     const wrapper = mountSelector('manual')
     await select(wrapper, 'auto')