Merge remote-tracking branch 'origin/staging' into feat/otter-ai-integration

# Conflicts:
#	apps/sim/lib/sim-search/live/application.test.ts

Author: waleedlatif1

apps/docs/components/docs-layout/docs-sidebar.tsx

@@ -103,7 +103,7 @@ export function DocsSidebar() {
             ['Docs', '/introduction'],
             ['API Reference', '/api-reference/getting-started'],
             ['CLI', '/cli'],
-            ['MCP', '/mcp'],
+            ['MCP', '/mcp/overview'],
             ['Academy', '/academy'],
           ].map(([label, href]) => (
             <ChipLink key={href} href={href} onNavigate={() => setOpen(false)}>

apps/docs/components/navbar/navbar.tsx

@@ -46,7 +46,7 @@ const NAV_TABS = [
   },
   {
     label: 'MCP',
-    href: '/mcp',
+    href: '/mcp/overview',
     match: (p: string) => isInSection(p, 'mcp'),
     external: false,
   },

apps/docs/content/docs/agents/mcp.mdx

@@ -9,6 +9,11 @@ import { Callout } from 'fumadocs-ui/components/callout'
 
 The Model Context Protocol ([MCP](https://modelcontextprotocol.com/)) is an open standard for connecting AI to external tools and data. Add an MCP server to your workspace and its tools become available to your agents — a way to integrate services Sim doesn't have a built-in integration for.
 
+<Callout type="info">
+  To use your Sim workspace from Claude, Codex, or Cursor, connect the
+  [Sim MCP server](/mcp/overview).
+</Callout>
+
 ## Adding an MCP Server as a Tool
 
 MCP servers provide collections of tools that your agents can use.

apps/docs/content/docs/mcp/meta.json

@@ -1,5 +1,5 @@
 {
   "title": "MCP",
   "root": true,
-  "pages": ["---Sim MCP---", "index", "authentication", "tools"]
+  "pages": ["---Sim MCP---", "overview", "authentication", "tools"]
 }

apps/docs/content/docs/mcp/index.mdx apps/docs/content/docs/mcp/overview.mdxapps/docs/content/docs/mcp/index.mdx renamed to apps/docs/content/docs/mcp/overview.mdx

@@ -34,7 +34,7 @@ import { Callout } from 'fumadocs-ui/components/callout'
 | `TRUSTED_ORIGINS` | Comma-separated additional origins to trust for auth (apex + `www`, alias domains) |
 | `AUTH_TRUSTED_PROXIES` | Comma-separated reverse-proxy IPs/CIDRs so the client IP cannot be forged through `X-Forwarded-For` |
 | `INTERNAL_API_BASE_URL` | Internal URL for server-side self-calls, e.g. `http://sim-app.simstudio.svc.cluster.local:3000`. Optional — falls back to the public base URL. Deliberately ignored inside the Trigger.dev worker runtime, where a cluster-internal address resolves to the worker itself |
-| `SIM_MCP_URL` | Public URL of the [Sim MCP server](/mcp) when you serve it on its own host, e.g. `https://mcp.example.com/mcp`. Point that host at the app; Sim serves only the MCP endpoint and its OAuth metadata there, and stops serving `/api/mcp` on the app host so clients use one URL. Optional — defaults to `<NEXT_PUBLIC_APP_URL>/api/mcp` |
+| `SIM_MCP_URL` | Public URL of the [Sim MCP server](/mcp/overview) when you serve it on its own host, e.g. `https://mcp.example.com/mcp`. Point that host at the app; Sim serves only the MCP endpoint and its OAuth metadata there, and stops serving `/api/mcp` on the app host so clients use one URL. Optional — defaults to `<NEXT_PUBLIC_APP_URL>/api/mcp` |
 | `DATABASE_REPLICA_URL` | Read-replica connection string for log listing, audit logs, and dashboard aggregations. Falls back to the primary when unset |
 
 ## AI Providers

apps/docs/content/docs/platform/self-hosting/environment-variables.mdx

@@ -76,9 +76,9 @@ export const DOCS_REDIRECTS: DocsRedirect[] = [
     destination: '/workflows/deployment/mcp',
     permanent: true,
   },
-  // building-agents section renamed to agents; mcp and skills folded into it
   { source: '/building-agents', destination: '/agents', permanent: true },
   { source: '/building-agents/:path*', destination: '/agents/:path*', permanent: true },
+  // Browsers may retain this permanent redirect; the workspace guide uses /mcp/overview.
   { source: '/mcp', destination: '/agents/mcp', permanent: true },
   { source: '/skills', destination: '/agents/skills', permanent: true },
   // tools/ + triggers/<service> unified into per-service integrations/ pages.