Merge remote-tracking branch 'origin/staging' into feat/ban-blocks-account

# Conflicts:
#	apps/sim/hooks/use-inline-rename.ts

Author: TheodoreSpeaks

.agents/skills/add-block/SKILL.md

@@ -41,7 +41,7 @@ export const {ServiceName}Block: BlockConfig = {
   name: '{Service Name}',               // Human readable
   description: 'Brief description',     // One sentence
   longDescription: 'Detailed description for docs',
-  docsLink: 'https://docs.sim.ai/tools/{service}',
+  docsLink: 'https://docs.sim.ai/integrations/{service}',
   category: 'tools',                    // 'tools' | 'blocks' | 'triggers'
   integrationType: IntegrationType.X,   // Primary category (see IntegrationType enum)
   tags: ['oauth', 'api'],              // Cross-cutting tags (see IntegrationTag type)
@@ -732,7 +732,7 @@ export const ServiceBlock: BlockConfig = {
   name: 'Service',
   description: 'Integrate with Service API',
   longDescription: 'Full description for documentation...',
-  docsLink: 'https://docs.sim.ai/tools/service',
+  docsLink: 'https://docs.sim.ai/integrations/service',
   category: 'tools',
   integrationType: IntegrationType.DeveloperTools,
   tags: ['oauth', 'api'],

.agents/skills/add-integration/SKILL.md

@@ -137,7 +137,7 @@ export const {Service}Block: BlockConfig = {
   name: '{Service}',
   description: '...',
   longDescription: '...',
-  docsLink: 'https://docs.sim.ai/tools/{service}',
+  docsLink: 'https://docs.sim.ai/integrations/{service}',
   category: 'tools',
   bgColor: '#HEXCOLOR',
   icon: {Service}Icon,
@@ -425,7 +425,7 @@ Run the documentation generator:
 bun run scripts/generate-docs.ts
 ```
 
-This creates `apps/docs/content/docs/en/tools/{service}.mdx`
+This creates `apps/docs/content/docs/en/integrations/{service}.mdx` — one page per service carrying the block's Actions and, if it has one, its Triggers section. Never hand-edit generated pages; the only editable region is the `{/* MANUAL-CONTENT */}` block (see `scripts/README.md`).
 
 ## V2 Integration Pattern
 

.agents/skills/validate-integration/SKILL.md

@@ -200,7 +200,7 @@ For **each tool** in `tools.access`:
 - [ ] `name` is human-readable (e.g., `'X'`, `'Cloudflare'`)
 - [ ] `description` is a concise one-liner
 - [ ] `longDescription` provides detail for docs
-- [ ] `docsLink` points to `'https://docs.sim.ai/tools/{service}'`
+- [ ] `docsLink` points to `'https://docs.sim.ai/integrations/{service}'`
 - [ ] `category` is `'tools'`
 - [ ] `bgColor` uses the service's brand color hex
 - [ ] `icon` references the correct icon component from `@/components/icons`

.github/workflows/ci.yml

@@ -46,10 +46,33 @@ jobs:
             echo "ℹ️ Not a release commit"
           fi
 
+  # Run database migrations before images are pushed: the ECR push triggers
+  # CodePipeline, so migrating first guarantees the schema is in place before
+  # the new app version deploys (replaces the removed ECS migration sidecar)
+  migrate:
+    name: Migrate DB
+    needs: [test-build]
+    if: >-
+      github.event_name == 'push' &&
+      (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
+    uses: ./.github/workflows/migrations.yml
+    with:
+      environment: ${{ github.ref == 'refs/heads/main' && 'production' || 'staging' }}
+    secrets: inherit
+
+  # Same ordering for dev (schema push before the dev image lands in ECR)
+  migrate-dev:
+    name: Migrate Dev DB
+    if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
+    uses: ./.github/workflows/migrations.yml
+    with:
+      environment: dev
+    secrets: inherit
+
   # Dev: build all 3 images for ECR only (no GHCR, no ARM64)
   build-dev:
     name: Build Dev ECR
-    needs: [detect-version]
+    needs: [detect-version, migrate-dev]
     if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
     runs-on: blacksmith-8vcpu-ubuntu-2404
     permissions:
@@ -108,7 +131,7 @@ jobs:
   # Main/staging: build AMD64 images and push to ECR + GHCR
   build-amd64:
     name: Build AMD64
-    needs: [test-build, detect-version]
+    needs: [test-build, detect-version, migrate]
     if: >-
       github.event_name == 'push' &&
       (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging')
@@ -318,14 +341,6 @@ jobs:
             docker manifest push "${IMAGE_BASE}:${VERSION}"
           fi
 
-  # Run database migrations for dev
-  migrate-dev:
-    name: Migrate Dev DB
-    needs: [build-dev]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
-    uses: ./.github/workflows/migrations.yml
-    secrets: inherit
-
   # Check if docs changed
   check-docs-changes:
     name: Check Docs Changes

.github/workflows/migrations.yml

@@ -2,7 +2,21 @@ name: Database Migrations
 
 on:
   workflow_call:
+    inputs:
+      environment:
+        description: Target environment (production, staging, or dev)
+        required: true
+        type: string
   workflow_dispatch:
+    inputs:
+      environment:
+        description: Target environment
+        required: true
+        type: choice
+        options:
+          - production
+          - staging
+          - dev
 
 permissions:
   contents: read
@@ -35,15 +49,28 @@ jobs:
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
+      # The expression maps the explicit environment input to exactly one repo
+      # secret, so the job never holds another environment's database URL. An
+      # unknown environment resolves to empty and the guard below fails the job.
+      # MIGRATION_DATABASE_URL is the optional direct (non-pooled) DSN preferred
+      # by migrate.ts; when the secret is unset it resolves to empty and the
+      # script falls back to DATABASE_URL.
       - name: Apply database schema changes
         working-directory: ./packages/db
         env:
-          DATABASE_URL: ${{ github.ref == 'refs/heads/main' && secrets.DATABASE_URL || github.ref == 'refs/heads/dev' && secrets.DEV_DATABASE_URL || secrets.STAGING_DATABASE_URL }}
+          DATABASE_URL: ${{ inputs.environment == 'production' && secrets.DATABASE_URL || inputs.environment == 'staging' && secrets.STAGING_DATABASE_URL || inputs.environment == 'dev' && secrets.DEV_DATABASE_URL || '' }}
+          MIGRATION_DATABASE_URL: ${{ inputs.environment == 'production' && secrets.MIGRATION_DATABASE_URL || inputs.environment == 'staging' && secrets.STAGING_MIGRATION_DATABASE_URL || '' }}
+          ENVIRONMENT: ${{ inputs.environment }}
         run: |
-          if [ "${{ github.ref }}" = "refs/heads/dev" ]; then
-            echo "Dev environment detected — pushing schema with drizzle-kit (db:push)"
+          if [ -z "$DATABASE_URL" ]; then
+            echo "ERROR: no database URL secret resolved for environment '${ENVIRONMENT}'" >&2
+            exit 1
+          fi
+
+          if [ "${ENVIRONMENT}" = "dev" ]; then
+            echo "Dev environment — pushing schema directly (db:push)"
             bun run db:push --force
           else
             echo "Applying versioned migrations (db:migrate)"
             bun run ./scripts/migrate.ts
-          fi
+          fi

apps/docs/.gitignore

@@ -36,4 +36,5 @@ bun-debug.log*
 next-env.d.ts
 
 # Fumadocs
-/.source/ 
+/.source/ 
+.plans/

apps/docs/app/[lang]/[[...slug]]/page.tsx

@@ -5,11 +5,12 @@ import type { ApiPageProps } from 'fumadocs-openapi/ui'
 import { createAPIPage } from 'fumadocs-openapi/ui'
 import { Pre } from 'fumadocs-ui/components/codeblock'
 import defaultMdxComponents from 'fumadocs-ui/mdx'
-import { DocsBody, DocsDescription, DocsPage, DocsTitle } from 'fumadocs-ui/page'
+import { DocsBody, DocsPage, DocsTitle } from 'fumadocs-ui/page'
 import { notFound } from 'next/navigation'
 import { PageFooter } from '@/components/docs-layout/page-footer'
 import { PageNavigationArrows } from '@/components/docs-layout/page-navigation-arrows'
 import { LLMCopyButton } from '@/components/page-actions'
+import { PageTypeBadge } from '@/components/page-type-badge'
 import { StructuredData } from '@/components/structured-data'
 import { CodeBlock } from '@/components/ui/code-block'
 import { Heading } from '@/components/ui/heading'
@@ -173,7 +174,6 @@ export default async function Page(props: { params: Promise<{ slug?: string[]; l
               <PageNavigationArrows previous={neighbours?.previous} next={neighbours?.next} />
             </div>
             <DocsTitle className='mb-2'>{data.title}</DocsTitle>
-            <DocsDescription>{data.description}</DocsDescription>
           </div>
           <DocsBody>
             <APIPage {...apiProps} />
@@ -222,8 +222,8 @@ export default async function Page(props: { params: Promise<{ slug?: string[]; l
             </div>
             <PageNavigationArrows previous={neighbours?.previous} next={neighbours?.next} />
           </div>
+          {data.pageType && <PageTypeBadge type={data.pageType} className='mb-3' />}
           <DocsTitle className='mb-2'>{data.title}</DocsTitle>
-          <DocsDescription>{data.description}</DocsDescription>
         </div>
         <DocsBody>
           <MDX

apps/docs/app/[lang]/layout.tsx

@@ -14,6 +14,7 @@ import { i18n } from '@/lib/i18n'
 import { serializeJsonLd } from '@/lib/json-ld'
 import { source } from '@/lib/source'
 import { DOCS_BASE_URL } from '@/lib/urls'
+import { season } from '@/app/fonts/season'
 import '../global.css'
 
 const inter = Inter({
@@ -84,7 +85,7 @@ export default async function Layout({ children, params }: LayoutProps) {
   return (
     <html
       lang={lang}
-      className={`${inter.variable} ${geistMono.variable}`}
+      className={`${inter.variable} ${geistMono.variable} ${season.variable}`}
       suppressHydrationWarning
     >
       <head>

apps/docs/app/fonts/SeasonSansUprightsVF.woff2

@@ -0,0 +1,16 @@
+import localFont from 'next/font/local'
+
+/**
+ * Season Sans variable font — the platform's UI font, mirrored from
+ * `apps/sim/app/_styles/fonts/season/season.ts` so docs chip chrome renders
+ * with the same typeface as the main app. Variable font supports weights
+ * 300-800.
+ */
+export const season = localFont({
+  src: [{ path: './SeasonSansUprightsVF.woff2', weight: '300 800', style: 'normal' }],
+  display: 'swap',
+  preload: true,
+  variable: '--font-season',
+  fallback: ['system-ui', 'Segoe UI', 'Roboto', 'Helvetica Neue', 'Arial', 'Noto Sans'],
+  adjustFontFallback: 'Arial',
+})