diff --git a/fern/apis/fai/openapi.json b/fern/apis/fai/openapi.json
index 8ccc57f89..7375be066 100644
--- a/fern/apis/fai/openapi.json
+++ b/fern/apis/fai/openapi.json
@@ -8,8 +8,9 @@
   "paths": {
     "/analytics/histogram/{domain}": {
       "get": {
+        "tags": ["Analytics"],
         "summary": "Get Analytics Histogram",
-        "operationId": "get_analytics_histogram_analytics_histogram__domain__get",
+        "operationId": "get_analytics_histogram",
         "parameters": [
           {
             "name": "domain",
@@ -102,8 +103,9 @@
     },
     "/analytics/insights/{domain}": {
       "get": {
+        "tags": ["Analytics"],
         "summary": "Get Analytics Insights",
-        "operationId": "get_analytics_insights_analytics_insights__domain__get",
+        "operationId": "get_analytics_insights",
         "parameters": [
           {
             "name": "domain",
@@ -185,9 +187,10 @@
     },
     "/analytics/insights/generate_all": {
       "post": {
+        "tags": ["Analytics"],
         "summary": "Generate All Insights",
         "description": "Generate insights for all domains with queries in the specified period.",
-        "operationId": "generate_all_insights_analytics_insights_generate_all_post",
+        "operationId": "generate_all_insights",
         "parameters": [
           {
             "name": "start_date",
@@ -253,9 +256,10 @@
     },
     "/analytics/insights/trigger_scheduled": {
       "post": {
+        "tags": ["Analytics"],
         "summary": "Trigger Scheduled Insights Generation",
         "description": "Manually trigger the scheduled weekly insights generation job.",
-        "operationId": "trigger_scheduled_insights_generation_analytics_insights_trigger_scheduled_post",
+        "operationId": "trigger_scheduled_insights_generation",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -271,9 +275,10 @@
     },
     "/analytics/scheduler/status": {
       "get": {
+        "tags": ["Analytics"],
         "summary": "Get Scheduler Status",
         "description": "Get the status of the scheduler and its jobs.",
-        "operationId": "get_scheduler_status_analytics_scheduler_status_get",
+        "operationId": "get_scheduler_status",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -289,8 +294,9 @@
     },
     "/chat/{domain}": {
       "post": {
+        "tags": ["Chat"],
         "summary": "Post Chat Completion",
-        "operationId": "post_chat_completion_chat__domain__post",
+        "operationId": "post_chat_completion",
         "parameters": [
           {
             "name": "domain",
@@ -344,8 +350,9 @@
     },
     "/conversation/{domain}/{conversation_id}": {
       "get": {
+        "tags": ["Conversation"],
         "summary": "Get Conversation By Id",
-        "operationId": "get_conversation_by_id_conversation__domain___conversation_id__get",
+        "operationId": "get_conversation_by_id",
         "parameters": [
           {
             "name": "domain",
@@ -398,8 +405,9 @@
     },
     "/discord/install": {
       "post": {
+        "tags": ["Discord"],
         "summary": "Create Discord Integration",
-        "operationId": "create_discord_integration_discord_install_post",
+        "operationId": "create_discord_integration",
         "parameters": [
           {
             "name": "domain",
@@ -443,8 +451,9 @@
     },
     "/discord/install/callback": {
       "get": {
+        "tags": ["Discord"],
         "summary": "Handle Discord Install Callback",
-        "operationId": "handle_discord_install_callback_discord_install_callback_get",
+        "operationId": "handle_discord_install_callback",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -460,8 +469,9 @@
     },
     "/document/{domain}/create": {
       "post": {
+        "tags": ["Document"],
         "summary": "Create Document",
-        "operationId": "create_document_document__domain__create_post",
+        "operationId": "create_document",
         "parameters": [
           {
             "name": "domain",
@@ -519,8 +529,9 @@
     },
     "/document/{domain}/batch-create": {
       "post": {
+        "tags": ["Document"],
         "summary": "Batch Create Document",
-        "operationId": "batch_create_document_document__domain__batch_create_post",
+        "operationId": "batch_create_document",
         "parameters": [
           {
             "name": "domain",
@@ -582,8 +593,9 @@
     },
     "/document/{domain}/{document_id}": {
       "patch": {
+        "tags": ["Document"],
         "summary": "Update Document",
-        "operationId": "update_document_document__domain___document_id__patch",
+        "operationId": "update_document",
         "parameters": [
           {
             "name": "domain",
@@ -644,8 +656,9 @@
         ]
       },
       "get": {
+        "tags": ["Document"],
         "summary": "Get Document By Id",
-        "operationId": "get_document_by_id_document__domain___document_id__get",
+        "operationId": "get_document_by_id",
         "parameters": [
           {
             "name": "domain",
@@ -698,8 +711,9 @@
     },
     "/document/{domain}/delete": {
       "delete": {
+        "tags": ["Document"],
         "summary": "Delete Document By Id",
-        "operationId": "delete_document_by_id_document__domain__delete_delete",
+        "operationId": "delete_document_by_id",
         "parameters": [
           {
             "name": "domain",
@@ -753,8 +767,9 @@
     },
     "/document/{domain}/batch-delete": {
       "delete": {
+        "tags": ["Document"],
         "summary": "Batch Delete Document",
-        "operationId": "batch_delete_document_document__domain__batch_delete_delete",
+        "operationId": "batch_delete_document",
         "parameters": [
           {
             "name": "domain",
@@ -812,8 +827,9 @@
     },
     "/document/{domain}": {
       "get": {
+        "tags": ["Document"],
         "summary": "Get Documents",
-        "operationId": "get_documents_document__domain__get",
+        "operationId": "get_documents",
         "parameters": [
           {
             "name": "domain",
@@ -893,8 +909,9 @@
     },
     "/document/{domain}/delete-all": {
       "delete": {
+        "tags": ["Document"],
         "summary": "Delete All Documents",
-        "operationId": "delete_all_documents_document__domain__delete_all_delete",
+        "operationId": "delete_all_documents",
         "parameters": [
           {
             "name": "domain",
@@ -938,8 +955,9 @@
     },
     "/feedback/{domain}": {
       "post": {
+        "tags": ["Feedback"],
         "summary": "Create Feedback",
-        "operationId": "create_feedback_feedback__domain__post",
+        "operationId": "create_feedback",
         "parameters": [
           {
             "name": "domain",
@@ -988,8 +1006,9 @@
     },
     "/feedback/{domain}/{conversation_id}": {
       "get": {
+        "tags": ["Feedback"],
         "summary": "Get Feedback By Id",
-        "operationId": "get_feedback_by_id_feedback__domain___conversation_id__get",
+        "operationId": "get_feedback_by_id",
         "parameters": [
           {
             "name": "domain",
@@ -1042,8 +1061,9 @@
     },
     "/guidance/{domain}/create": {
       "post": {
+        "tags": ["Guidance"],
         "summary": "Create Guidance",
-        "operationId": "create_guidance_guidance__domain__create_post",
+        "operationId": "create_guidance",
         "parameters": [
           {
             "name": "domain",
@@ -1097,8 +1117,9 @@
     },
     "/guidance/{domain}/{guidance_id}": {
       "patch": {
+        "tags": ["Guidance"],
         "summary": "Update",
-        "operationId": "update_guidance__domain___guidance_id__patch",
+        "operationId": "update",
         "parameters": [
           {
             "name": "domain",
@@ -1159,8 +1180,9 @@
         ]
       },
       "delete": {
+        "tags": ["Guidance"],
         "summary": "Delete Guidance By Id",
-        "operationId": "delete_guidance_by_id_guidance__domain___guidance_id__delete",
+        "operationId": "delete_guidance_by_id",
         "parameters": [
           {
             "name": "domain",
@@ -1211,8 +1233,9 @@
         ]
       },
       "get": {
+        "tags": ["Guidance"],
         "summary": "Get Guidance By Id",
-        "operationId": "get_guidance_by_id_guidance__domain___guidance_id__get",
+        "operationId": "get_guidance_by_id",
         "parameters": [
           {
             "name": "domain",
@@ -1265,8 +1288,9 @@
     },
     "/guidance/{domain}": {
       "get": {
+        "tags": ["Guidance"],
         "summary": "Get Guidances",
-        "operationId": "get_guidances_guidance__domain__get",
+        "operationId": "get_guidances",
         "parameters": [
           {
             "name": "domain",
@@ -1346,9 +1370,10 @@
     },
     "/health": {
       "get": {
+        "tags": ["Health"],
         "summary": "Health Check",
         "description": "Health check endpoint that returns the application status.",
-        "operationId": "health_check_health_get",
+        "operationId": "health_check",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -1364,8 +1389,9 @@
     },
     "/index/{domain}/reconstruct": {
       "post": {
+        "tags": ["Index"],
         "summary": "Reconstruct Query Index",
-        "operationId": "reconstruct_query_index_index__domain__reconstruct_post",
+        "operationId": "reconstruct_query_index",
         "parameters": [
           {
             "name": "domain",
@@ -1409,8 +1435,9 @@
     },
     "/index/{domain}/sync": {
       "post": {
+        "tags": ["Index"],
         "summary": "Sync Index To Query Index",
-        "operationId": "sync_index_to_query_index_index__domain__sync_post",
+        "operationId": "sync_index_to_query_index",
         "parameters": [
           {
             "name": "domain",
@@ -1464,8 +1491,9 @@
     },
     "/jobs/{job_id}/status": {
       "get": {
+        "tags": ["Index"],
         "summary": "Get Job Status",
-        "operationId": "get_job_status_jobs__job_id__status_get",
+        "operationId": "get_job_status",
         "parameters": [
           {
             "name": "job_id",
@@ -1504,8 +1532,9 @@
     },
     "/mcp/semantic/{domain}": {
       "post": {
+        "tags": ["Mcp"],
         "summary": "Get Mcp Semantic Query",
-        "operationId": "get_mcp_semantic_query_mcp_semantic__domain__post",
+        "operationId": "get_mcp_semantic_query",
         "parameters": [
           {
             "name": "domain",
@@ -1559,8 +1588,9 @@
     },
     "/mcp/bmf/{domain}": {
       "post": {
+        "tags": ["Mcp"],
         "summary": "Get Mcp Bmf Query",
-        "operationId": "get_mcp_bmf_query_mcp_bmf__domain__post",
+        "operationId": "get_mcp_bmf_query",
         "parameters": [
           {
             "name": "domain",
@@ -1614,8 +1644,9 @@
     },
     "/queries": {
       "post": {
+        "tags": ["Query"],
         "summary": "Create Query",
-        "operationId": "create_query_queries_post",
+        "operationId": "create_query",
         "parameters": [
           {
             "name": "domain",
@@ -1669,8 +1700,9 @@
     },
     "/queries/{domain}": {
       "get": {
+        "tags": ["Query"],
         "summary": "Get Recent Queries",
-        "operationId": "get_recent_queries_queries__domain__get",
+        "operationId": "get_recent_queries",
         "parameters": [
           {
             "name": "domain",
@@ -1825,9 +1857,10 @@
     },
     "/settings/ask-ai": {
       "get": {
+        "tags": ["Settings"],
         "summary": "Get Settings",
         "description": "Get settings for a domain and organization.",
-        "operationId": "get_settings_settings_ask_ai_get",
+        "operationId": "get_settings",
         "parameters": [
           {
             "name": "domain",
@@ -1866,9 +1899,10 @@
     },
     "/settings/ask-ai/docs": {
       "get": {
+        "tags": ["Settings"],
         "summary": "Get Docs Settings",
         "description": "Get settings for a domain and organization.",
-        "operationId": "get_docs_settings_settings_ask_ai_docs_get",
+        "operationId": "get_docs_settings",
         "parameters": [
           {
             "name": "domain",
@@ -1907,9 +1941,10 @@
     },
     "/settings/ask-ai/toggle": {
       "post": {
+        "tags": ["Settings"],
         "summary": "Toggle Ask Ai",
         "description": "Toggle Ask AI setting and return job_id for tracking.",
-        "operationId": "toggle_ask_ai_settings_ask_ai_toggle_post",
+        "operationId": "toggle_ask_ai",
         "parameters": [
           {
             "name": "domain",
@@ -1972,9 +2007,10 @@
     },
     "/settings/ask-ai/reindex": {
       "post": {
+        "tags": ["Settings"],
         "summary": "Reindex Ask Ai",
         "description": "Manually trigger reindex for an already enabled Ask AI setup.",
-        "operationId": "reindex_ask_ai_settings_ask_ai_reindex_post",
+        "operationId": "reindex_ask_ai",
         "parameters": [
           {
             "name": "domain",
@@ -2027,9 +2063,10 @@
     },
     "/settings/ask-ai/toggle/status": {
       "get": {
+        "tags": ["Settings"],
         "summary": "Get Toggle Status",
         "description": "Get the status of Ask AI toggle operation.",
-        "operationId": "get_toggle_status_settings_ask_ai_toggle_status_get",
+        "operationId": "get_toggle_status",
         "parameters": [
           {
             "name": "domain",
@@ -2073,9 +2110,10 @@
     },
     "/settings/reindex-preview-callback": {
       "post": {
+        "tags": ["Settings"],
         "summary": "Reindex Preview Callback",
         "description": "Handle callback from Upstash QStash when preview reindex completes.",
-        "operationId": "reindex_preview_callback_settings_reindex_preview_callback_post",
+        "operationId": "reindex_preview_callback",
         "requestBody": {
           "content": {
             "application/json": {
@@ -2111,8 +2149,9 @@
     },
     "/slack/integrations": {
       "post": {
+        "tags": ["Slack"],
         "summary": "Create Slack Integration",
-        "operationId": "create_slack_integration_slack_integrations_post",
+        "operationId": "create_slack_integration",
         "requestBody": {
           "content": {
             "application/json": {
@@ -2150,8 +2189,9 @@
     },
     "/slack/events": {
       "post": {
+        "tags": ["Slack"],
         "summary": "Handle Slack Events",
-        "operationId": "handle_slack_events_slack_events_post",
+        "operationId": "handle_slack_events",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -2167,8 +2207,9 @@
     },
     "/slack/slash-commands": {
       "post": {
+        "tags": ["Slack"],
         "summary": "Handle Slack Slash Commands",
-        "operationId": "handle_slack_slash_commands_slack_slash_commands_post",
+        "operationId": "handle_slack_slash_commands",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -2184,8 +2225,9 @@
     },
     "/slack/interactions": {
       "post": {
+        "tags": ["Slack"],
         "summary": "Handle Slack Interactions",
-        "operationId": "handle_slack_interactions_slack_interactions_post",
+        "operationId": "handle_slack_interactions",
         "responses": {
           "200": {
             "description": "Successful Response",
@@ -2201,8 +2243,9 @@
     },
     "/slack/oauth/callback": {
       "get": {
+        "tags": ["Slack"],
         "summary": "Handle Slack Oauth Callback",
-        "operationId": "handle_slack_oauth_callback_slack_oauth_callback_get",
+        "operationId": "handle_slack_oauth_callback",
         "parameters": [
           {
             "name": "code",
@@ -2255,8 +2298,9 @@
     },
     "/slack/get-install": {
       "get": {
+        "tags": ["Slack"],
         "summary": "Get Slack Install Link",
-        "operationId": "get_slack_install_link_slack_get_install_get",
+        "operationId": "get_slack_install_link",
         "parameters": [
           {
             "name": "domain",
@@ -2298,8 +2342,9 @@
     },
     "/slack/integrations/{domain}": {
       "get": {
+        "tags": ["Slack"],
         "summary": "List Slack Integrations",
-        "operationId": "list_slack_integrations_slack_integrations__domain__get",
+        "operationId": "list_slack_integrations",
         "parameters": [
           {
             "name": "domain",
@@ -2336,8 +2381,9 @@
     },
     "/slack/get-install/{integration_id}": {
       "get": {
+        "tags": ["Slack"],
         "summary": "Get Slack Install Link By Id",
-        "operationId": "get_slack_install_link_by_id_slack_get_install__integration_id__get",
+        "operationId": "get_slack_install_link_by_id",
         "parameters": [
           {
             "name": "integration_id",