diff --git a/mcpgateway/admin.py b/mcpgateway/admin.py
index aea799339..53fa0768a 100644
--- a/mcpgateway/admin.py
+++ b/mcpgateway/admin.py
@@ -4605,7 +4605,6 @@ async def admin_import_tools(
 
         # Extract base metadata for bulk import
         base_metadata = MetadataCapture.extract_creation_metadata(request, user, import_batch_id=import_batch_id)
-
         for i, item in enumerate(payload):
             name = (item or {}).get("name")
             try:
@@ -5100,7 +5099,6 @@ async def admin_export_logs(
     )
 
 
-# Configuration Export/Import Endpoints
 @admin_router.get("/export/configuration")
 async def admin_export_configuration(
     types: Optional[str] = None,
diff --git a/mcpgateway/config.py b/mcpgateway/config.py
index f59568099..9daacd567 100644
--- a/mcpgateway/config.py
+++ b/mcpgateway/config.py
@@ -440,7 +440,6 @@ def _parse_federation_peers(cls, v):
 
     # Cache control for well-known files (seconds)
     well_known_cache_max_age: int = 3600  # 1 hour default
-
     model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8", case_sensitive=False, extra="ignore")
 
     gateway_tool_name_separator: str = "-"
diff --git a/mcpgateway/templates/admin.html b/mcpgateway/templates/admin.html
index 84dbba37e..039d204f5 100644
--- a/mcpgateway/templates/admin.html
+++ b/mcpgateway/templates/admin.html
@@ -786,7 +786,6 @@ <h1 class="text-3xl font-bold text-gray-800 dark:text-gray-200">
           </div>
         </div>
       </div>
-
       <!-- Version Info Panel -->
       <div id="version-info-panel" class="tab-panel hidden"></div>
 
@@ -1612,15 +1611,217 @@ <h2 class="text-2xl font-bold dark:text-gray-200">
           </div>
         </div>
         <div class="bg-white shadow rounded-lg p-6 dark:bg-gray-800">
-          <div class="flex items-center justify-between mb-4">
+          <div class="flex justify-between items-center mb-4">
             <h3 class="text-lg font-bold dark:text-gray-200">Add New Tool</h3>
-            <button
-              id="open-bulk-import"
-              type="button"
-              class="inline-flex items-center gap-1 text-sm text-indigo-600 hover:text-indigo-700"
-            >
-              + Bulk Import Tools
-            </button>
+
+            <!-- Bulk Import Dropdown -->
+            <div class="relative">
+              <button
+                id="bulk-import-dropdown-btn"
+                onclick="toggleBulkImportDropdown()"
+                class="inline-flex items-center px-3 py-2 border border-gray-300 dark:border-gray-600 shadow-sm text-sm leading-4 font-medium rounded-md text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+              >
+                <svg
+                  class="w-4 h-4 mr-2 text-green-600"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M15 13l-3-3m0 0l-3 3m3-3v12"
+                  ></path>
+                </svg>
+                Bulk Import
+                <svg
+                  class="w-4 h-4 ml-1"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M19 9l-7 7-7-7"
+                  ></path>
+                </svg>
+              </button>
+
+              <!-- Dropdown Menu -->
+              <div
+                id="bulk-import-dropdown"
+                class="hidden absolute right-0 mt-2 w-96 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-600 rounded-lg shadow-lg z-50"
+              >
+                <div class="p-4">
+                  <!-- Information Section -->
+                  <div class="mb-4">
+                    <h4
+                      class="text-sm font-semibold text-gray-900 dark:text-gray-100 mb-2"
+                    >
+                      📥 Bulk Import Information
+                    </h4>
+                    <div
+                      class="text-xs text-gray-600 dark:text-gray-400 space-y-1"
+                    >
+                      <p>
+                        Import multiple tools from a JSON array. The system
+                        automatically fixes common formatting issues like tool
+                        name spaces and tag formats.
+                      </p>
+                      <p><strong>Maximum:</strong> 200 tools per import</p>
+                    </div>
+                  </div>
+
+                  <!-- Import Method Selection -->
+                  <div class="mb-4">
+                    <h5
+                      class="text-xs font-medium text-gray-700 dark:text-gray-300 mb-2"
+                    >
+                      Choose Import Method:
+                    </h5>
+                    <div class="flex space-x-4">
+                      <label class="flex items-center">
+                        <input
+                          type="radio"
+                          name="dropdown-import-method"
+                          value="file"
+                          checked
+                          onchange="toggleDropdownImportMethod('file')"
+                          class="mr-2"
+                        />
+                        <span class="text-xs text-gray-600 dark:text-gray-400"
+                          >Upload File</span
+                        >
+                      </label>
+                      <label class="flex items-center">
+                        <input
+                          type="radio"
+                          name="dropdown-import-method"
+                          value="paste"
+                          onchange="toggleDropdownImportMethod('paste')"
+                          class="mr-2"
+                        />
+                        <span class="text-xs text-gray-600 dark:text-gray-400"
+                          >Paste JSON</span
+                        >
+                      </label>
+                    </div>
+                  </div>
+
+                  <!-- File Upload Section -->
+                  <div id="dropdown-file-section" class="mb-4">
+                    <label
+                      class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-2"
+                    >
+                      Upload JSON File
+                    </label>
+                    <div
+                      class="border-2 border-dashed border-gray-300 dark:border-gray-600 rounded-lg p-3 text-center"
+                    >
+                      <input
+                        type="file"
+                        id="dropdown-file-input"
+                        accept=".json"
+                        onchange="handleDropdownFileSelect(this)"
+                        class="hidden"
+                      />
+                      <div
+                        id="dropdown-file-drop-zone"
+                        onclick="document.getElementById('dropdown-file-input').click()"
+                        class="cursor-pointer"
+                      >
+                        <svg
+                          class="mx-auto h-8 w-8 text-gray-400"
+                          fill="none"
+                          stroke="currentColor"
+                          viewBox="0 0 24 24"
+                        >
+                          <path
+                            stroke-linecap="round"
+                            stroke-linejoin="round"
+                            stroke-width="2"
+                            d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M15 13l-3-3m0 0l-3 3m3-3v12"
+                          ></path>
+                        </svg>
+                        <p
+                          class="text-xs text-gray-500 dark:text-gray-400 mt-1"
+                        >
+                          Click to upload JSON file
+                        </p>
+                      </div>
+                      <div
+                        id="dropdown-file-info"
+                        class="hidden mt-2 text-xs text-green-600 dark:text-green-400"
+                      ></div>
+                    </div>
+                  </div>
+
+                  <!-- JSON Paste Section -->
+                  <div id="dropdown-paste-section" class="hidden mb-4">
+                    <label
+                      class="block text-xs font-medium text-gray-700 dark:text-gray-300 mb-2"
+                    >
+                      Paste JSON Data
+                    </label>
+                    <textarea
+                      id="dropdown-json-textarea"
+                      rows="6"
+                      placeholder="[{&quot;name&quot;: &quot;example_tool&quot;, &quot;url&quot;: &quot;https://api.example.com&quot;, &quot;description&quot;: &quot;Example tool&quot;}]"
+                      oninput="validateDropdownJson()"
+                      class="w-full text-xs border border-gray-300 dark:border-gray-600 rounded-md p-2 dark:bg-gray-700 dark:text-gray-300"
+                    ></textarea>
+                    <div id="dropdown-json-status" class="mt-1 text-xs"></div>
+                  </div>
+
+                  <!-- Preview Section -->
+                  <div id="dropdown-preview" class="hidden mb-4">
+                    <h5
+                      class="text-xs font-medium text-gray-700 dark:text-gray-300 mb-2"
+                    >
+                      Import Preview
+                    </h5>
+                    <div class="bg-gray-50 dark:bg-gray-700 rounded-md p-2">
+                      <div class="text-xs text-gray-600 dark:text-gray-400">
+                        <span id="dropdown-preview-count">0</span> tools ready
+                        for import
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- Status Messages -->
+                  <div id="dropdown-status" class="hidden mb-4 text-xs"></div>
+
+                  <!-- Action Buttons -->
+                  <div class="flex justify-between items-center">
+                    <button
+                      onclick="resetDropdownImport()"
+                      class="text-xs text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200"
+                    >
+                      Clear
+                    </button>
+                    <div class="space-x-2">
+                      <button
+                        onclick="toggleBulkImportDropdown()"
+                        class="px-3 py-1 text-xs border border-gray-300 dark:border-gray-600 rounded text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-600"
+                      >
+                        Cancel
+                      </button>
+                      <button
+                        id="dropdown-import-btn"
+                        onclick="submitDropdownImport()"
+                        disabled
+                        class="px-3 py-1 text-xs bg-green-600 text-white rounded hover:bg-green-700 disabled:bg-gray-400 disabled:cursor-not-allowed"
+                      >
+                        Import Tools
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
 
           <form id="add-tool-form">
@@ -2801,8 +3002,8 @@ <h2 class="text-2xl font-bold dark:text-gray-200">
                     <!-- OAuth Config: {{ gateway.oauth_config }} -->
                     <!-- Grant Type: {{ gateway.oauth_config.grant_type if gateway.oauth_config else 'None' }} -->
                     <script>
-                      console.log('Auth Type:', '{{ gateway.authType }}');
-                      console.log('OAuth Config:', '{{ gateway.oauthConfig }}');
+                      console.log("Auth Type:", "{{ gateway.authType }}");
+                      console.log("OAuth Config:", "{{ gateway.oauthConfig }}");
                     </script>
 
                     {% if gateway.authType == 'oauth' %}
@@ -2823,8 +3024,7 @@ <h2 class="text-2xl font-bold dark:text-gray-200">
                     >
                       🔧 Fetch Tools
                     </button>
-                    {% endif %}
-                    {% if gateway.enabled %}
+                    {% endif %} {% if gateway.enabled %}
                     <form
                       method="POST"
                       action="{{ root_path }}/admin/gateways/{{ gateway.id }}/toggle"
@@ -3055,7 +3255,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
               <div id="auth-oauth-fields-gw" style="display: none">
                 <div class="space-y-4">
                   <div>
-                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                    <label
+                      class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                    >
                       Grant Type
                     </label>
                     <select
@@ -3063,13 +3265,19 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                       id="oauth-grant-type-gw"
                       class="mt-1 block w-full rounded-md border border-gray-300 dark:border-gray-700 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 dark:bg-gray-900 dark:placeholder-gray-300 dark:text-gray-300"
                     >
-                      <option value="client_credentials">Client Credentials (Machine-to-Machine)</option>
-                      <option value="authorization_code">Authorization Code (User Delegation)</option>
+                      <option value="client_credentials">
+                        Client Credentials (Machine-to-Machine)
+                      </option>
+                      <option value="authorization_code">
+                        Authorization Code (User Delegation)
+                      </option>
                     </select>
                   </div>
 
                   <div>
-                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                    <label
+                      class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                    >
                       Client ID
                     </label>
                     <input
@@ -3081,7 +3289,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                   </div>
 
                   <div>
-                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                    <label
+                      class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                    >
                       Client Secret
                     </label>
                     <input
@@ -3093,7 +3303,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                   </div>
 
                   <div>
-                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                    <label
+                      class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                    >
                       Token URL
                     </label>
                     <input
@@ -3106,7 +3318,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
 
                   <div id="oauth-auth-code-fields-gw" style="display: none">
                     <div>
-                      <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                      <label
+                        class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                      >
                         Authorization URL
                       </label>
                       <input
@@ -3121,7 +3335,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                     </div>
 
                     <div>
-                      <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                      <label
+                        class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                      >
                         Redirect URI
                       </label>
                       <input
@@ -3131,15 +3347,21 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                         placeholder="https://gateway.example.com/oauth/callback"
                       />
                       <p class="mt-1 text-sm text-gray-500">
-                        This must match the redirect URI configured in your OAuth application
+                        This must match the redirect URI configured in your
+                        OAuth application
                       </p>
                       <p class="mt-1 text-sm text-blue-600 font-medium">
-                        💡 Use: <code class="bg-blue-100 px-1 rounded">{{ request.base_url }}oauth/callback</code>
+                        💡 Use:
+                        <code class="bg-blue-100 px-1 rounded"
+                          >{{ request.base_url }}oauth/callback</code
+                        >
                       </p>
                     </div>
 
                     <div>
-                      <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                      <label
+                        class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                      >
                         Token Management
                       </label>
                       <div class="mt-2 space-y-2">
@@ -3150,7 +3372,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                             checked
                             class="rounded border-gray-300 text-indigo-600 focus:ring-indigo-500"
                           />
-                          <span class="ml-2 text-sm text-gray-700 dark:text-gray-300">
+                          <span
+                            class="ml-2 text-sm text-gray-700 dark:text-gray-300"
+                          >
                             Store access tokens for reuse
                           </span>
                         </label>
@@ -3161,7 +3385,9 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                             checked
                             class="rounded border-gray-300 text-indigo-600 focus:ring-indigo-500"
                           />
-                          <span class="ml-2 text-sm text-gray-700 dark:text-gray-300">
+                          <span
+                            class="ml-2 text-sm text-gray-700 dark:text-gray-300"
+                          >
                             Automatically refresh expired tokens
                           </span>
                         </label>
@@ -3171,25 +3397,51 @@ <h3 class="text-lg font-bold mb-4 dark:text-gray-200">
                       </p>
                     </div>
 
-                    <div class="bg-blue-50 border border-blue-200 rounded-md p-4 dark:bg-blue-900/20 dark:border-blue-800">
+                    <div
+                      class="bg-blue-50 border border-blue-200 rounded-md p-4 dark:bg-blue-900/20 dark:border-blue-800"
+                    >
                       <div class="flex">
                         <div class="flex-shrink-0">
-                          <svg class="h-5 w-5 text-blue-400" viewBox="0 0 20 20" fill="currentColor">
-                            <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd" />
+                          <svg
+                            class="h-5 w-5 text-blue-400"
+                            viewBox="0 0 20 20"
+                            fill="currentColor"
+                          >
+                            <path
+                              fill-rule="evenodd"
+                              d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
+                              clip-rule="evenodd"
+                            />
                           </svg>
                         </div>
                         <div class="ml-3">
-                          <h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">
+                          <h3
+                            class="text-sm font-medium text-blue-800 dark:text-blue-200"
+                          >
                             Authorization Code Flow Setup
                           </h3>
-                          <div class="mt-2 text-sm text-blue-700 dark:text-blue-300">
+                          <div
+                            class="mt-2 text-sm text-blue-700 dark:text-blue-300"
+                          >
                             <p>After creating this gateway, you'll need to:</p>
                             <ol class="list-decimal list-inside mt-1 space-y-1">
-                              <li>Click the "🔐 Authorize" button in the gateway list</li>
-                              <li>Complete the OAuth consent flow with your provider</li>
-                              <li>Return to the admin panel to see authorization status</li>
+                              <li>
+                                Click the "🔐 Authorize" button in the gateway
+                                list
+                              </li>
+                              <li>
+                                Complete the OAuth consent flow with your
+                                provider
+                              </li>
+                              <li>
+                                Return to the admin panel to see authorization
+                                status
+                              </li>
                             </ol>
-                            <p class="mt-2 font-medium">Note: The gateway will be created but tools won't work until OAuth authorization is completed.</p>
+                            <p class="mt-2 font-medium">
+                              Note: The gateway will be created but tools won't
+                              work until OAuth authorization is completed.
+                            </p>
                           </div>
                         </div>
                       </div>
@@ -3197,7 +3449,9 @@ <h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">
                   </div>
 
                   <div>
-                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                    <label
+                      class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                    >
                       Scopes
                     </label>
                     <input
@@ -3207,7 +3461,8 @@ <h3 class="text-sm font-medium text-blue-800 dark:text-blue-200">
                       placeholder="repo read:user (space-separated)"
                     />
                     <p class="mt-1 text-sm text-gray-500">
-                      Space-separated list of OAuth scopes (e.g., "repo read:user")
+                      Space-separated list of OAuth scopes (e.g., "repo
+                      read:user")
                     </p>
                   </div>
                 </div>
@@ -3255,7 +3510,8 @@ <h2 class="text-2xl font-bold dark:text-gray-200">
             A2A Agents Catalog
           </h2>
           <p class="text-sm text-gray-600 dark:text-gray-400 mt-1">
-            Manage Agent-to-Agent compatible agents that can be integrated as tools
+            Manage Agent-to-Agent compatible agents that can be integrated as
+            tools
           </p>
           <div class="flex items-center">
             <input
@@ -3437,77 +3693,126 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-200 mb-4">
               Registered A2A Agents
             </h3>
             <div class="space-y-4">
-              {% if a2a_agents %}
-                {% for agent in a2a_agents %}
-                <div class="border border-gray-200 dark:border-gray-600 rounded-lg p-4 space-y-3">
-                  <div class="flex items-start justify-between">
-                    <div class="flex-1">
-                      <h4 class="text-lg font-medium text-gray-900 dark:text-gray-200">{{ agent.name }}</h4>
-                      <p class="text-sm text-gray-600 dark:text-gray-400">{{ agent.description or "" }}</p>
-                      <div class="mt-2 flex flex-wrap gap-2">
-                        <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {% if agent.enabled %}bg-green-100 text-green-800{% else %}bg-red-100 text-red-800{% endif %}">
-                          {% if agent.enabled %}Active{% else %}Inactive{% endif %}
-                        </span>
-                        <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {% if agent.reachable %}bg-green-100 text-green-800{% else %}bg-yellow-100 text-yellow-800{% endif %}">
-                          {% if agent.reachable %}Reachable{% else %}Unreachable{% endif %}
-                        </span>
-                        <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800">
-                          {{ agent.agentType }}
-                        </span>
-                        <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800">
-                          Auth: {{ agent.authType or "None" }}
-                        </span>
+              {% if a2a_agents %} {% for agent in a2a_agents %}
+              <div
+                class="border border-gray-200 dark:border-gray-600 rounded-lg p-4 space-y-3"
+              >
+                <div class="flex items-start justify-between">
+                  <div class="flex-1">
+                    <h4
+                      class="text-lg font-medium text-gray-900 dark:text-gray-200"
+                    >
+                      {{ agent.name }}
+                    </h4>
+                    <p class="text-sm text-gray-600 dark:text-gray-400">
+                      {{ agent.description or "" }}
+                    </p>
+                    <div class="mt-2 flex flex-wrap gap-2">
+                      <span
+                        class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {% if agent.enabled %}bg-green-100 text-green-800{% else %}bg-red-100 text-red-800{% endif %}"
+                      >
+                        {% if agent.enabled %}Active{% else %}Inactive{% endif
+                        %}
+                      </span>
+                      <span
+                        class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium {% if agent.reachable %}bg-green-100 text-green-800{% else %}bg-yellow-100 text-yellow-800{% endif %}"
+                      >
+                        {% if agent.reachable %}Reachable{% else %}Unreachable{%
+                        endif %}
+                      </span>
+                      <span
+                        class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-blue-100 text-blue-800"
+                      >
+                        {{ agent.agentType }}
+                      </span>
+                      <span
+                        class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-100 text-gray-800"
+                      >
+                        Auth: {{ agent.authType or "None" }}
+                      </span>
+                    </div>
+                    <div class="mt-2 text-xs text-gray-500 dark:text-gray-400">
+                      <div>Endpoint: {{ agent.endpointUrl }}</div>
+                      <div>
+                        Executions: {{ agent.metrics.totalExecutions }} |
+                        Success Rate: {% if agent.metrics.totalExecutions %}{{
+                        "%.1f"|format(100 - agent.metrics.failureRate) }}%{%
+                        else %}N/A{% endif %}
                       </div>
-                      <div class="mt-2 text-xs text-gray-500 dark:text-gray-400">
-                        <div>Endpoint: {{ agent.endpointUrl }}</div>
-                        <div>Executions: {{ agent.metrics.totalExecutions }} | Success Rate: {% if agent.metrics.totalExecutions %}{{ "%.1f"|format(100 - agent.metrics.failureRate) }}%{% else %}N/A{% endif %}</div>
-                        <div>Created: {{ agent.createdAt.strftime('%Y-%m-%d %H:%M:%S') }}</div>
-                        {% if agent.lastInteraction %}
-                        <div>Last Interaction: {{ agent.lastInteraction.strftime('%Y-%m-%d %H:%M:%S') }}</div>
-                        {% endif %}
+                      <div>
+                        Created: {{ agent.createdAt.strftime('%Y-%m-%d
+                        %H:%M:%S') }}
                       </div>
-                      {% if agent.tags %}
-                      <div class="mt-2 flex flex-wrap gap-1">
-                        {% for tag in agent.tags %}
-                        <span class="inline-flex items-center px-2 py-1 rounded text-xs bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300">{{ tag }}</span>
-                        {% endfor %}
+                      {% if agent.lastInteraction %}
+                      <div>
+                        Last Interaction: {{
+                        agent.lastInteraction.strftime('%Y-%m-%d %H:%M:%S') }}
                       </div>
                       {% endif %}
-                      <!-- Test result placeholder -->
-                      <div id="test-result-{{ agent.id }}" class="mt-2 p-2 rounded-md bg-gray-50 dark:bg-gray-700 hidden"></div>
                     </div>
-                    <div class="flex space-x-2">
+                    {% if agent.tags %}
+                    <div class="mt-2 flex flex-wrap gap-1">
+                      {% for tag in agent.tags %}
+                      <span
+                        class="inline-flex items-center px-2 py-1 rounded text-xs bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300"
+                        >{{ tag }}</span
+                      >
+                      {% endfor %}
+                    </div>
+                    {% endif %}
+                    <!-- Test result placeholder -->
+                    <div
+                      id="test-result-{{ agent.id }}"
+                      class="mt-2 p-2 rounded-md bg-gray-50 dark:bg-gray-700 hidden"
+                    ></div>
+                  </div>
+                  <div class="flex space-x-2">
+                    <button
+                      onclick="testA2AAgent('{{ agent.id }}', '{{ agent.name }}', '{{ agent.endpointUrl }}')"
+                      class="px-3 py-1 text-sm font-medium text-blue-700 bg-blue-100 hover:bg-blue-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
+                    >
+                      Test
+                    </button>
+                    <form
+                      method="post"
+                      action="{{ root_path }}/admin/a2a/{{ agent.id }}/toggle"
+                      class="inline"
+                    >
+                      <input
+                        type="hidden"
+                        name="activate"
+                        value="{% if agent.enabled %}false{% else %}true{% endif %}"
+                      />
                       <button
-                        onclick="testA2AAgent('{{ agent.id }}', '{{ agent.name }}', '{{ agent.endpointUrl }}')"
-                        class="px-3 py-1 text-sm font-medium text-blue-700 bg-blue-100 hover:bg-blue-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
+                        type="submit"
+                        class="px-3 py-1 text-sm font-medium {% if agent.enabled %}text-red-700 bg-red-100 hover:bg-red-200{% else %}text-green-700 bg-green-100 hover:bg-green-200{% endif %} rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
                       >
-                        Test
+                        {% if agent.enabled %}Deactivate{% else %}Activate{%
+                        endif %}
                       </button>
-                      <form method="post" action="{{ root_path }}/admin/a2a/{{ agent.id }}/toggle" class="inline">
-                        <input type="hidden" name="activate" value="{% if agent.enabled %}false{% else %}true{% endif %}" />
-                        <button
-                          type="submit"
-                          class="px-3 py-1 text-sm font-medium {% if agent.enabled %}text-red-700 bg-red-100 hover:bg-red-200{% else %}text-green-700 bg-green-100 hover:bg-green-200{% endif %} rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
-                        >
-                          {% if agent.enabled %}Deactivate{% else %}Activate{% endif %}
-                        </button>
-                      </form>
-                      <form method="post" action="{{ root_path }}/admin/a2a/{{ agent.id }}/delete" class="inline" onsubmit="return confirm('Are you sure you want to delete this A2A agent?')">
-                        <button
-                          type="submit"
-                          class="px-3 py-1 text-sm font-medium text-red-700 bg-red-100 hover:bg-red-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500"
-                        >
-                          Delete
-                        </button>
-                      </form>
-                    </div>
+                    </form>
+                    <form
+                      method="post"
+                      action="{{ root_path }}/admin/a2a/{{ agent.id }}/delete"
+                      class="inline"
+                      onsubmit="return confirm('Are you sure you want to delete this A2A agent?')"
+                    >
+                      <button
+                        type="submit"
+                        class="px-3 py-1 text-sm font-medium text-red-700 bg-red-100 hover:bg-red-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500"
+                      >
+                        Delete
+                      </button>
+                    </form>
                   </div>
                 </div>
-                {% endfor %}
-              {% else %}
-                <div class="text-center py-8">
-                  <p class="text-gray-500 dark:text-gray-400">No A2A agents registered yet.</p>
-                </div>
+              </div>
+              {% endfor %} {% else %}
+              <div class="text-center py-8">
+                <p class="text-gray-500 dark:text-gray-400">
+                  No A2A agents registered yet.
+                </p>
+              </div>
               {% endif %}
             </div>
           </div>
@@ -3894,11 +4199,7 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
               <div class="mt-4">
                 <form id="edit-tool-form" method="POST">
                   <div class="grid grid-cols-1 gap-6">
-                    <input
-                      type="hidden"
-                      name="name"
-                      id="edit-tool-name"
-                    />
+                    <input type="hidden" name="name" id="edit-tool-name" />
 
                     <div>
                       <label
@@ -4802,7 +5103,9 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                     <div id="auth-oauth-fields-gw-edit" style="display: none">
                       <div class="space-y-4">
                         <div>
-                          <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                          <label
+                            class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                          >
                             Grant Type
                           </label>
                           <select
@@ -4810,13 +5113,19 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                             id="oauth-grant-type-gw-edit"
                             class="mt-1 block w-full rounded-md border border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 dark:bg-gray-900 dark:placeholder-gray-300 dark:text-gray-300"
                           >
-                            <option value="client_credentials">Client Credentials (Machine-to-Machine)</option>
-                            <option value="authorization_code">Authorization Code (User Delegation)</option>
+                            <option value="client_credentials">
+                              Client Credentials (Machine-to-Machine)
+                            </option>
+                            <option value="authorization_code">
+                              Authorization Code (User Delegation)
+                            </option>
                           </select>
                         </div>
 
                         <div>
-                          <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                          <label
+                            class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                          >
                             Client ID
                           </label>
                           <input
@@ -4829,7 +5138,9 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                         </div>
 
                         <div>
-                          <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                          <label
+                            class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                          >
                             Client Secret
                           </label>
                           <input
@@ -4845,7 +5156,9 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                         </div>
 
                         <div>
-                          <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                          <label
+                            class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                          >
                             Token URL
                           </label>
                           <input
@@ -4857,9 +5170,14 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                           />
                         </div>
 
-                        <div id="oauth-auth-code-fields-gw-edit" style="display: none">
+                        <div
+                          id="oauth-auth-code-fields-gw-edit"
+                          style="display: none"
+                        >
                           <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                            <label
+                              class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                            >
                               Authorization URL
                             </label>
                             <input
@@ -4875,7 +5193,9 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                           </div>
 
                           <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                            <label
+                              class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                            >
                               Redirect URI
                             </label>
                             <input
@@ -4886,15 +5206,21 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                               placeholder="https://gateway.example.com/oauth/callback"
                             />
                             <p class="mt-1 text-sm text-gray-500">
-                              This must match the redirect URI configured in your OAuth application
+                              This must match the redirect URI configured in
+                              your OAuth application
                             </p>
                             <p class="mt-1 text-sm text-blue-600 font-medium">
-                              💡 Use: <code class="bg-blue-100 px-1 rounded">http://localhost:4444/oauth/callback</code>
+                              💡 Use:
+                              <code class="bg-blue-100 px-1 rounded"
+                                >http://localhost:4444/oauth/callback</code
+                              >
                             </p>
                           </div>
 
                           <div>
-                            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300">
+                            <label
+                              class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+                            >
                               Scopes
                             </label>
                             <input
@@ -4905,7 +5231,8 @@ <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
                               placeholder="repo read:user (space-separated)"
                             />
                             <p class="mt-1 text-sm text-gray-500">
-                              Space-separated list of OAuth scopes (e.g., "repo read:user")
+                              Space-separated list of OAuth scopes (e.g., "repo
+                              read:user")
                             </p>
                           </div>
                         </div>
@@ -5904,7 +6231,1178 @@ <h3 class="text-lg font-bold mb-4">Available Log Files</h3>
             setTimeout(refreshLogs, 100);
           });
         }
+
+        // ================================
+        // BULK IMPORT FUNCTIONALITY
+        // ================================
+
+        let bulkImportData = null;
+
+        // Open bulk import modal - make it globally available
+        window.openBulkImportModal = function () {
+          console.log("openBulkImportModal called");
+          const modal = document.getElementById("bulk-import-modal");
+          console.log("Modal element:", modal);
+          if (modal) {
+            modal.classList.remove("hidden");
+            resetBulkImportModal();
+          } else {
+            console.error("Modal element not found!");
+          }
+        };
+
+        // Close bulk import modal
+        window.closeBulkImportModal = function () {
+          document.getElementById("bulk-import-modal").classList.add("hidden");
+          resetBulkImportModal();
+        };
+
+        // Reset modal to initial state
+        function resetBulkImportModal() {
+          // Reset radio buttons
+          document.querySelector(
+            'input[name="import-method"][value="file"]',
+          ).checked = true;
+          toggleImportMethod("file");
+
+          // Clear file input
+          document.getElementById("bulk-import-file").value = "";
+          document.getElementById("file-info").classList.add("hidden");
+
+          // Clear JSON textarea
+          document.getElementById("bulk-import-json").value = "";
+
+          // Hide sections
+          document.getElementById("import-preview").classList.add("hidden");
+          document.getElementById("import-status").classList.add("hidden");
+          document.getElementById("import-loading").classList.add("hidden");
+
+          // Reset validation status
+          document.getElementById("json-validation-status").textContent = "";
+          document.getElementById("json-validation-status").className =
+            "text-sm";
+
+          // Disable submit button
+          document.getElementById("import-submit-btn").disabled = true;
+
+          // Reset global data
+          bulkImportData = null;
+        }
+
+        // Toggle between file upload and JSON paste
+        window.toggleImportMethod = function (method) {
+          const fileSection = document.getElementById("file-upload-section");
+          const pasteSection = document.getElementById("json-paste-section");
+
+          if (method === "file") {
+            fileSection.classList.remove("hidden");
+            pasteSection.classList.add("hidden");
+          } else {
+            fileSection.classList.add("hidden");
+            pasteSection.classList.remove("hidden");
+          }
+
+          // Clear preview when switching methods
+          document.getElementById("import-preview").classList.add("hidden");
+          document.getElementById("import-submit-btn").disabled = true;
+          bulkImportData = null;
+        };
+
+        // Handle file selection
+        window.handleFileSelect = function (input) {
+          const file = input.files[0];
+          if (!file) {
+            document.getElementById("file-info").classList.add("hidden");
+            return;
+          }
+
+          // Validate file type
+          if (!file.name.toLowerCase().endsWith(".json")) {
+            showImportError("Please select a JSON file.");
+            input.value = "";
+            return;
+          }
+
+          // Show file info
+          document.getElementById("file-name").textContent = file.name;
+          document.getElementById("file-size").textContent =
+            `(${formatFileSize(file.size)})`;
+          document.getElementById("file-info").classList.remove("hidden");
+
+          // Read file content
+          const reader = new FileReader();
+          reader.onload = function (e) {
+            try {
+              const jsonData = JSON.parse(e.target.result);
+              processImportData(jsonData);
+            } catch (error) {
+              showImportError(`Invalid JSON file: ${error.message}`);
+              input.value = "";
+              document.getElementById("file-info").classList.add("hidden");
+            }
+          };
+          reader.onerror = function () {
+            showImportError("Error reading file.");
+            input.value = "";
+            document.getElementById("file-info").classList.add("hidden");
+          };
+          reader.readAsText(file);
+        };
+
+        // Validate JSON input from textarea
+        window.validateJsonInput = function () {
+          const jsonText = document
+            .getElementById("bulk-import-json")
+            .value.trim();
+          const statusElement = document.getElementById(
+            "json-validation-status",
+          );
+
+          if (!jsonText) {
+            statusElement.textContent = "Please enter JSON data";
+            statusElement.className =
+              "text-sm text-yellow-600 dark:text-yellow-400";
+            return;
+          }
+
+          try {
+            const jsonData = JSON.parse(jsonText);
+
+            // Validate structure with helpful messages
+            if (!Array.isArray(jsonData)) {
+              statusElement.textContent =
+                "✗ JSON must be an array of tool objects [{}], not a single object {}";
+              statusElement.className =
+                "text-sm text-red-600 dark:text-red-400";
+              document.getElementById("import-preview").classList.add("hidden");
+              document.getElementById("import-submit-btn").disabled = true;
+              bulkImportData = null;
+              return;
+            }
+
+            if (jsonData.length === 0) {
+              statusElement.textContent =
+                "✗ Array cannot be empty - add at least one tool";
+              statusElement.className =
+                "text-sm text-red-600 dark:text-red-400";
+              document.getElementById("import-preview").classList.add("hidden");
+              document.getElementById("import-submit-btn").disabled = true;
+              bulkImportData = null;
+              return;
+            }
+
+            // Success with helpful info
+            const toolCount = jsonData.length;
+            const toolsWithNames = jsonData.filter((tool) => tool && tool.name);
+
+            if (toolsWithNames.length === toolCount) {
+              statusElement.textContent = `✓ Valid JSON array with ${toolCount} tool(s) - names will be auto-fixed for compatibility`;
+              statusElement.className =
+                "text-sm text-green-600 dark:text-green-400";
+            } else {
+              statusElement.textContent = `⚠ Valid JSON but ${toolCount - toolsWithNames.length} tool(s) missing required name field`;
+              statusElement.className =
+                "text-sm text-yellow-600 dark:text-yellow-400";
+            }
+
+            processImportData(jsonData);
+          } catch (error) {
+            let helpText = "";
+            if (error.message.includes("Unexpected")) {
+              helpText = " (Check for missing commas, quotes, or brackets)";
+            }
+            statusElement.textContent = `✗ Invalid JSON: ${error.message}${helpText}`;
+            statusElement.className = "text-sm text-red-600 dark:text-red-400";
+            document.getElementById("import-preview").classList.add("hidden");
+            document.getElementById("import-submit-btn").disabled = true;
+            bulkImportData = null;
+          }
+        };
+
+        // Process and validate import data
+        function processImportData(data) {
+          try {
+            // Validate data structure
+            if (!Array.isArray(data)) {
+              throw new Error("Data must be an array of tool definitions");
+            }
+
+            if (data.length === 0) {
+              throw new Error("Array cannot be empty");
+            }
+
+            if (data.length > 200) {
+              throw new Error(
+                `Too many tools (${data.length}). Maximum 200 allowed.`,
+              );
+            }
+
+            // Auto-fix and validate each tool
+            const errors = [];
+            const fixedData = data.map((tool, index) => {
+              if (!tool || typeof tool !== "object") {
+                errors.push(`Item ${index + 1}: Must be an object`);
+                return tool;
+              }
+
+              // Create a copy to avoid modifying original
+              const fixedTool = { ...tool };
+
+              // Fix tool name to meet validation requirements
+              if (fixedTool.name) {
+                const originalName = fixedTool.name;
+                // Convert to valid format: start with letter, only letters/numbers/dots/underscores/hyphens
+                fixedTool.name = String(originalName)
+                  .trim()
+                  .replace(/\s+/g, "_") // Replace spaces with underscores
+                  .replace(/[^a-zA-Z0-9._-]/g, "") // Remove invalid characters
+                  .replace(/^[^a-zA-Z]/, "tool_") // Ensure starts with letter
+                  .toLowerCase();
+
+                if (fixedTool.name !== originalName) {
+                  console.log(
+                    `Auto-fixed tool name: "${originalName}" -> "${fixedTool.name}"`,
+                  );
+                }
+              }
+
+              // Fix tags if present (tags must be an array, not a string)
+              if (fixedTool.tags) {
+                const originalTags = fixedTool.tags;
+                if (typeof fixedTool.tags === "string") {
+                  // Convert comma-separated string to array of strings
+                  fixedTool.tags = fixedTool.tags
+                    .split(",") // Split by comma
+                    .map((tag) => tag.trim()) // Trim whitespace
+                    .filter((tag) => tag.length >= 2) // Remove empty/too short tags
+                    .map((tag) => tag.toLowerCase()) // Convert to lowercase
+                    .map((tag) => tag.replace(/[^a-z0-9\-\:\.]/g, "")) // Remove invalid characters
+                    .filter((tag) => tag.length >= 2); // Filter again after cleaning
+
+                  if (
+                    JSON.stringify(fixedTool.tags) !==
+                    JSON.stringify(originalTags)
+                  ) {
+                    console.log(
+                      `Auto-fixed tags: "${originalTags}" -> ${JSON.stringify(fixedTool.tags)}`,
+                    );
+                  }
+                } else if (Array.isArray(fixedTool.tags)) {
+                  // Clean up array of tags
+                  fixedTool.tags = fixedTool.tags
+                    .map((tag) => String(tag).trim().toLowerCase())
+                    .map((tag) => tag.replace(/[^a-z0-9\-\:\.]/g, ""))
+                    .filter((tag) => tag.length >= 2);
+
+                  if (
+                    JSON.stringify(fixedTool.tags) !==
+                    JSON.stringify(originalTags)
+                  ) {
+                    console.log(
+                      `Auto-fixed tags array: ${JSON.stringify(originalTags)} -> ${JSON.stringify(fixedTool.tags)}`,
+                    );
+                  }
+                }
+              }
+
+              // Only name is strictly required
+              const required = ["name"];
+              const missing = required.filter(
+                (field) =>
+                  !fixedTool[field] ||
+                  (typeof fixedTool[field] === "string" &&
+                    fixedTool[field].trim() === ""),
+              );
+              if (missing.length > 0) {
+                errors.push(
+                  `Item ${index + 1}: Missing required fields: ${missing.join(", ")}`,
+                );
+              }
+
+              // Warn about missing recommended fields but don't block import
+              const recommended = ["url"];
+              const missingRecommended = recommended.filter(
+                (field) =>
+                  !fixedTool[field] ||
+                  (typeof fixedTool[field] === "string" &&
+                    fixedTool[field].trim() === ""),
+              );
+              if (missingRecommended.length > 0) {
+                console.warn(
+                  `Item ${index + 1} (${fixedTool.name || "unnamed"}): Missing recommended fields: ${missingRecommended.join(", ")}`,
+                );
+              }
+
+              return fixedTool;
+            });
+
+            if (errors.length > 0) {
+              throw new Error(
+                `Validation errors:\\n${errors.slice(0, 5).join("\\n")}${errors.length > 5 ? `\\n... and ${errors.length - 5} more errors` : ""}`,
+              );
+            }
+
+            // Store the fixed data instead of original
+            bulkImportData = fixedData;
+
+            // Show preview
+            showImportPreview(fixedData);
+
+            // Enable submit button
+            document.getElementById("import-submit-btn").disabled = false;
+
+            // Clear any previous error messages
+            document.getElementById("import-status").classList.add("hidden");
+          } catch (error) {
+            showImportError(error.message);
+            bulkImportData = null;
+            document.getElementById("import-submit-btn").disabled = true;
+          }
+        } // Show import preview
+        function showImportPreview(data) {
+          document.getElementById("preview-count").textContent = data.length;
+
+          // Populate preview list
+          const previewList = document.getElementById("preview-list");
+          previewList.innerHTML = "";
+
+          data.slice(0, 10).forEach((tool, index) => {
+            const li = document.createElement("li");
+            li.className = "flex justify-between";
+            li.innerHTML = `
+              <span class="truncate">${escapeHtml(tool.name || "Unnamed")}</span>
+              <span class="ml-2 text-gray-500">${escapeHtml(tool.integrationType || "REST")}</span>
+            `;
+            previewList.appendChild(li);
+          });
+
+          if (data.length > 10) {
+            const li = document.createElement("li");
+            li.className = "text-gray-500 italic";
+            li.textContent = `... and ${data.length - 10} more tools`;
+            previewList.appendChild(li);
+          }
+
+          document.getElementById("import-preview").classList.remove("hidden");
+        }
+
+        // Toggle validation guide visibility
+        window.toggleValidationGuide = function () {
+          const guide = document.getElementById("validation-guide");
+          const toggle = document.getElementById("validation-guide-toggle");
+
+          if (guide.classList.contains("hidden")) {
+            guide.classList.remove("hidden");
+            toggle.textContent = "Hide Validation Rules";
+          } else {
+            guide.classList.add("hidden");
+            toggle.textContent = "Show Validation Rules";
+          }
+        };
+
+        // Toggle preview details
+        window.togglePreviewDetails = function () {
+          const details = document.getElementById("preview-details");
+          const toggleText = document.getElementById("preview-toggle-text");
+
+          if (details.classList.contains("hidden")) {
+            details.classList.remove("hidden");
+            toggleText.textContent = "Hide Details";
+          } else {
+            details.classList.add("hidden");
+            toggleText.textContent = "Show Details";
+          }
+        };
+
+        // Submit bulk import
+        window.submitBulkImport = async function () {
+          if (!bulkImportData) {
+            showImportError("No valid data to import");
+            return;
+          }
+
+          // Show loading
+          document.getElementById("import-loading").classList.remove("hidden");
+          document.getElementById("import-submit-btn").disabled = true;
+
+          try {
+            const response = await fetch(
+              `${window.location.origin}/admin/tools/import`,
+              {
+                method: "POST",
+                headers: {
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify(bulkImportData),
+              },
+            );
+
+            const result = await response.json();
+
+            // Debug logging
+            console.log("Response status:", response.status);
+            console.log("Response ok:", response.ok);
+            console.log("Result:", result);
+            console.log("Result.success:", result.success);
+            console.log("Result.created_count:", result.created_count);
+            console.log("Result.failed_count:", result.failed_count);
+            console.log("Result.errors:", result.errors);
+
+            // Log individual errors for debugging
+            if (result.errors && result.errors.length > 0) {
+              console.log("Detailed errors:");
+              result.errors.forEach((error, index) => {
+                console.log(`Error ${index + 1}:`, error);
+                if (error.error) {
+                  console.log(`  Error message:`, error.error.message);
+                  console.log(
+                    `  Full error object:`,
+                    JSON.stringify(error.error, null, 2),
+                  );
+                }
+              });
+            }
+
+            // Hide loading
+            document.getElementById("import-loading").classList.add("hidden");
+
+            if (response.ok) {
+              if (result.success) {
+                // Complete success
+                showImportSuccess(result);
+
+                // Auto-close modal after success and refresh page
+                setTimeout(() => {
+                  closeBulkImportModal();
+                  location.reload(); // Refresh to show new tools
+                }, 3000);
+              } else if (result.created_count > 0) {
+                // Partial success - some tools imported successfully
+                showImportSuccess(result);
+
+                // Auto-close modal after partial success and refresh page
+                setTimeout(() => {
+                  closeBulkImportModal();
+                  location.reload(); // Refresh to show new tools
+                }, 5000); // Longer delay to see the message
+              } else {
+                // Complete failure
+                showImportError(result.message || "All tools failed to import");
+                document.getElementById("import-submit-btn").disabled = false;
+              }
+            } else {
+              showImportError(result.message || "Import failed");
+              document.getElementById("import-submit-btn").disabled = false;
+            }
+          } catch (error) {
+            document.getElementById("import-loading").classList.add("hidden");
+            showImportError(`Network error: ${error.message}`);
+            document.getElementById("import-submit-btn").disabled = false;
+          }
+        };
+
+        // Show import success message
+        function showImportSuccess(result) {
+          const statusDiv = document.getElementById("import-status");
+          const isPartialSuccess = result.failed_count > 0;
+          const bgColor = isPartialSuccess ? "yellow" : "green";
+          const textColor = isPartialSuccess ? "yellow" : "green";
+
+          statusDiv.innerHTML = `
+            <div class="bg-${bgColor}-50 dark:bg-${bgColor}-900 border border-${bgColor}-200 dark:border-${bgColor}-800 rounded-md p-4">
+              <div class="flex">
+                <div class="flex-shrink-0">
+                  <svg class="h-5 w-5 text-${textColor}-400" fill="currentColor" viewBox="0 0 20 20">
+                    <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"></path>
+                  </svg>
+                </div>
+                <div class="ml-3">
+                  <h3 class="text-sm font-medium text-${textColor}-800 dark:text-${textColor}-200">
+                    ${isPartialSuccess ? "Import Partially Completed" : "Import Completed Successfully"}
+                  </h3>
+                  <div class="mt-2 text-sm text-${textColor}-700 dark:text-${textColor}-300">
+                    <p><strong>${result.created_count}</strong> tools imported successfully</p>
+                    ${result.failed_count > 0 ? `<p><strong>${result.failed_count}</strong> tools failed to import</p>` : ""}
+                    ${
+                      result.errors && result.errors.length > 0
+                        ? `
+                      <details class="mt-2">
+                        <summary class="cursor-pointer">View errors</summary>
+                        <ul class="mt-1 list-disc list-inside text-xs">
+                          ${result.errors
+                            .slice(0, 5)
+                            .map(
+                              (error) =>
+                                `<li>${error.name || "Tool"}: ${error.error?.message || "Unknown error"}</li>`,
+                            )
+                            .join("")}
+                          ${result.errors.length > 5 ? `<li>... and ${result.errors.length - 5} more errors</li>` : ""}
+                        </ul>
+                      </details>
+                    `
+                        : ""
+                    }
+                    <p class="mt-2 text-xs">Page will refresh automatically...</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          `;
+          statusDiv.classList.remove("hidden");
+        }
+
+        // Show import error message
+        function showImportError(message) {
+          const statusDiv = document.getElementById("import-status");
+          statusDiv.innerHTML = `
+            <div class="bg-red-50 dark:bg-red-900 border border-red-200 dark:border-red-800 rounded-md p-4">
+              <div class="flex">
+                <div class="flex-shrink-0">
+                  <svg class="h-5 w-5 text-red-400" fill="currentColor" viewBox="0 0 20 20">
+                    <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path>
+                  </svg>
+                </div>
+                <div class="ml-3">
+                  <h3 class="text-sm font-medium text-red-800 dark:text-red-200">
+                    Import Error
+                  </h3>
+                  <div class="mt-2 text-sm text-red-700 dark:text-red-300">
+                    <p>${escapeHtml(message)}</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          `;
+          statusDiv.classList.remove("hidden");
+        }
+
+        // Format file size
+        function formatFileSize(bytes) {
+          if (bytes === 0) return "0 Bytes";
+          const k = 1024;
+          const sizes = ["Bytes", "KB", "MB", "GB"];
+          const i = Math.floor(Math.log(bytes) / Math.log(k));
+          return (
+            parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i]
+          );
+        }
+
+        // Auto-trigger JSON validation when typing in textarea
+        document.addEventListener("DOMContentLoaded", function () {
+          const jsonTextarea = document.getElementById("bulk-import-json");
+          if (jsonTextarea) {
+            let validationTimeout;
+            jsonTextarea.addEventListener("input", function () {
+              clearTimeout(validationTimeout);
+              validationTimeout = setTimeout(function () {
+                if (jsonTextarea.value.trim()) {
+                  validateJsonInput();
+                }
+              }, 1000); // Validate 1 second after user stops typing
+            });
+          }
+        });
+
+        // Dropdown Functions
+        window.toggleBulkImportDropdown = function () {
+          const dropdown = document.getElementById("bulk-import-dropdown");
+          dropdown.classList.toggle("hidden");
+        };
+
+        window.toggleDropdownImportMethod = function (method) {
+          const fileSection = document.getElementById("dropdown-file-section");
+          const pasteSection = document.getElementById(
+            "dropdown-paste-section",
+          );
+
+          if (method === "file") {
+            fileSection.classList.remove("hidden");
+            pasteSection.classList.add("hidden");
+          } else {
+            fileSection.classList.add("hidden");
+            pasteSection.classList.remove("hidden");
+          }
+          resetDropdownImport();
+        };
+
+        window.handleDropdownFileSelect = function (input) {
+          const fileInfo = document.getElementById("dropdown-file-info");
+          const preview = document.getElementById("dropdown-preview");
+          const status = document.getElementById("dropdown-status");
+
+          if (!input.files[0]) {
+            resetDropdownImport();
+            return;
+          }
+
+          const file = input.files[0];
+          fileInfo.textContent = `Selected: ${file.name} (${(file.size / 1024).toFixed(1)} KB)`;
+          fileInfo.classList.remove("hidden");
+
+          const reader = new FileReader();
+          reader.onload = function (e) {
+            try {
+              const data = JSON.parse(e.target.result);
+              validateDropdownData(data);
+            } catch (error) {
+              showDropdownStatus("error", `Invalid JSON: ${error.message}`);
+            }
+          };
+          reader.readAsText(file);
+        };
+
+        window.validateDropdownJson = function () {
+          const textarea = document.getElementById("dropdown-json-textarea");
+          const status = document.getElementById("dropdown-json-status");
+
+          if (!textarea.value.trim()) {
+            status.textContent = "";
+            document.getElementById("dropdown-import-btn").disabled = true;
+            document.getElementById("dropdown-preview").classList.add("hidden");
+            return;
+          }
+
+          try {
+            const data = JSON.parse(textarea.value);
+            status.innerHTML =
+              '<span class="text-green-600">✓ Valid JSON</span>';
+            validateDropdownData(data);
+          } catch (error) {
+            status.innerHTML = `<span class="text-red-600">✗ Invalid JSON: ${error.message}</span>`;
+            document.getElementById("dropdown-import-btn").disabled = true;
+            document.getElementById("dropdown-preview").classList.add("hidden");
+          }
+        };
+
+        window.validateDropdownData = function (data) {
+          const preview = document.getElementById("dropdown-preview");
+          const count = document.getElementById("dropdown-preview-count");
+          const importBtn = document.getElementById("dropdown-import-btn");
+
+          if (!Array.isArray(data)) {
+            showDropdownStatus("error", "Data must be an array of tools");
+            return;
+          }
+
+          if (data.length === 0) {
+            showDropdownStatus("error", "Array cannot be empty");
+            return;
+          }
+
+          if (data.length > 200) {
+            showDropdownStatus(
+              "error",
+              "Cannot import more than 200 tools at once",
+            );
+            return;
+          }
+
+          count.textContent = data.length;
+          preview.classList.remove("hidden");
+          importBtn.disabled = false;
+          showDropdownStatus(
+            "success",
+            `${data.length} tools ready for import`,
+          );
+        };
+
+        window.showDropdownStatus = function (type, message) {
+          const status = document.getElementById("dropdown-status");
+          status.innerHTML = `<div class="text-${type === "error" ? "red" : "green"}-600">${message}</div>`;
+          status.classList.remove("hidden");
+        };
+
+        window.resetDropdownImport = function () {
+          document.getElementById("dropdown-file-input").value = "";
+          document.getElementById("dropdown-json-textarea").value = "";
+          document.getElementById("dropdown-file-info").classList.add("hidden");
+          document.getElementById("dropdown-json-status").textContent = "";
+          document.getElementById("dropdown-preview").classList.add("hidden");
+          document.getElementById("dropdown-status").classList.add("hidden");
+          document.getElementById("dropdown-import-btn").disabled = true;
+        };
+
+        window.submitDropdownImport = async function () {
+          const importBtn = document.getElementById("dropdown-import-btn");
+          const status = document.getElementById("dropdown-status");
+
+          let data;
+          const fileInput = document.getElementById("dropdown-file-input");
+          const textarea = document.getElementById("dropdown-json-textarea");
+
+          if (fileInput.files[0]) {
+            const reader = new FileReader();
+            reader.onload = async function (e) {
+              try {
+                data = JSON.parse(e.target.result);
+                await performDropdownImport(data);
+              } catch (error) {
+                showDropdownStatus(
+                  "error",
+                  `Failed to parse file: ${error.message}`,
+                );
+              }
+            };
+            reader.readAsText(fileInput.files[0]);
+          } else if (textarea.value.trim()) {
+            try {
+              data = JSON.parse(textarea.value);
+              await performDropdownImport(data);
+            } catch (error) {
+              showDropdownStatus("error", `Invalid JSON: ${error.message}`);
+            }
+          }
+        };
+
+        window.performDropdownImport = async function (data) {
+          const importBtn = document.getElementById("dropdown-import-btn");
+          const status = document.getElementById("dropdown-status");
+
+          importBtn.disabled = true;
+          importBtn.textContent = "Importing...";
+
+          try {
+            const response = await fetch("/admin/tools/import", {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify(data),
+            });
+
+            const result = await response.json();
+
+            if (response.ok) {
+              showDropdownStatus(
+                "success",
+                `✅ Successfully imported ${result.imported} tools`,
+              );
+              resetDropdownImport();
+              setTimeout(() => {
+                window.location.reload();
+              }, 2000);
+            } else {
+              showDropdownStatus(
+                "error",
+                `❌ Import failed: ${result.detail || "Unknown error"}`,
+              );
+            }
+          } catch (error) {
+            showDropdownStatus("error", `❌ Network error: ${error.message}`);
+          } finally {
+            importBtn.disabled = false;
+            importBtn.textContent = "Import Tools";
+          }
+        };
+
+        // Close dropdown when clicking outside
+        document.addEventListener("click", function (event) {
+          const dropdown = document.getElementById("bulk-import-dropdown");
+          const button = document.getElementById("bulk-import-dropdown-btn");
+
+          if (
+            dropdown &&
+            !dropdown.contains(event.target) &&
+            !button.contains(event.target)
+          ) {
+            dropdown.classList.add("hidden");
+          }
+        });
       });
     </script>
+
+    <!-- Bulk Import Modal -->
+    <div
+      id="bulk-import-modal-2"
+      class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full hidden z-50"
+    >
+      <div
+        class="relative top-20 mx-auto p-5 border w-11/12 md:w-3/4 lg:w-1/2 shadow-lg rounded-md bg-white dark:bg-gray-800"
+      >
+        <div class="mt-3">
+          <!-- Modal Header -->
+          <div class="flex items-center justify-between mb-4">
+            <h3 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+              Bulk Import Tools
+            </h3>
+            <button
+              onclick="closeBulkImportModal()"
+              class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300"
+            >
+              <svg
+                class="w-6 h-6"
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+              >
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  stroke-width="2"
+                  d="M6 18L18 6M6 6l12 12"
+                ></path>
+              </svg>
+            </button>
+          </div>
+
+          <!-- Modal Content -->
+          <div class="space-y-4">
+            <!-- Instructions -->
+            <div
+              class="bg-blue-50 dark:bg-blue-900 border border-blue-200 dark:border-blue-800 rounded-md p-3"
+            >
+              <div class="flex">
+                <div class="flex-shrink-0">
+                  <svg
+                    class="h-5 w-5 text-blue-400"
+                    fill="currentColor"
+                    viewBox="0 0 20 20"
+                  >
+                    <path
+                      fill-rule="evenodd"
+                      d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"
+                      clip-rule="evenodd"
+                    ></path>
+                  </svg>
+                </div>
+                <div class="ml-3">
+                  <h3
+                    class="text-sm font-medium text-blue-800 dark:text-blue-200"
+                  >
+                    Import Instructions
+                  </h3>
+                  <div class="mt-2 text-sm text-blue-700 dark:text-blue-300">
+                    <div class="mb-3">
+                      <button
+                        onclick="toggleValidationGuide()"
+                        class="inline-flex items-center text-xs text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-200"
+                      >
+                        <svg
+                          class="w-3 h-3 mr-1"
+                          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"
+                          ></path>
+                        </svg>
+                        <span id="validation-guide-toggle"
+                          >Show Validation Rules</span
+                        >
+                      </button>
+                    </div>
+
+                    <div
+                      id="validation-guide"
+                      class="hidden bg-blue-50 dark:bg-blue-900 border border-blue-200 dark:border-blue-700 rounded-md p-3 mb-3 text-xs"
+                    >
+                      <h5
+                        class="font-semibold mb-2 text-blue-800 dark:text-blue-200"
+                      >
+                        📋 JSON Validation Rules
+                      </h5>
+                      <div class="space-y-2">
+                        <div>
+                          <strong class="text-green-700 dark:text-green-300"
+                            >✅ Required:</strong
+                          >
+                          <code
+                            class="bg-blue-100 dark:bg-blue-800 px-1 rounded"
+                            >name</code
+                          >
+                          - must start with letter, only
+                          letters/numbers/dots/underscores/hyphens
+                        </div>
+                        <div>
+                          <strong class="text-blue-700 dark:text-blue-300"
+                            >🔹 Optional:</strong
+                          >
+                          <code
+                            class="bg-blue-100 dark:bg-blue-800 px-1 rounded"
+                            >url</code
+                          >
+                          (http/https/ws/wss only),
+                          <code
+                            class="bg-blue-100 dark:bg-blue-800 px-1 rounded"
+                            >description</code
+                          >,
+                          <code
+                            class="bg-blue-100 dark:bg-blue-800 px-1 rounded"
+                            >tags</code
+                          >
+                          (array only)
+                        </div>
+                        <div>
+                          <strong class="text-orange-700 dark:text-orange-300"
+                            >⚠️ Case Sensitive:</strong
+                          >
+                          <code
+                            class="bg-blue-100 dark:bg-blue-800 px-1 rounded"
+                            >requestType</code
+                          >
+                          ("GET", "POST"),
+                          <code
+                            class="bg-blue-100 dark:bg-blue-800 px-1 rounded"
+                            >integrationType</code
+                          >
+                          ("REST", "MCP")
+                        </div>
+                        <div>
+                          <strong class="text-red-700 dark:text-red-300"
+                            >❌ Not Allowed:</strong
+                          >
+                          Names starting with numbers, FTP URLs, tag strings
+                          "tag1,tag2" (use ["tag1","tag2"])
+                        </div>
+                        <div
+                          class="pt-1 border-t border-blue-200 dark:border-blue-700"
+                        >
+                          <strong class="text-purple-700 dark:text-purple-300"
+                            >🔧 Auto-Fixed:</strong
+                          >
+                          Spaces in names, tag strings → arrays, case
+                          normalization
+                        </div>
+                      </div>
+                    </div>
+
+                    <ul class="list-disc pl-5 space-y-1"></ul>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!-- Input Method Selection -->
+            <div class="space-y-3">
+              <h4 class="text-sm font-medium text-gray-900 dark:text-gray-100">
+                Choose Import Method:
+              </h4>
+
+              <!-- Radio buttons for input method -->
+              <div class="flex space-x-6">
+                <label class="flex items-center">
+                  <input
+                    type="radio"
+                    name="import-method"
+                    value="file"
+                    checked
+                    onchange="toggleImportMethod(this.value)"
+                    class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300"
+                  />
+                  <span class="ml-2 text-sm text-gray-700 dark:text-gray-300"
+                    >Upload JSON File</span
+                  >
+                </label>
+                <label class="flex items-center">
+                  <input
+                    type="radio"
+                    name="import-method"
+                    value="paste"
+                    onchange="toggleImportMethod(this.value)"
+                    class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300"
+                  />
+                  <span class="ml-2 text-sm text-gray-700 dark:text-gray-300"
+                    >Paste JSON Data</span
+                  >
+                </label>
+              </div>
+            </div>
+
+            <!-- File Upload Section -->
+            <div id="file-upload-section" class="space-y-3">
+              <label
+                class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
+                Select JSON File
+              </label>
+              <div
+                class="mt-1 flex justify-center px-6 pt-5 pb-6 border-2 border-gray-300 border-dashed rounded-md dark:border-gray-600"
+              >
+                <div class="space-y-1 text-center">
+                  <svg
+                    class="mx-auto h-12 w-12 text-gray-400"
+                    stroke="currentColor"
+                    fill="none"
+                    viewBox="0 0 48 48"
+                  >
+                    <path
+                      d="M28 8H12a4 4 0 00-4 4v20m32-12v8m0 0v8a4 4 0 01-4 4H12a4 4 0 01-4-4v-4m32-4l-3.172-3.172a4 4 0 00-5.656 0L28 28M8 32l9.172-9.172a4 4 0 015.656 0L28 28m0 0l4 4m4-24h8m-4-4v8m-12 4h.02"
+                      stroke-width="2"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                    />
+                  </svg>
+                  <div class="flex text-sm text-gray-600 dark:text-gray-400">
+                    <label
+                      for="bulk-import-file"
+                      class="relative cursor-pointer bg-white dark:bg-gray-800 rounded-md font-medium text-indigo-600 hover:text-indigo-500 focus-within:outline-none focus-within:ring-2 focus-within:ring-offset-2 focus-within:ring-indigo-500"
+                    >
+                      <span>Upload a file</span>
+                      <input
+                        id="bulk-import-file"
+                        name="bulk-import-file"
+                        type="file"
+                        accept=".json"
+                        onchange="handleFileSelect(this)"
+                        class="sr-only"
+                      />
+                    </label>
+                    <p class="pl-1">or drag and drop</p>
+                  </div>
+                  <p class="text-xs text-gray-500 dark:text-gray-400">
+                    JSON files only
+                  </p>
+                </div>
+              </div>
+              <!-- File info display -->
+              <div id="file-info" class="hidden mt-2">
+                <div
+                  class="flex items-center space-x-2 text-sm text-gray-600 dark:text-gray-400"
+                >
+                  <svg class="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
+                    <path
+                      fill-rule="evenodd"
+                      d="M3 17a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm3.293-7.707a1 1 0 011.414 0L9 10.586V3a1 1 0 112 0v7.586l1.293-1.293a1 1 0 111.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z"
+                      clip-rule="evenodd"
+                    ></path>
+                  </svg>
+                  <span id="file-name"></span>
+                  <span id="file-size" class="text-xs text-gray-500"></span>
+                </div>
+              </div>
+            </div>
+
+            <!-- JSON Paste Section -->
+            <div id="json-paste-section" class="space-y-3 hidden">
+              <label
+                for="bulk-import-json"
+                class="block text-sm font-medium text-gray-700 dark:text-gray-300"
+              >
+                Paste JSON Data
+              </label>
+              <textarea
+                id="bulk-import-json"
+                name="bulk-import-json"
+                rows="12"
+                placeholder="[&#10;  {&#10;    &quot;name&quot;: &quot;Books Search&quot;,&#10;    &quot;url&quot;: &quot;https://www.googleapis.com/books/v1/volumes&quot;,&#10;    &quot;description&quot;: &quot;Search Google Books&quot;,&#10;    &quot;integrationType&quot;: &quot;REST&quot;,&#10;    &quot;requestType&quot;: &quot;GET&quot;,&#10;    &quot;tags&quot;: [&quot;api&quot;, &quot;google&quot;, &quot;books&quot;]&#10;  },&#10;  {&#10;    &quot;name&quot;: &quot;JSON Placeholder Posts&quot;,&#10;    &quot;url&quot;: &quot;https://jsonplaceholder.typicode.com/posts&quot;,&#10;    &quot;integrationType&quot;: &quot;REST&quot;,&#10;    &quot;requestType&quot;: &quot;GET&quot;,&#10;    &quot;headers&quot;: {&quot;Accept&quot;: &quot;application/json&quot;}&#10;  }&#10;]"
+                class="shadow-sm focus:ring-indigo-500 focus:border-indigo-500 mt-1 block w-full sm:text-sm border border-gray-300 rounded-md dark:bg-gray-700 dark:border-gray-600 dark:text-gray-300"
+              ></textarea>
+              <div class="flex justify-between items-center">
+                <button
+                  type="button"
+                  onclick="validateJsonInput()"
+                  class="inline-flex items-center px-3 py-1 border border-transparent text-sm leading-4 font-medium rounded-md text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:bg-indigo-800 dark:text-indigo-200"
+                >
+                  <svg
+                    class="w-4 h-4 mr-1"
+                    fill="none"
+                    stroke="currentColor"
+                    viewBox="0 0 24 24"
+                  >
+                    <path
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      stroke-width="2"
+                      d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+                    ></path>
+                  </svg>
+                  Validate JSON
+                </button>
+                <span id="json-validation-status" class="text-sm"></span>
+              </div>
+            </div>
+
+            <!-- Preview Section -->
+            <div id="import-preview" class="hidden space-y-3">
+              <h4 class="text-sm font-medium text-gray-900 dark:text-gray-100">
+                Import Preview
+              </h4>
+              <div class="bg-gray-50 dark:bg-gray-700 rounded-md p-3">
+                <div class="flex items-center justify-between">
+                  <span class="text-sm text-gray-700 dark:text-gray-300">
+                    <span id="preview-count">0</span> tools ready for import
+                  </span>
+                  <button
+                    type="button"
+                    onclick="togglePreviewDetails()"
+                    class="text-sm text-indigo-600 hover:text-indigo-500 dark:text-indigo-400"
+                  >
+                    <span id="preview-toggle-text">Show Details</span>
+                  </button>
+                </div>
+                <div
+                  id="preview-details"
+                  class="hidden mt-3 max-h-40 overflow-y-auto"
+                >
+                  <ul
+                    id="preview-list"
+                    class="text-xs text-gray-600 dark:text-gray-400 space-y-1"
+                  >
+                    <!-- Preview items will be populated here -->
+                  </ul>
+                </div>
+              </div>
+            </div>
+
+            <!-- Status Messages -->
+            <div id="import-status" class="hidden">
+              <!-- Success/Error messages will be displayed here -->
+            </div>
+
+            <!-- Loading Indicator -->
+            <div
+              id="import-loading"
+              class="hidden flex items-center justify-center py-4"
+            >
+              <div
+                class="animate-spin rounded-full h-8 w-8 border-b-2 border-indigo-600"
+              ></div>
+              <span class="ml-2 text-sm text-gray-600 dark:text-gray-400"
+                >Processing import...</span
+              >
+            </div>
+
+            <!-- Modal Actions -->
+            <div
+              class="flex items-center justify-end space-x-3 pt-4 border-t border-gray-200 dark:border-gray-600"
+            >
+              <button
+                type="button"
+                onclick="closeBulkImportModal()"
+                class="inline-flex items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:bg-gray-700 dark:text-gray-300 dark:border-gray-600 dark:hover:bg-gray-600"
+              >
+                Cancel
+              </button>
+              <button
+                type="button"
+                id="import-submit-btn"
+                onclick="submitBulkImport()"
+                disabled
+                class="inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 disabled:opacity-50 disabled:cursor-not-allowed"
+              >
+                <svg
+                  class="w-4 h-4 mr-2"
+                  fill="none"
+                  stroke="currentColor"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M15 13l-3-3m0 0l-3 3m3-3v12"
+                  ></path>
+                </svg>
+                Import Tools
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
   </body>
 </html>