diff --git a/.claude/settings.json b/.claude/settings.json
index 8a9d6e387bfc..e8a0ee9c5362 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -1,12 +1,11 @@
 {
 	"hooks": {
-		"PostToolUse": [
+		"Stop": [
 			{
-				"matcher": "Edit|MultiEdit|Write",
 				"hooks": [
 					{
 						"type": "command",
-						"command": "jq -r '.tool_input.file_path' | { read file_path; yarn run -T prettier --write \"$file_path\"; }"
+						"command": "git diff --name-only --diff-filter=ACMR | grep -E '\\.(ts|tsx|js|jsx|json|md)$' | xargs -r yarn run -T prettier --write"
 					}
 				]
 			}
diff --git a/.github/workflows/add-framer-rewrites.yml b/.github/workflows/add-framer-rewrites.yml
new file mode 100644
index 000000000000..459db29ad3c5
--- /dev/null
+++ b/.github/workflows/add-framer-rewrites.yml
@@ -0,0 +1,70 @@
+name: Add Framer Rewrites
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  CI: 1
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  add-rewrites:
+    name: 'Add Framer Rewrites'
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Run our setup
+        uses: ./.github/actions/setup
+
+      - name: Check for changes before running script
+        id: before
+        run: |
+          echo "BEFORE_HASH=$(md5sum apps/docs/next.config.js | cut -d' ' -f1)" >> $GITHUB_OUTPUT
+
+      - name: Run add-framer-rewrites script
+        run: yarn add-framer-rewrites
+
+      - name: Check for changes after running script
+        id: after
+        run: |
+          echo "AFTER_HASH=$(md5sum apps/docs/next.config.js | cut -d' ' -f1)" >> $GITHUB_OUTPUT
+
+      - name: Create PR if changes detected
+        if: steps.before.outputs.BEFORE_HASH != steps.after.outputs.AFTER_HASH
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          BRANCH_NAME="framer-rewrites-$(date +%Y%m%d-%H%M%S)"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git checkout -b "$BRANCH_NAME"
+          git add apps/docs/next.config.js
+          git commit -m "Add missing Framer rewrites to next.config.js"
+          git push origin "$BRANCH_NAME"
+
+          gh pr create \
+            --title "Add missing Framer rewrites" \
+            --body "Adds missing rewrites for new Framer marketing pages to \`apps/docs/next.config.js\`.
+
+          ### Change type
+
+          - [x] \`improvement\`" \
+            --label "docs-hotfix-please"
+
+      - name: No changes detected
+        if: steps.before.outputs.BEFORE_HASH == steps.after.outputs.AFTER_HASH
+        run: |
+          echo "✔ No changes detected. All Framer paths already have rewrites configured."
diff --git a/.github/workflows/deploy-analytics.yml b/.github/workflows/deploy-analytics.yml
new file mode 100644
index 000000000000..ac388ee750da
--- /dev/null
+++ b/.github/workflows/deploy-analytics.yml
@@ -0,0 +1,49 @@
+name: Deploy analytics worker
+permissions:
+  contents: read
+  deployments: write
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - production
+
+env:
+  CI: 1
+  PRINT_GITHUB_ANNOTATIONS: 1
+  TLDRAW_ENV: ${{ (github.ref == 'refs/heads/production' && 'production') || (github.ref == 'refs/heads/main' && 'staging') || 'preview'  }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  deploy:
+    name: Deploy analytics worker to ${{ (github.ref == 'refs/heads/production' && 'production') || (github.ref == 'refs/heads/main' && 'staging') || 'preview'  }}
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    environment: ${{ github.ref == 'refs/heads/production' && 'deploy-production' || 'deploy-staging' }}
+    concurrency: analytics-worker-${{ github.ref == 'refs/heads/production' && 'deploy-production' || github.ref }}
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - uses: ./.github/actions/setup
+
+      - name: Build types
+        run: yarn build-types
+
+      - name: Deploy
+        run: yarn tsx internal/scripts/deploy-analytics.ts
+        env:
+          RELEASE_COMMIT_HASH: ${{ github.sha }}
+          GH_TOKEN: ${{ github.token }}
+
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          DISCORD_DEPLOY_WEBHOOK_URL: ${{ secrets.DISCORD_DEPLOY_WEBHOOK_URL }}
diff --git a/.github/workflows/deploy-dotcom.yml b/.github/workflows/deploy-dotcom.yml
index 9505d4b227bc..5d14d2b6f3b8 100644
--- a/.github/workflows/deploy-dotcom.yml
+++ b/.github/workflows/deploy-dotcom.yml
@@ -68,7 +68,7 @@ jobs:
           fi
 
       - name: Delete Neon Branch
-        uses: neondatabase/delete-branch-action@v3.1.3
+        uses: neondatabase/delete-branch-action@v3.2.0
         if: contains(github.event.pull_request.labels.*.name, 'reset-preview-db')
         with:
           project_id: ${{ vars.NEON_PROJECT_ID }}
@@ -158,3 +158,4 @@ jobs:
           VITE_GA4_MEASUREMENT_ID: ${{ secrets.VITE_GA4_MEASUREMENT_ID }}
           WORKER_SENTRY_DSN: ${{ secrets.WORKER_SENTRY_DSN }}
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
+          PIERRE_KEY: ${{ secrets.PIERRE_KEY }}
diff --git a/.github/workflows/i18n-download-strings.yml b/.github/workflows/i18n-download-strings.yml
index 7339431ca26d..04377b4e3f26 100644
--- a/.github/workflows/i18n-download-strings.yml
+++ b/.github/workflows/i18n-download-strings.yml
@@ -43,18 +43,25 @@ jobs:
         run: 'yarn i18n-check -f react-intl --locales ./apps/dotcom/client/public/tla/locales/ --source en'
 
       - name: Commit and push changes
-        if: always()
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
           git config --global user.name 'huppy-bot[bot]'
           git config --global user.email '128400622+huppy-bot[bot]@users.noreply.github.com'
-          git checkout -b update-i18n-strings
-          git add "*.json"
-          if git diff-index --quiet HEAD --; then
+
+          # Check if there are any changes to JSON files
+          if ! git diff --quiet '*.json' || ! git diff --cached --quiet '*.json'; then
+            echo "Changes detected, creating PR..."
+          else
             echo "No changes to commit"
             exit 0
           fi
+
+          # Delete the branch if it already exists
+          git push origin --delete update-i18n-strings 2>/dev/null || true
+
+          git checkout -b update-i18n-strings
+          git add "*.json"
           git commit --no-verify -m '[automated] update i18n strings'
           git push --set-upstream origin update-i18n-strings
           gh pr create --title "[automated] update i18n strings" --body "This PR updates the i18n strings.
diff --git a/.prettierignore b/.prettierignore
index 2931a5db746d..53e92c50dad6 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -30,6 +30,7 @@ apps/docs/content/reference/**/*
 **/.out/*
 **/.temp/*
 apps/dotcom/client/public/**/*.*
+apps/analytics/public/**/*
 
 **/.clasp.json
 
diff --git a/apps/analytics-worker/.gitignore b/apps/analytics-worker/.gitignore
new file mode 100644
index 000000000000..b3e55cbeabd1
--- /dev/null
+++ b/apps/analytics-worker/.gitignore
@@ -0,0 +1,2 @@
+build
+.wrangler
\ No newline at end of file
diff --git a/apps/analytics-worker/CONTEXT.md b/apps/analytics-worker/CONTEXT.md
new file mode 100644
index 000000000000..cf7b55441b4b
--- /dev/null
+++ b/apps/analytics-worker/CONTEXT.md
@@ -0,0 +1,127 @@
+# Analytics worker
+
+A Cloudflare Worker that determines whether users require explicit cookie consent based on their geographic location.
+
+## Purpose
+
+This worker supports the tldraw analytics system by providing geographic consent checking. It helps ensure compliance with privacy regulations like GDPR, UK PECR, FADP, and LGPD by identifying users in regions that require explicit opt-in for tracking.
+
+The worker is deployed to `tldraw-consent.workers.dev` and is called by the analytics app (`apps/analytics/`) during initialization.
+
+## How it works
+
+1. Receives GET request from analytics client
+2. Reads user's country code from CloudFlare's `CF-IPCountry` header
+3. Checks if country requires explicit consent
+4. Returns JSON response indicating whether consent is required
+5. Includes CORS headers for allowed tldraw origins
+
+## API
+
+**Endpoint**: `https://tldraw-consent.workers.dev` (or environment-specific variants)
+
+**Method**: `GET`
+
+**Response**:
+
+```json
+{
+  "requires_consent": boolean,
+  "country_code": string | null
+}
+```
+
+**Caching**: Responses are cached for 1 hour (`Cache-Control: public, max-age=3600`)
+
+## Geographic consent rules
+
+Users in the following countries/regions require explicit consent:
+
+**EU Member States (GDPR)**:
+
+- Austria, Belgium, Bulgaria, Croatia, Cyprus, Czech Republic, Denmark, Estonia, Finland, France, Germany, Greece, Hungary, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Poland, Portugal, Romania, Slovakia, Slovenia, Spain, Sweden
+
+**EEA/EFTA (GDPR)**:
+
+- Iceland, Liechtenstein, Norway
+
+**Other regions**:
+
+- United Kingdom (UK PECR)
+- Switzerland (FADP)
+- Brazil (LGPD)
+
+**Default behavior**: If country code cannot be determined, the worker defaults to requiring consent (conservative approach for privacy compliance).
+
+## CORS configuration
+
+The worker allows cross-origin requests from:
+
+- `http://localhost:3000` - Local development
+- `http://localhost:5420` - Local development
+- `https://meet.google.com` - Google Meet integration
+- `*.tldraw.com` - Production domains
+- `*.tldraw.dev` - Development domains
+- `*.tldraw.club` - Alternative domains
+- `*.tldraw.xyz` - Alternative domains
+- `*.tldraw.workers.dev` - Worker preview domains
+- `*-tldraw.vercel.app` - Vercel preview deployments
+
+## Development
+
+### Running locally
+
+```bash
+yarn dev              # Start local development server
+```
+
+### Testing
+
+```bash
+yarn test             # Run tests
+yarn test-ci          # Run tests in CI mode
+```
+
+### Deployment
+
+The worker is deployed via GitHub Actions (`.github/workflows/deploy-analytics.yml`) which runs `internal/scripts/deploy-analytics.ts`.
+
+**Environments**:
+
+- **dev**: `tldraw-consent-dev` (for testing)
+- **staging**: `tldraw-consent-staging` (deployed on push to `main`)
+- **production**: `tldraw-consent` (deployed on push to `production`)
+
+## File structure
+
+- `src/worker.ts` - Main worker code
+- `wrangler.toml` - Cloudflare Worker configuration
+- `package.json` - Package configuration and scripts
+- `tsconfig.json` - TypeScript configuration
+- `vitest.config.ts` - Test configuration
+
+## Integration
+
+This worker is called by the analytics app during initialization:
+
+1. Analytics app loads in user's browser
+2. If no existing consent preference is stored
+3. App calls this worker to check if consent is required
+4. Based on response, app either:
+   - Shows consent banner (requires_consent: true)
+   - Assumes implicit consent (requires_consent: false)
+
+See `apps/analytics/src/utils/consent-check.ts` for the client-side integration.
+
+## Dependencies
+
+- `@cloudflare/workers-types` - TypeScript types for Cloudflare Workers
+- `wrangler` - Cloudflare Workers CLI tool
+
+## Notes
+
+- This is a standalone worker (not part of the analytics app bundle)
+- Uses CloudFlare's edge network for low-latency responses worldwide
+- Conservative default (require consent) ensures compliance even if geo-detection fails
+- CORS preflight requests are handled with 24-hour cache
+- Responses are cached to reduce load and improve performance
diff --git a/apps/analytics-worker/package.json b/apps/analytics-worker/package.json
new file mode 100644
index 000000000000..a00cc0927f0d
--- /dev/null
+++ b/apps/analytics-worker/package.json
@@ -0,0 +1,28 @@
+{
+	"name": "@tldraw/analytics-worker",
+	"description": "tldraw infinite canvas SDK (analytics worker).",
+	"version": "0.0.0",
+	"private": true,
+	"author": {
+		"name": "tldraw GB Ltd.",
+		"email": "hello@tldraw.com"
+	},
+	"main": "./src/worker.ts",
+	"/* GOTCHA */": "files will include ./dist and index.d.ts by default, add any others you want to include in here",
+	"files": [],
+	"scripts": {
+		"dev": "yarn run -T tsx ../../internal/scripts/workers/dev.ts",
+		"test-ci": "yarn run -T vitest run --passWithNoTests",
+		"test": "yarn run -T vitest --passWithNoTests",
+		"test-coverage": "yarn run -T vitest run --coverage --passWithNoTests",
+		"check-bundle-size": "yarn run -T tsx ../../internal/scripts/check-worker-bundle.ts --entry src/worker.ts --size-limit-bytes 350000",
+		"lint": "yarn run -T tsx ../../internal/scripts/lint.ts"
+	},
+	"devDependencies": {
+		"@cloudflare/workers-types": "^4.20250913.0",
+		"esbuild": "^0.25.6",
+		"lazyrepo": "0.0.0-alpha.27",
+		"typescript": "^5.8.3",
+		"wrangler": "^4.37.1"
+	}
+}
diff --git a/apps/analytics-worker/src/worker.ts b/apps/analytics-worker/src/worker.ts
new file mode 100644
index 000000000000..2ba7ade46a75
--- /dev/null
+++ b/apps/analytics-worker/src/worker.ts
@@ -0,0 +1,117 @@
+/// <reference no-default-lib="true"/>
+/// <reference types="@cloudflare/workers-types" />
+
+/**
+ * Simple CloudFlare worker that returns whether the user requires cookie consent
+ * based on their geographic location (via CF-IPCountry header)
+ */
+
+/**
+ * Validates if an origin is allowed to make cross-origin requests.
+ * Returns the origin if allowed, or undefined if blocked.
+ */
+function isAllowedOrigin(origin: string | null): string | undefined {
+	if (!origin) return undefined
+	if (origin === 'http://localhost:3000') return origin
+	if (origin === 'http://localhost:3001') return origin
+	if (origin === 'http://localhost:5420') return origin
+	if (origin === 'https://meet.google.com') return origin
+	if (origin === 'https://tldraw.dev') return origin
+	if (origin.endsWith('.tldraw.com')) return origin
+	if (origin.endsWith('.tldraw.dev')) return origin
+	if (origin.endsWith('.tldraw.club')) return origin
+	if (origin.endsWith('.tldraw.xyz')) return origin
+	if (origin.endsWith('.tldraw.workers.dev')) return origin
+	if (origin.endsWith('-tldraw.vercel.app')) return origin
+	return undefined
+}
+
+const EXPLICIT_CONSENT_COUNTRIES = [
+	// EU Member States (GDPR)
+	'AT',
+	'BE',
+	'BG',
+	'HR',
+	'CY',
+	'CZ',
+	'DK',
+	'EE',
+	'FI',
+	'FR',
+	'DE',
+	'GR',
+	'HU',
+	'IE',
+	'IT',
+	'LV',
+	'LT',
+	'LU',
+	'MT',
+	'NL',
+	'PL',
+	'PT',
+	'RO',
+	'SK',
+	'SI',
+	'ES',
+	'SE',
+	// EEA/EFTA (GDPR)
+	'IS',
+	'LI',
+	'NO',
+	// Post-Brexit UK (UK PECR)
+	'GB',
+	// Switzerland (FADP)
+	'CH',
+	// Brazil (LGPD)
+	'BR',
+]
+
+export default {
+	async fetch(request: Request): Promise<Response> {
+		const origin = request.headers.get('origin')
+		const allowedOrigin = isAllowedOrigin(origin)
+
+		// Handle CORS preflight
+		if (request.method === 'OPTIONS') {
+			const headers: Record<string, string> = {
+				'Access-Control-Allow-Methods': 'GET, OPTIONS',
+				'Access-Control-Allow-Headers': 'Content-Type',
+				'Access-Control-Max-Age': '86400',
+			}
+			if (allowedOrigin) {
+				headers['Access-Control-Allow-Origin'] = allowedOrigin
+			}
+			return new Response(null, { headers })
+		}
+
+		// Only allow GET requests
+		if (request.method !== 'GET') {
+			return new Response('Method not allowed', { status: 405 })
+		}
+
+		// Get country code from CloudFlare header
+		const countryCode = request.headers.get('CF-IPCountry')
+
+		// Check if consent is required
+		// Default to requiring consent if country is unknown
+		const requiresConsent = !countryCode || EXPLICIT_CONSENT_COUNTRIES.includes(countryCode)
+
+		// Return response with CORS headers
+		const headers: Record<string, string> = {
+			'Content-Type': 'application/json',
+			'Cache-Control': 'public, max-age=3600', // Cache for 1 hour
+		}
+		if (allowedOrigin) {
+			headers['Access-Control-Allow-Origin'] = allowedOrigin
+		}
+
+		return new Response(
+			JSON.stringify({
+				requires_consent: requiresConsent,
+				country_code: countryCode,
+			}),
+			{ headers }
+		)
+	},
+}
diff --git a/apps/analytics-worker/tsconfig.json b/apps/analytics-worker/tsconfig.json
new file mode 100644
index 000000000000..71ee8ba34d3c
--- /dev/null
+++ b/apps/analytics-worker/tsconfig.json
@@ -0,0 +1,7 @@
+{
+	"extends": "../../internal/config/tsconfig.base.json",
+	"include": ["src", "scripts"],
+	"exclude": ["node_modules", "dist", ".tsbuild*"],
+	"compilerOptions": { "noEmit": true, "emitDeclarationOnly": false },
+	"references": []
+}
diff --git a/apps/analytics-worker/vitest.config.ts b/apps/analytics-worker/vitest.config.ts
new file mode 100644
index 000000000000..28709f2f5e13
--- /dev/null
+++ b/apps/analytics-worker/vitest.config.ts
@@ -0,0 +1,15 @@
+/// <reference types="vitest" />
+import { mergeConfig } from 'vitest/config'
+import baseConfig from '../../internal/config/vitest/node-preset'
+
+// bemo-worker is a Node.js/Cloudflare Worker environment
+export default mergeConfig(baseConfig, {
+	test: {
+		// Use node environment instead of jsdom for worker apps
+		environment: 'node',
+		// Module name mapping for path aliases
+		alias: {
+			'^~(.*)$': './src/$1',
+		},
+	},
+})
diff --git a/apps/analytics-worker/wrangler.toml b/apps/analytics-worker/wrangler.toml
new file mode 100644
index 000000000000..c2844486b1eb
--- /dev/null
+++ b/apps/analytics-worker/wrangler.toml
@@ -0,0 +1,44 @@
+main = "src/worker.ts"
+compatibility_date = "2024-06-20"
+upload_source_maps = true
+
+#################### Environment names ####################
+
+# Dev environment
+[env.dev]
+name = "tldraw-consent-dev"
+
+# Staging environment
+[env.staging]
+name = "tldraw-consent-staging"
+
+# Staging environment
+[env.preview]
+name = "tldraw-consent-preview"
+
+# Production environment
+[env.production]
+name = "tldraw-consent"
+
+#################### Routes ####################
+# in production, we use a custom domain. others get a default *.tldraw.workers.dev domain
+[[env.production.routes]]
+pattern = 'consent.tldraw.xyz'
+custom_domain = true
+zone_name = 'tldraw.xyz'
+
+#################### Version metadata ####################
+[version_metadata]
+binding = "CF_VERSION_METADATA"
+
+[env.dev.version_metadata]
+binding = "CF_VERSION_METADATA"
+
+[env.preview.version_metadata]
+binding = "CF_VERSION_METADATA"
+
+[env.staging.version_metadata]
+binding = "CF_VERSION_METADATA"
+
+[env.production.version_metadata]
+binding = "CF_VERSION_METADATA"
diff --git a/apps/analytics/CONTEXT.md b/apps/analytics/CONTEXT.md
index db0e90f0bb83..52ae6ad4a472 100644
--- a/apps/analytics/CONTEXT.md
+++ b/apps/analytics/CONTEXT.md
@@ -1,135 +1,201 @@
-# @tldraw/analytics
+# Analytics app
 
-The analytics app provides a privacy-compliant analytics tracking system for tldraw applications. It creates a standalone JavaScript library that can be embedded into websites to handle cookie consent, user tracking, and privacy settings.
+A unified analytics library for tldraw.com that integrates multiple analytics services with cookie consent management.
 
 ## Purpose
 
-This app builds a UMD (Universal Module Definition) library that provides:
+This package provides a single, consolidated analytics interface that:
 
-- Cookie consent banner with opt-in/opt-out functionality
-- Privacy settings dialog
-- Integration with multiple analytics providers (PostHog, Google Analytics 4, HubSpot, Reo)
-- GDPR-compliant tracking with user consent management
+- Integrates multiple analytics providers (PostHog, Google Analytics 4, HubSpot, Reo)
+- Manages cookie consent with a UI banner and privacy settings dialog
+- Exposes a unified API for tracking events, page views, and user identification
+- Ensures analytics only run when users have opted in
 
-## Architecture
-
-### Build system
+The analytics script is built as a standalone JavaScript bundle that can be included in any tldraw web application.
 
-- **Vite-based build**: Creates a single UMD library (`tl-analytics.js`)
-- **React components**: Built with React 18 but bundled for standalone usage
-- **CSS injection**: Styles are inlined and injected at runtime
-- **External globals**: React and ReactDOM are expected as global dependencies
+## Architecture
 
 ### Core components
 
-**Analytics.tsx** - Main analytics component
+**Analytics class** (`src/index.ts`)
 
-- Cookie consent banner with theme detection
-- Consent state management using cookies
-- Integration with multiple analytics providers
-- Conditional loading of tracking scripts based on consent
+- Main entry point that orchestrates all analytics services
+- Manages consent state and enables/disables services accordingly
+- Exposes global `window.tlanalytics` API with methods:
+  - `identify(userId, properties)` - Identify a user across all services
+  - `reset()` - Reset user identity across all services (called on logout)
+  - `track(name, data)` - Track an event
+  - `page()` - Track a page view
+  - `gtag(...args)` - Access Google Analytics gtag function
+  - `openPrivacySettings()` - Show privacy settings dialog
 
-**PrivacySettings.tsx** - Privacy settings dialog
+**Analytics services** (`src/analytics-services/`)
 
-- User-facing privacy controls
-- Toggle analytics consent on/off
-- Accessible dialog implementation using Radix UI
+- Base `AnalyticsService` class defines common interface
+- Each service (PostHog, GA4, HubSpot, Reo) extends the base class
+- Lifecycle methods:
+  - `initialize()` - Set up service (runs regardless of consent)
+  - `enable()` - Enable tracking when consent is granted
+  - `disable()` - Disable tracking when consent is revoked
+  - `identify(userId, properties)` - Identify user
+  - `reset()` - Reset user identity (called on logout)
+  - `trackEvent(name, data)` - Track custom event
+  - `trackPageview()` - Track page view
 
-**index.ts** - Entry point and global API
+**State management** (`src/state/`)
 
-- Exposes global `window.tlanalytics` object
-- Provides functions: `page()`, `identify()`, `track()`, `gtag()`, `openPrivacySettings()`
-- Handles DOM injection and component initialization
+- `AnalyticsState<T>` - Simple reactive state class with subscribe/notify pattern
+- `CookieConsentState` - Manages consent state ('unknown' | 'opted-in' | 'opted-out')
+- `ThemeState` - Manages theme for UI components ('light' | 'dark')
 
-### Analytics providers
+**UI components** (`src/components/`)
 
-**PostHog**
+- `CookieConsentBanner` - Shows cookie consent prompt when consent is unknown
+- `PrivacySettingsDialog` - Allows users to review and change their consent preferences
 
-- Primary analytics provider
-- Hosted at `https://analytics.tldraw.com/i`
-- Memory-only persistence when consent is denied
-- Full localStorage+cookie persistence when opted in
+### Consent flow
 
-**Google Analytics 4**
+1. On initialization, analytics reads consent from `allowTracking` cookie
+2. If no existing consent decision:
+   - Check user location via CloudFlare worker (`shouldRequireConsent()`)
+   - Users in GDPR/LGPD regions default to 'unknown' (must opt in)
+   - Users in other regions default to 'opted-in' (implicit consent)
+3. If consent is unknown, banner is shown
+4. User actions (accept/opt-out) update the consent state
+5. Consent state changes trigger enable/disable on all services
+6. Only opted-in users have their events tracked
 
-- Configured via `window.TL_GA4_MEASUREMENT_ID`
-- Supports Google Ads integration via `window.TL_GOOGLE_ADS_ID`
-- Consent-aware configuration
-- Anonymized IP when consent is denied
+**Geographic consent checking** (`src/utils/consent-check.ts`)
 
-**HubSpot**
+- Calls CloudFlare worker at `https://tldraw-consent.workers.dev`
+- Worker uses `CF-IPCountry` header to determine user's country
+- Requires explicit consent for EU, EEA, UK, Switzerland, Brazil
+- Falls back to requiring consent if check fails or times out (2s timeout)
+- Conservative default ensures compliance with privacy regulations
 
-- Loaded conditionally with consent
-- EU-hosted (js-eu1.hs-scripts.com)
-- Account ID: 145620695
+### Integration with services
 
-**Reo Analytics**
+**PostHog** (`src/analytics-services/posthog.ts`)
 
-- User session recording and analytics
-- Client ID: 47839e47a5ed202
-- Conditional loading based on consent
+- Product analytics and session recording
+- Switches between memory and localStorage persistence based on consent
 
-## Development
+**Google Analytics 4** (`src/analytics-services/ga4.ts`)
 
-### Scripts
+- Web analytics via gtag.js
+- Measurement ID provided via `window.TL_GA4_MEASUREMENT_ID`
 
-- `yarn dev` - Start development server with Vite
-- `yarn build` - Build UMD library to `public/tl-analytics.js`
-- `yarn lint` - Run ESLint
-- `yarn test` - Run Vitest (currently no tests)
+**HubSpot** (`src/analytics-services/hubspot.ts`)
 
-### Dependencies
+- Marketing automation and CRM tracking
+- Loaded via external script
 
-- **js-cookie**: Cookie management
-- **posthog-js**: PostHog analytics client
-- **radix-ui**: Accessible UI primitives for dialogs and switches
-- **react-ga4**: Google Analytics 4 integration
-- **react/react-dom**: UI framework
+**Reo** (`src/analytics-services/reo.ts`)
 
-## Usage
+- Analytics service
+- Loaded via external script
 
-The built library is designed to be included via script tag:
+### CloudFlare consent worker
 
-```html
-<script src="path/to/tl-analytics.js"></script>
-<script>
-	// Optional: Set GA4 measurement ID
-	window.TL_GA4_MEASUREMENT_ID = 'G-XXXXXXXXXX'
+The consent worker is now maintained in a separate package at `apps/analytics-worker/`.
 
-	// Track page view
-	window.tlanalytics.page()
+- Standalone CloudFlare Worker deployed to `tldraw-consent.workers.dev`
+- Returns whether explicit consent is required based on user's geographic location
+- Uses CloudFlare's `CF-IPCountry` header to detect country
+- Returns JSON: `{ requires_consent: boolean, country_code: string }`
+- CORS-enabled for cross-origin requests from tldraw domains
+- Cached for 1 hour to reduce load
+- Countries requiring explicit consent:
+  - EU member states (GDPR)
+  - EEA/EFTA countries (GDPR)
+  - United Kingdom (UK PECR)
+  - Switzerland (FADP)
+  - Brazil (LGPD)
 
-	// Identify user
-	window.tlanalytics.identify('user-id', { name: 'User Name' })
+## Development
 
-	// Track custom event
-	window.tlanalytics.track('button_click', { button_name: 'signup' })
+### Running the app
 
-	// Open privacy settings
-	window.tlanalytics.openPrivacySettings()
-</script>
+```bash
+yarn dev              # Start development server
+yarn build            # Build for production
+yarn test             # Run tests
 ```
 
-## Privacy & compliance
+### Testing
 
-### Cookie management
+Uses Vitest for unit testing. Test files are colocated with source files (e.g., `state.test.ts`).
 
-- Uses `allowTracking` cookie to store consent
-- Three states: 'unknown', 'opted-in', 'opted-out'
-- Consent banner appears only for 'unknown' state
+### Build output
 
-### Data collection
+Vite builds the app into two outputs:
 
-- **Without consent**: Anonymous, memory-only tracking
-- **With consent**: Full tracking with persistent storage
-- **GDPR compliance**: User can opt-out at any time via privacy settings
+1. JavaScript bundle in `public/` directory (via `vite build --outDir public`)
+2. TypeScript compiled output in `dist/` (via `tsc`)
 
-### Theme support
+The built script can be included in HTML via:
 
-- Automatic theme detection from document root styles
-- Observes changes to `color-scheme` CSS property
-- Applies appropriate styling for light/dark themes
+```html
+<script src="/analytics.js"></script>
+```
 
-## Deployment
+## Usage
+
+After the script loads, use the global API:
+
+```javascript
+// Identify a user
+window.tlanalytics.identify('user-123', { plan: 'pro' })
+
+// Reset user identity (on logout)
+window.tlanalytics.reset()
+
+// Track an event
+window.tlanalytics.track('button_clicked', { button: 'upgrade' })
+
+// Track a page view
+window.tlanalytics.page()
+
+// Open privacy settings
+window.tlanalytics.openPrivacySettings()
+```
 
-The built library (`public/tl-analytics.js`) is deployed via Vercel configuration and can be hosted on CDN for inclusion in other tldraw applications and websites.
+## Configuration
+
+Analytics services are configured via constants in `src/constants.ts` and environment variables:
+
+- `window.TL_GA4_MEASUREMENT_ID` - Google Analytics measurement ID
+- `window.TL_GOOGLE_ADS_ID` - Google Ads ID (optional)
+- PostHog, HubSpot, and Reo use hardcoded configuration in constants
+
+## Key files
+
+- `src/index.ts` - Main Analytics class and initialization
+- `src/types.ts` - TypeScript types and global declarations
+- `src/analytics-services/analytics-service.ts` - Base service class
+- `src/analytics-services/*.ts` - Individual service implementations (PostHog, GA4, HubSpot, Reo)
+- `src/state/state.ts` - Reactive state base class
+- `src/state/cookie-consent-state.ts` - Consent management
+- `src/state/theme-state.ts` - Theme management for UI components
+- `src/utils/consent-check.ts` - Geographic consent checking utility
+- `src/components/CookieConsentBanner.ts` - Consent banner UI
+- `src/components/PrivacySettingsDialog.ts` - Privacy settings dialog UI
+- `src/styles.css` - Component styles (inlined via Vite)
+
+## Dependencies
+
+- `posthog-js` - PostHog SDK
+- `js-cookie` - Cookie management
+- `vite` - Build tool
+- `vitest` - Testing framework
+
+## Notes
+
+- This app does NOT use tldraw's `@tldraw/state` library - it has its own simple reactive state implementation
+- The app is framework-agnostic - uses vanilla JavaScript/TypeScript
+- All UI is created with vanilla DOM manipulation (no React)
+- Styles are injected at runtime from the bundled CSS
+- Services are enabled/disabled dynamically based on consent without page reload
+- Error handling is implemented during initialization to prevent analytics failures from breaking the page
+- User identity persists in memory during session for re-identification if consent changes
+- Geographic consent checking uses a conservative approach - defaults to requiring consent on failure
diff --git a/apps/analytics/index.html b/apps/analytics/index.html
new file mode 100644
index 000000000000..4a6c37358bef
--- /dev/null
+++ b/apps/analytics/index.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>Analytics Banner Preview</title>
+		<style>
+			body {
+				width: 100%;
+				height: 100%;
+				background-color: white;
+				color: black;
+			}
+			body.dark {
+				background-color: black;
+				color: white;
+			}
+		</style>
+	</head>
+	<body>
+		<button id="toggle-theme">toggle theme</button>
+		<button id="cookie-dialog">show cookie preferences</button>
+	</body>
+	<script>
+		const button = document.getElementById('toggle-theme')
+		button.addEventListener('click', () => {
+			document.body.classList.toggle('dark')
+			document.body.setAttribute(
+				'data-theme',
+				document.body.classList.contains('dark') ? 'dark' : 'light'
+			)
+		})
+
+		const cookieButton = document.getElementById('cookie-dialog')
+		cookieButton.addEventListener('click', () => {
+			window.tlanalytics.openPrivacySettings()
+		})
+	</script>
+	<script src="./public/tl-analytics.js"></script>
+</html>
diff --git a/apps/analytics/package.json b/apps/analytics/package.json
index c937c38317f4..c98386f6fc02 100644
--- a/apps/analytics/package.json
+++ b/apps/analytics/package.json
@@ -14,18 +14,14 @@
 	},
 	"dependencies": {
 		"js-cookie": "^3.0.5",
-		"posthog-js": "^1.248.1",
-		"radix-ui": "^1.4.2",
-		"react": "^18.3.1",
-		"react-dom": "^18.3.1",
-		"react-ga4": "^2.1.0"
+		"posthog-js": "^1.281.0"
 	},
 	"devDependencies": {
+		"@cloudflare/workers-types": "^4.20250913.0",
 		"@types/js-cookie": "^3.0.6",
-		"@types/react": "^18.3.18",
-		"@types/react-dom": "^18.3.5",
-		"@vitejs/plugin-react": "^4.6.0",
 		"typescript": "^5.8.3",
-		"vite": "^7.0.1"
+		"vite": "^7.0.1",
+		"vitest": "^3.2.4",
+		"wrangler": "^4.37.1"
 	}
 }
diff --git a/apps/analytics/src/analytics-services/analytics-service.ts b/apps/analytics/src/analytics-services/analytics-service.ts
new file mode 100644
index 000000000000..2fcb6f2f25f4
--- /dev/null
+++ b/apps/analytics/src/analytics-services/analytics-service.ts
@@ -0,0 +1,50 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
+export class AnalyticsService {
+	protected isEnabled = false
+	// Initialize the service (regardless of cookie consent)
+	initialize(): void {}
+	// Clean up the service.
+	dispose(): void {}
+	// Enable the service when cookie consent is granted.
+	enable(): void {}
+	// Disable the service when cookie consent is revoked.
+	disable(): void {}
+	// Identify the user.
+	identify(userId: string, properties?: { [key: string]: any }): void {}
+	// Reset the user identity (call on logout).
+	reset(): void {}
+	// Track an event.
+	trackEvent(name: string, data?: { [key: string]: any }): void {}
+	// Track a pageview.
+	trackPageview(): void {}
+	// Track when consent banner is displayed (called before consent is granted).
+	trackConsentBannerDisplayed?(data: { consent_opt_in_type: 'manual' | 'auto' }): void
+	// Track when user selects consent preferences (called before consent is granted).
+	trackConsentBannerSelected?(data: {
+		consent_analytics: 'granted' | 'denied'
+		consent_marketing: 'granted' | 'denied'
+		consent_opt_in_type: 'manual' | 'auto'
+	}): void
+	// Track when user copies a code snippet.
+	trackCopyCode?(data: {
+		page_category: string
+		text_snippet: string
+		user_email?: string
+		user_email_sha256?: string
+		user_first_name?: string
+		user_last_name?: string
+		user_phone_number?: string
+	}): void
+	// Track when user submits a form.
+	trackFormSubmission?(data: {
+		enquiry_type: string
+		company_size?: string
+		company_website?: string
+		user_email: string
+		user_email_sha256: string
+		user_first_name: string
+		user_last_name: string
+		user_phone_number?: string
+	}): void
+}
diff --git a/apps/analytics/src/analytics-services/ga4.ts b/apps/analytics/src/analytics-services/ga4.ts
new file mode 100644
index 000000000000..d643036c564e
--- /dev/null
+++ b/apps/analytics/src/analytics-services/ga4.ts
@@ -0,0 +1,119 @@
+import { AnalyticsService } from './analytics-service'
+
+// Extend Window with gtag and dataLayer (other Window properties declared in types.ts)
+declare global {
+	interface Window {
+		gtag?(...args: any[]): void
+		dataLayer?: any[]
+	}
+}
+
+// Helper to safely call gtag
+function gtag(...args: any[]) {
+	if (typeof window !== 'undefined' && window.gtag) {
+		window.gtag(...args)
+	}
+}
+
+export function ga4Gtag(...args: any[]) {
+	gtag(...args)
+}
+
+class GA4AnalyticsService extends AnalyticsService {
+	private measurementId: string | undefined
+	private googleAdsId: string | undefined
+
+	override initialize() {
+		if (typeof window === 'undefined') return
+
+		this.measurementId = window.TL_GA4_MEASUREMENT_ID ?? undefined
+		this.googleAdsId = window.TL_GOOGLE_ADS_ID ?? undefined
+
+		if (this.measurementId) {
+			gtag('consent', 'default', {
+				ad_storage: 'denied',
+				ad_user_data: 'denied',
+				ad_personalization: 'denied',
+				analytics_storage: 'denied',
+				// Wait for our cookie to load.
+				wait_for_update: 500,
+			})
+
+			// Initialize dataLayer
+			window.dataLayer = window.dataLayer || []
+			window.gtag = function () {
+				// eslint-disable-next-line prefer-rest-params
+				window.dataLayer!.push(arguments)
+			}
+			gtag('js', new Date())
+
+			// Load the GA4 script
+			const script = document.createElement('script')
+			script.async = true
+			script.id = `gtag-${this.measurementId}`
+			script.src = `https://www.googletagmanager.com/gtag/js?id=${this.measurementId}`
+			document.head.appendChild(script)
+
+			gtag('config', this.measurementId, {
+				anonymize_ip: true,
+			})
+		}
+
+		if (this.googleAdsId) {
+			gtag('config', this.googleAdsId)
+		}
+	}
+
+	override dispose() {
+		const script = document.getElementById(`gtag-${this.measurementId}`)
+		if (script) script.remove()
+	}
+
+	override enable() {
+		if (this.isEnabled) return
+		gtag('set', { anonymize_ip: false })
+		gtag('consent', 'update', {
+			ad_user_data: 'granted',
+			ad_personalization: 'granted',
+			ad_storage: 'granted',
+			analytics_storage: 'granted',
+		})
+		this.isEnabled = true
+	}
+
+	override disable() {
+		if (!this.isEnabled) return
+		// Clear user properties
+		if (this.measurementId) {
+			gtag('config', this.measurementId, {
+				client_id: undefined,
+				user_id: undefined,
+			})
+		}
+		gtag('set', { anonymize_ip: true })
+		gtag('consent', 'update', {
+			ad_user_data: 'denied',
+			ad_personalization: 'denied',
+			ad_storage: 'denied',
+			analytics_storage: 'denied',
+		})
+		this.isEnabled = false
+	}
+
+	override identify(userId: string, properties?: { [key: string]: any }) {
+		gtag('set', { user_id: userId })
+		if (properties) {
+			gtag('set', properties)
+		}
+	}
+
+	override trackEvent(name: string, data?: { [key: string]: any }) {
+		gtag('event', name, data)
+	}
+
+	override trackPageview() {
+		gtag('event', 'page_view')
+	}
+}
+
+export const ga4Service = new GA4AnalyticsService()
diff --git a/apps/analytics/src/analytics-services/gtm.ts b/apps/analytics/src/analytics-services/gtm.ts
new file mode 100644
index 000000000000..a1d09a9f5f4c
--- /dev/null
+++ b/apps/analytics/src/analytics-services/gtm.ts
@@ -0,0 +1,192 @@
+import { GTM_SCRIPT_ID } from '../constants'
+import { AnalyticsService } from './analytics-service'
+
+// Extend Window with dataLayer (other Window properties declared in types.ts)
+declare global {
+	interface Window {
+		dataLayer?: any[]
+	}
+}
+
+// Helper to safely push to dataLayer (internal use only)
+function dataLayerPush(data: any) {
+	if (typeof window !== 'undefined' && window.dataLayer) {
+		window.dataLayer.push(data)
+	}
+}
+
+class GTMAnalyticsService extends AnalyticsService {
+	private gtmContainerId: string | undefined
+
+	override initialize() {
+		if (typeof window === 'undefined') return
+
+		this.gtmContainerId = window.TL_GTM_CONTAINER_ID ?? undefined
+
+		if (!this.gtmContainerId) return
+
+		// Set default consent state
+		window.dataLayer = window.dataLayer || []
+		dataLayerPush({
+			'gtm.start': new Date().getTime(),
+			event: 'gtm.js',
+		})
+
+		dataLayerPush({
+			event: 'consent_default',
+			consent: {
+				ad_storage: 'denied',
+				ad_user_data: 'denied',
+				ad_personalization: 'denied',
+				analytics_storage: 'denied',
+				wait_for_update: 500,
+			},
+		})
+
+		// Load the GTM script
+		const script = document.createElement('script')
+		script.async = true
+		script.id = GTM_SCRIPT_ID
+		script.src = `https://www.googletagmanager.com/gtm.js?id=${this.gtmContainerId}`
+		document.head.appendChild(script)
+	}
+
+	override dispose() {
+		const script = document.getElementById(GTM_SCRIPT_ID)
+		if (script) script.remove()
+	}
+
+	override enable() {
+		if (this.isEnabled) return
+		this.isEnabled = true
+	}
+
+	override disable() {
+		if (!this.isEnabled) return
+		this.isEnabled = false
+	}
+
+	override identify(userId: string, properties?: { [key: string]: any }) {
+		if (!this.isEnabled) return
+		dataLayerPush({
+			event: 'user_identify',
+			user_id: userId,
+			user_properties: properties,
+		})
+	}
+
+	override trackEvent(name: string, data?: { [key: string]: any }) {
+		if (!this.isEnabled) return
+		dataLayerPush({
+			event: name,
+			...data,
+		})
+	}
+
+	override trackPageview() {
+		if (!this.isEnabled) return
+		dataLayerPush({
+			event: 'page_view',
+		})
+	}
+
+	override trackConsentBannerDisplayed(data: { consent_opt_in_type: 'manual' | 'auto' }) {
+		dataLayerPush({
+			event: 'display_consent_banner',
+			id: crypto.randomUUID(),
+			data,
+		})
+	}
+
+	override trackConsentBannerSelected(data: {
+		consent_analytics: 'granted' | 'denied'
+		consent_marketing: 'granted' | 'denied'
+		consent_opt_in_type: 'manual' | 'auto'
+	}) {
+		dataLayerPush({
+			event: 'select_consent_banner',
+			id: crypto.randomUUID(),
+			data,
+		})
+	}
+
+	override trackCopyCode(data: {
+		page_category: string
+		text_snippet: string
+		user_email?: string
+		user_email_sha256?: string
+		user_first_name?: string
+		user_last_name?: string
+		user_phone_number?: string
+	}) {
+		if (!this.isEnabled) return
+		const payload: any = {
+			event: 'click_copy_code',
+			id: crypto.randomUUID(),
+			page: {
+				category: data.page_category.toLowerCase(),
+			},
+			data: {
+				text_snippet: data.text_snippet.substring(0, 100),
+			},
+			_clear: true,
+		}
+
+		// Only include user object if we have user data
+		if (
+			data.user_email ||
+			data.user_email_sha256 ||
+			data.user_first_name ||
+			data.user_last_name ||
+			data.user_phone_number
+		) {
+			payload.user = {}
+			if (data.user_email) payload.user.email = data.user_email.toLowerCase()
+			if (data.user_email_sha256) payload.user.email_sha256 = data.user_email_sha256.toLowerCase()
+			if (data.user_first_name) payload.user.first_name = data.user_first_name.toLowerCase()
+			if (data.user_last_name) payload.user.last_name = data.user_last_name.toLowerCase()
+			if (data.user_phone_number) payload.user.phone_number = data.user_phone_number
+		}
+
+		dataLayerPush(payload)
+	}
+
+	override trackFormSubmission(data: {
+		enquiry_type: string
+		company_size?: string
+		company_website?: string
+		user_email: string
+		user_email_sha256: string
+		user_first_name: string
+		user_last_name: string
+		user_phone_number?: string
+	}) {
+		if (!this.isEnabled) return
+		const payload: any = {
+			event: 'generate_lead',
+			id: crypto.randomUUID(),
+			page: {
+				category: 'enquiry',
+			},
+			data: {
+				enquiry_type: data.enquiry_type.toLowerCase(),
+			},
+			user: {
+				email: data.user_email.toLowerCase(),
+				email_sha256: data.user_email_sha256.toLowerCase(),
+				first_name: data.user_first_name.toLowerCase(),
+				last_name: data.user_last_name.toLowerCase(),
+			},
+			_clear: true,
+		}
+
+		// Add optional company data
+		if (data.company_size) payload.data.company_size = data.company_size.toLowerCase()
+		if (data.company_website) payload.data.company_website = data.company_website.toLowerCase()
+		if (data.user_phone_number) payload.user.phone_number = data.user_phone_number
+
+		dataLayerPush(payload)
+	}
+}
+
+export const gtmService = new GTMAnalyticsService()
diff --git a/apps/analytics/src/analytics-services/hubspot.ts b/apps/analytics/src/analytics-services/hubspot.ts
new file mode 100644
index 000000000000..e72acdb7a006
--- /dev/null
+++ b/apps/analytics/src/analytics-services/hubspot.ts
@@ -0,0 +1,23 @@
+import { HUBSPOT_SCRIPT_ID, HUBSPOT_SCRIPT_URL } from '../constants'
+import { AnalyticsService } from './analytics-service'
+
+class HubspotAnalyticsService extends AnalyticsService {
+	// Does not need to be initialized
+	override enable() {
+		if (this.isEnabled) return
+		const hubspotScriptTag = document.createElement('script')
+		hubspotScriptTag.id = HUBSPOT_SCRIPT_ID
+		hubspotScriptTag.src = HUBSPOT_SCRIPT_URL
+		hubspotScriptTag.defer = true
+		document.head.appendChild(hubspotScriptTag)
+		this.isEnabled = true
+	}
+
+	override dispose() {
+		const hubspotScriptTag = document.getElementById(HUBSPOT_SCRIPT_ID)
+		if (hubspotScriptTag) hubspotScriptTag.remove()
+		this.isEnabled = false
+	}
+}
+
+export const hubspotService = new HubspotAnalyticsService()
diff --git a/apps/analytics/src/analytics-services/posthog.ts b/apps/analytics/src/analytics-services/posthog.ts
new file mode 100644
index 000000000000..9202a8f32247
--- /dev/null
+++ b/apps/analytics/src/analytics-services/posthog.ts
@@ -0,0 +1,53 @@
+import _posthog from 'posthog-js'
+import { POSTHOG_API_HOST, POSTHOG_TOKEN, POSTHOG_UI_HOST } from '../constants'
+import { AnalyticsService } from './analytics-service'
+
+class PosthogAnalyticsService extends AnalyticsService {
+	override initialize() {
+		// Make posthog available globally
+		if (typeof window !== 'undefined') {
+			window.posthog = _posthog
+		}
+
+		_posthog.init(POSTHOG_TOKEN, {
+			api_host: POSTHOG_API_HOST,
+			ui_host: POSTHOG_UI_HOST,
+			capture_pageview: 'history_change',
+			cookieless_mode: 'on_reject',
+		})
+	}
+
+	override enable() {
+		if (this.isEnabled) return
+		_posthog.opt_in_capturing()
+		this.isEnabled = true
+	}
+
+	override disable() {
+		if (!this.isEnabled) return
+		_posthog.setPersonProperties({ analytics_consent: false })
+		_posthog.opt_out_capturing()
+		this.isEnabled = false
+	}
+
+	override identify(userId: string, properties?: { [key: string]: any }) {
+		_posthog.identify(userId, {
+			...properties,
+			analytics_consent: true,
+		})
+	}
+
+	override reset() {
+		_posthog.reset()
+	}
+
+	override trackEvent(name: string, data?: { [key: string]: any }) {
+		_posthog.capture(name, data)
+	}
+
+	override trackPageview() {
+		_posthog.capture('$pageview')
+	}
+}
+
+export const posthogService = new PosthogAnalyticsService()
diff --git a/apps/analytics/src/analytics-services/reo.ts b/apps/analytics/src/analytics-services/reo.ts
new file mode 100644
index 000000000000..45957fb55377
--- /dev/null
+++ b/apps/analytics/src/analytics-services/reo.ts
@@ -0,0 +1,39 @@
+import { REO_CLIENT_ID, REO_SCRIPT_ID, REO_SCRIPT_URL } from '../constants'
+import { AnalyticsService } from './analytics-service'
+
+class ReoAnalyticsService extends AnalyticsService {
+	override enable() {
+		if (this.isEnabled) return
+		const reoScriptTag = document.createElement('script')
+		reoScriptTag.id = REO_SCRIPT_ID
+		reoScriptTag.src = REO_SCRIPT_URL
+		reoScriptTag.defer = true
+		reoScriptTag.onload = () => window.Reo?.init?.({ clientID: REO_CLIENT_ID })
+		document.head.appendChild(reoScriptTag)
+		this.isEnabled = true
+	}
+
+	override disable() {
+		if (!this.isEnabled) return
+		window.Reo?.reset?.()
+		this.isEnabled = false
+	}
+
+	override dispose() {
+		const reoScriptTag = document.getElementById(REO_SCRIPT_ID)
+		if (reoScriptTag) reoScriptTag.remove()
+		this.isEnabled = false
+	}
+
+	override identify(userId: string, properties?: { [key: string]: any }) {
+		window.Reo?.identify?.({
+			...properties,
+			userId,
+			firstname: properties?.name || '',
+			username: properties?.email || '',
+			type: 'email',
+		})
+	}
+}
+
+export const reoService = new ReoAnalyticsService()
diff --git a/apps/analytics/src/analytics.tsx b/apps/analytics/src/analytics.tsx
deleted file mode 100644
index e7b83aa51411..000000000000
--- a/apps/analytics/src/analytics.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-import Cookies from 'js-cookie'
-import posthog from 'posthog-js'
-import { Dialog as _Dialog, Switch as _Switch } from 'radix-ui'
-import { useEffect, useState } from 'react'
-import ReactGA from 'react-ga4'
-import './styles.css'
-
-type CookieConsent = 'unknown' | 'opted-in' | 'opted-out'
-let isConfigured = false
-let storedUserId: string = ''
-let storedProperties: { [key: string]: any } | undefined = undefined
-let storedHasConsent: CookieConsent = 'unknown'
-window.posthog = posthog
-
-// Add theme detection
-function getTheme() {
-	const html = document.documentElement
-	const colorScheme = html.getAttribute('style')?.includes('color-scheme: dark') ? 'dark' : 'light'
-	return colorScheme
-}
-
-export default function Analytics() {
-	const [isLoaded, setIsLoaded] = useState(false)
-	const [hasConsent, setHasConsent] = useState<CookieConsent>('unknown')
-	const [theme, setTheme] = useState<'light' | 'dark'>(getTheme())
-
-	// Add theme observer
-	useEffect(() => {
-		const observer = new MutationObserver((mutations) => {
-			mutations.forEach((mutation) => {
-				if (mutation.attributeName === 'style') {
-					setTheme(getTheme())
-				}
-			})
-		})
-
-		observer.observe(document.documentElement, {
-			attributes: true,
-			attributeFilter: ['style'],
-		})
-
-		return () => observer.disconnect()
-	}, [])
-
-	const onConsentChanged = (hasConsent: boolean) => {
-		Cookies.set('allowTracking', hasConsent ? 'true' : 'false')
-		setHasConsent(hasConsent ? 'opted-in' : 'opted-out')
-		track('consent_changed', { consent: hasConsent })
-	}
-
-	useEffect(() => {
-		const consent = Cookies.get('allowTracking')
-		setHasConsent(consent === 'true' ? 'opted-in' : consent === 'false' ? 'opted-out' : 'unknown')
-		setIsLoaded(true)
-	}, [])
-
-	useEffect(() => {
-		if (!isConfigured) {
-			posthog.init('phc_i8oKgMzgV38sn3GfjswW9mevQ3gFlo7bJXekZFeDN6', {
-				api_host: 'https://analytics.tldraw.com/i',
-				ui_host: 'https://eu.i.posthog.com',
-				persistence: 'memory',
-				capture_pageview: 'history_change',
-			})
-
-			if (window.TL_GA4_MEASUREMENT_ID) {
-				ReactGA.gtag('consent', 'default', {
-					ad_storage: 'denied',
-					ad_user_data: 'denied',
-					ad_personalization: 'denied',
-					analytics_storage: 'denied',
-					// Wait for our cookie to load.
-					wait_for_update: 500,
-				})
-				ReactGA.initialize(window.TL_GA4_MEASUREMENT_ID, {
-					gaOptions: {
-						anonymize_ip: true,
-					},
-				})
-
-				// Add Google Ads configuration if present
-				if (window.TL_GOOGLE_ADS_ID) {
-					ReactGA.gtag('config', window.TL_GOOGLE_ADS_ID)
-				}
-			}
-
-			isConfigured = true
-		}
-
-		storedHasConsent = hasConsent
-		if (hasConsent === 'opted-in') {
-			posthog.set_config({ persistence: 'localStorage+cookie' })
-			posthog.opt_in_capturing()
-			ReactGA.set({ anonymize_ip: false })
-
-			ReactGA.gtag('consent', 'update', {
-				ad_user_data: 'granted',
-				ad_personalization: 'granted',
-				ad_storage: 'granted',
-				analytics_storage: 'granted',
-			})
-
-			if (storedUserId && storedProperties) {
-				identify(storedUserId, storedProperties)
-			}
-
-			// Add Hubspot analytics
-			if (!document.getElementById('hs-script-loader')) {
-				const hubspotScriptTag = document.createElement('script')
-				hubspotScriptTag.id = 'hs-script-loader'
-				hubspotScriptTag.src = `https://js-eu1.hs-scripts.com/145620695.js`
-				hubspotScriptTag.defer = true
-				document.head.appendChild(hubspotScriptTag)
-			}
-
-			// Add Reo analytics
-			if (!document.getElementById('reo-script-loader')) {
-				const reoId = '47839e47a5ed202'
-				const reoScriptTag = document.createElement('script')
-				reoScriptTag.id = 'reo-script-loader'
-				reoScriptTag.src = `https://static.reo.dev/${reoId}/reo.js`
-				reoScriptTag.defer = true
-				reoScriptTag.onload = () => window.Reo.init({ clientID: reoId })
-				document.head.appendChild(reoScriptTag)
-			}
-		} else {
-			posthog.setPersonProperties({ analytics_consent: false })
-			posthog.reset()
-			posthog.set_config({ persistence: 'memory' })
-			posthog.opt_out_capturing()
-			ReactGA.reset()
-			ReactGA.set({ anonymize_ip: true })
-			ReactGA.gtag('consent', 'update', {
-				ad_user_data: 'denied',
-				ad_personalization: 'denied',
-				ad_storage: 'denied',
-				analytics_storage: 'denied',
-			})
-			window.Reo?.reset?.()
-		}
-	}, [hasConsent])
-
-	if (!isLoaded || hasConsent !== 'unknown') return null
-
-	return (
-		<div className="tl-analytics-banner" data-theme={theme}>
-			<p>
-				We use cookies on this website.
-				<br /> Learn more in our{' '}
-				<a href="https://tldraw.notion.site/devcookiepolicy" target="_blank" rel="noreferrer">
-					Cookie Policy
-				</a>
-				.
-			</p>
-			<div className="tl-analytics-buttons">
-				<button
-					className="tl-analytics-button tl-analytics-button-secondary"
-					onClick={() => onConsentChanged(false)}
-				>
-					Opt out
-				</button>
-				<button
-					className="tl-analytics-button tl-analytics-button-primary"
-					onClick={() => onConsentChanged(true)}
-				>
-					<div className="tl-analytics-button-text-wrapper">
-						<div className="tl-analytics-button-text">Accept all</div>
-					</div>
-				</button>
-			</div>
-		</div>
-	)
-}
-
-export function page() {
-	posthog.capture('$pageview')
-	ReactGA.send('pageview')
-}
-
-export function identify(userId: string, properties?: { [key: string]: any }) {
-	storedUserId = userId
-	storedProperties = properties
-
-	if (storedHasConsent !== 'opted-in') return
-
-	posthog.identify(userId, {
-		properties,
-		analytics_consent: true,
-	})
-	ReactGA.set({ userId })
-	ReactGA.set(properties)
-	window.Reo?.identify?.({
-		...properties,
-		userId,
-		firstname: properties?.name || '',
-		username: properties?.email || '',
-		type: 'email',
-	})
-}
-
-export function track(name: string, data?: { [key: string]: any }) {
-	posthog.capture(name, data)
-	ReactGA.event(name, data)
-}
-
-export function gtag(...args: any[]) {
-	if (storedHasConsent !== 'opted-in') return
-	// @ts-ignore - ReactGA.gtag accepts variable arguments
-	ReactGA.gtag(...args)
-}
-
-export function PrivacySettings() {
-	const hasConsent: CookieConsent =
-		Cookies.get('allowTracking') === 'true' ? 'opted-in' : 'opted-out'
-	const [isChecked, setIsChecked] = useState(hasConsent === 'opted-in')
-	const [theme, setTheme] = useState<'light' | 'dark'>(getTheme())
-
-	// Add theme observer
-	useEffect(() => {
-		const observer = new MutationObserver((mutations) => {
-			mutations.forEach((mutation) => {
-				if (mutation.attributeName === 'style') {
-					setTheme(getTheme())
-				}
-			})
-		})
-
-		observer.observe(document.documentElement, {
-			attributes: true,
-			attributeFilter: ['style'],
-		})
-
-		return () => observer.disconnect()
-	}, [])
-
-	const onChange = (checked: boolean) => {
-		Cookies.set('allowTracking', checked ? 'true' : 'false')
-		setIsChecked(checked)
-	}
-
-	const onHide = () => {
-		// Need this for the settings to take effect on the consent banner.
-		window.location.reload()
-	}
-
-	return (
-		<_Dialog.Root open>
-			<_Dialog.Portal>
-				<_Dialog.Overlay className="tl-analytics-dialog" data-theme={theme} />
-				<div className="tl-analytics-dialog-wrapper" data-theme={theme}>
-					<_Dialog.Content
-						onInteractOutside={onHide}
-						onPointerDownOutside={onHide}
-						onEscapeKeyDown={onHide}
-						className="tl-analytics-dialog-content"
-					>
-						<_Dialog.Title className="tl-analytics-dialog-title">Privacy settings</_Dialog.Title>
-						<_Dialog.Description className="tl-analytics-dialog-body">
-							This website uses cookies to collect analytics from visitors. Read our{' '}
-							<a href="https://tldraw.notion.site/devcookiepolicy" target="_blank" rel="noreferrer">
-								cookie policy
-							</a>{' '}
-							to learn more.
-						</_Dialog.Description>
-						<_Dialog.Close className="tl-analytics-dialog-close" asChild>
-							<button aria-label="Close" onClick={onHide}>
-								<svg width="24" height="24" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-									<path
-										strokeLinecap="round"
-										strokeLinejoin="round"
-										strokeWidth={2}
-										d="M6 18L18 6M6 6l12 12"
-									/>
-								</svg>
-							</button>
-						</_Dialog.Close>
-
-						<div className="tl-analytics-checkbox-group">
-							<label className="tl-analytics-checkbox-label" htmlFor="privacy-analytics">
-								<strong>Analytics</strong>
-								<br />
-								Optional. Help us understand how people use this website so that we can make it
-								better.
-							</label>
-							<div>
-								<_Switch.Root
-									className="tl-analytics-checkbox"
-									id="privacy-analytics"
-									checked={isChecked}
-									onCheckedChange={onChange}
-								>
-									<_Switch.Thumb />
-								</_Switch.Root>
-							</div>
-						</div>
-					</_Dialog.Content>
-				</div>
-			</_Dialog.Portal>
-		</_Dialog.Root>
-	)
-}
diff --git a/apps/analytics/src/components/CookieConsentBanner.ts b/apps/analytics/src/components/CookieConsentBanner.ts
new file mode 100644
index 000000000000..7440434999df
--- /dev/null
+++ b/apps/analytics/src/components/CookieConsentBanner.ts
@@ -0,0 +1,85 @@
+import { DOT_DEV_COOKIE_POLICY_URL } from '../constants'
+import { CookieConsentState } from '../state/cookie-consent-state'
+import { ThemeState } from '../state/theme-state'
+
+export function createCookieConsentBanner(
+	cookieConsentState: CookieConsentState,
+	themeState: ThemeState
+): HTMLElement | null {
+	const consent = cookieConsentState.getValue()
+	const theme = themeState.getValue()
+
+	// Don't show banner if consent is already given
+	if (consent !== 'unknown') return null
+
+	// Create banner element
+	const banner = document.createElement('div')
+	banner.className = 'tl-analytics-banner'
+	banner.setAttribute('data-theme', theme)
+
+	// Create content
+	banner.innerHTML = `
+		<p class="tl-analytics-banner__text">
+			We use cookies on this website.
+			<br>
+			Learn more in our <a class="tl-analytics-banner__link" href="${DOT_DEV_COOKIE_POLICY_URL}" target="_blank" rel="noreferrer">Cookie Policy</a>.
+		</p>
+		<div class="tl-analytics-banner__buttons">
+			<button class="tl-analytics-button tl-analytics-button--secondary" data-action="opt-out">
+				Opt out
+			</button>
+			<button class="tl-analytics-button tl-analytics-button--primary" data-action="accept">
+				<div class="tl-analytics-button__text-wrapper">
+					<div class="tl-analytics-button__text">Accept all</div>
+				</div>
+			</button>
+		</div>
+	`
+
+	// Add event listeners
+	banner.addEventListener('click', (e: Event) => {
+		const target = e.target as HTMLElement
+		const action = target.closest('[data-action]')?.getAttribute('data-action')
+		if (action === 'opt-out') {
+			cookieConsentState.setValue('opted-out')
+		} else if (action === 'accept') {
+			cookieConsentState.setValue('opted-in')
+		}
+	})
+
+	const consentCleanup = cookieConsentState.subscribe((consent) => {
+		if (consent !== 'unknown') {
+			banner.remove()
+		}
+	})
+
+	// Watch for theme changes
+	const themeCleanup = themeState.subscribe((theme) => {
+		banner.setAttribute('data-theme', theme)
+	})
+
+	// Clean up observer when banner is removed
+	const originalRemove = banner.remove.bind(banner)
+	banner.remove = function () {
+		originalRemove()
+		themeCleanup()
+		consentCleanup()
+	}
+
+	return banner
+}
+
+// Auto-mount function for easy integration
+export function mountCookieConsentBanner(
+	cookieConsentState: CookieConsentState,
+	themeState: ThemeState,
+	container: HTMLElement
+): HTMLElement | null {
+	const existingBanner = document.querySelector('.tl-analytics-banner')
+	if (existingBanner) existingBanner.remove()
+
+	const banner = createCookieConsentBanner(cookieConsentState, themeState)
+	if (banner) container.appendChild(banner)
+
+	return banner
+}
diff --git a/apps/analytics/src/components/PrivacySettingsDialog.ts b/apps/analytics/src/components/PrivacySettingsDialog.ts
new file mode 100644
index 000000000000..4993b48ad951
--- /dev/null
+++ b/apps/analytics/src/components/PrivacySettingsDialog.ts
@@ -0,0 +1,132 @@
+import { DOT_DEV_COOKIE_POLICY_URL } from '../constants'
+import { CookieConsentState } from '../state/cookie-consent-state'
+import { ThemeState } from '../state/theme-state'
+
+export function createPrivacySettingsDialog(
+	cookieConsentState: CookieConsentState,
+	themeState: ThemeState
+): HTMLElement {
+	const consent = cookieConsentState.getValue()
+	const theme = themeState.getValue()
+
+	// Create dialog container
+	const dialogContainer = document.createElement('div')
+	dialogContainer.className = 'tl-analytics-dialog'
+
+	// Create overlay and dialog
+	const overlay = document.createElement('div')
+	overlay.className = 'tl-analytics-dialog__overlay'
+	overlay.setAttribute('data-theme', theme)
+
+	const dialogWrapper = document.createElement('div')
+	dialogWrapper.className = 'tl-analytics-dialog__wrapper'
+	dialogWrapper.setAttribute('data-theme', theme)
+
+	const dialog = document.createElement('div')
+	dialog.className = 'tl-analytics-dialog__content'
+
+	// Create dialog content
+	dialog.innerHTML = `
+		<div class="tl-analytics-dialog__header">
+			<h2 class="tl-analytics-dialog__title">Privacy settings</h2>
+			<button class="tl-analytics-dialog__close" aria-label="Close">
+				<svg width="15" height="15" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+					<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
+				</svg>
+			</button>
+		</div>
+		<p class="tl-analytics-dialog__body">
+			This website uses cookies to collect analytics from visitors. Read our
+			<a href="${DOT_DEV_COOKIE_POLICY_URL}" target="_blank" rel="noreferrer">cookie policy</a>
+			to learn more.
+		</p>
+		<div class="tl-analytics-dialog__checkbox-group">
+			<label class="tl-analytics-checkbox__label" for="privacy-analytics">
+				<strong>Analytics</strong> help us understand how people use this website so that we can make it better.
+			</label>
+			<div>
+				<button class="tl-analytics-checkbox ${consent === 'opted-in' ? 'checked' : ''}" id="privacy-analytics" role="switch" aria-checked="${consent === 'opted-in'}">
+					<span class="tl-analytics-checkbox__thumb"></span>
+				</button>
+			</div>
+		</div>
+	`
+
+	// Add event listeners
+	const closeButton = dialog.querySelector('.tl-analytics-dialog__close') as HTMLButtonElement
+	const switchButton = dialog.querySelector('.tl-analytics-checkbox') as HTMLButtonElement
+
+	function closeDialog() {
+		dialogContainer.remove()
+	}
+
+	closeButton.addEventListener('click', closeDialog)
+
+	// Close on overlay click
+	overlay.addEventListener('click', closeDialog)
+
+	// Prevent closing when clicking inside dialog
+	dialog.addEventListener('click', (e: Event) => e.stopPropagation())
+
+	// Handle ESC key
+	function handleKeyDown(e: KeyboardEvent) {
+		if (e.key === 'Escape') {
+			closeDialog()
+		}
+	}
+	document.addEventListener('keydown', handleKeyDown)
+
+	// Handle switch toggle
+	switchButton.addEventListener('click', () => {
+		const currentConsent = cookieConsentState.getValue()
+		cookieConsentState.setValue(currentConsent === 'opted-in' ? 'opted-out' : 'opted-in')
+	})
+
+	// Watch for consent changes
+	const cleanupConsent = cookieConsentState.subscribe((consent) => {
+		if (consent === 'opted-in') {
+			switchButton.classList.add('checked')
+			switchButton.setAttribute('aria-checked', 'true')
+		} else {
+			switchButton.classList.remove('checked')
+			switchButton.setAttribute('aria-checked', 'false')
+		}
+	})
+
+	// Watch for theme changes
+	const cleanupTheme = themeState.subscribe((theme) => {
+		overlay.setAttribute('data-theme', theme)
+		dialogWrapper.setAttribute('data-theme', theme)
+	})
+
+	// Clean up observer when dialog is removed
+	const originalRemove = dialogContainer.remove.bind(dialogContainer)
+	dialogContainer.remove = function () {
+		document.removeEventListener('keydown', handleKeyDown)
+		originalRemove()
+		cleanupTheme()
+		cleanupConsent()
+	}
+
+	// Assemble dialog
+	dialogWrapper.appendChild(dialog)
+	dialogContainer.appendChild(overlay)
+	dialogContainer.appendChild(dialogWrapper)
+
+	return dialogContainer
+}
+
+// Auto-mount function for easy integration
+export function mountPrivacySettingsDialog(
+	cookieConsentState: CookieConsentState,
+	themeState: ThemeState,
+	container: HTMLElement
+): HTMLElement {
+	const existingDialog = document.querySelector('.tl-analytics-dialog')
+	if (existingDialog) existingDialog.remove()
+
+	const dialog = createPrivacySettingsDialog(cookieConsentState, themeState)
+	if (dialog) container.appendChild(dialog)
+
+	return dialog
+}
diff --git a/apps/analytics/src/constants.ts b/apps/analytics/src/constants.ts
new file mode 100644
index 000000000000..e5a0f9c3c1dc
--- /dev/null
+++ b/apps/analytics/src/constants.ts
@@ -0,0 +1,23 @@
+// All analytics use the same cookie policy URL.
+export const DOT_DEV_COOKIE_POLICY_URL = 'https://tldraw.notion.site/devcookiepolicy'
+
+// All analytics use the same cookie to store consent.
+export const CONSENT_COOKIE_NAME = 'allowTracking'
+export const CONSENT_CHANGED_EVENT = 'tl-analytics-consent-changed'
+
+// All analytics are fed into the same HubSpot project.
+export const HUBSPOT_SCRIPT_ID = 'hs-script-loader'
+export const HUBSPOT_SCRIPT_URL = 'https://js-eu1.hs-scripts.com/145620695.js'
+
+// All analytics are fed into the same Reo project.
+export const REO_SCRIPT_ID = 'reo-script-loader'
+export const REO_CLIENT_ID = '47839e47a5ed202'
+export const REO_SCRIPT_URL = `https://static.reo.dev/${REO_CLIENT_ID}/reo.js`
+
+// All analytics are fed into the same PostHog project.
+export const POSTHOG_TOKEN = 'phc_i8oKgMzgV38sn3GfjswW9mevQ3gFlo7bJXekZFeDN6'
+export const POSTHOG_API_HOST = 'https://analytics.tldraw.com/i'
+export const POSTHOG_UI_HOST = 'https://eu.i.posthog.com'
+
+// Google Tag Manager configuration.
+export const GTM_SCRIPT_ID = 'gtm-script-loader'
diff --git a/apps/analytics/src/index.ts b/apps/analytics/src/index.ts
index d35083c7bd87..296efdbd4017 100644
--- a/apps/analytics/src/index.ts
+++ b/apps/analytics/src/index.ts
@@ -1,53 +1,311 @@
-import React from 'react'
-import { createRoot } from 'react-dom/client'
-import Analytics, { gtag, identify, page, PrivacySettings, track } from './analytics'
+import { ga4Gtag, ga4Service } from './analytics-services/ga4'
+import { gtmService } from './analytics-services/gtm'
+import { hubspotService } from './analytics-services/hubspot'
+import { posthogService } from './analytics-services/posthog'
+import { reoService } from './analytics-services/reo'
+import { mountCookieConsentBanner } from './components/CookieConsentBanner'
+import { mountPrivacySettingsDialog } from './components/PrivacySettingsDialog'
+import {
+	clearCookieValue,
+	CookieConsentState,
+	cookieConsentToCookieValue,
+	cookieValueToCookieConsent,
+	getCookieValue,
+	setCookieValue,
+} from './state/cookie-consent-state'
+import { ThemeState } from './state/theme-state'
 import styles from './styles.css?inline'
+import { ConsentPreferences, CookieConsent } from './types'
+import { shouldRequireConsent } from './utils/consent-check'
 
-// Inject styles
-const style = document.createElement('style')
-style.textContent = styles
-document.head.appendChild(style)
-
-// Create a container for our analytics component
-const container = document.createElement('div')
-container.id = 'tl-analytics-root'
-document.body.appendChild(container)
-
-// Initialize the analytics component
-const root = createRoot(container)
-root.render(React.createElement(Analytics))
-
-// Expose global functions
-declare global {
-	interface Window {
-		tlanalytics: {
-			openPrivacySettings(): void
-			page(): void
-			identify(userId: string, properties?: { [key: string]: any }): void
-			track(name: string, data?: { [key: string]: any }): void
-			gtag(...args: any[]): void
-		}
-		TL_GA4_MEASUREMENT_ID: string | undefined
-		TL_GOOGLE_ADS_ID?: string
-		Reo: any
-		posthog: any
+function cookieConsentToPreferences(consent: CookieConsent): ConsentPreferences {
+	if (consent === 'opted-in') {
+		return { analytics: 'granted', marketing: 'granted' }
 	}
+	return { analytics: 'denied', marketing: 'denied' }
 }
 
-// Create a container for the privacy settings dialog
-const privacyContainer = document.createElement('div')
-privacyContainer.id = 'tl-analytics-privacy-root'
-document.body.appendChild(privacyContainer)
-
-const privacyRoot = createRoot(privacyContainer)
-
-// Expose the global function to open privacy settings
-window.tlanalytics = {
-	openPrivacySettings: () => {
-		privacyRoot.render(React.createElement(PrivacySettings))
-	},
-	page,
-	identify,
-	track,
-	gtag,
+class Analytics {
+	private userId = '' as string
+	private userProperties = {} as { [key: string]: any } | undefined
+	private consent = 'unknown' as CookieConsent
+	private consentOptInType: 'manual' | 'auto' = 'manual'
+	private consentCallbacks: Array<(preferences: ConsentPreferences) => void> = []
+	private isInitialized = false
+
+	private services = [posthogService, ga4Service, gtmService, hubspotService, reoService]
+
+	async initialize() {
+		// Inject styles
+		const style = document.createElement('style')
+		style.textContent = styles
+		document.head.appendChild(style)
+
+		// Initialize the analytics services
+		for (const service of this.services) {
+			service.initialize()
+		}
+
+		// Set up our mini reactive states
+
+		const themeState = new ThemeState('light')
+		themeState.initialize()
+
+		const cookieConsentState = new CookieConsentState('unknown')
+		cookieConsentState.initialize()
+
+		// Subscribe to consent changes
+		cookieConsentState.subscribe((consent) => {
+			// Set (or clear) the cookie value
+			const cookieValue = cookieConsentToCookieValue(consent)
+			if (cookieValue) setCookieValue(cookieValue)
+			else clearCookieValue()
+
+			// If the consent is the same as the current consent, do nothing
+			if (consent === this.consent) return
+
+			const wasUnknown = this.consent === 'unknown'
+			this.consent = consent
+
+			// Track the consent change (after enabling or disabling)
+			const consentState =
+				consent === 'opted-in'
+					? {
+							ad_user_data: 'granted',
+							ad_personalization: 'granted',
+							ad_storage: 'granted',
+							analytics_storage: 'granted',
+						}
+					: {
+							ad_user_data: 'denied',
+							ad_personalization: 'denied',
+							ad_storage: 'denied',
+							analytics_storage: 'denied',
+						}
+
+			if (this.consent === 'opted-in') {
+				// Enable the analytics services only when consent is granted
+				for (const service of this.services) {
+					service.enable()
+				}
+
+				// We have to enable services first, then track the event
+				this.track('consent_update', { consent: consentState })
+				// Identify the user if we have a userId. Most of the time
+				// identify() should be called off of the window.tlanalytics object, ie. in an app
+				// where we have a user id and properties for that app (like tldraw computer). We do
+				// it here, too, so that we can re-identify a user who has opted out of analytics
+				// and then opts back in within the same session. We would have their user id and properties
+				// in memory (from the first time they called identify) and would re-use them here.
+				if (this.userId) {
+					this.identify(this.userId, this.userProperties)
+				}
+			} else {
+				// We need to track the event first, then disable services or the opt out won't get tracked
+				this.track('consent_update', { consent: consentState })
+				// Disable the analytics services when consent is revoked or when consent is unknown
+				for (const service of this.services) {
+					service.disable()
+				}
+			}
+
+			// Track consent selection only if user actually interacted with banner (not during initialization)
+			if (this.isInitialized && wasUnknown && consent !== 'unknown') {
+				const preferences = cookieConsentToPreferences(consent)
+				for (const service of this.services) {
+					service.trackConsentBannerSelected?.({
+						consent_analytics: preferences.analytics,
+						consent_marketing: preferences.marketing,
+						consent_opt_in_type: this.consentOptInType,
+					})
+				}
+			}
+
+			// Notify consent callbacks
+			if (consent !== 'unknown') {
+				const preferences = cookieConsentToPreferences(consent)
+				for (const callback of this.consentCallbacks) {
+					callback(preferences)
+				}
+			}
+		})
+
+		// ...also we stash a few things onto the window in case we need them elsewhere
+		window.tlanalytics = {
+			identify: this.identify.bind(this),
+			reset: this.reset.bind(this),
+			track: this.track.bind(this),
+			page: this.page.bind(this),
+			gtag: this.gtag.bind(this),
+			getConsentState: () => cookieConsentToPreferences(this.consent),
+			onConsentUpdate: (callback: (preferences: ConsentPreferences) => void) => {
+				this.consentCallbacks.push(callback)
+				return () => {
+					const index = this.consentCallbacks.indexOf(callback)
+					if (index > -1) this.consentCallbacks.splice(index, 1)
+				}
+			},
+			trackCopyCode: this.trackCopyCode.bind(this),
+			trackFormSubmission: this.trackFormSubmission.bind(this),
+			openPrivacySettings() {
+				mountPrivacySettingsDialog(cookieConsentState, themeState, document.body)
+			},
+		}
+
+		// Now that we have our subscriber set up, determine the initial consent state.
+		// If the user has already made a choice (cookie exists), use that.
+		// Otherwise, check their location to determine if we need explicit consent.
+		const initialCookieValue = getCookieValue()
+		let initialConsent: CookieConsent
+
+		if (initialCookieValue) {
+			// User has previously made a consent decision - respect it
+			initialConsent = cookieValueToCookieConsent(initialCookieValue)
+		} else {
+			// No existing consent decision - check if we need to ask based on location
+			const requiresConsent = await shouldRequireConsent()
+			if (requiresConsent === 'requires-consent') {
+				initialConsent = 'unknown'
+				this.consentOptInType = 'manual'
+			} else {
+				initialConsent = 'opted-in'
+				this.consentOptInType = 'auto'
+			}
+		}
+
+		// This will trigger the subscriber we set up earlier, which will
+		// enable/disable the analytics services accordingly
+		cookieConsentState.setValue(initialConsent)
+
+		// Now that we have the consent value in memory, we can initialize
+		// the cookie consent banner and start showing some UI (if consent is unknown)
+		const banner = mountCookieConsentBanner(cookieConsentState, themeState, document.body)
+
+		// Track banner display if banner was shown
+		if (banner) {
+			for (const service of this.services) {
+				service.trackConsentBannerDisplayed?.({
+					consent_opt_in_type: this.consentOptInType,
+				})
+			}
+		}
+
+		// Mark initialization as complete - any consent changes after this are user interactions
+		this.isInitialized = true
+	}
+
+	/**
+	 * Wrap and guard google analytics tag. This should be called from window.tlanalytics, ie. in an app where we have a user id and properties for that app (like tldraw computer).
+	 *
+	 * @param args - The arguments to pass to the google analytics tag
+	 * @returns void
+	 */
+	gtag(...args: any[]) {
+		if (this.consent !== 'opted-in') return
+		ga4Gtag(...args)
+	}
+
+	/**
+	 * Identify the user across all analytics services. This should be called from window.tlanalytics, ie. in an app where we have a user id and properties for that app (like tldraw computer).
+	 *
+	 * @param userId - The user id to identify the user by
+	 * @param properties - The properties to identify the user by
+	 * @returns void
+	 */
+	identify(userId: string, properties?: { [key: string]: any }) {
+		this.userId = userId
+		this.userProperties = properties
+
+		if (this.consent !== 'opted-in') return
+
+		for (const service of this.services) {
+			service.identify(userId, properties)
+		}
+	}
+
+	/**
+	 * Reset the user identity across all analytics services. This should be called from window.tlanalytics when a user logs out.
+	 *
+	 * @returns void
+	 */
+	reset() {
+		this.userId = ''
+		this.userProperties = undefined
+
+		for (const service of this.services) {
+			service.reset()
+		}
+	}
+
+	/**
+	 * Track an event across all analytics services. This should be called from window.tlanalytics, ie. in an app where we have a user id and properties for that app (like tldraw computer).
+	 *
+	 * @param name - The name of the event to track
+	 * @param data - The data to track with the event
+	 * @returns void
+	 */
+	track(name: string, data?: { [key: string]: any }) {
+		for (const service of this.services) {
+			service.trackEvent(name, data)
+		}
+	}
+
+	/**
+	 * Track a page view across all analytics services. This should be called from window.tlanalytics, ie. in an app where we have a user id and properties for that app (like tldraw computer).
+	 *
+	 * @returns void
+	 */
+	page() {
+		for (const service of this.services) {
+			service.trackPageview()
+		}
+	}
+
+	/**
+	 * Track code copy event. This should be called from window.tlanalytics when a user copies a code snippet.
+	 *
+	 * @param data - The code copy event data
+	 * @returns void
+	 */
+	trackCopyCode(data: {
+		page_category: string
+		text_snippet: string
+		user_email?: string
+		user_email_sha256?: string
+		user_first_name?: string
+		user_last_name?: string
+		user_phone_number?: string
+	}) {
+		for (const service of this.services) {
+			service.trackCopyCode?.(data)
+		}
+	}
+
+	/**
+	 * Track form submission event. This should be called from window.tlanalytics when a user submits a form.
+	 *
+	 * @param data - The form submission event data
+	 * @returns void
+	 */
+	trackFormSubmission(data: {
+		enquiry_type: string
+		company_size?: string
+		company_website?: string
+		user_email: string
+		user_email_sha256: string
+		user_first_name: string
+		user_last_name: string
+		user_phone_number?: string
+	}) {
+		for (const service of this.services) {
+			service.trackFormSubmission?.(data)
+		}
+	}
+}
+
+try {
+	const analytics = new Analytics()
+	analytics.initialize()
+} catch (error) {
+	console.error('Error initializing analytics manager:', error)
 }
diff --git a/apps/analytics/src/state/cookie-consent-state.ts b/apps/analytics/src/state/cookie-consent-state.ts
new file mode 100644
index 000000000000..f4bb8ab476c8
--- /dev/null
+++ b/apps/analytics/src/state/cookie-consent-state.ts
@@ -0,0 +1,35 @@
+import Cookies from 'js-cookie'
+import { CONSENT_COOKIE_NAME } from '../constants'
+import { type CookieConsent } from '../types'
+import { AnalyticsState } from './state'
+
+export function cookieConsentToCookieValue(consent: CookieConsent): string | undefined {
+	switch (consent) {
+		case 'opted-in':
+			return 'true'
+		case 'opted-out':
+			return 'false'
+		case 'unknown':
+			return undefined
+	}
+}
+
+export function getCookieValue(): string | undefined {
+	return Cookies.get(CONSENT_COOKIE_NAME)
+}
+
+export function setCookieValue(value: string): void {
+	Cookies.set(CONSENT_COOKIE_NAME, value)
+}
+
+export function clearCookieValue() {
+	Cookies.remove(CONSENT_COOKIE_NAME)
+}
+
+export function cookieValueToCookieConsent(cookieValue: string | undefined): CookieConsent {
+	if (cookieValue === 'true') return 'opted-in'
+	if (cookieValue === 'false') return 'opted-out'
+	return 'unknown'
+}
+
+export class CookieConsentState extends AnalyticsState<CookieConsent> {}
diff --git a/apps/analytics/src/state/state.test.ts b/apps/analytics/src/state/state.test.ts
new file mode 100644
index 000000000000..486bf4c04fa6
--- /dev/null
+++ b/apps/analytics/src/state/state.test.ts
@@ -0,0 +1,57 @@
+import { AnalyticsState } from './state'
+
+describe('mini reactive state', () => {
+	test('creates a state with an initial value', () => {
+		class MyState extends AnalyticsState<number> {}
+		const myState = new MyState(10)
+		expect(myState.getValue()).toBe(10)
+		const myOtherState = new MyState(20)
+		expect(myOtherState.getValue()).toBe(20)
+	})
+
+	test('updates the state', () => {
+		class MyState extends AnalyticsState<number> {}
+		const myState = new MyState(10)
+		myState.setValue(20)
+		expect(myState.getValue()).toBe(20)
+	})
+
+	test('handles subscribers', () => {
+		class MyState extends AnalyticsState<number> {}
+		const myState = new MyState(10)
+		const fn = vi.fn()
+		myState.subscribe((value) => fn(value))
+		myState.setValue(20)
+		expect(fn).toHaveBeenCalledWith(20)
+		expect(fn).toHaveBeenCalledOnce()
+	})
+
+	test('removes subscribers', () => {
+		class MyState extends AnalyticsState<number> {}
+		const myState = new MyState(10)
+		const fn = vi.fn()
+		const unsubscribe = myState.subscribe((value) => fn(value))
+		unsubscribe()
+		myState.setValue(20)
+		expect(fn).not.toHaveBeenCalled()
+	})
+
+	test('handles initializer / dispose', () => {
+		const someState = {} as { something?: boolean }
+
+		class MyState extends AnalyticsState<number> {
+			override initialize(): void {
+				someState.something = true
+			}
+			override dispose(): void {
+				delete someState.something
+			}
+		}
+		const myState = new MyState(10)
+		expect(someState.something).not.toBeDefined()
+		myState.initialize()
+		expect(someState.something).toBeDefined()
+		myState.dispose()
+		expect(someState.something).not.toBeDefined()
+	})
+})
diff --git a/apps/analytics/src/state/state.ts b/apps/analytics/src/state/state.ts
new file mode 100644
index 000000000000..492ed76da2a1
--- /dev/null
+++ b/apps/analytics/src/state/state.ts
@@ -0,0 +1,59 @@
+export class AnalyticsState<T> {
+	// The current value of the state.
+	protected value: T
+
+	// Set of listeners to notify when the state changes.
+	protected listeners = new Set<(value: T) => void>()
+
+	constructor(initialValue: T) {
+		this.value = initialValue
+	}
+
+	/**
+	 * Subscribe to the state change.
+	 *
+	 * @param listener - The listener to notify when the state changes.
+	 * @returns A function to unsubscribe the listener.
+	 */
+	subscribe(listener: (value: T) => void): () => void {
+		this.listeners.add(listener)
+		return () => this.listeners.delete(listener)
+	}
+
+	/**
+	 * Notify all listeners of the state change.
+	 */
+	notify() {
+		this.listeners.forEach((listener) => listener(this.value))
+	}
+
+	/**
+	 * Initialize the state.
+	 */
+	initialize(): void {}
+
+	/**
+	 * Clean up the state.
+	 */
+	dispose(): void {}
+
+	/**
+	 * Get the current value of the state.
+	 *
+	 * @returns The current value.
+	 */
+	getValue(): T {
+		return this.value
+	}
+
+	/**
+	 * Set the value of the state and notify all listeners.
+	 *
+	 * @param value - The new value to set.
+	 */
+	setValue(value: T): void {
+		if (value === this.value) return
+		this.value = value
+		this.notify()
+	}
+}
diff --git a/apps/analytics/src/state/theme-state.ts b/apps/analytics/src/state/theme-state.ts
new file mode 100644
index 000000000000..539852462778
--- /dev/null
+++ b/apps/analytics/src/state/theme-state.ts
@@ -0,0 +1,47 @@
+// This module provides theme detection utilities for analytics components
+// Since the analytics library is used on many sites, which all may use different themes,
+// we use the most general way of detecting light or dark theme by checking the
+// `color-scheme` CSS property on the `html` element.
+
+import { AnalyticsState } from './state'
+
+export class ThemeState extends AnalyticsState<'light' | 'dark'> {
+	private observer: MutationObserver | null = null
+
+	override initialize(): void {
+		// If document is not available, default to light theme
+		if (typeof document === 'undefined') {
+			this.value = 'light'
+			return
+		}
+
+		// Read initial theme from document
+		const docElm = document.documentElement
+		this.value = docElm.getAttribute('style')?.includes('color-scheme: dark') ? 'dark' : 'light'
+
+		if (typeof MutationObserver === 'undefined') {
+			// weird browser, we just won't set up the observer (we won't be able to detect theme changes)
+		} else {
+			const observer = new MutationObserver((mutations) => {
+				if (mutations.some((mutation) => mutation.attributeName === 'style')) {
+					this.setValue(
+						docElm.getAttribute('style')?.includes('color-scheme: dark') ? 'dark' : 'light'
+					)
+				}
+			})
+
+			observer.observe(document.documentElement, {
+				attributes: true,
+				attributeFilter: ['style'],
+			})
+
+			this.observer = observer
+		}
+	}
+	override dispose() {
+		if (this.observer) {
+			this.observer.disconnect()
+			this.observer = null
+		}
+	}
+}
diff --git a/apps/analytics/src/styles.css b/apps/analytics/src/styles.css
index 4e0193669109..20eaf9ef9ee3 100644
--- a/apps/analytics/src/styles.css
+++ b/apps/analytics/src/styles.css
@@ -1,138 +1,126 @@
 :root {
-	--tl-analytics-button-bg: #000000;
-	--tl-analytics-button-text: #ffffff;
-	--tl-analytics-bg: white;
-	--tl-analytics-text: #111827;
-	--tl-analytics-text-secondary: #374151;
-	--tl-analytics-border: #e5e7eb;
-	--tl-analytics-link: #3b82f6;
-	--tl-analytics-link-hover: #2563eb;
-	--tl-analytics-overlay: rgba(255, 255, 255, 0.9);
-	--tl-analytics-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
-}
-
-[data-theme='dark'] {
-	--tl-analytics-button-bg: #ffffff;
-	--tl-analytics-button-text: #000000;
-	--tl-analytics-bg: #18181b;
-	--tl-analytics-text: #f4f4f5;
-	--tl-analytics-text-secondary: #a1a1aa;
-	--tl-analytics-border: #27272a;
+	--tl-analytics-button-bg: hsl(0, 0%, 100%);
+	--tl-analytics-button-text: hsl(235, 6.8%, 13.5%);
+	--tl-analytics-bg: hsl(235, 6.8%, 13.5%);
+	--tl-analytics-text: hsl(0, 9%, 94%);
+	--tl-analytics-text-secondary: hsl(204, 4%, 75%);
 	--tl-analytics-link: #60a5fa;
 	--tl-analytics-link-hover: #93c5fd;
-	--tl-analytics-overlay: rgba(0, 0, 0, 0.9);
-	--tl-analytics-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.3), 0 2px 4px -1px rgba(0, 0, 0, 0.2);
+	--tl-analytics-overlay: rgba(0, 0, 0, 0.2);
+	--tl-analytics-shadow:
+		0px 1px 3px hsl(0, 0%, 0%, 66.6%), 0px 2px 6px hsl(0, 0%, 0%, 33%),
+		inset 0px 0px 0px 1px var(--tl-color-panel-contrast);
 }
 
-#tl-analytics-root {
-	font-weight: 400;
+[data-theme='dark'] {
+	--tl-analytics-button-bg: hsl(0, 0%, 0%);
+	--tl-analytics-button-text: hsl(0, 0%, 100%);
+	--tl-analytics-bg: hsl(0, 0%, 99%);
+	--tl-analytics-text: hsl(0, 0%, 0%);
+	--tl-analytics-text-secondary: hsl(204, 4%, 45%);
+	--tl-analytics-link: #3b82f6;
+	--tl-analytics-link-hover: #2563eb;
+	--tl-analytics-overlay: rgba(0, 0, 0, 0.45);
+	--tl-analytics-shadow:
+		0px 0px 2px hsl(0, 0%, 0%, 16%), 0px 2px 3px hsl(0, 0%, 0%, 24%),
+		0px 2px 6px hsl(0, 0%, 0%, 0.1), inset 0px 0px 0px 1px var(--tl-color-panel-contrast);
 }
 
 .tl-analytics-banner {
 	position: fixed;
 	z-index: 1000;
-	padding: 14px;
+	padding: 6px;
 	border-radius: 8px;
 	box-shadow: var(--tl-analytics-shadow);
-	border: 1px solid var(--tl-analytics-border);
 	background-color: var(--tl-analytics-bg);
 	display: flex;
 	flex-direction: column;
-	gap: 12px;
+	gap: 4px;
 	/* Inter is usually available on our properties */
 	font-family: 'Inter', sans-serif;
+	font-weight: 400;
 	/* Safe area aware overrides */
-	bottom: max(8px, env(safe-area-inset-bottom));
-	left: max(8px, env(safe-area-inset-left));
-	max-width: calc(
-		100% - max(8px, env(safe-area-inset-left)) - max(8px, env(safe-area-inset-right))
-	);
+	bottom: max(4px, env(safe-area-inset-bottom));
+	right: max(4px, env(safe-area-inset-right));
+	max-width: 240px;
 	/* Slide-in animation */
-	transform: translateY(120%);
-	animation: slideUp 5s ease-in-out forwards;
+	transform: translateY(110%);
+	animation: slideUp 5s ease-in forwards;
 	animation-delay: 2s;
 }
 
 @keyframes slideUp {
-	from {
-		transform: translateY(120%);
+	0% {
+		transform: translateY(110%);
 	}
-	to {
+	100% {
 		transform: translateY(0);
 	}
 }
 
-@media (min-width: 640px) {
-	.tl-analytics-banner {
-		flex-direction: row;
-		align-items: center;
-		gap: 32px;
-	}
-}
-
-.tl-analytics-banner p {
+.tl-analytics-banner__text {
 	font-size: 12px;
-	line-height: 1.5;
+	line-height: 1.4;
 	color: var(--tl-analytics-text);
 	margin: 0;
+	padding: 8px 8px 12px;
 }
 
-.tl-analytics-banner a {
+.tl-analytics-banner__link {
 	color: var(--tl-analytics-link);
 	text-decoration: none;
 }
 
-.tl-analytics-banner a:hover {
+.tl-analytics-banner__link:hover {
 	color: var(--tl-analytics-link-hover);
 }
 
-.tl-analytics-buttons {
+.tl-analytics-banner__buttons {
 	display: flex;
-	gap: 16px;
+	gap: 4px;
 	justify-content: space-between;
 	width: 100%;
-}
-
-@media (min-width: 640px) {
-	.tl-analytics-buttons {
-		width: auto;
-	}
+	flex-wrap: wrap;
 }
 
 .tl-analytics-button {
-	font-size: 14px;
+	font-size: 12px;
 	cursor: pointer;
 	text-decoration: none;
 	border: none;
-	padding: 8px 16px;
-	border-radius: 100px;
+	padding: 4px 8px;
+	border-radius: 6px;
+	white-space: nowrap;
+	flex-shrink: 0;
 }
 
-.tl-analytics-button-primary {
+.tl-analytics-button--primary {
+	font-weight: 500;
 	background-color: var(--tl-analytics-button-bg);
 	color: var(--tl-analytics-button-text);
-	font-weight: 500;
 	overflow: hidden;
 	position: relative;
+	padding: 6px 6px;
+	min-width: 96px;
 }
 
-.tl-analytics-button-text-wrapper {
+.tl-analytics-button__text-wrapper {
 	overflow: hidden;
 }
 
-.tl-analytics-button-text {
+.tl-analytics-button__text {
 	display: inline-block;
-	animation: marquee 3s linear infinite;
+	animation: marquee 2.5s linear infinite;
 	white-space: nowrap;
-	transform: translateX(100%);
+	transform: translateX(72px);
 }
 
 @keyframes marquee {
 	0% {
-		transform: translateX(100%);
+		transform: translateX(72px);
 	}
 	100% {
-		transform: translateX(-100%);
+		transform: translateX(-72px);
 	}
 }
 
@@ -143,102 +131,125 @@
 		transform: translateY(0);
 	}
 
-	.tl-analytics-button-text {
+	.tl-analytics-button__text {
 		animation: none;
 		transform: translateX(0);
 	}
 }
 
-.tl-analytics-button-secondary {
+.tl-analytics-button--secondary {
 	background: none;
-	color: var(--tl-analytics-text-secondary);
-	opacity: 0.82;
-	padding: 0px 0px;
-	margin: 0px 16px;
-}
-
-.tl-analytics-button-secondary:hover {
 	color: var(--tl-analytics-text);
 }
 
 .tl-analytics-dialog {
+	font-family: 'Inter', sans-serif;
+	color: var(--tl-analytics-text);
 	position: fixed;
 	inset: 0;
-	z-index: 100;
-	background-color: var(--tl-analytics-overlay);
-}
-
-.tl-analytics-dialog-wrapper {
-	position: fixed;
-	inset: 0;
-	z-index: 150;
+	z-index: 10000;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 	justify-content: center;
-	height: 100vh;
 }
 
-.tl-analytics-dialog-content {
+.tl-analytics-dialog__overlay {
+	position: fixed;
+	inset: 0;
+	background-color: var(--tl-analytics-overlay);
+	z-index: 1;
+}
+
+.tl-analytics-dialog__wrapper {
+	z-index: 2;
+}
+
+.tl-analytics-dialog__content {
 	position: relative;
-	max-width: 32rem;
-	padding: 2rem;
+	max-width: 350px;
+	min-width: 350px;
 	background-color: var(--tl-analytics-bg);
-	border-radius: 0.375rem;
+	border-radius: 8px;
 	box-shadow: var(--tl-analytics-shadow);
-	font-size: 1rem;
+	font-size: 12px;
+	line-height: 1.6;
 	text-align: left;
 }
 
-.tl-analytics-dialog-title {
-	font-weight: 700;
+.tl-analytics-dialog__header {
+	height: 40px;
+	padding-left: 12px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.tl-analytics-dialog__title {
+	font-weight: 500;
+	font-size: 12px;
 	color: var(--tl-analytics-text);
-	margin: 0 0 1rem 0;
+	margin: 0;
 }
 
-.tl-analytics-dialog-close {
-	position: absolute;
-	top: 8px;
-	right: 8px;
+.tl-analytics-dialog__close {
+	position: relative;
+	height: 40px;
+	width: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 	padding: 4px;
 	border: none;
 	background: none;
 	cursor: pointer;
-	color: var(--tl-analytics-text-secondary);
+	color: var(--tl-analytics-text);
 }
 
-.tl-analytics-dialog-close:hover {
-	color: var(--tl-analytics-text);
+@media (hover: hover) {
+	.tl-analytics-dialog__close::after {
+		content: '';
+		position: absolute;
+		inset: 4px;
+		background-color: var(--tl-analytics-overlay);
+		border-radius: 4px;
+		opacity: 0;
+	}
+	.tl-analytics-dialog__close:hover::after {
+		opacity: 0.2;
+	}
 }
 
-.tl-analytics-dialog-body {
-	margin-top: 1.5rem;
+.tl-analytics-dialog__body {
+	margin: 12px;
 }
 
-.tl-analytics-dialog-body p {
-	margin: 0 0 1rem 0;
+.tl-analytics-dialog__body p {
+	margin: 0;
 	color: var(--tl-analytics-text-secondary);
 }
 
-.tl-analytics-dialog-body a {
+.tl-analytics-dialog__body a {
+	display: inline-block;
 	color: var(--tl-analytics-link);
 	text-decoration: none;
 }
 
-.tl-analytics-dialog-body a:hover {
+.tl-analytics-dialog__body a:hover {
 	color: var(--tl-analytics-link-hover);
 }
 
-.tl-analytics-checkbox-group {
+.tl-analytics-dialog__checkbox-group {
 	display: flex;
 	align-items: center;
-	gap: 8px;
-	margin-bottom: 1rem;
+	gap: 12px;
+	margin: 12px;
+	padding-bottom: 12px;
 }
 
 .tl-analytics-checkbox {
-	width: 3rem;
-	height: 1.75rem;
+	width: 32px;
+	height: 20px;
 	background-color: var(--tl-analytics-text-secondary);
 	border-radius: 9999px;
 	position: relative;
@@ -247,33 +258,36 @@
 	padding: 0;
 }
 
-.tl-analytics-checkbox[data-state='checked'] {
-	background-color: var(--tl-analytics-link);
-}
-
-.tl-analytics-checkbox > span {
+.tl-analytics-checkbox__thumb {
 	display: block;
-	width: 1.25rem;
-	height: 1.25rem;
+	width: 16px;
+	height: 16px;
 	background-color: var(--tl-analytics-bg);
 	border-radius: 9999px;
 	transition: transform 100ms;
-	transform: translateX(0.25rem);
+	transform: translateX(2px);
 }
 
-.tl-analytics-checkbox[data-state='checked'] > span {
-	transform: translateX(1.5rem);
+.tl-analytics-checkbox[aria-checked='true'] {
+	background-color: var(--tl-analytics-link);
 }
 
-.tl-analytics-checkbox-label {
-	margin-top: 1.5rem;
-	margin-bottom: 0.5rem;
-	color: var(--tl-analytics-text-secondary);
+.tl-analytics-checkbox[aria-checked='true'] .tl-analytics-checkbox__thumb {
+	transform: translateX(14px);
 }
 
-.tl-analytics-dialog-footer {
-	margin-top: 1.5rem;
+.tl-analytics-checkbox__label {
+	margin: 0;
+	font-size: 12px;
+}
+
+.tl-analytics-dialog__footer {
+	padding: 0 8px 8px;
 	display: flex;
 	justify-content: flex-end;
-	gap: 8px;
+	gap: 4px;
+}
+
+body:has(.tl-analytics-dialog) .tl-analytics-banner {
+	opacity: 0;
 }
diff --git a/apps/analytics/src/types.ts b/apps/analytics/src/types.ts
new file mode 100644
index 000000000000..86e5bd1fb19f
--- /dev/null
+++ b/apps/analytics/src/types.ts
@@ -0,0 +1,46 @@
+// Expose global functions
+declare global {
+	interface Window {
+		tlanalytics: {
+			openPrivacySettings(): void
+			page(): void
+			identify(userId: string, properties?: { [key: string]: any }): void
+			reset(): void
+			track(name: string, data?: { [key: string]: any }): void
+			gtag(...args: any[]): void
+			getConsentState(): ConsentPreferences
+			onConsentUpdate(callback: (preferences: ConsentPreferences) => void): () => void
+			trackCopyCode(data: {
+				page_category: string
+				text_snippet: string
+				user_email?: string
+				user_email_sha256?: string
+				user_first_name?: string
+				user_last_name?: string
+				user_phone_number?: string
+			}): void
+			trackFormSubmission(data: {
+				enquiry_type: string
+				company_size?: string
+				company_website?: string
+				user_email: string
+				user_email_sha256: string
+				user_first_name: string
+				user_last_name: string
+				user_phone_number?: string
+			}): void
+		}
+		TL_GA4_MEASUREMENT_ID: string | undefined
+		TL_GOOGLE_ADS_ID?: string
+		TL_GTM_CONTAINER_ID?: string
+		Reo: any
+		posthog: any
+	}
+}
+
+export type CookieConsent = 'unknown' | 'opted-in' | 'opted-out'
+
+export interface ConsentPreferences {
+	analytics: 'granted' | 'denied'
+	marketing: 'granted' | 'denied'
+}
diff --git a/apps/analytics/src/utils/consent-check.ts b/apps/analytics/src/utils/consent-check.ts
new file mode 100644
index 000000000000..eb35bf1e98ea
--- /dev/null
+++ b/apps/analytics/src/utils/consent-check.ts
@@ -0,0 +1,27 @@
+type ConsentCheckResult = 'requires-consent' | 'no-consent-needed'
+
+/**
+ * Checks if consent is required based on CloudFlare geolocation headers
+ *
+ *  @returns Promise<'requires-consent' | 'no-consent-needed'> - 'requires-consent' if explicit consent is required, 'no-consent-needed' if confident it's not
+ */
+export async function shouldRequireConsent(): Promise<ConsentCheckResult> {
+	// CloudFlare provides the CF-IPCountry header on all requests
+	// Our consent worker checks this and returns whether consent is required
+	try {
+		const response = await fetch('https://consent.tldraw.xyz')
+		if (response.ok) {
+			const data = await response.json()
+			// Worker returns { requires_consent: boolean, country_code: string }
+			if (typeof data.requires_consent === 'boolean') {
+				return data.requires_consent ? 'requires-consent' : 'no-consent-needed'
+			}
+		}
+	} catch (error) {
+		// Fetch failed or timed out - will default to requiring consent
+		console.warn('Consent check failed, defaulting to requiring consent:', error)
+	}
+
+	// Conservative default: require consent
+	return 'requires-consent'
+}
diff --git a/apps/analytics/src/types.d.ts b/apps/analytics/src/vite-env.d.ts
similarity index 67%
rename from apps/analytics/src/types.d.ts
rename to apps/analytics/src/vite-env.d.ts
index ac8e774f165e..379944592791 100644
--- a/apps/analytics/src/types.d.ts
+++ b/apps/analytics/src/vite-env.d.ts
@@ -1,3 +1,5 @@
+/// <reference types="vite/client" />
+
 declare module '*.css?inline' {
 	const content: string
 	export default content
diff --git a/apps/analytics/tsconfig.json b/apps/analytics/tsconfig.json
index f74263ee2f1c..832e34e2662a 100644
--- a/apps/analytics/tsconfig.json
+++ b/apps/analytics/tsconfig.json
@@ -2,9 +2,16 @@
 	"extends": "../../internal/config/tsconfig.base.json",
 	"compilerOptions": {
 		"moduleResolution": "bundler",
+		"composite": false,
+		"declaration": false,
+		"declarationMap": false,
 		"noEmit": true,
-		"emitDeclarationOnly": false
+		"emitDeclarationOnly": false,
+		"incremental": false,
+		"types": ["vite/client", "vitest/globals"],
+		"lib": ["dom", "DOM.Iterable", "esnext"]
 	},
-	"include": ["src", "src/analytics.tsx", "./vite.config.ts"],
+	"exclude": ["node_modules", "public", ".tsbuild*", "worker"],
+	"include": ["src", "./vite.config.ts", "./vitest.config.ts"],
 	"references": []
 }
diff --git a/apps/analytics/vercel.json b/apps/analytics/vercel.json
index f362bb1ab4bf..eafff625f38b 100644
--- a/apps/analytics/vercel.json
+++ b/apps/analytics/vercel.json
@@ -8,8 +8,14 @@
 		{
 			"source": "/(.*)",
 			"headers": [
-				{ "key": "Access-Control-Allow-Origin", "value": "*" },
-				{ "key": "Access-Control-Allow-Methods", "value": "GET, POST" }
+				{
+					"key": "Access-Control-Allow-Origin",
+					"value": "*"
+				},
+				{
+					"key": "Access-Control-Allow-Methods",
+					"value": "GET, POST"
+				}
 			]
 		}
 	],
diff --git a/apps/analytics/vite.config.ts b/apps/analytics/vite.config.ts
index 0410b5d13aa6..0fcf629914aa 100644
--- a/apps/analytics/vite.config.ts
+++ b/apps/analytics/vite.config.ts
@@ -1,8 +1,7 @@
-import react from '@vitejs/plugin-react'
 import { defineConfig } from 'vite'
 
 export default defineConfig({
-	plugins: [react()],
+	plugins: [],
 	define: {
 		'process.env.NODE_ENV': JSON.stringify('production'),
 	},
@@ -15,12 +14,7 @@ export default defineConfig({
 			formats: ['umd'],
 		},
 		rollupOptions: {
-			output: {
-				globals: {
-					react: 'React',
-					'react-dom': 'ReactDOM',
-				},
-			},
+			// React and ReactDOM are now bundled instead of external
 		},
 	},
 })
diff --git a/apps/analytics/vitest.config.ts b/apps/analytics/vitest.config.ts
new file mode 100644
index 000000000000..686bc41cd365
--- /dev/null
+++ b/apps/analytics/vitest.config.ts
@@ -0,0 +1,6 @@
+/// <reference types="vitest" />
+import { mergeConfig } from 'vitest/config'
+import baseConfig from '../../internal/config/vitest/node-preset'
+
+// State package uses the standard node preset with no overrides
+export default mergeConfig(baseConfig, {})
diff --git a/apps/docs/app/analytics.tsx b/apps/docs/app/analytics.tsx
index 125105cf6abb..91ff97e50d7e 100644
--- a/apps/docs/app/analytics.tsx
+++ b/apps/docs/app/analytics.tsx
@@ -7,6 +7,7 @@ export default function Analytics() {
 	useEffect(() => {
 		window.TL_GA4_MEASUREMENT_ID = process.env.NEXT_PUBLIC_GA4_MEASUREMENT_ID
 		window.TL_GOOGLE_ADS_ID = process.env.NEXT_PUBLIC_GOOGLE_ADS_ID
+		window.TL_GTM_CONTAINER_ID = process.env.NEXT_PUBLIC_GTM_CONTAINER_ID
 	}, [])
 
 	useEffect(() => {
@@ -14,8 +15,13 @@ export default function Analytics() {
 			const isWithinCodeBlock = (copyEvent.target as HTMLElement | null)?.closest('pre, code')
 			if (isWithinCodeBlock) {
 				const copiedText = window.getSelection()?.toString() || ''
-				const isInstall = copiedText.trim() === 'npm install tldraw'
-				track('docs.copy.code-block', { isInstall })
+
+				if (window.tlanalytics?.trackCopyCode) {
+					window.tlanalytics.trackCopyCode({
+						page_category: 'docs',
+						text_snippet: copiedText,
+					})
+				}
 
 				// Track Google Ads conversion for code block copies
 				if (window.tlanalytics?.gtag) {
@@ -33,6 +39,11 @@ export default function Analytics() {
 		}
 	}, [])
 
+	const analyticsScriptSrc =
+		process.env.NODE_ENV === 'development'
+			? 'http://localhost:5173/tl-analytics.js'
+			: 'https://analytics.tldraw.com/tl-analytics.js'
+
 	return (
 		<>
 			<Script
@@ -41,21 +52,48 @@ export default function Analytics() {
 				strategy="afterInteractive"
 				async
 				defer
-				src="https://analytics.tldraw.com/tl-analytics.js"
+				src={analyticsScriptSrc}
 			/>
 		</>
 	)
 }
 
+interface ConsentPreferences {
+	analytics: 'granted' | 'denied'
+	marketing: 'granted' | 'denied'
+}
+
 declare global {
 	interface Window {
 		tlanalytics: {
 			openPrivacySettings(): void
 			track(name: string, data?: { [key: string]: any }): void
 			gtag(...args: any[]): void
+			getConsentState(): ConsentPreferences
+			onConsentUpdate(callback: (preferences: ConsentPreferences) => void): () => void
+			trackCopyCode(data: {
+				page_category: string
+				text_snippet: string
+				user_email?: string
+				user_email_sha256?: string
+				user_first_name?: string
+				user_last_name?: string
+				user_phone_number?: string
+			}): void
+			trackFormSubmission(data: {
+				enquiry_type: string
+				company_size?: string
+				company_website?: string
+				user_email: string
+				user_email_sha256: string
+				user_first_name: string
+				user_last_name: string
+				user_phone_number?: string
+			}): void
 		}
 		TL_GA4_MEASUREMENT_ID: string | undefined
 		TL_GOOGLE_ADS_ID?: string
+		TL_GTM_CONTAINER_ID?: string
 		posthog: any
 	}
 }
diff --git a/apps/docs/app/layout.tsx b/apps/docs/app/layout.tsx
index 8e809df66fc3..c1f67f41b4ac 100644
--- a/apps/docs/app/layout.tsx
+++ b/apps/docs/app/layout.tsx
@@ -76,6 +76,14 @@ export default async function Layout({ children }: { children: React.ReactNode }
 						<Footer />
 						<Analytics />
 					</ThemeProvider>
+					<noscript>
+						<iframe
+							src="https://www.googletagmanager.com/ns.html?id=GTM-PJDV58LL"
+							height="0"
+							width="0"
+							style={{ display: 'none', visibility: 'hidden' }}
+						/>
+					</noscript>
 				</body>
 			</html>
 		</Wrapper>
diff --git a/apps/docs/app/robots.txt b/apps/docs/app/robots.txt
index 14267e90323c..8bab37dbdc47 100644
--- a/apps/docs/app/robots.txt
+++ b/apps/docs/app/robots.txt
@@ -1,2 +1,4 @@
 User-agent: *
-Allow: /
\ No newline at end of file
+Allow: /
+
+Sitemap: https://www.tldraw.dev/sitemap.xml
diff --git a/apps/docs/components/content/code-files.tsx b/apps/docs/components/content/code-files.tsx
index d86432448e6e..4a4a41c48e0b 100644
--- a/apps/docs/components/content/code-files.tsx
+++ b/apps/docs/components/content/code-files.tsx
@@ -67,7 +67,7 @@ export function CodeFiles({
 									__html: hastToHtml(codeElem),
 								}}
 							></pre>
-							<CopyButton copy={content} name={name} />
+							<CopyButton copy={content} />
 						</TabPanel>
 					)
 				})}
diff --git a/apps/docs/components/content/copy-button.tsx b/apps/docs/components/content/copy-button.tsx
index 0d1a31cdb6a1..b34ad9958006 100644
--- a/apps/docs/components/content/copy-button.tsx
+++ b/apps/docs/components/content/copy-button.tsx
@@ -4,11 +4,9 @@ import { RefObject, useCallback, useState } from 'react'
 import { Button } from '../common/button'
 
 export function CopyButton({
-	name,
 	copy,
 	className,
 }: {
-	name: string
 	copy: string | RefObject<HTMLElement>
 	className?: string
 }) {
@@ -18,20 +16,16 @@ export function CopyButton({
 
 		navigator.clipboard.writeText(code)
 
-		const isInstall = code.trim() === 'npm install tldraw'
-		track('docs.copy.code-block', { isInstall, codeBlockId: name })
-
-		// Track Google Ads conversion for code block copies
-		if (window.tlanalytics?.gtag) {
-			window.tlanalytics.gtag('event', 'conversion', {
-				send_to: 'AW-17268182782/qIuDCMnhl_EaEP6djqpA',
-				value: 1.0,
-				currency: 'USD',
+		if (window.tlanalytics?.trackCopyCode) {
+			window.tlanalytics.trackCopyCode({
+				page_category: 'docs',
+				text_snippet: code,
 			})
 		}
+
 		setCopied(true)
 		setTimeout(() => setCopied(false), 1500)
-	}, [copy, name])
+	}, [copy])
 
 	return (
 		<Button
@@ -43,7 +37,3 @@ export function CopyButton({
 		/>
 	)
 }
-
-export function track(name: string, data?: { [key: string]: any }) {
-	window.tlanalytics?.track(name, data)
-}
diff --git a/apps/docs/components/content/pre.tsx b/apps/docs/components/content/pre.tsx
index 6c5254333c68..5b090ed5444c 100644
--- a/apps/docs/components/content/pre.tsx
+++ b/apps/docs/components/content/pre.tsx
@@ -26,7 +26,7 @@ export function Pre(props: DetailedHTMLProps<HTMLAttributes<HTMLPreElement>, HTM
 			>
 				{props.children}
 			</pre>
-			<CopyButton copy={container} name={'code-block'} />
+			<CopyButton copy={container} />
 		</div>
 	)
 }
diff --git a/apps/docs/content/docs/editor.mdx b/apps/docs/content/docs/editor.mdx
index a72ac23934d5..0da3224bd391 100644
--- a/apps/docs/content/docs/editor.mdx
+++ b/apps/docs/content/docs/editor.mdx
@@ -476,19 +476,29 @@ To create a binding of your own, you can define a custom binding.
 
 #### The binding type
 
-First, you need to create a type that describes what the binding object will look like:
+First, we register the binding's props using TypeScript module augmentation:
 
 ```ts
-import { TLBaseBinding } from 'tldraw'
+const STICKER_TYPE = 'sticker'
 
-type StickerBinding = TLBaseBinding<'sticker', { x: number; y: number }>
+declare module 'tldraw' {
+	export interface TLGlobalBindingPropsMap {
+		[STICKER_TYPE]: { x: number; y: number }
+	}
+}
+```
+
+Then, we can extract the binding type using `TLBinding`:
+
+```ts
+import { TLBinding } from 'tldraw'
+
+type StickerBinding = TLBinding<typeof STICKER_TYPE>
 ```
 
-With [TLBaseBinding](?) we define the binding's type (`sticker`) and `props` property (`{x: number,
-y: number}`). The type can be any string, and the props must be a plain JSON object (ie not a class
-instance).
+The type can be any string but the props must be a regular [JSON-serializable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description) JavaScript object.
 
-The [TLBaseBinding](?) helper adds the other base properties like `id`, `toId`, and `fromId`.
+The created binding types extend [TLBaseBinding](?) and thus include all the base properties of a binding, such as `id`, `toId`, and `fromId`.
 
 #### The `BindingUtil` class
 
diff --git a/apps/docs/content/docs/shapes.mdx b/apps/docs/content/docs/shapes.mdx
index 1b0d93ef2d82..fcce6f6712af 100644
--- a/apps/docs/content/docs/shapes.mdx
+++ b/apps/docs/content/docs/shapes.mdx
@@ -95,15 +95,29 @@ You can create your own custom shapes. In the examples below, we will create a c
 
 In tldraw's data model, each shape is represented by a JSON object. Let's first create a type that describes what this object will look like.
 
+First, we register the shape's props using TypeScript module augmentation:
+
 ```ts
-import { TLBaseShape } from 'tldraw'
+const CARD_TYPE = 'card'
 
-type CardShape = TLBaseShape<'card', { w: number; h: number }>
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[CARD_TYPE]: { w: number; h: number }
+	}
+}
 ```
 
-With the [TLBaseShape](?) helper, we define the shape's `type` property (`card`) and the shape's `props` property (`{ w: number, h: number }`). The type can be any string but the props must be a regular [JSON-serializable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description) JavaScript object.
+Then, we can extract the shape type using `TLShape`:
 
-The [TLBaseShape](?) helper adds the other base properties of a shape, such as `x`, `y`, `rotation`, and `opacity`.
+```ts
+import { TLShape } from 'tldraw'
+
+type CardShape = TLShape<typeof CARD_TYPE>
+```
+
+The type can be any string but the props must be a regular [JSON-serializable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify#description) JavaScript object.
+
+The created shape types extend [TLBaseShape](?) and thus include all the base properties of a shape, such as `x`, `y`, `rotation`, and `opacity`.
 
 ### Shape Util
 
@@ -112,10 +126,12 @@ While tldraw's shapes themselves are simple JSON objects, we use [ShapeUtil](?)
 Let's create a [ShapeUtil](?) class for the shape.
 
 ```tsx
-import { HTMLContainer, ShapeUtil } from 'tldraw'
+import { HTMLContainer, Rectangle2d, ShapeUtil } from 'tldraw'
+
+// ...
 
 class CardShapeUtil extends ShapeUtil<CardShape> {
-	static override type = 'card' as const
+	static override type = CARD_TYPE
 
 	getDefaultProps(): CardShape['props'] {
 		return {
diff --git a/apps/docs/content/getting-started/releases.mdx b/apps/docs/content/getting-started/releases.mdx
index 9b86759f58be..fe1b1e8d984e 100644
--- a/apps/docs/content/getting-started/releases.mdx
+++ b/apps/docs/content/getting-started/releases.mdx
@@ -15,197 +15,52 @@ Unlike many JavaScript packages distributed on [NPM](https://www.npmjs.com/), th
 
 {/* START AUTO-GENERATED CHANGELOG */}
 
-## Current release: [v4.0.0](/releases/v4.0.0)
+## Current release: [v4.2.0](/releases/v4.2.0)
 
-Welcome to the notes for the 4.0 release of the tldraw SDK. Like our previous major releases, this release includes changes to our license as well as new resources for developers building infinite canvas apps and features with tldraw.
+Welcome to tldraw v4.2.0!
 
-## What's new
+This is a minor maintenance release that includes many bug fixes and small API additions, along with a major version bump of our TipTap rich text editor.
 
-### npm create tldraw
+## TipTap v3 ([#5717](https://github.com/tldraw/tldraw/issues/5717))
 
-This release includes our new CLI tool, available at `npm create tldraw`. You can use this tool to quickly create new tldraw projects using our templates and new starter kits.
+We've upgraded TipTap from v2 to v3. If you've done any customization to our standard TipTap kit, please refer to TipTap's Guide [How to upgrade Tiptap v2 to v3](https://tiptap.dev/docs/guides/upgrade-tiptap-v2) as to any breaking changes you might experience from a custom homebrew of the rich text editor in tldraw.
 
-### Starter kits
+## API Changes
 
-This release includes four new starter kits:
+- Add `Editor.setTool`/`Editor.removeTool` for dynamically altering the editor's tool state chart. ([#6909](https://github.com/tldraw/tldraw/issues/6909)) ([#7134](https://github.com/tldraw/tldraw/issues/7134))
+- Allow using custom socket implementations with `useSync` via a new `connect` option ([#6859](https://github.com/tldraw/tldraw/issues/6859)) (thanks to [@Digital39999](https://github.com/Digital39999) for help on this one)
+- Support store queries on nested properties, e.g. props ([#6981](https://github.com/tldraw/tldraw/issues/6981))
+- Add `createBookmarkFromUrl` helper function for creating bookmark shapes more easily. ([#6894](https://github.com/tldraw/tldraw/issues/6894))
+- Allow handles to specify a custom reference point for shift-modifier angle snapping ([#6987](https://github.com/tldraw/tldraw/issues/6987)) (contributed by [@naaa760](https://github.com/naaa760))
+- Add a 'secret' lined-fill style similar to the full-fill style but with visible outlines. Users can select it by pressing `Option+Shift+F`. ([#7034](https://github.com/tldraw/tldraw/issues/7034))
+- Add option to pass callback to onInteractionEnd ([#6919](https://github.com/tldraw/tldraw/issues/6919))
+- Add `allowReferrer` option to window opening functions ([#7004](https://github.com/tldraw/tldraw/issues/7004))
+- Remove broken/defunct Excalidraw embed definition. Existing Excalidraw embed shapes will remain but render as bookmarks. ([#6897](https://github.com/tldraw/tldraw/issues/6897))
 
-- [agent](https://tldraw.dev/starter-kits/agent) is a Cursor-style chatbot starter. This kit replaces our AI module and AI template. If you're interested in driving AI interactions on the canvas, this is a great place to start hacking.
-- [workflow](https://tldraw.dev/starter-kits/workflow) is a React-flow style starter for node-and-wire applications. If you have an idea for a patch programming interface, an asynchronous workflow tool, or a ComfyUI-style pipeline for images or data, start with this one.
-- [branching chat](https://tldraw.dev/starter-kits/branching-chat) is a starter kit for branching AI chats, inspired by tweets by [Max Lee](https://x.com/maxleedev/status/1962938769914658984) and [Jacob Colling](https://x.com/JacobColling/status/1787659433431994392). Run with it!
-- [chat](https://tldraw.dev/starter-kits/chat) is a starter kit where the tldraw canvas is used to create and annotate images. If you're working on an app that features a chatbot (who isn't?) then give this one a spin and try out some ideas.
-- [multiplayer](https://tldraw.dev/starter-kits/multiplayer) is clean starter kit featuring our [tldraw sync](https://tldraw.dev/docs/sync) multiplayer backend. Build a multiplayer whiteboard, [game](https://x.com/btn0s/status/1965828679260643535), or bypass your school's chat app restrictions.
+## Improvements
 
-The starter kits are all MIT licensed, so go ahead and build with them as you like. Learn more on the [tldraw docs](https://tldraw.dev/starter-kits/overview) or get started by running `npm create tldraw` in your terminal.
+- Use window.prompt for renaming frames on mobile ([#6838](https://github.com/tldraw/tldraw/issues/6838))
+- Add string append optimization to sync protocol ([#7007](https://github.com/tldraw/tldraw/issues/7007)) (contributed by [@quasor](https://github.com/quasor))
 
-### Licensing changes
+## Bug Fixes
 
-Like our previous major releases, this release includes changes to our license. Fate and capital both demand that tldraw be sustainable, so these changes are designed to help us commercialize the SDK without cutting off community adoption.
+- Fix Replit embed URL handling ([#6892](https://github.com/tldraw/tldraw/issues/6892))
+- Fix accessibility issue that caused a misleading warning in the console ([#6904](https://github.com/tldraw/tldraw/issues/6904))
+- Fix convert-to-bookmark action ([#6894](https://github.com/tldraw/tldraw/issues/6894))
+- Fix pointer handling for dropdown menus in `InFrontOfTheCanvas` ([#7021](https://github.com/tldraw/tldraw/issues/7021))
+- Fixed a bug with iOS image uploads on Safari ([#7037](https://github.com/tldraw/tldraw/issues/7037))
+- Ignore alt+tab on Windows to avoid conflicting with the window manager ([#7005](https://github.com/tldraw/tldraw/issues/7005))
+- Fix text focus issue ([#7043](https://github.com/tldraw/tldraw/issues/7043))
+- Allow using `TldrawEditor` without needing `TldrawUiContextProvider` ([#7053](https://github.com/tldraw/tldraw/issues/7053))
+- Fix clipboard functionality for cross-realm apps ([#7026](https://github.com/tldraw/tldraw/issues/7026))
+- Fix broken ink on iOS by disabling coalesced events ([#6917](https://github.com/tldraw/tldraw/issues/6917))
+- Fix dragging behavior when menu is open ([#6918](https://github.com/tldraw/tldraw/issues/6918))
 
-In this release, the SDK is only permitted to be used in development environments unless you have either a trial license, a commercial license, or a hobby license. These licenses come with a license key. The SDK will not work in production unless it has a valid license key.
-
-If you are only using tldraw in localhost or development environments, then you do not need a license. If you wish to use the tldraw SDK in production, you can [get a free 100-day trial license](https://tldraw.dev/get-a-license/trial).
-
-To use the tldraw SDK in production after the trial ends, commercial projects will require a [commercial license](https://tldraw.dev/get-a-license/plans) and non-commercial projects can apply for a [hobby license](https://tldraw.dev/get-a-license/hobby).
-
-You can read more about our licensing [here](https://tldraw.dev/community/license). If you have any questions, please visit [our Discord](https://discord.tldraw.com/?utm_source=docs&utm_medium=organic&utm_campaign=sociallink) to chat with the team.
-
-## Features and improvements
-
-### Drag out of toolbar ([#4793](https://github.com/tldraw/tldraw/pull/4793))
-
-You can now drag shapes out from the toolbar. It's easy to add this sort of interaction to your own user interfaces, too.
-
-### Accessibility: WCAG 2.2 level AA compliance
-
-We've worked over the last months to improve the tldraw SDK's accessibility.
-
-With this release, and with the help of [Sarah Fossheim](https://fossheim.io/), we were able to complete enough improvements, features, and fixes to become compliant with the [WCAG 2.2 AA accessibility standard](https://www.wcag.com/blog/wcag-2-2-aa-summary-and-checklist-for-website-owners/). We will soon be publicly providing our [VPAT](https://www.wcag.com/solutions/vpat-accessibility-documentation/) compliance document which will provide further details.
-
-- Added an Accessibility Mode that includes labels for the style panel, higher contrast selection rings, quicker tooltips, and several other features intended to improve accessibility ([#6444](https://github.com/tldraw/tldraw/pull/6444)).
-- Added new keyboard shortcuts for rotation, `Shift + <` and `Shift + >` with `Alt` for fine adjustments. ([#6447](https://github.com/tldraw/tldraw/pull/6447))
-- Fixed missing aria-labels in various places. ([#6721](https://github.com/tldraw/tldraw/pull/6721)) ([#6750](https://github.com/tldraw/tldraw/pull/6750))
-- Made menus scrollable when zoomed in. ([#6740](https://github.com/tldraw/tldraw/pull/6740))
-- Added contrast on our placeholder text and improved menu localization. ([#6750](https://github.com/tldraw/tldraw/pull/6750))
-- Made the image/video toolbars accessible by keyboard shortcut. ([#6750](https://github.com/tldraw/tldraw/pull/6750))
-
-### Custom shapes can clip their children ([#6649](https://github.com/tldraw/tldraw/pull/6649))
-
-Before this PR, only the built-in frame shape could clip its children. Now, any custom shape can clip its children.
-
-### Vertical toolbar ([#6532](https://github.com/tldraw/tldraw/pull/6532))
-
-It's now easy to make tldraw's toolbar vertical. Override the `Toolbar` component, and set `orientation` to `vertical`:
-
-```tsx
-`<Tldraw
-	components={{
-		Toolbar: () =>` <DefaultToolbar orientation="vertical" />,
-	}}
-/>
-```
-
-You can also now use `<TldrawUiMenuGroup />` to group together toolbar items.
-
----
-
-### Breaking changes
-
-- All of tldraw's CSS variables now start with `--tl-`. If you're using any of our variables in your own css, you'll need to update your CSS. For example:
-  - `--color-background` is now `--tl-color-background`
-  - `--space-4` is now `--tl-space-4`
-  - `--tl-zoom` is still `--tl-zoom` ([#6568](https://github.com/tldraw/tldraw/pull/6568))
-- `Geometry2D`'s `isLabel` config option no longer excludes the geometry from the shape bounds calculations by default. A new separate flag `excludeFromShapeBounds` has been added for this. ([#6637](https://github.com/tldraw/tldraw/pull/6637))
-- Change the `open-url` event data - rename it from `url` to `destinationUrl` as `url` might shadow some automatically sent properties by analytics tools. ([#6654](https://github.com/tldraw/tldraw/pull/6654))
-- `InFrontOfTheCanvas` now renders as a child of `.tl-canvas`, in a `.tl-canvas__in-front` wrapper.
-- The `DefaultColorThemePalette` color theme object has been flattened. If you're using this object, you'll need to update to the new structure, using the `getColorValue` helper. ([#6466](https://github.com/tldraw/tldraw/pull/6466))
-- Arrow shapes now have a `richText` instead of a `text` prop. The data will migrate automatically, but if you're accessing or setting the `arrow.props.text` property directly, you'll need to update your code to use the new `arrow.props.richText` property. ([#6325](https://github.com/tldraw/tldraw/pull/6325))
-- We removed the `@tldraw/ai` module in favour of the new agent starter kit, which provides a more flexible and customizable API for building AI-powered canvas applications. To upgrade, we recommend cloning or copying relevant code from the agent starter kit, then using `useTldrawAgent`.
-
-```ts
-const agent = useTldrawAgent(editor)
-agent.prompt('Draw a flowchart for how to update a web package.')
-```
-
-- We no longer swallow most events that happen on the canvas, & we removed `stopEventPropagation`. Most places that used it should be replaced with `editor.markEventAsHandled` which causes tldraw to ignore an event, but allows it to propagate out above tldraw. If you definitely still want stop propagation semantics, you can call `event.stopPropagation()` instead. ([#6733](https://github.com/tldraw/tldraw/pull/6733))
-- The style panel has been rewritten to be much easier to customize - similarly to the Toolbar. We removed the several old components (`ArrowheadStylePickerSet`, `CommonStylePickerSet`, `GeoStylePickerSet`, `OpacitySlider`, `SplineStylePickerSet`, `TextStylePickerSet`, `TldrawUiButtonPicker`), and replaced them with new `StylePanel*Picker` components. ([#6672](https://github.com/tldraw/tldraw/pull/6672))
-- The `tlui-buttons__horizontal` and `tlui-buttons__grid` class names have been replaced by `tlui-row` and `tlui-grid`. ([#6526](https://github.com/tldraw/tldraw/pull/6526))
-- The `tlui-toolbar` classnames have been renamed to `tlui-main-toolbar`
-- We removed a number of deprecated APIs:
-  - `Store.getSnapshot()` and `Store.loadSnapshot()` methods → use the same methods on `editor`.
-  - `RecordType.createCustomId()` method → use `RecordType.createId()`
-  - `Editor.mark()` method → replaced by `markHistoryStoppingPoint()`
-  - `Editor.batch()` method → replaced by `Editor.run()`
-  - `Editor.getSvg()` method → replaced by `Editor.getSvgElement()`
-  - `Editor.getDroppingOverShape()` method
-  - `Editor.getOpenMenus()` → replaced by `editor.menus.getOpenMenus()`
-  - `Editor.addOpenMenu()` → replaced by `editor.menus.addOpenMenu()`
-  - `Editor.deleteOpenMenu()` → replaced by `editor.menus.deleteOpenMenu()`
-  - `Editor.clearOpenMenus()` → replaced by `editor.menus.clearOpenMenus()`
-  - `Editor.getIsMenuOpen()` → replaced by `editor.menus.hasAnyOpenMenus()`
-  - `Editor.environment` property → replaced by `tlenv`
-  - `isShapeHidden` prop/option → replaced by `getShapeVisibility`
-  - `exportAs()` function overloads (multiple parameter signatures) → consolidated to options object
-  - `copyAs()` function overloads (multiple parameter signatures) → consolidated to options object
-  - `exportToBlob()` function → use `Editor.toImage`
-  - `useEditableText` → replaced by `useEditablePlainText`
-  - `TextLabel` → replaced by `PlainTextLabel`
-  - `useAsset` → replaced by `useImageOrVideoAsset`
-  - `TLSvgOptions` type alias → replaced by `TLSvgExportOptions`
-  - `Vec.norm()` method → replaced by `Vec.uni()`
-  - `Geometry2d.nearestPointOnLineSegment()` method
-  - `debugEnableLicensing()` function
-
-### Bug Fixes
-
-- Arrow labels are no longer cut off in image exports. ([#6637](https://github.com/tldraw/tldraw/pull/6637))
-- PNGs with that specify their physical pixel dimensions are now parsed correctly. ([#6735](https://github.com/tldraw/tldraw/pull/6735))
-- tldraw sync's `documentClock` no longer advances even if no document changes had occurred when loading a new snapshot. ([#6666](https://github.com/tldraw/tldraw/pull/6666))
-- Complex keyboard shortcuts are now formatted correctly on windows and linux. ([#6638](https://github.com/tldraw/tldraw/pull/6638))
-- Pointer events in editable shapes fire consistently on mobile. ([#6628](https://github.com/tldraw/tldraw/pull/6628))
-- On canvas UI renders in the correct place when the canvas is inset from the tldraw container. ([#6626](https://github.com/tldraw/tldraw/pull/6626))
-- Items marked with `usePassThroughWheelEvents` no longer block wheel events when the editor is not focused. ([#6640](https://github.com/tldraw/tldraw/pull/6640))
-- Embeds are now positioned correctly on Chrome when zoom isn't 100%. ([#6611](https://github.com/tldraw/tldraw/pull/6611))
-- Prevent the editor from remounting in a loop if given custom
-  assetUrls. ([#6605](https://github.com/tldraw/tldraw/pull/6605))
-- KeyboardShortcutsDialog override is now respected in more places. ([#6571](https://github.com/tldraw/tldraw/pull/6571))
-- Hollow shapes can now be bound-to by arrows when overlapping a filled shape. ([#6525](https://github.com/tldraw/tldraw/pull/6525))
-- `onDataChange` and `onPresenceChange` are now always passed to `TLSyncRoom`. ([#6549](https://github.com/tldraw/tldraw/pull/6549))
-- Deleting a page now correctly deletes all the shapes on that page. ([#6333](https://github.com/tldraw/tldraw/pull/6333))
-- `pointingPreciseTimeout` is now respected everywhere it should be. ([#6789](https://github.com/tldraw/tldraw/pull/6789))
-
-### Improvements
-
-- Hold command or control while erasing to erase only the first shape that you began erasing. Useful for erasing overlapping shapes! ([#6554](https://github.com/tldraw/tldraw/pull/6554))
-- Arrow labels now accept rich text formatting. ([#6325](https://github.com/tldraw/tldraw/pull/6325))
-- The toast shown when uploading a file that's too big now shows the maximum file size. ([#6745](https://github.com/tldraw/tldraw/pull/6745))
-- We switched up how we generate shape indexes to avoid incorrectly formatted indexes. ([#6646](https://github.com/tldraw/tldraw/pull/6646))
-- Migrations with explicit `dependsOn` constraints will now be scheduled as close as possible to the things they depend on. ([#6702](https://github.com/tldraw/tldraw/pull/6702))
-- Your tldraw license key will now be automatically pulled from an env var if it's set. We check `TLDRAW_LICENSE_KEY`, `NEXT_PUBLIC_TLDRAW_LICENSE_KEY`, `REACT_APP_TLDRAW_LICENSE_KEY`, `VITE_TLDRAW_LICENSE_KEY`, and `PUBLIC_TLDRAW_LICENSE_KEY`.
-- When exporting an annotated image, we no longer add padding unless the annotations stray over the bounds of the image.
-- We now completely skip initial font loading when `maxFontsToLoadBeforeRender` is 0. ([#6622](https://github.com/tldraw/tldraw/pull/6622))
-- `useSync` now only sends presence updates, like mouse and camera positions, when there are more than one unique user in a room. ([#6524](https://github.com/tldraw/tldraw/pull/6524))
-- tldraw sync has better server-side performance when dealing with large rooms. ([#6488](https://github.com/tldraw/tldraw/pull/6488))
-
-### API changes
-
-- Added support for sending custom messages from `TLSocketRoom` to connected clients. `TLSocketRoom` exposes a new method `sendCustomMessage` to send arbitrary data to a connected client, and `useSync` accepts a new callback `onCustomMessageReceived` to receive it. Special thanks to community contributor Fabian Iwand (@mootari) for this. ([#6614](https://github.com/tldraw/tldraw/pull/6614))
-- The `Editor.getShapesAtPoint` can now accept a number _or_ a number tuple for its `margin` option that will be used as the inner and outer margins. This works best when `hitInside` is `true`; if `hitInside` is false, then the larger of the two margins will be used for both inside and outside margin. ([#6525](https://github.com/tldraw/tldraw/pull/6525))
-- Added `ShapeUtil.isExportBoundsContainer`. If this returns true, exports of your shape won't have padding if their bounds contain all other shapes in the export. ([#6636](https://github.com/tldraw/tldraw/pull/6636))
-- Added `ShapeUtil.canCull`, which can be used to disable culling on certain shapes. ([#6699](https://github.com/tldraw/tldraw/pull/6699))
-- `RoomSnapshot` now has a `documentClock` field. ([#6666](https://github.com/tldraw/tldraw/pull/6666))
-- `TldrawOptions` now has `uiDragDistanceSquared` and `uiCourseDragDistanceSquared` for controlling the dragging threshold of UI components. ([#6596](https://github.com/tldraw/tldraw/pull/6596))
-- `TldrawUiMenuItem` now accepts `onDragFromToolbarToCreateShape` and `onDragStart` to facilitate dragging shapes out of a toolbar. ([#4793](https://github.com/tldraw/tldraw/pull/4793))
-- `TldrawUiInput` now accepts `aria-label`. ([#6760](https://github.com/tldraw/tldraw/pull/6760))
-- `TldrawUiMenuCheckboxItem` now accepts `lang`. ([#6750](https://github.com/tldraw/tldraw/pull/6750))
-- New translation keys for confirming a crop operation ([#6663](https://github.com/tldraw/tldraw/pull/6663)), rhombus 2 ([#6653](https://github.com/tldraw/tldraw/pull/6653)), selected tool states ([#6734](https://github.com/tldraw/tldraw/pull/6734)), max file size notices ([#6745](https://github.com/tldraw/tldraw/pull/6745)).
-- Adds `onDragFromToolbarToCreateShape`, `OnDragFromToolbarToCreateShapesOpts`, and `onDragStart` on `TldrawUiMenuItem` to facilitate dragging shapes out of a toolbar. ([#4793](https://github.com/tldraw/tldraw/pull/4793))
-- `TLSocketRoom#getRecord` return type now reflects that it returns `undefined` if the record was not found. ([#6488](https://github.com/tldraw/tldraw/pull/6488))
-- `StoreSchema#migrateStoreSnapshot` has a new option `mutateInputStore: boolean` which is false by default. If left false, it will copy the input store with `structuredClone`. If set to true the mutators will be allowed to mutate the input store. ([#6488](https://github.com/tldraw/tldraw/pull/6488))
-- Added the `overlapsPolygon` method to the `Geometry2D` class. ([#6679](https://github.com/tldraw/tldraw/pull/6679))
-- Added `editor.toImageDataUrl`, which is useful for applications that need to display or work with image data URLs directly instead of blob objects. ([#6624](https://github.com/tldraw/tldraw/pull/6624))
-- Expose `notifyIfFileNotAllowed` which is useful when creating custom file upload flows. ([#6625](https://github.com/tldraw/tldraw/pull/6625))
-- Added `TldrawUiRow` and `TldrawUiGrid` layout classes. ([#6526](https://github.com/tldraw/tldraw/pull/6526))
-- Added `EditorAtom`, a helper for storing editor UI state in an `Atom`. ([#6531](https://github.com/tldraw/tldraw/pull/6531))
-- There's now a `data-state` attribute on `.tl-container` which contains the current state tree path. This makes it easier to write styles based on the current interaction state. ([#6515](https://github.com/tldraw/tldraw/pull/6515))
-- Add an option to `squashRecordDiffs` to allow mutating the first diff instead of creating a new diff. ([#6533](https://github.com/tldraw/tldraw/pull/6533))
-- Add `ShapeWrapper` to the `components` prop to allow customizing how every single shape is rendered to the DOM. ([#6514](https://github.com/tldraw/tldraw/pull/6514))
-- `TldrawCropHandles`, `ToggleToolLockedButton`, `getHitShapeOnCanvasPointerDown`, `getAssetInfo`, `useUnlockedSelectedShapesCount`, and `LockGroup` are now exported publicly. ([#6513](https://github.com/tldraw/tldraw/pull/6513))
-- Add `editor.updatePointer()`, which is useful when you want an interaction to update in response to an external change, such as moving the camera or creating a shape. ([#6494](https://github.com/tldraw/tldraw/pull/6494))
-- Pass `isCreatingShape` to `ShapeUtil.onHandleDrag` and other handle drag callbacks. This will be true if the current interaction is creating the shape in question. ([#6493](https://github.com/tldraw/tldraw/pull/6493))
-- Add `onHandleDragStart` and `onHandleDragEnd` to `ShapeUtil` to complement `onHandleDrag`. ([#6489](https://github.com/tldraw/tldraw/pull/6489))
-- Add `onTranslateCancel`, `onResizeCancel`, `onRotateCancel`, and `onHandleDragCancel` callbacks to `ShapeUtil`. ([#6489](https://github.com/tldraw/tldraw/pull/6489))
-- Added optional `opts` parameter to `putExternalContent()` `replaceExternalContent()` with `force?: boolean` option
-- Added optional `opts` parameter to `replaceExternalContent(info, opts?)` method with `force?: boolean` option. Both methods now respect readonly state by default, but can bypass it with `{ force: true }` ([#6729](https://github.com/tldraw/tldraw/pull/6729))
-- `TldrawUiSlider`s `onHistoryMark` prop is now optional. ([#6718](https://github.com/tldraw/tldraw/pull/6718))
-- `clearArrowTargetState`, `getArrowTargetState`, and `updateArrowTargetState` are now part of the public API, making it possible to re-implement `TldrawOverlays`. ([#6788](https://github.com/tldraw/tldraw/pull/6788))
-- `ArrowShapeUtil.options.shouldBeExact` now accepts `isPrecise` as a
-  second argument. ([#6781](https://github.com/tldraw/tldraw/pull/6781))
-
----
+## Previous releases
 
-That's it for this release! Breaking changes are minimal
+- [v4.1.0](/releases/v4.1.0)
 
-## Previous releases
+- [v4.0.0](/releases/v4.0.0)
 
 - [v3.15.0](/releases/v3.15.0)
 
diff --git a/apps/docs/next.config.js b/apps/docs/next.config.js
index 1d5729bea614..b4d2892c2ab6 100644
--- a/apps/docs/next.config.js
+++ b/apps/docs/next.config.js
@@ -159,6 +159,28 @@ const nextConfig = {
 					'/?utm_source=codewithjason&utm_medium=podcast&utm_campaign=steve_codewithjason_2025',
 				permanent: true,
 			},
+			{
+				source: '/diveclub',
+				destination: '/?utm_source=diveclub&utm_medium=podcast&utm_campaign=steve_diveclub_2025',
+				permanent: true,
+			},
+			{
+				source: '/shoptalk',
+				destination: '/?utm_source=shoptalk&utm_medium=podcast&utm_campaign=steve_shoptalk_2025',
+				permanent: true,
+			},
+			{
+				source: '/hanselminutes',
+				destination:
+					'/?utm_source=hanselminutes&utm_medium=paid_podcast&utm_campaign=ad_hanselminutes_2025',
+				permanent: true,
+			},
+			{
+				source: '/mostlytechnical',
+				destination:
+					'/?utm_source=mostlytechnical&utm_medium=paid_podcast&utm_campaign=ad_mostlytechnical_2025',
+				permanent: true,
+			},
 		]
 	},
 	async rewrites() {
@@ -172,6 +194,10 @@ const nextConfig = {
 					source: '/404',
 					destination: `https://${REWRITE_DOMAIN}/404`,
 				},
+				{
+					source: '/accessibility',
+					destination: `https://${REWRITE_DOMAIN}/accessibility`,
+				},
 				{
 					source: '/blog/announcements',
 					destination: `https://${REWRITE_DOMAIN}/blog/category/announcements`,
diff --git a/apps/docs/scripts/add-framer-rewrites.ts b/apps/docs/scripts/add-framer-rewrites.ts
new file mode 100644
index 000000000000..8957454eb821
--- /dev/null
+++ b/apps/docs/scripts/add-framer-rewrites.ts
@@ -0,0 +1,191 @@
+import * as fs from 'fs'
+import * as path from 'path'
+
+const { log: nicelog } = console
+
+const REWRITE_DOMAIN = 'tldrawdotdev.framer.website'
+const SITEMAP_URL = `https://${REWRITE_DOMAIN}/sitemap.xml`
+
+async function fetchFramerSitemap(): Promise<string[]> {
+	const response = await fetch(SITEMAP_URL)
+	if (!response.ok) {
+		throw new Error(`Failed to fetch sitemap: ${response.statusText}`)
+	}
+
+	const xml = await response.text()
+	const locRegex = /<loc>([^<]+)<\/loc>/g
+	const paths: string[] = []
+
+	let match
+	while ((match = locRegex.exec(xml)) !== null) {
+		const url = match[1]
+		const urlObj = new URL(url)
+		paths.push(urlObj.pathname)
+	}
+
+	return paths
+}
+
+function getCurrentRewrites(configPath: string): Set<string> {
+	const configContent = fs.readFileSync(configPath, 'utf-8')
+	const sourceRegex = /source:\s*['"]([^'"]+)['"]/g
+	const rewrites = new Set<string>()
+
+	let match
+	while ((match = sourceRegex.exec(configContent)) !== null) {
+		rewrites.add(match[1])
+	}
+
+	return rewrites
+}
+
+function pathMatchesRewrite(p: string, rewritePattern: string): boolean {
+	const normalizedPath = p.replace(/\/$/, '')
+	const normalizedPattern = rewritePattern.replace(/\/$/, '')
+
+	if (normalizedPath === normalizedPattern) {
+		return true
+	}
+
+	if (normalizedPattern.includes(':path*')) {
+		const prefix = normalizedPattern.split('/:path*')[0]
+		return normalizedPath.startsWith(prefix)
+	}
+	if (normalizedPattern.includes(':path+')) {
+		const prefix = normalizedPattern.split('/:path+')[0]
+		return normalizedPath.startsWith(prefix) && normalizedPath !== prefix
+	}
+
+	if (normalizedPattern.includes('/:')) {
+		const parts = normalizedPattern.split('/')
+		const pathParts = normalizedPath.split('/')
+
+		if (parts.length !== pathParts.length) {
+			return false
+		}
+
+		return parts.every((part, i) => {
+			if (part.startsWith(':')) {
+				return true
+			}
+			return part === pathParts[i]
+		})
+	}
+
+	return false
+}
+
+function findMissingRewrites(framerPaths: string[], currentRewrites: Set<string>): string[] {
+	return framerPaths.filter((p) => {
+		for (const rewrite of currentRewrites) {
+			if (pathMatchesRewrite(p, rewrite)) {
+				return false
+			}
+		}
+		return true
+	})
+}
+
+function addRewritesToConfig(configPath: string, missingRewrites: string[]): void {
+	let configContent = fs.readFileSync(configPath, 'utf-8')
+
+	// Find the beforeFiles array
+	const beforeFilesStart = configContent.indexOf('beforeFiles: [')
+	const beforeFilesEnd = configContent.indexOf('],', beforeFilesStart)
+
+	if (beforeFilesStart === -1 || beforeFilesEnd === -1) {
+		throw new Error('Could not find beforeFiles array in next.config.js')
+	}
+
+	// Extract current beforeFiles content
+	const beforeFilesContent = configContent.substring(
+		beforeFilesStart + 'beforeFiles: ['.length,
+		beforeFilesEnd
+	)
+
+	// Parse existing rewrites
+	const existingRewrites: Array<{ source: string; destination: string }> = []
+	const rewriteBlockRegex =
+		/\{\s*source:\s*['"]([^'"]+)['"]\s*,\s*destination:\s*[`'"]([^`'"]+)[`'"]\s*,?\s*\}/g
+
+	let match
+	while ((match = rewriteBlockRegex.exec(beforeFilesContent)) !== null) {
+		existingRewrites.push({ source: match[1], destination: match[2] })
+	}
+
+	// For each missing rewrite, find where to insert it alphabetically
+	const sortedMissing = [...missingRewrites].sort()
+
+	for (const path of sortedMissing) {
+		// Find the insertion point
+		let insertIndex = 0
+		for (let i = 0; i < existingRewrites.length; i++) {
+			if (path.localeCompare(existingRewrites[i].source) < 0) {
+				insertIndex = i
+				break
+			}
+			insertIndex = i + 1
+		}
+
+		// Insert at the found position
+		existingRewrites.splice(insertIndex, 0, {
+			source: path,
+			destination: `https://\${REWRITE_DOMAIN}${path}`,
+		})
+	}
+
+	// Rebuild the array with consistent formatting
+	const rewriteEntries = existingRewrites
+		.map((r) => {
+			// Use template literal only if there's interpolation
+			const destQuote = r.destination.includes('${') ? '`' : "'"
+			return `\t\t\t\t{\n\t\t\t\t\tsource: '${r.source}',\n\t\t\t\t\tdestination: ${destQuote}${r.destination}${destQuote},\n\t\t\t\t}`
+		})
+		.join(',\n')
+
+	const newBeforeFiles = `beforeFiles: [\n${rewriteEntries},\n\t\t\t],`
+
+	configContent =
+		configContent.substring(0, beforeFilesStart) +
+		newBeforeFiles +
+		configContent.substring(beforeFilesEnd + 2)
+
+	fs.writeFileSync(configPath, configContent, 'utf-8')
+}
+
+async function addMissingRewrites() {
+	nicelog('• Fetching Framer sitemap...')
+
+	const framerPaths = await fetchFramerSitemap()
+	const configPath = path.join(__dirname, '../next.config.js')
+	const currentRewrites = getCurrentRewrites(configPath)
+	const missingRewrites = findMissingRewrites(framerPaths, currentRewrites)
+
+	nicelog(`• Found ${framerPaths.length} paths in Framer sitemap`)
+	nicelog(`• Found ${currentRewrites.size} existing rewrites in config`)
+
+	if (missingRewrites.length === 0) {
+		nicelog('✔ No missing rewrites found')
+		return { added: 0, paths: [] }
+	}
+
+	nicelog(`• Adding ${missingRewrites.length} missing rewrites...`)
+	addRewritesToConfig(configPath, missingRewrites)
+
+	nicelog('✔ Successfully added missing rewrites')
+
+	return { added: missingRewrites.length, paths: missingRewrites }
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+	addMissingRewrites()
+		.then(() => {
+			process.exit(0)
+		})
+		.catch((error) => {
+			console.error('Error:', error)
+			process.exit(1)
+		})
+}
+
+export { addMissingRewrites }
diff --git a/apps/docs/version.ts b/apps/docs/version.ts
index 82ffd702e1c4..0c50ec2cee4e 100644
--- a/apps/docs/version.ts
+++ b/apps/docs/version.ts
@@ -1,9 +1,9 @@
 // This file is automatically generated by internal/scripts/refresh-assets.ts.
 // Do not edit manually. Or do, I'm a comment, not a cop.
 
-export const version = '4.1.1'
+export const version = '4.2.0'
 export const publishDates = {
 	major: '2025-09-18T14:39:22.803Z',
-	minor: '2025-10-15T12:30:12.428Z',
-	patch: '2025-10-15T13:45:13.201Z',
+	minor: '2025-11-19T11:53:58.692Z',
+	patch: '2025-11-19T11:53:58.692Z',
 }
diff --git a/apps/dotcom/asset-upload-worker/src/worker.ts b/apps/dotcom/asset-upload-worker/src/worker.ts
index d76b8cafa226..004872173527 100644
--- a/apps/dotcom/asset-upload-worker/src/worker.ts
+++ b/apps/dotcom/asset-upload-worker/src/worker.ts
@@ -2,21 +2,24 @@
 /// <reference types="@cloudflare/workers-types" />
 
 import {
+	blockUnknownOrigins,
 	createRouter,
 	handleApiRequest,
 	handleUserAssetGet,
 	handleUserAssetUpload,
+	isAllowedOrigin,
 	notFound,
 } from '@tldraw/worker-shared'
 import { WorkerEntrypoint } from 'cloudflare:workers'
 import { cors } from 'itty-router'
 import { Environment } from './types'
 
-const { preflight, corsify } = cors({ origin: '*' })
+const { preflight, corsify } = cors({ origin: isAllowedOrigin })
 
 export default class Worker extends WorkerEntrypoint<Environment> {
 	readonly router = createRouter<Environment>()
 		.all('*', preflight)
+		.all('*', blockUnknownOrigins)
 		.get('/uploads/:objectName', async (request) => {
 			return handleUserAssetGet({
 				request,
diff --git a/apps/dotcom/client/assets/icons/icon/icon-folder-new.svg b/apps/dotcom/client/assets/icons/icon/icon-folder-new.svg
new file mode 100644
index 000000000000..a0178b77a2d6
--- /dev/null
+++ b/apps/dotcom/client/assets/icons/icon/icon-folder-new.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.5 7.07v3.606M5.625 8.873h3.75m3.125 4.902a1.2 1.2 0 0 0 .884-.398c.234-.254.366-.6.366-.96V5.634c0-.36-.132-.705-.366-.96a1.2 1.2 0 0 0-.884-.397H7.563a1.17 1.17 0 0 1-.6-.16 1.3 1.3 0 0 1-.457-.45L6 2.85a1.3 1.3 0 0 0-.45-.448 1.2 1.2 0 0 0-.594-.163H2.5a1.2 1.2 0 0 0-.884.398 1.42 1.42 0 0 0-.366.96v8.82c0 .36.132.705.366.96.235.254.552.397.884.397z"/></svg>
\ No newline at end of file
diff --git a/apps/dotcom/client/assets/icons/icon/icon-folder-open.svg b/apps/dotcom/client/assets/icons/icon/icon-folder-open.svg
new file mode 100644
index 000000000000..4542b955c266
--- /dev/null
+++ b/apps/dotcom/client/assets/icons/icon/icon-folder-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m3.749 9.31.938-1.687c.101-.188.256-.347.448-.46.192-.112.412-.174.639-.18h6.725m0 0c.191 0 .38.04.551.119s.322.191.439.332c.117.14.198.304.236.478.039.174.034.353-.014.526l-1.1 3.489c-.069.25-.227.473-.447.631a1.3 1.3 0 0 1-.771.241H2.499a1.3 1.3 0 0 1-.884-.34 1.12 1.12 0 0 1-.366-.823v-7.56c0-.309.132-.605.366-.823.235-.218.553-.34.884-.34h2.438c.209-.002.415.045.6.136.184.092.34.225.456.387l.506.698c.114.16.269.293.451.384s.386.14.593.14h3.706c.332 0 .65.122.884.34s.366.514.366.822z"/></svg>
\ No newline at end of file
diff --git a/apps/dotcom/client/assets/icons/icon/icon-folder.svg b/apps/dotcom/client/assets/icons/icon/icon-folder.svg
new file mode 100644
index 000000000000..fc41a8aa92b0
--- /dev/null
+++ b/apps/dotcom/client/assets/icons/icon/icon-folder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 12.638c.332 0 .65-.12.884-.336s.366-.508.366-.813V5.744c0-.304-.132-.597-.366-.812a1.3 1.3 0 0 0-.884-.336H7.563a1.34 1.34 0 0 1-.6-.135 1.2 1.2 0 0 1-.457-.383L6 3.39a1.2 1.2 0 0 0-.45-.38 1.34 1.34 0 0 0-.594-.137H2.5c-.332 0-.65.121-.884.337a1.1 1.1 0 0 0-.366.812v7.468c0 .305.132.597.366.813.235.215.552.336.884.336z"/></svg>
\ No newline at end of file
diff --git a/apps/dotcom/client/e2e/fixtures/Database.ts b/apps/dotcom/client/e2e/fixtures/Database.ts
index 862db0134f25..47792e7d947b 100644
--- a/apps/dotcom/client/e2e/fixtures/Database.ts
+++ b/apps/dotcom/client/e2e/fixtures/Database.ts
@@ -1,5 +1,5 @@
 import { Page } from '@playwright/test'
-import { DB } from '@tldraw/dotcom-shared'
+import { DB, userHasFlag } from '@tldraw/dotcom-shared'
 import fs from 'fs'
 import { Kysely, PostgresDialect, sql } from 'kysely'
 import pg from 'pg'
@@ -49,7 +49,7 @@ export class Database {
 			flags: string | null
 		}>`SELECT flags FROM public.user WHERE id = ${id}`.execute(db)
 
-		return result.rows[0]?.flags?.includes('groups_backend') ?? false
+		return userHasFlag(result.rows[0]?.flags, 'groups_backend')
 	}
 
 	/**
@@ -64,6 +64,31 @@ export class Database {
 		await sql`SELECT * FROM migrate_user_to_groups(${id}, ${inviteSecret})`.execute(db)
 	}
 
+	/**
+	 * Enable groups frontend flag for a user
+	 */
+	async enableGroupsFrontend(isOther: boolean = false): Promise<void> {
+		const id = await this.getUserId(isOther)
+		if (!id) throw new Error('User not found')
+
+		// Get current flags
+		const result = await sql<{
+			flags: string | null
+		}>`SELECT flags FROM public.user WHERE id = ${id}`.execute(db)
+
+		const currentFlags = result.rows[0]?.flags || ''
+		const flagsArray = currentFlags.split(/[,\s]+/).filter(Boolean)
+
+		// Add groups_frontend if not present
+		if (!flagsArray.includes('groups_frontend')) {
+			flagsArray.push('groups_frontend')
+		}
+
+		// Update with new flags
+		const newFlags = flagsArray.join(',')
+		await sql`UPDATE public.user SET flags = ${newFlags} WHERE id = ${id}`.execute(db)
+	}
+
 	private async cleanUpUser(isOther: boolean) {
 		const fileName = getStorageStateFileName(this.parallelIndex, isOther ? 'suppy' : 'huppy')
 		if (!fs.existsSync(fileName)) return
@@ -73,9 +98,6 @@ export class Database {
 			// eslint-disable-next-line no-restricted-globals
 			await fetch(`http://localhost:3000/api/app/__test__/user/${id}/prepare-for-test`, {
 				method: 'POST',
-				headers: {
-					'x-legacy': process.env.TLDRAW_INIT_MODE === 'new' ? 'false' : 'true',
-				},
 			})
 		} catch (e) {
 			console.error('Error', e)
diff --git a/apps/dotcom/client/e2e/fixtures/GroupInviteDialog.ts b/apps/dotcom/client/e2e/fixtures/GroupInviteDialog.ts
new file mode 100644
index 000000000000..6f5d1b73ad09
--- /dev/null
+++ b/apps/dotcom/client/e2e/fixtures/GroupInviteDialog.ts
@@ -0,0 +1,36 @@
+import type { Locator, Page } from '@playwright/test'
+import { expect, step } from './tla-test'
+
+export class GroupInviteDialog {
+	public readonly dialog: Locator
+	public readonly acceptButton: Locator
+	public readonly declineButton: Locator
+
+	constructor(public readonly page: Page) {
+		this.dialog = this.page.getByText("You've been invited to group")
+		this.acceptButton = this.page.getByRole('button', { name: 'Accept and join group' })
+		this.declineButton = this.page.getByRole('button', { name: 'No thanks' })
+	}
+
+	async isVisible() {
+		return this.dialog.isVisible()
+	}
+
+	async expectIsVisible() {
+		await expect(this.dialog).toBeVisible()
+	}
+
+	async expectIsNotVisible() {
+		await expect(this.dialog).not.toBeVisible()
+	}
+
+	@step
+	async acceptInvitation() {
+		await this.acceptButton.click()
+	}
+
+	@step
+	async declineInvitation() {
+		await this.declineButton.click()
+	}
+}
diff --git a/apps/dotcom/client/e2e/fixtures/HomePage.ts b/apps/dotcom/client/e2e/fixtures/HomePage.ts
index 219afb09f4f3..06714649e060 100644
--- a/apps/dotcom/client/e2e/fixtures/HomePage.ts
+++ b/apps/dotcom/client/e2e/fixtures/HomePage.ts
@@ -16,34 +16,27 @@ export class HomePage {
 		this.signInButton = this.page.getByTestId('tla-sign-in-button')
 		this.tldrawEditor = this.page.getByTestId('tla-editor')
 		this.tldrawCanvas = this.page.getByTestId('canvas')
-
-		// Set localStorage flag based on environment variable
-		const initMode = process.env.TLDRAW_INIT_MODE || 'legacy'
-		this.page.addInitScript((mode) => {
-			if (mode === 'new') {
-				// eslint-disable-next-line no-restricted-syntax
-				localStorage.setItem('tldraw_groups_init', 'true')
-			} else {
-				// eslint-disable-next-line no-restricted-syntax
-				localStorage.removeItem('tldraw_groups_init')
-			}
-		}, initMode)
 	}
 
 	@step
 	async loginAs(email: string) {
-		const isSideBarToggleVisible = await this.editor.sidebarToggle.isVisible()
-		// We are already signed in
-		if (isSideBarToggleVisible) return
 		if (this.page.url() !== rootUrl) {
 			await this.goto()
 		}
+		await this.page.waitForLoadState('domcontentloaded')
+		const isSideBarToggleVisible =
+			(await this.editor.sidebarToggle.isVisible().catch(() => false)) ?? false
+		if (isSideBarToggleVisible) return
+
 		await expect(this.signInButton).toBeVisible()
-		await this.signInButton.click()
-		await this.page.getByLabel('Email address').fill(email)
-		await this.page.getByRole('button', { name: 'Continue', exact: true }).click()
-		await this.page.waitForTimeout(1000)
-		await this.page.getByRole('textbox', { name: 'Enter verification code' }).fill('424242')
+
+		await this.signInButton.click({ force: true })
+		await this.page.getByTestId('tla-identifier-input').fill(email)
+		await this.page.getByTestId('tla-continue-with-email-button').click()
+		// will go to
+		await this.page.getByTestId('tla-verification-code-input').fill('424242')
+		// Wait till we're on a file page, e.g. /f/:someId
+		await this.page.waitForURL(new RegExp(`${rootUrl}f/.*`))
 		await expect(async () => {
 			await expect(this.page.getByTestId('tla-sidebar-toggle')).toBeVisible()
 		}).toPass()
@@ -56,15 +49,32 @@ export class HomePage {
 		await expect(this.signInButton).toBeVisible()
 		await this.signInButton.click()
 		await this.page.getByLabel('Email address').fill(email)
-		await this.page.getByRole('button', { name: 'Continue', exact: true }).click()
+		// Note: This method is for staging/production Clerk flows that use passwords
+		// The password field appears after clicking continue on email
+		await this.page.getByTestId('tla-continue-with-email-button').click()
+		await this.page.waitForTimeout(500)
 		await this.page.getByRole('textbox', { name: 'Password' }).fill(password)
+		// After entering password, look for any Continue button (Clerk's default buttons don't have test IDs)
 		await this.page.getByRole('button', { name: 'Continue', exact: true }).click()
 		await this.page.waitForTimeout(1000)
+		await this.handleTermsIfNeeded()
 		await expect(async () => {
 			await expect(this.page.getByTestId('tla-sidebar-toggle')).toBeVisible()
 		}).toPass()
 	}
 
+	private async handleTermsIfNeeded() {
+		const acceptAndContinueButton = this.page.getByTestId('tla-accept-and-continue-button')
+		// Wait a bit for the dialog to potentially appear
+		await this.page.waitForTimeout(500)
+		if ((await acceptAndContinueButton.count()) === 0) return
+		await expect(acceptAndContinueButton).toBeVisible()
+		await expect(acceptAndContinueButton).toBeEnabled()
+		await acceptAndContinueButton.click()
+		// Wait for the button click to complete
+		await this.page.waitForTimeout(500)
+	}
+
 	async expectSignInButtonVisible() {
 		await expect(async () => {
 			await expect(this.signInButton).toBeVisible()
@@ -82,6 +92,9 @@ export class HomePage {
 	}
 
 	async isLoaded() {
+		// Swat away the terms dialog if it appears.
+		await this.handleTermsIfNeeded()
+
 		await expect(async () => {
 			await expect(this.tldrawEditor).toBeVisible({ timeout: 10000 })
 			await expect(this.tldrawCanvas).toBeVisible({ timeout: 10000 })
diff --git a/apps/dotcom/client/e2e/fixtures/Sidebar.ts b/apps/dotcom/client/e2e/fixtures/Sidebar.ts
index ccab75435603..0405da7cf4f5 100644
--- a/apps/dotcom/client/e2e/fixtures/Sidebar.ts
+++ b/apps/dotcom/client/e2e/fixtures/Sidebar.ts
@@ -8,6 +8,7 @@ export class Sidebar {
 	public readonly sidebar: Locator
 	public readonly sidebarLogo: Locator
 	public readonly createFileButton: Locator
+	public readonly createGroupButton: Locator
 	public readonly userSettingsMenu: Locator
 	public readonly helpMenu: Locator
 	public readonly themeButton: Locator
@@ -18,6 +19,7 @@ export class Sidebar {
 		this.sidebar = this.page.getByTestId('tla-sidebar')
 		this.sidebarLogo = this.page.getByTestId('tla-sidebar-logo-icon')
 		this.createFileButton = this.page.getByTestId('tla-create-file')
+		this.createGroupButton = this.page.getByTestId('tla-create-group')
 		this.userSettingsMenu = this.page.getByTestId('tla-sidebar-user-settings-trigger')
 		this.helpMenu = this.page.getByTestId('tla-sidebar-help-menu-trigger')
 		this.themeButton = this.page.getByText('Theme')
@@ -238,4 +240,354 @@ export class Sidebar {
 	async closeAccountMenu() {
 		await this.page.keyboard.press('Escape')
 	}
+
+	// Group-related methods
+
+	@step
+	async createGroup(name: string) {
+		// Click the create group button
+		await this.createGroupButton.click()
+
+		// Fill in group name
+		const input = this.page.getByPlaceholder('Group name')
+		await expect(input).toBeVisible()
+		await input.fill(name)
+
+		// Click create button
+		await this.page.getByRole('button', { name: 'Create group' }).click()
+		await this.mutationResolution()
+	}
+
+	getGroup(groupName: string) {
+		return this.page.locator(`[data-group-id]`).filter({ hasText: groupName })
+	}
+
+	async expectGroupVisible(groupName: string) {
+		await expect(this.getGroup(groupName)).toBeVisible()
+	}
+
+	async isGroupExpanded(groupName: string): Promise<boolean> {
+		const group = this.getGroup(groupName)
+		const header = group.locator('[role="button"]').first()
+		const expanded = await header.getAttribute('aria-expanded')
+		return expanded === 'true'
+	}
+
+	@step
+	async toggleGroup(groupName: string) {
+		const group = this.getGroup(groupName)
+		const header = group.locator('[role="button"]').first()
+		await header.click()
+	}
+
+	@step
+	async expandGroup(groupName: string) {
+		if (!(await this.isGroupExpanded(groupName))) {
+			await this.toggleGroup(groupName)
+		}
+	}
+
+	@step
+	async collapseGroup(groupName: string) {
+		if (await this.isGroupExpanded(groupName)) {
+			await this.toggleGroup(groupName)
+		}
+	}
+
+	private async expectGroupState(groupName: string, expectedExpanded: boolean) {
+		const group = this.getGroup(groupName)
+		const header = group.locator('[role="button"]').first()
+
+		// Check aria-expanded attribute
+		await expect(header).toHaveAttribute('aria-expanded', expectedExpanded.toString())
+
+		// Check icon via mask style
+		const icon = group.locator('[role="img"]').first()
+		const expectedIcon = expectedExpanded ? 'icon-folder-open' : 'icon-folder'
+		await expect(icon).toBeVisible()
+
+		await expect(async () => {
+			const maskStyle = await icon.evaluate((el) => window.getComputedStyle(el).mask)
+			expect(maskStyle).toContain(expectedIcon)
+			if (!expectedExpanded) {
+				expect(maskStyle).not.toContain('icon-folder-open')
+			}
+		}).toPass({ timeout: 5000 })
+	}
+
+	@step
+	async expectGroupExpanded(groupName: string) {
+		await this.expectGroupState(groupName, true)
+	}
+
+	@step
+	async expectGroupCollapsed(groupName: string) {
+		await this.expectGroupState(groupName, false)
+	}
+
+	@step
+	async openGroupSettings(groupName: string) {
+		const group = this.getGroup(groupName)
+		const groupHeader = group.locator('[role="button"]').first()
+		await groupHeader.hover()
+
+		// Click the more options button
+		const moreOptionsButton = group.locator('button[title="More options"]')
+		await moreOptionsButton.click()
+
+		// Click Settings menu item
+		await this.page.getByRole('menuitem', { name: 'Settings' }).click()
+	}
+
+	@step
+	async renameGroup(oldName: string, newName: string) {
+		await this.openGroupSettings(oldName)
+
+		// Find the name input and change it (use placeholder as user sees it)
+		const input = this.page.getByPlaceholder('Group name')
+		await expect(input).toBeVisible()
+		await input.fill(newName)
+
+		// Close the dialog
+		await this.page.getByRole('button', { name: 'Close' }).click()
+		await this.mutationResolution()
+	}
+
+	@step
+	async deleteGroup(groupName: string) {
+		await this.openGroupSettings(groupName)
+
+		// Click the Delete group button (exact text as user sees it)
+		await this.page.getByRole('button', { name: 'Delete group…' }).click()
+
+		// Confirm deletion in the confirmation dialog
+		await this.page.getByRole('button', { name: 'Delete group' }).click()
+		await this.mutationResolution()
+	}
+
+	async expectGroupNotVisible(groupName: string) {
+		await expect(this.getGroup(groupName)).not.toBeVisible()
+	}
+
+	// File visibility methods
+	getFileByName(fileName: string) {
+		return this.page.locator('[data-element="file-link"]').filter({ hasText: fileName })
+	}
+
+	@step
+	async expectFileVisible(fileName: string) {
+		await expect(this.getFileByName(fileName)).toBeVisible()
+	}
+
+	@step
+	async expectFileNotVisible(fileName: string) {
+		await expect(this.getFileByName(fileName)).not.toBeVisible()
+	}
+
+	@step
+	async createFileInGroup(groupName: string, fileName: string) {
+		const group = this.getGroup(groupName)
+		const groupHeader = group.locator('[role="button"]').first()
+		await groupHeader.hover()
+
+		const createButton = group.locator('button[title="New file"]')
+		await expect(createButton).toBeVisible()
+		await createButton.click()
+
+		const input = this.page.getByTestId('tla-sidebar-rename-input')
+		await expect(input).toBeVisible({ timeout: 10000 })
+		await expect(input).toBeFocused()
+		await input.fill(fileName)
+		await this.page.keyboard.press('Enter')
+
+		await this.mutationResolution()
+		await this.expectFileVisible(fileName)
+		// UI has 1000ms throttle - wait to allow next file creation
+		await this.page.waitForTimeout(1100)
+	}
+
+	@step
+	private async openFileMenuByName(fileName: string) {
+		const fileLink = this.getFileByName(fileName)
+		await fileLink.hover()
+		const button = fileLink.getByRole('button')
+		await button.click()
+	}
+
+	@step
+	async pinFileInGroup(fileName: string) {
+		await this.openFileMenuByName(fileName)
+		await this.page.getByRole('menuitem', { name: 'Pin' }).click()
+		await this.mutationResolution()
+	}
+
+	@step
+	async unpinFileInGroup(fileName: string) {
+		await this.openFileMenuByName(fileName)
+		await this.page.getByRole('menuitem', { name: 'Unpin' }).click()
+		await this.mutationResolution()
+	}
+
+	@step
+	async expectFilePinned(fileName: string) {
+		const fileLink = this.getFileByName(fileName)
+		await expect(fileLink).toHaveAttribute('data-is-pinned', 'true')
+	}
+
+	@step
+	async expectFileNotPinned(fileName: string) {
+		const fileLink = this.getFileByName(fileName)
+		await expect(fileLink).toHaveAttribute('data-is-pinned', 'false')
+	}
+
+	async getFilesInGroup(groupName: string): Promise<string[]> {
+		const group = this.getGroup(groupName)
+		const fileLinks = group.locator('[data-element="file-link"]')
+		const count = await fileLinks.count()
+		const fileNames: string[] = []
+		for (let i = 0; i < count; i++) {
+			const fileName = await fileLinks.nth(i).locator('[data-testid*="-name"]').innerText()
+			fileNames.push(fileName)
+		}
+		return fileNames
+	}
+
+	@step
+	async deleteFileInGroup(fileName: string) {
+		await this.openFileMenuByName(fileName)
+		await this.deleteFromFileMenu()
+	}
+
+	@step
+	async duplicateFileInGroup(fileName: string, newName?: string) {
+		await this.openFileMenuByName(fileName)
+		await this.duplicateFromFileMenu(newName)
+	}
+
+	@step
+	async moveFileToGroup(fileName: string, targetGroupName: string) {
+		await this.openFileMenuByName(fileName)
+		await this.page.getByRole('menuitem', { name: 'Move to' }).hover()
+		await this.page.getByRole('menuitem', { name: targetGroupName, exact: true }).click()
+		await this.mutationResolution()
+	}
+
+	@step
+	async moveFileToHome(fileName: string) {
+		await this.openFileMenuByName(fileName)
+		await this.page.getByRole('menuitem', { name: 'Move to' }).hover()
+		await this.page.getByRole('menuitem', { name: 'My files' }).click()
+		await this.mutationResolution()
+	}
+
+	@step
+	async copyGroupInviteLink(groupName: string): Promise<string> {
+		const group = this.getGroup(groupName)
+		await this.expandGroup(groupName)
+		const inviteButton = group.getByRole('button', { name: 'copy invite link' })
+		await inviteButton.click()
+		return await this.page.evaluate(() => navigator.clipboard.readText())
+	}
+
+	@step
+	async copyGroupInviteLinkFromMenu(groupName: string): Promise<string> {
+		const group = this.getGroup(groupName)
+		const groupHeader = group.locator('[role="button"]').first()
+		await groupHeader.hover()
+
+		const moreOptionsButton = group.locator('button[title="More options"]')
+		await moreOptionsButton.click()
+
+		await this.page.getByRole('menuitem', { name: 'Copy invite link' }).click()
+		return await this.page.evaluate(() => navigator.clipboard.readText())
+	}
+
+	async getGroupOrder(): Promise<string[]> {
+		const groups = this.page.locator('[data-group-id]')
+		const count = await groups.count()
+		const groupNames: string[] = []
+		for (let i = 0; i < count; i++) {
+			const groupHeader = groups.nth(i).locator('[role="button"]').first()
+			const text = await groupHeader.innerText()
+			// Extract just the group name (text before any counts)
+			const name = text.split('\n')[0].trim()
+			groupNames.push(name)
+		}
+		return groupNames
+	}
+
+	@step
+	async dragGroupToPosition(sourceGroupName: string, targetGroupName: string) {
+		const sourceHeader = this.getGroup(sourceGroupName).locator('[role="button"]').first()
+		const targetGroup = this.getGroup(targetGroupName)
+
+		const sourceBox = await sourceHeader.boundingBox()
+		const targetBox = await targetGroup.boundingBox()
+
+		if (!sourceBox || !targetBox) throw new Error('Could not get bounding boxes')
+
+		// Move to source
+		await this.page.mouse.move(
+			sourceBox.x + sourceBox.width / 2,
+			sourceBox.y + sourceBox.height / 2
+		)
+
+		// Press and hold
+		await this.page.mouse.down()
+
+		// Small delay to let browser detect drag intent
+		await this.page.waitForTimeout(100)
+
+		// Drag to target position (below target group)
+		await this.page.mouse.move(
+			targetBox.x + targetBox.width / 2,
+			targetBox.y + targetBox.height + 5,
+			{ steps: 10 }
+		)
+
+		// Small delay before release
+		await this.page.waitForTimeout(50)
+
+		// Release
+		await this.page.mouse.up()
+
+		await this.mutationResolution()
+	}
+
+	@step
+	async dragFileToGroup(fileName: string, targetGroupName: string) {
+		const fileElement = this.getFileByName(fileName)
+		const targetGroup = this.getGroup(targetGroupName)
+
+		const fileBox = await fileElement.boundingBox()
+		const targetBox = await targetGroup.boundingBox()
+
+		if (!fileBox || !targetBox) throw new Error('Could not get bounding boxes')
+
+		// Move to file
+		await this.page.mouse.move(fileBox.x + fileBox.width / 2, fileBox.y + fileBox.height / 2)
+
+		// Press and hold
+		await this.page.mouse.down()
+
+		// Small delay to let browser detect drag intent
+		await this.page.waitForTimeout(100)
+
+		// Drag to target group center
+		await this.page.mouse.move(
+			targetBox.x + targetBox.width / 2,
+			targetBox.y + targetBox.height / 2,
+			{
+				steps: 10,
+			}
+		)
+
+		// Small delay before release
+		await this.page.waitForTimeout(50)
+
+		// Release
+		await this.page.mouse.up()
+
+		await this.mutationResolution()
+	}
 }
diff --git a/apps/dotcom/client/e2e/fixtures/SignInDialog.ts b/apps/dotcom/client/e2e/fixtures/SignInDialog.ts
new file mode 100644
index 000000000000..190a76435e4c
--- /dev/null
+++ b/apps/dotcom/client/e2e/fixtures/SignInDialog.ts
@@ -0,0 +1,90 @@
+import type { Locator, Page } from '@playwright/test'
+import { expect } from '@playwright/test'
+import { step } from './tla-test'
+
+export class SignInDialog {
+	public readonly googleButton: Locator
+	public readonly emailInput: Locator
+	public readonly continueWithEmailButton: Locator
+	public readonly codeInput: Locator
+	public readonly resendButton: Locator
+	public readonly analyticsCheckbox: Locator
+	public readonly acceptAndContinueButton: Locator
+
+	constructor(private readonly page: Page) {
+		this.googleButton = this.page.getByTestId('tla-google-sign-in-button')
+		this.emailInput = this.page.getByLabel('Email address')
+		this.continueWithEmailButton = this.page.getByTestId('tla-continue-with-email-button')
+		this.codeInput = this.page.locator('#tla-verification-code')
+		this.resendButton = this.page.getByTestId('tla-resend-code-button')
+		this.analyticsCheckbox = this.page.getByRole('checkbox', {
+			name: /Allow analytics to help improve tldraw/i,
+		})
+		this.acceptAndContinueButton = this.page.getByTestId('tla-accept-and-continue-button')
+	}
+
+	@step
+	async expectInitialElements() {
+		await expect(this.googleButton).toBeVisible()
+		await expect(this.emailInput).toBeVisible()
+		await expect(this.continueWithEmailButton).toBeVisible()
+	}
+
+	@step
+	async continueWithEmail(email: string) {
+		await this.emailInput.fill(email)
+		await expect(this.continueWithEmailButton).toBeEnabled()
+		await this.continueWithEmailButton.click()
+	}
+
+	@step
+	async expectCodeStageVisible() {
+		await expect(this.codeInput).toBeVisible()
+	}
+
+	@step
+	async fillCode(code: string) {
+		await this.codeInput.fill(code)
+	}
+
+	@step
+	async clickResend() {
+		await expect(this.resendButton).toBeVisible()
+		await this.resendButton.click()
+	}
+
+	@step
+	async expectTermsStageVisible() {
+		await expect(this.acceptAndContinueButton).toBeVisible()
+	}
+
+	@step
+	async expectAnalyticsToggleVisible() {
+		await expect(this.analyticsCheckbox).toBeVisible()
+	}
+
+	@step
+	async expectAnalyticsToggleHidden() {
+		await expect(this.analyticsCheckbox).toHaveCount(0)
+	}
+
+	@step
+	async expectAcceptAndContinueDisabled() {
+		await expect(this.acceptAndContinueButton).toBeDisabled()
+	}
+
+	@step
+	async setAnalyticsOptIn(optIn: boolean) {
+		if ((await this.analyticsCheckbox.count()) === 0) return
+		if (optIn) {
+			await this.analyticsCheckbox.check()
+		} else {
+			await this.analyticsCheckbox.uncheck()
+		}
+	}
+
+	@step
+	async acceptAndContinue() {
+		await this.acceptAndContinueButton.click()
+	}
+}
diff --git a/apps/dotcom/client/e2e/fixtures/helpers.ts b/apps/dotcom/client/e2e/fixtures/helpers.ts
index 688e406bde8f..1ddf12e01e52 100644
--- a/apps/dotcom/client/e2e/fixtures/helpers.ts
+++ b/apps/dotcom/client/e2e/fixtures/helpers.ts
@@ -3,6 +3,7 @@ import fs from 'fs'
 import path from 'path'
 import { Editor } from './Editor'
 import { ErrorPage } from './ErrorPages'
+import { GroupInviteDialog } from './GroupInviteDialog'
 import { HomePage } from './HomePage'
 import { ShareMenu } from './ShareMenu'
 import { Sidebar } from './Sidebar'
@@ -33,7 +34,8 @@ export async function openNewTab(
 			await newContext.grantPermissions(['clipboard-read', 'clipboard-write'])
 		}
 		const newPage = await newContext.newPage()
-		const { newEditor, newHomePage, newShareMenu, errorPage } = createFixtures(newPage)
+		const { newSidebar, newEditor, newHomePage, newShareMenu, newGroupInviteDialog, errorPage } =
+			createFixtures(newPage)
 		if (url) {
 			await newPage.goto(url)
 		} else {
@@ -41,7 +43,16 @@ export async function openNewTab(
 		}
 
 		await newHomePage.isLoaded()
-		return { newPage, newContext, newHomePage, newEditor, newShareMenu, errorPage }
+		return {
+			newPage,
+			newContext,
+			newSidebar,
+			newHomePage,
+			newEditor,
+			newShareMenu,
+			newGroupInviteDialog,
+			errorPage,
+		}
 	})
 }
 
@@ -67,8 +78,9 @@ export function createFixtures(page: Page) {
 	const newEditor = new Editor(page, newSidebar)
 	const newHomePage = new HomePage(page, newEditor)
 	const newShareMenu = new ShareMenu(page)
+	const newGroupInviteDialog = new GroupInviteDialog(page)
 	const errorPage = new ErrorPage(page)
-	return { newSidebar, newEditor, newHomePage, newShareMenu, errorPage }
+	return { newSidebar, newEditor, newHomePage, newShareMenu, newGroupInviteDialog, errorPage }
 }
 
 export function getRandomName() {
diff --git a/apps/dotcom/client/e2e/fixtures/tla-test.ts b/apps/dotcom/client/e2e/fixtures/tla-test.ts
index 3ecf58353528..07562ec5a058 100644
--- a/apps/dotcom/client/e2e/fixtures/tla-test.ts
+++ b/apps/dotcom/client/e2e/fixtures/tla-test.ts
@@ -5,9 +5,11 @@ import { OTHER_USERS, USERS } from '../consts'
 import { Database } from './Database'
 import { DeleteFileDialog } from './DeleteFileDialog'
 import { Editor } from './Editor'
+import { GroupInviteDialog } from './GroupInviteDialog'
 import { HomePage } from './HomePage'
 import { ShareMenu } from './ShareMenu'
 import { Sidebar } from './Sidebar'
+import { SignInDialog } from './SignInDialog'
 import { getStorageStateFileName } from './helpers'
 
 interface TlaFixtures {
@@ -17,6 +19,8 @@ interface TlaFixtures {
 	shareMenu: ShareMenu
 	database: Database
 	deleteFileDialog: DeleteFileDialog
+	groupInviteDialog: GroupInviteDialog
+	signInDialog: SignInDialog
 	setupAndCleanup: void
 	retry(fn: () => Promise<void>): Promise<void>
 }
@@ -44,6 +48,12 @@ export const test = base.extend<TlaFixtures, TlaWorkerFixtures>({
 	deleteFileDialog: async ({ page }, testUse) => {
 		await testUse(new DeleteFileDialog(page))
 	},
+	groupInviteDialog: async ({ page }, testUse) => {
+		await testUse(new GroupInviteDialog(page))
+	},
+	signInDialog: async ({ page }, testUse) => {
+		await testUse(new SignInDialog(page))
+	},
 	// This is an auto fixture which makes sure that we are on the home page when the test starts
 	// and that we clean up when the tests completes
 	setupAndCleanup: [
diff --git a/apps/dotcom/client/e2e/run-both-modes.sh b/apps/dotcom/client/e2e/run-both-modes.sh
deleted file mode 100755
index 579fa099d6e3..000000000000
--- a/apps/dotcom/client/e2e/run-both-modes.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# Script to run e2e tests with both initialization modes
-# 1. Legacy init (unmigrated users) - default
-# 2. New groups init (migrated users)
-
-set -e
-
-echo "🚀 Running e2e tests with both initialization modes"
-echo ""
-
-# Function to run tests with a specific init mode
-run_tests_with_mode() {
-    local mode=$1
-    local description=$2
-    
-    echo "🧪 Running tests with: $description"
-    echo "📋 TLDRAW_INIT_MODE=$mode"
-    echo ""
-    
-    # Run tests with the specific environment variable
-    TLDRAW_INIT_MODE=$mode yarn e2e
-    
-    if [ $? -eq 0 ]; then
-        echo "✅ Tests passed for: $description"
-    else
-        echo "❌ Tests failed for: $description"
-        exit 1
-    fi
-    
-    echo ""
-}
-
-# Run tests with legacy initialization (unmigrated users)
-run_tests_with_mode "legacy" "Legacy Init (Unmigrated Users)"
-
-# Run tests with new groups initialization (migrated users)
-run_tests_with_mode "new" "New Groups Init (Migrated Users)"
-
-echo "🎉 All test configurations passed!"
diff --git a/apps/dotcom/client/e2e/tests/cookie-consent.spec.ts b/apps/dotcom/client/e2e/tests/cookie-consent.spec.ts
index 03a4a95b7305..1817e97f5290 100644
--- a/apps/dotcom/client/e2e/tests/cookie-consent.spec.ts
+++ b/apps/dotcom/client/e2e/tests/cookie-consent.spec.ts
@@ -7,6 +7,15 @@ test.use({ storageState: { cookies: [], origins: [] } })
 
 test.describe('cookie consent banner', () => {
 	test.beforeEach(async ({ page }) => {
+		// Mock the consent check to always require consent
+		await page.route('https://consent.tldraw.xyz', async (route) => {
+			await route.fulfill({
+				status: 200,
+				contentType: 'application/json',
+				body: JSON.stringify({ requires_consent: true, country_code: 'TEST' }),
+			})
+		})
+
 		await page.evaluate((key) => {
 			// eslint-disable-next-line no-restricted-syntax
 			window.localStorage.removeItem(key)
diff --git a/apps/dotcom/client/e2e/tests/groups.spec.ts b/apps/dotcom/client/e2e/tests/groups.spec.ts
new file mode 100644
index 000000000000..d08ff64cb22c
--- /dev/null
+++ b/apps/dotcom/client/e2e/tests/groups.spec.ts
@@ -0,0 +1,554 @@
+import { getRandomName, openNewTab } from '../fixtures/helpers'
+import { expect, test } from '../fixtures/tla-test'
+
+test.describe('groups', () => {
+	test.beforeEach(async ({ database, editor }) => {
+		await database.migrateUser()
+		await database.enableGroupsFrontend()
+		await editor.isLoaded()
+		await editor.ensureSidebarOpen()
+	})
+
+	test.describe('basic operations', () => {
+		test('create group', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupVisible(groupName)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expectGroupVisible(groupName)
+		})
+
+		test('rename group', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+			const newGroupName = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupVisible(groupName)
+
+			await sidebar.renameGroup(groupName, newGroupName)
+
+			await sidebar.expectGroupVisible(newGroupName)
+			await sidebar.expectGroupNotVisible(groupName)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expectGroupVisible(newGroupName)
+			await sidebar.expectGroupNotVisible(groupName)
+		})
+
+		test('delete group', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+			const fileName = getRandomName()
+			const homeFileName = getRandomName()
+
+			await sidebar.createNewDocument(homeFileName)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupVisible(groupName)
+			await sidebar.createFileInGroup(groupName, fileName)
+			await sidebar.expectFileVisible(fileName)
+
+			await sidebar.getFileByName(homeFileName).click()
+			await editor.isLoaded()
+
+			await sidebar.deleteGroup(groupName)
+
+			await sidebar.expectGroupNotVisible(groupName)
+			await sidebar.expectFileNotVisible(fileName)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expectGroupNotVisible(groupName)
+			await sidebar.expectFileNotVisible(fileName)
+			await sidebar.expectFileVisible(homeFileName)
+		})
+
+		test('expand and collapse', async ({ page, sidebar, editor }) => {
+			const group1 = getRandomName()
+			const group2 = getRandomName()
+			const homeFileName = getRandomName()
+			const file1 = getRandomName()
+			const file2 = getRandomName()
+
+			await sidebar.createNewDocument(homeFileName)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.createGroup(group1)
+			await sidebar.createGroup(group2)
+			await sidebar.expectGroupExpanded(group1)
+			await sidebar.expectGroupExpanded(group2)
+
+			await sidebar.createFileInGroup(group1, file1)
+			await sidebar.createFileInGroup(group2, file2)
+
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(file2)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.toggleGroup(group1)
+			await sidebar.expectGroupCollapsed(group1)
+			await sidebar.expectFileNotVisible(file1)
+			await sidebar.expectFileVisible(file2)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.toggleGroup(group2)
+			await sidebar.expectGroupCollapsed(group2)
+			await sidebar.expectFileNotVisible(file1)
+			await sidebar.expectFileNotVisible(file2)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.toggleGroup(group1)
+			await sidebar.expectGroupExpanded(group1)
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileNotVisible(file2)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.toggleGroup(group2)
+			await sidebar.expectGroupExpanded(group2)
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(file2)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.getFileByName(homeFileName).click()
+			await editor.isLoaded()
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expectGroupCollapsed(group1)
+			await sidebar.expectGroupCollapsed(group2)
+
+			await sidebar.expectFileNotVisible(file1)
+			await sidebar.expectFileNotVisible(file2)
+			await sidebar.expectFileVisible(homeFileName)
+		})
+
+		test('create file via empty state', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+			const fileName = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+
+			const group = sidebar.getGroup(groupName)
+			await expect(group).toContainText('Drag files here')
+			await expect(group).toContainText('create a file')
+			await expect(group).toContainText('copy invite link')
+
+			const createFileButton = group.getByRole('button', { name: 'create a file' })
+			await createFileButton.click()
+
+			const input = page.getByTestId('tla-sidebar-rename-input')
+			await expect(input).toBeVisible({ timeout: 10000 })
+			await expect(input).toBeFocused()
+			await input.fill(fileName)
+			await page.keyboard.press('Enter')
+
+			await sidebar.mutationResolution()
+
+			await sidebar.expectFileVisible(fileName)
+			const filesInGroup = await sidebar.getFilesInGroup(groupName)
+			expect(filesInGroup).toContain(fileName)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(groupName)
+
+			await sidebar.expectFileVisible(fileName)
+		})
+	})
+
+	test.describe('group operations', () => {
+		test('drag groups to reorder', async ({ page, sidebar, editor }) => {
+			const group1 = getRandomName()
+			const group2 = getRandomName()
+			const group3 = getRandomName()
+
+			await sidebar.createGroup(group1)
+			await sidebar.createGroup(group2)
+			await sidebar.createGroup(group3)
+
+			// Get initial order (newest first)
+			const initialOrder = await sidebar.getGroupOrder()
+			expect(initialOrder).toEqual([group3, group2, group1])
+
+			// Drag group3 (first) to position after group1 (last)
+			await sidebar.dragGroupToPosition(group3, group1)
+
+			// Verify new order - group3 should have moved
+			const newOrder = await sidebar.getGroupOrder()
+			expect(newOrder).not.toEqual(initialOrder)
+			expect(newOrder).toContain(group1)
+			expect(newOrder).toContain(group2)
+			expect(newOrder).toContain(group3)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+
+			// Verify order persisted
+			const orderAfterReload = await sidebar.getGroupOrder()
+			expect(orderAfterReload).toEqual(newOrder)
+		})
+	})
+
+	test.describe('file operations', () => {
+		test('drag file between groups', async ({ page, sidebar, editor }) => {
+			const group1 = getRandomName()
+			const group2 = getRandomName()
+			const file1 = getRandomName()
+
+			await sidebar.createGroup(group1)
+			await sidebar.createGroup(group2)
+			await sidebar.expectGroupExpanded(group1)
+			await sidebar.expectGroupExpanded(group2)
+
+			await sidebar.createFileInGroup(group1, file1)
+			await sidebar.expectFileVisible(file1)
+
+			const filesInGroup1Before = await sidebar.getFilesInGroup(group1)
+			expect(filesInGroup1Before).toContain(file1)
+
+			// Drag file from group1 to group2
+			await sidebar.dragFileToGroup(file1, group2)
+
+			const filesInGroup1After = await sidebar.getFilesInGroup(group1)
+			const filesInGroup2 = await sidebar.getFilesInGroup(group2)
+			expect(filesInGroup1After).not.toContain(file1)
+			expect(filesInGroup2).toContain(file1)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(group1)
+			await sidebar.expandGroup(group2)
+
+			const filesInGroup1AfterReload = await sidebar.getFilesInGroup(group1)
+			const filesInGroup2AfterReload = await sidebar.getFilesInGroup(group2)
+			expect(filesInGroup1AfterReload).not.toContain(file1)
+			expect(filesInGroup2AfterReload).toContain(file1)
+		})
+
+		test('pin and unpin files', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+			const homeFileName = getRandomName()
+			const file1 = getRandomName()
+			const file2 = getRandomName()
+			const file3 = getRandomName()
+
+			await sidebar.createNewDocument(homeFileName)
+			await sidebar.expectFileVisible(homeFileName)
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, file1)
+			await sidebar.createFileInGroup(groupName, file2)
+			await sidebar.createFileInGroup(groupName, file3)
+
+			await sidebar.getFileByName(homeFileName).click()
+			await editor.isLoaded()
+			await sidebar.expectFileNotPinned(file1)
+			await sidebar.expectFileNotPinned(file2)
+			await sidebar.expectFileNotPinned(file3)
+
+			await sidebar.pinFileInGroup(file2)
+			await sidebar.expectFilePinned(file2)
+
+			let fileOrder = await sidebar.getFilesInGroup(groupName)
+			expect(fileOrder[0]).toBe(file2)
+
+			await sidebar.pinFileInGroup(file1)
+			await sidebar.expectFilePinned(file1)
+
+			fileOrder = await sidebar.getFilesInGroup(groupName)
+			const file1Index = fileOrder.indexOf(file1)
+			const file2Index = fileOrder.indexOf(file2)
+			const file3Index = fileOrder.indexOf(file3)
+
+			expect(file1Index).toBeLessThan(file3Index)
+			expect(file2Index).toBeLessThan(file3Index)
+
+			await sidebar.unpinFileInGroup(file2)
+			await sidebar.expectFileNotPinned(file2)
+			await sidebar.expectFilePinned(file1)
+
+			await sidebar.getFileByName(homeFileName).click()
+			await editor.isLoaded()
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(groupName)
+
+			await sidebar.expectFilePinned(file1)
+			await sidebar.expectFileNotPinned(file2)
+			await sidebar.expectFileNotPinned(file3)
+
+			fileOrder = await sidebar.getFilesInGroup(groupName)
+			expect(fileOrder[0]).toBe(file1)
+		})
+
+		test('delete file', async ({ page, sidebar, editor, deleteFileDialog }) => {
+			const groupName = getRandomName()
+			const file1 = getRandomName()
+			const file2 = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, file1)
+			await sidebar.createFileInGroup(groupName, file2)
+
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(file2)
+
+			await sidebar.deleteFileInGroup(file1)
+			await deleteFileDialog.expectIsVisible()
+			await deleteFileDialog.confirmDeletion()
+			await deleteFileDialog.expectIsNotVisible()
+			await sidebar.mutationResolution()
+
+			await sidebar.expectFileNotVisible(file1)
+			await sidebar.expectFileVisible(file2)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(groupName)
+
+			await sidebar.expectFileNotVisible(file1)
+			await sidebar.expectFileVisible(file2)
+		})
+
+		test('duplicate file', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+			const file1 = getRandomName()
+			const file1Copy = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, file1)
+
+			await sidebar.expectFileVisible(file1)
+
+			await sidebar.duplicateFileInGroup(file1, file1Copy)
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(file1Copy)
+
+			const filesInGroup = await sidebar.getFilesInGroup(groupName)
+			expect(filesInGroup).toContain(file1)
+			expect(filesInGroup).toContain(file1Copy)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(groupName)
+
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(file1Copy)
+		})
+
+		test('move file between groups', async ({ page, sidebar, editor }) => {
+			const group1 = getRandomName()
+			const group2 = getRandomName()
+			const file1 = getRandomName()
+
+			await sidebar.createGroup(group1)
+			await sidebar.createGroup(group2)
+			await sidebar.expectGroupExpanded(group1)
+			await sidebar.expectGroupExpanded(group2)
+
+			await sidebar.createFileInGroup(group1, file1)
+			await sidebar.expectFileVisible(file1)
+
+			const filesInGroup1Before = await sidebar.getFilesInGroup(group1)
+			expect(filesInGroup1Before).toContain(file1)
+
+			await sidebar.moveFileToGroup(file1, group2)
+
+			const filesInGroup1After = await sidebar.getFilesInGroup(group1)
+			const filesInGroup2 = await sidebar.getFilesInGroup(group2)
+			expect(filesInGroup1After).not.toContain(file1)
+			expect(filesInGroup2).toContain(file1)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(group1)
+			await sidebar.expandGroup(group2)
+
+			const filesInGroup1AfterReload = await sidebar.getFilesInGroup(group1)
+			const filesInGroup2AfterReload = await sidebar.getFilesInGroup(group2)
+			expect(filesInGroup1AfterReload).not.toContain(file1)
+			expect(filesInGroup2AfterReload).toContain(file1)
+		})
+
+		test('move file to home', async ({ page, sidebar, editor }) => {
+			const groupName = getRandomName()
+			const file1 = getRandomName()
+			const homeFile = getRandomName()
+
+			await sidebar.createNewDocument(homeFile)
+			await sidebar.expectFileVisible(homeFile)
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, file1)
+
+			const filesInGroupBefore = await sidebar.getFilesInGroup(groupName)
+			expect(filesInGroupBefore).toContain(file1)
+
+			await sidebar.moveFileToHome(file1)
+
+			const filesInGroupAfter = await sidebar.getFilesInGroup(groupName)
+			expect(filesInGroupAfter).not.toContain(file1)
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(homeFile)
+
+			await page.reload()
+			await editor.isLoaded()
+			await editor.ensureSidebarOpen()
+			await sidebar.expandGroup(groupName)
+
+			const filesInGroupAfterReload = await sidebar.getFilesInGroup(groupName)
+			expect(filesInGroupAfterReload).not.toContain(file1)
+			await sidebar.expectFileVisible(file1)
+			await sidebar.expectFileVisible(homeFile)
+		})
+	})
+
+	test.describe('sharing', () => {
+		test.beforeEach(async ({ context }) => {
+			await context.grantPermissions(['clipboard-read', 'clipboard-write'])
+		})
+
+		test('invite user to group', async ({ sidebar, browser, database }) => {
+			const groupName = getRandomName()
+			const fileName = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, fileName)
+
+			const inviteUrl = await sidebar.copyGroupInviteLinkFromMenu(groupName)
+
+			// Migrate invitee to groups backend but not frontend (tests auto-enable)
+			await database.migrateUser(true)
+
+			const parallelIndex = test.info().parallelIndex
+			const { newSidebar, newEditor, newGroupInviteDialog, newContext } = await openNewTab(
+				browser,
+				{
+					url: inviteUrl,
+					allowClipboard: true,
+					userProps: { user: 'suppy', index: parallelIndex },
+				}
+			)
+
+			await newEditor.isLoaded()
+			await newEditor.ensureSidebarOpen()
+			await newGroupInviteDialog.acceptInvitation()
+
+			// Verify group visible (proves frontend flag was auto-enabled)
+			await newSidebar.expectGroupVisible(groupName)
+			await newSidebar.expandGroup(groupName)
+			await newSidebar.expectFileVisible(fileName)
+
+			await newContext.close()
+		})
+
+		test('delete file removes for all group members', async ({
+			sidebar,
+			browser,
+			database,
+			deleteFileDialog,
+		}) => {
+			const groupName = getRandomName()
+			const fileName = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, fileName)
+
+			const inviteUrl = await sidebar.copyGroupInviteLinkFromMenu(groupName)
+			await database.migrateUser(true)
+
+			const parallelIndex = test.info().parallelIndex
+			const { newSidebar, newEditor, newGroupInviteDialog, newContext } = await openNewTab(
+				browser,
+				{
+					url: inviteUrl,
+					allowClipboard: true,
+					userProps: { user: 'suppy', index: parallelIndex },
+				}
+			)
+
+			await newEditor.isLoaded()
+			await newEditor.ensureSidebarOpen()
+			await newGroupInviteDialog.acceptInvitation()
+
+			await newSidebar.expectGroupVisible(groupName)
+			await newSidebar.expandGroup(groupName)
+			await newSidebar.expectFileVisible(fileName)
+
+			// Delete file from original user
+			await sidebar.deleteFileInGroup(fileName)
+			await deleteFileDialog.expectIsVisible()
+			await deleteFileDialog.confirmDeletion()
+			await deleteFileDialog.expectIsNotVisible()
+			await sidebar.mutationResolution()
+
+			await sidebar.expectFileNotVisible(fileName)
+
+			// Verify file also removed for other user
+			await newSidebar.expectFileNotVisible(fileName)
+
+			await newContext.close()
+		})
+
+		test('delete group removes for all members', async ({ sidebar, browser, database }) => {
+			const groupName = getRandomName()
+			const fileName = getRandomName()
+
+			await sidebar.createGroup(groupName)
+			await sidebar.expectGroupExpanded(groupName)
+			await sidebar.createFileInGroup(groupName, fileName)
+
+			const inviteUrl = await sidebar.copyGroupInviteLinkFromMenu(groupName)
+			await database.migrateUser(true)
+
+			const parallelIndex = test.info().parallelIndex
+			const { newSidebar, newEditor, newGroupInviteDialog, newContext } = await openNewTab(
+				browser,
+				{
+					url: inviteUrl,
+					allowClipboard: true,
+					userProps: { user: 'suppy', index: parallelIndex },
+				}
+			)
+
+			await newEditor.isLoaded()
+			await newEditor.ensureSidebarOpen()
+			await newGroupInviteDialog.acceptInvitation()
+
+			await newSidebar.expectGroupVisible(groupName)
+
+			// Delete group from original user
+			await sidebar.deleteGroup(groupName)
+			await sidebar.expectGroupNotVisible(groupName)
+
+			// Verify group also removed for other user
+			await newSidebar.expectGroupNotVisible(groupName)
+
+			await newContext.close()
+		})
+	})
+})
diff --git a/apps/dotcom/client/e2e/tests/homepage.spec.ts b/apps/dotcom/client/e2e/tests/homepage.spec.ts
index 333213623bf1..a17799f2c26e 100644
--- a/apps/dotcom/client/e2e/tests/homepage.spec.ts
+++ b/apps/dotcom/client/e2e/tests/homepage.spec.ts
@@ -6,7 +6,14 @@ test.beforeEach(async ({ editor }) => {
 	await editor.isLoaded()
 })
 
-test('can toggle sidebar', async ({ editor, sidebar }) => {
+test('can instantiate', async ({ page }) => {
+	const dialogCloseButton = page.getByTestId('dialog.close')
+	// expect this button not to be present; ie that the dialog is not open
+	await expect(dialogCloseButton).not.toBeVisible()
+})
+
+test('can toggle sidebar', async ({ editor, sidebar, homePage }) => {
+	await homePage.expectSignInButtonNotVisible()
 	await editor.ensureSidebarOpen()
 	await editor.toggleSidebar()
 	await sidebar.expectIsNotVisible()
diff --git a/apps/dotcom/client/e2e/tests/init-mode-verification.spec.ts b/apps/dotcom/client/e2e/tests/init-mode-verification.spec.ts
deleted file mode 100644
index 55497a7b9a7c..000000000000
--- a/apps/dotcom/client/e2e/tests/init-mode-verification.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { expect, test } from '../fixtures/tla-test'
-
-/**
- * Simple test to verify that the init mode environment variable works correctly
- */
-
-test.describe('Init Mode Verification', () => {
-	test('should create user with correct migration state', async ({
-		database,
-		sidebar,
-		editor,
-		page,
-	}) => {
-		// Get the init mode from environment
-		const initMode = process.env.TLDRAW_INIT_MODE || 'legacy'
-		const shouldUseNewInit = initMode === 'new'
-
-		// Verify localStorage was set correctly
-		// eslint-disable-next-line no-restricted-syntax
-		const localStorageValue = await page.evaluate(() => localStorage.getItem('tldraw_groups_init'))
-
-		expect(localStorageValue).toBe(shouldUseNewInit ? 'true' : null)
-
-		// Reset to ensure fresh user creation
-		await database.reset()
-
-		// Navigate to trigger user creation
-		await page.goto('http://localhost:3000/')
-		await editor.isLoaded()
-		await editor.ensureSidebarOpen()
-		await sidebar.createNewDocument()
-
-		// Check the user's migration state
-		const isMigrated = await database.isUserMigrated()
-
-		if (shouldUseNewInit) {
-			expect(isMigrated).toBe(true)
-		} else {
-			expect(isMigrated).toBe(false)
-		}
-	})
-})
diff --git a/apps/dotcom/client/e2e/tests/signin-dialog.spec.ts b/apps/dotcom/client/e2e/tests/signin-dialog.spec.ts
new file mode 100644
index 000000000000..507857e1c9ed
--- /dev/null
+++ b/apps/dotcom/client/e2e/tests/signin-dialog.spec.ts
@@ -0,0 +1,497 @@
+import type { Page } from '@playwright/test'
+import { USERS } from '../consts'
+import { expect, test } from '../fixtures/tla-test'
+
+// Don't use stored credentials for these dialog-specific tests
+test.use({ storageState: { cookies: [], origins: [] } })
+
+// Helper function to set up route mocking for legal acceptance requirement
+// Works with both sign-in and sign-up flows
+async function setupLegalAcceptanceRequired(page: Page, sessionId: string) {
+	let verificationIntercepted = false
+
+	// Intercept verification attempts (both sign-in and sign-up)
+	await page.route('**/sign_ins/*/attempt*', async (route) => {
+		if (verificationIntercepted) {
+			await route.continue()
+			return
+		}
+
+		verificationIntercepted = true
+		const response = await route.fetch()
+		const json = await response.json()
+
+		// Modify response to require legal acceptance
+		json.missing_fields = ['legal_accepted']
+		json.missingFields = ['legal_accepted']
+		json.status = 'missing_requirements'
+
+		if (json.response) {
+			json.response.missing_fields = ['legal_accepted']
+			json.response.status = 'missing_requirements'
+		}
+
+		await route.fulfill({
+			status: 200,
+			contentType: 'application/json',
+			body: JSON.stringify(json),
+		})
+	})
+
+	await page.route('**/sign_ups/*/attempt*', async (route) => {
+		if (verificationIntercepted) {
+			await route.continue()
+			return
+		}
+
+		verificationIntercepted = true
+		const response = await route.fetch()
+		const json = await response.json()
+
+		// Modify response to require legal acceptance
+		json.missing_fields = ['legal_accepted']
+		json.missingFields = ['legal_accepted']
+		json.status = 'missing_requirements'
+
+		if (json.response) {
+			json.response.missing_fields = ['legal_accepted']
+			json.response.status = 'missing_requirements'
+		}
+
+		await route.fulfill({
+			status: 200,
+			contentType: 'application/json',
+			body: JSON.stringify(json),
+		})
+	})
+
+	// Intercept updates to complete after legal acceptance
+	await page.route('**/sign_ins/**', async (route) => {
+		const request = route.request()
+		const method = request.method()
+		const postData = request.postData() || ''
+
+		if (method === 'PATCH' && postData.includes('legalAccepted')) {
+			await route.fulfill({
+				status: 200,
+				contentType: 'application/json',
+				body: JSON.stringify({
+					status: 'complete',
+					createdSessionId: sessionId,
+					missing_fields: [],
+					missingFields: [],
+				}),
+			})
+			return
+		}
+
+		await route.fallback()
+	})
+
+	await page.route('**/sign_ups/**', async (route) => {
+		const request = route.request()
+		const method = request.method()
+		const postData = request.postData() || ''
+
+		if (method === 'PATCH' && postData.includes('legalAccepted')) {
+			await route.fulfill({
+				status: 200,
+				contentType: 'application/json',
+				body: JSON.stringify({
+					status: 'complete',
+					createdSessionId: sessionId,
+					missing_fields: [],
+					missingFields: [],
+				}),
+			})
+			return
+		}
+
+		await route.fallback()
+	})
+}
+
+test.describe('SignInDialog', () => {
+	test('renders initial elements and validates email input', async ({ homePage, signInDialog }) => {
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.expectInitialElements()
+
+		// Button is always enabled, but HTML5 validation prevents empty submission
+		await expect(signInDialog.continueWithEmailButton).toBeEnabled()
+		await signInDialog.emailInput.fill('user@example.com')
+		await expect(signInDialog.continueWithEmailButton).toBeEnabled()
+	})
+
+	test('can sign in via email code using the custom dialog', async ({
+		homePage,
+		editor,
+		signInDialog,
+	}) => {
+		const user = USERS[test.info().parallelIndex]
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+
+		await signInDialog.fillCode('424242')
+
+		await editor.isLoaded()
+		await expect(homePage.signInButton).not.toBeVisible()
+		await expect(editor.sidebarToggle).toBeVisible()
+	})
+
+	test('resend is available on code stage', async ({ homePage, signInDialog }) => {
+		const user = USERS[test.info().parallelIndex]
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+		await signInDialog.clickResend()
+
+		// Code input should still be visible and empty after resend
+		await expect(signInDialog.codeInput).toBeVisible()
+	})
+
+	test.skip('requires legal acceptance before continuing', async ({
+		homePage,
+		signInDialog,
+		page,
+	}) => {
+		// TODO: This test requires Clerk API mocking to work properly
+		// The setupLegalAcceptanceRequired function attempts to intercept Clerk API calls
+		// to simulate a user who needs to accept legal terms, but the current implementation
+		// doesn't properly handle the response format or the sign-in flow.
+		//
+		// To fix this test, we need to either:
+		// 1. Set up a test user in the Clerk environment who actually needs to accept terms
+		// 2. Improve the API mocking to handle both sign-in and sign-up flows correctly
+		// 3. Mock at a different level (e.g., mock the entire Clerk client)
+		const user = USERS[test.info().parallelIndex]
+
+		await setupLegalAcceptanceRequired(page, 'session_mock_1')
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+		await signInDialog.fillCode('424242')
+
+		await signInDialog.expectTermsStageVisible()
+		await signInDialog.expectAnalyticsToggleVisible()
+		await signInDialog.acceptAndContinue()
+	})
+
+	test.skip('hides analytics toggle when consent already granted', async ({
+		homePage,
+		signInDialog,
+		page,
+	}) => {
+		// TODO: See comment in 'requires legal acceptance before continuing' test
+		// This test has the same Clerk API mocking issues
+		const user = USERS[test.info().parallelIndex]
+
+		await setupLegalAcceptanceRequired(page, 'session_mock_analytics_hidden')
+
+		await page.evaluate(
+			([key, value]) => {
+				// eslint-disable-next-line no-restricted-syntax
+				window.localStorage.setItem(key, value)
+			},
+			['tldraw_cookie_consent', JSON.stringify({ analytics: true })]
+		)
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+		await signInDialog.fillCode('424242')
+
+		await signInDialog.expectTermsStageVisible()
+		await signInDialog.expectAnalyticsToggleHidden()
+		await signInDialog.acceptAndContinue()
+	})
+
+	test.skip('opt-in analytics persists to localStorage', async ({
+		homePage,
+		signInDialog,
+		page,
+	}) => {
+		// TODO: See comment in 'requires legal acceptance before continuing' test
+		// This test has the same Clerk API mocking issues
+		const user = USERS[test.info().parallelIndex]
+
+		await setupLegalAcceptanceRequired(page, 'session_mock_2')
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+		await signInDialog.fillCode('424242')
+
+		await signInDialog.expectTermsStageVisible()
+		await signInDialog.expectAnalyticsToggleVisible()
+		await signInDialog.setAnalyticsOptIn(true)
+		await signInDialog.acceptAndContinue()
+
+		const storedConsent = await page.evaluate(() => {
+			try {
+				return (window as any)['localStorage'].getItem('tldraw_cookie_consent')
+			} catch {
+				return null
+			}
+		})
+
+		expect(storedConsent).toBeTruthy()
+		const parsed = storedConsent ? JSON.parse(storedConsent as string) : null
+		expect(parsed?.analytics).toBe(true)
+	})
+
+	// Google OAuth flow
+	test.skip('can sign in with Google OAuth', async () => {
+		// Should test:
+		// 1. Click "Sign in with Google" button
+		// 2. Mock/handle OAuth redirect flow
+		// 3. Verify successful authentication and redirect to editor
+		// 4. Check that user is signed in (no sign in button visible)
+		// Note: Requires OAuth flow mocking or test environment setup
+	})
+
+	test.skip('Google OAuth handles new user requiring legal acceptance', async () => {
+		// Should test:
+		// 1. Start Google OAuth for a new user account
+		// 2. After OAuth completion, verify legal acceptance screen appears
+		// 3. Verify analytics toggle is shown
+		// 4. Accept terms and verify user is fully signed in
+	})
+
+	// Existing user sign-in flow
+	test.skip('existing user can sign in without legal acceptance', async () => {
+		// Should test:
+		// 1. Enter email for an existing user who has already accepted terms
+		// 2. Enter verification code
+		// 3. Verify sign in completes without showing terms/analytics screen
+		// 4. Verify user is taken directly to editor
+	})
+
+	// Error handling scenarios
+	test.skip('displays error for invalid verification code', async () => {
+		// Should test:
+		// 1. Enter valid email and proceed to code stage
+		// 2. Enter incorrect verification code
+		// 3. Verify error message is displayed
+		// 4. Verify code input is cleared and can be retried
+	})
+
+	test.skip('handles API errors during email submission', async () => {
+		// Should test:
+		// 1. Mock API to return error during sign in attempt
+		// 2. Submit email address
+		// 3. Verify error message is displayed to user
+		// 4. Verify form remains usable for retry
+	})
+
+	test.skip('handles network failure during code verification', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Mock network failure for verification attempt
+		// 3. Submit verification code
+		// 4. Verify error is displayed and user can retry
+	})
+
+	test.skip('handles error during terms acceptance', async () => {
+		// Should test:
+		// 1. Complete email and code steps for new user
+		// 2. Mock API error when submitting legal acceptance
+		// 3. Click "Accept and continue"
+		// 4. Verify error message is displayed
+		// 5. Verify user can retry acceptance
+	})
+
+	test.skip('displays resend error when resend API fails', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Mock resend API to return error
+		// 3. Click resend button
+		// 4. Verify resend error message is displayed
+	})
+
+	// Resend cooldown behavior
+	test.skip('enforces 30-second cooldown on resend button', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Click resend button
+		// 3. Verify button is disabled with countdown timer (30, 29, 28...)
+		// 4. Wait for cooldown to expire
+		// 5. Verify button becomes enabled again after 30 seconds
+	})
+
+	test.skip('cannot resend code while previous resend is in progress', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Click resend and immediately try to click again
+		// 3. Verify button is disabled during submission
+		// 4. Verify only one resend request is sent
+	})
+
+	// Code input UX
+	test.skip('auto-submits code when 6 digits are entered', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Type 6 digits in code input
+		// 3. Verify code is automatically submitted without clicking a button
+		// 4. Verify verification API call is made automatically
+	})
+
+	test.skip('code input only accepts numeric characters', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Try typing letters and special characters in code input
+		// 3. Verify only numeric characters 0-9 are accepted
+		// 4. Verify input is limited to 6 characters maximum
+	})
+
+	test.skip('code input shows visual focus state on OTP boxes', async () => {
+		// Should test:
+		// 1. Enter email and proceed to code stage
+		// 2. Focus on code input
+		// 3. Verify correct OTP box shows focus state as digits are entered
+		// 4. Verify focus indicator moves as each digit is typed
+	})
+
+	// Analytics opt-out
+	test.skip('can opt out of analytics on sign-up', async () => {
+		// Should test:
+		// 1. Complete sign-up flow to terms stage
+		// 2. Verify analytics toggle is initially unchecked or check state
+		// 3. Explicitly uncheck analytics toggle (if checked)
+		// 4. Accept terms and continue
+		// 5. Verify localStorage shows analytics: false
+	})
+
+	test.skip('analytics preference defaults to null for first-time users', async () => {
+		// Should test:
+		// 1. Clear localStorage
+		// 2. Start sign-up flow
+		// 3. Reach terms stage
+		// 4. Verify analytics toggle state reflects null initial state
+		// 5. Accept without changing toggle
+		// 6. Verify final localStorage state
+	})
+
+	// Dialog close behaviors
+	test('can close dialog during email entry stage', async ({ homePage, signInDialog, page }) => {
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		await signInDialog.expectInitialElements()
+
+		// Partially fill email
+		await signInDialog.emailInput.fill('partial@example.com')
+
+		// Close the dialog
+		await page.keyboard.press('Escape')
+
+		// Verify dialog is closed and user remains signed out
+		await expect(signInDialog.emailInput).not.toBeVisible()
+		await homePage.expectSignInButtonVisible()
+	})
+
+	test('can close dialog during code entry stage', async ({ homePage, signInDialog, page }) => {
+		const user = USERS[test.info().parallelIndex]
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		// Complete email stage
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+
+		// Close dialog without entering code
+		await page.keyboard.press('Escape')
+
+		// Verify dialog is closed and user remains signed out
+		await expect(signInDialog.codeInput).not.toBeVisible()
+		await homePage.expectSignInButtonVisible()
+
+		// Verify user can restart flow by reopening dialog
+		await homePage.signInButton.click()
+		await signInDialog.expectInitialElements()
+	})
+
+	test.skip('can close dialog during terms acceptance stage', async ({
+		homePage,
+		signInDialog,
+		page,
+	}) => {
+		// TODO: See comment in 'requires legal acceptance before continuing' test
+		// This test has the same Clerk API mocking issues
+		const user = USERS[test.info().parallelIndex]
+
+		await setupLegalAcceptanceRequired(page, 'session_mock_close')
+
+		await homePage.expectSignInButtonVisible()
+		await homePage.signInButton.click()
+
+		// Complete email and code stages
+		await signInDialog.continueWithEmail(user)
+		await signInDialog.expectCodeStageVisible()
+		await signInDialog.fillCode('424242')
+
+		// Reach terms acceptance screen
+		await signInDialog.expectTermsStageVisible()
+
+		// Close dialog without accepting
+		await page.keyboard.press('Escape')
+
+		// Verify dialog is closed and user is not signed in
+		await expect(signInDialog.acceptAndContinueButton).not.toBeVisible()
+		await homePage.expectSignInButtonVisible()
+
+		// Verify reopening dialog starts fresh (user can restart flow)
+		await homePage.signInButton.click()
+		await signInDialog.expectInitialElements()
+	})
+
+	// Edge cases
+	test.skip('prevents submission of empty or whitespace-only email', async () => {
+		// Should test:
+		// 1. Open sign in dialog
+		// 2. Try to submit with empty email
+		// 3. Verify continue button is disabled
+		// 4. Try to submit with whitespace only
+		// 5. Verify submission is prevented via HTML5 validation or button state
+	})
+
+	test.skip('handles session already complete on verification', async () => {
+		// Should test:
+		// 1. Start sign-in flow
+		// 2. Mock API to return status: 'complete' immediately on code entry
+		// 3. Enter code
+		// 4. Verify user is signed in without showing additional screens
+		// 5. Verify dialog closes and editor is accessible
+	})
+
+	test.skip('recovers from Clerk API inconsistencies', async () => {
+		// Should test:
+		// 1. Mock Clerk API returning inconsistent response formats
+		// 2. Test handling of both missing_fields and missingFields variations
+		// 3. Verify sign-up flow completes despite API format variations
+	})
+
+	test.skip('handles missing emailAddressId in sign-in response', async () => {
+		// Should test:
+		// 1. Mock sign-in response without emailAddressId for email_code factor
+		// 2. Submit email for existing user
+		// 3. Verify error message about email verification not being available
+		// 4. Verify user can retry or try different email
+	})
+})
diff --git a/apps/dotcom/client/package.json b/apps/dotcom/client/package.json
index 9bf0e74cd857..f58eeb46bd94 100644
--- a/apps/dotcom/client/package.json
+++ b/apps/dotcom/client/package.json
@@ -18,7 +18,7 @@
 		"lint": "yarn run -T tsx ../../../internal/scripts/lint.ts",
 		"test-ci": "yarn run -T vitest run --passWithNoTests",
 		"test": "yarn run -T vitest --passWithNoTests",
-		"i18n:extract": "formatjs extract 'src/{tla,pages,components}/**/*.ts*' --out-file public/tla/locales/en.json --additional-component-names F --id-interpolation-pattern '[md5:contenthash:hex:10]' --format lokalise",
+		"i18n:extract": "formatjs extract 'src/{tla,pages,components,fairy}/**/*.ts*' --out-file public/tla/locales/en.json --additional-component-names F --id-interpolation-pattern '[md5:contenthash:hex:10]' --format lokalise",
 		"i18n:compile": "formatjs compile-folder public/tla/locales public/tla/locales-compiled --format lokalise --ast",
 		"e2e": "NODE_OPTIONS='--no-experimental-strip-types' rm -rf 'e2e/.auth' && yarn playwright test --project=chromium --workers=1",
 		"e2e-x10": "NODE_OPTIONS='--no-experimental-strip-types' yarn playwright test --project=chromium --repeat-each=10",
@@ -29,7 +29,8 @@
 		"test-coverage": "yarn run -T vitest run --coverage --passWithNoTests"
 	},
 	"dependencies": {
-		"@clerk/clerk-react": "^5.22.8",
+		"@clerk/clerk-react": "^5.53.3",
+		"@clerk/elements": "^0.23.74",
 		"@rocicorp/zero": "0.19.2025050203",
 		"@sentry/integrations": "^7.120.3",
 		"@sentry/react": "^7.120.3",
@@ -46,7 +47,7 @@
 		"idb": "^7.1.1",
 		"intl-messageformat": "^10.7.14",
 		"lodash.pick": "^4.4.0",
-		"posthog-js": "^1.248.1",
+		"posthog-js": "^1.281.0",
 		"qrcode": "^1.5.4",
 		"radix-ui": "^1.4.2",
 		"react": "^18.3.1",
@@ -54,6 +55,7 @@
 		"react-ga4": "^2.1.0",
 		"react-helmet-async": "^1.3.0",
 		"react-intl": "^6.8.9",
+		"react-markdown": "^10.1.0",
 		"react-router-dom": "^6.28.2",
 		"tldraw": "workspace:*"
 	},
diff --git a/apps/dotcom/client/public/cookies.html b/apps/dotcom/client/public/cookies.html
new file mode 100644
index 000000000000..f68184805672
--- /dev/null
+++ b/apps/dotcom/client/public/cookies.html
@@ -0,0 +1,707 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Cookie Policy</title><style>
+  /* cspell:disable-file */
+  /* webkit printing magic: print all background colors */
+  html {
+    -webkit-print-color-adjust: exact;
+  }
+  * {
+    box-sizing: border-box;
+    -webkit-print-color-adjust: exact;
+  }
+  
+  html,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+  @media only screen {
+    body {
+      margin: 2em auto;
+      max-width: 70ch;
+      padding: 0 2em;
+      color: rgb(55, 53, 47);
+    }
+  }
+  
+  body {
+    line-height: 1.5;
+    white-space: pre-wrap;
+  }
+  
+  a,
+  a.visited {
+    color: inherit;
+    text-decoration: underline;
+  }
+  
+  .pdf-relative-link-path {
+    font-size: 80%;
+    color: #444;
+  }
+  
+  h1,
+  h2,
+  h3 {
+    letter-spacing: -0.01em;
+    line-height: 1.2;
+    font-weight: 600;
+    margin-bottom: 0;
+  }
+  
+  .page-title {
+    font-size: 2.5rem;
+    font-weight: 700;
+    margin-top: 0;
+    margin-bottom: 0.75em;
+  }
+  
+  h1 {
+    font-size: 1.875rem;
+    margin-top: 1.875rem;
+  }
+  
+  h2 {
+    font-size: 1.5rem;
+    margin-top: 1.5rem;
+  }
+  
+  h3 {
+    font-size: 1.25rem;
+    margin-top: 1.25rem;
+  }
+  
+  .source {
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    padding: 1.5em;
+    word-break: break-all;
+  }
+  
+  .callout {
+    border-radius: 10px;
+    padding: 1rem;
+  }
+  
+  figure {
+    margin: 1.25em 0;
+    page-break-inside: avoid;
+  }
+  
+  figcaption {
+    opacity: 0.5;
+    font-size: 85%;
+    margin-top: 0.5em;
+  }
+  
+  mark {
+    background-color: transparent;
+  }
+  
+  .indented {
+    padding-left: 1.5em;
+  }
+  
+  hr {
+    background: transparent;
+    display: block;
+    width: 100%;
+    height: 1px;
+    visibility: visible;
+    border: none;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.09);
+  }
+  
+  img {
+    max-width: 100%;
+  }
+  
+  @media only print {
+    img {
+      max-height: 100vh;
+      object-fit: contain;
+    }
+  }
+  
+  @page {
+    margin: 1in;
+  }
+  
+  .collection-content {
+    font-size: 0.875rem;
+  }
+  
+  .collection-content td {
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+  
+  .column-list {
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .column {
+    padding: 0 1em;
+  }
+  
+  .column:first-child {
+    padding-left: 0;
+  }
+  
+  .column:last-child {
+    padding-right: 0;
+  }
+  
+  .table_of_contents-item {
+    display: block;
+    font-size: 0.875rem;
+    line-height: 1.3;
+    padding: 0.125rem;
+  }
+  
+  .table_of_contents-indent-1 {
+    margin-left: 1.5rem;
+  }
+  
+  .table_of_contents-indent-2 {
+    margin-left: 3rem;
+  }
+  
+  .table_of_contents-indent-3 {
+    margin-left: 4.5rem;
+  }
+  
+  .table_of_contents-link {
+    text-decoration: none;
+    opacity: 0.7;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.18);
+  }
+  
+  table,
+  th,
+  td {
+    border: 1px solid rgba(55, 53, 47, 0.09);
+    border-collapse: collapse;
+  }
+  
+  table {
+    border-left: none;
+    border-right: none;
+  }
+  
+  th,
+  td {
+    font-weight: normal;
+    padding: 0.25em 0.5em;
+    line-height: 1.5;
+    min-height: 1.5em;
+    text-align: left;
+  }
+  
+  th {
+    color: rgba(55, 53, 47, 0.6);
+  }
+  
+  ol,
+  ul {
+    margin: 0;
+    margin-block-start: 0.6em;
+    margin-block-end: 0.6em;
+  }
+  
+  li > ol:first-child,
+  li > ul:first-child {
+    margin-block-start: 0.6em;
+  }
+  
+  ul > li {
+    list-style: disc;
+  }
+  
+  ul.to-do-list {
+    padding-inline-start: 0;
+  }
+  
+  ul.to-do-list > li {
+    list-style: none;
+  }
+  
+  .to-do-children-checked {
+    text-decoration: line-through;
+    opacity: 0.375;
+  }
+  
+  ul.toggle > li {
+    list-style: none;
+  }
+  
+  ul {
+    padding-inline-start: 1.7em;
+  }
+  
+  ul > li {
+    padding-left: 0.1em;
+  }
+  
+  ol {
+    padding-inline-start: 1.6em;
+  }
+  
+  ol > li {
+    padding-left: 0.2em;
+  }
+  
+  .mono ol {
+    padding-inline-start: 2em;
+  }
+  
+  .mono ol > li {
+    text-indent: -0.4em;
+  }
+  
+  .toggle {
+    padding-inline-start: 0em;
+    list-style-type: none;
+  }
+  
+  /* Indent toggle children */
+  .toggle > li > details {
+    padding-left: 1.7em;
+  }
+  
+  .toggle > li > details > summary {
+    margin-left: -1.1em;
+  }
+  
+  .selected-value {
+    display: inline-block;
+    padding: 0 0.5em;
+    background: rgba(206, 205, 202, 0.5);
+    border-radius: 3px;
+    margin-right: 0.5em;
+    margin-top: 0.3em;
+    margin-bottom: 0.3em;
+    white-space: nowrap;
+  }
+  
+  .collection-title {
+    display: inline-block;
+    margin-right: 1em;
+  }
+  
+  .page-description {
+    margin-bottom: 2em;
+  }
+  
+  .simple-table {
+    margin-top: 1em;
+    font-size: 0.875rem;
+    empty-cells: show;
+  }
+  .simple-table td {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table th {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table-header-color {
+    background: rgb(247, 246, 243);
+    color: black;
+  }
+  .simple-table-header {
+    font-weight: 500;
+  }
+  
+  time {
+    opacity: 0.5;
+  }
+  
+  .icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    max-width: 1.2em;
+    max-height: 1.2em;
+    text-decoration: none;
+    vertical-align: text-bottom;
+    margin-right: 0.5em;
+  }
+  
+  img.icon {
+    border-radius: 3px;
+  }
+  
+  .callout img.notion-static-icon {
+    width: 1em;
+    height: 1em;
+  }
+  
+  .callout p {
+    margin: 0;
+  }
+  
+  .callout h1,
+  .callout h2,
+  .callout h3 {
+    margin: 0 0 0.6rem;
+  }
+  
+  .user-icon {
+    width: 1.5em;
+    height: 1.5em;
+    border-radius: 100%;
+    margin-right: 0.5rem;
+  }
+  
+  .user-icon-inner {
+    font-size: 0.8em;
+  }
+  
+  .text-icon {
+    border: 1px solid #000;
+    text-align: center;
+  }
+  
+  .page-cover-image {
+    display: block;
+    object-fit: cover;
+    width: 100%;
+    max-height: 30vh;
+  }
+  
+  .page-header-icon {
+    font-size: 3rem;
+    margin-bottom: 1rem;
+  }
+  
+  .page-header-icon-with-cover {
+    margin-top: -0.72em;
+    margin-left: 0.07em;
+  }
+  
+  .page-header-icon img {
+    border-radius: 3px;
+  }
+  
+  .link-to-page {
+    margin: 1em 0;
+    padding: 0;
+    border: none;
+    font-weight: 500;
+  }
+  
+  p > .user {
+    opacity: 0.5;
+  }
+  
+  td > .user,
+  td > time {
+    white-space: nowrap;
+  }
+  
+  input[type="checkbox"] {
+    transform: scale(1.5);
+    margin-right: 0.6em;
+    vertical-align: middle;
+  }
+  
+  p {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+  }
+  
+  .image {
+    border: none;
+    margin: 1.5em 0;
+    padding: 0;
+    border-radius: 0;
+    text-align: center;
+  }
+  
+  .code,
+  code {
+    background: rgba(135, 131, 120, 0.15);
+    border-radius: 3px;
+    padding: 0.2em 0.4em;
+    border-radius: 3px;
+    font-size: 85%;
+    tab-size: 2;
+  }
+  
+  code {
+    color: #eb5757;
+  }
+  
+  .code {
+    padding: 1.5em 1em;
+  }
+  
+  .code-wrap {
+    white-space: pre-wrap;
+    word-break: break-all;
+  }
+  
+  .code > code {
+    background: none;
+    padding: 0;
+    font-size: 100%;
+    color: inherit;
+  }
+  
+  blockquote {
+    font-size: 1em;
+    margin: 1em 0;
+    padding-left: 1em;
+    border-left: 3px solid rgb(55, 53, 47);
+  }
+  
+  blockquote.quote-large {
+    font-size: 1.25em;
+  }
+  
+  .bookmark {
+    text-decoration: none;
+    max-height: 8em;
+    padding: 0;
+    display: flex;
+    width: 100%;
+    align-items: stretch;
+  }
+  
+  .bookmark-title {
+    font-size: 0.85em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    height: 1.75em;
+    white-space: nowrap;
+  }
+  
+  .bookmark-text {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .bookmark-info {
+    flex: 4 1 180px;
+    padding: 12px 14px 14px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  
+  .bookmark-image {
+    width: 33%;
+    flex: 1 1 180px;
+    display: block;
+    position: relative;
+    object-fit: cover;
+    border-radius: 1px;
+  }
+  
+  .bookmark-description {
+    color: rgba(55, 53, 47, 0.6);
+    font-size: 0.75em;
+    overflow: hidden;
+    max-height: 4.5em;
+    word-break: break-word;
+  }
+  
+  .bookmark-href {
+    font-size: 0.75em;
+    margin-top: 0.25em;
+  }
+  
+  .sans { font-family: ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; }
+  .code { font-family: "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace; }
+  .serif { font-family: Lyon-Text, Georgia, ui-serif, serif; }
+  .mono { font-family: iawriter-mono, Nitti, Menlo, Courier, monospace; }
+  .pdf .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK JP'; }
+  .pdf:lang(zh-CN) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK SC'; }
+  .pdf:lang(zh-TW) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK TC'; }
+  .pdf:lang(ko-KR) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK KR'; }
+  .pdf .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .pdf .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK JP'; }
+  .pdf:lang(zh-CN) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK SC'; }
+  .pdf:lang(zh-TW) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK TC'; }
+  .pdf:lang(ko-KR) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK KR'; }
+  .pdf .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .highlight-default {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .highlight-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .highlight-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .highlight-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .highlight-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .highlight-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .highlight-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .highlight-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .highlight-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .highlight-default_background {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray_background {
+    background: rgba(42, 28, 0, 0.07);
+  }
+  .highlight-brown_background {
+    background: rgba(139, 46, 0, 0.086);
+  }
+  .highlight-orange_background {
+    background: rgba(224, 101, 1, 0.129);
+  }
+  .highlight-yellow_background {
+    background: rgba(211, 168, 0, 0.137);
+  }
+  .highlight-teal_background {
+    background: rgba(0, 100, 45, 0.09);
+  }
+  .highlight-blue_background {
+    background: rgba(0, 124, 215, 0.094);
+  }
+  .highlight-purple_background {
+    background: rgba(102, 0, 178, 0.078);
+  }
+  .highlight-pink_background {
+    background: rgba(197, 0, 93, 0.086);
+  }
+  .highlight-red_background {
+    background: rgba(223, 22, 0, 0.094);
+  }
+  .block-color-default {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .block-color-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .block-color-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .block-color-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .block-color-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .block-color-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .block-color-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .block-color-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .block-color-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .block-color-default_background {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray_background {
+    background: rgba(240, 239, 237, 1);
+  }
+  .block-color-brown_background {
+    background: rgba(245, 237, 233, 1);
+  }
+  .block-color-orange_background {
+    background: rgba(251, 235, 222, 1);
+  }
+  .block-color-yellow_background {
+    background: rgba(249, 243, 220, 1);
+  }
+  .block-color-teal_background {
+    background: rgba(232, 241, 236, 1);
+  }
+  .block-color-blue_background {
+    background: rgba(229, 242, 252, 1);
+  }
+  .block-color-purple_background {
+    background: rgba(243, 235, 249, 1);
+  }
+  .block-color-pink_background {
+    background: rgba(250, 233, 241, 1);
+  }
+  .block-color-red_background {
+    background: rgba(252, 233, 231, 1);
+  }
+  .select-value-color-default { background-color: rgba(42, 28, 0, 0.07); }
+  .select-value-color-gray { background-color: rgba(28, 19, 1, 0.11); }
+  .select-value-color-brown { background-color: rgba(127, 51, 0, 0.156); }
+  .select-value-color-orange { background-color: rgba(196, 88, 0, 0.203); }
+  .select-value-color-yellow { background-color: rgba(209, 156, 0, 0.282); }
+  .select-value-color-green { background-color: rgba(0, 96, 38, 0.156); }
+  .select-value-color-blue { background-color: rgba(0, 118, 217, 0.203); }
+  .select-value-color-purple { background-color: rgba(92, 0, 163, 0.141); }
+  .select-value-color-pink { background-color: rgba(183, 0, 78, 0.152); }
+  .select-value-color-red { background-color: rgba(206, 24, 0, 0.164); }
+  
+  .checkbox {
+    display: inline-flex;
+    vertical-align: text-bottom;
+    width: 16;
+    height: 16;
+    background-size: 16px;
+    margin-left: 2px;
+    margin-right: 5px;
+  }
+  
+  .checkbox-on {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%2358A9D7%22%2F%3E%0A%3Cpath%20d%3D%22M6.71429%2012.2852L14%204.9995L12.7143%203.71436L6.71429%209.71378L3.28571%206.2831L2%207.57092L6.71429%2012.2852Z%22%20fill%3D%22white%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+  
+  .checkbox-off {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20x%3D%220.75%22%20y%3D%220.75%22%20width%3D%2214.5%22%20height%3D%2214.5%22%20fill%3D%22white%22%20stroke%3D%22%2336352F%22%20stroke-width%3D%221.5%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+    
+  </style></head><body><article id="17b3e4c3-24c0-804a-a860-f39e42865cf1" class="page sans"><header><div class="page-header-icon undefined"><span class="icon">📄</span></div><h1 class="page-title">Cookie Policy</h1><p class="page-description"></p></header><div class="page-body"><p id="17b3e4c3-24c0-8020-9f70-c53fe33b8c1d" class=""><strong>Last updated: January 14, 2025</strong></p><h2 id="17b3e4c3-24c0-806b-a27c-f87f5a642d4e" class="">Introduction</h2><p id="17b3e4c3-24c0-8007-8424-e74989793a5e" class="">This Cookie Policy explains how tldraw (&quot;we,&quot; &quot;us,&quot; or &quot;our&quot;) uses cookies and similar technologies when you use our whiteboarding application. This policy provides you with clear and comprehensive information about the cookies and storage technologies we use and the purposes for their use.</p><h2 id="17b3e4c3-24c0-8005-aded-f0c413243a8b" class="">What Are Cookies and Browser Storage?</h2><p id="17b3e4c3-24c0-80aa-96f4-f6c66c8a47be" class="">Cookies are small text files that websites place on your device to store information about your preferences, improve your user experience, and in some cases, enable core functionality of the service.</p><p id="17b3e4c3-24c0-80e9-b10e-d3c2bf972970" class="">Browser storage (including localStorage and sessionStorage) is a way for web applications to store data directly in your browser. Unlike cookies, browser storage can hold larger amounts of data and remains on your device until explicitly cleared by you or your browser&#x27;s automatic clearing mechanisms.</p><h2 id="17b3e4c3-24c0-80ee-af40-d82afe64b89c" class="">Types of Storage and Cookies We Use</h2><h3 id="17b3e4c3-24c0-80a8-b57c-c9ca072eabb0" class="">Essential Storage and Cookies</h3><ul id="17b3e4c3-24c0-80e4-afab-f5ebcd130cdf" class="bulleted-list"><li style="list-style-type:disc"><strong>Browser Storage for Whiteboard Data</strong>: <ul id="b16c92f7-9da8-4672-826d-c2888c3aa486" class="bulleted-list"><li style="list-style-type:circle">When not logged in, we use browser storage to save any drawings on your whiteboard and any configuration settings.</li></ul><ul id="f78fe060-61e3-4843-af15-dd90815618a7" class="bulleted-list"><li style="list-style-type:circle">This data remains stored indefinitely until you clear your browser storage or your browser automatically clears it.</li></ul></li></ul><ul id="17b3e4c3-24c0-8063-b5d2-ee896a1758ef" class="bulleted-list"><li style="list-style-type:disc"><strong>Authentication Cookies</strong> (via Clerk):<ul id="46c7b60f-c517-4def-ada1-c5c97321fb85" class="bulleted-list"><li style="list-style-type:circle">These enable our login system and manage user sessions.</li></ul><ul id="4fef0931-2c80-49ab-949e-8a9c0cbbee91" class="bulleted-list"><li style="list-style-type:circle">We store them for 1 year.</li></ul><ul id="9923127d-aeb7-4e61-af44-a19c334ab71d" class="bulleted-list"><li style="list-style-type:circle">These cookies are set regardless of whether you log in.</li></ul><ul id="a38d745b-4e03-4135-8908-2bf1b2bdee09" class="bulleted-list"><li style="list-style-type:circle">Once you’ve logged in, these cookies maintain your session and sync your whiteboard/preferences data.</li></ul></li></ul><h3 id="17b3e4c3-24c0-80b6-ab74-d62dba6054cb" class="">Analytics Cookies (Logged-in Users Only)</h3><ul id="17b3e4c3-24c0-806f-a894-e6a9c9e39178" class="bulleted-list"><li style="list-style-type:disc"><strong>Usage Analytics</strong>:<ul id="5742dfb5-5bec-4844-8208-413bf1b384b8" class="bulleted-list"><li style="list-style-type:circle">Once you’ve signed in, we’ll ask you if we can track how you use tldraw. We’ll use this information to improve our service.</li></ul><ul id="4c467889-70bb-4a93-aa80-0ca19ab0645c" class="bulleted-list"><li style="list-style-type:circle">We’ll only set this with your explicit consent. You can manage your choices here by clicking your name at the bottom of the sidebar, and choosing “Manage cookies” in the help menu.</li></ul></li></ul><h2 id="17b3e4c3-24c0-805c-8bbb-f9a12f3d35a4" class="">Data Storage When Logged In</h2><p id="17b3e4c3-24c0-80dc-b7aa-ef8e06fcf1e7" class="">When you log in to tldraw:</p><ul id="17b3e4c3-24c0-80f0-a936-e819f8c53f87" class="bulleted-list"><li style="list-style-type:disc">Your whiteboard data and preferences sync with our servers</li></ul><ul id="17b3e4c3-24c0-8085-adfa-d33842fed3cd" class="bulleted-list"><li style="list-style-type:disc">Session information is maintained via Clerk&#x27;s authentication cookies</li></ul><ul id="17b3e4c3-24c0-80de-8113-f743c22b6937" class="bulleted-list"><li style="list-style-type:disc">Previous local storage data is accessible through your account</li></ul><ul id="17b3e4c3-24c0-802e-9c84-e556d4cdd89b" class="bulleted-list"><li style="list-style-type:disc">Analytics cookies may be set (with your consent) to help us improve the service</li></ul><h2 id="17b3e4c3-24c0-8055-8bc9-c2206132f97d" class="">Managing Your Cookie Preferences</h2><h3 id="17b3e4c3-24c0-806b-98d7-dd3398a9124b" class="">Essential Cookies and Browser Storage</h3><p id="17b3e4c3-24c0-80f4-9aaa-f87905b16a13" class="">Essential cookies and local storage are required for tldraw to function properly. While you can clear your browser storage at any time, this will:</p><ul id="17b3e4c3-24c0-80fc-98ca-e66d164b5048" class="bulleted-list"><li style="list-style-type:disc">Delete any unsaved whiteboards (if not logged in)</li></ul><ul id="17b3e4c3-24c0-80b6-a189-c1ef8ca99b6a" class="bulleted-list"><li style="list-style-type:disc">Reset your application preferences</li></ul><ul id="17b3e4c3-24c0-80c1-80d0-e45532fbd790" class="bulleted-list"><li style="list-style-type:disc">Require you to log in again</li></ul><h3 id="17b3e4c3-24c0-8009-bc28-da3af1a3addc" class="">Analytics Cookies</h3><p id="17b3e4c3-24c0-8047-bc2f-c0746947847a" class="">You can (when logged in):</p><ol type="1" id="17b3e4c3-24c0-80e7-ad87-d52b5ab789ce" class="numbered-list" start="1"><li>Manage analytics cookie preferences through your account settings</li></ol><ol type="1" id="17b3e4c3-24c0-80c6-827d-cb749c9fd448" class="numbered-list" start="2"><li>Access cookie settings by:<ul id="96b8f297-918e-42fa-ac81-97e801dca833" class="bulleted-list"><li style="list-style-type:disc">Clicking your name at the bottom of the sidebar</li></ul><ul id="5bf67b96-2cf1-4af5-8c40-9b69fba58faa" class="bulleted-list"><li style="list-style-type:disc">Selecting &quot;cookies&quot;</li></ul></li></ol><ol type="1" id="17b3e4c3-24c0-8017-a178-fdb464e43ed9" class="numbered-list" start="3"><li>Opt out of analytics at any time</li></ol><p id="17b3e4c3-24c0-8083-a533-c07097fd9c6f" class="">If you haven’t logged into tldraw, we don’t set any analytics cookies.</p><h2 id="17b3e4c3-24c0-80b1-908b-f3acee3b85d1" class="">Additional Information</h2><ul id="17b3e4c3-24c0-80a9-a248-ebb1ea27b29e" class="bulleted-list"><li style="list-style-type:disc">Cookies set by our authentication provider (Clerk) are subject to their privacy and cookie policies</li></ul><ul id="17b3e4c3-24c0-8093-9114-e3441fc91f76" class="bulleted-list"><li style="list-style-type:disc">We regularly review and update our cookie practices to ensure compliance with data protection regulations</li></ul><h3 id="17b3e4c3-24c0-80e8-86bd-de66354b91c2" class="">Changes to This Policy</h3><p id="17b3e4c3-24c0-8059-a507-c70f58ed93ea" class="">We may update this Cookie Policy from time to time. We will notify you of any changes by posting the new Cookie Policy on this page with a new &quot;Last updated&quot; date.</p><h2 id="17b3e4c3-24c0-80bd-a382-dd48d1d2f68c" class="">Contact Us</h2><p id="17b3e4c3-24c0-8039-a73b-db4764c55f77" class="">If you have any questions about our Cookie Policy, please contact us at legal@tldraw.com.</p></div></article><span class="sans" style="font-size:14px;padding-top:2em"></span></body></html>
\ No newline at end of file
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-antenna.png b/apps/dotcom/client/public/fairy/fairy-hat-antenna.png
new file mode 100644
index 000000000000..271c87d2e044
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-antenna.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-bald.png b/apps/dotcom/client/public/fairy/fairy-hat-bald.png
new file mode 100644
index 000000000000..6bf8ac01241c
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-bald.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-cap.png b/apps/dotcom/client/public/fairy/fairy-hat-cap.png
new file mode 100644
index 000000000000..0bfade232818
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-cap.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-ears.png b/apps/dotcom/client/public/fairy/fairy-hat-ears.png
new file mode 100644
index 000000000000..a4f0b7484f54
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-ears.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-hair.png b/apps/dotcom/client/public/fairy/fairy-hat-hair.png
new file mode 100644
index 000000000000..bd873e91ee9e
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-hair.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-propellor.png b/apps/dotcom/client/public/fairy/fairy-hat-propellor.png
new file mode 100644
index 000000000000..8b134b64a45d
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-propellor.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-hat-spiky.png b/apps/dotcom/client/public/fairy/fairy-hat-spiky.png
new file mode 100644
index 000000000000..ef2cdb52f5a0
Binary files /dev/null and b/apps/dotcom/client/public/fairy/fairy-hat-spiky.png differ
diff --git a/apps/dotcom/client/public/fairy/fairy-loading.png b/apps/dotcom/client/public/fairy/fairy-loading.png
index 68175f610a89..8f9429592f2b 100644
Binary files a/apps/dotcom/client/public/fairy/fairy-loading.png and b/apps/dotcom/client/public/fairy/fairy-loading.png differ
diff --git a/apps/dotcom/client/public/legal.html b/apps/dotcom/client/public/legal.html
new file mode 100644
index 000000000000..192022f9d2e8
--- /dev/null
+++ b/apps/dotcom/client/public/legal.html
@@ -0,0 +1,707 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Legal summary</title><style>
+  /* cspell:disable-file */
+  /* webkit printing magic: print all background colors */
+  html {
+    -webkit-print-color-adjust: exact;
+  }
+  * {
+    box-sizing: border-box;
+    -webkit-print-color-adjust: exact;
+  }
+  
+  html,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+  @media only screen {
+    body {
+      margin: 2em auto;
+      max-width: 900px;
+      color: rgb(55, 53, 47);
+    }
+  }
+  
+  body {
+    line-height: 1.5;
+    white-space: pre-wrap;
+  }
+  
+  a,
+  a.visited {
+    color: inherit;
+    text-decoration: underline;
+  }
+  
+  .pdf-relative-link-path {
+    font-size: 80%;
+    color: #444;
+  }
+  
+  h1,
+  h2,
+  h3 {
+    letter-spacing: -0.01em;
+    line-height: 1.2;
+    font-weight: 600;
+    margin-bottom: 0;
+  }
+  
+  .page-title {
+    font-size: 2.5rem;
+    font-weight: 700;
+    margin-top: 0;
+    margin-bottom: 0.75em;
+  }
+  
+  h1 {
+    font-size: 1.875rem;
+    margin-top: 1.875rem;
+  }
+  
+  h2 {
+    font-size: 1.5rem;
+    margin-top: 1.5rem;
+  }
+  
+  h3 {
+    font-size: 1.25rem;
+    margin-top: 1.25rem;
+  }
+  
+  .source {
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    padding: 1.5em;
+    word-break: break-all;
+  }
+  
+  .callout {
+    border-radius: 10px;
+    padding: 1rem;
+  }
+  
+  figure {
+    margin: 1.25em 0;
+    page-break-inside: avoid;
+  }
+  
+  figcaption {
+    opacity: 0.5;
+    font-size: 85%;
+    margin-top: 0.5em;
+  }
+  
+  mark {
+    background-color: transparent;
+  }
+  
+  .indented {
+    padding-left: 1.5em;
+  }
+  
+  hr {
+    background: transparent;
+    display: block;
+    width: 100%;
+    height: 1px;
+    visibility: visible;
+    border: none;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.09);
+  }
+  
+  img {
+    max-width: 100%;
+  }
+  
+  @media only print {
+    img {
+      max-height: 100vh;
+      object-fit: contain;
+    }
+  }
+  
+  @page {
+    margin: 1in;
+  }
+  
+  .collection-content {
+    font-size: 0.875rem;
+  }
+  
+  .collection-content td {
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+  
+  .column-list {
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .column {
+    padding: 0 1em;
+  }
+  
+  .column:first-child {
+    padding-left: 0;
+  }
+  
+  .column:last-child {
+    padding-right: 0;
+  }
+  
+  .table_of_contents-item {
+    display: block;
+    font-size: 0.875rem;
+    line-height: 1.3;
+    padding: 0.125rem;
+  }
+  
+  .table_of_contents-indent-1 {
+    margin-left: 1.5rem;
+  }
+  
+  .table_of_contents-indent-2 {
+    margin-left: 3rem;
+  }
+  
+  .table_of_contents-indent-3 {
+    margin-left: 4.5rem;
+  }
+  
+  .table_of_contents-link {
+    text-decoration: none;
+    opacity: 0.7;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.18);
+  }
+  
+  table,
+  th,
+  td {
+    border: 1px solid rgba(55, 53, 47, 0.09);
+    border-collapse: collapse;
+  }
+  
+  table {
+    border-left: none;
+    border-right: none;
+  }
+  
+  th,
+  td {
+    font-weight: normal;
+    padding: 0.25em 0.5em;
+    line-height: 1.5;
+    min-height: 1.5em;
+    text-align: left;
+  }
+  
+  th {
+    color: rgba(55, 53, 47, 0.6);
+  }
+  
+  ol,
+  ul {
+    margin: 0;
+    margin-block-start: 0.6em;
+    margin-block-end: 0.6em;
+  }
+  
+  li > ol:first-child,
+  li > ul:first-child {
+    margin-block-start: 0.6em;
+  }
+  
+  ul > li {
+    list-style: disc;
+  }
+  
+  ul.to-do-list {
+    padding-inline-start: 0;
+  }
+  
+  ul.to-do-list > li {
+    list-style: none;
+  }
+  
+  .to-do-children-checked {
+    text-decoration: line-through;
+    opacity: 0.375;
+  }
+  
+  ul.toggle > li {
+    list-style: none;
+  }
+  
+  ul {
+    padding-inline-start: 1.7em;
+  }
+  
+  ul > li {
+    padding-left: 0.1em;
+  }
+  
+  ol {
+    padding-inline-start: 1.6em;
+  }
+  
+  ol > li {
+    padding-left: 0.2em;
+  }
+  
+  .mono ol {
+    padding-inline-start: 2em;
+  }
+  
+  .mono ol > li {
+    text-indent: -0.4em;
+  }
+  
+  .toggle {
+    padding-inline-start: 0em;
+    list-style-type: none;
+  }
+  
+  /* Indent toggle children */
+  .toggle > li > details {
+    padding-left: 1.7em;
+  }
+  
+  .toggle > li > details > summary {
+    margin-left: -1.1em;
+  }
+  
+  .selected-value {
+    display: inline-block;
+    padding: 0 0.5em;
+    background: rgba(206, 205, 202, 0.5);
+    border-radius: 3px;
+    margin-right: 0.5em;
+    margin-top: 0.3em;
+    margin-bottom: 0.3em;
+    white-space: nowrap;
+  }
+  
+  .collection-title {
+    display: inline-block;
+    margin-right: 1em;
+  }
+  
+  .page-description {
+    margin-bottom: 2em;
+  }
+  
+  .simple-table {
+    margin-top: 1em;
+    font-size: 0.875rem;
+    empty-cells: show;
+  }
+  .simple-table td {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table th {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table-header-color {
+    background: rgb(247, 246, 243);
+    color: black;
+  }
+  .simple-table-header {
+    font-weight: 500;
+  }
+  
+  time {
+    opacity: 0.5;
+  }
+  
+  .icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    max-width: 1.2em;
+    max-height: 1.2em;
+    text-decoration: none;
+    vertical-align: text-bottom;
+    margin-right: 0.5em;
+  }
+  
+  img.icon {
+    border-radius: 3px;
+  }
+  
+  .callout img.notion-static-icon {
+    width: 1em;
+    height: 1em;
+  }
+  
+  .callout p {
+    margin: 0;
+  }
+  
+  .callout h1,
+  .callout h2,
+  .callout h3 {
+    margin: 0 0 0.6rem;
+  }
+  
+  .user-icon {
+    width: 1.5em;
+    height: 1.5em;
+    border-radius: 100%;
+    margin-right: 0.5rem;
+  }
+  
+  .user-icon-inner {
+    font-size: 0.8em;
+  }
+  
+  .text-icon {
+    border: 1px solid #000;
+    text-align: center;
+  }
+  
+  .page-cover-image {
+    display: block;
+    object-fit: cover;
+    width: 100%;
+    max-height: 30vh;
+  }
+  
+  .page-header-icon {
+    font-size: 3rem;
+    margin-bottom: 1rem;
+  }
+  
+  .page-header-icon-with-cover {
+    margin-top: -0.72em;
+    margin-left: 0.07em;
+  }
+  
+  .page-header-icon img {
+    border-radius: 3px;
+  }
+  
+  .link-to-page {
+    margin: 1em 0;
+    padding: 0;
+    border: none;
+    font-weight: 500;
+  }
+  
+  p > .user {
+    opacity: 0.5;
+  }
+  
+  td > .user,
+  td > time {
+    white-space: nowrap;
+  }
+  
+  input[type="checkbox"] {
+    transform: scale(1.5);
+    margin-right: 0.6em;
+    vertical-align: middle;
+  }
+  
+  p {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+  }
+  
+  .image {
+    border: none;
+    margin: 1.5em 0;
+    padding: 0;
+    border-radius: 0;
+    text-align: center;
+  }
+  
+  .code,
+  code {
+    background: rgba(135, 131, 120, 0.15);
+    border-radius: 3px;
+    padding: 0.2em 0.4em;
+    border-radius: 3px;
+    font-size: 85%;
+    tab-size: 2;
+  }
+  
+  code {
+    color: #eb5757;
+  }
+  
+  .code {
+    padding: 1.5em 1em;
+  }
+  
+  .code-wrap {
+    white-space: pre-wrap;
+    word-break: break-all;
+  }
+  
+  .code > code {
+    background: none;
+    padding: 0;
+    font-size: 100%;
+    color: inherit;
+  }
+  
+  blockquote {
+    font-size: 1em;
+    margin: 1em 0;
+    padding-left: 1em;
+    border-left: 3px solid rgb(55, 53, 47);
+  }
+  
+  blockquote.quote-large {
+    font-size: 1.25em;
+  }
+  
+  .bookmark {
+    text-decoration: none;
+    max-height: 8em;
+    padding: 0;
+    display: flex;
+    width: 100%;
+    align-items: stretch;
+  }
+  
+  .bookmark-title {
+    font-size: 0.85em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    height: 1.75em;
+    white-space: nowrap;
+  }
+  
+  .bookmark-text {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .bookmark-info {
+    flex: 4 1 180px;
+    padding: 12px 14px 14px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  
+  .bookmark-image {
+    width: 33%;
+    flex: 1 1 180px;
+    display: block;
+    position: relative;
+    object-fit: cover;
+    border-radius: 1px;
+  }
+  
+  .bookmark-description {
+    color: rgba(55, 53, 47, 0.6);
+    font-size: 0.75em;
+    overflow: hidden;
+    max-height: 4.5em;
+    word-break: break-word;
+  }
+  
+  .bookmark-href {
+    font-size: 0.75em;
+    margin-top: 0.25em;
+  }
+  
+  .sans { font-family: ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; }
+  .code { font-family: "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace; }
+  .serif { font-family: Lyon-Text, Georgia, ui-serif, serif; }
+  .mono { font-family: iawriter-mono, Nitti, Menlo, Courier, monospace; }
+  .pdf .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK JP'; }
+  .pdf:lang(zh-CN) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK SC'; }
+  .pdf:lang(zh-TW) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK TC'; }
+  .pdf:lang(ko-KR) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK KR'; }
+  .pdf .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .pdf .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK JP'; }
+  .pdf:lang(zh-CN) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK SC'; }
+  .pdf:lang(zh-TW) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK TC'; }
+  .pdf:lang(ko-KR) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK KR'; }
+  .pdf .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .highlight-default {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .highlight-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .highlight-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .highlight-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .highlight-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .highlight-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .highlight-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .highlight-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .highlight-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .highlight-default_background {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray_background {
+    background: rgba(42, 28, 0, 0.07);
+  }
+  .highlight-brown_background {
+    background: rgba(139, 46, 0, 0.086);
+  }
+  .highlight-orange_background {
+    background: rgba(224, 101, 1, 0.129);
+  }
+  .highlight-yellow_background {
+    background: rgba(211, 168, 0, 0.137);
+  }
+  .highlight-teal_background {
+    background: rgba(0, 100, 45, 0.09);
+  }
+  .highlight-blue_background {
+    background: rgba(0, 124, 215, 0.094);
+  }
+  .highlight-purple_background {
+    background: rgba(102, 0, 178, 0.078);
+  }
+  .highlight-pink_background {
+    background: rgba(197, 0, 93, 0.086);
+  }
+  .highlight-red_background {
+    background: rgba(223, 22, 0, 0.094);
+  }
+  .block-color-default {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .block-color-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .block-color-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .block-color-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .block-color-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .block-color-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .block-color-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .block-color-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .block-color-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .block-color-default_background {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray_background {
+    background: rgba(240, 239, 237, 1);
+  }
+  .block-color-brown_background {
+    background: rgba(245, 237, 233, 1);
+  }
+  .block-color-orange_background {
+    background: rgba(251, 235, 222, 1);
+  }
+  .block-color-yellow_background {
+    background: rgba(249, 243, 220, 1);
+  }
+  .block-color-teal_background {
+    background: rgba(232, 241, 236, 1);
+  }
+  .block-color-blue_background {
+    background: rgba(229, 242, 252, 1);
+  }
+  .block-color-purple_background {
+    background: rgba(243, 235, 249, 1);
+  }
+  .block-color-pink_background {
+    background: rgba(250, 233, 241, 1);
+  }
+  .block-color-red_background {
+    background: rgba(252, 233, 231, 1);
+  }
+  .select-value-color-default { background-color: rgba(42, 28, 0, 0.07); }
+  .select-value-color-gray { background-color: rgba(28, 19, 1, 0.11); }
+  .select-value-color-brown { background-color: rgba(127, 51, 0, 0.156); }
+  .select-value-color-orange { background-color: rgba(196, 88, 0, 0.203); }
+  .select-value-color-yellow { background-color: rgba(209, 156, 0, 0.282); }
+  .select-value-color-green { background-color: rgba(0, 96, 38, 0.156); }
+  .select-value-color-blue { background-color: rgba(0, 118, 217, 0.203); }
+  .select-value-color-purple { background-color: rgba(92, 0, 163, 0.141); }
+  .select-value-color-pink { background-color: rgba(183, 0, 78, 0.152); }
+  .select-value-color-red { background-color: rgba(206, 24, 0, 0.164); }
+  
+  .checkbox {
+    display: inline-flex;
+    vertical-align: text-bottom;
+    width: 16;
+    height: 16;
+    background-size: 16px;
+    margin-left: 2px;
+    margin-right: 5px;
+  }
+  
+  .checkbox-on {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%2358A9D7%22%2F%3E%0A%3Cpath%20d%3D%22M6.71429%2012.2852L14%204.9995L12.7143%203.71436L6.71429%209.71378L3.28571%206.2831L2%207.57092L6.71429%2012.2852Z%22%20fill%3D%22white%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+  
+  .checkbox-off {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20x%3D%220.75%22%20y%3D%220.75%22%20width%3D%2214.5%22%20height%3D%2214.5%22%20fill%3D%22white%22%20stroke%3D%22%2336352F%22%20stroke-width%3D%221.5%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+    
+  </style></head><body><article id="1ea3e4c3-24c0-80e5-80d9-fd2028e866dc" class="page sans"><header><div class="page-header-icon undefined"><span class="icon">💼</span></div><h1 class="page-title">Legal summary</h1><p class="page-description"></p></header><div class="page-body"><figure id="1583e4c3-24c0-800f-95a2-f4d7d71c73ed" class="link-to-page"><a href="/tos.html"><span class="icon">📄</span>Terms of Service</a></figure><figure id="1583e4c3-24c0-8087-9905-d15759ecaa96" class="link-to-page"><a href="/privacy.html"><span class="icon">📄</span>Privacy Policy</a></figure><figure id="17b3e4c3-24c0-804a-a860-f39e42865cf1" class="link-to-page"><a href="/cookies.html"><span class="icon">📄</span>Cookie Policy</a></figure><p id="1843e4c3-24c0-808d-b7bb-c0baf9bcf510" class="">
+  </p></div></article><span class="sans" style="font-size:14px;padding-top:2em"></span></body></html>
\ No newline at end of file
diff --git a/apps/dotcom/client/public/privacy.html b/apps/dotcom/client/public/privacy.html
new file mode 100644
index 000000000000..aeb45fcb4602
--- /dev/null
+++ b/apps/dotcom/client/public/privacy.html
@@ -0,0 +1,707 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Privacy Policy</title><style>
+  /* cspell:disable-file */
+  /* webkit printing magic: print all background colors */
+  html {
+    -webkit-print-color-adjust: exact;
+  }
+  * {
+    box-sizing: border-box;
+    -webkit-print-color-adjust: exact;
+  }
+  
+  html,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+  @media only screen {
+    body {
+      margin: 2em auto;
+      max-width: 70ch;
+      padding: 0 2em;
+      color: rgb(55, 53, 47);
+    }
+  }
+  
+  body {
+    line-height: 1.5;
+    white-space: pre-wrap;
+  }
+  
+  a,
+  a.visited {
+    color: inherit;
+    text-decoration: underline;
+  }
+  
+  .pdf-relative-link-path {
+    font-size: 80%;
+    color: #444;
+  }
+  
+  h1,
+  h2,
+  h3 {
+    letter-spacing: -0.01em;
+    line-height: 1.2;
+    font-weight: 600;
+    margin-bottom: 0;
+  }
+  
+  .page-title {
+    font-size: 2.5rem;
+    font-weight: 700;
+    margin-top: 0;
+    margin-bottom: 0.75em;
+  }
+  
+  h1 {
+    font-size: 1.875rem;
+    margin-top: 1.875rem;
+  }
+  
+  h2 {
+    font-size: 1.5rem;
+    margin-top: 1.5rem;
+  }
+  
+  h3 {
+    font-size: 1.25rem;
+    margin-top: 1.25rem;
+  }
+  
+  .source {
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    padding: 1.5em;
+    word-break: break-all;
+  }
+  
+  .callout {
+    border-radius: 10px;
+    padding: 1rem;
+  }
+  
+  figure {
+    margin: 1.25em 0;
+    page-break-inside: avoid;
+  }
+  
+  figcaption {
+    opacity: 0.5;
+    font-size: 85%;
+    margin-top: 0.5em;
+  }
+  
+  mark {
+    background-color: transparent;
+  }
+  
+  .indented {
+    padding-left: 1.5em;
+  }
+  
+  hr {
+    background: transparent;
+    display: block;
+    width: 100%;
+    height: 1px;
+    visibility: visible;
+    border: none;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.09);
+  }
+  
+  img {
+    max-width: 100%;
+  }
+  
+  @media only print {
+    img {
+      max-height: 100vh;
+      object-fit: contain;
+    }
+  }
+  
+  @page {
+    margin: 1in;
+  }
+  
+  .collection-content {
+    font-size: 0.875rem;
+  }
+  
+  .collection-content td {
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+  
+  .column-list {
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .column {
+    padding: 0 1em;
+  }
+  
+  .column:first-child {
+    padding-left: 0;
+  }
+  
+  .column:last-child {
+    padding-right: 0;
+  }
+  
+  .table_of_contents-item {
+    display: block;
+    font-size: 0.875rem;
+    line-height: 1.3;
+    padding: 0.125rem;
+  }
+  
+  .table_of_contents-indent-1 {
+    margin-left: 1.5rem;
+  }
+  
+  .table_of_contents-indent-2 {
+    margin-left: 3rem;
+  }
+  
+  .table_of_contents-indent-3 {
+    margin-left: 4.5rem;
+  }
+  
+  .table_of_contents-link {
+    text-decoration: none;
+    opacity: 0.7;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.18);
+  }
+  
+  table,
+  th,
+  td {
+    border: 1px solid rgba(55, 53, 47, 0.09);
+    border-collapse: collapse;
+  }
+  
+  table {
+    border-left: none;
+    border-right: none;
+  }
+  
+  th,
+  td {
+    font-weight: normal;
+    padding: 0.25em 0.5em;
+    line-height: 1.5;
+    min-height: 1.5em;
+    text-align: left;
+  }
+  
+  th {
+    color: rgba(55, 53, 47, 0.6);
+  }
+  
+  ol,
+  ul {
+    margin: 0;
+    margin-block-start: 0.6em;
+    margin-block-end: 0.6em;
+  }
+  
+  li > ol:first-child,
+  li > ul:first-child {
+    margin-block-start: 0.6em;
+  }
+  
+  ul > li {
+    list-style: disc;
+  }
+  
+  ul.to-do-list {
+    padding-inline-start: 0;
+  }
+  
+  ul.to-do-list > li {
+    list-style: none;
+  }
+  
+  .to-do-children-checked {
+    text-decoration: line-through;
+    opacity: 0.375;
+  }
+  
+  ul.toggle > li {
+    list-style: none;
+  }
+  
+  ul {
+    padding-inline-start: 1.7em;
+  }
+  
+  ul > li {
+    padding-left: 0.1em;
+  }
+  
+  ol {
+    padding-inline-start: 1.6em;
+  }
+  
+  ol > li {
+    padding-left: 0.2em;
+  }
+  
+  .mono ol {
+    padding-inline-start: 2em;
+  }
+  
+  .mono ol > li {
+    text-indent: -0.4em;
+  }
+  
+  .toggle {
+    padding-inline-start: 0em;
+    list-style-type: none;
+  }
+  
+  /* Indent toggle children */
+  .toggle > li > details {
+    padding-left: 1.7em;
+  }
+  
+  .toggle > li > details > summary {
+    margin-left: -1.1em;
+  }
+  
+  .selected-value {
+    display: inline-block;
+    padding: 0 0.5em;
+    background: rgba(206, 205, 202, 0.5);
+    border-radius: 3px;
+    margin-right: 0.5em;
+    margin-top: 0.3em;
+    margin-bottom: 0.3em;
+    white-space: nowrap;
+  }
+  
+  .collection-title {
+    display: inline-block;
+    margin-right: 1em;
+  }
+  
+  .page-description {
+    margin-bottom: 2em;
+  }
+  
+  .simple-table {
+    margin-top: 1em;
+    font-size: 0.875rem;
+    empty-cells: show;
+  }
+  .simple-table td {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table th {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table-header-color {
+    background: rgb(247, 246, 243);
+    color: black;
+  }
+  .simple-table-header {
+    font-weight: 500;
+  }
+  
+  time {
+    opacity: 0.5;
+  }
+  
+  .icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    max-width: 1.2em;
+    max-height: 1.2em;
+    text-decoration: none;
+    vertical-align: text-bottom;
+    margin-right: 0.5em;
+  }
+  
+  img.icon {
+    border-radius: 3px;
+  }
+  
+  .callout img.notion-static-icon {
+    width: 1em;
+    height: 1em;
+  }
+  
+  .callout p {
+    margin: 0;
+  }
+  
+  .callout h1,
+  .callout h2,
+  .callout h3 {
+    margin: 0 0 0.6rem;
+  }
+  
+  .user-icon {
+    width: 1.5em;
+    height: 1.5em;
+    border-radius: 100%;
+    margin-right: 0.5rem;
+  }
+  
+  .user-icon-inner {
+    font-size: 0.8em;
+  }
+  
+  .text-icon {
+    border: 1px solid #000;
+    text-align: center;
+  }
+  
+  .page-cover-image {
+    display: block;
+    object-fit: cover;
+    width: 100%;
+    max-height: 30vh;
+  }
+  
+  .page-header-icon {
+    font-size: 3rem;
+    margin-bottom: 1rem;
+  }
+  
+  .page-header-icon-with-cover {
+    margin-top: -0.72em;
+    margin-left: 0.07em;
+  }
+  
+  .page-header-icon img {
+    border-radius: 3px;
+  }
+  
+  .link-to-page {
+    margin: 1em 0;
+    padding: 0;
+    border: none;
+    font-weight: 500;
+  }
+  
+  p > .user {
+    opacity: 0.5;
+  }
+  
+  td > .user,
+  td > time {
+    white-space: nowrap;
+  }
+  
+  input[type="checkbox"] {
+    transform: scale(1.5);
+    margin-right: 0.6em;
+    vertical-align: middle;
+  }
+  
+  p {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+  }
+  
+  .image {
+    border: none;
+    margin: 1.5em 0;
+    padding: 0;
+    border-radius: 0;
+    text-align: center;
+  }
+  
+  .code,
+  code {
+    background: rgba(135, 131, 120, 0.15);
+    border-radius: 3px;
+    padding: 0.2em 0.4em;
+    border-radius: 3px;
+    font-size: 85%;
+    tab-size: 2;
+  }
+  
+  code {
+    color: #eb5757;
+  }
+  
+  .code {
+    padding: 1.5em 1em;
+  }
+  
+  .code-wrap {
+    white-space: pre-wrap;
+    word-break: break-all;
+  }
+  
+  .code > code {
+    background: none;
+    padding: 0;
+    font-size: 100%;
+    color: inherit;
+  }
+  
+  blockquote {
+    font-size: 1em;
+    margin: 1em 0;
+    padding-left: 1em;
+    border-left: 3px solid rgb(55, 53, 47);
+  }
+  
+  blockquote.quote-large {
+    font-size: 1.25em;
+  }
+  
+  .bookmark {
+    text-decoration: none;
+    max-height: 8em;
+    padding: 0;
+    display: flex;
+    width: 100%;
+    align-items: stretch;
+  }
+  
+  .bookmark-title {
+    font-size: 0.85em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    height: 1.75em;
+    white-space: nowrap;
+  }
+  
+  .bookmark-text {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .bookmark-info {
+    flex: 4 1 180px;
+    padding: 12px 14px 14px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  
+  .bookmark-image {
+    width: 33%;
+    flex: 1 1 180px;
+    display: block;
+    position: relative;
+    object-fit: cover;
+    border-radius: 1px;
+  }
+  
+  .bookmark-description {
+    color: rgba(55, 53, 47, 0.6);
+    font-size: 0.75em;
+    overflow: hidden;
+    max-height: 4.5em;
+    word-break: break-word;
+  }
+  
+  .bookmark-href {
+    font-size: 0.75em;
+    margin-top: 0.25em;
+  }
+  
+  .sans { font-family: ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; }
+  .code { font-family: "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace; }
+  .serif { font-family: Lyon-Text, Georgia, ui-serif, serif; }
+  .mono { font-family: iawriter-mono, Nitti, Menlo, Courier, monospace; }
+  .pdf .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK JP'; }
+  .pdf:lang(zh-CN) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK SC'; }
+  .pdf:lang(zh-TW) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK TC'; }
+  .pdf:lang(ko-KR) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK KR'; }
+  .pdf .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .pdf .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK JP'; }
+  .pdf:lang(zh-CN) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK SC'; }
+  .pdf:lang(zh-TW) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK TC'; }
+  .pdf:lang(ko-KR) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK KR'; }
+  .pdf .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .highlight-default {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .highlight-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .highlight-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .highlight-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .highlight-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .highlight-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .highlight-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .highlight-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .highlight-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .highlight-default_background {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray_background {
+    background: rgba(42, 28, 0, 0.07);
+  }
+  .highlight-brown_background {
+    background: rgba(139, 46, 0, 0.086);
+  }
+  .highlight-orange_background {
+    background: rgba(224, 101, 1, 0.129);
+  }
+  .highlight-yellow_background {
+    background: rgba(211, 168, 0, 0.137);
+  }
+  .highlight-teal_background {
+    background: rgba(0, 100, 45, 0.09);
+  }
+  .highlight-blue_background {
+    background: rgba(0, 124, 215, 0.094);
+  }
+  .highlight-purple_background {
+    background: rgba(102, 0, 178, 0.078);
+  }
+  .highlight-pink_background {
+    background: rgba(197, 0, 93, 0.086);
+  }
+  .highlight-red_background {
+    background: rgba(223, 22, 0, 0.094);
+  }
+  .block-color-default {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .block-color-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .block-color-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .block-color-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .block-color-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .block-color-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .block-color-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .block-color-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .block-color-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .block-color-default_background {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray_background {
+    background: rgba(240, 239, 237, 1);
+  }
+  .block-color-brown_background {
+    background: rgba(245, 237, 233, 1);
+  }
+  .block-color-orange_background {
+    background: rgba(251, 235, 222, 1);
+  }
+  .block-color-yellow_background {
+    background: rgba(249, 243, 220, 1);
+  }
+  .block-color-teal_background {
+    background: rgba(232, 241, 236, 1);
+  }
+  .block-color-blue_background {
+    background: rgba(229, 242, 252, 1);
+  }
+  .block-color-purple_background {
+    background: rgba(243, 235, 249, 1);
+  }
+  .block-color-pink_background {
+    background: rgba(250, 233, 241, 1);
+  }
+  .block-color-red_background {
+    background: rgba(252, 233, 231, 1);
+  }
+  .select-value-color-default { background-color: rgba(42, 28, 0, 0.07); }
+  .select-value-color-gray { background-color: rgba(28, 19, 1, 0.11); }
+  .select-value-color-brown { background-color: rgba(127, 51, 0, 0.156); }
+  .select-value-color-orange { background-color: rgba(196, 88, 0, 0.203); }
+  .select-value-color-yellow { background-color: rgba(209, 156, 0, 0.282); }
+  .select-value-color-green { background-color: rgba(0, 96, 38, 0.156); }
+  .select-value-color-blue { background-color: rgba(0, 118, 217, 0.203); }
+  .select-value-color-purple { background-color: rgba(92, 0, 163, 0.141); }
+  .select-value-color-pink { background-color: rgba(183, 0, 78, 0.152); }
+  .select-value-color-red { background-color: rgba(206, 24, 0, 0.164); }
+  
+  .checkbox {
+    display: inline-flex;
+    vertical-align: text-bottom;
+    width: 16;
+    height: 16;
+    background-size: 16px;
+    margin-left: 2px;
+    margin-right: 5px;
+  }
+  
+  .checkbox-on {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%2358A9D7%22%2F%3E%0A%3Cpath%20d%3D%22M6.71429%2012.2852L14%204.9995L12.7143%203.71436L6.71429%209.71378L3.28571%206.2831L2%207.57092L6.71429%2012.2852Z%22%20fill%3D%22white%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+  
+  .checkbox-off {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20x%3D%220.75%22%20y%3D%220.75%22%20width%3D%2214.5%22%20height%3D%2214.5%22%20fill%3D%22white%22%20stroke%3D%22%2336352F%22%20stroke-width%3D%221.5%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+    
+  </style></head><body><article id="1583e4c3-24c0-8087-9905-d15759ecaa96" class="page sans"><header><div class="page-header-icon undefined"><span class="icon">📄</span></div><h1 class="page-title">Privacy Policy</h1><p class="page-description"></p></header><div class="page-body"><p id="1843e4c3-24c0-8086-b0fe-e2ce68f1d4a8" class=""><strong>Effective as of January 20th, 2024. </strong></p><p id="1843e4c3-24c0-8004-a532-f745077cd4fb" class="">This Privacy Policy describes how tldraw Inc. (&quot;tldraw,&quot; &quot;we&quot;, “us” or &quot;our&quot;) processes personal information that we collect through our digital or online properties or services that link to this Privacy Policy (including as applicable, our website and the application functionality on our website, marketing activities, and other activities described in this Privacy Policy (collectively, the “Service”)).</p><h3 id="1843e4c3-24c0-805b-82e7-eafe312a9e9a" class="">Personal information we collect</h3><p id="1843e4c3-24c0-808c-8064-d8389f6fdca5" class=""><strong>Information you provide to us. </strong>Personal information you may provide to us through the Service or otherwise includes: </p><ul id="1843e4c3-24c0-806f-b259-c2ede777a8c9" class="bulleted-list"><li style="list-style-type:disc"><strong>Contact data</strong>, such as your first and last name, salutation, email address, address, and phone number.</li></ul><ul id="1843e4c3-24c0-806f-8771-fd23be12ddea" class="bulleted-list"><li style="list-style-type:disc"><strong>Profile data</strong>, such as the username and password that you may set to establish an online account with us, interests, preferences, and any other information that you add to your account profile.</li></ul><ul id="1843e4c3-24c0-8059-ad32-e48ed71a75a6" class="bulleted-list"><li style="list-style-type:disc"><strong>Communications data </strong>based on our exchanges with you, including when you contact us through the Service, social media, or otherwise.</li></ul><ul id="1843e4c3-24c0-802f-831f-d8d7b24dffa1" class="bulleted-list"><li style="list-style-type:disc"><strong>Marketing data</strong>, such as your preferences for receiving our marketing communications and details about your engagement with them.</li></ul><ul id="1843e4c3-24c0-800b-b810-e18c4e1329e9" class="bulleted-list"><li style="list-style-type:disc"><strong>User-generated content data</strong>, such as photos, images, music, videos, comments, questions, messages, works of authorship, and other content or information that you generate, transmit, or otherwise make available on the Service, as well as associated metadata. Metadata includes information on how, when, where and by whom a piece of content was collected and how that content has been formatted or edited. Metadata also includes information that users can add or can have added to their content, such as keywords, geographical or location information, and other similar data.</li></ul><ul id="1843e4c3-24c0-80da-89cb-ecb59bf95592" class="bulleted-list"><li style="list-style-type:disc"><strong>Other data </strong>not specifically listed here, which we will use as described in this Privacy Policy or as otherwise disclosed at the time of collection.</li></ul><p id="1843e4c3-24c0-80ae-b77a-cf82db62f04c" class=""><strong>Third-party sources.</strong> We may combine personal information we receive from you with personal information we obtain from other sources, such as:</p><ul id="1843e4c3-24c0-8001-9ce8-e3391b2b23e3" class="bulleted-list"><li style="list-style-type:disc"><strong>Public sources</strong>, such as government agencies, public records, social media platforms, and other publicly available sources.</li></ul><ul id="1843e4c3-24c0-80e9-a249-cd10a23f6225" class="bulleted-list"><li style="list-style-type:disc"><strong>Data providers</strong>, such as information services and data licensors that provide demographic and other information.</li></ul><ul id="1843e4c3-24c0-80f5-9931-c8ade7dce688" class="bulleted-list"><li style="list-style-type:disc"><strong>Service providers</strong> that provide services on our behalf or help us operate the Service or our business.</li></ul><ul id="1843e4c3-24c0-805d-9d00-c705da13f6fe" class="bulleted-list"><li style="list-style-type:disc"><strong>Partners</strong>, such as marketing partners and event co-sponsors.</li></ul><ul id="1843e4c3-24c0-805e-97d3-f3ae73be1d71" class="bulleted-list"><li style="list-style-type:disc"><strong>Business transaction partners</strong>. We may receive personal information in connection with an actual or prospective business transaction. For example, we may receive your personal information from an entity we acquire or are acquired by, a successor, or assignee or any party involved in a business transaction such as a merger, acquisition, sale of assets, or similar transaction, and/or in the context of an insolvency, bankruptcy, or receivership.</li></ul><ul id="1843e4c3-24c0-804b-a267-e3d090053f2f" class="bulleted-list"><li style="list-style-type:disc"><strong>Third-party services</strong>, such as social media services, that you use to log into, or otherwise link to, your Service account. This data may include your username, profile picture and other information associated with your account on that third-party service that is made available to us based on your account settings on that service.</li></ul><p id="1843e4c3-24c0-8013-bfb4-fb12f40a32c1" class=""><strong>Automatic data collection.</strong> We, our service providers, and our business partners may automatically log information about you, your computer or mobile device, and your interaction over time with the Service, our communications and other online services, such as: </p><ul id="1843e4c3-24c0-802f-b887-df58d558318f" class="bulleted-list"><li style="list-style-type:disc"><strong>Device data</strong>,<strong> </strong>such as your computer or mobile device’s operating system type and version, manufacturer and model, browser type, screen resolution, RAM and disk size, CPU usage, device type (e.g., phone, tablet), IP address, unique identifiers (including identifiers used for advertising purposes), language settings, mobile device carrier, radio/network information (e.g., Wi-Fi, LTE, 3G), and general location information such as city, state or geographic area.</li></ul><ul id="1843e4c3-24c0-802b-8f02-c5bb7afe04f7" class="bulleted-list"><li style="list-style-type:disc"><strong>Online activity data</strong>, such as pages or screens you viewed, how long you spent on a page or screen, the website you visited before browsing to the Service, navigation paths between pages or screens, information about your activity on a page or screen, access times and duration of access, and whether you have opened our emails or clicked links within them.</li></ul><ul id="1843e4c3-24c0-800e-993a-c9cbb927659d" class="bulleted-list"><li style="list-style-type:disc"><strong>Communication interaction data </strong>such<strong> </strong>as your interactions with our email, text or other communications (e.g., whether you open and/or forward emails) – we may do this through use of pixel tags (which are also known as clear GIFs), which may be embedded invisibly in our emails.</li></ul><p id="1843e4c3-24c0-80bb-9264-d2d568ea8bb8" class=""><strong>Cookies and similar technologies.</strong> Some of the automatic collection described above is facilitated by the following technologies: </p><ul id="1843e4c3-24c0-80e5-884a-d24b2f1f8cdf" class="bulleted-list"><li style="list-style-type:disc"><strong>Cookies</strong>, which are small text files that websites store on user devices and that allow web servers to record users’ web browsing activities and remember their submissions, preferences, and login status as they navigate a site. Cookies used on our sites include both “session cookies” that are deleted when a session ends, “persistent cookies” that remain longer, “first party” cookies that we place and “third party” cookies that our third-party business partners and service providers place.</li></ul><ul id="1843e4c3-24c0-80af-8aae-d491b1d8de65" class="bulleted-list"><li style="list-style-type:disc"><strong>Local storage technologies</strong>, like HTML5, that provide cookie-equivalent functionality but can store larger amounts of data on your device outside of your browser in connection with specific applications.</li></ul><ul id="1843e4c3-24c0-8037-ba49-fd2145e2898b" class="bulleted-list"><li style="list-style-type:disc"><strong>Web beacons</strong>, also known as pixel tags or clear GIFs, which are used to demonstrate that a webpage or email was accessed or opened, or that certain content was viewed or clicked.</li></ul><p id="1843e4c3-24c0-806f-bb7e-c1fbb0480abb" class=""><strong>Data about others. </strong>We may offer features that help users invite their friends or contacts to use the Service, and we may collect contact details about these invitees so we can deliver their invitations. Please do not refer someone to us or share their contact details with us unless you have their permission to do so.</p><h3 id="1843e4c3-24c0-8054-8593-d9391eeeff9f" class="">How we use your personal information</h3><p id="1843e4c3-24c0-8083-afa9-f60996a8f317" class="">We may use your personal information for the following purposes or as otherwise described at the time of collection:</p><p id="1843e4c3-24c0-80a9-b8a2-c01f1f3afef4" class=""><strong>Service delivery and operations. </strong>We may use your personal information to: </p><ul id="1843e4c3-24c0-80f1-a475-f88fac905b15" class="bulleted-list"><li style="list-style-type:disc">provide, operate and improve the Service and our business;</li></ul><ul id="1843e4c3-24c0-803d-9bc5-df9e790ebb56" class="bulleted-list"><li style="list-style-type:disc">personalize the service, including remembering the devices from which you have previously logged in and remembering your selections and preferences as you navigate the Service;</li></ul><ul id="1843e4c3-24c0-80fd-8c28-db350cbcecbd" class="bulleted-list"><li style="list-style-type:disc">establish and maintain your user profile on the Service;</li></ul><ul id="1843e4c3-24c0-8008-894f-d193a22ee740" class="bulleted-list"><li style="list-style-type:disc">facilitate your invitations to friends who you want to invite to join the Service;</li></ul><ul id="1843e4c3-24c0-80ec-a951-f437d490334e" class="bulleted-list"><li style="list-style-type:disc">enable security features of the Service, such as by sending you security codes via email or SMS, and remembering devices from which you have previously logged in;</li></ul><ul id="1843e4c3-24c0-805c-be84-d7b16eb84b2a" class="bulleted-list"><li style="list-style-type:disc">communicate with you about the Service, including by sending Service-related announcements, updates, security alerts, and support and administrative messages;</li></ul><ul id="1843e4c3-24c0-80a2-9b24-f5b7ac821440" class="bulleted-list"><li style="list-style-type:disc">communicate with you about events or contests in which you participate;</li></ul><ul id="1843e4c3-24c0-8058-b11f-c2a0b55d1306" class="bulleted-list"><li style="list-style-type:disc">understand your needs and interests, and personalize your experience with the Service and our communications; and</li></ul><ul id="1843e4c3-24c0-80ac-a3f4-f34bda42c4b7" class="bulleted-list"><li style="list-style-type:disc">provide support for the Service, and respond to your requests, questions and feedback.</li></ul><p id="1843e4c3-24c0-800a-b6dc-f7f766bc04bd" class=""><strong>Research and development.</strong> We may use your personal information for research and development purposes, including to analyze and improve the Service and our business and to develop new products and services. As part of these activities, we may create aggregated, de-identified and/or anonymized data from personal information we collect. We make personal information into de-identified or anonymized data by removing information that makes the data personally identifiable to you. We may use this aggregated, de-identified or otherwise anonymized data and share it with third parties for our lawful business purposes, including to analyze and improve the Service and promote our business.</p><ul id="1843e4c3-24c0-8033-bc84-ca52dc3c7576" class="bulleted-list"><li style="list-style-type:disc"><strong>Direct marketing.</strong> We may send you direct marketing communications and may personalize these messages based on your needs and interests. You may opt-out of our marketing communications as described in the <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">Opt-out of marketing</a> section below.</li></ul><p id="1843e4c3-24c0-806e-b046-fa46dca4421b" class=""><strong>Service improvement and analytics.</strong> We may use your personal information to analyze your usage of the Service, improve the Service, improve the rest of our business, help us understand user activity on the Service, including which pages are most and least visited and how visitors move around the Service, as well as user interactions with our emails, and to develop new products and services. For example, we use Sentry Analytics for this purpose. You can learn more about Sentry Analytics here: https://sentry.io/privacy/. </p><p id="1843e4c3-24c0-8067-8788-d5ff60930ccd" class=""><strong>Compliance and protection.</strong> We may use your personal information to: </p><ul id="1843e4c3-24c0-80a8-bd69-c6c57c34a468" class="bulleted-list"><li style="list-style-type:disc">comply with applicable laws, lawful requests, and legal process, such as to respond to subpoenas, investigations or requests from government authorities;</li></ul><ul id="1843e4c3-24c0-8059-b969-fef2a1d89630" class="bulleted-list"><li style="list-style-type:disc">protect our, your or others’ rights, privacy, safety or property (including by making and defending legal claims);</li></ul><ul id="1843e4c3-24c0-804b-a48a-c69adfa987e2" class="bulleted-list"><li style="list-style-type:disc">audit our internal processes for compliance with legal and contractual requirements or our internal policies;</li></ul><ul id="1843e4c3-24c0-8013-a151-e8adfa38089b" class="bulleted-list"><li style="list-style-type:disc">enforce the terms and conditions that govern the Service; and</li></ul><ul id="1843e4c3-24c0-806d-a5ef-f99f0221b31f" class="bulleted-list"><li style="list-style-type:disc">prevent, identify, investigate and deter fraudulent, harmful, unauthorized, unethical or illegal activity, including cyberattacks and identity theft.</li></ul><p id="1843e4c3-24c0-805b-9a10-c81b8cd88e30" class=""><strong>Cookies and similar technologies.</strong> In addition to the other uses included in this section, we may use the Cookies and similar technologies described above for the following purposes: </p><ul id="1843e4c3-24c0-807e-b3d8-f971457c9582" class="bulleted-list"><li style="list-style-type:disc"><strong>Technical operation</strong>. To allow the technical operation of the Service, such as by remembering your selections and preferences as you navigate the site, and whether you are logged in when you visit password protected areas of the Service.</li></ul><ul id="1843e4c3-24c0-8043-ac56-ea353174a1e3" class="bulleted-list"><li style="list-style-type:disc"><strong>Functionality</strong>. To enhance the performance and functionality of our services.</li></ul><ul id="1843e4c3-24c0-80e7-8f0f-cc38852e027c" class="bulleted-list"><li style="list-style-type:disc"><strong>Advertising</strong>. To help our third-party advertising partners collect information about how you use the Service and other online services over time, which they use to show you ads on other online services they believe will interest you and measure how the ads perform.</li></ul><ul id="1843e4c3-24c0-80a5-b313-cf27509314e9" class="bulleted-list"><li style="list-style-type:disc"><strong>Analytics</strong>. To help us understand user activity on the Service, including which pages are most and least visited and how visitors move around the Service, as well as user interactions with our emails.</li></ul><p id="1843e4c3-24c0-8025-a40a-eb1e272cb9b8" class=""><strong>With your consent. </strong>In some cases, we may specifically ask for your consent to collect, use or share your personal information, such as when required by law. </p><h3 id="1843e4c3-24c0-80ae-a9ab-e3a9cf63b7a6" class="">How we share your personal information</h3><p id="1843e4c3-24c0-80ce-ba39-d1f058c293d5" class="">We may share your personal information with the following parties and as otherwise described in this Privacy Policy, in other applicable notices, or at the time of collection.</p><p id="1843e4c3-24c0-8002-b3b1-dd6ecde1d874" class=""><strong>Affiliates. </strong>Our corporate parent, subsidiaries, and affiliates.</p><p id="1843e4c3-24c0-809d-96e3-c84ee41096d5" class=""><strong>Service providers.</strong> Third parties<strong> </strong>that provide services on our behalf or help us operate the Service or our business (such as hosting, information technology, customer support, email delivery, marketing, consumer research and website analytics).</p><p id="1843e4c3-24c0-800c-955c-fdffb5810509" class=""><strong>Advertising partners.  </strong>Third-party advertising companies for the <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">interest-based advertising purposes</a> described above.</p><p id="1843e4c3-24c0-80f1-ae37-c15b13c7cb9f" class=""><strong>Business and marketing partners. </strong>Third parties<strong> </strong>with whom we co-sponsor events or promotions, with whom we jointly offer products or services, or whose products or services may be of interest to you.</p><p id="1843e4c3-24c0-808e-8f6f-f94bafeb43be" class=""><strong>Professional advisors.</strong> Professional advisors, such as lawyers, auditors, bankers and insurers, where necessary in the course of the professional services that they render to us.</p><p id="1843e4c3-24c0-801e-bca7-cf0e76675555" class=""><strong>Authorities and others. </strong>Law enforcement, government authorities, and private parties, as we believe in good faith to be necessary or appropriate for the <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">Compliance and protection purposes</a> described above.</p><p id="1843e4c3-24c0-80d5-84e8-df51f2cb74e5" class=""><strong>Business transferees</strong>. We may disclose personal information in the context of actual or prospective business transactions (<em>e.g.,</em> investments in tldraw, financing of tldraw, public stock offerings, or the sale, transfer or merger of all or part of our business, assets or shares), for example, we may need to share certain personal information with prospective counterparties and their advisers. We may also disclose your personal information to an acquirer, successor, or assignee of tldraw as part of any merger, acquisition, sale of assets, or similar transaction, and/or in the event of an insolvency, bankruptcy, or receivership in which personal information is transferred to one or more third parties as one of our business assets.</p><p id="1843e4c3-24c0-8097-8147-d324dbee20ab" class=""><strong>Other users and the public. </strong>Your profile and other user-generated content data may be visible to other users of the Service and the public. For example, other users of the Service or the public may have access to your information if you chose to make your forum account profile or other personal information available to them through the Service, such as when you provide comments, reviews, survey responses, or share other content.  This information can be seen, collected and used by others, including being cached, copied, screen captured or stored elsewhere by others (e.g., search engines), and we are not responsible for any such use of this information.</p><h3 id="1843e4c3-24c0-80e4-b9c8-ecf8fc89afba" class="">Your choices</h3><p id="1843e4c3-24c0-8066-830b-cf2eca557d5f" class=""><strong>Access or update your information.</strong> If you have registered for an account with us through the Service, you may review and update certain account information by logging into the account.</p><p id="1843e4c3-24c0-805e-bf9d-d11878601924" class=""><strong>Opt-out of communications.</strong> You may opt-out of marketing-related emails by following the opt-out or unsubscribe instructions at the bottom of the email, or by <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">contacting us</a>. Please note that if you choose to opt-out of marketing-related emails, you may continue to receive service-related and other non-marketing emails.</p><p id="1843e4c3-24c0-808f-85c8-e72cdeadaec3" class=""><strong>Cookies.</strong> Most browsers let you remove or reject cookies.  To do this, follow the instructions in your browser settings.  Many browsers accept cookies by default until you change your settings.  Please note that if you set your browser to disable cookies, the Service may not work properly.  For more information about cookies, including how to see what cookies have been set on your browser and how to manage and delete them, visit <a href="http://www.allaboutcookies.org/">www.allaboutcookies.org</a>.</p><p id="1843e4c3-24c0-801b-bb99-f195d71cec1f" class=""><strong>Blocking images/clear gifs: </strong>Most browsers and devices allow you to configure your device to prevent images from loading. To do this, follow the instructions in your particular browser or device settings.</p><p id="1843e4c3-24c0-80f3-9f8a-f8d8c81ec8ac" class=""><strong>Mobile location data. </strong>You can disable our access to your device’s precise geolocation in your mobile device settings.</p><p id="1843e4c3-24c0-8039-bf10-dc6c11c39f24" class=""><strong>Privacy settings. </strong>We make available certain privacy settings on the Service, including options to control. To modify these settings, visit your Account Settings.</p><p id="1843e4c3-24c0-80b3-af47-f90d51ad7dc2" class=""><strong>Do Not Track.</strong> Some Internet browsers may be configured to send “Do Not Track” signals to the online services that you visit. We currently do not respond to “Do Not Track” signals. To find out more about “Do Not Track,” please visit <a href="http://www.allaboutdnt.com/">http://www.allaboutdnt.com</a>.</p><p id="1843e4c3-24c0-80fd-a141-f98107657f21" class=""><strong>Declining to provide information.</strong> We need to collect personal information to provide certain services. If you do not provide the information we identify as required or mandatory, we may not be able to provide those services.</p><p id="1843e4c3-24c0-80bc-b13a-dc9fb976dbba" class=""><strong>Remove or anonymize your content. </strong>You may request that the content that you posted to the Service be removed or anonymized such that your personal information will not be publicly identifiable on the Service by <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">contacting us</a>. We may decline to process your request as consistent with law. Please note that even if we process your request, it does not ensure complete or comprehensive removal of the content or information posted on the Service.</p><p id="1843e4c3-24c0-803a-b6cb-dacea0e2b880" class=""><strong>Delete your content or close your account.</strong> You can choose to delete certain content through your account. If you wish to request to close your account, please <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">contact us</a>.</p><h3 id="1843e4c3-24c0-8000-9772-c513ef637bd8" class="">Other sites and services</h3><p id="1843e4c3-24c0-80a3-b9b3-fb5e47b1efc4" class="">The Service may contain links to websites, mobile applications, and other online services operated by third parties. In addition, our content may be integrated into web pages or other online services that are not associated with us. These links and integrations are not an endorsement of, or representation that we are affiliated with, any third party. We do not control websites, mobile applications or online services operated by third parties, and we are not responsible for their actions. We encourage you to read the privacy policies of the other websites, mobile applications and online services you use.</p><h3 id="1843e4c3-24c0-8065-b441-c3f3bc4fceeb" class="">Security</h3><p id="1843e4c3-24c0-80f4-992e-c9733a9619b4" class="">We employ a number of technical, organizational and physical safeguards designed to protect the personal information we collect. However, security risk is inherent in all internet and information technologies and we cannot guarantee the security of your personal information.</p><h3 id="1843e4c3-24c0-8000-bacb-e156fde667ab" class="">International data transfer</h3><p id="1843e4c3-24c0-806d-b941-d146d23c216f" class="">We are headquartered in the United States and may use service providers that operate in other countries. Your personal information may be transferred to the United States or other locations where privacy laws may not be as protective as those in your state, province, or country.</p><h3 id="1843e4c3-24c0-803d-84b9-dea664fac6fe" class="">Children</h3><p id="1843e4c3-24c0-807b-b600-fed8ec89e636" class="">The Service is not intended for use by anyone under 13 years of age. If you are a parent or guardian of a child from whom you believe we have collected personal information in a manner prohibited by law, please <a href="https://www.notion.so/Privacy-Policy-1583e4c324c080879905d15759ecaa96?pvs=21">contact us</a>. If we learn that we have collected personal information through the Service from a child without the consent of the child’s parent or guardian as required by law, we will comply with applicable legal requirements to delete the information.</p><h3 id="1843e4c3-24c0-80c4-80a5-ffed3a11e3c0" class="">Changes to this Privacy Policy</h3><p id="1843e4c3-24c0-80e8-88af-cc748ca22e2f" class="">We reserve the right to modify this Privacy Policy at any time. If we make material changes to this Privacy Policy, we will notify you by updating the date of this Privacy Policy and posting it on the Service or other appropriate means. Any modifications to this Privacy Policy will be effective upon our posting the modified version (or as otherwise indicated at the time of posting). In all cases, your use of the Service after the effective date of any modified Privacy Policy indicates your acknowledging that the modified Privacy Policy applies to your interactions with the Service and our business.</p><h3 id="1843e4c3-24c0-800e-8814-f70604ee7db6" class="">How to contact us</h3><ul id="1843e4c3-24c0-8081-af92-e39d4482adbe" class="bulleted-list"><li style="list-style-type:disc"><strong>Email</strong>: <a href="mailto:hello@tldraw.com">hello@tldraw.com</a></li></ul><ul id="1843e4c3-24c0-808e-a917-ea480bc6da7a" class="bulleted-list"><li style="list-style-type:disc"><strong>Mail</strong>: Floor 3, The Arts Building, Morris Pl, Finsbury Park, London N4 3JG</li></ul><ul id="1843e4c3-24c0-804f-9f79-d1606fb6042c" class="bulleted-list"><li style="list-style-type:disc"><strong>Phone</strong>: +44 7481 806757</li></ul></div></article><span class="sans" style="font-size:14px;padding-top:2em"></span></body></html>
\ No newline at end of file
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ar.json b/apps/dotcom/client/public/tla/locales-compiled/ar.json
index 325d8f21b57a..b0398b225ebb 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ar.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ar.json
@@ -51,6 +51,12 @@
       "value": "حساب"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "قم بإنشاء حساب مجاني لحفظ عملك والتعاون في الوقت الفعلي والمزيد."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "قائمة الملفات"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw عبارة عن سبورة بيضاء افتراضية مجانية وفورية."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "مشاركة"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "مغادرة المجموعة"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "إلغاء تثبيت الملف"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "تصدير كـ"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "إظهار المزيد"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "حذف المجموعة"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "تقترب هذه الغرفة من الحد الأقصى لحجمها. فكّر في إزالة بعض المحتوى أو إنشاء ملف جديد."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "إنشاء مجموعة"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "فشل التحميل"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "ملفاتي"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: إبراز العناصر الناقصة"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "إضافة رابط"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "المحرر"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "متابعة بالبريد الإلكتروني"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ملف الدبوس"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "لصق عنوان URL لملف tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "هل أنت متأكد من أنك تريد نسيان هذا الملف؟"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "اسم"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "إعادة التحميل"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "حذف المجموعة…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "هل أنت متأكد أنك تريد حذف هذه المجموعة؟ لا يمكن التراجع عن هذا الإجراء."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "سياسة الخصوصية"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "اسحب الملفات هنا، أو "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "إنشاء ملف"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "، أو "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "نسخ رابط الدعوة"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " للبدء."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "تم اكتشاف متصفح قديم. يُرجى تحديث متصفحك لاستخدام هذا التطبيق."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "إلغاء هذا الرابط وإنشاء رابط جديد."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "أقدم"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "أنت"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "تتوفر نسخة جديدة من tldraw. يُرجى إعادة تحميل الصفحة للمتابعة."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "لقد تمت دعوتك إلى المجموعة "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "أدخل عنوان بريدك الإلكتروني"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "اتبع هذه الخطوات لاستيراد المحتوى يدويًا:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "إعدادات المجموعة"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "نسيان"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "مغادرة المجموعة…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "إعادة تسمية الملف"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "ًلا شكرا"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "لمواصلة التحرير، يرجى نسخ الغرفة إلى ملفاتك."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "تحقق من بريدك الإلكتروني للحصول على رمز التحقق."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "نسخ إلى ملفاتي"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "تم نسخ رابط الدعوة"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "تسجيل الدخول باستخدام جوجل"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "البناء باستخدام SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "هذا الشهر"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "شروط الاستخدام"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "إضافة رابط الملف"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "فاتح"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "لم تستلم الرمز؟ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "إعادة إرسال"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "الخلفية"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "تسجيل الدخول لقبول الدعوة"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "مستخدم ضيف"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "عنوان البريد الإلكتروني"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "رابط الملف"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "تسجيل الدخول"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "مالك"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "تسجيل الدخول للمشاركة"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "إلغاء التثبيت"
+      "value": "قبول والانضمام إلى المجموعة"
     }
   ],
   "bbbcefd7ce": [
@@ -783,16 +1041,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "تحميل ملفات .tldr"
+      "value": "اعرف المزيد عن المشاركة."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "اعرف المزيد عن المشاركة."
+      "value": "السماح لـ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " بمساعدتنا على تحسين tldraw."
     }
   ],
   "c303bd1095": [
@@ -807,6 +1079,12 @@
       "value": "ملفات تعريف الارتباط الأساسية"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "اسم المجموعة"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -819,12 +1097,24 @@
       "value": "الدعوة"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "إظهار أقل"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "تسجيل الخروج"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "يحفظ"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -855,6 +1145,40 @@
       "value": "تبديل الشريط الجانبي"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "قبل أن تبدأ، يرجى قبول "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "شروط الاستخدام"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " و"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "سياسة الخصوصية"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " الخاصة بنا."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -867,40 +1191,82 @@
       "value": "حاول مرة أخرى"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "قبول ومواصلة"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "اذهب هنا لرؤية المحتوى"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "لقد وصلتَ إلى الحد الأقصى لعدد المجموعات. عليكَ حذف المجموعات القديمة قبل إنشاء مجموعات جديدة."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "دعوة فقط"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "عنوان URL لملف tldraw غير صالح"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "علامات تصحيح الأخطاء في التطبيق"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "دعوة الأعضاء"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "نسخ رابط الدعوة"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "الملخص القانوني"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "مسؤل"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "شروط الخدمة"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "أو"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "تثبيت"
+      "value": "منطقة الخطر"
     }
   ],
   "ea4788705e": [
@@ -959,6 +1325,12 @@
       "value": " لمعرفة المزيد."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "أعضاء"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -1001,6 +1373,18 @@
       "value": "إعدادات"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "هل أنت متأكد أنك تريد مغادرة هذه المجموعة؟"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "سياسة الخصوصية"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1019,6 +1403,12 @@
       "value": "رابط منسوخ"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "أضف رابط الملف…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/bn.json b/apps/dotcom/client/public/tla/locales-compiled/bn.json
index 88619aaf46a9..8599aa6a2662 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/bn.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/bn.json
@@ -51,6 +51,12 @@
       "value": "হিসাব"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "আপনার কাজ সংরক্ষণ করতে, রিয়েল-টাইমে সহযোগিতা করতে এবং আরও অনেক কিছু করতে একটি বিনামূল্যে অ্যাকাউন্ট তৈরি করুন।"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ফাইল মেনু"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw হল একটি বিনামূল্যের এবং তাৎক্ষণিক ভার্চুয়াল হোয়াইটবোর্ড।"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "প্রকাশ করুন"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "গ্রুপ ছেড়ে দিন"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ফাইল আনপিন করুন"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "হিসাবে রপ্তানি করুন"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "আরও দেখাও"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "গ্রুপ মুছুন"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "এই রুমটি তার আকারের সীমার কাছাকাছি চলে আসছে। কিছু কন্টেন্ট সরিয়ে ফেলার অথবা একটি নতুন ফাইল শুরু করার কথা বিবেচনা করুন।"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "গ্রুপ তৈরি করুন"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "আপলোড ব্যর্থ হয়েছে"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "আমার ফাইলগুলি"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: হাইলাইট অনুপস্থিত"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "লিঙ্ক যোগ করুন"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "সম্পাদক"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ইমেল দিয়ে চালিয়ে যান"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ফাইল পিন করুন"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ফাইলের URL পেস্ট করুন..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "আপনি কি নিশ্চিত আপনি এই ফাইলটি ভুলে যেতে চান?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "নাম"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "পুনরায় লোড করুন"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "গ্রুপটি মুছে ফেলুন..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "আপনি কি নিশ্চিত যে আপনি এই গ্রুপটি মুছে ফেলতে চান? এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না।"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "গোপনীয়তা নীতি"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "শুরু করতে ফাইলগুলি এখানে টেনে আনুন, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "একটি ফাইল তৈরি করুন"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", অথবা "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "আমন্ত্রণ লিঙ্কটি অনুলিপি করুন"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "।"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "পুরনো ব্রাউজার শনাক্ত হয়েছে। এই অ্যাপটি ব্যবহার করার জন্য অনুগ্রহ করে আপনার ব্রাউজার আপডেট করুন।"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "এই লিঙ্কটি প্রত্যাহার করুন এবং একটি নতুন লিঙ্ক তৈরি করুন।"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "বয়স্ক"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "তুমি"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw-এর একটি নতুন সংস্করণ উপলব্ধ। চালিয়ে যেতে অনুগ্রহ করে পৃষ্ঠাটি পুনরায় লোড করুন।"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "আপনাকে গ্রুপে আমন্ত্রণ জানানো হয়েছে "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "আপনার ইমেল ঠিকানা লিখুন"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "ম্যানুয়ালি সামগ্রী আমদানি করতে এই পদক্ষেপগুলি অনুসরণ করুন:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "গ্রুপ সেটিংস"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "ভুলে যাও"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "গ্রুপ ছেড়ে দিন..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "ফাইলের নাম পরিবর্তন করুন"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "না ধন্যবাদ"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "সম্পাদনা চালিয়ে যেতে, অনুগ্রহ করে আপনার ফাইলগুলিতে রুমটি কপি করুন।"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "যাচাইকরণ কোডের জন্য আপনার ইমেল চেক করুন।"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "আমার ফাইল কপি"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "আমন্ত্রণের লিঙ্কটি কপি করা হয়েছে"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "গুগল দিয়ে সাইন ইন করুন"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK দিয়ে তৈরি করুন"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "এই মাসে"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ব্যবহারের শর্তাবলী"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ফাইলের লিঙ্ক যোগ করুন"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "আলো"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "কোড পাননি? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "পুনরায় পাঠান"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "।"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "পটভূমি"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "আমন্ত্রণ গ্রহণ করতে সাইন ইন করুন"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "অতিথি ব্যবহারকারী"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ইমেল ঠিকানা"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ফাইলের URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "সাইন ইন করুন"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "মালিক"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "শেয়ার করতে সাইন ইন করুন"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "আনপিন করুন"
+      "value": "গ্রহণ করুন এবং গ্রুপে যোগদান করুন"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr ফাইল আপলোড করুন"
+      "value": "শেয়ার করার বিষয়ে আরও জানুন।"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "শেয়ার করার বিষয়ে আরও জানুন।"
+      "value": "tldraw উন্নত করতে আমাদের সাহায্য করার জন্য "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " কে অনুমতি দিন।"
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "প্রয়োজনীয় কুকিজ"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "গ্রুপের নাম"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "আমন্ত্রণ"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "কম দেখান"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "সাইন আউট করুন"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "সংরক্ষণ করুন"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "সাইডবার টগল করুন"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "শুরু করার আগে, অনুগ্রহ করে আমাদের "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ব্যবহারের শর্তাবলী"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " এবং "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "গোপনীয়তা নীতি"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " মেনে নিন।"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "আবার চেষ্টা করুন"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "গ্রহণ করুন এবং চালিয়ে যান"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "বিষয়বস্তু দেখতে এখানে যান"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "আপনি সর্বাধিক সংখ্যক গ্রুপে পৌঁছে গেছেন। নতুন গ্রুপ তৈরি করার আগে আপনাকে পুরানো গ্রুপগুলি মুছে ফেলতে হবে।"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "শুধুমাত্র আমন্ত্রণ"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "tldraw ফাইলের URLটি ভুল"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "অ্যাপ ডিবাগ পতাকা"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "সদস্যদের আমন্ত্রণ জানান"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "আমন্ত্রণের লিঙ্ক কপি করুন"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "আইনি সারসংক্ষেপ"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "অ্যাডমিন"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "পরিষেবার শর্তাবলী"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "অথবা"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "পিন"
+      "value": "বিপদ অঞ্চল"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " পড়ুন।"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "সদস্যরা"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "সেটিংস"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "তুমি কি নিশ্চিত যে তুমি এই গ্রুপটি ছেড়ে যেতে চাও?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "গোপনীয়তা নীতি"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "অনুলিপি করা লিঙ্ক"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ফাইলের লিঙ্ক যোগ করুন..."
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ca.json b/apps/dotcom/client/public/tla/locales-compiled/ca.json
index 4fbe2a963bad..a2d045e082ba 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ca.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ca.json
@@ -51,6 +51,12 @@
       "value": "Compte"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Crea un compte gratuït per desar la teva feina, col·laborar en temps real i molt més."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menú Fitxer"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw és una pissarra virtual gratuïta i instantània."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publicar"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Sortir del grup"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Desfixar fitxer"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exporta com a"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mostra'n més"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Suprimeix el grup"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Aquesta sala s'acosta al seu límit de mida. Penseu en la possibilitat d'eliminar part del contingut o iniciar un fitxer nou."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Crea un grup"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "La càrrega ha fallat"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Els meus fitxers"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Ressaltar que falta"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Afegeix un enllaç"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continua amb el correu electrònic"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fitxer fixat"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Enganxa l'URL del fitxer tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Esteu segur que voleu oblidar aquest fitxer?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nom"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Torna a carregar"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Suprimeix el grup…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Esteu segur que voleu suprimir aquest grup? Aquesta acció no es pot desfer."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Política de privadesa"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Arrossega els fitxers aquí, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "crea un fitxer"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " o "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copia l'enllaç d'invitació"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " per començar."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "S'ha detectat un navegador antic. Actualitzeu el navegador per utilitzar aquesta aplicació."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revoca aquest enllaç i crea'n un de nou."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Més vell"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "tu"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Hi ha disponible una nova versió de tldraw. Torneu a carregar la pàgina per continuar."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Has estat convidat al grup "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Introdueix la teva adreça electrònica"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Seguiu aquests passos per importar el contingut manualment:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Configuració del grup"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Oblida't"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Sortir del grup…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Canvia el nom del fitxer"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "No, gràcies."
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Per continuar editant, copieu la sala als vostres fitxers."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Revisa el teu correu electrònic per obtenir un codi de verificació."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copia als meus fitxers"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Enllaç d'invitació copiat"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Inicia la sessió amb Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Compilar amb el SDK de tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Aquest mes"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Condicions d'ús"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Afegeix un enllaç de fitxer"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Llum"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "No has rebut cap codi? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Torna a enviar"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Fons"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Inicia la sessió per acceptar la invitació"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Usuari convidat"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Adreça electrònica"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL del fitxer"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Inicia sessió"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "propietari"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Inicia la sessió per compartir"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Desenganxa"
+      "value": "Accepta i uneix-te al grup"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Carregueu fitxers .tldr"
+      "value": "Més informació sobre com compartir."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Més informació sobre com compartir."
+      "value": "Permet que "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ens ajudi a millorar tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Galetes essencials"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nom del grup"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Convidar"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Mostra menys"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Tanca la sessió"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Desa"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Canvia la barra lateral"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Abans de començar, si us plau, accepteu les nostres "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "condicions d'ús"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " i la "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "política de privacitat"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Torna-ho a provar"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Accepta i continua"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Entra aquí per veure el contingut"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Heu arribat al nombre màxim de grups. Heu de suprimir els grups antics abans de crear-ne de nous."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Només convidar"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL de fitxer tldraw no vàlida"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Senyals de depuració d'aplicacions"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Convida membres"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copia l'enllaç d'invitació"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Resum legal"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrador"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Condicions del servei"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "o"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Zona de perill"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " per obtenir més informació."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membres"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Configuració"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Esteu segur que voleu sortir d'aquest grup?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Política de privacitat"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Enllaç copiat"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Afegeix un enllaç de fitxer…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/cs.json b/apps/dotcom/client/public/tla/locales-compiled/cs.json
index 269be1ff478b..e3d81c0ef289 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/cs.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/cs.json
@@ -51,6 +51,12 @@
       "value": "Účet"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Vytvořte si bezplatný účet pro ukládání své práce, spolupráci v reálném čase a další."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Nabídka Soubor"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw je bezplatná a okamžitá virtuální bílá tabule."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publikovat"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Opustit skupinu"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Odepnout soubor"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportovat jako"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Zobrazit více"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Smazat skupinu"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Tato místnost se blíží svému limitu velikosti. Zkuste odstranit část obsahu nebo vytvořit nový soubor."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Vytvořit skupinu"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Nahrání se nezdařilo"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Moje soubory"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Zvýraznění chybí"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Přidat odkaz"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Pokračovat s e-mailem"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Připnout soubor"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Vložit URL soubor tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Opravdu chcete tento soubor zapomenout?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Jméno"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Znovu načíst"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Smazat skupinu…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Jste si jisti, že chcete tuto skupinu smazat? Tuto akci nelze vrátit zpět."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Zásady ochrany osobních údajů"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Přetáhněte soubory sem, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "vytvořte soubor"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " nebo "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "zkopírujte odkaz na pozvánku"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " a začněte."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Byl detekován starý prohlížeč. Pro použití této aplikace prosím aktualizujte prohlížeč."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Zrušte toto propojení a vytvořte nové."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Starší"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Vy"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "K dispozici je nová verze tldraw. Chcete-li pokračovat, znovu načtěte stránku."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Byli jste pozváni do skupiny "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Zadejte svou e-mailovou adresu"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Chcete-li obsah importovat ručně, postupujte takto:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Nastavení skupiny"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Zapomenout"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Opustit skupinu…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Přejmenovat soubor"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Ne, děkuji."
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Chcete-li pokračovat v úpravách, zkopírujte prosím místnost do svých souborů."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Zkontrolujte si e-mail, kde vám bude doručen ověřovací kód."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopírovat do mých souborů"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Zkopírován odkaz na pozvánku"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Přihlásit se pomocí Googlu"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Sestavení s tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Tento měsíc"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Podmínky použití"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Přidat odkaz na soubor"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Světlo"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Neobdrželi jste kód? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Znovu odeslat"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Pozadí"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Přihlaste se pro přijetí pozvánky"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Hostující uživatel"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-mailová adresa"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL souboru"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Přihlaste se"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Majitel"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Přihlaste se pro sdílení"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Odepnout"
+      "value": "Přijmout a připojit se ke skupině"
     }
   ],
   "bbbcefd7ce": [
@@ -775,16 +1033,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Nahrajte soubory .tldr"
+      "value": "Další informace o sdílení."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Další informace o sdílení."
+      "value": "Povolte "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": ", které nám pomohou vylepšit tldraw."
     }
   ],
   "c303bd1095": [
@@ -799,6 +1071,12 @@
       "value": "Základní soubory cookie"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Název skupiny"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -811,12 +1089,24 @@
       "value": "Pozvat"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Zobrazit méně"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Odhlaste se"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Uložit"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -847,6 +1137,40 @@
       "value": "Přepnout postranní panel"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Než začnete, přijměte prosím naše "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "podmínky použití"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " a "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "zásady ochrany osobních údajů"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -859,40 +1183,82 @@
       "value": "Zkuste to znovu"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Přijmout a pokračovat"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Přejděte sem a podívejte se na obsah"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Dosáhli jste maximálního počtu skupin. Před vytvořením nových skupin je třeba smazat staré skupiny."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Pouze na pozvání"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Neplatná adresa URL souboru tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Příznaky ladění aplikace"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Pozvat členy"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopírovat odkaz na pozvánku"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Právní shrnutí"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrátor"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Podmínky služby"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "nebo"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Připnout"
+      "value": "Nebezpečná zóna"
     }
   ],
   "ea4788705e": [
@@ -951,6 +1317,12 @@
       "value": " a dozvíte se více."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Členové"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -993,6 +1365,18 @@
       "value": "Nastavení"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Jste si jistý/á, že chcete tuto skupinu opustit?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Zásady ochrany osobních údajů"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1011,6 +1395,12 @@
       "value": "Zkopírován odkaz"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Přidat odkaz na soubor…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/da.json b/apps/dotcom/client/public/tla/locales-compiled/da.json
index f5af6cd8ae27..9bd6d641c7f6 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/da.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/da.json
@@ -51,6 +51,12 @@
       "value": "Konto"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Opret en gratis konto for at gemme dit arbejde, samarbejde i realtid og meget mere."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Fil menu"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw er en gratis og øjeblikkelig virtuel whiteboard."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Offentliggøre"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Forlad gruppen"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Frigør fil"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Eksporter som"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Vis mere"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Slet gruppe"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Dette rum nærmer sig sin størrelsesgrænse. Overvej at fjerne noget indhold eller starte en ny fil."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Opret gruppe"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Upload mislykkedes"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Mine filer"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Fremhæv mangler"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Tilføj link"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Redaktør"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Fortsæt med e-mail"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tltegn"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fastgør fil"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Indsæt tldraw-filens URL..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Er du sikker på, at du vil glemme denne fil?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Navn"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Genindlæs"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Slet gruppe…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Er du sikker på, at du vil slette denne gruppe? Denne handling kan ikke fortrydes."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Privatlivspolitik"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Træk filer hertil, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "opret en fil"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", eller "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopiér invitationslinket"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " for at komme i gang."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Gammel browser fundet. Opdater venligst din browser for at bruge denne app."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Tilbagekald dette link og opret et nyt."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Ældre"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "du"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "En ny version af tldraw er tilgængelig. Genindlæs siden for at fortsætte."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Du er blevet inviteret til gruppen "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Indtast din e-mailadresse"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Følg disse trin for at importere indholdet manuelt:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Gruppeindstillinger"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Glemme"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Forlad gruppen…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Omdøb fil"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nej tak"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "For at fortsætte redigeringen skal du kopiere rummet til dine filer."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Tjek din e-mail for en bekræftelseskode."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopier til mine filer"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kopieret invitationslink"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Log ind med Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Byg med tldraw SDK'et"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Denne måned"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Brugsbetingelser"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Tilføj fillink"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Lys"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Har du ikke modtaget en kode? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Send igen"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Baggrund"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Log ind for at acceptere invitationen"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Gæstebruger"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-mailadresse"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Fil-URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Log ind"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Ejer"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Log ind for at dele"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Frigør"
+      "value": "Accepter og bliv medlem af gruppen"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Upload .tldr-filer"
+      "value": "Få mere at vide om deling."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Få mere at vide om deling."
+      "value": "Tillad "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analyse"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " for at hjælpe os med at forbedre tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Vigtige cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Gruppenavn"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Invitere"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Vis mindre"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Log ud"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Spare"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Skift sidebjælke"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Før du starter, bedes du acceptere vores "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "brugsbetingelser"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " og "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "privatlivspolitik"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Prøv igen"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Accepter og fortsæt"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Gå her for at se indholdet"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Du har nået det maksimale antal grupper. Du skal slette gamle grupper, før du opretter nye."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Kun invitation"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Ugyldig URL til tldraw-fil"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "App debug flag"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Inviter medlemmer"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopiér invitationslinket"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Juridisk resumé"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Servicevilkår"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "eller"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Stift"
+      "value": "Farezone"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " for at få mere at vide."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Medlemmer"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Indstillinger"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Er du sikker på, at du vil forlade denne gruppe?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Privatlivspolitik"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Kopieret link"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Tilføj fillink…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/de.json b/apps/dotcom/client/public/tla/locales-compiled/de.json
index 9caeb7129f9c..5dcb4bc38000 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/de.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/de.json
@@ -51,6 +51,12 @@
       "value": "Konto"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Erstellen Sie ein kostenloses Konto, um Ihre Arbeit zu speichern, in Echtzeit zusammenzuarbeiten und vieles mehr."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Dateimenü"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ist ein kostenloses und sofort einsatzbereites virtuelles Whiteboard."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Veröffentlichen"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Gruppe verlassen"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Datei aufheben"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportieren als"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mehr anzeigen"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Gruppe löschen"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Dieser Raum erreicht seine maximale Größe. Entfernen Sie ggf. Inhalte oder erstellen Sie eine neue Datei."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Gruppe erstellen"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Hochladen fehlgeschlagen"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Meine Dateien"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Markierung fehlt"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Link hinzufügen"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Mit der E-Mail fortfahren"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pin-Datei"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "URL der tldraw-Datei einfügen..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Möchten Sie diese Datei wirklich vergessen?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Name"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Neu laden"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Gruppe löschen…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Sind Sie sicher, dass Sie diese Gruppe löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Datenschutzrichtlinie"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Ziehen Sie Dateien hierher, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Datei erstellen"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " oder "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Einladungslink kopieren"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": ", um zu beginnen."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Alter Browser erkannt. Bitte aktualisieren Sie Ihren Browser, um diese App zu verwenden."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Diese Verknüpfung löschen und eine neue erstellen."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Älter"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Du"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "Eine neue Version von tldraw ist verfügbar. Bitte laden Sie die Seite neu, um fortzufahren."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Sie wurden zur Gruppe "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " eingeladen."
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Geben Sie Ihre E-Mail-Adresse ein."
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "Befolgen Sie diese Schritte, um den Inhalt manuell zu importieren:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Gruppeneinstellungen"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "Vergessen"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Gruppe verlassen…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "Datei umbenennen"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nein danke"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Um mit der Bearbeitung fortzufahren, kopieren Sie den Raum bitte in Ihre Dateien."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Prüfen Sie Ihr E-Mail-Postfach auf einen Bestätigungscode."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "In meine Dateien kopieren"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kopierter Einladungslink"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Mit Google anmelden"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Erstellen mit dem tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Diesen Monat"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Nutzungsbedingungen"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Dateilink hinzufügen"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Hell"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Sie haben keinen Code erhalten? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Erneut senden"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "Hintergrund"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Melden Sie sich an, um die Einladung anzunehmen."
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "Gastbenutzer"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-Mail-Adresse"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Datei-URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Anmelden"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Eigentümer"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "Zum Teilen anmelden"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Lösen"
+      "value": "Akzeptiere und trete der Gruppe bei"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1029,30 @@
       "value": " geteilt"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr-Dateien hochladen"
+      "value": "Erfahren Sie mehr über das Teilen."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Erfahren Sie mehr über das Teilen."
+      "value": "Erlauben Sie uns, mithilfe von "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " tldraw zu verbessern."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1067,12 @@
       "value": "Notwendige Cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Gruppenname"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1085,24 @@
       "value": "Einladen"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Weniger anzeigen"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Abmelden"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Speichern"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1133,40 @@
       "value": "Seitenleiste umschalten"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Bevor Sie beginnen, akzeptieren Sie bitte unsere "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Nutzungsbedingungen"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " und "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Datenschutzrichtlinie"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1179,82 @@
       "value": "Erneut versuchen"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Akzeptieren und fortfahren"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Hier können Sie den Inhalt sehen"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Sie haben die maximale Anzahl an Gruppen erreicht. Sie müssen alte Gruppen löschen, bevor Sie neue erstellen können."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Nur einladen"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Ungültige tldraw-Datei-URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "App-Debug-Markierungen"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Mitglieder einladen"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Einladungslink kopieren"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Rechtliche Zusammenfassung"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrator"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Servicebedingungen"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "oder"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Anheften"
+      "value": "Gefahrenzone"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1313,12 @@
       "value": ", um mehr zu erfahren."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Mitglieder"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1361,18 @@
       "value": "Einstellungen"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Möchtest du diese Gruppe wirklich verlassen?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Datenschutzrichtlinie"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1391,12 @@
       "value": "Link kopiert"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Dateiverknüpfung hinzufügen…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/el.json b/apps/dotcom/client/public/tla/locales-compiled/el.json
index 9a7ce2330726..c674d4d5a26c 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/el.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/el.json
@@ -51,6 +51,12 @@
       "value": "Λογαριασμός"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Δημιουργήστε έναν δωρεάν λογαριασμό για να αποθηκεύσετε την εργασία σας, να συνεργαστείτε σε πραγματικό χρόνο και πολλά άλλα."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Μενού αρχείου"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "Το tldraw είναι ένας δωρεάν και άμεσος εικονικός πίνακας."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Δημοσιεύω"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Αποχώρηση από την ομάδα"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Ξεκαρφίτσωμα αρχείου"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Εξαγωγή ως"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Εμφάνιση περισσότερων"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Διαγραφή ομάδας"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Αυτό το δωμάτιο πλησιάζει το όριο μεγέθους του. Σκεφτείτε να καταργήσετε κάποιο περιεχόμενο ή να ξεκινήσετε ένα νέο αρχείο."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Δημιουργία ομάδας"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Η μεταφόρτωση απέτυχε"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Τα αρχεία μου"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Επισήμανση Λείπει"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Προσθήκη συνδέσμου"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Συντάκτης"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Συνέχεια με email"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tdraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Καρφίτσωμα αρχείου"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Επικόλληση URL αρχείου tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Είστε βέβαιοι ότι θέλετε να ξεχάσετε αυτό το αρχείο;"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Ονομα"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Γεμίζω πάλι"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Διαγραφή ομάδας…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την ομάδα; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Πολιτική απορρήτου"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Σύρετε αρχεία εδώ, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "δημιουργήστε ένα αρχείο"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ή "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "αντιγράψτε τον σύνδεσμο πρόσκλησης"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " για να ξεκινήσετε."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Εντοπίστηκε παλιό πρόγραμμα περιήγησης. Ενημερώστε το πρόγραμμα περιήγησής σας για να χρησιμοποιήσετε αυτήν την εφαρμογή."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Ανακαλέστε αυτόν τον σύνδεσμο και δημιουργήστε έναν νέο."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Πιο παλιά"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "εσείς"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Μια νέα έκδοση του tldraw είναι διαθέσιμη. Επαναλάβετε τη φόρτωση της σελίδας για να συνεχίσετε."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Έχετε προσκληθεί στην ομάδα "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Εισαγάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Ακολουθήστε αυτά τα βήματα για να εισαγάγετε το περιεχόμενο με μη αυτόματο τρόπο:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Ρυθμίσεις ομάδας"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Ξεχνώ"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Αποχώρηση από την ομάδα…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Μετονομασία αρχείου"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Όχι ευχαριστώ"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Για να συνεχίσετε την επεξεργασία, αντιγράψτε το δωμάτιο στα αρχεία σας."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Ελέγξτε το email σας για έναν κωδικό επαλήθευσης."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Αντιγραφή στα αρχεία μου"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Αντιγραμμένος σύνδεσμος πρόσκλησης"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Συνδεθείτε με την Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Δημιουργήστε με το tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Αυτόν τον μήνα"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Όροι Χρήσης"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Προσθήκη συνδέσμου αρχείου"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Φως"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Δεν λάβατε κωδικό; "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Επαναποστολή"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Φόντο"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Συνδεθείτε για να αποδεχτείτε την πρόσκληση"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Επισκέπτης χρήστης"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL αρχείου"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Συνδεθείτε"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Ιδιοκτήτης"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Συνδεθείτε για κοινοποίηση"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Ξεκαρφιτσώνω"
+      "value": "Αποδοχή και συμμετοχή στην ομάδα"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Ανεβάστε αρχεία .tldr"
+      "value": "Μάθετε περισσότερα σχετικά με την κοινή χρήση."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Μάθετε περισσότερα σχετικά με την κοινή χρήση."
+      "value": "Επιτρέψτε στα "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " να μας βοηθήσουν να βελτιώσουμε το tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Βασικά cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Όνομα ομάδας"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Καλώ"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Εμφάνιση λιγότερων"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Αποσυνδεθείτε"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Εκτός"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Εναλλαγή πλευρικής γραμμής"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Πριν ξεκινήσετε, αποδεχτείτε τους "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "όρους χρήσης"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " και την "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "πολιτική απορρήτου"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " μας."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Δοκιμάστε ξανά"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Αποδοχή και συνέχεια"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Μεταβείτε εδώ για να δείτε το περιεχόμενο"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Έχετε φτάσει τον μέγιστο αριθμό ομάδων. Πρέπει να διαγράψετε τις παλιές ομάδες πριν δημιουργήσετε νέες."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Πρόσκληση μόνο"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Μη έγκυρη διεύθυνση URL αρχείου tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Σημαίες εντοπισμού σφαλμάτων εφαρμογών"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Πρόσκληση μελών"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Αντιγραφή συνδέσμου πρόσκλησης"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Νομική περίληψη"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Διαχειριστής"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Όροι παροχής υπηρεσιών"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ή"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Καρφίτσα"
+      "value": "Ζώνη κινδύνου"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " για να μάθετε περισσότερα."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Μέλη"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Ρυθμίσεις"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν την ομάδα;"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Πολιτική Απορρήτου"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Αντιγράφηκε ο σύνδεσμος"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Προσθήκη συνδέσμου αρχείου…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/en.json b/apps/dotcom/client/public/tla/locales-compiled/en.json
index 847d9c89704c..ed16a77c8a1e 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/en.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/en.json
@@ -5,6 +5,12 @@
       "value": "Export"
     }
   ],
+  "038c9b4432": [
+    {
+      "type": 0,
+      "value": "Fairy’s personality"
+    }
+  ],
   "03b3e13197": [
     {
       "type": 0,
@@ -21,12 +27,6 @@
       "value": "GetHelpLink"
     }
   ],
-  "05596b840b": [
-    {
-      "type": 0,
-      "value": "Open tldraw."
-    }
-  ],
   "06b9281e39": [
     {
       "type": 0,
@@ -51,6 +51,12 @@
       "value": "Account"
     }
   ],
+  "090b807281": [
+    {
+      "type": 0,
+      "value": "Spiky"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "File menu"
     }
   ],
+  "0befa10111": [
+    {
+      "type": 0,
+      "value": "Fairies"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,24 @@
       "value": "Publish"
     }
   ],
+  "11a755d598": [
+    {
+      "type": 0,
+      "value": "Stop"
+    }
+  ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Leave group"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Unpin file"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +117,24 @@
       "value": "Export as"
     }
   ],
+  "141c7239d3": [
+    {
+      "type": 0,
+      "value": "Fairy customization"
+    }
+  ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Show more"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Delete group"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -105,6 +153,18 @@
       "value": "Today"
     }
   ],
+  "1e38506832": [
+    {
+      "type": 0,
+      "value": "Go to fairy"
+    }
+  ],
+  "1fe250ea06": [
+    {
+      "type": 0,
+      "value": "Instruct the group…"
+    }
+  ],
   "20976e7bec": [
     {
       "type": 0,
@@ -117,24 +177,54 @@
       "value": "This room is approaching its size limit. Consider removing some content or starting a new file."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Create group"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
       "value": "About tldraw"
     }
   ],
+  "2811a731bb": [
+    {
+      "type": 0,
+      "value": "Customize fairy"
+    }
+  ],
+  "284d5cd0dd": [
+    {
+      "type": 0,
+      "value": "Model:"
+    }
+  ],
   "299cb00a7a": [
     {
       "type": 0,
       "value": "Upload failed"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "My files"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
       "value": "This room has reached its size limit and changes might no longer be saved. Remove some content or start a new file."
     }
   ],
+  "2e86e6853d": [
+    {
+      "type": 0,
+      "value": "Select leader"
+    }
+  ],
   "31246941ad": [
     {
       "type": 0,
@@ -147,6 +237,18 @@
       "value": "i18n: Highlight Missing"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Add link"
+    }
+  ],
+  "324a0f3182": [
+    {
+      "type": 0,
+      "value": "Back to tldraw"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +261,24 @@
       "value": "Editor"
     }
   ],
+  "3a295397e6": [
+    {
+      "type": 0,
+      "value": "Ask for help"
+    }
+  ],
+  "3a77f951ca": [
+    {
+      "type": 0,
+      "value": "Add a new task…"
+    }
+  ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continue with email"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -177,6 +297,12 @@
       "value": "Accept all"
     }
   ],
+  "4131ec34ef": [
+    {
+      "type": 0,
+      "value": "Bald"
+    }
+  ],
   "42e53c47c1": [
     {
       "type": 0,
@@ -195,18 +321,48 @@
       "value": "Thanks for helping us improve tldraw!"
     }
   ],
+  "465a8a92a4": [
+    {
+      "type": 0,
+      "value": "No fairies selected"
+    }
+  ],
   "47839e47a5": [
     {
       "type": 0,
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pin file"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Paste tldraw file URL..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Are you sure you want to forget this file?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Name"
+    }
+  ],
+  "4b3e8439d5": [
+    {
+      "type": 0,
+      "value": "Leader fairy will be given orchestration power"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +375,36 @@
       "value": "Reload"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Delete group…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Are you sure you want to delete this group? This action cannot be undone."
+    }
+  ],
+  "4e98378836": [
+    {
+      "type": 0,
+      "value": "Personality"
+    }
+  ],
+  "4ef3716596": [
+    {
+      "type": 0,
+      "value": "Unfollow fairy"
+    }
+  ],
+  "4f827717f7": [
+    {
+      "type": 0,
+      "value": "Pointy"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -237,12 +423,6 @@
       "value": "Collaborator limit reached"
     }
   ],
-  "54d240fa41": [
-    {
-      "type": 0,
-      "value": "Please slow down."
-    }
-  ],
   "554a05155c": [
     {
       "type": 0,
@@ -277,6 +457,40 @@
       "value": "Privacy policy"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Drag files here, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "create a file"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", or "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copy invite link"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " to get started."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,12 +515,24 @@
       "value": "Old browser detected. Please update your browser to use this app."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revoke this link and create a new one."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
       "value": "We failed to upload some of the content you created before you signed in."
     }
   ],
+  "5ea8bb44be": [
+    {
+      "type": 0,
+      "value": "You have been invited to join group:"
+    }
+  ],
   "5f3c333678": [
     {
       "type": 0,
@@ -331,6 +557,24 @@
       "value": "Older"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "you"
+    }
+  ],
+  "64ebe56d8c": [
+    {
+      "type": 0,
+      "value": "Click to remove or drag to move"
+    }
+  ],
+  "65709fd250": [
+    {
+      "type": 0,
+      "value": "Task list"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +587,12 @@
       "value": "A new version of tldraw is available. Please reload the page to continue."
     }
   ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Enter your email address"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +611,12 @@
       "value": "Follow these steps to import the content manually:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Group settings"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -415,12 +671,24 @@
       "value": "Please reload"
     }
   ],
+  "76dea3c9ca": [
+    {
+      "type": 0,
+      "value": "tldraw is a free online whiteboard. Create an account to save your files and work with your friends."
+    }
+  ],
   "777f9e90cf": [
     {
       "type": 0,
       "value": "Invalid request."
     }
   ],
+  "7835039819": [
+    {
+      "type": 0,
+      "value": "Propeller"
+    }
+  ],
   "78e9815992": [
     {
       "type": 0,
@@ -433,30 +701,60 @@
       "value": "Submit an issue on GitHub"
     }
   ],
+  "7a3113b0ba": [
+    {
+      "type": 0,
+      "value": "Drag to canvas"
+    }
+  ],
   "7b1329f5ca": [
     {
       "type": 0,
       "value": "User manual"
     }
   ],
+  "7b5449bd84": [
+    {
+      "type": 0,
+      "value": "Antenna"
+    }
+  ],
   "7be10fc592": [
     {
       "type": 0,
       "value": "Restore version"
     }
   ],
+  "7c0747a5df": [
+    {
+      "type": 0,
+      "value": "Open tldraw"
+    }
+  ],
   "7cb5f8b4a5": [
     {
       "type": 0,
       "value": "Forget"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Leave group…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
       "value": "Publish changes"
     }
   ],
+  "7e94fd31ac": [
+    {
+      "type": 0,
+      "value": "Create project"
+    }
+  ],
   "7fcdcc6455": [
     {
       "type": 0,
@@ -469,6 +767,12 @@
       "value": "Download"
     }
   ],
+  "80a3d8a5bb": [
+    {
+      "type": 0,
+      "value": "Log response time (solo mode only)"
+    }
+  ],
   "815e116a2e": [
     {
       "type": 0,
@@ -503,6 +807,12 @@
       "value": "."
     }
   ],
+  "81d48c2f3a": [
+    {
+      "type": 0,
+      "value": "Show tasks on canvas"
+    }
+  ],
   "85a082de1b": [
     {
       "type": 0,
@@ -529,12 +839,24 @@
       "value": "Rename file"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "No thanks"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "To continue editing please copy the room to your files."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Check your email for a verification code."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,6 +887,36 @@
       "value": "Copy to my files"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Copied invite link"
+    }
+  ],
+  "93346fdd70": [
+    {
+      "type": 0,
+      "value": "Ears"
+    }
+  ],
+  "93dfe9fbbe": [
+    {
+      "type": 0,
+      "value": "Deselect fairy"
+    }
+  ],
+  "94966d9074": [
+    {
+      "type": 0,
+      "value": "Send"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Sign in with Google"
+    }
+  ],
   "95d2109dc8": [
     {
       "type": 0,
@@ -577,12 +929,62 @@
       "value": "This month"
     }
   ],
+  "97a9f16b2e": [
+    {
+      "type": 0,
+      "value": "New fairy"
+    }
+  ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Terms of Use"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Add file link"
+    }
+  ],
+  "98e528aac6": [
+    {
+      "type": 0,
+      "value": "Switch to fairy chat"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Light"
     }
   ],
+  "9953e9946b": [
+    {
+      "type": 0,
+      "value": "Debug view"
+    }
+  ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Didn’t receive a code? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Resend"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -625,6 +1027,12 @@
       "value": "Padding"
     }
   ],
+  "a10d7a62aa": [
+    {
+      "type": 0,
+      "value": "Hat"
+    }
+  ],
   "a18366b217": [
     {
       "type": 0,
@@ -643,18 +1051,42 @@
       "value": "Export image"
     }
   ],
+  "a2f0372a75": [
+    {
+      "type": 0,
+      "value": "Switch to task list"
+    }
+  ],
   "a3debabee7": [
     {
       "type": 0,
       "value": "Cookie policy"
     }
   ],
+  "a3e932550c": [
+    {
+      "type": 0,
+      "value": "Fairy’s name"
+    }
+  ],
   "a4d3b161ce": [
     {
       "type": 0,
       "value": "Submit"
     }
   ],
+  "a4e2d4d837": [
+    {
+      "type": 0,
+      "value": "Reset all chats"
+    }
+  ],
+  "a4ffdcf0dc": [
+    {
+      "type": 0,
+      "value": "Top"
+    }
+  ],
   "a6cc403d56": [
     {
       "type": 0,
@@ -667,6 +1099,12 @@
       "value": "Analytics"
     }
   ],
+  "a885eb91ac": [
+    {
+      "type": 0,
+      "value": "Leader fairy selection"
+    }
+  ],
   "a9ded1e5ce": [
     {
       "type": 0,
@@ -697,28 +1135,52 @@
       "value": "Guest user"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Email address"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "File URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Sign in"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Owner"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
       "value": "Copy link"
     }
   ],
+  "b8996797b9": [
+    {
+      "type": 0,
+      "value": "Hide tasks on canvas"
+    }
+  ],
   "ba0318cb81": [
     {
       "type": 0,
       "value": "Sign in to share"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Unpin"
+      "value": "Accept and join group"
     }
   ],
   "bbbcefd7ce": [
@@ -773,16 +1235,36 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Upload .tldr files"
+      "value": "Learn more about sharing."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Learn more about sharing."
+      "value": "Allow "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " to help us improve tldraw."
+    }
+  ],
+  "c2ad21c079": [
+    {
+      "type": 0,
+      "value": "Hair"
     }
   ],
   "c303bd1095": [
@@ -797,6 +1279,12 @@
       "value": "Essential cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Group name"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -809,12 +1297,36 @@
       "value": "Invite"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Show less"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Sign out"
     }
   ],
+  "c9b04e7b53": [
+    {
+      "type": 0,
+      "value": "Deselect leader"
+    }
+  ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Save"
+    }
+  ],
+  "cb93643511": [
+    {
+      "type": 0,
+      "value": "Summon fairy"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,58 +1351,184 @@
       "value": "Close"
     }
   ],
+  "d46632fe1f": [
+    {
+      "type": 0,
+      "value": "Too many requests. Please slow down."
+    }
+  ],
   "d4bbf74f3e": [
     {
       "type": 0,
       "value": "Toggle sidebar"
     }
   ],
+  "d5f491d157": [
+    {
+      "type": 0,
+      "value": "Follow fairy"
+    }
+  ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Before you start, please accept our "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "terms of use"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " and "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "privacy policy"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
       "value": "Theme"
     }
   ],
+  "d739f35e18": [
+    {
+      "type": 0,
+      "value": "Whisper to "
+    },
+    {
+      "type": 1,
+      "value": "name"
+    },
+    {
+      "type": 0,
+      "value": "…"
+    }
+  ],
+  "d7bc9d5a2e": [
+    {
+      "type": 0,
+      "value": "Delete task"
+    }
+  ],
+  "d856d53da4": [
+    {
+      "type": 0,
+      "value": "No leader selected"
+    }
+  ],
   "d876a9fe1a": [
     {
       "type": 0,
       "value": "Try Again"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Accept and continue"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Go here to see the content"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "You have reached the maximum number of groups. You need to delete old groups before creating new ones."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Invite only"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Invalid tldraw file URL"
+    }
+  ],
+  "de290d52ef": [
+    {
+      "type": 0,
+      "value": "Select a fairy on the right to chat with"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "App debug flags"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Invite members"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copy invite link"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Legal summary"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Terms of service"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "or"
+    }
+  ],
+  "ea0626ac5a": [
+    {
+      "type": 0,
+      "value": "Danger zone"
+    }
+  ],
+  "ea181d98ca": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Select fairy"
     }
   ],
   "ea4788705e": [
@@ -949,12 +1587,30 @@
       "value": " to learn more."
     }
   ],
+  "eecad1e370": [
+    {
+      "type": 0,
+      "value": "Delete fairy"
+    }
+  ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Members"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
       "value": "selected"
     }
   ],
+  "efb2d9d471": [
+    {
+      "type": 0,
+      "value": "Todo list"
+    }
+  ],
   "f09b16bc5f": [
     {
       "type": 0,
@@ -979,16 +1635,40 @@
       "value": "Delete"
     }
   ],
-  "f43fb62093": [
+  "f4f70727dc": [
     {
       "type": 0,
-      "value": "Back to tldraw."
+      "value": "Settings"
     }
   ],
-  "f4f70727dc": [
+  "f6ae34b4ba": [
     {
       "type": 0,
-      "value": "Settings"
+      "value": "Reset all wands"
+    }
+  ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Are you sure you want to leave this group?"
+    }
+  ],
+  "f7d5ee6855": [
+    {
+      "type": 0,
+      "value": "Select a leader first…"
+    }
+  ],
+  "f87386b4ba": [
+    {
+      "type": 0,
+      "value": "Summon all fairies"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Privacy Policy"
     }
   ],
   "fb15c53f22": [
@@ -997,6 +1677,18 @@
       "value": "Viewer"
     }
   ],
+  "fcd66d76d6": [
+    {
+      "type": 0,
+      "value": "Delete all fairies"
+    }
+  ],
+  "fd11eafb92": [
+    {
+      "type": 0,
+      "value": "Disband projects"
+    }
+  ],
   "fd1be3efcf": [
     {
       "type": 0,
@@ -1009,6 +1701,18 @@
       "value": "Copied link"
     }
   ],
+  "ff7276d298": [
+    {
+      "type": 0,
+      "value": "Reset chat"
+    }
+  ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Add file link…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/es.json b/apps/dotcom/client/public/tla/locales-compiled/es.json
index fdc8a9d68d23..d9f26dc40e4e 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/es.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/es.json
@@ -51,6 +51,12 @@
       "value": "Cuenta"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Crea una cuenta gratuita para guardar tu trabajo, colaborar en tiempo real y mucho más."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menú de archivo"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw es una pizarra virtual gratuita e instantánea."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publicar"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Grupo de salida"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Desanclar archivo"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportar como"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mostrar más"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Eliminar grupo"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Esta sala está llegando a su límite de tamaño. Considere eliminar contenido o crear un nuevo archivo."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Crear grupo"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Error al cargar"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Mis archivos"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: falta resaltado"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Agregar enlace"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continúa con el correo electrónico"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Archivo de pines"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Pegue la URL del archivo tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "¿Seguro que quiere olvidar este archivo?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nombre"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Volver a cargar"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Eliminar grupo…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "¿Seguro que quieres eliminar este grupo? Esta acción no se puede deshacer."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Política de privacidad"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Arrastra los archivos aquí, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "crea un archivo"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " o "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copia el enlace de invitación"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " para empezar."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Se detectó un navegador antiguo. Actualice su navegador para usar esta aplicación."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revoca este enlace y crea uno nuevo."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Más antiguo"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "tú"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Hay una nueva versión de tldraw disponible. Vuelva a cargar la página para continuar."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Has sido invitado al grupo "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Introduce tu dirección de correo electrónico"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Siga estos pasos para importar el contenido de forma manual:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Configuración de grupo"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Olvidar"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Salir del grupo…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Cambiar el nombre del archivo"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "No, gracias"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Para continuar editando, copie la sala a sus archivos."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Comprueba tu correo electrónico para encontrar un código de verificación."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copiar en mis archivos"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Enlace de invitación copiado"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Inicia sesión con Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Construir con el SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Este mes"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Condiciones de uso"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Agregar enlace de archivo"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Claro"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "¿No recibiste un código? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Reenviar"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Fondo"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Inicia sesión para aceptar la invitación"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Usuario invitado"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Dirección de correo electrónico"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL del archivo"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Iniciar sesión"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Dueño"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Inicia sesión para compartir"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Desanclar"
+      "value": "Aceptar y unirse al grupo"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Cargar archivos .tldr"
+      "value": "Más información sobre el uso compartido."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Más información sobre el uso compartido."
+      "value": "Permitir "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " para ayudarnos a mejorar tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Cookies esenciales"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nombre del grupo"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Invitar"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Mostrar menos"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Cerrar sesión"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Ahorrar"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Alternar barra lateral"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Antes de comenzar, acepte nuestros "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "términos de uso"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " y nuestra "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "política de privacidad"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Inténtelo de nuevo"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Aceptar y continuar"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Vaya aquí para ver el contenido"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Has alcanzado el número máximo de grupos. Debes eliminar los grupos antiguos antes de crear otros nuevos."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Solo invitar"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL de archivo tldraw no válida"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Indicadores de depuración de la aplicación"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Invitar a los miembros"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copiar enlace de invitación"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Resumen legal"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administración"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Condiciones de servicio"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "o"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Anclar"
+      "value": "Zona de peligro"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " para obtener más información."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Miembros"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Ajustes"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "¿Estás seguro de que quieres abandonar este grupo?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "política de privacidad"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Enlace copiado"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Agregar enlace de archivo…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/fa.json b/apps/dotcom/client/public/tla/locales-compiled/fa.json
index 8c0441c722a2..54e4a9427841 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/fa.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/fa.json
@@ -51,6 +51,12 @@
       "value": "حساب کاربری"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "برای ذخیره کار خود، همکاری در لحظه و موارد دیگر، یک حساب کاربری رایگان ایجاد کنید."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "منوی فایل"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw یک تخته سفید مجازی رایگان و فوری است."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "منتشر کنید"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "گروه را ترک کنید"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "فایل را از حالت پین خارج کنید"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "صادرات به عنوان"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "نمایش بیشتر"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "حذف گروه"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "این اتاق به محدودیت اندازه خود نزدیک می‌شود. حذف برخی از محتوا یا شروع یک فایل جدید را در نظر بگیرید."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "ایجاد گروه"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "آپلود انجام نشد"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "فایل‌های من"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Highlight Missing"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "افزودن لینک"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "ویرایشگر"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ادامه با ایمیل"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "ترسیم کنید"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "فایل پین"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "آدرس فایل tldraw را جایگذاری کنید..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "آیا مطمئن هستید که می خواهید این فایل را فراموش کنید؟"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "نام"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "بارگذاری مجدد"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "حذف گروه…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "آیا مطمئن هستید که می‌خواهید این گروه را حذف کنید؟ این اقدام قابل بازگشت نیست."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "سیاست حفظ حریم خصوصی"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "برای شروع، فایل‌ها را به اینجا بکشید، "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "یک فایل ایجاد کنید"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "، یا "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "لینک دعوت را کپی کنید"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "مرورگر قدیمی شناسایی شد. لطفاً برای استفاده از این برنامه، مرورگر خود را به‌روزرسانی کنید."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "این لینک را لغو کنید و یک لینک جدید ایجاد کنید."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "قدیمی تر"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "شما"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "نسخه جدید tldraw موجود است. لطفاً برای ادامه صفحه را دوباره بارگیری کنید."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "شما به گروه "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " دعوت شده‌اید."
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "آدرس ایمیل خود را وارد کنید"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "برای وارد کردن دستی محتوا مراحل زیر را دنبال کنید:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "تنظیمات گروه"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "فراموش کن"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "گروه را ترک کنید…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "تغییر نام فایل"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "نه ممنون"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "برای ادامه ویرایش، لطفاً اتاق را به فایل‌های خود کپی کنید."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "برای دریافت کد تایید، ایمیل خود را بررسی کنید."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "در فایل های من کپی کنید"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "لینک دعوت کپی شده"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "با گوگل وارد شوید"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "با tldraw SDK بسازید"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "این ماه"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "شرایط استفاده"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "اضافه کردن لینک فایل"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "نور"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "کدی دریافت نکردید؟ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ارسال مجدد"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "پس زمینه"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "برای پذیرش دعوتنامه وارد شوید"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "کاربر مهمان"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "آدرس ایمیل"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "آدرس فایل"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "وارد شوید"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "مالک"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "برای اشتراک‌گذاری وارد شوید"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "پین را بردارید"
+      "value": "پذیرش و عضویت در گروه"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "فایل های tldr. را آپلود کنید"
+      "value": "درباره اشتراک گذاری بیشتر بدانید."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "درباره اشتراک گذاری بیشتر بدانید."
+      "value": "به "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " اجازه دهید تا به ما در بهبود tldraw کمک کند."
     }
   ],
   "c303bd1095": [
@@ -787,6 +1063,12 @@
       "value": "کوکی‌های ضروری"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "نام گروه"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1081,24 @@
       "value": "دعوت کنید"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "نمایش کمتر"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "از سیستم خارج شوید"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "ذخیره"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1129,40 @@
       "value": "نوار کناری را تغییر دهید"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "قبل از شروع، لطفاً "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "شرایط استفاده"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " و "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "سیاست حفظ حریم خصوصی"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " ما را بپذیرید."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1175,82 @@
       "value": "دوباره امتحان کنید"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "بپذیرید و ادامه دهید"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "برای دیدن مطالب به اینجا بروید"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "شما به حداکثر تعداد گروه‌ها رسیده‌اید. قبل از ایجاد گروه‌های جدید، باید گروه‌های قدیمی را حذف کنید."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "فقط دعوت کنید"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "آدرس فایل tldraw نامعتبر است"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "پرچم‌های اشکال‌زدایی برنامه"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "دعوت از اعضا"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "کپی کردن لینک دعوت"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "خلاصه حقوقی"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "مدیر"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "شرایط خدمات"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "یا"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "سنجاق"
+      "value": "منطقه خطر"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1309,12 @@
       "value": " ما را مطالعه کنید."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "اعضا"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1357,18 @@
       "value": "تنظیمات"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "مطمئنی که می‌خوای از این گروه بری؟"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "سیاست حفظ حریم خصوصی"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1387,12 @@
       "value": "لینک کپی شده"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "اضافه کردن لینک فایل…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/fi.json b/apps/dotcom/client/public/tla/locales-compiled/fi.json
index ed9b9dfc3414..eb377eb2b4e1 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/fi.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/fi.json
@@ -51,6 +51,12 @@
       "value": "Tili"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Luo ilmainen tili tallentaaksesi työsi, tehdäksesi yhteistyötä reaaliajassa ja paljon muuta."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Tiedosto-valikko"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw on ilmainen ja pikaisesti käytettävä virtuaalinen valkotaulu."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Julkaista"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Poistu ryhmästä"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Irrota tiedosto"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Vie nimellä"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Näytä lisää"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Poista ryhmä"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Tämä huone lähestyy kokorajoitustaan. Harkitse sisällön poistamista tai uuden tiedoston aloittamista."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Luo ryhmä"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Lataus epäonnistui"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Omat tiedostoni"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Korosta puuttuu"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Lisää linkki"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Toimittaja"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Jatka sähköpostitse"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Kiinnitä tiedosto"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Liitä tldraw-tiedoston URL-osoite..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Haluatko varmasti unohtaa tämän tiedoston?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nimi"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Lataa uudelleen"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Poista ryhmä…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Haluatko varmasti poistaa tämän ryhmän? Tätä toimintoa ei voi perua."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Tietosuojakäytäntö"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Vedä tiedostot tähän, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "luo tiedosto"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " tai "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopioi kutsulinkki"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " aloittaaksesi."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Vanha selain havaittu. Päivitä selaimesi käyttääksesi tätä sovellusta."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Peruuta tämä linkki ja luo uusi."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Vanhempi"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "sinä"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Uusi versio tldraw:sta on saatavilla. Jatka lataamalla sivu uudelleen."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Sinut on kutsuttu ryhmään "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Anna sähköpostiosoitteesi"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Tuo sisältö manuaalisesti seuraavasti:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Ryhmän asetukset"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Unohtaa"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Poistu ryhmästä…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Nimeä tiedosto uudelleen"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Ei kiitos"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Jatkaaksesi muokkaamista, kopioi huone tiedostoihisi."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Tarkista sähköpostistasi vahvistuskoodi."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopioi tiedostoihini"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kutsulinkki kopioitu"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Kirjaudu sisään Googlella"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Rakenna tldraw SDK:lla"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Tämä kuukausi"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Käyttöehdot"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Lisää tiedostolinkki"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Kevyt"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Etkö saanut koodia? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Lähetä uudelleen"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Tausta"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Kirjaudu sisään hyväksyäksesi kutsun"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Vieraskäyttäjä"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Sähköpostiosoite"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Tiedoston URL-osoite"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Kirjaudu sisään"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Omistaja"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Kirjaudu sisään jakaaksesi"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Irrota kiinnitys"
+      "value": "Hyväksy ja liity ryhmään"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Lataa .tldr-tiedostoja"
+      "value": "Lisätietoja jakamisesta."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Lisätietoja jakamisesta."
+      "value": "Salli "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": "-palvelun auttaa meitä parantamaan tldrawia."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Välttämättömät evästeet"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Ryhmän nimi"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Kutsu"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Näytä vähemmän"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Kirjaudu ulos"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Tallentaa"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Vaihda sivupalkki"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Ennen kuin aloitat, hyväksy "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "käyttöehtomme"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " ja "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "tietosuojakäytäntömme"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Yritä uudelleen"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Hyväksy ja jatka"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Siirry tänne nähdäksesi sisällön"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Olet saavuttanut ryhmien enimmäismäärän. Sinun on poistettava vanhoja ryhmiä ennen uusien luomista."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Vain kutsu"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Virheellinen tldraw-tiedoston URL-osoite"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Sovelluksen virheenkorjausliput"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Kutsu jäseniä"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopioi kutsulinkki"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Oikeudellinen yhteenveto"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Ylläpitäjä"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Palveluehdot"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "tai"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Vaara-alue"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": "."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Jäsenet"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Asetukset"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Haluatko varmasti poistua tästä ryhmästä?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Tietosuojakäytäntö"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Linkki kopioitu"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Lisää tiedostolinkki…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/fr.json b/apps/dotcom/client/public/tla/locales-compiled/fr.json
index 330ef91b1cc0..39b6f606bfe1 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/fr.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/fr.json
@@ -51,6 +51,12 @@
       "value": "Compte"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Créez un compte gratuit pour sauvegarder votre travail, collaborer en temps réel et bien plus encore."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu du fichier"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw est un tableau blanc virtuel gratuit et instantané."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publier"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Quitter le groupe"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Détacher le fichier"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exporter en tant que"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Afficher plus"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Supprimer le groupe"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Cette salle approche de sa taille maximale. Envisagez de supprimer du contenu ou de créer un nouveau fichier."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Créer un groupe"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Échec de l'importation"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Mes fichiers"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n : surlignement manquant"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Ajouter un lien"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Éditeur"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Poursuivre par courriel"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fichier d'épingles"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Collez l'URL du fichier tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Voulez-vous vraiment oublier ce fichier ?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nom"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Recharger"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Supprimer le groupe…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Êtes-vous sûr de vouloir supprimer ce groupe ? Cette action est irréversible."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Politique de confidentialité"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Glissez-déposez les fichiers ici, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "créer un fichier"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ou "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copier le lien d'invitation"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " pour commencer."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Ancien navigateur détecté. Veuillez mettre à jour votre navigateur pour utiliser cette application."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Révoquez ce lien et créez-en un nouveau."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Plus ancien"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "toi"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Une nouvelle version de tldraw est disponible. Veuillez recharger la page pour continuer."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Vous avez été invité à rejoindre le groupe "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Saisissez votre adresse e-mail"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Suivez ces étapes pour importer le contenu manuellement :"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Paramètres de groupe"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Oublier"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Quitter le groupe…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Renommer le fichier"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Non merci"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Pour continuer l'édition, veuillez copier la pièce dans vos fichiers."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Consultez votre boîte mail pour obtenir un code de vérification."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copier dans mes fichiers"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Lien d'invitation copié"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Se connecter avec Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Construire avec le SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Ce mois-ci"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Conditions d'utilisation"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Ajouter un lien vers le fichier"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Clair"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Vous n'avez pas reçu de code ? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Renvoyer"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Arrière-plan"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Connectez-vous pour accepter l'invitation"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Utilisateur invité"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Adresse email"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL du fichier"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Se connecter"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Propriétaire"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Connectez-vous pour partager"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Désépingler"
+      "value": "Accepter et rejoindre le groupe"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Importer des fichiers .tldr"
+      "value": "En savoir plus sur le partage."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "En savoir plus sur le partage."
+      "value": "Autorisez les "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " pour nous aider à améliorer tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Cookies essentiels"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nom du groupe"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Inviter"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Afficher moins"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Se déconnecter"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Sauvegarder"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Activer/désactiver la barre latérale"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Avant de commencer, veuillez accepter nos "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "conditions d'utilisation"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " et notre "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "politique de confidentialité"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Réessayer"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Accepter et continuer"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Le contenu se trouve ici"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Vous avez atteint le nombre maximal de groupes. Vous devez supprimer les anciens groupes avant d'en créer de nouveaux."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Invitation uniquement"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL de fichier tldraw invalide"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Indicateurs de débogage de l'application"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Inviter des membres"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copier le lien d'invitation"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Résumé juridique"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrateur"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Conditions d'utilisation"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
     {
       "type": 0,
-      "value": "Épingler"
+      "value": "ou"
+    }
+  ],
+  "ea0626ac5a": [
+    {
+      "type": 0,
+      "value": "Zone dangereuse"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " pour en savoir plus."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membres"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Paramètres"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Êtes-vous sûr(e) de vouloir quitter ce groupe ?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "politique de confidentialité"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Lien copié"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Ajouter un lien vers le fichier…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/gl.json b/apps/dotcom/client/public/tla/locales-compiled/gl.json
index 7ef6419ab7fe..8b4f20598fa1 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/gl.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/gl.json
@@ -51,6 +51,12 @@
       "value": "Conta"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Crea unha conta gratuíta para gardar o teu traballo, colaborar en tempo real e moito máis."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menú Ficheiro"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw é unha pizarra virtual gratuíta e instantánea."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publicar"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Abandonar o grupo"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Desfixar ficheiro"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportar como"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mostrar máis"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Eliminar grupo"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Esta sala está a chegar ao seu límite de tamaño. Considera eliminar parte do contido ou comezar un novo ficheiro."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Crear grupo"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Produciuse un erro na carga"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Os meus ficheiros"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Falta resaltar"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Engadir ligazón"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continuar co correo electrónico"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Ficheiro fixado"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Pegar o URL do ficheiro tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Estás seguro de que queres esquecer este ficheiro?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nome"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Recarga"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Eliminar grupo…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Seguro que queres eliminar este grupo? Esta acción non se pode desfacer."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Política de privacidade"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Arrastra ficheiros aquí, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "crea un ficheiro"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ou "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copia a ligazón de invitación"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " para comezar."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Detectouse un navegador antigo. Actualízao para usar esta aplicación."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revoga esta ligazón e crea unha nova."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Máis vello"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ti"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Hai unha nova versión de tldraw dispoñible. Volve cargar a páxina para continuar."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Convidáronte ao grupo "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Introduce o teu enderezo de correo electrónico"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Siga estes pasos para importar o contido manualmente:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Configuración do grupo"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Esquece"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Abandonar o grupo…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Cambiar o nome do ficheiro"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Non, grazas."
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Para continuar coa edición, copia a sala nos teus ficheiros."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Consulta o teu correo electrónico para obter un código de verificación."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copiar nos meus ficheiros"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Ligazón de invitación copiada"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Iniciar sesión con Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Compilar co SDK de tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Este mes"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Condicións de uso"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Engadir ligazón ao ficheiro"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Luz"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Non recibiches o código? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Volver enviar"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Fondo"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Inicia sesión para aceptar a invitación"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Usuario convidado"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Enderezo de correo electrónico"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL do ficheiro"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Inicia sesión"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Propietario"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Inicia sesión para compartir"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Desfixo"
+      "value": "Aceptar e unirse ao grupo"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Carga ficheiros .tldr"
+      "value": "Obtén máis información sobre como compartir."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Obtén máis información sobre como compartir."
+      "value": "Permite que as "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " nos axuden a mellorar tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Galletas esenciais"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nome do grupo"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Invitar"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Mostrar menos"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Pechar sesión"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Gardar"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Alterna a barra lateral"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Antes de comezar, acepta as nosas "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "condicións de uso"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " e a nosa "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "política de privacidade"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Téntao de novo"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Aceptar e continuar"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Entra aquí para ver o contido"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Alcanzaches o número máximo de grupos. Debes eliminar os grupos antigos antes de crear outros novos."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Só invitar"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL de ficheiro tldraw non válida"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Marcadores de depuración de aplicacións"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Convidar membros"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copiar ligazón de invitación"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Resumo legal"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrador"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Condicións do servizo"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ou"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Zona de perigo"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " para obter máis información."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membros"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Configuración"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Seguro que queres saír deste grupo?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Política de privacidade"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Ligazón copiada"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Engadir ligazón ao ficheiro…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/gu-in.json b/apps/dotcom/client/public/tla/locales-compiled/gu-in.json
index bd43bde8dbc1..a87431772dba 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/gu-in.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/gu-in.json
@@ -51,6 +51,12 @@
       "value": "ખાતું"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "તમારા કાર્યને સાચવવા, રીઅલ-ટાઇમમાં સહયોગ કરવા અને વધુ કરવા માટે એક મફત એકાઉન્ટ બનાવો."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ફાઇલ મેનુ"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw એ એક મફત અને ત્વરિત વર્ચ્યુઅલ વ્હાઇટબોર્ડ છે."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "પ્રકાશિત કરો"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "જૂથ છોડો"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ફાઇલ અનપિન કરો"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "તરીકે નિકાસ કરો"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "વધુ બતાવો"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "જૂથ કાઢી નાખો"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "આ રૂમ તેની કદ મર્યાદાની નજીક પહોંચી રહ્યો છે. કેટલીક સામગ્રી દૂર કરવાનું અથવા નવી ફાઇલ શરૂ કરવાનું વિચારો."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "જૂથ બનાવો"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "અપલોડ નિષ્ફળ થયું"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "મારી ફાઇલો"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: હાઇલાઇટ ખૂટે છે"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "લિંક ઉમેરો"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "સંપાદક"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ઇમેઇલ સાથે ચાલુ રાખો"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ફાઇલ પિન કરો"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ફાઇલ URL પેસ્ટ કરો..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "શું તમે ખરેખર આ ફાઇલને ભૂલી જવા માંગો છો?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "નામ"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "ફરીથી લોડ કરો"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "જૂથ કાઢી નાખો..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "શું તમે ખરેખર આ જૂથ કાઢી નાખવા માંગો છો? આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "ગોપનીયતા નીતિ"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "શરૂ કરવા માટે ફાઇલોને અહીં ખેંચો, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ફાઇલ બનાવો"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " અથવા "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "આમંત્રણ લિંક કૉપિ કરો"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "જૂનું બ્રાઉઝર મળ્યું. આ એપ્લિકેશનનો ઉપયોગ કરવા માટે કૃપા કરીને તમારા બ્રાઉઝરને અપડેટ કરો."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "આ લિંક રદ કરો અને એક નવી બનાવો."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "જૂની"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "તમે"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw નું નવું વર્ઝન ઉપલબ્ધ છે. ચાલુ રાખવા માટે કૃપા કરીને પેજ ફરીથી લોડ કરો."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "તમને ગ્રુપમાં આમંત્રિત કરવામાં આવ્યા છે "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "તમારું ઇમેઇલ સરનામું દાખલ કરો"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "સામગ્રીને મેન્યુઅલી આયાત કરવા માટે આ પગલાં અનુસરો:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "ગ્રુપ સેટિંગ્સ"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "ભૂલી જાવ"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "જૂથ છોડો…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "ફાઇલનું નામ બદલો"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "ના આભાર"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "સંપાદન ચાલુ રાખવા માટે કૃપા કરીને રૂમને તમારી ફાઇલોમાં કૉપિ કરો."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "ચકાસણી કોડ માટે તમારો ઇમેઇલ તપાસો."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "મારી ફાઇલોમાં કૉપિ કરો"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "આમંત્રણ લિંક કૉપિ કરી"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "ગુગલ સાથે સાઇન ઇન કરો"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK વડે બનાવો"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "આ મહિને"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ઉપયોગની શરતો"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ફાઇલ લિંક ઉમેરો"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "પ્રકાશ"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "કોડ મળ્યો નથી? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ફરીથી મોકલો"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "પૃષ્ઠભૂમિ"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "આમંત્રણ સ્વીકારવા માટે સાઇન ઇન કરો"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "મહેમાન વપરાશકર્તા"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ઇમેઇલ સરનામું"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ફાઇલ URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "સાઇન ઇન કરો"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "માલિક"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "શેર કરવા માટે સાઇન ઇન કરો"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "અનપિન કરો"
+      "value": "સ્વીકારો અને જૂથમાં જોડાઓ"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": " દ્વારા શેર કરેલ"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr ફાઇલો અપલોડ કરો"
+      "value": "શેર કરવા વિશે વધુ જાણો."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "શેર કરવા વિશે વધુ જાણો."
+      "value": "tldraw ને સુધારવામાં અમારી સહાય કરવા માટે "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ને મંજૂરી આપો."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "આવશ્યક કૂકીઝ"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "જૂથનું નામ"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "આમંત્રણ આપો"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "ઓછું બતાવો"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "સાઇન આઉટ કરો"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "સાચવો"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "સાઇડબારને ટૉગલ કરો"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "શરૂ કરતા પહેલા, કૃપા કરીને અમારી "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ઉપયોગની શરતો"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " અને "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ગોપનીયતા નીતિ"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " સ્વીકારો."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "ફરી પ્રયાસ કરો"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "સ્વીકારો અને ચાલુ રાખો"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "સામગ્રી જોવા માટે અહીં જાઓ"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "તમે જૂથોની મહત્તમ સંખ્યા પર પહોંચી ગયા છો. નવા જૂથો બનાવતા પહેલા તમારે જૂના જૂથો કાઢી નાખવાની જરૂર છે."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "ફક્ત આમંત્રણ આપો"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "અમાન્ય tldraw ફાઇલ URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "એપ્લિકેશન ડીબગ ફ્લેગ્સ"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "સભ્યોને આમંત્રિત કરો"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "આમંત્રણ લિંક કૉપિ કરો"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "કાનૂની સારાંશ"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "એડમિન"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "સેવાની શરતો"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "અથવા"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "પિન"
+      "value": "જોખમ ક્ષેત્ર"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " વાંચો."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "સભ્યો"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "સેટિંગ્સ"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "શું તમે ખરેખર આ જૂથ છોડવા માંગો છો?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "ગોપનીયતા નીતિ"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "લિંક કોપી કરી"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ફાઇલ લિંક ઉમેરો…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/he.json b/apps/dotcom/client/public/tla/locales-compiled/he.json
index a473dd5cf0dc..c7ea239505a9 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/he.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/he.json
@@ -51,6 +51,12 @@
       "value": "חֶשְׁבּוֹן"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "צור חשבון חינמי כדי לשמור את עבודתך, לשתף פעולה בזמן אמת ועוד."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "תפריט קבצים"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw הוא לוח לבן וירטואלי חינמי ומיידי."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "פרסום"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "עזוב את הקבוצה"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ביטול הצמדת קובץ"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "ייצא בשם"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "הצג עוד"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "מחיקת קבוצה"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "החדר הזה מתקרב למגבלת הגודל שלו. שקול להסיר חלק מהתוכן או להתחיל קובץ חדש."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "צור קבוצה"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "ההעלאה נכשלה"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "הקבצים שלי"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: הדגש חסר"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "הוסף קישור"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "עוֹרֵך"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "המשך עם הדוא\"ל"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "קובץ הצמדה"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "הדבק את כתובת ה-URL של קובץ tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "רוצה בוודאות לשכוח את הקובץ הזה?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "שֵׁם"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "לטעון מחדש"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "מחיקת קבוצה…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "האם אתה בטוח שברצונך למחוק קבוצה זו? פעולה זו אינה ניתנת לביטול."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "מדיניות הפרטיות"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "גררו קבצים לכאן, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "צרו קובץ"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", או "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "העתיקו את קישור ההזמנה"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " כדי להתחיל."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "זוהה דפדפן ישן. אנא עדכן את הדפדפן שלך כדי להשתמש באפליקציה זו."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "בטל קישור זה וצור קישור חדש."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "ישן יותר"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "אַתָה"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "גרסה חדשה של tldraw זמינה. אנא טען מחדש את הדף כדי להמשיך."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "הוזמנת לקבוצה "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "הזן את כתובת הדוא\"ל שלך"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "כדי לייבא את התוכן באופן ידני יש לבצע את השלבים הבאים:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "הגדרות קבוצה"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "לשכוח"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "עזוב את הקבוצה…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "שנה את שם הקובץ"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "לא תודה"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "כדי להמשיך בעריכה, אנא העתיקו את החדר לקבצים שלכם."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "בדוק את האימייל שלך עבור קוד אימות."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "העתקה לקבצים שלי"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "קישור ההזמנה הועתק"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "התחברות עם גוגל"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "בנה עם ערכת פיתוח התוכנה tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "החודש הזה"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "תנאי שימוש"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "הוסף קישור לקובץ"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "תאורה"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "לא קיבלת קוד? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "שלח שוב"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "רקע"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "היכנס כדי לקבל את ההזמנה"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "משתמש אורח"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "כתובת דוא\"ל"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "כתובת אתר של הקובץ"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "כניסה"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "בַּעַל"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "היכנס כדי לשתף"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "ביטול נעיצה"
+      "value": "אישור והצטרפות לקבוצה"
     }
   ],
   "bbbcefd7ce": [
@@ -775,16 +1033,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "העלאת קבצי .tldr"
+      "value": "למידע נוסף על שיתוף."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "למידע נוסף על שיתוף."
+      "value": "אפשרו ל-"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " לעזור לנו לשפר את tldraw."
     }
   ],
   "c303bd1095": [
@@ -799,6 +1071,12 @@
       "value": "עוגיות חיוניות"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "שם הקבוצה"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -811,12 +1089,24 @@
       "value": "הזמנה"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "הצג פחות"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "יציאה"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "לְהַצִיל"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -847,6 +1137,40 @@
       "value": "החלפת סרגל הצד"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "לפני שתתחיל, אנא קבל את "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "תנאי השימוש"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " ואת "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "מדיניות הפרטיות"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " שלנו."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -859,40 +1183,82 @@
       "value": "לנסות שוב"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "קבל והמשך"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "כנסו לכאן כדי לראות את התוכן"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "הגעת למספר הקבוצות המרבי. עליך למחוק קבוצות ישנות לפני יצירת חדשות."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "הזמנה בלבד"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "כתובת URL לא חוקית של קובץ tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "דגלי ניפוי באגים באפליקציה"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "הזמנת חברים"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "העתקת קישור ההזמנה"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "סיכום משפטי"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "מנהל"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "תנאי שירות"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "אוֹ"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "נעיצה"
+      "value": "אזור סכנה"
     }
   ],
   "ea4788705e": [
@@ -951,6 +1317,12 @@
       "value": " שלנו למידע נוסף."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "חברים"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -993,6 +1365,18 @@
       "value": "הגדרות"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "האם אתה בטוח שאתה רוצה לעזוב את הקבוצה הזו?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "מדיניות פרטיות"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1011,6 +1395,12 @@
       "value": "הקישור הועתק"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "הוסף קישור לקובץ…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/hi-in.json b/apps/dotcom/client/public/tla/locales-compiled/hi-in.json
index f4a5f7a98980..4bc315ad9359 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/hi-in.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/hi-in.json
@@ -51,6 +51,12 @@
       "value": "खाता"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "अपना कार्य सहेजने, वास्तविक समय में सहयोग करने, आदि के लिए एक निःशुल्क खाता बनाएं।"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "फ़ाइल मेनू"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw एक निःशुल्क और त्वरित वर्चुअल व्हाइटबोर्ड है।"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "पब्लिश करें"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "समूह छोड़ दें"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "फ़ाइल अनपिन करें"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "के रूप में एक्सपोर्ट करें"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "और दिखाएँ"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "समूह हटाएं"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "यह कमरा अपनी आकार सीमा के करीब पहुँच रहा है। कुछ सामग्री हटाने या नई फ़ाइल शुरू करने पर विचार करें।"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "समूह बनाना"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "अपलोड करना विफल रहा"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "मेरी फ़ाइलें"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: हाइलाइट मिसींग है"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "लिंक जोड़ें"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "एडिटर"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ईमेल के साथ जारी रखें"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "फ़ाइल पिन करें"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw फ़ाइल URL चिपकाएँ..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "क्या आप वाकई इस फाइल को भूलना चाहते है?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "नाम"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "दोबारा लोड करें"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "समूह हटाएँ..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "क्या आप वाकई इस समूह को हटाना चाहते हैं? यह कार्रवाई पूर्ववत नहीं की जा सकती।"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "गोपनीयता नीति"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "आरंभ करने के लिए फ़ाइलों को यहां खींचें, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "फ़ाइल बनाएं"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", या "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "आमंत्रण लिंक कॉपी करें"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "पुराना ब्राउज़र पाया गया। कृपया इस ऐप का उपयोग करने के लिए अपना ब्राउज़र अपडेट करें।"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "इस लिंक को निरस्त करें और नया लिंक बनाएं."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "पुराना"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "आप"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw का नया संस्करण उपलब्ध है। कृपया जारी रखने के लिए पृष्ठ को पुनः लोड करें।"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "आपको समूह "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " में आमंत्रित किया गया है"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "अपना ईमेल पता दर्ज करें"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "कंटेंट को मैन्युअल रूप से इम्पोर्ट करने के लिए इन स्टेप्स को फॉलो करें :"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "समूह सेटिंग्स"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "भूल जाएँ"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "समूह छोड़ दें…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "फ़ाइल का नाम बदलें"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "जी नहीं, धन्यवाद"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "संपादन जारी रखने के लिए कृपया कमरे को अपनी फ़ाइलों में कॉपी करें।"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "सत्यापन कोड के लिए अपना ईमेल जांचें."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "मेरी फाइलों में कॉपी करें"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "आमंत्रण लिंक कॉपी किया गया"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google के साथ साइन इन करें"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK के साथ बनाएँ"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "इस महीने"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "उपयोग की शर्तें"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "फ़ाइल लिंक जोड़ें"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "लाइट"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "कोड प्राप्त नहीं हुआ? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "पुनः भेजें"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "बैकग्राउंड"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "आमंत्रण स्वीकार करने के लिए साइन इन करें"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +935,30 @@
       "value": "अतिथि उपयोगकर्ता"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "मेल पता"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "फ़ाइल URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "साइन इन करें"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "मालिक"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +971,10 @@
       "value": "साझा करने के लिए साइन इन करें"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "अनपिन करें"
+      "value": "स्वीकार करें और समूह में शामिल हों"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1025,26 @@
       "value": " के द्वारा शेयर किया गया"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr फाइलें अपलोड करें"
+      "value": "शेयर करने के बारे में ज्यादा जानें"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "एनालिटिक्स"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
     {
       "type": 0,
-      "value": "शेयर करने के बारे में ज्यादा जानें"
+      "value": " को अनुमति दें ताकि हम tldraw को बेहतर बना सकें."
     }
   ],
   "c303bd1095": [
@@ -787,6 +1059,12 @@
       "value": "आवश्यक कुकीज़"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "समूह नाम"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1077,24 @@
       "value": "इन्वाइट करें"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "कम दिखाएं"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "साइन आउट करें"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "बचाना"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1125,40 @@
       "value": "साइडबार टॉगल करें"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "शुरू करने से पहले, कृपया हमारी "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "उपयोग की शर्तें"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " और "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "गोपनीयता नीति"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " स्वीकार करें।"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1171,82 @@
       "value": "दोबारा कोशिश करें"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "स्वीकार करें और जारी रखें"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "कंटेंट को देखने के लिए यहाँ जाएँ"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "आप समूहों की अधिकतम संख्या तक पहुँच गए हैं। नए समूह बनाने से पहले आपको पुराने समूह हटाने होंगे।"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "सिर्फ इन्वाइट करें"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "अमान्य tldraw फ़ाइल URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ऐप डिबग फ्लैग्स"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "सदस्यों को आमंत्रित करो"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "आमंत्रण लिंक कॉपी करें"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "कानूनी सारांश"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "व्यवस्थापक"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "सेवा की शर्तें"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "या"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "पिन करें"
+      "value": "खतरा क्षेत्र"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1305,12 @@
       "value": " पढ़ें."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "सदस्यों"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1353,18 @@
       "value": "सेटिंग्स"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "क्या आप वाकई इस समूह को छोड़ना चाहते हैं?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "गोपनीयता नीति"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1383,12 @@
       "value": "लिंक को कॉपी किया गया"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "फ़ाइल लिंक जोड़ें..."
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/hr.json b/apps/dotcom/client/public/tla/locales-compiled/hr.json
index 5b9681233b3a..fc85bbb55b0c 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/hr.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/hr.json
@@ -51,6 +51,12 @@
       "value": "Račun"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Izradite besplatan račun za spremanje svog rada, suradnju u stvarnom vremenu i još mnogo toga."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Izbornik datoteka"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw je besplatna i trenutna virtualna bijela ploča."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Objaviti"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Napusti grupu"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Otkvači datoteku"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Izvezi kao"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Prikaži više"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Izbriši grupu"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Ova soba se približava ograničenju veličine. Razmislite o uklanjanju dijela sadržaja ili pokretanju nove datoteke."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Stvori grupu"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Prijenos nije uspio"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Moje datoteke"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Oznaka nedostaje"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Dodaj vezu"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Urednik"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Nastavite s e-poštom"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Prikvači datoteku"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Zalijepi URL tldraw datoteke..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Jeste li sigurni da želite zaboraviti ovu datoteku?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Ime"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Ponovno učitaj"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Izbriši grupu…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Jeste li sigurni da želite izbrisati ovu grupu? Ova se radnja ne može poništiti."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Politika privatnosti"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Povucite datoteke ovdje, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "izradite datoteku"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ili "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopirajte poveznicu za poziv"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " da biste započeli."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Otkriven je stari preglednik. Ažurirajte preglednik da biste mogli koristiti ovu aplikaciju."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Poništi ovu vezu i stvori novu."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Starije"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "vas"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Dostupna je nova verzija tldraw-a. Ponovno učitajte stranicu za nastavak."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Pozvani ste u grupu "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Unesite svoju adresu e-pošte"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Slijedite ove korake za ručni uvoz sadržaja:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Postavke grupe"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Zaboraviti"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Napusti grupu…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Preimenuj datoteku"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Ne hvala"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Za nastavak uređivanja kopirajte sobu u svoje datoteke."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Provjerite svoju e-poštu za kod za potvrdu."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopiraj u moje datoteke"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kopirana je poveznica za poziv"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Prijava putem Googlea"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Izgradite s tldraw SDK-om"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Ovaj mjesec"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Uvjeti korištenja"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Dodaj vezu do datoteke"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Svjetlo"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Niste primili kôd? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Ponovno pošalji"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Pozadina"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Prijavite se da biste prihvatili pozivnicu"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Gostujući korisnik"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-mail adresa"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL datoteke"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Prijavite se"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Vlasnik"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Prijavite se za dijeljenje"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Otkvači"
+      "value": "Prihvati i pridruži se grupi"
     }
   ],
   "bbbcefd7ce": [
@@ -771,16 +1029,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Učitajte .tldr datoteke"
+      "value": "Saznajte više o dijeljenju."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Saznajte više o dijeljenju."
+      "value": "Dopustite "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " kako biste nam pomogli poboljšati tldraw."
     }
   ],
   "c303bd1095": [
@@ -795,6 +1067,12 @@
       "value": "Osnovni kolačići"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Naziv grupe"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -807,12 +1085,24 @@
       "value": "Pozvati"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Prikaži manje"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Odjavi se"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Uštedjeti"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -843,6 +1133,40 @@
       "value": "Uključi/isključi bočnu traku"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Prije nego što započnete, molimo vas da prihvatite naše "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "uvjete korištenja"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " i "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "pravila privatnosti"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -855,40 +1179,82 @@
       "value": "Pokušajte ponovno"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Prihvati i nastavi"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Idite ovdje da vidite sadržaj"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Dosegli ste maksimalan broj grupa. Morate izbrisati stare grupe prije nego što stvorite nove."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Samo na poziv"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Nevažeći URL datoteke tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Oznake za otklanjanje pogrešaka aplikacije"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Pozovi članove"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopiraj poveznicu za pozivnicu"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Pravni sažetak"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrator"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Uvjeti usluge"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ili"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Opasna zona"
     }
   ],
   "ea4788705e": [
@@ -947,6 +1313,12 @@
       "value": " kako biste saznali više."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Članovi"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -989,6 +1361,18 @@
       "value": "Postavke"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Jeste li sigurni da želite napustiti ovu grupu?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Pravila o privatnosti"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1007,6 +1391,12 @@
       "value": "Kopirana veza"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Dodaj poveznicu na datoteku…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/hu.json b/apps/dotcom/client/public/tla/locales-compiled/hu.json
index a14e401d23ff..7f1a41d9b770 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/hu.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/hu.json
@@ -51,6 +51,12 @@
       "value": "Fiók"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Hozz létre egy ingyenes fiókot a munkád mentéséhez, valós idejű együttműködéshez és sok máshoz."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Fájl menü"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "A tldraw egy ingyenes és azonnal használható virtuális tábla."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Közzététel"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Kilépés a csoportból"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Fájl rögzítésének feloldása"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportálás másként"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mutass többet"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Csoport törlése"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Ez a szoba közeledik a méretkorlátjához. Fontolja meg néhány tartalom eltávolítását vagy új fájl létrehozását."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Csoport létrehozása"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "A feltöltés sikertelen"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Saját fájlok"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Hiányzó kiemelés"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Link hozzáadása"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Szerkesztő"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Folytatás e-mailben"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fájl rögzítése"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Tldraw fájl URL-címének beillesztése..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Biztosan elfelejti ezt a fájlt?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Név"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Újratöltés"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Csoport törlése…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Biztosan törölni szeretné ezt a csoportot? Ez a művelet nem vonható vissza."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Adatvédelmi szabályzat"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Húzd ide a fájlokat, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "hozz létre egy fájlt"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", vagy "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "másold ki a meghívó linket"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " a kezdéshez."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Régi böngésző észlelve. Kérjük, frissítse böngészőjét az alkalmazás használatához."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Vonja vissza ezt a linket, és hozzon létre egy újat."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Régebbi"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "te"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "Elérhető a tldraw új verziója. A folytatáshoz töltse be újra az oldalt."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Meghívtak a(z) "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " csoportba"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Add meg az e-mail címed"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "Kövesse az alábbi lépéseket a tartalom kézi importálásához:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Csoportbeállítások"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "Felejtsd el"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Kilépés a csoportból…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "Fájl átnevezése"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nem, köszönöm"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "A szerkesztés folytatásához másold át a szobát a fájljaid közé."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Ellenőrizd az e-mailjeidet, hogy érkezett-e egy ellenőrző kód."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "Másolás a fájljaim közé"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Meghívólink másolva"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Bejelentkezés Google-fiókkal"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Fordítás a tldraw SDK-val"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Ebben a hónapban"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Felhasználási feltételek"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Fájllink hozzáadása"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Fény"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Nem kaptad meg a kódot? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Újraküldés"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "Háttér"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Jelentkezzen be a meghívás elfogadásához"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "Vendégfelhasználó"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-mail cím"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Fájl URL-címe"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Jelentkezzen be"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Tulajdonos"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "Jelentkezzen be a megosztáshoz"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Kibont"
+      "value": "Elfogadás és csatlakozás a csoporthoz"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1021,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Töltsön fel .tldr fájlokat"
+      "value": "További információ a megosztásról."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "További információ a megosztásról."
+      "value": "Engedélyezd az "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " használatát a tldraw fejlesztéséhez."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1059,12 @@
       "value": "Alapvető sütik"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Csoport neve"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1077,24 @@
       "value": "Meghív"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Kevesebb megjelenítése"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Jelentkezzen ki"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Megtakarítás"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1125,40 @@
       "value": "Oldalsáv váltása"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Mielőtt elkezdené, kérjük, fogadja el a "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "felhasználási feltételeinket"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " és az "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "adatvédelmi irányelveinket"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1171,82 @@
       "value": "Próbáld újra"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Elfogadom és folytatom"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Menjen ide a tartalom megtekintéséhez"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Elérte a csoportok maximális számát. Új csoportok létrehozása előtt törölnie kell a régieket."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Csak meghívással"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Érvénytelen tldraw fájl URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Alkalmazás-hibakeresési jelzők"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Tagok meghívása"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Meghívólink másolása"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Jogi összefoglaló"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Adminisztrátor"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Szolgáltatási feltételek"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "vagy"
+    }
+  ],
+  "ea0626ac5a": [
+    {
+      "type": 0,
+      "value": "Veszélyes zóna"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1305,12 @@
       "value": "."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Tagok"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1353,18 @@
       "value": "Beállítások"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Biztosan kilépsz ebből a csoportból?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Adatvédelmi irányelvek"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1383,12 @@
       "value": "Link másolva"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Fájllink hozzáadása…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/id.json b/apps/dotcom/client/public/tla/locales-compiled/id.json
index 1aac82a3e075..6b7867dadf1b 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/id.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/id.json
@@ -51,6 +51,12 @@
       "value": "Akun"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Buat akun gratis untuk menyimpan pekerjaan Anda, berkolaborasi secara real-time, dan banyak lagi."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu file"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw adalah papan tulis virtual yang gratis dan instan."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Terbitkan"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Keluar dari grup"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Lepaskan sematan file"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Ekspor sebagai"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Tampilkan lebih banyak"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Hapus grup"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Ruangan ini hampir mencapai batas ukurannya. Pertimbangkan untuk menghapus beberapa konten atau memulai berkas baru."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Buat grup"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Pengunggahan gagal"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "File saya"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Sorotan Tidak Ada"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Tambahkan tautan"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Lanjutkan dengan email"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Berkas pin"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Tempel URL berkas tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Yakin ingin mengabaikan file ini?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nama"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Muat ulang"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Hapus grup…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Yakin ingin menghapus grup ini? Tindakan ini tidak dapat dibatalkan."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Kebijakan privasi"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Seret file ke sini, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "buat file"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ",create atau "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "salin tautan undangan"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " untuk memulai."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Browser lama terdeteksi. Harap perbarui browser Anda untuk menggunakan aplikasi ini."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Cabut tautan ini dan buat yang baru."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Lebih lama"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Anda"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Versi baru tldraw telah tersedia. Silakan muat ulang halaman untuk melanjutkan."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Anda telah diundang ke grup "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Masukkan alamat email Anda"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Ikuti langkah berikut untuk mengimpor konten secara manual:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Pengaturan grup"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Abaikan"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Keluar dari grup…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Ganti nama berkas"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Tidak, terima kasih"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Untuk meneruskan pengeditan, salin ruangan ke berkas Anda."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Periksa email Anda untuk mendapatkan kode verifikasi."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Salin ke file saya"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Salin tautan undangan"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Masuk dengan Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Membangun dengan tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Bulan ini"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Ketentuan Penggunaan"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Tambahkan tautan berkas"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Cahaya"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Tidak menerima kode? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Kirim ulang"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Latar belakang"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Masuk untuk menerima undangan"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Pengguna tamu"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Alamat email"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL berkas"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Masuk"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Pemilik"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Masuk untuk berbagi"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Lepaskan"
+      "value": "Terima dan bergabung dengan grup"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Unggah file .tldr"
+      "value": "Pelajari lebih lanjut tentang berbagi."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Pelajari lebih lanjut tentang berbagi."
+      "value": "Izinkan "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " membantu kami meningkatkan tldraw."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "Cookie penting"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nama grup"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "Undang"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Tampilkan lebih sedikit"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Keluar"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Menyimpan"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "Alihkan bilah samping"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Sebelum memulai, harap terima "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "persyaratan penggunaan"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " dan "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kebijakan privasi"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " kami."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "Coba Lagi"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Terima dan lanjutkan"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Klik di sini untuk melihat konten"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Anda telah mencapai jumlah grup maksimum. Anda perlu menghapus grup lama sebelum membuat grup baru."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Hanya mengundang"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL file tldraw tidak valid"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Bendera debug aplikasi"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Undang anggota"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Salin tautan undangan"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Ringkasan hukum"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Ketentuan Layanan"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "atau"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Sematkan"
+      "value": "Zona bahaya"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " kami untuk mempelajari lebih lanjut."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Anggota"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "Pengaturan"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Apakah Anda yakin ingin meninggalkan grup ini?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Kebijakan Privasi"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "Tautan disalin"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Tambahkan tautan berkas…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/it.json b/apps/dotcom/client/public/tla/locales-compiled/it.json
index b25f008dbebf..224d52b6be7e 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/it.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/it.json
@@ -51,6 +51,12 @@
       "value": "Account"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Crea un account gratuito per salvare il tuo lavoro, collaborare in tempo reale e altro ancora."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu file"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw è una lavagna virtuale gratuita e istantanea."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Pubblica"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Lascia il gruppo"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Sblocca il file"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Esporta come"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mostra altro"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Elimina gruppo"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Questa stanza sta per raggiungere il limite di dimensioni. Valuta la possibilità di rimuovere alcuni contenuti o di creare un nuovo file."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Crea gruppo"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Caricamento non riuscito"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "I miei file"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: evidenziazione mancante"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Aggiungi collegamento"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continua con l'email"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "File Pin"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Incolla l'URL del file tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Confermi di voler dimenticare questo file?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nome"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Ricarica"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Elimina gruppo…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Vuoi davvero eliminare questo gruppo? Questa azione non può essere annullata."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Politica sulla riservatezza"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Trascina i file qui, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "crea un file"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " o "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copia il link di invito"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " per iniziare."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Rilevato browser obsoleto. Aggiorna il browser per utilizzare questa app."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revoca questo collegamento e creane uno nuovo."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Meno recenti"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Voi"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "È disponibile una nuova versione di tldraw. Ricarica la pagina per continuare."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Sei stato invitato al gruppo "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Inserisci il tuo indirizzo email"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Per importare il contenuto manualmente, segui questi passaggi:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Impostazioni di gruppo"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Dimentica"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Lascia il gruppo…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Rinomina file"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "No grazie"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Per continuare la modifica, copia la stanza nei tuoi file."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Controlla la tua email per un codice di verifica."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copia nei miei file"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Link di invito copiato"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Accedi con Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Costruisci con l'SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Questo mese"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Termini di utilizzo"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Aggiungi collegamento al file"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Chiaro"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Non hai ricevuto il codice? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Invia di nuovo"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Sfondo"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Accedi per accettare l'invito"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Utente ospite"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Indirizzo e-mail"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL del file"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Accedi"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Proprietario"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Accedi per condividere"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Rimuovi"
+      "value": "Accetta e unisciti al gruppo"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Carica file .tldr"
+      "value": "Maggiori informazioni sulla condivisione."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Maggiori informazioni sulla condivisione."
+      "value": "Consenti "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " per aiutarci a migliorare tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Cookie essenziali"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nome del gruppo"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Invita"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Mostra meno"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Esci"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Salva"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Attiva/disattiva barra laterale"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Prima di iniziare, accetta i nostri "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "termini di utilizzo"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " e la nostra "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "informativa sulla privacy"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Riprova"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Accetta e continua"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Vai qui per vedere i contenuti"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Hai raggiunto il numero massimo di gruppi. Devi eliminare i vecchi gruppi prima di crearne di nuovi."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Solo su invito"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL del file tldraw non valido"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Flag di debug dell'app"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Invita i membri"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copia il link di invito"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Riepilogo legale"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Amministratore"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Termini di servizio"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "O"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Fissa in alto"
+      "value": "Zona pericolosa"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": "."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membri"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Impostazioni"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Sei sicuro di voler abbandonare questo gruppo?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "politica sulla riservatezza"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Link copiato"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Aggiungi collegamento al file…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ja.json b/apps/dotcom/client/public/tla/locales-compiled/ja.json
index 93d8a2ee9e85..3680491232b1 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ja.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ja.json
@@ -51,6 +51,12 @@
       "value": "アカウント"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "無料アカウントを作成すると、作業の保存、リアルタイムでの共同作業などが行えます。"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ファイルメニュー"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw は、無料ですぐに使える仮想ホワイトボードです。"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "公開"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "グループを脱退"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ファイルのピンを外す"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "形式を選択してエクスポート"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "もっと見る"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "グループを削除"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "このルームのサイズ制限に近づいています。一部のコンテンツを削除するか、新しいファイルを作成することを検討してください。"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "グループを作成"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "アップロードに失敗しました"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "私のファイル"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n：ハイライト不足"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "リンクを追加"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "エディタ"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "メールで続行"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ピンファイル"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ファイルの URL を貼り付けます..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "このファイルを無視しても本当によろしいですか？"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "名前"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "再読み込み"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "グループを削除…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "このグループを削除してもよろしいですか? この操作は元に戻せません。"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "プライバシーポリシー"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "開始するには、ファイルをここにドラッグするか、"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ファイルを作成"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "するか、"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "招待リンクをコピー"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "してください。"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "古いブラウザが検出されました。このアプリを使用するにはブラウザを更新してください。"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "このリンクを取り消して新しいリンクを作成してください。"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "より古い"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "あなた"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw の新しいバージョンが利用可能です。続行するにはページを再読み込みしてください。"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "グループ "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " に招待されました"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "メールアドレスを入力してください"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "コンテンツを手動でインポートするには、次の手順に従ってください。"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "グループ設定"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "無視する"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "グループを脱退…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "ファイル名を変更する"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "結構です"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "編集を続けるには、部屋をファイルにコピーしてください。"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "確認コードをメールで確認してください。"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,64 @@
       "value": "自分のファイルにコピー"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "招待リンクをコピーしました"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Googleでログイン"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDKでビルドする"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "今月"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "利用規約"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ファイルリンクを追加"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "ライト"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "コードが届きませんか？ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "再送信"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "背景"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "招待を承諾するにはサインインしてください"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "ゲストユーザー"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "電子メールアドレス"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ファイルURL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "サインイン"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "所有者"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "共有するにはサインインしてください"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "ピン留めを解除"
+      "value": "承認してグループに参加する"
     }
   ],
   "bbbcefd7ce": [
@@ -751,16 +1009,30 @@
       "value": "さんが共有"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "tldrファイルをアップロード"
+      "value": "共有についてさらに詳しく。"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "共有についてさらに詳しく。"
+      "value": "tldraw を改善するために、"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " を許可します。"
     }
   ],
   "c303bd1095": [
@@ -775,6 +1047,12 @@
       "value": "必須クッキー"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "グループ名"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -787,12 +1065,24 @@
       "value": "招待する"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "表示を減らす"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "サインアウト"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "保存"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -823,6 +1113,40 @@
       "value": "サイドバーを切り替え"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "始める前に、"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "利用規約"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": "と"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "プライバシーポリシー"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "に同意してください。"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -835,40 +1159,82 @@
       "value": "再試行"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "同意して続行"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "コンテンツを見るにはこちらへ移動してください"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "グループの最大数に達しました。新しいグループを作成する前に、古いグループを削除する必要があります。"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "招待のみ"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "無効なtldrawファイルURL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "デバッグのフラグを追加"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "メンバーを招待する"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "招待リンクをコピー"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "法的概要"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "管理者"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "利用規約"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "または"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "ピン留めする"
+      "value": "危険地帯"
     }
   ],
   "ea4788705e": [
@@ -927,6 +1293,12 @@
       "value": " をお読みください。"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "メンバー"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -969,6 +1341,18 @@
       "value": "設定"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "このグループを脱退してもよろしいですか?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "プライバシーポリシー"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -987,6 +1371,12 @@
       "value": "コピーしたリンク"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ファイルリンクを追加…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/km-kh.json b/apps/dotcom/client/public/tla/locales-compiled/km-kh.json
index 3e9370143d18..fa5c18544cbb 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/km-kh.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/km-kh.json
@@ -51,6 +51,12 @@
       "value": "គណនី"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "បង្កើតគណនីឥតគិតថ្លៃ ដើម្បីរក្សាទុកការងាររបស់អ្នក សហការក្នុងពេលជាក់ស្តែង និងច្រើនទៀត។"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ម៉ឺនុយឯកសារ"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw គឺជាក្តារខៀននិម្មិតឥតគិតថ្លៃ និងភ្លាមៗ។"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "បោះពុម្ពផ្សាយ"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "ចាកចេញពីក្រុម"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ដកការខ្ទាស់ឯកសារ"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "នាំចេញជា"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "បង្ហាញច្រើនទៀត"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "លុបក្រុម"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "បន្ទប់នេះជិតដល់ដែនកំណត់ទំហំរបស់វា។ ពិចារណាលុបខ្លឹមសារខ្លះចេញ ឬចាប់ផ្តើមឯកសារថ្មី។"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "បង្កើតក្រុម"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "ការបង្ហោះបានបរាជ័យ"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "ឯកសាររបស់ខ្ញុំ"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: បន្លិចបាត់"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "បន្ថែមតំណ"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "កម្មវិធីនិពន្ធ"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "បន្តជាមួយអ៊ីមែល"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ខ្ទាស់ឯកសារ"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "បិទភ្ជាប់ URL ឯកសារ tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "តើអ្នកប្រាកដថាចង់បំភ្លេចឯកសារនេះទេ?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "ឈ្មោះ"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "ផ្ទុកឡើងវិញ"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "លុបក្រុម..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "តើអ្នកប្រាកដថាចង់លុបក្រុមនេះទេ? សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ។"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "គោលការណ៍ឯកជនភាព"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "អូសឯកសារនៅទីនេះ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "បង្កើតឯកសារ"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ឬ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ចម្លងតំណអញ្ជើញ"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " ដើម្បីចាប់ផ្តើម។"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "កម្មវិធីរុករកចាស់ត្រូវបានរកឃើញ។ សូមអាប់ដេតកម្មវិធីរុករកតាមអ៊ីនធឺណិតរបស់អ្នក ដើម្បីប្រើកម្មវិធីនេះ។"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "ដកហូតតំណនេះ ហើយបង្កើតថ្មីមួយ។"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "ចាស់ជាង"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "អ្នក"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "កំណែថ្មីនៃ tldraw មាន។ សូមផ្ទុកទំព័រឡើងវិញដើម្បីបន្ត។"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "អ្នកត្រូវបានអញ្ជើញឱ្យចូលរួមក្នុងក្រុម "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "បញ្ចូលអាសយដ្ឋានអ៊ីមែលរបស់អ្នក។"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "អនុវត្តតាមជំហានទាំងនេះដើម្បីនាំចូលមាតិកាដោយដៃ៖"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "ការកំណត់ក្រុម"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "ភ្លេច"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "ចាកចេញពីក្រុម…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "ប្តូរឈ្មោះឯកសារ"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "ទេ អរគុណ"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "ដើម្បីបន្តកែសម្រួល សូមចម្លងបន្ទប់ទៅឯកសាររបស់អ្នក។"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "ពិនិត្យអ៊ីមែលរបស់អ្នកសម្រាប់លេខកូដផ្ទៀងផ្ទាត់។"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "ចម្លងទៅឯកសាររបស់ខ្ញុំ"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "បានចម្លងតំណអញ្ជើញ"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "ចូលជាមួយ Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "បង្កើតជាមួយ tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "ខែនេះ។"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ល័ក្ខខ័ណ្ឌនៃការប្រើប្រាស់"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "បន្ថែមតំណឯកសារ"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "ពន្លឺ"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "មិនបានទទួលលេខកូដមែនទេ? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ផ្ញើឡើងវិញ"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "។"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "ផ្ទៃខាងក្រោយ"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "ចូល​ដើម្បី​ទទួល​យក​ការ​អញ្ជើញ"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "អ្នកប្រើប្រាស់ភ្ញៀវ"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "អាសយដ្ឋានអ៊ីមែល"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL ឯកសារ"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "ចូល"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "ម្ចាស់"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "ចូលដើម្បីចែករំលែក"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "ដកខ្ទាស់"
+      "value": "ទទួលយក និងចូលរួមក្រុម"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "ផ្ទុកឡើងឯកសារ .tldr"
+      "value": "ស្វែងយល់បន្ថែមអំពីការចែករំលែក។"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "ស្វែងយល់បន្ថែមអំពីការចែករំលែក។"
+      "value": "អនុញ្ញាតឱ្យ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ដើម្បីជួយយើងកែលម្អ tldraw ។"
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "ខូឃីសំខាន់ៗ"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "ឈ្មោះក្រុម"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "អញ្ជើញ"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "បង្ហាញតិច"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "ចេញ"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "រក្សាទុក"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "បិទបើករបារចំហៀង"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "មុនពេលអ្នកចាប់ផ្តើម សូមទទួលយក "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "លក្ខខណ្ឌប្រើប្រាស់"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " និង "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "គោលការណ៍ឯកជនភាព"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " របស់យើង។"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "ព្យាយាមម្តងទៀត"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "ទទួលយកហើយបន្ត"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "ទៅទីនេះដើម្បីមើលខ្លឹមសារ"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "អ្នកបានឈានដល់ចំនួនក្រុមអតិបរមាហើយ។ អ្នកត្រូវលុបក្រុមចាស់មុននឹងបង្កើតក្រុមថ្មី។"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "អញ្ជើញតែប៉ុណ្ណោះ"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL ឯកសារ tldraw មិនត្រឹមត្រូវ"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ទង់បំបាត់កំហុសកម្មវិធី"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "អញ្ជើញសមាជិក"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "ចម្លងតំណអញ្ជើញ"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "សង្ខេបច្បាប់"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "អ្នកគ្រប់គ្រង"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "ល័ក្ខខ័ណ្ឌនៃសេវាកម្ម"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ឬ"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "ម្ជុល"
+      "value": "តំបន់គ្រោះថ្នាក់"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " របស់យើងដើម្បីស្វែងយល់បន្ថែម។"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "សមាជិក"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "ការកំណត់"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "តើអ្នកប្រាកដថាចង់ចាកចេញពីក្រុមនេះទេ?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "គោលការណ៍ឯកជនភាព"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "បានចម្លងតំណ"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "បន្ថែមតំណឯកសារ…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/kn.json b/apps/dotcom/client/public/tla/locales-compiled/kn.json
index eb0c15a4ba61..739f8a2dcf55 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/kn.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/kn.json
@@ -51,6 +51,12 @@
       "value": "ಖಾತೆ"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "ನಿಮ್ಮ ಕೆಲಸವನ್ನು ಉಳಿಸಲು, ನೈಜ ಸಮಯದಲ್ಲಿ ಸಹಯೋಗಿಸಲು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಲು ಉಚಿತ ಖಾತೆಯನ್ನು ರಚಿಸಿ."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ಫೈಲ್ ಮೆನು"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ಒಂದು ಉಚಿತ ಮತ್ತು ತ್ವರಿತ ವರ್ಚುವಲ್ ವೈಟ್‌ಬೋರ್ಡ್ ಆಗಿದೆ."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "ಪ್ರಕಟಿಸಿ"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪನ್ನು ತೊರೆಯಿರಿ"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ಫೈಲ್ ಅನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡಿ"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "ರಫ್ತು ಮಾಡಿ"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "ಇನ್ನಷ್ಟು ತೋರಿಸು"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪನ್ನು ಅಳಿಸಿ"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "ಈ ಕೋಣೆಯ ಗಾತ್ರದ ಮಿತಿಯನ್ನು ಸಮೀಪಿಸುತ್ತಿದೆ. ಕೆಲವು ವಿಷಯವನ್ನು ತೆಗೆದುಹಾಕುವುದನ್ನು ಅಥವಾ ಹೊಸ ಫೈಲ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸುವುದನ್ನು ಪರಿಗಣಿಸಿ."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪನ್ನು ರಚಿಸಿ"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "ಅಪ್‌ಲೋಡ್ ವಿಫಲವಾಗಿದೆ"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "ನನ್ನ ಫೈಲ್‌ಗಳು"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: ಹೈಲೈಟ್ ಕಾಣೆಯಾಗಿದೆ"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "ಲಿಂಕ್ ಸೇರಿಸಿ"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "ಸಂಪಾದಕ"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ಇಮೇಲ್ ಮೂಲಕ ಮುಂದುವರಿಸಿ"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "ಡ್ರಾ"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ಪಿನ್ ಫೈಲ್"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ಫೈಲ್ URL ಅಂಟಿಸಿ..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "ಈ ಫೈಲ್ ಅನ್ನು ಮರೆಯಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "ಹೆಸರು"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "ಮರುಲೋಡ್ ಮಾಡಿ"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪನ್ನು ಅಳಿಸಿ..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "ಈ ಗುಂಪನ್ನು ಅಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "ಗೌಪ್ಯತೆ ನೀತಿ"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "ಪ್ರಾರಂಭಿಸಲು ಫೈಲ್‌ಗಳನ್ನು ಇಲ್ಲಿಗೆ ಎಳೆಯಿರಿ, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ಫೈಲ್ ರಚಿಸಿ"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", ಅಥವಾ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ಆಹ್ವಾನ ಲಿಂಕ್ ಅನ್ನು ನಕಲಿಸಿ"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "ಹಳೆಯ ಬ್ರೌಸರ್ ಪತ್ತೆಯಾಗಿದೆ. ಈ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ದಯವಿಟ್ಟು ನಿಮ್ಮ ಬ್ರೌಸರ್ ಅನ್ನು ನವೀಕರಿಸಿ."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "ಈ ಲಿಂಕ್ ಅನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳಿ ಮತ್ತು ಹೊಸದನ್ನು ರಚಿಸಿ."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "ಹಳೆಯದು"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ನೀವು"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw ನ ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ. ಮುಂದುವರಿಯಲು ದಯವಿಟ್ಟು ಪುಟವನ್ನು ಮರುಲೋಡ್ ಮಾಡಿ."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "ನಿಮ್ಮನ್ನು "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " ಗುಂಪಿಗೆ ಆಹ್ವಾನಿಸಲಾಗಿದೆ."
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "ವಿಷಯವನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಆಮದು ಮಾಡಿಕೊಳ್ಳಲು ಈ ಹಂತಗಳನ್ನು ಅನುಸರಿಸಿ:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "ಮರೆತುಬಿಡಿ"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪನ್ನು ತೊರೆಯಿರಿ..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "ಫೈಲ್ ಅನ್ನು ಮರುಹೆಸರಿಸಿ"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "ಬೇಡ ಧನ್ಯವಾದಗಳು"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "ಸಂಪಾದನೆಯನ್ನು ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು ಕೊಠಡಿಯನ್ನು ನಿಮ್ಮ ಫೈಲ್‌ಗಳಿಗೆ ನಕಲಿಸಿ."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "ಪರಿಶೀಲನಾ ಕೋಡ್‌ಗಾಗಿ ನಿಮ್ಮ ಇಮೇಲ್ ಪರಿಶೀಲಿಸಿ."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "ನನ್ನ ಫೈಲ್‌ಗಳಿಗೆ ನಕಲಿಸಿ"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "ಆಹ್ವಾನ ಲಿಂಕ್ ನಕಲಿಸಲಾಗಿದೆ"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google ನೊಂದಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK ಬಳಸಿ ನಿರ್ಮಿಸಿ"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "ಈ ತಿಂಗಳು"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ಬಳಕೆಯ ನಿಯಮಗಳು"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ಫೈಲ್ ಲಿಂಕ್ ಸೇರಿಸಿ"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "ಬೆಳಕು"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "ಕೋಡ್ ಸಿಗಲಿಲ್ಲವೇ? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ಮತ್ತೆ ಕಳುಹಿಸಿ"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "ಹಿನ್ನೆಲೆ"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "ಆಹ್ವಾನವನ್ನು ಸ್ವೀಕರಿಸಲು ಸೈನ್ ಇನ್ ಮಾಡಿ"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "ಅತಿಥಿ ಬಳಕೆದಾರ"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ಇಮೇಲ್ ವಿಳಾಸ"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ಫೈಲ್ URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "ಸೈನ್ ಇನ್ ಮಾಡಿ"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "ಮಾಲೀಕ"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "ಹಂಚಿಕೊಳ್ಳಲು ಸೈನ್ ಇನ್ ಮಾಡಿ"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "ಅನ್‌ಪಿನ್ ಮಾಡಿ"
+      "value": "ಗುಂಪನ್ನು ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಸೇರಿ"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1021,30 @@
       "value": " ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr ಫೈಲ್‌ಗಳನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"
+      "value": "ಹಂಚಿಕೊಳ್ಳುವ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "ಹಂಚಿಕೊಳ್ಳುವ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ."
+      "value": "tldraw ಸುಧಾರಿಸಲು ನಮಗೆ ಸಹಾಯ ಮಾಡಲು "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ಅನ್ನು ಅನುಮತಿಸಿ."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1059,12 @@
       "value": "ಅಗತ್ಯ ಕುಕೀಗಳು"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "ಗುಂಪಿನ ಹೆಸರು"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1077,24 @@
       "value": "ಆಹ್ವಾನಿಸಿ"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "ಕಡಿಮೆ ತೋರಿಸಿ"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "ಸೈನ್ ಔಟ್ ಮಾಡಿ"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "ಉಳಿಸಿ"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1125,40 @@
       "value": "ಸೈಡ್‌ಬಾರ್ ಅನ್ನು ಟಾಗಲ್ ಮಾಡಿ"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "ನೀವು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು, ದಯವಿಟ್ಟು ನಮ್ಮ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ಬಳಕೆಯ ನಿಯಮಗಳು"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " ಮತ್ತು "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ಗೌಪ್ಯತೆ ನೀತಿ"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "ಯನ್ನು ಒಪ್ಪಿಕೊಳ್ಳಿ."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1171,82 @@
       "value": "ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಮುಂದುವರಿಸಿ"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "ವಿಷಯವನ್ನು ನೋಡಲು ಇಲ್ಲಿಗೆ ಹೋಗಿ"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "ನೀವು ಗುಂಪುಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ತಲುಪಿದ್ದೀರಿ. ಹೊಸ ಗುಂಪುಗಳನ್ನು ರಚಿಸುವ ಮೊದಲು ನೀವು ಹಳೆಯ ಗುಂಪುಗಳನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "ಆಮಂತ್ರಣ ಮಾತ್ರ"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "ಅಮಾನ್ಯವಾದ tldraw ಫೈಲ್ URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ಅಪ್ಲಿಕೇಶನ್ ಡೀಬಗ್ ಫ್ಲ್ಯಾಗ್‌ಗಳು"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "ಸದಸ್ಯರನ್ನು ಆಹ್ವಾನಿಸಿ"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "ಆಹ್ವಾನ ಲಿಂಕ್ ನಕಲಿಸಿ"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "ಕಾನೂನು ಸಾರಾಂಶ"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "ನಿರ್ವಾಹಕ"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "ಸೇವಾ ನಿಯಮಗಳು"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
     {
       "type": 0,
-      "value": "ಪಿನ್"
+      "value": "ಅಥವಾ"
+    }
+  ],
+  "ea0626ac5a": [
+    {
+      "type": 0,
+      "value": "ಅಪಾಯ ವಲಯ"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1305,12 @@
       "value": " ಓದಿ."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "ಸದಸ್ಯರು"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1353,18 @@
       "value": "ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "ನೀವು ಈ ಗುಂಪನ್ನು ತೊರೆಯಲು ಖಚಿತವಾಗಿ ಬಯಸುತ್ತೀರಾ?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "ಗೌಪ್ಯತಾ ನೀತಿ"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1383,12 @@
       "value": "ನಕಲಿಸಲಾದ ಲಿಂಕ್"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ಫೈಲ್ ಲಿಂಕ್ ಸೇರಿಸಿ..."
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ko-kr.json b/apps/dotcom/client/public/tla/locales-compiled/ko-kr.json
index 7640474543c2..baa6eaf2d8ad 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ko-kr.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ko-kr.json
@@ -51,6 +51,12 @@
       "value": "계정"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "무료 계정을 만들어서 작업 내용을 저장하고, 실시간으로 협업하고, 다양한 기능을 활용하세요."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "파일 메뉴"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw는 무료로 즉시 사용할 수 있는 가상 화이트보드입니다."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "게시"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "그룹 탈퇴"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "파일 고정 해제"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "내보내기 형식"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "더 보기"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "그룹 삭제"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "이 방의 크기 제한에 거의 도달했습니다. 일부 콘텐츠를 삭제하거나 새 파일을 만들어 보세요."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "그룹 만들기"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "업로드 실패"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "내 파일"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n(국제화): 하이라이트 누락"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "링크 추가"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "편집기"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "이메일로 계속하기"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "핀 파일"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw 파일 URL을 붙여넣습니다..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "이 파일을 무시하시겠습니까?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "이름"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "다시 로드"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "그룹 삭제…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "이 그룹을 삭제하시겠습니까? 이 작업은 실행 취소할 수 없습니다."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "개인정보 보호정책"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "시작하려면 파일을 여기로 끌어다 놓거나, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "파일을 생성"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "하거나, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "초대 링크 복사"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "하세요."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "이전 브라우저가 감지되었습니다. 이 앱을 사용하려면 브라우저를 업데이트하세요."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "이 링크를 취소하고 새 링크를 만드세요."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "이전"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "너"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw의 새 버전이 출시되었습니다. 계속하려면 페이지를 다시 로드하세요."
     }
   ],
+  "68257bb646": [
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " 그룹에 초대되었습니다."
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "이메일 주소를 입력하세요"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "수동으로 콘텐츠를 가져오려면 다음 단계를 따르세요."
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "그룹 설정"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "무시"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "그룹 탈퇴…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "파일 이름 바꾸기"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "아니요, 고맙습니다"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "편집을 계속하려면 해당 방을 파일로 복사하세요."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "이메일에서 인증 코드를 확인하세요."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "내 파일로 복사"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "초대 링크 복사됨"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google로 로그인"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK로 빌드"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "이번 달"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "이용 약관"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "파일 링크 추가"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "라이트"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "코드를 받지 못하셨나요? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "다시 보내기"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "배경"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "초대를 수락하려면 로그인하세요"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "게스트 사용자"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "이메일 주소"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "파일 URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "로그인"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "소유자"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "공유하려면 로그인하세요"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "고정 해제"
+      "value": "그룹 수락 및 가입"
     }
   ],
   "bbbcefd7ce": [
@@ -751,16 +1009,26 @@
       "value": " 님이 공유함"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr 파일 업로드"
+      "value": "공유에 대해 자세히 알아보세요."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
     {
       "type": 0,
-      "value": "공유에 대해 자세히 알아보세요."
+      "value": "를 허용하여 tldraw를 개선하세요."
     }
   ],
   "c303bd1095": [
@@ -775,6 +1043,12 @@
       "value": "필수 쿠키"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "그룹 이름"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -787,12 +1061,24 @@
       "value": "초대"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "덜 보기"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "로그아웃"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "구하다"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -823,6 +1109,40 @@
       "value": "사이드바 전환"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "시작하기에 앞서, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "이용약관"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " 및 "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "개인정보처리방침"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "에 동의해 주시기 바랍니다."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -835,40 +1155,82 @@
       "value": "다시 시도"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "수락하고 계속하세요"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "여기로 이동하여 콘텐츠 보기"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "최대 그룹 수에 도달했습니다. 새 그룹을 만들려면 기존 그룹을 삭제해야 합니다."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "초대만"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "잘못된 tldraw 파일 URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "앱 디버그 신고"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "회원 초대"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "초대 링크 복사"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "법적 요약"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "관리자"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "서비스 약관"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "또는"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "고정"
+      "value": "위험 구역"
     }
   ],
   "ea4788705e": [
@@ -927,6 +1289,12 @@
       "value": "을 읽어보세요."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "회원들"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -969,6 +1337,18 @@
       "value": "설정"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "정말로 이 그룹을 떠나시겠습니까?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "개인정보 보호정책"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -987,6 +1367,12 @@
       "value": "복사된 링크"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "파일 링크 추가…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ml.json b/apps/dotcom/client/public/tla/locales-compiled/ml.json
index 174384baec25..18159ae40bec 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ml.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ml.json
@@ -51,6 +51,12 @@
       "value": "അക്കൗണ്ട്"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "നിങ്ങളുടെ ജോലി സംരക്ഷിക്കാനും, തത്സമയം സഹകരിക്കാനും, മറ്റും ഒരു സൗജന്യ അക്കൗണ്ട് സൃഷ്ടിക്കുക."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ഫയൽ മെനു"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ഒരു സൗജന്യവും തൽക്ഷണവുമായ വെർച്വൽ വൈറ്റ്‌ബോർഡാണ്."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "പ്രസിദ്ധീകരിക്കുക"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പ് വിടുക"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ഫയൽ അൺപിൻ ചെയ്യുക"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "ആയി കയറ്റുമതി ചെയ്യുക"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "കൂടുതൽ കാണിക്കുക"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പ് ഇല്ലാതാക്കുക"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "ഈ മുറിയുടെ വലുപ്പ പരിധി അടുക്കുന്നു. കുറച്ച് ഉള്ളടക്കം നീക്കം ചെയ്യുന്നതോ പുതിയൊരു ഫയൽ ആരംഭിക്കുന്നതോ പരിഗണിക്കുക."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പ് സൃഷ്ടിക്കുക"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "അപ്‌ലോഡ് പരാജയപ്പെട്ടു"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "എന്റെ ഫയലുകൾ"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: ഹൈലൈറ്റ് നഷ്‌ടമായി"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "ലിങ്ക് ചേർക്കുക"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "എഡിറ്റർ"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ഇമെയിൽ വഴി തുടരുക"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ഫയൽ പിൻ ചെയ്യുക"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ഫയലിന്റെ URL ഒട്ടിക്കുക..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "ഈ ഫയൽ മറക്കണമെന്ന് തീർച്ചയാണോ?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "പേര്"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "വീണ്ടും ലോഡുചെയ്യുക"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പ് ഇല്ലാതാക്കുക..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "ഈ ഗ്രൂപ്പ് ഇല്ലാതാക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ? ഈ പ്രവർത്തനം പഴയപടിയാക്കാൻ കഴിയില്ല."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "സ്വകാര്യതാ നയം"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "ആരംഭിക്കുന്നതിന് ഫയലുകൾ ഇവിടെ വലിച്ചിടുക, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ഒരു ഫയൽ സൃഷ്ടിക്കുക"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", അല്ലെങ്കിൽ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ക്ഷണ ലിങ്ക് പകർത്തുക"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " ചെയ്യുക."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "പഴയ ബ്രൗസർ കണ്ടെത്തി. ഈ ആപ്പ് ഉപയോഗിക്കാൻ നിങ്ങളുടെ ബ്രൗസർ അപ്‌ഡേറ്റ് ചെയ്യുക."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "ഈ ലിങ്ക് റദ്ദാക്കി പുതിയൊരെണ്ണം സൃഷ്ടിക്കുക."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "പഴയത്"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "നീ"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw യുടെ പുതിയ പതിപ്പ് ലഭ്യമാണ്. തുടരാൻ പേജ് വീണ്ടും ലോഡുചെയ്യുക."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "നിങ്ങളെ "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " എന്ന ഗ്രൂപ്പിലേക്ക് ക്ഷണിച്ചിരിക്കുന്നു."
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം നൽകുക"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "ഉള്ളടക്കം നേരിട്ട് ഇറക്കുമതി ചെയ്യാൻ ഈ ഘട്ടങ്ങൾ പാലിക്കുക:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പ് ക്രമീകരണങ്ങൾ"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "മറക്കുക"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പ് വിടുക..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "ഫയലിൻ്റെ പേരുമാറ്റുക"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "വേണ്ട, നന്ദി"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "എഡിറ്റ് ചെയ്യുന്നത് തുടരാൻ, റൂം നിങ്ങളുടെ ഫയലുകളിലേക്ക് പകർത്തുക."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "സ്ഥിരീകരണ കോഡിനായി നിങ്ങളുടെ ഇമെയിൽ പരിശോധിക്കുക."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "എൻ്റെ ഫയലുകളിലേക്ക് പകർത്തുക"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "ക്ഷണ ലിങ്ക് പകർത്തി"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK ഉപയോഗിച്ച് നിർമ്മിക്കുക"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "ഈ മാസം"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ഉപയോഗ നിബന്ധനകൾ"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ഫയൽ ലിങ്ക് ചേർക്കുക"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "വെളിച്ചം"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "കോഡ് ലഭിച്ചില്ലേ? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "വീണ്ടും അയയ്ക്കുക"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "പശ്ചാത്തലം"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "ക്ഷണം സ്വീകരിക്കാൻ സൈൻ ഇൻ ചെയ്യുക"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "അതിഥി ഉപയോക്താവ്"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ഇമെയിൽ വിലാസം"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ഫയൽ URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "സൈൻ ഇൻ"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "ഉടമസ്ഥൻ"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "പങ്കിടാൻ സൈൻ ഇൻ ചെയ്യുക"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "അൺപിൻ ചെയ്യുക"
+      "value": "അംഗീകരിച്ച് ഗ്രൂപ്പിൽ ചേരുക"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1021,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr ഫയലുകൾ അപ്‌ലോഡ് ചെയ്യുക"
+      "value": "പങ്കിടുന്നതിനെക്കുറിച്ച് കൂടുതലറിയുക."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "പങ്കിടുന്നതിനെക്കുറിച്ച് കൂടുതലറിയുക."
+      "value": "tldraw മെച്ചപ്പെടുത്താൻ ഞങ്ങളെ സഹായിക്കുന്നതിന് "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " അനുവദിക്കുക."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1059,12 @@
       "value": "അവശ്യ കുക്കികൾ"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "ഗ്രൂപ്പിന്റെ പേര്"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1077,24 @@
       "value": "ക്ഷണിക്കുക"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "കുറച്ച് കാണിക്കുക"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "സൈൻ ഔട്ട്"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "രക്ഷിക്കും"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1125,40 @@
       "value": "സൈഡ്‌ബാർ ടോഗിൾ ചെയ്യുക"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "ആരംഭിക്കുന്നതിന് മുമ്പ്, ദയവായി ഞങ്ങളുടെ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ഉപയോഗ നിബന്ധനകൾ"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": ", "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "സ്വകാര്യതാ നയം"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " എന്നിവ അംഗീകരിക്കുക."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1171,82 @@
       "value": "വീണ്ടും ശ്രമിക്കുക"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "അംഗീകരിച്ച് തുടരുക"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "ഉള്ളടക്കം കാണാൻ ഇവിടെ പോകുക"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "നിങ്ങൾ ഗ്രൂപ്പുകളുടെ പരമാവധി എണ്ണത്തിലെത്തി. പുതിയവ സൃഷ്ടിക്കുന്നതിന് മുമ്പ് പഴയ ഗ്രൂപ്പുകൾ ഇല്ലാതാക്കേണ്ടതുണ്ട്."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "ക്ഷണിക്കുക മാത്രം"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "tldraw ഫയൽ URL അസാധുവാണ്."
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ആപ്പ് ഡീബഗ് ഫ്ലാഗുകൾ"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "അംഗങ്ങളെ ക്ഷണിക്കുക"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "ക്ഷണ ലിങ്ക് പകർത്തുക"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "നിയമപരമായ സംഗ്രഹം"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "അഡ്മിൻ"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "സേവന നിബന്ധനകൾ"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "അല്ലെങ്കിൽ"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "പിൻ"
+      "value": "അപകട മേഖല"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1305,12 @@
       "value": " വായിക്കുക."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "അംഗങ്ങൾ"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1353,18 @@
       "value": "ക്രമീകരണങ്ങൾ"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "ഈ ഗ്രൂപ്പ് വിടണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "സ്വകാര്യതാ നയം"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1383,12 @@
       "value": "പകർത്തിയ ലിങ്ക്"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ഫയൽ ലിങ്ക് ചേർക്കുക..."
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/mr.json b/apps/dotcom/client/public/tla/locales-compiled/mr.json
index 98c5392fb936..aa987ceca5fe 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/mr.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/mr.json
@@ -51,6 +51,12 @@
       "value": "खाते"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "तुमचे काम जतन करण्यासाठी, रिअल-टाइममध्ये सहयोग करण्यासाठी आणि बरेच काही करण्यासाठी एक मोफत खाते तयार करा."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "फाइल मेनू"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw हा एक मोफत आणि त्वरित व्हर्च्युअल व्हाईटबोर्ड आहे."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "प्रकाशित करा"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "गट सोडा"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "फाइल अनपिन करा"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "म्हणून निर्यात करा"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "अजून दाखवा"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "गट हटवा"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "ही खोली त्याच्या आकार मर्यादेपर्यंत पोहोचत आहे. काही सामग्री काढून टाकण्याचा किंवा नवीन फाइल सुरू करण्याचा विचार करा."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "गट तयार करा"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "अपलोड अयशस्वी"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "माझ्या फायली"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: हायलाइट गहाळ"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "लिंक जोडा"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "संपादक"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ईमेलसह सुरू ठेवा"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "फाइल पिन करा"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw फाइलची URL पेस्ट करा..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "तुमची खात्री आहे की तुम्ही ही फाइल विसरू इच्छिता?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "नाव"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "रीलोड करा"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "गट हटवा..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "तुम्हाला हा गट नक्की हटवायचा आहे का? ही कृती पूर्ववत करता येणार नाही."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "गोपनीयता धोरण"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "सुरुवात करण्यासाठी फायली येथे ड्रॅग करा, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "फाइल तयार करा"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " किंवा "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "निमंत्रण लिंक कॉपी करा"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " करा."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "जुना ब्राउझर आढळला. हे अ‍ॅप वापरण्यासाठी कृपया तुमचा ब्राउझर अपडेट करा."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "ही लिंक रद्द करा आणि एक नवीन तयार करा."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "जुने"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "तू"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw ची नवीन आवृत्ती उपलब्ध आहे. पुढे सुरू ठेवण्यासाठी कृपया पेज रीलोड करा."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "तुम्हाला गटात आमंत्रित केले आहे "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "तुमचा ईमेल पत्ता प्रविष्ट करा."
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "सामग्री व्यक्तिचलितपणे आयात करण्यासाठी या चरणांचे अनुसरण करा:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "गट सेटिंग्ज"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "विसरून जा"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "गट सोडा..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "फाइलचे नाव बदला"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "नाही धन्यवाद"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "संपादन सुरू ठेवण्यासाठी कृपया तुमच्या फाइल्समध्ये रूम कॉपी करा."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "पडताळणी कोडसाठी तुमचा ईमेल तपासा."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "माझ्या फाइल्समध्ये कॉपी करा"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "आमंत्रण लिंक कॉपी केली"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "गुगल वापरून साइन इन करा"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK वापरून तयार करा"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "या महिन्यात"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "वापराच्या अटी"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "फाइल लिंक जोडा"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "प्रकाश"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "कोड मिळाला नाही का? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "पुन्हा पाठवा"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "पार्श्वभूमी"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "आमंत्रण स्वीकारण्यासाठी साइन इन करा"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "पाहुणा वापरकर्ता"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ईमेल पत्ता"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "फाइल URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "साइन इन करा"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "मालक"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "शेअर करण्यासाठी साइन इन करा"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "अनपिन करा"
+      "value": "स्वीकारा आणि गटात सामील व्हा"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": " द्वारे शेअर केलेले"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr फाइल अपलोड करा"
+      "value": "शेअर करण्याबद्दल अधिक जाणून घ्या."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "शेअर करण्याबद्दल अधिक जाणून घ्या."
+      "value": "tldraw सुधारण्यास मदत करण्यासाठी "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ला अनुमती द्या."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "आवश्यक कुकीज"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "गटाचे नाव"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "आमंत्रित करा"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "कमी दाखवा"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "साइन आउट करा"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "जतन करा"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "साइडबार टॉगल करा"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "तुम्ही सुरुवात करण्यापूर्वी, कृपया आमच्या "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "वापराच्या अटी"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " आणि "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "गोपनीयता धोरण"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " स्वीकारा."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "पुन्हा प्रयत्न करा"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "स्वीकारा आणि सुरू ठेवा"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "सामग्री पाहण्यासाठी येथे जा"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "तुम्ही गटांची कमाल संख्या गाठली आहे. नवीन गट तयार करण्यापूर्वी तुम्हाला जुने गट हटवावे लागतील."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "फक्त आमंत्रित करा"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "चुकीची tldraw फाइल URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ॲप डीबग ध्वज"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "सदस्यांना आमंत्रित करा"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "आमंत्रण लिंक कॉपी करा"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "कायदेशीर सारांश"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "प्रशासन"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "सेवा अटी"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "किंवा"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "पिन"
+      "value": "धोक्याचा झोन"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " वाचा."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "सदस्य"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "सेटिंग्ज"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "तुम्हाला नक्की हा गट सोडायचा आहे का?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "गोपनीयता धोरण"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "लिंक कॉपी केली"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "फाइल लिंक जोडा..."
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ms.json b/apps/dotcom/client/public/tla/locales-compiled/ms.json
index 81cff6829150..5018ca3d3634 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ms.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ms.json
@@ -51,6 +51,12 @@
       "value": "Akaun"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Cipta akaun percuma untuk menyimpan kerja anda, bekerjasama dalam masa nyata dan banyak lagi."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "menu fail"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ialah papan putih maya percuma dan segera."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Terbitkan"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Tinggalkan kumpulan"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Nyahsemat fail"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Eksport sebagai"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Tunjukkan lagi"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Padamkan kumpulan"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Bilik ini menghampiri had saiznya. Pertimbangkan untuk mengalih keluar beberapa kandungan atau memulakan fail baharu."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Buat kumpulan"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Muat naik gagal"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Fail saya"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Serlahkan Hilang"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Tambah pautan"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Teruskan dengan e-mel"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pin fail"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Tampalkan URL fail tdraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Adakah anda pasti mahu melupakan fail ini?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nama"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Muat semula"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Padamkan kumpulan…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Adakah anda pasti mahu memadamkan kumpulan ini? Tindakan ini tidak boleh dibuat asal."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Dasar privasi"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Seret fail ke sini, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "buat fail"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " atau "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copy link invite"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " untuk bermula."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Pelayar lama dikesan. Sila kemas kini pelayar anda untuk menggunakan aplikasi ini."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Batalkan pautan ini dan buat yang baharu."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Lebih tua"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "awak"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Versi baharu tldraw tersedia. Sila muat semula halaman untuk meneruskan."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Anda telah dijemput ke kumpulan "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Masukkan alamat e-mel anda"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Ikuti langkah ini untuk mengimport kandungan secara manual:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Tetapan kumpulan"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "lupa"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Tinggalkan kumpulan…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Namakan semula fail"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Tidak terima kasih"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Untuk meneruskan pengeditan sila salin bilik ke fail anda."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Semak e-mel anda untuk mendapatkan kod pengesahan."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Salin ke fail saya"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Pautan jemputan disalin"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Log masuk dengan Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Bina dengan tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "bulan ini"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Syarat Penggunaan"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Tambah pautan fail"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Cahaya"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Tidak menerima kod? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Hantar semula"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Latar belakang"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Log masuk untuk menerima jemputan"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Pengguna tetamu"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Alamat e-mel"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL fail"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Log masuk"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Pemilik"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Log masuk untuk berkongsi"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Nyahsemat"
+      "value": "Terima dan sertai kumpulan"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Muat naik fail .tldr"
+      "value": "Ketahui lebih lanjut tentang perkongsian."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Ketahui lebih lanjut tentang perkongsian."
+      "value": "Benarkan "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analitik"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " untuk membantu kami meningkatkan tldraw."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "Kuki penting"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nama kumpulan"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "Jemput"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Tunjukkan lebih sedikit"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Log keluar"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Jimat"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "Togol bar sisi"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Sebelum anda mula, sila terima "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "syarat penggunaan"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " dan "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "dasar privasi"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " kami."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "Cuba Lagi"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Terima dan teruskan"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Pergi ke sini untuk melihat kandungannya"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Anda telah mencapai bilangan maksimum kumpulan. Anda perlu memadamkan kumpulan lama sebelum membuat kumpulan baharu."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Jemput sahaja"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL fail tldraw tidak sah"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Bendera nyahpepijat apl"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Jemput ahli"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Salin pautan jemputan"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Ringkasan undang-undang"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Syarat perkhidmatan"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "atau"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Zon bahaya"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " kami untuk mengetahui lebih lanjut."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "ahli"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "tetapan"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Adakah anda pasti mahu meninggalkan kumpulan ini?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Dasar Privasi"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "pautan disalin"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Tambahkan pautan fail…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ne.json b/apps/dotcom/client/public/tla/locales-compiled/ne.json
index e51a04c6bab8..f5d221188b0c 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ne.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ne.json
@@ -51,6 +51,12 @@
       "value": "खाता"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "आफ्नो काम बचत गर्न, वास्तविक समयमा सहकार्य गर्न र थप कुराहरू गर्न नि:शुल्क खाता सिर्जना गर्नुहोस्।"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "फाइल मेनु"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw एक नि:शुल्क र तत्काल भर्चुअल व्हाइटबोर्ड हो।"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "प्रकाशित गर्नुहोस्"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "समूह छोड्नुहोस्"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "फाइल अनपिन गर्नुहोस्"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "को रूपमा निर्यात गर्नुहोस्"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "थप देखाउनुहोस्"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "समूह मेटाउनुहोस्"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "यो कोठा यसको आकार सीमा नजिकिँदै छ। केही सामग्री हटाउने वा नयाँ फाइल सुरु गर्ने विचार गर्नुहोस्।"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "समूह सिर्जना गर्नुहोस्"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "अपलोड असफल भयो"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "मेरा फाइलहरू"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: छुटेको हाइलाइट गर्नुहोस्"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "लिङ्क थप्नुहोस्"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "सम्पादक"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "इमेलको साथ जारी राख्नुहोस्"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "फाइल पिन गर्नुहोस्"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw फाइलको URL टाँस्नुहोस्..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "के तपाइँ यो फाइल बिर्सन निश्चित हुनुहुन्छ?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "नाम"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "पुन: लोड गर्नुहोस्"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "समूह मेटाउनुहोस्..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "के तपाईं यो समूह मेटाउन निश्चित हुनुहुन्छ? यो कार्य पूर्ववत गर्न सकिँदैन।"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "गोपनीयता नीति"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "सुरु गर्न फाइलहरू यहाँ तान्नुहोस्, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "फाइल सिर्जना गर्नुहोस्"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", वा "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "निमन्त्रणा लिङ्क प्रतिलिपि गर्नुहोस्"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "।"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "पुरानो ब्राउजर पत्ता लाग्यो। यो एप प्रयोग गर्न कृपया आफ्नो ब्राउजर अपडेट गर्नुहोस्।"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "यो लिङ्क रद्द गर्नुहोस् र नयाँ लिङ्क सिर्जना गर्नुहोस्।"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "पुरानो"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "तिमी"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw को नयाँ संस्करण उपलब्ध छ। जारी राख्न कृपया पृष्ठ पुन: लोड गर्नुहोस्।"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "तपाईंलाई समूहमा आमन्त्रित गरिएको छ "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "आफ्नो इमेल ठेगाना प्रविष्ट गर्नुहोस्।"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "म्यानुअल रूपमा सामग्री आयात गर्न यी चरणहरू पालना गर्नुहोस्:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "समूह सेटिङहरू"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "बिर्सनुहोस्"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "समूह छोड्नुहोस्..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "फाइल पुन: नामाकरण गर्नुहोस्"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "होइन, धन्यवाद"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "सम्पादन जारी राख्न कृपया कोठालाई आफ्ना फाइलहरूमा प्रतिलिपि गर्नुहोस्।"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "प्रमाणीकरण कोडको लागि आफ्नो इमेल जाँच गर्नुहोस्।"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "मेरो फाइलहरूमा प्रतिलिपि गर्नुहोस्"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "निमन्त्रणा लिङ्क प्रतिलिपि गरियो"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "गुगल मार्फत साइन इन गर्नुहोस्"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK प्रयोग गरेर निर्माण गर्नुहोस्"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "यो महिना"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "प्रयोगका सर्तहरू"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "फाइलको लिङ्क थप्नुहोस्"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "उज्यालो"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "कोड प्राप्त गर्नुभएन? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " पुन: पठाउनुहोस्"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "।"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "पृष्ठभूमि"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "निमन्त्रणा स्वीकार गर्न साइन इन गर्नुहोस्"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "अतिथि प्रयोगकर्ता"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "इमेल ठेगाना"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "फाइल URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "साइन इन गर्नुहोस्"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "मालिक"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "साझेदारी गर्न साइन इन गर्नुहोस्"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "अनपिन गर्नुहोस्"
+      "value": "स्वीकार गर्नुहोस् र समूहमा सामेल हुनुहोस्"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": " द्वारा साझा गरिएको"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "tldr फाइलहरू अपलोड गर्नुहोस्"
+      "value": "साझेदारी बारे थप जान्नुहोस्।"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "साझेदारी बारे थप जान्नुहोस्।"
+      "value": "tldraw सुधार गर्न हामीलाई मद्दत गर्न "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " लाई अनुमति दिनुहोस्।"
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "आवश्यक कुकीजहरू"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "समूहको नाम"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "आमन्त्रित गर्नुहोस्"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "कम देखाउनुहोस्"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "साइन आउट गर्नुहोस्"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "बचत गर्नुहोस्"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "साइडबार टगल गर्नुहोस्"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "सुरु गर्नु अघि, कृपया हाम्रो "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "प्रयोगका सर्तहरू"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " र "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "गोपनीयता नीति"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " स्वीकार गर्नुहोस्।"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "फेरि प्रयास गर्नुहोस्"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "स्वीकार गर्नुहोस् र जारी राख्नुहोस्"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "सामग्री हेर्न यहाँ जानुहोस्"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "तपाईंले समूहहरूको अधिकतम संख्यामा पुग्नुभएको छ। नयाँ समूहहरू सिर्जना गर्नु अघि तपाईंले पुराना समूहहरू मेटाउन आवश्यक छ।"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "निमन्त्रणा मात्र"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "अमान्य tldraw फाइल URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "एप डिबग फ्ल्यागहरू"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "सदस्यहरूलाई आमन्त्रित गर्नुहोस्"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "निमन्त्रणाको लिङ्क प्रतिलिपि गर्नुहोस्"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "कानुनी सारांश"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "व्यवस्थापक"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "सेवाका सर्तहरू"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "वा"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "पिन"
+      "value": "खतरा क्षेत्र"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " पढ्नुहोस्।"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "सदस्यहरू"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "सेटिङहरू"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "के तपाईं यो समूह छोड्न निश्चित हुनुहुन्छ?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "गोपनीयता नीति"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "प्रतिलिपि गरिएको लिङ्क"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "फाइलको लिङ्क थप्नुहोस्..."
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/nl.json b/apps/dotcom/client/public/tla/locales-compiled/nl.json
index 44b98c454645..366b4c531c98 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/nl.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/nl.json
@@ -51,6 +51,12 @@
       "value": "Rekening"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Maak een gratis account aan om uw werk op te slaan, in realtime samen te werken en meer."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Bestandsmenu"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw is een gratis en direct beschikbaar virtueel whiteboard."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publiceren"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Groep verlaten"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Bestand losmaken"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exporteren als"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Meer weergeven"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Groep verwijderen"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Deze ruimte nadert zijn maximale grootte. Overweeg om wat inhoud te verwijderen of een nieuw bestand te maken."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Groep aanmaken"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Uploaden mislukt"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Mijn bestanden"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Markering ontbreekt"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Link toevoegen"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Doorgaan met e-mail"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pinbestand"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Plak de URL van het tldraw-bestand..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Weet u zeker dat u dit bestand wilt vergeten?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Naam"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Opnieuw laden"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Groep verwijderen…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Weet u zeker dat u deze groep wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Privacybeleid"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Sleep bestanden hierheen, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "maak een bestand"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " of "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopieer de uitnodigingslink"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " om te beginnen."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Oude browser gedetecteerd. Werk uw browser bij om deze app te gebruiken."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Trek deze link in en maak een nieuwe."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Ouder"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Jij"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Er is een nieuwe versie van tldraw beschikbaar. Laad de pagina opnieuw om verder te gaan."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Je bent uitgenodigd voor groep "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Voer uw e-mailadres in"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Volg deze stappen om de inhoud handmatig te importeren:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Groepsinstellingen"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Vergeten"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Groep verlaten…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "Bestand hernoemen"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nee bedankt"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Om door te kunnen gaan met bewerken, kopieer je de kamer naar je bestanden."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Controleer uw e-mail voor een verificatiecode."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "Kopieer naar mijn bestanden"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Gekopieerde uitnodigingslink"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Aanmelden met Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Bouwen met de tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Deze maand"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Gebruiksvoorwaarden"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Bestandslink toevoegen"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Licht"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Geen code ontvangen? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Opnieuw verzenden"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "Achtergrond"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Meld u aan om de uitnodiging te accepteren"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "Gastgebruiker"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-mailadres"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Bestands-URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Aanmelden"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Eigenaar"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "Meld je aan om te delen"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Losmaken"
+      "value": "Accepteren en lid worden van de groep"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1021,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Upload .tldr-bestanden"
+      "value": "Meer informatie over delen."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Meer informatie over delen."
+      "value": "Sta "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " toe om ons te helpen tldraw te verbeteren."
     }
   ],
   "c303bd1095": [
@@ -787,6 +1059,12 @@
       "value": "Essentiële cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Groepsnaam"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1077,24 @@
       "value": "Uitnodiging"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Minder weergeven"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Afmelden"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Redden"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1125,40 @@
       "value": "Schakel zijbalk in"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Voordat u begint, accepteert u onze "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "gebruiksvoorwaarden"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " en ons "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "privacybeleid"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1171,82 @@
       "value": "Probeer het opnieuw"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Accepteren en doorgaan"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Ga hierheen om de inhoud te bekijken"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Je hebt het maximale aantal groepen bereikt. Je moet oude groepen verwijderen voordat je nieuwe kunt aanmaken."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Alleen op uitnodiging"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Ongeldige tldraw-bestands-URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "App-debug vlaggen"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Nodig leden uit"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopieer uitnodigingslink"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Juridische samenvatting"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Beheerder"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Servicevoorwaarden"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "of"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Vastmaken"
+      "value": "Gevarenzone"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1305,12 @@
       "value": " voor meer informatie."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Leden"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1353,18 @@
       "value": "Instellingen"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Weet u zeker dat u deze groep wilt verlaten?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Privacybeleid"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1383,12 @@
       "value": "Gekopieerde link"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Bestandskoppeling toevoegen…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/no.json b/apps/dotcom/client/public/tla/locales-compiled/no.json
index 5870b3306aa6..9ca9149564d9 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/no.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/no.json
@@ -51,6 +51,12 @@
       "value": "Konto"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Opprett en gratis konto for å lagre arbeidet ditt, samarbeide i sanntid og mer."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Fil-menyen"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw er en gratis og umiddelbar virtuell tavle."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Utgi"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Forlat gruppen"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Løsne filen"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Eksporter som"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Vis mer"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Slett gruppe"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Dette rommet nærmer seg størrelsesgrensen. Vurder å fjerne noe innhold eller starte en ny fil."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Opprett gruppe"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Opplasting mislyktes"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Mine filer"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Utheving mangler"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Legg til lenke"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Redaktør"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Fortsett med e-post"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldra"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fest filen"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Lim inn URL-en til tldraw-filen..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Er du sikker på at du vil glemme denne filen?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Navn"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Last inn på nytt"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Slett gruppe…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Er du sikker på at du vil slette denne gruppen? Denne handlingen kan ikke angres."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Personvernerklæring"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Dra filer hit, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "opprett en fil"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", eller "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopier invitasjonslenken"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " for å komme i gang."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Gammel nettleser oppdaget. Oppdater nettleseren din for å bruke denne appen."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Tilbakekalle denne lenken og opprett en ny."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Eldre"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "du"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "En ny versjon av tldraw er tilgjengelig. Last inn siden på nytt for å fortsette."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Du har blitt invitert til gruppen "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Skriv inn e-postadressen din"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Følg disse trinnene for å importere innholdet manuelt:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Gruppeinnstillinger"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Glemme"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Forlat gruppen…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Gi nytt navn til filen"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nei takk"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "For å fortsette redigeringen, kopier rommet til filene dine."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Sjekk e-posten din for en bekreftelseskode."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopier til filene mine"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kopierte invitasjonslenken"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Logg inn med Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Bygg med tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Denne måneden"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Bruksvilkår"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Legg til fillenke"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Lys"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Fikk du ikke en kode? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Send på nytt"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Bakgrunn"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Logg inn for å godta invitasjonen"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Gjestebruker"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-postadresse"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Fil-URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Logg på"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Eier"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Logg inn for å dele"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Løsne"
+      "value": "Godta og bli med i gruppen"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Last opp .tldr-filer"
+      "value": "Finn ut mer om deling."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Finn ut mer om deling."
+      "value": "Tillat "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analyse"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " for å hjelpe oss med å forbedre tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Viktige informasjonskapsler"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Gruppenavn"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Invitere"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Vis mindre"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Logg ut"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Spare"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Bytt sidefelt"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Før du starter, vennligst godta våre "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "bruksvilkår"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " og "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "personvernerklæring"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Prøv igjen"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Godta og fortsett"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Gå hit for å se innholdet"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Du har nådd maksimalt antall grupper. Du må slette gamle grupper før du oppretter nye."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Kun invitasjon"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Ugyldig URL-adresse for tldraw-filen"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "App-feilsøkingsflagg"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Inviter medlemmer"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopier invitasjonslenken"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Juridisk sammendrag"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Vilkår for bruk"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "eller"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Faresone"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " for å lære mer."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Medlemmer"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Innstillinger"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Er du sikker på at du vil forlate denne gruppen?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Personvernerklæring"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Kopiert lenke"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Legg til fillenke…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/pa.json b/apps/dotcom/client/public/tla/locales-compiled/pa.json
index 6d5f45b8963c..508a538a503e 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/pa.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/pa.json
@@ -51,6 +51,12 @@
       "value": "ਖਾਤਾ"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "ਆਪਣੇ ਕੰਮ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ, ਰੀਅਲ-ਟਾਈਮ ਵਿੱਚ ਸਹਿਯੋਗ ਕਰਨ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ਕਰਨ ਲਈ ਇੱਕ ਮੁਫ਼ਤ ਖਾਤਾ ਬਣਾਓ।"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ਫਾਈਲ ਮੀਨੂ"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ਇੱਕ ਮੁਫ਼ਤ ਅਤੇ ਤੁਰੰਤ ਵਰਚੁਅਲ ਵ੍ਹਾਈਟਬੋਰਡ ਹੈ।"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "ਪ੍ਰਕਾਸ਼ਿਤ ਕਰੋ"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "ਗਰੁੱਪ ਛੱਡੋ"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ਫਾਈਲ ਨੂੰ ਅਨਪਿੰਨ ਕਰੋ"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "ਦੇ ਰੂਪ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "ਹੋਰ ਦਿਖਾਓ"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "ਗਰੁੱਪ ਮਿਟਾਓ"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "ਇਹ ਕਮਰਾ ਆਪਣੀ ਆਕਾਰ ਸੀਮਾ ਦੇ ਨੇੜੇ ਆ ਰਿਹਾ ਹੈ। ਕੁਝ ਸਮੱਗਰੀ ਨੂੰ ਹਟਾਉਣ ਜਾਂ ਇੱਕ ਨਵੀਂ ਫਾਈਲ ਸ਼ੁਰੂ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰ ਕਰੋ।"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "ਗਰੁੱਪ ਬਣਾਓ"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "ਅੱਪਲੋਡ ਅਸਫਲ ਰਿਹਾ"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "ਮੇਰੀਆਂ ਫਾਈਲਾਂ"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: ਹਾਈਲਾਈਟ ਗੁੰਮ ਹੈ"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "ਸੰਪਾਦਕ"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ਈਮੇਲ ਨਾਲ ਜਾਰੀ ਰੱਖੋ"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ਫਾਈਲ ਪਿੰਨ ਕਰੋ"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ਫਾਈਲ URL ਪੇਸਟ ਕਰੋ..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਇਸ ਫ਼ਾਈਲ ਨੂੰ ਭੁੱਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "ਨਾਮ"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "ਰੀਲੋਡ ਕਰੋ"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "ਗਰੁੱਪ ਮਿਟਾਓ..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਇਸ ਸਮੂਹ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "ਪਰਾਈਵੇਟ ਨੀਤੀ"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫਾਈਲਾਂ ਨੂੰ ਇੱਥੇ ਘਸੀਟੋ, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ਇੱਕ ਫਾਈਲ ਬਣਾਓ"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", ਜਾਂ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ਸੱਦਾ ਲਿੰਕ ਕਾਪੀ ਕਰੋ"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "।"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "ਪੁਰਾਣਾ ਬ੍ਰਾਊਜ਼ਰ ਮਿਲਿਆ। ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਬ੍ਰਾਊਜ਼ਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ।"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "ਇਸ ਲਿੰਕ ਨੂੰ ਰੱਦ ਕਰੋ ਅਤੇ ਇੱਕ ਨਵਾਂ ਬਣਾਓ।"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "ਪੁਰਾਣੀ"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ਤੁਸੀਂ"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw ਦਾ ਇੱਕ ਨਵਾਂ ਵਰਜਨ ਉਪਲਬਧ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਪੰਨੇ ਨੂੰ ਰੀਲੋਡ ਕਰੋ।"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "ਤੁਹਾਨੂੰ ਗਰੁੱਪ ਵਿੱਚ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "ਆਪਣਾ ਈਮੇਲ ਪਤਾ ਦਰਜ ਕਰੋ"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "ਸਮੱਗਰੀ ਨੂੰ ਹੱਥੀਂ ਆਯਾਤ ਕਰਨ ਲਈ ਇਹਨਾਂ ਕਦਮਾਂ ਦੀ ਪਾਲਣਾ ਕਰੋ:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "ਗਰੁੱਪ ਸੈਟਿੰਗਾਂ"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "ਭੁੱਲ ਜਾਓ"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "ਗਰੁੱਪ ਛੱਡੋ…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "ਫਾਈਲ ਦਾ ਨਾਮ ਬਦਲੋ"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "ਨਹੀਂ ਧੰਨਵਾਦ"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "ਸੰਪਾਦਨ ਜਾਰੀ ਰੱਖਣ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਕਮਰੇ ਨੂੰ ਆਪਣੀਆਂ ਫਾਈਲਾਂ ਵਿੱਚ ਕਾਪੀ ਕਰੋ।"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "ਪੁਸ਼ਟੀਕਰਨ ਕੋਡ ਲਈ ਆਪਣੀ ਈਮੇਲ ਦੀ ਜਾਂਚ ਕਰੋ।"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "ਮੇਰੀਆਂ ਫਾਈਲਾਂ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "ਸੱਦਾ ਲਿੰਕ ਕਾਪੀ ਕੀਤਾ ਗਿਆ"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "ਗੂਗਲ ਨਾਲ ਸਾਈਨ ਇਨ ਕਰੋ"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK ਨਾਲ ਬਣਾਓ"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "ਇਸ ਮਹੀਨੇ"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ਵਰਤੋ ਦੀਆਂ ਸ਼ਰਤਾਂ"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ਫਾਈਲ ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "ਰੋਸ਼ਨੀ"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "ਕੀ ਕੋਡ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਇਆ? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ਮੁੜ ਭੇਜੋ"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "।"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "ਪਿਛੋਕੜ"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "ਸੱਦਾ ਸਵੀਕਾਰ ਕਰਨ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "ਮਹਿਮਾਨ ਉਪਭੋਗਤਾ"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ਈਮੇਲ ਪਤਾ"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ਫਾਈਲ URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "ਸਾਈਨ - ਇਨ"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "ਮਾਲਕ"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "ਅਨਪਿੰਨ ਕਰੋ"
+      "value": "ਸਵੀਕਾਰ ਕਰੋ ਅਤੇ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": " ਦੁਆਰਾ ਸਾਂਝਾ ਕੀਤਾ ਗਿਆ"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr ਫ਼ਾਈਲਾਂ ਅੱਪਲੋਡ ਕਰੋ"
+      "value": "ਸਾਂਝਾ ਕਰਨ ਬਾਰੇ ਹੋਰ ਜਾਣੋ।"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "ਸਾਂਝਾ ਕਰਨ ਬਾਰੇ ਹੋਰ ਜਾਣੋ।"
+      "value": "tldraw ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਵਿੱਚ ਸਾਡੀ ਮਦਦ ਕਰਨ ਲਈ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ਵਿਸ਼ਲੇਸ਼ਣ"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ਨੂੰ ਆਗਿਆ ਦਿਓ।"
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "ਜ਼ਰੂਰੀ ਕੂਕੀਜ਼"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "ਸਮੂਹ ਦਾ ਨਾਮ"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "ਸੱਦਾ ਦਿਓ"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "ਘੱਟ ਦਿਖਾਓ"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "ਸਾਇਨ ਆਉਟ"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "ਸੇਵ ਕਰੋ"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "ਸਾਈਡਬਾਰ ਨੂੰ ਟੌਗਲ ਕਰੋ"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਕਿਰਪਾ ਕਰਕੇ ਸਾਡੀਆਂ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ਵਰਤੋਂ ਦੀਆਂ ਸ਼ਰਤਾਂ"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " ਅਤੇ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ਗੋਪਨੀਯਤਾ ਨੀਤੀ"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " ਨੂੰ ਸਵੀਕਾਰ ਕਰੋ।"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "ਸਵੀਕਾਰ ਕਰੋ ਅਤੇ ਜਾਰੀ ਰੱਖੋ"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "ਸਮੱਗਰੀ ਨੂੰ ਦੇਖਣ ਲਈ ਇੱਥੇ ਜਾਓ"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "ਤੁਸੀਂ ਸਮੂਹਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ 'ਤੇ ਪਹੁੰਚ ਗਏ ਹੋ। ਤੁਹਾਨੂੰ ਨਵੇਂ ਸਮੂਹ ਬਣਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਰਾਣੇ ਸਮੂਹਾਂ ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "ਸਿਰਫ਼ ਸੱਦਾ ਦਿਓ"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "ਅਵੈਧ tldraw ਫਾਈਲ URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ਐਪ ਡੀਬੱਗ ਫਲੈਗ"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "ਮੈਂਬਰਾਂ ਨੂੰ ਸੱਦਾ ਦਿਓ"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "ਸੱਦਾ ਲਿੰਕ ਕਾਪੀ ਕਰੋ"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "ਕਾਨੂੰਨੀ ਸਾਰ"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "ਐਡਮਿਨ"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ਜਾਂ"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "ਪਿੰਨ"
+      "value": "ਖ਼ਤਰੇ ਵਾਲਾ ਖੇਤਰ"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " ਪੜ੍ਹੋ।"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "ਮੈਂਬਰ"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "ਸੈਟਿੰਗਾਂ"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਇਸ ਸਮੂਹ ਨੂੰ ਛੱਡਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "ਪਰਾਈਵੇਟ ਨੀਤੀ"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "ਲਿੰਕ ਕਾਪੀ ਕੀਤਾ ਗਿਆ"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ਫਾਈਲ ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/pl.json b/apps/dotcom/client/public/tla/locales-compiled/pl.json
index 896b8c764d29..70c538e9b5a8 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/pl.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/pl.json
@@ -51,6 +51,12 @@
       "value": "Konto"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Załóż bezpłatne konto, aby zapisać swoją pracę, współpracować w czasie rzeczywistym i nie tylko."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu pliku"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw to darmowa i natychmiastowa wirtualna tablica."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Opublikuj"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Opuść grupę"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Odepnij plik"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Eksportuj jako"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Pokaż więcej"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Usuń grupę"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Ten pokój zbliża się do limitu rozmiaru. Rozważ usunięcie części zawartości lub utworzenie nowego pliku."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Utwórz grupę"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Przesyłanie nie powiodło się"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Moje pliki"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Brak wyróżnienia"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Dodaj link"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Edytor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Kontynuuj z e-mailem"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Przypnij plik"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Wklej adres URL pliku tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Czy na pewno chcesz zapomnieć ten plik?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nazwa"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Załaduj ponownie"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Usuń grupę…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Czy na pewno chcesz usunąć tę grupę? Tej czynności nie można cofnąć."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Polityka prywatności"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Przeciągnij pliki tutaj, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "utwórz plik"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " lub "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "skopiuj link zaproszenia"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": ", aby rozpocząć."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Wykryto starą przeglądarkę. Zaktualizuj przeglądarkę, aby korzystać z tej aplikacji."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Usuń ten link i utwórz nowy."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Starszy"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Ty"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Dostępna jest nowa wersja tldraw. Aby kontynuować, odśwież stronę."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Zostałeś zaproszony do grupy "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Podaj swój adres e-mail"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Aby ręcznie zaimportować zawartość, wykonaj następujące czynności:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Ustawienia grupy"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Zapomnij"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Opuść grupę…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Zmień nazwę pliku"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nie, dziękuję"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Aby kontynuować edycję, skopiuj pokój do swoich plików."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Sprawdź swoją skrzynkę e-mail, aby uzyskać kod weryfikacyjny."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopiuj do moich plików"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Skopiowano link zaproszenia"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Zaloguj się za pomocą Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Kompilacja z użyciem zestawu SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "W tym miesiącu"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Warunki korzystania"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Dodaj link do pliku"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Jasny"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Nie otrzymałeś kodu? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Wyślij ponownie"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Tło"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Zaloguj się, aby zaakceptować zaproszenie"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Użytkownik gość"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Adres e-mail"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Adres URL pliku"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Zaloguj się"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Właściciel"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Zaloguj się, aby udostępnić"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Odepnij"
+      "value": "Zaakceptuj i dołącz do grupy"
     }
   ],
   "bbbcefd7ce": [
@@ -775,16 +1033,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Prześlij pliki .tldr"
+      "value": "Dowiedz się więcej o udostępnianiu."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Dowiedz się więcej o udostępnianiu."
+      "value": "Zezwól na "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": ", aby pomóc nam ulepszyć tldraw."
     }
   ],
   "c303bd1095": [
@@ -799,6 +1071,12 @@
       "value": "Niezbędne pliki cookie"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nazwa grupy"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -811,12 +1089,24 @@
       "value": "Zaproś"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Pokaż mniej"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Wyloguj się"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Ratować"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -847,6 +1137,40 @@
       "value": "Przełącz pasek boczny"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Przed rozpoczęciem prosimy o zaakceptowanie naszych "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "warunków korzystania"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " i "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "polityki prywatności"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -859,40 +1183,82 @@
       "value": "Spróbuj ponownie"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Akceptuj i kontynuuj"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Kliknij tutaj, aby zobaczyć zawartość"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Osiągnięto maksymalną liczbę grup. Aby utworzyć nowe, należy usunąć stare grupy."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Tylko z zaproszeniem"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Nieprawidłowy adres URL pliku tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Oznaczenia debugowania aplikacji"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Zaproś członków"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopiuj link zaproszenia"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Podsumowanie prawne"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrator"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Warunki korzystania z usługi"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "Lub"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pinezka"
+      "value": "Strefa niebezpieczna"
     }
   ],
   "ea4788705e": [
@@ -951,6 +1317,12 @@
       "value": "."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Członkowie"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -993,6 +1365,18 @@
       "value": "Ustawienia"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Czy na pewno chcesz opuścić tę grupę?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Polityka prywatności"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1011,6 +1395,12 @@
       "value": "Skopiowany link"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Dodaj link do pliku…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/pt-br.json b/apps/dotcom/client/public/tla/locales-compiled/pt-br.json
index c5f829158fa7..94eaeeb2bc97 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/pt-br.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/pt-br.json
@@ -51,6 +51,12 @@
       "value": "Conta"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Crie uma conta gratuita para salvar seu trabalho, colaborar em tempo real e muito mais."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Guia do arquivo"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "O tldraw é um quadro branco virtual gratuito e instantâneo."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publicar"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Sair do grupo"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Desafixar arquivo"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportar como"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mostrar mais"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Excluir grupo"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Esta sala está se aproximando do limite de tamanho. Considere remover algum conteúdo ou iniciar um novo arquivo."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Criar grupo"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Falha ao fazer upload"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Meus arquivos"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Destaque ausente"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Adicionar link"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continuar com o e-mail"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Arquivo PIN"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Cole o URL do arquivo tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Tem certeza de que deseja esquecer este arquivo?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nome"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Recarregar"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Excluir grupo…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Tem certeza de que deseja excluir este grupo? Esta ação não pode ser desfeita."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Política de Privacidade"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Arraste os arquivos para cá, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "criar um arquivo"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ou "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copiar link de convite"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " para começar."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Navegador antigo detectado. Atualize seu navegador para usar este aplicativo."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revogue este link e crie um novo."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Anterior"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "você"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Uma nova versão do tldraw está disponível. Recarregue a página para continuar."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Você foi convidado(a) para o grupo "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Insira seu endereço de e-mail"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Siga estas etapas para importar o conteúdo manualmente:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Configurações de grupo"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Esquecer"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Sair do grupo…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Renomear arquivo"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Não, obrigado"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Para continuar editando, copie a sala para seus arquivos."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Verifique seu e-mail para obter um código de verificação."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copiar para meus arquivos"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Link do convite copiado"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Iniciar sessão com o Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Construir com o SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Este mês"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Termos de Uso"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Adicionar link do arquivo"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Modo claro"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Não recebeu o código? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Reenviar"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Informações gerais"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Faça login para aceitar o convite."
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Usuário convidado"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Endereço de email"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL do arquivo"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Fazer login"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Proprietário"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Entre para compartilhar"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Desafixar"
+      "value": "Aceitar e entrar no grupo"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Fazer upload de arquivos .tldr"
+      "value": "Saiba mais sobre como compartilhar."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Saiba mais sobre como compartilhar."
+      "value": "Permitir "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "análises"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " para nos ajudar a melhorar o tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Cookies essenciais"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nome do grupo"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Convidar"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Mostrar menos"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Sair"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Salvar"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Alternar barra lateral"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Antes de começar, aceite nossos "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "termos de uso"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " e "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "política de privacidade"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Tente novamente"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Aceitar e continuar"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Clique aqui para visualizar o conteúdo"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Você atingiu o número máximo de grupos. É necessário excluir os grupos antigos antes de criar novos."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Apenas para convidados"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL de arquivo tldraw inválida"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Sinalizadores de depuração de aplicativos"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Convide membros"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copiar link de convite"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Resumo jurídico"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrador"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Termos de serviço"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ou"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Fixar"
+      "value": "Zona de perigo"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " para saber mais."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membros"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Configurações"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Tem certeza de que deseja sair deste grupo?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "política de Privacidade"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Link copiado"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Adicionar link do arquivo…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/pt-pt.json b/apps/dotcom/client/public/tla/locales-compiled/pt-pt.json
index edbf766ce4df..c83d31dd17af 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/pt-pt.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/pt-pt.json
@@ -51,6 +51,12 @@
       "value": "Conta"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Crie uma conta gratuita para salvar seu trabalho, colaborar em tempo real e muito mais."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu Ficheiro"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "O tldraw é um quadro branco virtual gratuito e instantâneo."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publicar"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Sair do grupo"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Desafixar arquivo"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportar como"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Mostrar mais"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Excluir grupo"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Esta sala está se aproximando do limite de tamanho. Considere remover algum conteúdo ou iniciar um novo arquivo."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Criar grupo"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "O carregamento falhou"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Meus arquivos"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Realce em falta"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Adicionar link"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continuar com o e-mail"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Arquivo PIN"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Cole o URL do arquivo tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Tem a certeza de que quer esquecer este ficheiro?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nome"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Recarregar"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Excluir grupo…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Tem certeza de que deseja excluir este grupo? Esta ação não pode ser desfeita."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Política de Privacidade"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Arraste os arquivos para cá, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "criar um arquivo"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ou "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copiar link de convite"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " para começar."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Navegador antigo detectado. Atualize seu navegador para usar este aplicativo."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revogue este link e crie um novo."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Mais antigo"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "você"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Uma nova versão do tldraw está disponível. Recarregue a página para continuar."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Você foi convidado(a) para o grupo "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Insira seu endereço de e-mail"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Siga estes passos para importar o conteúdo manualmente:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Configurações de grupo"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Esquecer"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Sair do grupo…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Renomear arquivo"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Não, obrigado"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Para continuar editando, copie a sala para seus arquivos."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Verifique seu e-mail para obter um código de verificação."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copiar para os meus ficheiros"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Link do convite copiado"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Iniciar sessão com o Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Construir com o SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Este mês"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Termos de Uso"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Adicionar link do arquivo"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Claro"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Não recebeu o código? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Reenviar"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Fundo"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Faça login para aceitar o convite."
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Usuário convidado"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Endereço de email"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL do arquivo"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Iniciar sessão"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Proprietário"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Entre para compartilhar"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Desafixar"
+      "value": "Aceitar e entrar no grupo"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Carregar ficheiros .tldr"
+      "value": "Saiba mais sobre partilha."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Saiba mais sobre partilha."
+      "value": "Permitir "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "análises"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " para nos ajudar a melhorar o tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Cookies essenciais"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Nome do grupo"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Convidar"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Mostrar menos"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Terminar sessão"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Salvar"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Alternar barra lateral"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Antes de começar, aceite nossos "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "termos de uso"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " e "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "política de privacidade"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Tente de novo"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Aceitar e continuar"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Vá aqui para ver o conteúdo"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Você atingiu o número máximo de grupos. É necessário excluir os grupos antigos antes de criar novos."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Apenas por convite"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL de arquivo tldraw inválida"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Sinalizadores de depuração da aplicação"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Convide membros"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copiar link de convite"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Resumo jurídico"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrador"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Termos de serviço"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ou"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Afixar"
+      "value": "Zona de perigo"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " para saber mais."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membros"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Configurações"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Tem certeza de que deseja sair deste grupo?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "política de Privacidade"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Link copiado"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Adicionar link do arquivo…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ro.json b/apps/dotcom/client/public/tla/locales-compiled/ro.json
index 1dae81fdc16e..0ee0ac779aa9 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ro.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ro.json
@@ -51,6 +51,12 @@
       "value": "Cont"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Creează un cont gratuit pentru a-ți salva munca, a colabora în timp real și multe altele."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "meniul Fișier"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw este o tablă albă virtuală gratuită și instantanee."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publica"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Părăsește grupul"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Anulează fixarea fișierului"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportați ca"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Afișează mai multe"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Ștergeți grupul"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Această cameră se apropie de limita de dimensiune. Luați în considerare eliminarea unei părți din conținut sau începerea unui fișier nou."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Creați un grup"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Încărcarea nu a reușit"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Fișierele mele"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Evidențiați Lipsă"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Adăugați link"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Continuă cu e-mailul"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fișier fixat"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Lipiți adresa URL a fișierului tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Sigur vrei să uiți acest fișier?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Nume"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Reîncărcați"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Ștergeți grupul…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Sigur doriți să ștergeți acest grup? Această acțiune nu poate fi anulată."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Politica de confidențialitate"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Trageți fișierele aici, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "creați un fișier"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " sau "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copiați linkul de invitație"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " pentru a începe."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Browser vechi detectat. Vă rugăm să actualizați browserul pentru a utiliza această aplicație."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Revocați acest link și creați unul nou."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Mai în vârstă"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "tu"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Este disponibilă o nouă versiune de tldraw. Vă rugăm să reîncărcați pagina pentru a continua."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Ai fost invitat(ă) în grupul "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Introdu adresa ta de e-mail"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Urmați acești pași pentru a importa manual conținutul:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Setări de grup"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Uita"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Părăsește grupul…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Redenumiți fișierul"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nu, mulțumesc"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Pentru a continua editarea, vă rugăm să copiați camera în fișierele dvs."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Verifică-ți e-mailul pentru un cod de verificare."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Copiați în fișierele mele"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Link de invitație copiat"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Conectați-vă cu Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Construiți cu SDK-ul tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Luna aceasta"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Termeni de utilizare"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Adăugați linkul fișierului"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Aprinde"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Nu ați primit un cod? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Retrimiteți"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Fundal"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Conectați-vă pentru a accepta invitația"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Utilizator invitat"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Adresa de e-mail"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL-ul fișierului"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Conectare"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Proprietar"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Conectați-vă pentru a partaja"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Anulați fixarea"
+      "value": "Acceptă și alătură-te grupului"
     }
   ],
   "bbbcefd7ce": [
@@ -771,16 +1029,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Încărcați fișiere .tldr"
+      "value": "Aflați mai multe despre partajare."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Aflați mai multe despre partajare."
+      "value": "Permiteți `"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": "` să ne ajute să îmbunătățim tldraw."
     }
   ],
   "c303bd1095": [
@@ -795,6 +1067,12 @@
       "value": "Cookie-uri esențiale"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Numele grupului"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -807,12 +1085,24 @@
       "value": "Invita"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Afișează mai puțin"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Sign out"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Salva"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -843,6 +1133,40 @@
       "value": "Comutați bara laterală"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Înainte de a începe, vă rugăm să acceptați "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "termenii de utilizare"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " și "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "politica de confidențialitate"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -855,40 +1179,82 @@
       "value": "Încearcă din nou"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Acceptați și continuați"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Intră aici pentru a vedea conținutul"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Ați atins numărul maxim de grupuri. Trebuie să ștergeți grupurile vechi înainte de a crea altele noi."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Numai cu invitație"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Adresă URL fișier tldraw nevalidă"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Indicatori de depanare a aplicației"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Invită membri"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Copiați linkul de invitație"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Rezumat juridic"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administrator"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Termeni și condiții"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "sau"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Zonă periculoasă"
     }
   ],
   "ea4788705e": [
@@ -947,6 +1313,12 @@
       "value": " pentru a afla mai multe."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Membri"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -989,6 +1361,18 @@
       "value": "Setări"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Sigur vrei să părăsești acest grup?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Politica de confidențialitate"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1007,6 +1391,12 @@
       "value": "Link copiat"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Adăugați linkul fișierului…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ru.json b/apps/dotcom/client/public/tla/locales-compiled/ru.json
index efd7027297c7..167b12b13fcc 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ru.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ru.json
@@ -51,6 +51,12 @@
       "value": "Счет"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Создайте бесплатную учетную запись, чтобы сохранять свою работу, сотрудничать в режиме реального времени и многое другое."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Меню «Файл»"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw — бесплатная и мгновенная виртуальная доска."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Опубликовать"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Покинуть группу"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Открепить файл"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Экспортировать как"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Показать больше"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Удалить группу"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Размер этой комнаты приближается к пределу. Попробуйте удалить часть контента или создать новый файл."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Создать группу"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Загрузка не удалась"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Мои файлы"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Выделение отсутствует"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Добавить ссылку"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Редактор"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Продолжить с электронной почтой"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Закрепить файл"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Вставьте URL-адрес файла tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Вы уверены, что хотите забыть этот файл?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Имя"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Перезагрузить"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Удалить группу…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Вы уверены, что хотите удалить эту группу? Это действие не может быть отменено."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Политика конфиденциальности"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Перетащите файлы сюда, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "создайте файл"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " или "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "скопируйте ссылку приглашения"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": ", чтобы начать."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Обнаружен старый браузер. Пожалуйста, обновите браузер, чтобы использовать это приложение."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Отмените эту ссылку и создайте новую."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Старше"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ты"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Доступна новая версия tldraw. Пожалуйста, перезагрузите страницу, чтобы продолжить."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Вас пригласили в группу "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Введите свой адрес электронной почты"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Выполните следующие шаги, чтобы импортировать контент вручную:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Настройки группы"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Забыть"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Покинуть группу…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Переименовать файл"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Нет, спасибо"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Чтобы продолжить редактирование, скопируйте комнату в свои файлы."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Проверьте свою электронную почту на наличие проверочного кода."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Скопировать в мои файлы"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Скопированная ссылка-приглашение"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Войти через Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Сборка с помощью tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "В этом месяце"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Условия эксплуатации"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Добавить ссылку на файл"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Светлая"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Не получили код? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Отправить повторно"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Фон"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Войдите, чтобы принять приглашение"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Гость-пользователь"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Адрес электронной почты"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL-адрес файла"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Войти"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Владелец"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Войдите, чтобы поделиться"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Открепить"
+      "value": "Принять и присоединиться к группе"
     }
   ],
   "bbbcefd7ce": [
@@ -783,16 +1041,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Загрузить файлы .tldr"
+      "value": "Узнать больше о том, как поделиться."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Узнать больше о том, как поделиться."
+      "value": "Разрешите "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "аналитику"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " помочь нам улучшить tldraw."
     }
   ],
   "c303bd1095": [
@@ -807,6 +1079,12 @@
       "value": "Необходимые файлы cookie"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Название группы"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -819,12 +1097,24 @@
       "value": "Пригласить"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Показать меньше"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Выйти"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Сохранять"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -855,6 +1145,40 @@
       "value": "Переключить боковую панель"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Прежде чем начать, пожалуйста, примите наши "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "условия использования"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " и "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "политику конфиденциальности"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -867,40 +1191,82 @@
       "value": "Попробуйте еще раз"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Принять и продолжить"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Перейдите сюда, чтобы посмотреть контент"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Вы достигли максимального количества групп. Перед созданием новых групп необходимо удалить старые."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Только по приглашениям"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Неверный URL-адрес файла tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Флажки отладки приложений"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Пригласить участников"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Копировать ссылку приглашения"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Юридическое резюме"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Администратор"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Условия обслуживания"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "или"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Прикрепить"
+      "value": "Опасная зона"
     }
   ],
   "ea4788705e": [
@@ -959,6 +1325,12 @@
       "value": "."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Участники"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -1001,6 +1373,18 @@
       "value": "Настройки"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Вы уверены, что хотите покинуть эту группу?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "политика конфиденциальности"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1019,6 +1403,12 @@
       "value": "Скопированная ссылка"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Добавить ссылку на файл…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/sl.json b/apps/dotcom/client/public/tla/locales-compiled/sl.json
index d1cd956312d7..95fa7f111dfd 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/sl.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/sl.json
@@ -51,6 +51,12 @@
       "value": "Račun"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Ustvarite brezplačen račun za shranjevanje dela, sodelovanje v realnem času in še več."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Meni datoteke"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw je brezplačna in takojšnja virtualna tabla."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Objavi"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Zapusti skupino"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Odpri datoteko"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Izvozi kot"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Prikaži več"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Izbriši skupino"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Ta soba se bliža svoji omejitvi velikosti. Razmislite o odstranitvi nekaj vsebine ali ustvarjanju nove datoteke."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Ustvari skupino"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Nalaganje ni uspelo"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Moje datoteke"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Oznaka manjka"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Dodaj povezavo"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Urednik"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Nadaljuj z e-pošto"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pripni datoteko"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Prilepi URL datoteke tldraw ..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Ali ste prepričani, da želite pozabiti to datoteko?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Ime"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Ponovno naloži"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Izbriši skupino …"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Ali ste prepričani, da želite izbrisati to skupino? Tega dejanja ni mogoče razveljaviti."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Politika zasebnosti"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Za začetek povlecite datoteke sem, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ustvarite datoteko"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " ali "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopirajte povezavo za povabilo"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Zaznan je bil star brskalnik. Za uporabo te aplikacije posodobite brskalnik."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Prekliči to povezavo in ustvari novo."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Starejši"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ti"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Na voljo je nova različica tldraw. Za nadaljevanje znova naložite stran."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Povabljeni ste bili v skupino "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Vnesite svoj e-poštni naslov"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Za ročni uvoz vsebine sledite tem korakom:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Nastavitve skupine"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Pozabi"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Zapusti skupino …"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Preimenuj datoteko"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Ne, hvala."
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Za nadaljevanje urejanja kopirajte sobo v svoje datoteke."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Preverite svojo e-pošto za potrditveno kodo."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopiraj v moje datoteke"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Povezava za povabilo je bila kopirana"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Prijava z Googlom"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Zgradite s kompletom za razvoj programske opreme tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Ta mesec"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Pogoji uporabe"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Dodaj povezavo do datoteke"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Svetlo"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Niste prejeli kode? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Ponovno pošlji"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Ozadje"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Prijavite se, da sprejmete povabilo"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Gostujoči uporabnik"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-poštni naslov"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL datoteke"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Prijava"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Lastnik"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Prijavite se za skupno rabo"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Odpni"
+      "value": "Sprejmi in se pridruži skupini"
     }
   ],
   "bbbcefd7ce": [
@@ -775,16 +1033,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Naložite datoteke .tldr"
+      "value": "Preberite več o skupni rabi."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Preberite več o skupni rabi."
+      "value": "Dovoli "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": ", da nam pomaga izboljšati tldraw."
     }
   ],
   "c303bd1095": [
@@ -799,6 +1071,12 @@
       "value": "Bistveni piškotki"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Ime skupine"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -811,12 +1089,24 @@
       "value": "Povabi"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Prikaži manj"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Odjava"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Shrani"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -847,6 +1137,40 @@
       "value": "Preklopi stransko vrstico"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Preden začnete, sprejmite naše "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "pogoje uporabe"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " in "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "politiko zasebnosti"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -859,40 +1183,82 @@
       "value": "Poskusi znova"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Sprejmi in nadaljuj"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Za ogled vsebine pojdite sem"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Dosegli ste največje dovoljeno število skupin. Preden ustvarite nove skupine, morate izbrisati stare."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Samo povabljeni"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Neveljaven URL datoteke tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Zastavice za odpravljanje napak v aplikaciji"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Povabi člane"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopiraj povezavo za povabilo"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Pravni povzetek"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Skrbnik"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Pogoji storitve"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "ali"
+    }
+  ],
+  "ea0626ac5a": [
+    {
+      "type": 0,
+      "value": "Nevarno območje"
     }
   ],
   "ea4788705e": [
@@ -951,6 +1317,12 @@
       "value": "."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Člani"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -993,6 +1365,18 @@
       "value": "Nastavitve"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Ali ste prepričani, da želite zapustiti to skupino?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Pravilnik o zasebnosti"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1011,6 +1395,12 @@
       "value": "Povezava kopirana"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Dodaj povezavo do datoteke …"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/so.json b/apps/dotcom/client/public/tla/locales-compiled/so.json
index 39faa4bbd615..2a2a218fc242 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/so.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/so.json
@@ -51,6 +51,12 @@
       "value": "Xisaab"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Abuur akoon bilaasha si aad u badbaadiso shaqadaada, wax wada qabsato wakhtiga dhabta ah, iyo in ka badan."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Liiska faylka"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw waa sabuur cad oo bilaash ah oo degdeg ah."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Daabac"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Ka tag kooxda"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Furaha faylka"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Dhoofinta sida"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Wax badan muuji"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Kooxda tirtir"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Qolkan waxa uu ku soo dhawaanayaa cabbirkiisa. Tixgeli inaad tirtirto qaar ka mid ah nuxurka ama bilawdo fayl cusub."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Abuur koox"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Soo dejintu waa fashilantay"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Galalkayga"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Iftiimin Maqan"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Kudar xiriiriyaha"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Tafatire"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Ku sii wad iimaylka"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Gal gal"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Ku dheji URL faylka tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Ma hubtaa inaad rabto inaad ilowdo faylkan?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Magaca"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Dib u soo deji"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Tirtir kooxda…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Ma hubtaa inaad doonayso inaad tirtirto kooxdan? Tallaabadan lama noqon karo."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Siyaasada gaarka ah"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Halkan ku soo jiid faylasha, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "abuur fayl"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", ama "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "koobiyi xidhiidhka martiqaadka"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " si aad u bilowdo."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "browser hore waa la helay Fadlan cusboonaysii biraawsarkaaga si aad u isticmaasho abkan."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Ka noqo xiriirkan oo samee mid cusub."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Ka weyn"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "adiga"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Nooc cusub oo tldraw ah ayaa diyaar ah. Fadlan dib u soo deji bogga si aad u sii waddo."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Waxaa lagugu martiqaaday kooxda "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Geli ciwaanka iimaylkaaga"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Raac tillaabooyinkan si aad gacanta ugu soo dejiso waxa ku jira:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Dejinta kooxda"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Iska ilow"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Ka bax kooxda…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Magaca beddelo faylka"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Maya mahadsanid"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Si aad u sii waddo tafatirka fadlan ku koobi qolka faylashaada."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Hubi iimaylkaga koodka xaqiijinta"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Ku koobbi faylalkayga"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Xiriirinta martiqaadka oo la guuriyay"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Ku gal Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Ku dhis tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Bishan"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Shuruudaha Isticmaalka"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Kudar xiriirinta faylka"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Iftiin"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "kood ma helin? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "dib u dir "
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Asalkii hore"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Saxeex si aad u aqbasho martiqaadka"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Isticmaalaha martida"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Ciwaanka iimaylka"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL faylka"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Soo gal"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Mulkiilaha"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Saxiix si aad ula wadaagto"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Furi"
+      "value": "Aqbal oo ku biir kooxda"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Soo rar faylasha tldr"
+      "value": "Wax badan ka baro wadaagga"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Wax badan ka baro wadaagga"
+      "value": "Oggolow "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " inay naga caawiyaan horumarinta tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Kukiyada muhiimka ah"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Magaca kooxda"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "martiqaad"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Muuji wax yar"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Saxiix"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Badbaadin"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Beddel dhinaca bar"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Kahor intaadan bilaabin, fadlan aqbal "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "shuruudaha isticmaalka"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " iyo "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "siyaasadda asturnaanta"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Isku day Mar Kale"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Aqbal oo sii wad"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Tag halkan si aad u aragto waxa ku jira"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Waxaad gaadhay tirada ugu badan ee kooxaha Waxaad u baahan tahay inaad tirtirto kooxihii hore ka hor inta aanad abuurin kuwa cusub."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "martiqaad kaliya"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL faylka tldraw aan sax ahayn"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Calaamadaha cilladaha abka"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "martiqaad xubnaha"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Nuqul ka samee xidhiidhka martiqaadka"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Soo koobid sharci ah"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Shuruudaha adeegga"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "ama"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Aagga khatarta ah"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1305,12 @@
       "value": "a"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Xubnaha"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1353,18 @@
       "value": "Dejinta"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Ma hubtaa inaad doonayso inaad ka baxdo kooxdan?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Siyaasadda Qarsoonnimada"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1383,12 @@
       "value": "Xiriirinta la guuriyay"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Kudar xiriirinta faylka…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/sv.json b/apps/dotcom/client/public/tla/locales-compiled/sv.json
index b46e9241ca50..cf067ef4af8a 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/sv.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/sv.json
@@ -51,6 +51,12 @@
       "value": "Konto"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Skapa ett gratis konto för att spara ditt arbete, samarbeta i realtid och mer."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Arkivmenyn"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw är en gratis och omedelbar virtuell whiteboardtavla."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Publicera"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Lämna gruppen"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Lossa filen"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Exportera som"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Visa mer"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Ta bort grupp"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Det här rummet närmar sig sin storleksgräns. Överväg att ta bort en del innehåll eller starta en ny fil."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Skapa grupp"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Uppladdningen misslyckades"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Mina filer"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Markering saknas"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Lägg till länk"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Redigeringsverktyg"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Fortsätt med e-post"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Fäst fil"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Klistra in tldraw-filens URL..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Är du säker på att du vill glömma den här filen?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Namn"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Ladda om"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Radera grupp…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Är du säker på att du vill ta bort den här gruppen? Åtgärden kan inte ångras."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Sekretesspolicy"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Dra filer hit, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "skapa en fil"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " eller "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kopiera inbjudningslänken"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " för att komma igång."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Gammal webbläsare upptäckt. Uppdatera din webbläsare för att använda den här appen."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Återkalla den här länken och skapa en ny."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Äldre"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "du"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "En ny version av tldraw är tillgänglig. Ladda om sidan för att fortsätta."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Du har blivit inbjuden till gruppen "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Ange din e-postadress"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Följ dessa steg för att importera innehållet manuellt:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Gruppinställningar"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Glöm"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Lämna gruppen…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Byt namn på filen"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Nej tack"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "För att fortsätta redigera, kopiera rummet till dina filer."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Kontrollera din e-post för en verifieringskod."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopiera till mina filer"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kopierad inbjudningslänk"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Logga in med Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Bygg med tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Denna månad"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Användarvillkor"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Lägg till fillänk"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Ljus"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Fick du ingen kod? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Skicka igen"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Bakgrund"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Logga in för att acceptera inbjudan"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Gästanvändare"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-postadress"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Fil-URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Logga in"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Ägare"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Logga in för att dela"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Ta bort nål"
+      "value": "Godkänn och gå med i gruppen"
     }
   ],
   "bbbcefd7ce": [
@@ -767,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Ladda upp .tldr-filer"
+      "value": "Läs mer om delning."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Läs mer om delning."
+      "value": "Tillåt "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " för att hjälpa oss att förbättra tldraw."
     }
   ],
   "c303bd1095": [
@@ -791,6 +1063,12 @@
       "value": "Viktiga cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Gruppnamn"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -803,12 +1081,24 @@
       "value": "Bjud in"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Visa mindre"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Logga ut"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Spara"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -839,6 +1129,40 @@
       "value": "Aktivera sidofältet"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Innan du börjar, vänligen acceptera våra "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "användarvillkor"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " och "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "sekretesspolicy"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -851,40 +1175,82 @@
       "value": "Försök igen"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Acceptera och fortsätt"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Gå hit för att se innehållet"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Du har nått det maximala antalet grupper. Du måste ta bort gamla grupper innan du skapar nya."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Endast inbjudan"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Ogiltig URL för tldraw-fil"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Appfelsökningsflaggor"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Bjud in medlemmar"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopiera inbjudningslänken"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Juridisk sammanfattning"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Administration"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Användarvillkor"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
     {
       "type": 0,
-      "value": "Nåla fast"
+      "value": "eller"
+    }
+  ],
+  "ea0626ac5a": [
+    {
+      "type": 0,
+      "value": "Riskzon"
     }
   ],
   "ea4788705e": [
@@ -943,6 +1309,12 @@
       "value": " för att lära dig mer."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Medlemmar"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -985,6 +1357,18 @@
       "value": "Inställningar"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Är du säker på att du vill lämna den här gruppen?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Integritetspolicy"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1003,6 +1387,12 @@
       "value": "Länk kopierad"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Lägg till fillänk…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ta.json b/apps/dotcom/client/public/tla/locales-compiled/ta.json
index 4a339a5a80cf..f9dc8551f8fe 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ta.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ta.json
@@ -51,6 +51,12 @@
       "value": "கணக்கு"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "உங்கள் வேலையைச் சேமிக்க, நிகழ்நேரத்தில் ஒத்துழைக்க மற்றும் பலவற்றிற்கு இலவச கணக்கை உருவாக்கவும்."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "கோப்பு மெனு"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw என்பது ஒரு இலவச மற்றும் உடனடி மெய்நிகர் ஒயிட்போர்டு ஆகும்."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "வெளியிடு"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "குழுவிலிருந்து வெளியேறு"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "கோப்பை அகற்று"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "என ஏற்றுமதி செய்யவும்"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "மேலும் காட்டு"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "குழுவை நீக்கு"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "இந்த அறை அதன் அளவு வரம்பை நெருங்குகிறது. சில உள்ளடக்கங்களை அகற்றுவது அல்லது புதிய கோப்பைத் தொடங்குவது பற்றி பரிசீலிக்கவும்."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "குழுவை உருவாக்கு"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "பதிவேற்றம் தோல்வியடைந்தது"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "எனது கோப்புகள்"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: ஹைலைட் இல்லை"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "இணைப்பைச் சேர்"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "ஆசிரியர்"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "மின்னஞ்சலுடன் தொடரவும்"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "வரைதல்"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "கோப்பை பின் செய்"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw கோப்பு URL ஐ ஒட்டவும்..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "இந்தக் கோப்பை நிச்சயமாக மறக்க விரும்புகிறீர்களா?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "பெயர்"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "மீண்டும் ஏற்றவும்"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "குழுவை நீக்கு..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "இந்தக் குழுவை நீக்க விரும்புகிறீர்களா? இந்தச் செயலைச் செயல்தவிர்க்க முடியாது."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "தனியுரிமைக் கொள்கை"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "தொடங்குவதற்கு கோப்புகளை இங்கே இழுக்கவும், "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ஒரு கோப்பை உருவாக்கவும்"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", அல்லது "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " அழைப்பு இணைப்பை நகலெடுக்கவும்"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "பழைய உலாவி கண்டறியப்பட்டது. இந்தப் பயன்பாட்டைப் பயன்படுத்த உங்கள் உலாவியைப் புதுப்பிக்கவும்."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "இந்த இணைப்பை ரத்துசெய்து புதிய ஒன்றை உருவாக்கவும்."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "பழையது"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "நீ"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw இன் புதிய பதிப்பு கிடைக்கிறது. தொடர பக்கத்தை மீண்டும் ஏற்றவும்."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "நீங்கள் "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " குழுவிற்கு அழைக்கப்பட்டுள்ளீர்கள்"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "உங்கள் மின்னஞ்சல் முகவரியை உள்ளிடவும்"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "உள்ளடக்கத்தை கைமுறையாக இறக்குமதி செய்ய, இந்தப் படிகளைப் பின்பற்றவும்:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "குழு அமைப்புகள்"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "மறந்துவிடு"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "குழுவிலிருந்து வெளியேறு..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "கோப்பை மறுபெயரிடவும்"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "இல்லை நன்றி"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "தொடர்ந்து திருத்த, அறையை உங்கள் கோப்புகளில் நகலெடுக்கவும்."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "சரிபார்ப்புக் குறியீட்டிற்கு உங்கள் மின்னஞ்சலைப் பார்க்கவும்."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "எனது கோப்புகளுக்கு நகலெடுக்கவும்"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "அழைப்பு இணைப்பு நகலெடுக்கப்பட்டது"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google மூலம் உள்நுழையவும்"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK உடன் உருவாக்கவும்"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "இந்த மாதம்"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "பயன்பாட்டு விதிமுறைகள்"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "கோப்பு இணைப்பைச் சேர்க்கவும்"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "ஒளி"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "குறியீட்டைப் பெறவில்லையா? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "மீண்டும் அனுப்பு"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "பின்னணி"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "அழைப்பை ஏற்க உள்நுழையவும்."
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "விருந்தினர் பயனர்"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "மின்னஞ்சல் முகவரி"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "கோப்பு URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "உள்நுழைக"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "உரிமையாளர்"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "பகிர உள்நுழையவும்"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "அன்பின்"
+      "value": "ஏற்றுக்கொண்டு குழுவில் சேரவும்."
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1021,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr கோப்புகளைப் பதிவேற்றவும்"
+      "value": "பகிர்வது பற்றி மேலும் அறிக."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "பகிர்வது பற்றி மேலும் அறிக."
+      "value": "tldraw-வை மேம்படுத்த எங்களுக்கு உதவ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ஐ அனுமதிக்கவும்."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1059,12 @@
       "value": "அத்தியாவசிய குக்கீகள்"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "குழு பெயர்"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1077,24 @@
       "value": "அழைக்கவும்"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "குறைவாகக் காட்டு"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "வெளியேறு"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "சேமிக்கவும்"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1125,40 @@
       "value": "பக்கப்பட்டியை நிலைமாற்று"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "நீங்கள் தொடங்குவதற்கு முன், எங்கள் "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "பயன்பாட்டு விதிமுறைகள்"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " மற்றும் "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "தனியுரிமைக் கொள்கை"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " ஆகியவற்றை ஏற்றுக்கொள்ளுங்கள்."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1171,82 @@
       "value": "மீண்டும் முயற்சிக்கவும்"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "ஏற்றுக்கொண்டு தொடரவும்"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "உள்ளடக்கத்தைப் பார்க்க இங்கே செல்லவும்"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "நீங்கள் அதிகபட்ச குழுக்களின் எண்ணிக்கையை அடைந்துவிட்டீர்கள். புதியவற்றை உருவாக்குவதற்கு முன்பு பழைய குழுக்களை நீக்க வேண்டும்."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "அழை மட்டும்"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "தவறான tldraw கோப்பு URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "பயன்பாட்டு பிழைத்திருத்தக் கொடிகள்"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "உறுப்பினர்களை அழைக்கவும்"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "அழைப்பு இணைப்பை நகலெடு"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "சட்டச் சுருக்கம்"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "நிர்வாகம்"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "சேவை விதிமுறைகள்"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "அல்லது"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "பின்"
+      "value": "ஆபத்து மண்டலம்"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1305,12 @@
       "value": " படியுங்கள்."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "உறுப்பினர்கள்"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1353,18 @@
       "value": "அமைப்புகள்"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "இந்தக் குழுவிலிருந்து வெளியேற விரும்புகிறீர்களா?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "தனியுரிமைக் கொள்கை"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1383,12 @@
       "value": "நகலெடுக்கப்பட்ட இணைப்பு"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "கோப்பு இணைப்பைச் சேர்…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/te.json b/apps/dotcom/client/public/tla/locales-compiled/te.json
index 87f0175062e0..58bd8ebf7f88 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/te.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/te.json
@@ -51,6 +51,12 @@
       "value": "ఖాతా"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "మీ పనిని సేవ్ చేయడానికి, నిజ సమయంలో సహకరించడానికి మరియు మరిన్ని చేయడానికి ఉచిత ఖాతాను సృష్టించండి."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "ఫైల్ మెను"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw అనేది ఉచిత మరియు తక్షణ వర్చువల్ వైట్‌బోర్డ్."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "ప్రచురించండి"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "సమూహం నుండి నిష్క్రమించండి"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ఫైల్‌ను అన్‌పిన్ చేయి"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "ఇలా ఎగుమతి చేయండి"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "మరిన్ని చూపించు"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "సమూహాన్ని తొలగించు"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "ఈ గది దాని పరిమాణ పరిమితిని చేరుకుంటోంది. కొంత కంటెంట్‌ను తీసివేయడం లేదా కొత్త ఫైల్‌ను ప్రారంభించడం పరిగణించండి."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "సమూహాన్ని సృష్టించండి"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "అప్‌లోడ్ విఫలమైంది"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "నా ఫైళ్లు"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: హైలైట్ లేదు"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "లింక్‌ను జోడించండి"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "ఎడిటర్"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ఇమెయిల్‌తో కొనసాగించండి"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "డ్రా"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ఫైల్‌ను పిన్ చేయండి"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw ఫైల్ URL ని అతికించండి..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "మీరు ఖచ్చితంగా ఈ ఫైల్‌ను మర్చిపోవాలనుకుంటున్నారా?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "పేరు"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "మళ్లీ లోడ్ చేయండి"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "సమూహాన్ని తొలగించు..."
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "మీరు ఈ సమూహాన్ని తొలగించాలనుకుంటున్నారా? ఈ చర్యను రద్దు చేయలేరు."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "గోప్యతా విధానం"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "ప్రారంభించడానికి ఫైల్‌లను ఇక్కడికి లాగండి, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ఫైల్‌ను సృష్టించండి"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " లేదా "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " ఆహ్వాన లింక్‌ను కాపీ చేయండి"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "పాత బ్రౌజర్ గుర్తించబడింది. ఈ యాప్‌ను ఉపయోగించడానికి దయచేసి మీ బ్రౌజర్‌ను అప్‌డేట్ చేయండి."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "ఈ లింక్‌ను ఉపసంహరించుకుని, కొత్తదాన్ని సృష్టించండి."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "పాతది"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "నువ్వు"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw యొక్క కొత్త వెర్షన్ అందుబాటులో ఉంది. కొనసాగించడానికి దయచేసి పేజీని మళ్లీ లోడ్ చేయండి."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "మీరు "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " గుంపుకు ఆహ్వానించబడ్డారు"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "మీ ఇమెయిల్ చిరునామాను నమోదు చేయండి"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "కంటెంట్‌ను మాన్యువల్‌గా దిగుమతి చేసుకోవడానికి ఈ దశలను అనుసరించండి:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "సమూహ సెట్టింగ్‌లు"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "మరచిపో"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "గ్రూప్ నుండి నిష్క్రమించండి..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "ఫైల్ పేరు మార్చండి"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "వద్దు ధన్యవాదాలు"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "సవరించడం కొనసాగించడానికి దయచేసి గదిని మీ ఫైల్‌లలోకి కాపీ చేయండి."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "ధృవీకరణ కోడ్ కోసం మీ ఇమెయిల్‌ను తనిఖీ చేయండి."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "నా ఫైల్‌లకు కాపీ చేయండి"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "ఆహ్వాన లింక్ కాపీ చేయబడింది"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google తో సైన్ ఇన్ చేయండి"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK తో నిర్మించండి"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "ఈ నెల"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "ఉపయోగ నిబంధనలు"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "ఫైల్ లింక్‌ను జోడించండి"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "కాంతి"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "కోడ్ రాలేదా? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": " మళ్ళీ పంపు"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "నేపథ్యం"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "ఆహ్వానాన్ని అంగీకరించడానికి సైన్ ఇన్ చేయండి"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "అతిథి వినియోగదారు"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ఇమెయిల్ చిరునామా"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "ఫైల్ URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "సైన్ ఇన్ చేయండి"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "యజమాని"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "షేర్ చేయడానికి సైన్ ఇన్ చేయండి"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "అన్‌పిన్ చేయండి"
+      "value": "అంగీకరించి, సమూహంలో చేరండి"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1021,30 @@
       "value": " ద్వారా భాగస్వామ్యం చేయబడింది"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr ఫైల్‌లను అప్‌లోడ్ చేయండి"
+      "value": "భాగస్వామ్యం చేయడం గురించి మరింత తెలుసుకోండి."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "భాగస్వామ్యం చేయడం గురించి మరింత తెలుసుకోండి."
+      "value": "tldraw ను మెరుగుపరచడంలో మాకు సహాయపడటానికి "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ని అనుమతించండి."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1059,12 @@
       "value": "ముఖ్యమైన కుక్కీలు"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "గ్రూప్ పేరు"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1077,24 @@
       "value": "ఆహ్వానించండి"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "తక్కువ చూపించు"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "సైన్ అవుట్ చేయండి"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "సేవ్ చేయండి"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1125,40 @@
       "value": "సైడ్‌బార్‌ని టోగుల్ చేయండి"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "మీరు ప్రారంభించడానికి ముందు, దయచేసి మా "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ఉపయోగ నిబంధనలు"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " మరియు "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "గోప్యతా విధానం"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "ను అంగీకరించండి."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1171,82 @@
       "value": "మళ్లీ ప్రయత్నించండి"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "అంగీకరించి కొనసాగించండి"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "కంటెంట్‌ని చూడటానికి ఇక్కడకు వెళ్లండి"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "మీరు గరిష్ట సంఖ్యలో సమూహాలను చేరుకున్నారు. కొత్త వాటిని సృష్టించే ముందు మీరు పాత సమూహాలను తొలగించాలి."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "ఆహ్వానం మాత్రమే"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "చెల్లని tldraw ఫైల్ URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "యాప్ డీబగ్ ఫ్లాగ్‌లు"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "సభ్యులను ఆహ్వానించండి"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "ఆహ్వాన లింక్‌ను కాపీ చేయి"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "చట్టపరమైన సారాంశం"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "అడ్మిన్"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "సేవా నిబంధనలు"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "లేదా"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "పిన్ చేయండి"
+      "value": "ప్రమాద ప్రాంతం"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1305,12 @@
       "value": " చదవండి."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "సభ్యులు"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1353,18 @@
       "value": "సెట్టింగులు"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "మీరు ఖచ్చితంగా ఈ గుంపు నుండి నిష్క్రమించాలనుకుంటున్నారా?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "గోప్యతా విధానం"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1383,12 @@
       "value": "లింక్ కాపీ చేయబడింది"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "ఫైల్ లింక్‌ను జోడించండి…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/th.json b/apps/dotcom/client/public/tla/locales-compiled/th.json
index 00638e164eaf..cdbe506cd7d9 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/th.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/th.json
@@ -51,6 +51,12 @@
       "value": "บัญชี"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "สร้างบัญชีฟรีเพื่อบันทึกงานของคุณ ทำงานร่วมกันแบบเรียลไทม์ และอื่นๆ อีกมากมาย"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "เมนูไฟล์"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw เป็นไวท์บอร์ดเสมือนจริงที่ใช้งานได้ฟรีและทันที"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "เผยแพร่"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "ออกจากกลุ่ม"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "ปลดหมุดไฟล์"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "ส่งออกเป็น"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "แสดงเพิ่มเติม"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "ลบกลุ่ม"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "ห้องนี้ใกล้ถึงขีดจำกัดขนาดแล้ว โปรดพิจารณาลบเนื้อหาบางส่วนหรือสร้างไฟล์ใหม่"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "สร้างกลุ่ม"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "อัปโหลดล้มเหลว"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "ไฟล์ของฉัน"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: ไฮไลท์หายไป"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "เพิ่มลิงค์"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "โปรแกรมแก้ไข"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ดำเนินการต่อด้วยอีเมล"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "ปักหมุดไฟล์"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "วาง URL ไฟล์ tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "คุณแน่ใจหรือไม่ว่าต้องการลืมไฟล์นี้"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "ชื่อ"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "โหลดซ้ำ"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "ลบกลุ่ม…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "คุณแน่ใจหรือไม่ว่าต้องการลบกลุ่มนี้? การดำเนินการนี้ไม่สามารถย้อนกลับได้"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "นโยบายความเป็นส่วนตัว"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "ลากไฟล์มาที่นี่ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "สร้างไฟล์"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " หรือ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "คัดลอกลิงก์เชิญ"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " เพื่อเริ่มต้น"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "ตรวจพบเบราว์เซอร์รุ่นเก่า โปรดอัปเดตเบราว์เซอร์เพื่อใช้แอปนี้"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "เพิกถอนลิงค์นี้และสร้างใหม่"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "เก่ากว่า"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "คุณ"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "เวอร์ชันใหม่ของ tldraw พร้อมให้บริการแล้ว โปรดโหลดหน้าใหม่อีกครั้งเพื่อดำเนินการต่อ"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "คุณได้รับเชิญให้เข้าร่วมกลุ่ม "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "กรอกที่อยู่อีเมลของคุณ"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "ปฏิบัติตามขั้นตอนเหล่านี้เพื่อนำเข้าเนื้อหาด้วยตนเอง:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "การตั้งค่ากลุ่ม"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "ลืม"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "ออกจากกลุ่ม…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "เปลี่ยนชื่อไฟล์"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "ไม่เป็นไร"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "หากต้องการแก้ไขต่อ โปรดคัดลอกห้องไปยังไฟล์ของคุณ"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "ตรวจสอบอีเมลของคุณเพื่อรับรหัสยืนยัน"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,64 @@
       "value": "คัดลอกไปยังไฟล์ของฉัน"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "คัดลอกลิงก์เชิญ"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "ลงชื่อเข้าใช้ด้วย Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "สร้างด้วย tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "เดือนนี้"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "เงื่อนไขการใช้งาน"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "เพิ่มลิงค์ไฟล์"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "แสง"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "ไม่ได้รับรหัส? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ส่งอีกครั้ง"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +897,12 @@
       "value": "พื้นหลัง"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "ลงชื่อเข้าใช้เพื่อยอมรับคำเชิญ"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -695,12 +931,30 @@
       "value": "ผู้ใช้ที่เป็นแขก"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ที่อยู่อีเมล"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL ของไฟล์"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "ลงชื่อเข้าใช้"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "เจ้าของ"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -713,10 +967,10 @@
       "value": "ลงชื่อเข้าใช้เพื่อแชร์"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "ยกเลิกปักหมุด"
+      "value": "ยอมรับและเข้าร่วมกลุ่ม"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1017,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "อัปโหลดไฟล์ .tldr"
+      "value": "เรียนรู้เพิ่มเติมเกี่ยวกับการแชร์"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "เรียนรู้เพิ่มเติมเกี่ยวกับการแชร์"
+      "value": "อนุญาตให้ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " ช่วยเราปรับปรุง tldraw"
     }
   ],
   "c303bd1095": [
@@ -787,6 +1055,12 @@
       "value": "คุกกี้ที่จำเป็น"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "ชื่อกลุ่ม"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1073,24 @@
       "value": "เชิญ"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "แสดงน้อยลง"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "ออกจากระบบ"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "บันทึก"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1121,40 @@
       "value": "สลับแถบด้านข้าง"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "ก่อนที่คุณจะเริ่มต้น โปรดยอมรับ"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ข้อกำหนดการใช้งาน"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": "และ"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "นโยบายความเป็นส่วนตัว"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "ของเรา"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1167,82 @@
       "value": "ลองอีกครั้ง"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "ยอมรับและดำเนินการต่อ"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "เข้าไปที่นี่เพื่อดูเนื้อหา"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "คุณมีจำนวนกลุ่มถึงจำนวนสูงสุดแล้ว คุณต้องลบกลุ่มเก่าออกก่อนจึงจะสร้างกลุ่มใหม่ได้"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "เชิญเท่านั้น"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL ไฟล์ tldraw ไม่ถูกต้อง"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ค่าสถานะการแก้ไขข้อบกพร่องของแอป"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "เชิญสมาชิก"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "คัดลอกลิงก์คำเชิญ"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "สรุปข้อกฎหมาย"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "ผู้ดูแลระบบ"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "เงื่อนไขการบริการ"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "หรือ"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "ปักหมุด"
+      "value": "เขตอันตราย"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1301,12 @@
       "value": "ของเราเพื่อเรียนรู้เพิ่มเติม"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "สมาชิก"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1349,18 @@
       "value": "การตั้งค่า"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "คุณแน่ใจหรือไม่ว่าต้องการออกจากกลุ่มนี้?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "นโยบายความเป็นส่วนตัว"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1379,12 @@
       "value": "ลิงก์ที่คัดลอก"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "เพิ่มลิงค์ไฟล์…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/tl.json b/apps/dotcom/client/public/tla/locales-compiled/tl.json
index 68897c20f961..8b9fbb590fda 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/tl.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/tl.json
@@ -51,6 +51,12 @@
       "value": "Account"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Gumawa ng libreng account para i-save ang iyong trabaho, makipagtulungan sa real-time, at higit pa."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu ng file"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "Ang tldraw ay isang libre at instant na virtual whiteboard."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "I-publish"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Umalis sa grupo"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "I-unpin ang file"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "I-export bilang"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Magpakita ng higit pa"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Tanggalin ang pangkat"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Papalapit na ang kwartong ito sa limitasyon ng laki nito. Pag-isipang mag-alis ng ilang content o magsimula ng bagong file."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Lumikha ng pangkat"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Nabigo ang pag-upload"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Aking mga file"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Nawawala ang Highlight"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Magdagdag ng link"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Editor"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Magpatuloy sa email"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pin file"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "I-paste ang URL ng tldraw file..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Sigurado ka bang gusto mong kalimutan ang file na ito?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Pangalan"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "I-reload"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Tanggalin ang pangkat…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Sigurado ka bang gusto mong tanggalin ang pangkat na ito? Ang pagkilos na ito ay hindi maaaring i-undo."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Patakaran sa privacy"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "I-drag ang mga file dito, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "lumikha ng file"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": ", o "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "copy invite link"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " para makapagsimula."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Nakita ang lumang browser. Mangyaring i-update ang iyong browser upang magamit ang app na ito."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Bawiin ang link na ito at gumawa ng bago."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Mas matanda"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ikaw"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Available ang bagong bersyon ng tldraw. Paki-reload ang page para magpatuloy."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Inimbitahan ka sa pangkat na "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Ilagay ang iyong email address"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Sundin ang mga hakbang na ito upang manu-manong i-import ang nilalaman:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Mga setting ng pangkat"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Kalimutan"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Umalis sa grupo..."
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Palitan ang pangalan ng file"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Hindi salamat"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Para magpatuloy sa pag-edit, pakikopya ang kwarto sa iyong mga file."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Tingnan ang iyong email para sa isang verification code."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Kopyahin sa aking mga file"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Kinopya ang link ng imbitasyon"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Mag-sign in gamit ang Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Bumuo gamit ang tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Ngayong buwan"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Mga Tuntunin sa Paggamit"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Magdagdag ng link ng file"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Liwanag"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Hindi nakatanggap ng code? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Muling ipadala"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Background"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Mag-sign in para tanggapin ang imbitasyon"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Guest user"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Email address"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL ng file"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Mag-sign in"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "May-ari"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Mag-sign in upang ibahagi"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "I-unpin"
+      "value": "Tanggapin at sumali sa grupo"
     }
   ],
   "bbbcefd7ce": [
@@ -783,16 +1041,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Mag-upload ng mga .tldr na file"
+      "value": "Matuto pa tungkol sa pagbabahagi."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Matuto pa tungkol sa pagbabahagi."
+      "value": "Payagan ang "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " na tulungan kaming pagbutihin ang tldraw."
     }
   ],
   "c303bd1095": [
@@ -807,6 +1079,12 @@
       "value": "Mahahalagang cookies"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Pangalan ng grupo"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -819,12 +1097,24 @@
       "value": "Mag-imbita"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Magpakita ng mas kaunti"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Mag-sign out"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "I-save"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -855,6 +1145,40 @@
       "value": "I-toggle ang sidebar"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Bago ka magsimula, mangyaring tanggapin ang aming "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "mga tuntunin ng paggamit"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " at "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "patakaran sa privacy"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -867,40 +1191,82 @@
       "value": "Subukan Muli"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Tanggapin at magpatuloy"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Pumunta dito upang makita ang nilalaman"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Naabot mo na ang maximum na bilang ng mga pangkat. Kailangan mong tanggalin ang mga lumang grupo bago gumawa ng mga bago."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Mag-imbita lang"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Di-wastong tldraw file URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Mga flag ng pag-debug ng app"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Mag-imbita ng mga miyembro"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Kopyahin ang link ng imbitasyon"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Legal na buod"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Admin"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Mga tuntunin ng serbisyo"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "o"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Pin"
+      "value": "Danger zone"
     }
   ],
   "ea4788705e": [
@@ -959,6 +1325,12 @@
       "value": " upang matuto nang higit pa."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Mga miyembro"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -1001,6 +1373,18 @@
       "value": "Mga setting"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Sigurado ka bang gusto mong umalis sa grupong ito?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Patakaran sa Privacy"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1019,6 +1403,12 @@
       "value": "Kinopya ang link"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Magdagdag ng link ng file…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/tr.json b/apps/dotcom/client/public/tla/locales-compiled/tr.json
index 646019d94668..079f0784c31b 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/tr.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/tr.json
@@ -51,6 +51,12 @@
       "value": "Hesap"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Çalışmalarınızı kaydetmek, gerçek zamanlı işbirliği yapmak ve daha fazlası için ücretsiz bir hesap oluşturun."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Dosya menüsü"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ücretsiz ve anında kullanılabilen sanal bir beyaz tahtadır."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Yayınla"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Gruptan ayrıl"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Dosyayı sabitle"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Dışa aktarma formatı"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Daha fazlasını göster"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Grubu sil"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Bu oda boyut sınırına yaklaşıyor. İçeriğin bir kısmını kaldırmayı veya yeni bir dosya başlatmayı düşünün."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Grup oluştur"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Yüklenemedi"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Dosyalarım"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Vurgu Eksik"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Bağlantı ekle"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Düzenleyici"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "E-postayla devam et"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Pin dosyası"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw dosya URL'sini yapıştır..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Bu dosyayı unutmak istediğinizden emin misiniz?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "İsim"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Tekrar yükle"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Grubu sil…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Bu grubu silmek istediğinizden emin misiniz? Bu işlem geri alınamaz."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Gizlilik Politikası"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Başlamak için dosyaları buraya sürükleyin, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "bir dosya oluşturun"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " veya "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "davet bağlantısını kopyalayın"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Eski tarayıcı algılandı. Bu uygulamayı kullanmak için lütfen tarayıcınızı güncelleyin."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Bu bağlantıyı iptal edin ve yeni bir bağlantı oluşturun."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Daha eski"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Sen"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw'ın yeni bir sürümü mevcut. Devam etmek için lütfen sayfayı yeniden yükleyin."
     }
   ],
+  "68257bb646": [
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " grubuna davet edildiniz"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "E-posta adresinizi girin"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "İçeriği manuel olarak içe aktarmak için şu adımları izleyin:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Grup ayarları"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Unut"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Gruptan ayrıl…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +697,24 @@
       "value": "Dosyayı yeniden adlandır"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Hayır, teşekkürler"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Düzenlemeye devam etmek için lütfen odayı dosyalarınıza kopyalayın."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Doğrulama kodu için e-postanızı kontrol edin."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +745,68 @@
       "value": "Dosyalarıma kopyala"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Davet bağlantısı kopyalandı"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Google ile oturum açın"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK ile oluşturun"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Bu ay"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Kullanım Şartları"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Dosya bağlantısı ekle"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Açık"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Kod almadınız mı? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Tekrar gönder"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +897,12 @@
       "value": "Arka plan"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Daveti kabul etmek için oturum açın"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +927,30 @@
       "value": "Misafir kullanıcı"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "E-posta adresi"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "Dosya URL'si"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Oturum aç"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Mal sahibi"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +963,10 @@
       "value": "Paylaşmak için oturum açın"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "SabitlemeyI kaldır"
+      "value": "Kabul et ve gruba katıl"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": " tarafından paylaşıldı"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": ".tldr dosyalarını yükle"
+      "value": "Paylaşım hakkında daha fazla bilgi edinin."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Paylaşım hakkında daha fazla bilgi edinin."
+      "value": "Tldraw'ı geliştirmemize yardımcı olması için "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": "'e izin verin."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "Temel çerezler"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Grup adı"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "Davet et"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Daha az göster"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Oturumu kapat"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Kaydetmek"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "Kenar çubuğunu aç/kapat"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Başlamadan önce lütfen "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "kullanım koşullarımızı"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " ve "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "gizlilik politikamızı"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " kabul edin."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "Tekrar Dene"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Kabul et ve devam et"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "İçeriği görmek için buraya gidin"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Maksimum grup sayısına ulaştınız. Yeni gruplar oluşturmadan önce eski grupları silmeniz gerekiyor."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Yalnızca davetle"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Geçersiz tldraw dosya URL'si"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Uygulama hata ayıklama bayrakları"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Üyeleri davet et"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Davet bağlantısını kopyala"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Hukuki özet"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Yönetici"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Hizmet Şartları"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "veya"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Sabitle"
+      "value": "Tehlikeli bölge"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " okuyun."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Üyeler"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "Ayarlar"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Bu gruptan ayrılmak istediğinize emin misiniz?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Gizlilik Politikası"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "Bağlantı kopyalandı"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Dosya bağlantısı ekle…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/uk.json b/apps/dotcom/client/public/tla/locales-compiled/uk.json
index 67d08707ae52..1daee2dbf782 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/uk.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/uk.json
@@ -51,6 +51,12 @@
       "value": "Обліковий запис"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Створіть безкоштовний обліковий запис, щоб зберігати свою роботу, співпрацювати в режимі реального часу та багато іншого."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Меню «Файл»"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw — це безкоштовна та миттєва віртуальна дошка."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Опублікувати"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Вийти з групи"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Відкріпити файл"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Експортувати як"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Показати більше"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Видалити групу"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Розмір цієї кімнати наближається до ліміту. Спробуйте видалити деякий вміст або створити новий файл."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Створити групу"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Помилка завантаження"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Мої файли"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Виділення відсутнє"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Додати посилання"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Редактор"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Продовжити з електронною поштою"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Закріпити файл"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Вставити URL-адресу файлу tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Ви впевнені, що хочете забути цей файл?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Ім'я"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Перезавантажити"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Видалити групу…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Ви впевнені, що хочете видалити цю групу? Цю дію не можна скасувати."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Політика конфіденційності"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Перетягніть файли сюди, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "створіть файл"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " або "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "скопіюйте посилання для запрошення"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": ", щоб розпочати."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Виявлено старий браузер. Будь ласка, оновіть свій браузер, щоб користуватися цією програмою."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Скасуйте це посилання та створіть нове."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Старший"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "ти"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Доступна нова версія tldraw. Перезавантажте сторінку, щоб продовжити."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Вас запросили до групи "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Введіть свою адресу електронної пошти"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Щоб імпортувати вміст вручну, виконайте такі дії:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Налаштування групи"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Забути"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Вийти з групи…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Перейменувати файл"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Ні, дякую."
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Щоб продовжити редагування, скопіюйте кімнату до своїх файлів."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Перевірте свою електронну пошту, щоб отримати код підтвердження."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Копіювати в мої файли"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Скопійоване посилання для запрошення"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Увійти за допомогою Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Збірка за допомогою tldraw SDK"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Цього місяця"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Умови використання"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Додати посилання на файл"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Світла"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Не отримали код? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Надіслати ще раз"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Фон"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Увійдіть, щоб прийняти запрошення"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Гість"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Адреса електронної пошти"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL-адреса файлу"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Увійти"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Власник"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Увійдіть, щоб поділитися"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Відкріпити"
+      "value": "Прийняти та приєднатися до групи"
     }
   ],
   "bbbcefd7ce": [
@@ -775,16 +1033,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Завантажте файли .tldr"
+      "value": "Докладніше про те, як поділитися."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Докладніше про те, як поділитися."
+      "value": "Дозволити використання "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " для покращення tldraw."
     }
   ],
   "c303bd1095": [
@@ -799,6 +1071,12 @@
       "value": "Основні файли cookie"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Назва групи"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -811,12 +1089,24 @@
       "value": "Запросити"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Показати менше"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Вийти"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Зберегти"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -847,6 +1137,40 @@
       "value": "Перемкнути бічну панель"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Перш ніж почати, будь ласка, прийміть наші "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "умови використання"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " та "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "політику конфіденційності"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -859,40 +1183,82 @@
       "value": "Спробуйте ще раз"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Прийняти та продовжити"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Перейдіть сюди, щоб переглянути вміст"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Ви досягли максимальної кількості груп. Вам потрібно видалити старі групи, перш ніж створювати нові."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Тільки запрошені"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "Недійсна URL-адреса файлу tldraw"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Прапорці налагодження програми"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Запросити учасників"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Копіювати посилання-запрошення"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Юридичний виклад"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Адміністратор"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Умови обслуговування"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "або"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Прикріпити"
+      "value": "НЕБЕЗПЕЧНА ЗОНА"
     }
   ],
   "ea4788705e": [
@@ -951,6 +1317,12 @@
       "value": ", щоб дізнатися більше."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Члени"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -993,6 +1365,18 @@
       "value": "Налаштування"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Ви впевнені, що хочете вийти з цієї групи?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Політика конфіденційності"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -1011,6 +1395,12 @@
       "value": "Скопійоване посилання"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Додати посилання на файл…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/ur.json b/apps/dotcom/client/public/tla/locales-compiled/ur.json
index a6a687c5276b..0f0d193411b9 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/ur.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/ur.json
@@ -51,6 +51,12 @@
       "value": "اکاؤنٹ"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "اپنے کام کو بچانے، حقیقی وقت میں تعاون کرنے اور مزید بہت کچھ کرنے کے لیے ایک مفت اکاؤنٹ بنائیں۔"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "فائل مینو"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw ایک مفت اور فوری ورچوئل وائٹ بورڈ ہے۔"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "شائع کریں۔"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "گروپ چھوڑ دیں۔"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "فائل کو ان پن کریں۔"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "بطور برآمد کریں۔"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "مزید دکھائیں"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "گروپ کو حذف کریں۔"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "یہ کمرہ اپنے سائز کی حد کو پہنچ رہا ہے۔ کچھ مواد کو ہٹانے یا نئی فائل شروع کرنے پر غور کریں۔"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "گروپ بنائیں"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "اپ لوڈ ناکام ہو گیا۔"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "میری فائلیں۔"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: ہائی لائٹ مسنگ"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "لنک شامل کریں۔"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "ایڈیٹر"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "ای میل کے ساتھ جاری رکھیں"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "فائل کو پن کریں۔"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "tldraw فائل کا URL پیسٹ کریں..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "کیا آپ واقعی اس فائل کو بھولنا چاہتے ہیں؟"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "نام"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "دوبارہ لوڈ کریں۔"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "گروپ کو حذف کریں…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "کیا آپ واقعی اس گروپ کو حذف کرنا چاہتے ہیں؟ اس کارروائی کو کالعدم نہیں کیا جا سکتا۔"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "رازداری کی پالیسی"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "شروع کرنے کے لیے فائلوں کو یہاں گھسیٹیں، "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "ایک فائل بنائیں"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "، یا "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "کاپی کریں دعوت کا لنک"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "۔"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "پرانے براؤزر کا پتہ چلا۔ براہ کرم اس ایپ کو استعمال کرنے کے لیے اپنے براؤزر کو اپ ڈیٹ کریں۔"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "اس لنک کو منسوخ کریں اور ایک نیا بنائیں۔"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "پرانا"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "آپ"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,34 @@
       "value": "tldraw کا ایک نیا ورژن دستیاب ہے۔ جاری رکھنے کے لیے براہ کرم صفحہ کو دوبارہ لوڈ کریں۔"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "آپ کو گروپ "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    },
+    {
+      "type": 0,
+      "value": " میں مدعو کیا گیا ہے۔"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "اپنا ای میل ایڈریس درج کریں۔"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +525,12 @@
       "value": "مواد کو دستی طور پر درآمد کرنے کے لیے ان اقدامات پر عمل کریں:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "گروپ کی ترتیبات"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +621,12 @@
       "value": "بھول جاؤ"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "گروپ چھوڑیں…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -525,12 +701,24 @@
       "value": "فائل کا نام تبدیل کریں۔"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "نہیں شکریہ"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "ترمیم جاری رکھنے کے لیے براہ کرم کمرے کو اپنی فائلوں میں کاپی کریں۔"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "تصدیقی کوڈ کے لیے اپنا ای میل چیک کریں۔"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -561,18 +749,68 @@
       "value": "میری فائلوں میں کاپی کریں۔"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "دعوت کا لنک کاپی کر دیا گیا۔"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "گوگل کے ساتھ سائن ان کریں۔"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "tldraw SDK کے ساتھ بنائیں"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "اس مہینے"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "استعمال کی شرائط"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "فائل کا لنک شامل کریں۔"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "روشنی"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "کوڈ موصول نہیں ہوا؟ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "دوبارہ بھیجیں"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "۔"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -663,6 +901,12 @@
       "value": "پس منظر"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "دعوت قبول کرنے کے لیے سائن ان کریں۔"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -687,12 +931,30 @@
       "value": "مہمان صارف"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "ای میل ایڈریس"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "فائل URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "سائن ان کریں۔"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "مالک"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -705,10 +967,10 @@
       "value": "اشتراک کرنے کے لیے سائن ان کریں۔"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "پن کھول دیں۔"
+      "value": "قبول کریں اور گروپ میں شامل ہوں۔"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1025,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "tldr فائلیں اپ لوڈ کریں۔"
+      "value": "اشتراک کے بارے میں مزید جانیں۔"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "اشتراک کے بارے میں مزید جانیں۔"
+      "value": "tldraw کو بہتر بنانے میں ہماری مدد کرنے کے لیے "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " کو اجازت دیں۔"
     }
   ],
   "c303bd1095": [
@@ -787,6 +1063,12 @@
       "value": "ضروری کوکیز"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "گروپ کا نام"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1081,24 @@
       "value": "دعوت دیں۔"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "کم دکھائیں۔"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "سائن آؤٹ کریں۔"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "محفوظ کریں۔"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1129,40 @@
       "value": "سائڈبار کو ٹوگل کریں۔"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "شروع کرنے سے پہلے، براہ کرم ہماری "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "استعمال کی شرائط"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " اور "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "رازداری کی پالیسی"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " کو قبول کریں۔"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1175,82 @@
       "value": "دوبارہ کوشش کریں۔"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "قبول کریں اور جاری رکھیں"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "مواد دیکھنے کے لیے یہاں جائیں۔"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "آپ گروپس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ نئے بنانے سے پہلے آپ کو پرانے گروپس کو حذف کرنے کی ضرورت ہے۔"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "صرف دعوت دیں۔"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "غلط tldraw فائل کا URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "ایپ ڈیبگ جھنڈے"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "ممبران کو مدعو کریں۔"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "دعوت کا لنک کاپی کریں۔"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "قانونی خلاصہ"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "ایڈمن"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "سروس کی شرائط"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "یا"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "پن"
+      "value": "خطرہ زون"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1309,12 @@
       "value": " پڑھیں۔"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "ممبران"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1357,18 @@
       "value": "ترتیبات"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "کیا آپ واقعی اس گروپ کو چھوڑنا چاہتے ہیں؟"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "رازداری کی پالیسی"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1387,12 @@
       "value": "کاپی شدہ لنک"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "فائل کا لنک شامل کریں…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/vi.json b/apps/dotcom/client/public/tla/locales-compiled/vi.json
index dea7a70d3c7f..178037fc9eaf 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/vi.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/vi.json
@@ -51,6 +51,12 @@
       "value": "Tài khoản"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "Tạo một tài khoản miễn phí để lưu công việc, cộng tác theo thời gian thực và nhiều chức năng khác."
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "Menu tệp"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw là bảng trắng ảo miễn phí và tức thì."
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "Xuất bản"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "Rời khỏi nhóm"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "Bỏ ghim tệp"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "Xuất dưới dạng"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "Hiển thị thêm"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "Xóa nhóm"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "Phòng này sắp đạt đến giới hạn kích thước. Hãy cân nhắc xóa bớt nội dung hoặc tạo một tệp mới."
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "Tạo nhóm"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "Tải lên thất bại"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "Các tập tin của tôi"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n: Thiếu đánh dấu"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "Thêm liên kết"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "Biên tập viên"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "Tiếp tục với email"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "Tệp ghim"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "Dán URL tệp tldraw..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "Bạn có chắc chắn muốn quên tệp này không?"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "Tên"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "Tải lại"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "Xóa nhóm…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "Bạn có chắc chắn muốn xóa nhóm này không? Thao tác này không thể hoàn tác."
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "Chính sách bảo mật"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "Kéo tệp vào đây, "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "tạo tệp"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": " hoặc "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "sao chép liên kết mời"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": " để bắt đầu."
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "Đã phát hiện trình duyệt cũ. Vui lòng cập nhật trình duyệt của bạn để sử dụng ứng dụng này."
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "Thu hồi liên kết này và tạo liên kết mới."
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "Cũ hơn"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "Bạn"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "Phiên bản mới của tldraw đã có sẵn. Vui lòng tải lại trang để tiếp tục."
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "Bạn đã được mời vào nhóm "
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "Nhập địa chỉ email của bạn"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "Làm theo các bước sau để nhập nội dung theo cách thủ công:"
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "Cài đặt nhóm"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "Quên"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "Rời khỏi nhóm…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "Đổi tên tập tin"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "Không, cảm ơn"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "Để tiếp tục chỉnh sửa, vui lòng sao chép phòng vào tệp của bạn."
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "Kiểm tra email của bạn để lấy mã xác minh."
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "Sao chép vào tệp của tôi"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "Đã sao chép liên kết mời"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "Đăng nhập bằng Google"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "Xây dựng với SDK tldraw"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "Tháng này"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "Điều khoản sử dụng"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "Thêm liên kết tệp"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "Sáng"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "Không nhận được mã? "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "Gửi lại"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "."
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "Cơ sở"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "Đăng nhập để chấp nhận lời mời"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "Người dùng khách"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "Địa chỉ email"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "URL tệp"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "Đăng nhập"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "Người sở hữu"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "Đăng nhập để chia sẻ"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "Bỏ ghim"
+      "value": "Chấp nhận và tham gia nhóm"
     }
   ],
   "bbbcefd7ce": [
@@ -759,16 +1017,30 @@
       "value": "ownerName"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "Tải lên các tệp .tldr."
+      "value": "Tìm hiểu thêm về chia sẻ."
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "Tìm hiểu thêm về chia sẻ."
+      "value": "Cho phép "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " giúp chúng tôi cải thiện tldraw."
     }
   ],
   "c303bd1095": [
@@ -783,6 +1055,12 @@
       "value": "Cookie thiết yếu"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "Tên nhóm"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -795,12 +1073,24 @@
       "value": "Mời"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "Hiển thị ít hơn"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "Đăng xuất"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "Cứu"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -831,6 +1121,40 @@
       "value": "Chuyển đổi thanh bên"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "Trước khi bắt đầu, vui lòng chấp nhận "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "điều khoản sử dụng"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": " và "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "chính sách bảo mật"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": " của chúng tôi."
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -843,40 +1167,82 @@
       "value": "Thử lại"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "Chấp nhận và tiếp tục"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "Vào đây để xem nội dung"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "Bạn đã đạt đến số lượng nhóm tối đa. Bạn cần xóa nhóm cũ trước khi tạo nhóm mới."
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "Chỉ mời"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "URL tệp tldraw không hợp lệ"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "Cờ gỡ lỗi ứng dụng"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "Mời thành viên"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "Sao chép liên kết mời"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "Tóm tắt pháp lý"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "Quản trị viên"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "Điều khoản dịch vụ"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "hoặc"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "Ghim"
+      "value": "Khu vực nguy hiểm"
     }
   ],
   "ea4788705e": [
@@ -935,6 +1301,12 @@
       "value": " của chúng tôi để tìm hiểu thêm."
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "Thành viên"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -977,6 +1349,18 @@
       "value": "Cài đặt"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "Bạn có chắc chắn muốn rời khỏi nhóm này không?"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "Chính sách bảo mật"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -995,6 +1379,12 @@
       "value": "Đã sao chép liên kết"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "Thêm liên kết tệp…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/zh-cn.json b/apps/dotcom/client/public/tla/locales-compiled/zh-cn.json
index 3ebf30c89a6c..bce5a665dd25 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/zh-cn.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/zh-cn.json
@@ -51,6 +51,12 @@
       "value": "帐户"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "创建免费帐户，即可保存您的作品、实时协作等等。"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "文件菜单"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw 是一款免费且即时可用的虚拟白板。"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "发布"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "离开群组"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "解压文件"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "导出为"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "显示更多"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "删除组"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "此房间已接近其大小限制。请考虑删除一些内容或创建新文件。"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "创建组"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "上传失败"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "我的文件"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "国际化：高亮缺失部分"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "添加链接"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "编辑器"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "继续通过电子邮件"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "针文件"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "粘贴tldraw文件URL..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "确定要忘记该文件吗？"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "姓名"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "重新加载"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "删除群组…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "您确定要删除此群组吗？此操作无法撤销。"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "隐私政策"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "将文件拖到这里，"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "创建文件"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "，或"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "复制邀请链接"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "即可开始。"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "检测到旧版浏览器。请更新您的浏览器以使用此应用。"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "撤销此链接并创建一个新链接。"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "较旧"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "你"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw 有新版本可用。请重新加载页面以继续。"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "您已被邀请加入群组"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "请输入您的电子邮件地址"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "要手动导入内容，请参阅以下步骤："
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "群组设置"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "忘记"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "离开群组…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "重命名文件"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "不，谢谢"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "要继续编辑，请将房间复制到您的文件中。"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "请查看您的电子邮件，您会收到验证码。"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "复制到我的文件"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "复制的邀请链接"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "使用 Google 登录"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "使用 tldraw SDK 构建"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "本月"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "使用条款"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "添加文件链接"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "浅色"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "没有收到验证码？"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "重新发送"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "。"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "背景"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "登录以接受邀请"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "来宾用户"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "电子邮件"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "文件 URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "登录"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "所有者"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "登录以分享"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "取消固定"
+      "value": "接受并加入群组"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1021,30 @@
       "value": "分享"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "上传.tldr文件"
+      "value": "详细了解分享。"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "详细了解分享。"
+      "value": "允许使用 "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " 来帮助我们改进 tldraw。"
     }
   ],
   "c303bd1095": [
@@ -787,6 +1059,12 @@
       "value": "必需 Cookie"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "组名"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1077,24 @@
       "value": "邀请"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "显示更少"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "退出登录"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "节省"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1125,40 @@
       "value": "切换侧边栏"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "开始之前，请接受我们的"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "使用条款"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": "和"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "隐私政策"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "。"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1171,82 @@
       "value": "重试"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "接受并继续"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "在这里查看内容"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "您已达到群组数量上限。创建新群组前，您需要先删除旧群组。"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "仅邀请"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "无效的tldraw文件URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "App调试标记"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "邀请成员"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "复制邀请链接"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "法律摘要"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "行政"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "服务条款"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "或者"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "固定"
+      "value": "危险区域"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1305,12 @@
       "value": "以了解更多信息。"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "成员"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1353,18 @@
       "value": "设置"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "你确定要退出这个群组吗？"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "隐私政策"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1383,12 @@
       "value": "链接已复制"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "添加文件链接…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales-compiled/zh-tw.json b/apps/dotcom/client/public/tla/locales-compiled/zh-tw.json
index bae64bed76d5..edec1ab5b45c 100644
--- a/apps/dotcom/client/public/tla/locales-compiled/zh-tw.json
+++ b/apps/dotcom/client/public/tla/locales-compiled/zh-tw.json
@@ -51,6 +51,12 @@
       "value": "帳戶"
     }
   ],
+  "08d2d725a9": [
+    {
+      "type": 0,
+      "value": "建立免費帳戶，即可保存您的作品、即時協作等等。"
+    }
+  ],
   "0b27918290": [
     {
       "type": 0,
@@ -63,6 +69,12 @@
       "value": "檔案選單"
     }
   ],
+  "0beb3ca97b": [
+    {
+      "type": 0,
+      "value": "tldraw 是一款免費且即時可用的虛擬白板。"
+    }
+  ],
   "0d1f2bb523": [
     {
       "type": 0,
@@ -75,6 +87,18 @@
       "value": "發布"
     }
   ],
+  "129b9e34ea": [
+    {
+      "type": 0,
+      "value": "離開群組"
+    }
+  ],
+  "12a6766ba1": [
+    {
+      "type": 0,
+      "value": "解壓縮文件"
+    }
+  ],
   "12c8a9838c": [
     {
       "type": 0,
@@ -87,6 +111,18 @@
       "value": "匯出為"
     }
   ],
+  "146ffe2fd9": [
+    {
+      "type": 0,
+      "value": "顯示更多"
+    }
+  ],
+  "14d65465b7": [
+    {
+      "type": 0,
+      "value": "刪除群組"
+    }
+  ],
   "181b90f889": [
     {
       "type": 0,
@@ -117,6 +153,12 @@
       "value": "此房間已接近其大小限制。請考慮刪除一些內容或建立新檔案。"
     }
   ],
+  "2445e5e347": [
+    {
+      "type": 0,
+      "value": "建立群組"
+    }
+  ],
   "250ddea65c": [
     {
       "type": 0,
@@ -129,6 +171,12 @@
       "value": "上傳失敗"
     }
   ],
+  "2c3ef76333": [
+    {
+      "type": 0,
+      "value": "我的文件"
+    }
+  ],
   "2deec2cb74": [
     {
       "type": 0,
@@ -147,6 +195,12 @@
       "value": "i18n：醒目顯示遺失"
     }
   ],
+  "32210b37e4": [
+    {
+      "type": 0,
+      "value": "添加連結"
+    }
+  ],
   "335defdafe": [
     {
       "type": 0,
@@ -159,6 +213,12 @@
       "value": "編輯器"
     }
   ],
+  "3bc7d6ea2f": [
+    {
+      "type": 0,
+      "value": "繼續透過電子郵件"
+    }
+  ],
   "3bd1b98dbd": [
     {
       "type": 0,
@@ -201,12 +261,30 @@
       "value": "tldraw"
     }
   ],
+  "47f493a590": [
+    {
+      "type": 0,
+      "value": "針文件"
+    }
+  ],
+  "49049467ff": [
+    {
+      "type": 0,
+      "value": "貼上tldraw文件URL..."
+    }
+  ],
   "4908687e50": [
     {
       "type": 0,
       "value": "您確定要遺忘此檔案嗎？"
     }
   ],
+  "49ee308734": [
+    {
+      "type": 0,
+      "value": "姓名"
+    }
+  ],
   "4d0d3ddec9": [
     {
       "type": 0,
@@ -219,6 +297,18 @@
       "value": "重新載入"
     }
   ],
+  "4da5988a2e": [
+    {
+      "type": 0,
+      "value": "刪除群組…"
+    }
+  ],
+  "4e6fbf032b": [
+    {
+      "type": 0,
+      "value": "您確定要刪除此群組嗎？此操作無法撤銷。"
+    }
+  ],
   "50db1b7e1e": [
     {
       "type": 0,
@@ -277,6 +367,40 @@
       "value": "隱私權政策"
     }
   ],
+  "5a86b22fa0": [
+    {
+      "type": 0,
+      "value": "將檔案拖曳到這裡，"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "建立檔案"
+        }
+      ],
+      "type": 8,
+      "value": "create"
+    },
+    {
+      "type": 0,
+      "value": "，或"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "複製邀請連結"
+        }
+      ],
+      "type": 8,
+      "value": "invite"
+    },
+    {
+      "type": 0,
+      "value": "即可開始。"
+    }
+  ],
   "5a95a425f7": [
     {
       "type": 0,
@@ -301,6 +425,12 @@
       "value": "偵測到舊版瀏覽器。請更新您的瀏覽器以使用此應用程式。"
     }
   ],
+  "5c6fe42bc2": [
+    {
+      "type": 0,
+      "value": "撤銷此連結並建立新連結。"
+    }
+  ],
   "5d26ae7550": [
     {
       "type": 0,
@@ -331,6 +461,12 @@
       "value": "較舊的"
     }
   ],
+  "639bae9ac6": [
+    {
+      "type": 0,
+      "value": "你"
+    }
+  ],
   "6609dd239e": [
     {
       "type": 0,
@@ -343,6 +479,30 @@
       "value": "tldraw 有新版本可用。請重新加載頁面以繼續。"
     }
   ],
+  "68257bb646": [
+    {
+      "type": 0,
+      "value": "您已被邀請加入群組"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "br"
+    },
+    {
+      "children": [
+      ],
+      "type": 8,
+      "value": "groupName"
+    }
+  ],
+  "6832ac5936": [
+    {
+      "type": 0,
+      "value": "請輸入您的電子郵件地址"
+    }
+  ],
   "6a26f54883": [
     {
       "type": 0,
@@ -361,6 +521,12 @@
       "value": "按照以下步驟手動匯入內容："
     }
   ],
+  "70222abcfc": [
+    {
+      "type": 0,
+      "value": "群組設定"
+    }
+  ],
   "70a6facb9d": [
     {
       "type": 0,
@@ -451,6 +617,12 @@
       "value": "遺忘"
     }
   ],
+  "7cfe6c43dc": [
+    {
+      "type": 0,
+      "value": "離開群組…"
+    }
+  ],
   "7daeced9ff": [
     {
       "type": 0,
@@ -529,12 +701,24 @@
       "value": "重新命名文件"
     }
   ],
+  "8ad4303b83": [
+    {
+      "type": 0,
+      "value": "不，謝謝"
+    }
+  ],
   "8b1946f965": [
     {
       "type": 0,
       "value": "若要繼續編輯，請將房間複製到您的文件中。"
     }
   ],
+  "8c2d3d730c": [
+    {
+      "type": 0,
+      "value": "請查看您的電子郵件，您會收到驗證碼。"
+    }
+  ],
   "8eb2c00e96": [
     {
       "type": 0,
@@ -565,18 +749,68 @@
       "value": "複製到我的檔案"
     }
   ],
+  "930390d222": [
+    {
+      "type": 0,
+      "value": "複製的邀請連結"
+    }
+  ],
+  "95aacd4d4a": [
+    {
+      "type": 0,
+      "value": "使用 Google 登入"
+    }
+  ],
+  "95d2109dc8": [
+    {
+      "type": 0,
+      "value": "使用 tldraw SDK 構建"
+    }
+  ],
   "96165d6df5": [
     {
       "type": 0,
       "value": "本月"
     }
   ],
+  "985a4b720f": [
+    {
+      "type": 0,
+      "value": "使用條款"
+    }
+  ],
+  "98c997a27e": [
+    {
+      "type": 0,
+      "value": "添加文件連結"
+    }
+  ],
   "9914a0ce04": [
     {
       "type": 0,
       "value": "淺色"
     }
   ],
+  "9b33f5c63c": [
+    {
+      "type": 0,
+      "value": "沒有收到驗證碼？ "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "重新傳送"
+        }
+      ],
+      "type": 8,
+      "value": "resend"
+    },
+    {
+      "type": 0,
+      "value": "。"
+    }
+  ],
   "9bef626805": [
     {
       "type": 0,
@@ -667,6 +901,12 @@
       "value": "背景"
     }
   ],
+  "aa916767cf": [
+    {
+      "type": 0,
+      "value": "登入以接受邀請"
+    }
+  ],
   "ab0df9ba36": [
     {
       "type": 0,
@@ -691,12 +931,30 @@
       "value": "來賓用戶"
     }
   ],
+  "b357b524e7": [
+    {
+      "type": 0,
+      "value": "電子郵件"
+    }
+  ],
+  "b3d2db69fe": [
+    {
+      "type": 0,
+      "value": "文件 URL"
+    }
+  ],
   "b6d4223e60": [
     {
       "type": 0,
       "value": "登入"
     }
   ],
+  "b6f4a2ec63": [
+    {
+      "type": 0,
+      "value": "擁有者"
+    }
+  ],
   "b758336699": [
     {
       "type": 0,
@@ -709,10 +967,10 @@
       "value": "登入以分享"
     }
   ],
-  "bb792693e2": [
+  "bb93a7590f": [
     {
       "type": 0,
-      "value": "取消置頂"
+      "value": "接受並加入群組"
     }
   ],
   "bbbcefd7ce": [
@@ -763,16 +1021,30 @@
       "value": " 共享"
     }
   ],
-  "bcb62136a3": [
+  "c2276c9127": [
     {
       "type": 0,
-      "value": "上傳 .tldr 檔"
+      "value": "瞭解有關共享的更多資訊。"
     }
   ],
-  "c2276c9127": [
+  "c28aed8348": [
     {
       "type": 0,
-      "value": "瞭解有關共享的更多資訊。"
+      "value": "允許使用 "
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "analytics"
+        }
+      ],
+      "type": 8,
+      "value": "cookies"
+    },
+    {
+      "type": 0,
+      "value": " 來幫助我們改進 tldraw。"
     }
   ],
   "c303bd1095": [
@@ -787,6 +1059,12 @@
       "value": "必備 Cookie"
     }
   ],
+  "c6155aaecc": [
+    {
+      "type": 0,
+      "value": "組名"
+    }
+  ],
   "c655b27b1e": [
     {
       "type": 0,
@@ -799,12 +1077,24 @@
       "value": "邀請"
     }
   ],
+  "c74ea6dbff": [
+    {
+      "type": 0,
+      "value": "顯示更少"
+    }
+  ],
   "c87aacf567": [
     {
       "type": 0,
       "value": "登出"
     }
   ],
+  "c9cc8cce24": [
+    {
+      "type": 0,
+      "value": "節省"
+    }
+  ],
   "cceaefbc20": [
     {
       "type": 0,
@@ -835,6 +1125,40 @@
       "value": "切換側邊欄"
     }
   ],
+  "d638a3344b": [
+    {
+      "type": 0,
+      "value": "在開始之前，請接受我們的"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "使用條款"
+        }
+      ],
+      "type": 8,
+      "value": "tos"
+    },
+    {
+      "type": 0,
+      "value": "和"
+    },
+    {
+      "children": [
+        {
+          "type": 0,
+          "value": "隱私權政策"
+        }
+      ],
+      "type": 8,
+      "value": "privacy"
+    },
+    {
+      "type": 0,
+      "value": "。"
+    }
+  ],
   "d721757161": [
     {
       "type": 0,
@@ -847,40 +1171,82 @@
       "value": "重試"
     }
   ],
+  "d88ad2dc74": [
+    {
+      "type": 0,
+      "value": "接受並繼續"
+    }
+  ],
   "d9100f3e10": [
     {
       "type": 0,
       "value": "前往此處查看內容"
     }
   ],
+  "d9e35d0f55": [
+    {
+      "type": 0,
+      "value": "您已達到群組數量上限。建立新群組前，您需要先刪除舊群組。"
+    }
+  ],
   "dbbebf3c03": [
     {
       "type": 0,
       "value": "限受邀者"
     }
   ],
+  "dcdaa754fe": [
+    {
+      "type": 0,
+      "value": "無效的tldraw檔案URL"
+    }
+  ],
   "dfdb78a4e4": [
     {
       "type": 0,
       "value": "應用程式的偵錯旗標"
     }
   ],
+  "e0c88179b3": [
+    {
+      "type": 0,
+      "value": "邀請成員"
+    }
+  ],
+  "e2198d6228": [
+    {
+      "type": 0,
+      "value": "複製邀請連結"
+    }
+  ],
   "e2ae80a510": [
     {
       "type": 0,
       "value": "法律摘要"
     }
   ],
+  "e3afed0047": [
+    {
+      "type": 0,
+      "value": "行政"
+    }
+  ],
   "e404559826": [
     {
       "type": 0,
       "value": "服務條款"
     }
   ],
-  "e78e14c5f1": [
+  "e81c4e4f2b": [
+    {
+      "type": 0,
+      "value": "或者"
+    }
+  ],
+  "ea0626ac5a": [
     {
       "type": 0,
-      "value": "置頂"
+      "value": "危險區域"
     }
   ],
   "ea4788705e": [
@@ -939,6 +1305,12 @@
       "value": "以了解更多資訊。"
     }
   ],
+  "ef53538ae4": [
+    {
+      "type": 0,
+      "value": "成員"
+    }
+  ],
   "ef7de3f485": [
     {
       "type": 0,
@@ -981,6 +1353,18 @@
       "value": "設定"
     }
   ],
+  "f714e36843": [
+    {
+      "type": 0,
+      "value": "你確定要退出這個群組嗎？"
+    }
+  ],
+  "fa2ead697d": [
+    {
+      "type": 0,
+      "value": "隱私權政策"
+    }
+  ],
   "fb15c53f22": [
     {
       "type": 0,
@@ -999,6 +1383,12 @@
       "value": "已複製連結"
     }
   ],
+  "ff7a814974": [
+    {
+      "type": 0,
+      "value": "新增文件連結…"
+    }
+  ],
   "ffcd73e997": [
     {
       "type": 0,
diff --git a/apps/dotcom/client/public/tla/locales/ar.json b/apps/dotcom/client/public/tla/locales/ar.json
index a8c0cb8250a7..bdd1d8efdbe1 100644
--- a/apps/dotcom/client/public/tla/locales/ar.json
+++ b/apps/dotcom/client/public/tla/locales/ar.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "حساب"
   },
+  "08d2d725a9": {
+    "translation": "قم بإنشاء حساب مجاني لحفظ عملك والتعاون في الوقت الفعلي والمزيد."
+  },
   "0b27918290": {
     "translation": "الملف"
   },
   "0b9a4cde72": {
     "translation": "قائمة الملفات"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw عبارة عن سبورة بيضاء افتراضية مجانية وفورية."
+  },
   "0d1f2bb523": {
     "translation": "إرسال التعليقات"
   },
   "110a4b01be": {
     "translation": "مشاركة"
   },
+  "129b9e34ea": {
+    "translation": "مغادرة المجموعة"
+  },
+  "12a6766ba1": {
+    "translation": "إلغاء تثبيت الملف"
+  },
   "12c8a9838c": {
     "translation": "جرب SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "تصدير كـ"
   },
+  "146ffe2fd9": {
+    "translation": "إظهار المزيد"
+  },
+  "14d65465b7": {
+    "translation": "حذف المجموعة"
+  },
   "181b90f889": {
     "translation": "إنشاء ملف"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "تقترب هذه الغرفة من الحد الأقصى لحجمها. فكّر في إزالة بعض المحتوى أو إنشاء ملف جديد."
   },
+  "2445e5e347": {
+    "translation": "إنشاء مجموعة"
+  },
   "250ddea65c": {
     "translation": "حول tldraw"
   },
   "299cb00a7a": {
     "translation": "فشل التحميل"
   },
+  "2c3ef76333": {
+    "translation": "ملفاتي"
+  },
   "2deec2cb74": {
     "translation": "وصلت هذه الغرفة إلى الحد الأقصى لحجمها، وقد لا تُحفظ التغييرات. يُرجى إزالة بعض المحتوى أو إنشاء ملف جديد."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: إبراز العناصر الناقصة"
   },
+  "32210b37e4": {
+    "translation": "إضافة رابط"
+  },
   "335defdafe": {
     "translation": "يُرجى محاولة تحديث الصفحة."
   },
   "344a7f427f": {
     "translation": "المحرر"
   },
+  "3bc7d6ea2f": {
+    "translation": "متابعة بالبريد الإلكتروني"
+  },
   "3bd1b98dbd": {
     "translation": "يتعذّر نشر التغييرات."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "يرجى إعادة التحميل"
+  "47f493a590": {
+    "translation": "ملف الدبوس"
   },
-  "764671e008": {
-    "translation": "تحدث معنا على Discord"
+  "49049467ff": {
+    "translation": "لصق عنوان URL لملف tldraw..."
   },
   "4908687e50": {
     "translation": "هل أنت متأكد من أنك تريد نسيان هذا الملف؟"
   },
+  "49ee308734": {
+    "translation": "اسم"
+  },
   "4d0d3ddec9": {
     "translation": "يستخدم هذا الموقع ملفات تعريف الارتباط لجعل التطبيق يعمل وجمع التحليلات."
   },
   "4d1c8263ba": {
     "translation": "إعادة التحميل"
   },
+  "4da5988a2e": {
+    "translation": "حذف المجموعة…"
+  },
+  "4e6fbf032b": {
+    "translation": "هل أنت متأكد أنك تريد حذف هذه المجموعة؟ لا يمكن التراجع عن هذا الإجراء."
+  },
   "50db1b7e1e": {
     "translation": "يتعذّر إلغاء نشر الملف."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "سياسة الخصوصية"
   },
+  "5a86b22fa0": {
+    "translation": "اسحب الملفات هنا، أو <create>إنشاء ملف</create>، أو <invite>نسخ رابط الدعوة</invite> للبدء."
+  },
   "5a95a425f7": {
     "translation": "المشاركة"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "تم اكتشاف متصفح قديم. يُرجى تحديث متصفحك لاستخدام هذا التطبيق."
   },
+  "5c6fe42bc2": {
+    "translation": "إلغاء هذا الرابط وإنشاء رابط جديد."
+  },
   "5d26ae7550": {
     "translation": "تعذر علينا تحميل بعض المحتوى الذي أنشأته قبل تسجيل الدخول."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "أقدم"
   },
+  "639bae9ac6": {
+    "translation": "أنت"
+  },
   "6609dd239e": {
     "translation": "حدث خطأ"
   },
   "6637a98151": {
     "translation": "تتوفر نسخة جديدة من tldraw. يُرجى إعادة تحميل الصفحة للمتابعة."
   },
+  "68257bb646": {
+    "translation": "لقد تمت دعوتك إلى المجموعة <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "أدخل عنوان بريدك الإلكتروني"
+  },
   "6a26f54883": {
     "translation": "المساعدة"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "اتبع هذه الخطوات لاستيراد المحتوى يدويًا:"
   },
+  "70222abcfc": {
+    "translation": "إعدادات المجموعة"
+  },
   "70a6facb9d": {
     "translation": "هذا الأسبوع"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "إدارة ملفات تعريف الارتباط"
   },
+  "7697920637": {
+    "translation": "يرجى إعادة التحميل"
+  },
+  "764671e008": {
+    "translation": "تحدث معنا على Discord"
+  },
   "777f9e90cf": {
     "translation": "طلب غير صالح."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "نسيان"
   },
+  "7cfe6c43dc": {
+    "translation": "مغادرة المجموعة…"
+  },
   "7daeced9ff": {
     "translation": "نشر التغييرات"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "إعادة تسمية الملف"
   },
+  "8ad4303b83": {
+    "translation": "ًلا شكرا"
+  },
   "8b1946f965": {
     "translation": "لمواصلة التحرير، يرجى نسخ الغرفة إلى ملفاتك."
   },
+  "8c2d3d730c": {
+    "translation": "تحقق من بريدك الإلكتروني للحصول على رمز التحقق."
+  },
   "8eb2c00e96": {
     "translation": "تمت المشاركة معك"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "نسخ إلى ملفاتي"
   },
+  "930390d222": {
+    "translation": "تم نسخ رابط الدعوة"
+  },
+  "95aacd4d4a": {
+    "translation": "تسجيل الدخول باستخدام جوجل"
+  },
+  "95d2109dc8": {
+    "translation": "البناء باستخدام SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "هذا الشهر"
   },
+  "985a4b720f": {
+    "translation": "شروط الاستخدام"
+  },
+  "98c997a27e": {
+    "translation": "إضافة رابط الملف"
+  },
   "9914a0ce04": {
     "translation": "فاتح"
   },
+  "9b33f5c63c": {
+    "translation": "لم تستلم الرمز؟ <resend>إعادة إرسال</resend>."
+  },
   "9bef626805": {
     "translation": "حذف الملف"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "الخلفية"
   },
+  "aa916767cf": {
+    "translation": "تسجيل الدخول لقبول الدعوة"
+  },
   "ab0df9ba36": {
     "translation": "تم الوصول إلى الحد الأقصى للملفات"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "مستخدم ضيف"
   },
+  "b357b524e7": {
+    "translation": "عنوان البريد الإلكتروني"
+  },
+  "b3d2db69fe": {
+    "translation": "رابط الملف"
+  },
   "b6d4223e60": {
     "translation": "تسجيل الدخول"
   },
+  "b6f4a2ec63": {
+    "translation": "مالك"
+  },
   "b758336699": {
     "translation": "نسخ الرابط"
   },
   "ba0318cb81": {
     "translation": "تسجيل الدخول للمشاركة"
   },
-  "bb792693e2": {
-    "translation": "إلغاء التثبيت"
+  "bb93a7590f": {
+    "translation": "قبول والانضمام إلى المجموعة"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, zero {} one {جاري تحميل ملف .tldr…} two {} few {} many {} other {جاري تحميل {uploaded} من {total} ملفات .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "شاركه {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "تحميل ملفات .tldr"
-  },
   "c2276c9127": {
     "translation": "اعرف المزيد عن المشاركة."
   },
+  "c28aed8348": {
+    "translation": "السماح لـ <cookies>analytics</cookies> بمساعدتنا على تحسين tldraw."
+  },
   "c303bd1095": {
     "translation": "يتعذّر نشر الملف."
   },
   "c4b39a1cc3": {
     "translation": "ملفات تعريف الارتباط الأساسية"
   },
+  "c6155aaecc": {
+    "translation": "اسم المجموعة"
+  },
   "c655b27b1e": {
     "translation": "i18n: سلسلة طويلة"
   },
   "c6a00f137b": {
     "translation": "الدعوة"
   },
+  "c74ea6dbff": {
+    "translation": "إظهار أقل"
+  },
   "c87aacf567": {
     "translation": "تسجيل الخروج"
   },
+  "c9cc8cce24": {
+    "translation": "يحفظ"
+  },
   "cceaefbc20": {
     "translation": "مشاركة هذا الملف"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "تبديل الشريط الجانبي"
   },
+  "d638a3344b": {
+    "translation": "قبل أن تبدأ، يرجى قبول <tos>شروط الاستخدام</tos> و<privacy>سياسة الخصوصية</privacy> الخاصة بنا."
+  },
   "d721757161": {
     "translation": "الموضوع"
   },
   "d876a9fe1a": {
     "translation": "حاول مرة أخرى"
   },
+  "d88ad2dc74": {
+    "translation": "قبول ومواصلة"
+  },
   "d9100f3e10": {
     "translation": "اذهب هنا لرؤية المحتوى"
   },
+  "d9e35d0f55": {
+    "translation": "لقد وصلتَ إلى الحد الأقصى لعدد المجموعات. عليكَ حذف المجموعات القديمة قبل إنشاء مجموعات جديدة."
+  },
   "dbbebf3c03": {
     "translation": "دعوة فقط"
   },
+  "dcdaa754fe": {
+    "translation": "عنوان URL لملف tldraw غير صالح"
+  },
   "dfdb78a4e4": {
     "translation": "علامات تصحيح الأخطاء في التطبيق"
   },
+  "e0c88179b3": {
+    "translation": "دعوة الأعضاء"
+  },
+  "e2198d6228": {
+    "translation": "نسخ رابط الدعوة"
+  },
   "e2ae80a510": {
     "translation": "الملخص القانوني"
   },
+  "e3afed0047": {
+    "translation": "مسؤل"
+  },
   "e404559826": {
     "translation": "شروط الخدمة"
   },
-  "e78e14c5f1": {
-    "translation": "تثبيت"
+  "e81c4e4f2b": {
+    "translation": "أو"
+  },
+  "ea0626ac5a": {
+    "translation": "منطقة الخطر"
   },
   "ea4788705e": {
     "translation": "إلغاء"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "اقرأ <a>سياسة ملفات تعريف الارتباط</a> لمعرفة المزيد."
   },
+  "ef53538ae4": {
+    "translation": "أعضاء"
+  },
   "ef7de3f485": {
     "translation": "تم اختياره"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "إعدادات"
   },
+  "f714e36843": {
+    "translation": "هل أنت متأكد أنك تريد مغادرة هذه المجموعة؟"
+  },
+  "fa2ead697d": {
+    "translation": "سياسة الخصوصية"
+  },
   "fb15c53f22": {
     "translation": "عارض"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "رابط منسوخ"
   },
+  "ff7a814974": {
+    "translation": "أضف رابط الملف…"
+  },
   "ffcd73e997": {
     "translation": "استيراد الملف…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/bn.json b/apps/dotcom/client/public/tla/locales/bn.json
index 7d49672ddb40..e6f70ffd9e3b 100644
--- a/apps/dotcom/client/public/tla/locales/bn.json
+++ b/apps/dotcom/client/public/tla/locales/bn.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "হিসাব"
   },
+  "08d2d725a9": {
+    "translation": "আপনার কাজ সংরক্ষণ করতে, রিয়েল-টাইমে সহযোগিতা করতে এবং আরও অনেক কিছু করতে একটি বিনামূল্যে অ্যাকাউন্ট তৈরি করুন।"
+  },
   "0b27918290": {
     "translation": "ফাইল"
   },
   "0b9a4cde72": {
     "translation": "ফাইল মেনু"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw হল একটি বিনামূল্যের এবং তাৎক্ষণিক ভার্চুয়াল হোয়াইটবোর্ড।"
+  },
   "0d1f2bb523": {
     "translation": "মতামত পাঠান"
   },
   "110a4b01be": {
     "translation": "প্রকাশ করুন"
   },
+  "129b9e34ea": {
+    "translation": "গ্রুপ ছেড়ে দিন"
+  },
+  "12a6766ba1": {
+    "translation": "ফাইল আনপিন করুন"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK ব্যবহার করে দেখুন"
   },
   "13ddd375ad": {
     "translation": "হিসাবে রপ্তানি করুন"
   },
+  "146ffe2fd9": {
+    "translation": "আরও দেখাও"
+  },
+  "14d65465b7": {
+    "translation": "গ্রুপ মুছুন"
+  },
   "181b90f889": {
     "translation": "ফাইল তৈরি করুন"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "এই রুমটি তার আকারের সীমার কাছাকাছি চলে আসছে। কিছু কন্টেন্ট সরিয়ে ফেলার অথবা একটি নতুন ফাইল শুরু করার কথা বিবেচনা করুন।"
   },
+  "2445e5e347": {
+    "translation": "গ্রুপ তৈরি করুন"
+  },
   "250ddea65c": {
     "translation": "tldraw সম্পর্কে"
   },
   "299cb00a7a": {
     "translation": "আপলোড ব্যর্থ হয়েছে"
   },
+  "2c3ef76333": {
+    "translation": "আমার ফাইলগুলি"
+  },
   "2deec2cb74": {
     "translation": "এই রুমটি তার আকারের সীমায় পৌঁছে গেছে এবং পরিবর্তনগুলি আর সংরক্ষণ করা নাও যেতে পারে। কিছু কন্টেন্ট সরান অথবা একটি নতুন ফাইল শুরু করুন।"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: হাইলাইট অনুপস্থিত"
   },
+  "32210b37e4": {
+    "translation": "লিঙ্ক যোগ করুন"
+  },
   "335defdafe": {
     "translation": "পৃষ্ঠাটি রিফ্রেশ করার চেষ্টা করুন."
   },
   "344a7f427f": {
     "translation": "সম্পাদক"
   },
+  "3bc7d6ea2f": {
+    "translation": "ইমেল দিয়ে চালিয়ে যান"
+  },
   "3bd1b98dbd": {
     "translation": "পরিবর্তনগুলি প্রকাশ করতে অক্ষম৷"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "পুনরায় লোড করুন"
+  "47f493a590": {
+    "translation": "ফাইল পিন করুন"
   },
-  "764671e008": {
-    "translation": "ডিসকর্ডে আমাদের সাথে চ্যাট করুন"
+  "49049467ff": {
+    "translation": "tldraw ফাইলের URL পেস্ট করুন..."
   },
   "4908687e50": {
     "translation": "আপনি কি নিশ্চিত আপনি এই ফাইলটি ভুলে যেতে চান?"
   },
+  "49ee308734": {
+    "translation": "নাম"
+  },
   "4d0d3ddec9": {
     "translation": "এই সাইটটি অ্যাপটিকে কার্যকর করতে এবং বিশ্লেষণ সংগ্রহ করতে কুকিজ ব্যবহার করে।"
   },
   "4d1c8263ba": {
     "translation": "পুনরায় লোড করুন"
   },
+  "4da5988a2e": {
+    "translation": "গ্রুপটি মুছে ফেলুন..."
+  },
+  "4e6fbf032b": {
+    "translation": "আপনি কি নিশ্চিত যে আপনি এই গ্রুপটি মুছে ফেলতে চান? এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না।"
+  },
   "50db1b7e1e": {
     "translation": "ফাইলটি অপ্রকাশিত করতে অক্ষম৷"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "গোপনীয়তা নীতি"
   },
+  "5a86b22fa0": {
+    "translation": "শুরু করতে ফাইলগুলি এখানে টেনে আনুন, <create>একটি ফাইল তৈরি করুন</create>, অথবা <invite>আমন্ত্রণ লিঙ্কটি অনুলিপি করুন</invite>।"
+  },
   "5a95a425f7": {
     "translation": "শেয়ার করুন"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "পুরনো ব্রাউজার শনাক্ত হয়েছে। এই অ্যাপটি ব্যবহার করার জন্য অনুগ্রহ করে আপনার ব্রাউজার আপডেট করুন।"
   },
+  "5c6fe42bc2": {
+    "translation": "এই লিঙ্কটি প্রত্যাহার করুন এবং একটি নতুন লিঙ্ক তৈরি করুন।"
+  },
   "5d26ae7550": {
     "translation": "আপনি সাইন ইন করার আগে আমরা আপনার তৈরি করা কিছু সামগ্রী আপলোড করতে ব্যর্থ হয়েছি৷"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "বয়স্ক"
   },
+  "639bae9ac6": {
+    "translation": "তুমি"
+  },
   "6609dd239e": {
     "translation": "কিছু ভুল হয়েছে"
   },
   "6637a98151": {
     "translation": "tldraw-এর একটি নতুন সংস্করণ উপলব্ধ। চালিয়ে যেতে অনুগ্রহ করে পৃষ্ঠাটি পুনরায় লোড করুন।"
   },
+  "68257bb646": {
+    "translation": "আপনাকে গ্রুপে আমন্ত্রণ জানানো হয়েছে <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "আপনার ইমেল ঠিকানা লিখুন"
+  },
   "6a26f54883": {
     "translation": "সাহায্য"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "ম্যানুয়ালি সামগ্রী আমদানি করতে এই পদক্ষেপগুলি অনুসরণ করুন:"
   },
+  "70222abcfc": {
+    "translation": "গ্রুপ সেটিংস"
+  },
   "70a6facb9d": {
     "translation": "এই সপ্তাহে"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "কুকিজ পরিচালনা করুন"
   },
+  "7697920637": {
+    "translation": "পুনরায় লোড করুন"
+  },
+  "764671e008": {
+    "translation": "ডিসকর্ডে আমাদের সাথে চ্যাট করুন"
+  },
   "777f9e90cf": {
     "translation": "অবৈধ অনুরোধ."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "ভুলে যাও"
   },
+  "7cfe6c43dc": {
+    "translation": "গ্রুপ ছেড়ে দিন..."
+  },
   "7daeced9ff": {
     "translation": "পরিবর্তনগুলি প্রকাশ করুন"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ফাইলের নাম পরিবর্তন করুন"
   },
+  "8ad4303b83": {
+    "translation": "না ধন্যবাদ"
+  },
   "8b1946f965": {
     "translation": "সম্পাদনা চালিয়ে যেতে, অনুগ্রহ করে আপনার ফাইলগুলিতে রুমটি কপি করুন।"
   },
+  "8c2d3d730c": {
+    "translation": "যাচাইকরণ কোডের জন্য আপনার ইমেল চেক করুন।"
+  },
   "8eb2c00e96": {
     "translation": "আপনার সাথে শেয়ার করা হয়েছে"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "আমার ফাইল কপি"
   },
+  "930390d222": {
+    "translation": "আমন্ত্রণের লিঙ্কটি কপি করা হয়েছে"
+  },
+  "95aacd4d4a": {
+    "translation": "গুগল দিয়ে সাইন ইন করুন"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK দিয়ে তৈরি করুন"
+  },
   "96165d6df5": {
     "translation": "এই মাসে"
   },
+  "985a4b720f": {
+    "translation": "ব্যবহারের শর্তাবলী"
+  },
+  "98c997a27e": {
+    "translation": "ফাইলের লিঙ্ক যোগ করুন"
+  },
   "9914a0ce04": {
     "translation": "আলো"
   },
+  "9b33f5c63c": {
+    "translation": "কোড পাননি? <resend>পুনরায় পাঠান</resend>।"
+  },
   "9bef626805": {
     "translation": "ফাইল মুছুন"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "পটভূমি"
   },
+  "aa916767cf": {
+    "translation": "আমন্ত্রণ গ্রহণ করতে সাইন ইন করুন"
+  },
   "ab0df9ba36": {
     "translation": "ফাইলের সীমা পৌঁছেছে"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "অতিথি ব্যবহারকারী"
   },
+  "b357b524e7": {
+    "translation": "ইমেল ঠিকানা"
+  },
+  "b3d2db69fe": {
+    "translation": "ফাইলের URL"
+  },
   "b6d4223e60": {
     "translation": "সাইন ইন করুন"
   },
+  "b6f4a2ec63": {
+    "translation": "মালিক"
+  },
   "b758336699": {
     "translation": "লিঙ্ক কপি করুন"
   },
   "ba0318cb81": {
     "translation": "শেয়ার করতে সাইন ইন করুন"
   },
-  "bb792693e2": {
-    "translation": "আনপিন করুন"
+  "bb93a7590f": {
+    "translation": "গ্রহণ করুন এবং গ্রুপে যোগদান করুন"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr ফাইল আপলোড করা হচ্ছে...} other {{total} .tldr ফাইলের {uploaded} আপলোড করা হচ্ছে...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "শেয়ার করেছেন {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": ".tldr ফাইল আপলোড করুন"
-  },
   "c2276c9127": {
     "translation": "শেয়ার করার বিষয়ে আরও জানুন।"
   },
+  "c28aed8348": {
+    "translation": "tldraw উন্নত করতে আমাদের সাহায্য করার জন্য <cookies>analytics</cookies> কে অনুমতি দিন।"
+  },
   "c303bd1095": {
     "translation": "ফাইল প্রকাশ করতে অক্ষম."
   },
   "c4b39a1cc3": {
     "translation": "প্রয়োজনীয় কুকিজ"
   },
+  "c6155aaecc": {
+    "translation": "গ্রুপের নাম"
+  },
   "c655b27b1e": {
     "translation": "i18n: লম্বা স্ট্রিং"
   },
   "c6a00f137b": {
     "translation": "আমন্ত্রণ"
   },
+  "c74ea6dbff": {
+    "translation": "কম দেখান"
+  },
   "c87aacf567": {
     "translation": "সাইন আউট করুন"
   },
+  "c9cc8cce24": {
+    "translation": "সংরক্ষণ করুন"
+  },
   "cceaefbc20": {
     "translation": "এই ফাইল শেয়ার করুন"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "সাইডবার টগল করুন"
   },
+  "d638a3344b": {
+    "translation": "শুরু করার আগে, অনুগ্রহ করে আমাদের <tos>ব্যবহারের শর্তাবলী</tos> এবং <privacy>গোপনীয়তা নীতি</privacy> মেনে নিন।"
+  },
   "d721757161": {
     "translation": "থিম"
   },
   "d876a9fe1a": {
     "translation": "আবার চেষ্টা করুন"
   },
+  "d88ad2dc74": {
+    "translation": "গ্রহণ করুন এবং চালিয়ে যান"
+  },
   "d9100f3e10": {
     "translation": "বিষয়বস্তু দেখতে এখানে যান"
   },
+  "d9e35d0f55": {
+    "translation": "আপনি সর্বাধিক সংখ্যক গ্রুপে পৌঁছে গেছেন। নতুন গ্রুপ তৈরি করার আগে আপনাকে পুরানো গ্রুপগুলি মুছে ফেলতে হবে।"
+  },
   "dbbebf3c03": {
     "translation": "শুধুমাত্র আমন্ত্রণ"
   },
+  "dcdaa754fe": {
+    "translation": "tldraw ফাইলের URLটি ভুল"
+  },
   "dfdb78a4e4": {
     "translation": "অ্যাপ ডিবাগ পতাকা"
   },
+  "e0c88179b3": {
+    "translation": "সদস্যদের আমন্ত্রণ জানান"
+  },
+  "e2198d6228": {
+    "translation": "আমন্ত্রণের লিঙ্ক কপি করুন"
+  },
   "e2ae80a510": {
     "translation": "আইনি সারসংক্ষেপ"
   },
+  "e3afed0047": {
+    "translation": "অ্যাডমিন"
+  },
   "e404559826": {
     "translation": "পরিষেবার শর্তাবলী"
   },
-  "e78e14c5f1": {
-    "translation": "পিন"
+  "e81c4e4f2b": {
+    "translation": "অথবা"
+  },
+  "ea0626ac5a": {
+    "translation": "বিপদ অঞ্চল"
   },
   "ea4788705e": {
     "translation": "বাতিল করুন"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "আরও জানতে আমাদের <a>কুকি নীতি</a> পড়ুন।"
   },
+  "ef53538ae4": {
+    "translation": "সদস্যরা"
+  },
   "ef7de3f485": {
     "translation": "নির্বাচিত"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "সেটিংস"
   },
+  "f714e36843": {
+    "translation": "তুমি কি নিশ্চিত যে তুমি এই গ্রুপটি ছেড়ে যেতে চাও?"
+  },
+  "fa2ead697d": {
+    "translation": "গোপনীয়তা নীতি"
+  },
   "fb15c53f22": {
     "translation": "দর্শক"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "অনুলিপি করা লিঙ্ক"
   },
+  "ff7a814974": {
+    "translation": "ফাইলের লিঙ্ক যোগ করুন..."
+  },
   "ffcd73e997": {
     "translation": "ফাইল আমদানি করুন..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/ca.json b/apps/dotcom/client/public/tla/locales/ca.json
index b8724bbe57ea..9d11272add46 100644
--- a/apps/dotcom/client/public/tla/locales/ca.json
+++ b/apps/dotcom/client/public/tla/locales/ca.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Compte"
   },
+  "08d2d725a9": {
+    "translation": "Crea un compte gratuït per desar la teva feina, col·laborar en temps real i molt més."
+  },
   "0b27918290": {
     "translation": "Fitxer"
   },
   "0b9a4cde72": {
     "translation": "Menú Fitxer"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw és una pissarra virtual gratuïta i instantània."
+  },
   "0d1f2bb523": {
     "translation": "Enviar comentaris"
   },
   "110a4b01be": {
     "translation": "Publicar"
   },
+  "129b9e34ea": {
+    "translation": "Sortir del grup"
+  },
+  "12a6766ba1": {
+    "translation": "Desfixar fitxer"
+  },
   "12c8a9838c": {
     "translation": "Prova el SDK de tldraw"
   },
   "13ddd375ad": {
     "translation": "Exporta com a"
   },
+  "146ffe2fd9": {
+    "translation": "Mostra'n més"
+  },
+  "14d65465b7": {
+    "translation": "Suprimeix el grup"
+  },
   "181b90f889": {
     "translation": "Crea un fitxer"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Aquesta sala s'acosta al seu límit de mida. Penseu en la possibilitat d'eliminar part del contingut o iniciar un fitxer nou."
   },
+  "2445e5e347": {
+    "translation": "Crea un grup"
+  },
   "250ddea65c": {
     "translation": "Sobre tldraw"
   },
   "299cb00a7a": {
     "translation": "La càrrega ha fallat"
   },
+  "2c3ef76333": {
+    "translation": "Els meus fitxers"
+  },
   "2deec2cb74": {
     "translation": "Aquesta sala ha arribat al límit de mida i és possible que els canvis ja no es puguin desar. Elimina part del contingut o inicia un fitxer nou."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Ressaltar que falta"
   },
+  "32210b37e4": {
+    "translation": "Afegeix un enllaç"
+  },
   "335defdafe": {
     "translation": "Si us plau, prova d'actualitzar la pàgina."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continua amb el correu electrònic"
+  },
   "3bd1b98dbd": {
     "translation": "No es poden publicar els canvis."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Torneu a carregar"
+  "47f493a590": {
+    "translation": "Fitxer fixat"
   },
-  "764671e008": {
-    "translation": "Xateja amb nosaltres a Discord"
+  "49049467ff": {
+    "translation": "Enganxa l'URL del fitxer tldraw..."
   },
   "4908687e50": {
     "translation": "Esteu segur que voleu oblidar aquest fitxer?"
   },
+  "49ee308734": {
+    "translation": "Nom"
+  },
   "4d0d3ddec9": {
     "translation": "Aquest lloc web utilitza cookies per fer que l'aplicació funcioni i per recopilar dades analítiques."
   },
   "4d1c8263ba": {
     "translation": "Torna a carregar"
   },
+  "4da5988a2e": {
+    "translation": "Suprimeix el grup…"
+  },
+  "4e6fbf032b": {
+    "translation": "Esteu segur que voleu suprimir aquest grup? Aquesta acció no es pot desfer."
+  },
   "50db1b7e1e": {
     "translation": "No es pot anul·lar la publicació del fitxer."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Política de privadesa"
   },
+  "5a86b22fa0": {
+    "translation": "Arrossega els fitxers aquí, <create>crea un fitxer</create> o <invite>copia l'enllaç d'invitació</invite> per començar."
+  },
   "5a95a425f7": {
     "translation": "Comparteix"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "S'ha detectat un navegador antic. Actualitzeu el navegador per utilitzar aquesta aplicació."
   },
+  "5c6fe42bc2": {
+    "translation": "Revoca aquest enllaç i crea'n un de nou."
+  },
   "5d26ae7550": {
     "translation": "No hem pogut penjar part del contingut que vas crear abans d'iniciar la sessió."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Més vell"
   },
+  "639bae9ac6": {
+    "translation": "tu"
+  },
   "6609dd239e": {
     "translation": "Alguna cosa va fallar"
   },
   "6637a98151": {
     "translation": "Hi ha disponible una nova versió de tldraw. Torneu a carregar la pàgina per continuar."
   },
+  "68257bb646": {
+    "translation": "Has estat convidat al grup <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Introdueix la teva adreça electrònica"
+  },
   "6a26f54883": {
     "translation": "Ajuda"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Seguiu aquests passos per importar el contingut manualment:"
   },
+  "70222abcfc": {
+    "translation": "Configuració del grup"
+  },
   "70a6facb9d": {
     "translation": "Aquesta setmana"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Gestionar cookies"
   },
+  "7697920637": {
+    "translation": "Torneu a carregar"
+  },
+  "764671e008": {
+    "translation": "Xateja amb nosaltres a Discord"
+  },
   "777f9e90cf": {
     "translation": "Sol·licitud no vàlida."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Oblida't"
   },
+  "7cfe6c43dc": {
+    "translation": "Sortir del grup…"
+  },
   "7daeced9ff": {
     "translation": "Publicar els canvis"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Canvia el nom del fitxer"
   },
+  "8ad4303b83": {
+    "translation": "No, gràcies."
+  },
   "8b1946f965": {
     "translation": "Per continuar editant, copieu la sala als vostres fitxers."
   },
+  "8c2d3d730c": {
+    "translation": "Revisa el teu correu electrònic per obtenir un codi de verificació."
+  },
   "8eb2c00e96": {
     "translation": "Compartit amb tu"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copia als meus fitxers"
   },
+  "930390d222": {
+    "translation": "Enllaç d'invitació copiat"
+  },
+  "95aacd4d4a": {
+    "translation": "Inicia la sessió amb Google"
+  },
+  "95d2109dc8": {
+    "translation": "Compilar amb el SDK de tldraw"
+  },
   "96165d6df5": {
     "translation": "Aquest mes"
   },
+  "985a4b720f": {
+    "translation": "Condicions d'ús"
+  },
+  "98c997a27e": {
+    "translation": "Afegeix un enllaç de fitxer"
+  },
   "9914a0ce04": {
     "translation": "Llum"
   },
+  "9b33f5c63c": {
+    "translation": "No has rebut cap codi? <resend>Torna a enviar</resend>."
+  },
   "9bef626805": {
     "translation": "Esborra el fitxer"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Fons"
   },
+  "aa916767cf": {
+    "translation": "Inicia la sessió per acceptar la invitació"
+  },
   "ab0df9ba36": {
     "translation": "S'ha arribat al límit de fitxers"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Usuari convidat"
   },
+  "b357b524e7": {
+    "translation": "Adreça electrònica"
+  },
+  "b3d2db69fe": {
+    "translation": "URL del fitxer"
+  },
   "b6d4223e60": {
     "translation": "Inicia sessió"
   },
+  "b6f4a2ec63": {
+    "translation": "propietari"
+  },
   "b758336699": {
     "translation": "Copia l'enllaç"
   },
   "ba0318cb81": {
     "translation": "Inicia la sessió per compartir"
   },
-  "bb792693e2": {
-    "translation": "Desenganxa"
+  "bb93a7590f": {
+    "translation": "Accepta i uneix-te al grup"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {S'està penjant el fitxer .tldr...} other {S'estan penjant {uploaded} de {total} fitxers .tldr...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Compartit per {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Carregueu fitxers .tldr"
-  },
   "c2276c9127": {
     "translation": "Més informació sobre com compartir."
   },
+  "c28aed8348": {
+    "translation": "Permet que <cookies>analytics</cookies> ens ajudi a millorar tldraw."
+  },
   "c303bd1095": {
     "translation": "No es pot publicar el fitxer."
   },
   "c4b39a1cc3": {
     "translation": "Galetes essencials"
   },
+  "c6155aaecc": {
+    "translation": "Nom del grup"
+  },
   "c655b27b1e": {
     "translation": "i18n: cadena llarga"
   },
   "c6a00f137b": {
     "translation": "Convidar"
   },
+  "c74ea6dbff": {
+    "translation": "Mostra menys"
+  },
   "c87aacf567": {
     "translation": "Tanca la sessió"
   },
+  "c9cc8cce24": {
+    "translation": "Desa"
+  },
   "cceaefbc20": {
     "translation": "Comparteix aquest fitxer"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Canvia la barra lateral"
   },
+  "d638a3344b": {
+    "translation": "Abans de començar, si us plau, accepteu les nostres <tos>condicions d'ús</tos> i la <privacy>política de privacitat</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Torna-ho a provar"
   },
+  "d88ad2dc74": {
+    "translation": "Accepta i continua"
+  },
   "d9100f3e10": {
     "translation": "Entra aquí per veure el contingut"
   },
+  "d9e35d0f55": {
+    "translation": "Heu arribat al nombre màxim de grups. Heu de suprimir els grups antics abans de crear-ne de nous."
+  },
   "dbbebf3c03": {
     "translation": "Només convidar"
   },
+  "dcdaa754fe": {
+    "translation": "URL de fitxer tldraw no vàlida"
+  },
   "dfdb78a4e4": {
     "translation": "Senyals de depuració d'aplicacions"
   },
+  "e0c88179b3": {
+    "translation": "Convida membres"
+  },
+  "e2198d6228": {
+    "translation": "Copia l'enllaç d'invitació"
+  },
   "e2ae80a510": {
     "translation": "Resum legal"
   },
+  "e3afed0047": {
+    "translation": "Administrador"
+  },
   "e404559826": {
     "translation": "Condicions del servei"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "o"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona de perill"
   },
   "ea4788705e": {
     "translation": "Cancel·la"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Llegiu la nostra <a>política de cookies</a> per obtenir més informació."
   },
+  "ef53538ae4": {
+    "translation": "Membres"
+  },
   "ef7de3f485": {
     "translation": "seleccionat"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Configuració"
   },
+  "f714e36843": {
+    "translation": "Esteu segur que voleu sortir d'aquest grup?"
+  },
+  "fa2ead697d": {
+    "translation": "Política de privacitat"
+  },
   "fb15c53f22": {
     "translation": "Visor"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Enllaç copiat"
   },
+  "ff7a814974": {
+    "translation": "Afegeix un enllaç de fitxer…"
+  },
   "ffcd73e997": {
     "translation": "Importa el fitxer…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/cs.json b/apps/dotcom/client/public/tla/locales/cs.json
index 3b1f61cb96c3..c69acf32d9f5 100644
--- a/apps/dotcom/client/public/tla/locales/cs.json
+++ b/apps/dotcom/client/public/tla/locales/cs.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Účet"
   },
+  "08d2d725a9": {
+    "translation": "Vytvořte si bezplatný účet pro ukládání své práce, spolupráci v reálném čase a další."
+  },
   "0b27918290": {
     "translation": "Soubor"
   },
   "0b9a4cde72": {
     "translation": "Nabídka Soubor"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw je bezplatná a okamžitá virtuální bílá tabule."
+  },
   "0d1f2bb523": {
     "translation": "Odeslat zpětnou vazbu"
   },
   "110a4b01be": {
     "translation": "Publikovat"
   },
+  "129b9e34ea": {
+    "translation": "Opustit skupinu"
+  },
+  "12a6766ba1": {
+    "translation": "Odepnout soubor"
+  },
   "12c8a9838c": {
     "translation": "Vyzkoušejte sadu SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Exportovat jako"
   },
+  "146ffe2fd9": {
+    "translation": "Zobrazit více"
+  },
+  "14d65465b7": {
+    "translation": "Smazat skupinu"
+  },
   "181b90f889": {
     "translation": "Vytvořit soubor"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Tato místnost se blíží svému limitu velikosti. Zkuste odstranit část obsahu nebo vytvořit nový soubor."
   },
+  "2445e5e347": {
+    "translation": "Vytvořit skupinu"
+  },
   "250ddea65c": {
     "translation": "O tldraw"
   },
   "299cb00a7a": {
     "translation": "Nahrání se nezdařilo"
   },
+  "2c3ef76333": {
+    "translation": "Moje soubory"
+  },
   "2deec2cb74": {
     "translation": "Tato místnost dosáhla limitu velikosti a změny se již nemusí ukládat. Odstraňte část obsahu nebo začněte vytvářet nový soubor."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Zvýraznění chybí"
   },
+  "32210b37e4": {
+    "translation": "Přidat odkaz"
+  },
   "335defdafe": {
     "translation": "Zkuste prosím obnovit stránku."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Pokračovat s e-mailem"
+  },
   "3bd1b98dbd": {
     "translation": "Změny nelze publikovat."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Načtěte znovu"
+  "47f493a590": {
+    "translation": "Připnout soubor"
   },
-  "764671e008": {
-    "translation": "Chatujte s námi na Discordu"
+  "49049467ff": {
+    "translation": "Vložit URL soubor tldraw..."
   },
   "4908687e50": {
     "translation": "Opravdu chcete tento soubor zapomenout?"
   },
+  "49ee308734": {
+    "translation": "Jméno"
+  },
   "4d0d3ddec9": {
     "translation": "Tato stránka používá soubory cookie k fungování aplikace a ke shromažďování analytických údajů."
   },
   "4d1c8263ba": {
     "translation": "Znovu načíst"
   },
+  "4da5988a2e": {
+    "translation": "Smazat skupinu…"
+  },
+  "4e6fbf032b": {
+    "translation": "Jste si jisti, že chcete tuto skupinu smazat? Tuto akci nelze vrátit zpět."
+  },
   "50db1b7e1e": {
     "translation": "Publikování souboru nelze zrušit."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Zásady ochrany osobních údajů"
   },
+  "5a86b22fa0": {
+    "translation": "Přetáhněte soubory sem, <create>vytvořte soubor</create> nebo <invite>zkopírujte odkaz na pozvánku</invite> a začněte."
+  },
   "5a95a425f7": {
     "translation": "Podíl"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Byl detekován starý prohlížeč. Pro použití této aplikace prosím aktualizujte prohlížeč."
   },
+  "5c6fe42bc2": {
+    "translation": "Zrušte toto propojení a vytvořte nové."
+  },
   "5d26ae7550": {
     "translation": "Nepodařilo se nám nahrát část obsahu, který jste vytvořili, než jste se přihlásili."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Starší"
   },
+  "639bae9ac6": {
+    "translation": "Vy"
+  },
   "6609dd239e": {
     "translation": "Něco se pokazilo"
   },
   "6637a98151": {
     "translation": "K dispozici je nová verze tldraw. Chcete-li pokračovat, znovu načtěte stránku."
   },
+  "68257bb646": {
+    "translation": "Byli jste pozváni do skupiny <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Zadejte svou e-mailovou adresu"
+  },
   "6a26f54883": {
     "translation": "Pomoc"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Chcete-li obsah importovat ručně, postupujte takto:"
   },
+  "70222abcfc": {
+    "translation": "Nastavení skupiny"
+  },
   "70a6facb9d": {
     "translation": "Tento týden"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Spravovat soubory cookie"
   },
+  "7697920637": {
+    "translation": "Načtěte znovu"
+  },
+  "764671e008": {
+    "translation": "Chatujte s námi na Discordu"
+  },
   "777f9e90cf": {
     "translation": "Neplatný požadavek."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Zapomenout"
   },
+  "7cfe6c43dc": {
+    "translation": "Opustit skupinu…"
+  },
   "7daeced9ff": {
     "translation": "Publikovat změny"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Přejmenovat soubor"
   },
+  "8ad4303b83": {
+    "translation": "Ne, děkuji."
+  },
   "8b1946f965": {
     "translation": "Chcete-li pokračovat v úpravách, zkopírujte prosím místnost do svých souborů."
   },
+  "8c2d3d730c": {
+    "translation": "Zkontrolujte si e-mail, kde vám bude doručen ověřovací kód."
+  },
   "8eb2c00e96": {
     "translation": "Sdíleno s vámi"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopírovat do mých souborů"
   },
+  "930390d222": {
+    "translation": "Zkopírován odkaz na pozvánku"
+  },
+  "95aacd4d4a": {
+    "translation": "Přihlásit se pomocí Googlu"
+  },
+  "95d2109dc8": {
+    "translation": "Sestavení s tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Tento měsíc"
   },
+  "985a4b720f": {
+    "translation": "Podmínky použití"
+  },
+  "98c997a27e": {
+    "translation": "Přidat odkaz na soubor"
+  },
   "9914a0ce04": {
     "translation": "Světlo"
   },
+  "9b33f5c63c": {
+    "translation": "Neobdrželi jste kód? <resend>Znovu odeslat</resend>."
+  },
   "9bef626805": {
     "translation": "Smazat soubor"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Pozadí"
   },
+  "aa916767cf": {
+    "translation": "Přihlaste se pro přijetí pozvánky"
+  },
   "ab0df9ba36": {
     "translation": "Byl dosažen limit souborů"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Hostující uživatel"
   },
+  "b357b524e7": {
+    "translation": "E-mailová adresa"
+  },
+  "b3d2db69fe": {
+    "translation": "URL souboru"
+  },
   "b6d4223e60": {
     "translation": "Přihlaste se"
   },
+  "b6f4a2ec63": {
+    "translation": "Majitel"
+  },
   "b758336699": {
     "translation": "Zkopírujte odkaz"
   },
   "ba0318cb81": {
     "translation": "Přihlaste se pro sdílení"
   },
-  "bb792693e2": {
-    "translation": "Odepnout"
+  "bb93a7590f": {
+    "translation": "Přijmout a připojit se ke skupině"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Nahrávání souboru .tldr…} few {} many {} other {Nahrávání {uploaded} z {total} souborů .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Sdílel {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Nahrajte soubory .tldr"
-  },
   "c2276c9127": {
     "translation": "Další informace o sdílení."
   },
+  "c28aed8348": {
+    "translation": "Povolte <cookies>analytics</cookies>, které nám pomohou vylepšit tldraw."
+  },
   "c303bd1095": {
     "translation": "Soubor nelze publikovat."
   },
   "c4b39a1cc3": {
     "translation": "Základní soubory cookie"
   },
+  "c6155aaecc": {
+    "translation": "Název skupiny"
+  },
   "c655b27b1e": {
     "translation": "i18n: Dlouhá struna"
   },
   "c6a00f137b": {
     "translation": "Pozvat"
   },
+  "c74ea6dbff": {
+    "translation": "Zobrazit méně"
+  },
   "c87aacf567": {
     "translation": "Odhlaste se"
   },
+  "c9cc8cce24": {
+    "translation": "Uložit"
+  },
   "cceaefbc20": {
     "translation": "Sdílet tento soubor"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Přepnout postranní panel"
   },
+  "d638a3344b": {
+    "translation": "Než začnete, přijměte prosím naše <tos>podmínky použití</tos> a <privacy>zásady ochrany osobních údajů</privacy>."
+  },
   "d721757161": {
     "translation": "Téma"
   },
   "d876a9fe1a": {
     "translation": "Zkuste to znovu"
   },
+  "d88ad2dc74": {
+    "translation": "Přijmout a pokračovat"
+  },
   "d9100f3e10": {
     "translation": "Přejděte sem a podívejte se na obsah"
   },
+  "d9e35d0f55": {
+    "translation": "Dosáhli jste maximálního počtu skupin. Před vytvořením nových skupin je třeba smazat staré skupiny."
+  },
   "dbbebf3c03": {
     "translation": "Pouze na pozvání"
   },
+  "dcdaa754fe": {
+    "translation": "Neplatná adresa URL souboru tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Příznaky ladění aplikace"
   },
+  "e0c88179b3": {
+    "translation": "Pozvat členy"
+  },
+  "e2198d6228": {
+    "translation": "Kopírovat odkaz na pozvánku"
+  },
   "e2ae80a510": {
     "translation": "Právní shrnutí"
   },
+  "e3afed0047": {
+    "translation": "Administrátor"
+  },
   "e404559826": {
     "translation": "Podmínky služby"
   },
-  "e78e14c5f1": {
-    "translation": "Připnout"
+  "e81c4e4f2b": {
+    "translation": "nebo"
+  },
+  "ea0626ac5a": {
+    "translation": "Nebezpečná zóna"
   },
   "ea4788705e": {
     "translation": "Zrušit"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Přečtěte si naše <a>zásady používání souborů cookie</a> a dozvíte se více."
   },
+  "ef53538ae4": {
+    "translation": "Členové"
+  },
   "ef7de3f485": {
     "translation": "vybraný"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Nastavení"
   },
+  "f714e36843": {
+    "translation": "Jste si jistý/á, že chcete tuto skupinu opustit?"
+  },
+  "fa2ead697d": {
+    "translation": "Zásady ochrany osobních údajů"
+  },
   "fb15c53f22": {
     "translation": "Prohlížeč"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Zkopírován odkaz"
   },
+  "ff7a814974": {
+    "translation": "Přidat odkaz na soubor…"
+  },
   "ffcd73e997": {
     "translation": "Importovat soubor…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/da.json b/apps/dotcom/client/public/tla/locales/da.json
index f1c63640362c..84dc983091c9 100644
--- a/apps/dotcom/client/public/tla/locales/da.json
+++ b/apps/dotcom/client/public/tla/locales/da.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Konto"
   },
+  "08d2d725a9": {
+    "translation": "Opret en gratis konto for at gemme dit arbejde, samarbejde i realtid og meget mere."
+  },
   "0b27918290": {
     "translation": "Fil"
   },
   "0b9a4cde72": {
     "translation": "Fil menu"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw er en gratis og øjeblikkelig virtuel whiteboard."
+  },
   "0d1f2bb523": {
     "translation": "Send feedback"
   },
   "110a4b01be": {
     "translation": "Offentliggøre"
   },
+  "129b9e34ea": {
+    "translation": "Forlad gruppen"
+  },
+  "12a6766ba1": {
+    "translation": "Frigør fil"
+  },
   "12c8a9838c": {
     "translation": "Prøv tldraw SDK'et"
   },
   "13ddd375ad": {
     "translation": "Eksporter som"
   },
+  "146ffe2fd9": {
+    "translation": "Vis mere"
+  },
+  "14d65465b7": {
+    "translation": "Slet gruppe"
+  },
   "181b90f889": {
     "translation": "Opret fil"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Dette rum nærmer sig sin størrelsesgrænse. Overvej at fjerne noget indhold eller starte en ny fil."
   },
+  "2445e5e347": {
+    "translation": "Opret gruppe"
+  },
   "250ddea65c": {
     "translation": "Om tldraw"
   },
   "299cb00a7a": {
     "translation": "Upload mislykkedes"
   },
+  "2c3ef76333": {
+    "translation": "Mine filer"
+  },
   "2deec2cb74": {
     "translation": "Dette rum har nået sin størrelsesgrænse, og ændringerne kan muligvis ikke længere gemmes. Fjern noget indhold, eller start en ny fil."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Fremhæv mangler"
   },
+  "32210b37e4": {
+    "translation": "Tilføj link"
+  },
   "335defdafe": {
     "translation": "Prøv venligst at opdatere siden."
   },
   "344a7f427f": {
     "translation": "Redaktør"
   },
+  "3bc7d6ea2f": {
+    "translation": "Fortsæt med e-mail"
+  },
   "3bd1b98dbd": {
     "translation": "Ændringerne kunne ikke offentliggøres."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tltegn"
   },
-  "7697920637": {
-    "translation": "Genindlæs venligst"
+  "47f493a590": {
+    "translation": "Fastgør fil"
   },
-  "764671e008": {
-    "translation": "Chat med os på Discord"
+  "49049467ff": {
+    "translation": "Indsæt tldraw-filens URL..."
   },
   "4908687e50": {
     "translation": "Er du sikker på, at du vil glemme denne fil?"
   },
+  "49ee308734": {
+    "translation": "Navn"
+  },
   "4d0d3ddec9": {
     "translation": "Dette websted bruger cookies til at få appen til at fungere og til at indsamle analyser."
   },
   "4d1c8263ba": {
     "translation": "Genindlæs"
   },
+  "4da5988a2e": {
+    "translation": "Slet gruppe…"
+  },
+  "4e6fbf032b": {
+    "translation": "Er du sikker på, at du vil slette denne gruppe? Denne handling kan ikke fortrydes."
+  },
   "50db1b7e1e": {
     "translation": "Filen kunne ikke fjernes."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Privatlivspolitik"
   },
+  "5a86b22fa0": {
+    "translation": "Træk filer hertil, <create>opret en fil</create>, eller <invite>kopiér invitationslinket</invite> for at komme i gang."
+  },
   "5a95a425f7": {
     "translation": "Dele"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Gammel browser fundet. Opdater venligst din browser for at bruge denne app."
   },
+  "5c6fe42bc2": {
+    "translation": "Tilbagekald dette link og opret et nyt."
+  },
   "5d26ae7550": {
     "translation": "Vi kunne ikke uploade noget af det indhold, du oprettede, før du loggede ind."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Ældre"
   },
+  "639bae9ac6": {
+    "translation": "du"
+  },
   "6609dd239e": {
     "translation": "Noget gik galt"
   },
   "6637a98151": {
     "translation": "En ny version af tldraw er tilgængelig. Genindlæs siden for at fortsætte."
   },
+  "68257bb646": {
+    "translation": "Du er blevet inviteret til gruppen <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Indtast din e-mailadresse"
+  },
   "6a26f54883": {
     "translation": "Hjælp"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Følg disse trin for at importere indholdet manuelt:"
   },
+  "70222abcfc": {
+    "translation": "Gruppeindstillinger"
+  },
   "70a6facb9d": {
     "translation": "Denne uge"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Administrer cookies"
   },
+  "7697920637": {
+    "translation": "Genindlæs venligst"
+  },
+  "764671e008": {
+    "translation": "Chat med os på Discord"
+  },
   "777f9e90cf": {
     "translation": "Ugyldig anmodning."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Glemme"
   },
+  "7cfe6c43dc": {
+    "translation": "Forlad gruppen…"
+  },
   "7daeced9ff": {
     "translation": "Udgiv ændringer"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Omdøb fil"
   },
+  "8ad4303b83": {
+    "translation": "Nej tak"
+  },
   "8b1946f965": {
     "translation": "For at fortsætte redigeringen skal du kopiere rummet til dine filer."
   },
+  "8c2d3d730c": {
+    "translation": "Tjek din e-mail for en bekræftelseskode."
+  },
   "8eb2c00e96": {
     "translation": "Delt med dig"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopier til mine filer"
   },
+  "930390d222": {
+    "translation": "Kopieret invitationslink"
+  },
+  "95aacd4d4a": {
+    "translation": "Log ind med Google"
+  },
+  "95d2109dc8": {
+    "translation": "Byg med tldraw SDK'et"
+  },
   "96165d6df5": {
     "translation": "Denne måned"
   },
+  "985a4b720f": {
+    "translation": "Brugsbetingelser"
+  },
+  "98c997a27e": {
+    "translation": "Tilføj fillink"
+  },
   "9914a0ce04": {
     "translation": "Lys"
   },
+  "9b33f5c63c": {
+    "translation": "Har du ikke modtaget en kode? <resend>Send igen</resend>."
+  },
   "9bef626805": {
     "translation": "Slet fil"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Baggrund"
   },
+  "aa916767cf": {
+    "translation": "Log ind for at acceptere invitationen"
+  },
   "ab0df9ba36": {
     "translation": "Filgrænsen er nået"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gæstebruger"
   },
+  "b357b524e7": {
+    "translation": "E-mailadresse"
+  },
+  "b3d2db69fe": {
+    "translation": "Fil-URL"
+  },
   "b6d4223e60": {
     "translation": "Log ind"
   },
+  "b6f4a2ec63": {
+    "translation": "Ejer"
+  },
   "b758336699": {
     "translation": "Kopiér link"
   },
   "ba0318cb81": {
     "translation": "Log ind for at dele"
   },
-  "bb792693e2": {
-    "translation": "Frigør"
+  "bb93a7590f": {
+    "translation": "Accepter og bliv medlem af gruppen"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Uploader .tldr-fil...} other {Uploader {uploaded} af {total} .tldr-filer...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Delt af {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Upload .tldr-filer"
-  },
   "c2276c9127": {
     "translation": "Få mere at vide om deling."
   },
+  "c28aed8348": {
+    "translation": "Tillad <cookies>analyse</cookies> for at hjælpe os med at forbedre tldraw."
+  },
   "c303bd1095": {
     "translation": "Filen kunne ikke udgives."
   },
   "c4b39a1cc3": {
     "translation": "Vigtige cookies"
   },
+  "c6155aaecc": {
+    "translation": "Gruppenavn"
+  },
   "c655b27b1e": {
     "translation": "i18n: Lang streng"
   },
   "c6a00f137b": {
     "translation": "Invitere"
   },
+  "c74ea6dbff": {
+    "translation": "Vis mindre"
+  },
   "c87aacf567": {
     "translation": "Log ud"
   },
+  "c9cc8cce24": {
+    "translation": "Spare"
+  },
   "cceaefbc20": {
     "translation": "Del denne fil"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Skift sidebjælke"
   },
+  "d638a3344b": {
+    "translation": "Før du starter, bedes du acceptere vores <tos>brugsbetingelser</tos> og <privacy>privatlivspolitik</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Prøv igen"
   },
+  "d88ad2dc74": {
+    "translation": "Accepter og fortsæt"
+  },
   "d9100f3e10": {
     "translation": "Gå her for at se indholdet"
   },
+  "d9e35d0f55": {
+    "translation": "Du har nået det maksimale antal grupper. Du skal slette gamle grupper, før du opretter nye."
+  },
   "dbbebf3c03": {
     "translation": "Kun invitation"
   },
+  "dcdaa754fe": {
+    "translation": "Ugyldig URL til tldraw-fil"
+  },
   "dfdb78a4e4": {
     "translation": "App debug flag"
   },
+  "e0c88179b3": {
+    "translation": "Inviter medlemmer"
+  },
+  "e2198d6228": {
+    "translation": "Kopiér invitationslinket"
+  },
   "e2ae80a510": {
     "translation": "Juridisk resumé"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Servicevilkår"
   },
-  "e78e14c5f1": {
-    "translation": "Stift"
+  "e81c4e4f2b": {
+    "translation": "eller"
+  },
+  "ea0626ac5a": {
+    "translation": "Farezone"
   },
   "ea4788705e": {
     "translation": "Ophæve"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Læs vores <a>cookiepolitik</a> for at få mere at vide."
   },
+  "ef53538ae4": {
+    "translation": "Medlemmer"
+  },
   "ef7de3f485": {
     "translation": "udvalgte"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Indstillinger"
   },
+  "f714e36843": {
+    "translation": "Er du sikker på, at du vil forlade denne gruppe?"
+  },
+  "fa2ead697d": {
+    "translation": "Privatlivspolitik"
+  },
   "fb15c53f22": {
     "translation": "Seer"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Kopieret link"
   },
+  "ff7a814974": {
+    "translation": "Tilføj fillink…"
+  },
   "ffcd73e997": {
     "translation": "Importér fil…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/de.json b/apps/dotcom/client/public/tla/locales/de.json
index 04ebc0cff38f..3bbe81ab0ed2 100644
--- a/apps/dotcom/client/public/tla/locales/de.json
+++ b/apps/dotcom/client/public/tla/locales/de.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Konto"
   },
+  "08d2d725a9": {
+    "translation": "Erstellen Sie ein kostenloses Konto, um Ihre Arbeit zu speichern, in Echtzeit zusammenzuarbeiten und vieles mehr."
+  },
   "0b27918290": {
     "translation": "Datei"
   },
   "0b9a4cde72": {
     "translation": "Dateimenü"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ist ein kostenloses und sofort einsatzbereites virtuelles Whiteboard."
+  },
   "0d1f2bb523": {
     "translation": "Feedback senden"
   },
   "110a4b01be": {
     "translation": "Veröffentlichen"
   },
+  "129b9e34ea": {
+    "translation": "Gruppe verlassen"
+  },
+  "12a6766ba1": {
+    "translation": "Datei aufheben"
+  },
   "12c8a9838c": {
     "translation": "Testen Sie das tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Exportieren als"
   },
+  "146ffe2fd9": {
+    "translation": "Mehr anzeigen"
+  },
+  "14d65465b7": {
+    "translation": "Gruppe löschen"
+  },
   "181b90f889": {
     "translation": "Datei erstellen"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Dieser Raum erreicht seine maximale Größe. Entfernen Sie ggf. Inhalte oder erstellen Sie eine neue Datei."
   },
+  "2445e5e347": {
+    "translation": "Gruppe erstellen"
+  },
   "250ddea65c": {
     "translation": "Über tldraw"
   },
   "299cb00a7a": {
     "translation": "Hochladen fehlgeschlagen"
   },
+  "2c3ef76333": {
+    "translation": "Meine Dateien"
+  },
   "2deec2cb74": {
     "translation": "Dieser Raum hat seine Größenbeschränkung erreicht und Änderungen können möglicherweise nicht mehr gespeichert werden. Entfernen Sie Inhalte oder beginnen Sie eine neue Datei."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Markierung fehlt"
   },
+  "32210b37e4": {
+    "translation": "Link hinzufügen"
+  },
   "335defdafe": {
     "translation": "Versuchen Sie bitte, die Seite neu zu laden."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Mit der E-Mail fortfahren"
+  },
   "3bd1b98dbd": {
     "translation": "Die Änderungen können nicht veröffentlicht werden."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Bitte neu laden"
+  "47f493a590": {
+    "translation": "Pin-Datei"
   },
-  "764671e008": {
-    "translation": "Chatten Sie mit uns auf Discord"
+  "49049467ff": {
+    "translation": "URL der tldraw-Datei einfügen..."
   },
   "4908687e50": {
     "translation": "Möchten Sie diese Datei wirklich vergessen?"
   },
+  "49ee308734": {
+    "translation": "Name"
+  },
   "4d0d3ddec9": {
     "translation": "Diese Site verwendet Cookies, damit die App funktioniert und um Analysen zu sammeln."
   },
   "4d1c8263ba": {
     "translation": "Neu laden"
   },
+  "4da5988a2e": {
+    "translation": "Gruppe löschen…"
+  },
+  "4e6fbf032b": {
+    "translation": "Sind Sie sicher, dass Sie diese Gruppe löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden."
+  },
   "50db1b7e1e": {
     "translation": "Die Veröffentlichung für diese Datei kann nicht aufgehoben werden."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Datenschutzrichtlinie"
   },
+  "5a86b22fa0": {
+    "translation": "Ziehen Sie Dateien hierher, <create>Datei erstellen</create> oder <invite>Einladungslink kopieren</invite>, um zu beginnen."
+  },
   "5a95a425f7": {
     "translation": "Teilen"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Alter Browser erkannt. Bitte aktualisieren Sie Ihren Browser, um diese App zu verwenden."
   },
+  "5c6fe42bc2": {
+    "translation": "Diese Verknüpfung löschen und eine neue erstellen."
+  },
   "5d26ae7550": {
     "translation": "Wir konnten den von Ihnen vor Ihrer Anmeldung erstellten Inhalt teilweise nicht hochladen."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Älter"
   },
+  "639bae9ac6": {
+    "translation": "Du"
+  },
   "6609dd239e": {
     "translation": "Es ist ein Fehler aufgetreten"
   },
   "6637a98151": {
     "translation": "Eine neue Version von tldraw ist verfügbar. Bitte laden Sie die Seite neu, um fortzufahren."
   },
+  "68257bb646": {
+    "translation": "Sie wurden zur Gruppe <br></br><groupName></groupName> eingeladen."
+  },
+  "6832ac5936": {
+    "translation": "Geben Sie Ihre E-Mail-Adresse ein."
+  },
   "6a26f54883": {
     "translation": "Hilfe"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Befolgen Sie diese Schritte, um den Inhalt manuell zu importieren:"
   },
+  "70222abcfc": {
+    "translation": "Gruppeneinstellungen"
+  },
   "70a6facb9d": {
     "translation": "Diese Woche"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Cookies anpassen"
   },
+  "7697920637": {
+    "translation": "Bitte neu laden"
+  },
+  "764671e008": {
+    "translation": "Chatten Sie mit uns auf Discord"
+  },
   "777f9e90cf": {
     "translation": "Ungültige Anfrage."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Vergessen"
   },
+  "7cfe6c43dc": {
+    "translation": "Gruppe verlassen…"
+  },
   "7daeced9ff": {
     "translation": "Änderungen veröffentlichen"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Datei umbenennen"
   },
+  "8ad4303b83": {
+    "translation": "Nein danke"
+  },
   "8b1946f965": {
     "translation": "Um mit der Bearbeitung fortzufahren, kopieren Sie den Raum bitte in Ihre Dateien."
   },
+  "8c2d3d730c": {
+    "translation": "Prüfen Sie Ihr E-Mail-Postfach auf einen Bestätigungscode."
+  },
   "8eb2c00e96": {
     "translation": "Mit Ihnen geteilt"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "In meine Dateien kopieren"
   },
+  "930390d222": {
+    "translation": "Kopierter Einladungslink"
+  },
+  "95aacd4d4a": {
+    "translation": "Mit Google anmelden"
+  },
+  "95d2109dc8": {
+    "translation": "Erstellen mit dem tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Diesen Monat"
   },
+  "985a4b720f": {
+    "translation": "Nutzungsbedingungen"
+  },
+  "98c997a27e": {
+    "translation": "Dateilink hinzufügen"
+  },
   "9914a0ce04": {
     "translation": "Hell"
   },
+  "9b33f5c63c": {
+    "translation": "Sie haben keinen Code erhalten? <resend>Erneut senden</resend>."
+  },
   "9bef626805": {
     "translation": "Datei löschen"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Hintergrund"
   },
+  "aa916767cf": {
+    "translation": "Melden Sie sich an, um die Einladung anzunehmen."
+  },
   "ab0df9ba36": {
     "translation": "Dateilimit erreicht"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gastbenutzer"
   },
+  "b357b524e7": {
+    "translation": "E-Mail-Adresse"
+  },
+  "b3d2db69fe": {
+    "translation": "Datei-URL"
+  },
   "b6d4223e60": {
     "translation": "Anmelden"
   },
+  "b6f4a2ec63": {
+    "translation": "Eigentümer"
+  },
   "b758336699": {
     "translation": "Link kopieren"
   },
   "ba0318cb81": {
     "translation": "Zum Teilen anmelden"
   },
-  "bb792693e2": {
-    "translation": "Lösen"
+  "bb93a7590f": {
+    "translation": "Akzeptiere und trete der Gruppe bei"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr-Datei wird hochgeladen …} other {Hochladen von {uploaded} von {total} .tldr-Dateien…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Von {ownerName} geteilt"
   },
-  "bcb62136a3": {
-    "translation": ".tldr-Dateien hochladen"
-  },
   "c2276c9127": {
     "translation": "Erfahren Sie mehr über das Teilen."
   },
+  "c28aed8348": {
+    "translation": "Erlauben Sie uns, mithilfe von <cookies>analytics</cookies> tldraw zu verbessern."
+  },
   "c303bd1095": {
     "translation": "Diese Datei kann nicht veröffentlicht werden."
   },
   "c4b39a1cc3": {
     "translation": "Notwendige Cookies"
   },
+  "c6155aaecc": {
+    "translation": "Gruppenname"
+  },
   "c655b27b1e": {
     "translation": "i18n: Langer String"
   },
   "c6a00f137b": {
     "translation": "Einladen"
   },
+  "c74ea6dbff": {
+    "translation": "Weniger anzeigen"
+  },
   "c87aacf567": {
     "translation": "Abmelden"
   },
+  "c9cc8cce24": {
+    "translation": "Speichern"
+  },
   "cceaefbc20": {
     "translation": "Diese Datei teilen"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Seitenleiste umschalten"
   },
+  "d638a3344b": {
+    "translation": "Bevor Sie beginnen, akzeptieren Sie bitte unsere <tos>Nutzungsbedingungen</tos> und <privacy>Datenschutzrichtlinie</privacy>."
+  },
   "d721757161": {
     "translation": "Design"
   },
   "d876a9fe1a": {
     "translation": "Erneut versuchen"
   },
+  "d88ad2dc74": {
+    "translation": "Akzeptieren und fortfahren"
+  },
   "d9100f3e10": {
     "translation": "Hier können Sie den Inhalt sehen"
   },
+  "d9e35d0f55": {
+    "translation": "Sie haben die maximale Anzahl an Gruppen erreicht. Sie müssen alte Gruppen löschen, bevor Sie neue erstellen können."
+  },
   "dbbebf3c03": {
     "translation": "Nur einladen"
   },
+  "dcdaa754fe": {
+    "translation": "Ungültige tldraw-Datei-URL"
+  },
   "dfdb78a4e4": {
     "translation": "App-Debug-Markierungen"
   },
+  "e0c88179b3": {
+    "translation": "Mitglieder einladen"
+  },
+  "e2198d6228": {
+    "translation": "Einladungslink kopieren"
+  },
   "e2ae80a510": {
     "translation": "Rechtliche Zusammenfassung"
   },
+  "e3afed0047": {
+    "translation": "Administrator"
+  },
   "e404559826": {
     "translation": "Servicebedingungen"
   },
-  "e78e14c5f1": {
-    "translation": "Anheften"
+  "e81c4e4f2b": {
+    "translation": "oder"
+  },
+  "ea0626ac5a": {
+    "translation": "Gefahrenzone"
   },
   "ea4788705e": {
     "translation": "Abbrechen"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Lesen Sie unsere <a>Cookie-Richtlinie</a>, um mehr zu erfahren."
   },
+  "ef53538ae4": {
+    "translation": "Mitglieder"
+  },
   "ef7de3f485": {
     "translation": "ausgewählt"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Einstellungen"
   },
+  "f714e36843": {
+    "translation": "Möchtest du diese Gruppe wirklich verlassen?"
+  },
+  "fa2ead697d": {
+    "translation": "Datenschutzrichtlinie"
+  },
   "fb15c53f22": {
     "translation": "Viewer"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Link kopiert"
   },
+  "ff7a814974": {
+    "translation": "Dateiverknüpfung hinzufügen…"
+  },
   "ffcd73e997": {
     "translation": "Datei importieren…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/el.json b/apps/dotcom/client/public/tla/locales/el.json
index 9c4ba8acda68..743710c6515c 100644
--- a/apps/dotcom/client/public/tla/locales/el.json
+++ b/apps/dotcom/client/public/tla/locales/el.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Λογαριασμός"
   },
+  "08d2d725a9": {
+    "translation": "Δημιουργήστε έναν δωρεάν λογαριασμό για να αποθηκεύσετε την εργασία σας, να συνεργαστείτε σε πραγματικό χρόνο και πολλά άλλα."
+  },
   "0b27918290": {
     "translation": "Αρχείο"
   },
   "0b9a4cde72": {
     "translation": "Μενού αρχείου"
   },
+  "0beb3ca97b": {
+    "translation": "Το tldraw είναι ένας δωρεάν και άμεσος εικονικός πίνακας."
+  },
   "0d1f2bb523": {
     "translation": "Αποστολή σχολίων"
   },
   "110a4b01be": {
     "translation": "Δημοσιεύω"
   },
+  "129b9e34ea": {
+    "translation": "Αποχώρηση από την ομάδα"
+  },
+  "12a6766ba1": {
+    "translation": "Ξεκαρφίτσωμα αρχείου"
+  },
   "12c8a9838c": {
     "translation": "Δοκιμάστε το SDK του tldraw"
   },
   "13ddd375ad": {
     "translation": "Εξαγωγή ως"
   },
+  "146ffe2fd9": {
+    "translation": "Εμφάνιση περισσότερων"
+  },
+  "14d65465b7": {
+    "translation": "Διαγραφή ομάδας"
+  },
   "181b90f889": {
     "translation": "Δημιουργία αρχείου"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Αυτό το δωμάτιο πλησιάζει το όριο μεγέθους του. Σκεφτείτε να καταργήσετε κάποιο περιεχόμενο ή να ξεκινήσετε ένα νέο αρχείο."
   },
+  "2445e5e347": {
+    "translation": "Δημιουργία ομάδας"
+  },
   "250ddea65c": {
     "translation": "Σχετικά με το tldraw"
   },
   "299cb00a7a": {
     "translation": "Η μεταφόρτωση απέτυχε"
   },
+  "2c3ef76333": {
+    "translation": "Τα αρχεία μου"
+  },
   "2deec2cb74": {
     "translation": "Αυτό το δωμάτιο έχει φτάσει στο όριο μεγέθους του και οι αλλαγές ενδέχεται να μην αποθηκεύονται πλέον. Αφαιρέστε κάποιο περιεχόμενο ή ξεκινήστε ένα νέο αρχείο."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Επισήμανση Λείπει"
   },
+  "32210b37e4": {
+    "translation": "Προσθήκη συνδέσμου"
+  },
   "335defdafe": {
     "translation": "Δοκιμάστε να ανανεώσετε τη σελίδα."
   },
   "344a7f427f": {
     "translation": "Συντάκτης"
   },
+  "3bc7d6ea2f": {
+    "translation": "Συνέχεια με email"
+  },
   "3bd1b98dbd": {
     "translation": "Δεν είναι δυνατή η δημοσίευση των αλλαγών."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tdraw"
   },
-  "7697920637": {
-    "translation": "Παρακαλώ επαναφόρτωση"
+  "47f493a590": {
+    "translation": "Καρφίτσωμα αρχείου"
   },
-  "764671e008": {
-    "translation": "Συνομιλήστε μαζί μας στο Discord"
+  "49049467ff": {
+    "translation": "Επικόλληση URL αρχείου tldraw..."
   },
   "4908687e50": {
     "translation": "Είστε βέβαιοι ότι θέλετε να ξεχάσετε αυτό το αρχείο;"
   },
+  "49ee308734": {
+    "translation": "Ονομα"
+  },
   "4d0d3ddec9": {
     "translation": "Αυτός ο ιστότοπος χρησιμοποιεί cookies για να λειτουργήσει η εφαρμογή και να συλλέγει αναλυτικά στοιχεία."
   },
   "4d1c8263ba": {
     "translation": "Γεμίζω πάλι"
   },
+  "4da5988a2e": {
+    "translation": "Διαγραφή ομάδας…"
+  },
+  "4e6fbf032b": {
+    "translation": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την ομάδα; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί."
+  },
   "50db1b7e1e": {
     "translation": "Δεν είναι δυνατή η κατάργηση της δημοσίευσης του αρχείου."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Πολιτική απορρήτου"
   },
+  "5a86b22fa0": {
+    "translation": "Σύρετε αρχεία εδώ, <create>δημιουργήστε ένα αρχείο</create> ή <invite>αντιγράψτε τον σύνδεσμο πρόσκλησης</invite> για να ξεκινήσετε."
+  },
   "5a95a425f7": {
     "translation": "Μερίδιο"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Εντοπίστηκε παλιό πρόγραμμα περιήγησης. Ενημερώστε το πρόγραμμα περιήγησής σας για να χρησιμοποιήσετε αυτήν την εφαρμογή."
   },
+  "5c6fe42bc2": {
+    "translation": "Ανακαλέστε αυτόν τον σύνδεσμο και δημιουργήστε έναν νέο."
+  },
   "5d26ae7550": {
     "translation": "Δεν καταφέραμε να ανεβάσουμε μέρος του περιεχομένου που δημιουργήσατε πριν συνδεθείτε."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Πιο παλιά"
   },
+  "639bae9ac6": {
+    "translation": "εσείς"
+  },
   "6609dd239e": {
     "translation": "Κάτι πήγε στραβά"
   },
   "6637a98151": {
     "translation": "Μια νέα έκδοση του tldraw είναι διαθέσιμη. Επαναλάβετε τη φόρτωση της σελίδας για να συνεχίσετε."
   },
+  "68257bb646": {
+    "translation": "Έχετε προσκληθεί στην ομάδα <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Εισαγάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
+  },
   "6a26f54883": {
     "translation": "Βοήθεια"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Ακολουθήστε αυτά τα βήματα για να εισαγάγετε το περιεχόμενο με μη αυτόματο τρόπο:"
   },
+  "70222abcfc": {
+    "translation": "Ρυθμίσεις ομάδας"
+  },
   "70a6facb9d": {
     "translation": "Αυτή την εβδομάδα"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Διαχείριση cookies"
   },
+  "7697920637": {
+    "translation": "Παρακαλώ επαναφόρτωση"
+  },
+  "764671e008": {
+    "translation": "Συνομιλήστε μαζί μας στο Discord"
+  },
   "777f9e90cf": {
     "translation": "Μη έγκυρο αίτημα."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Ξεχνώ"
   },
+  "7cfe6c43dc": {
+    "translation": "Αποχώρηση από την ομάδα…"
+  },
   "7daeced9ff": {
     "translation": "Δημοσίευση αλλαγών"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Μετονομασία αρχείου"
   },
+  "8ad4303b83": {
+    "translation": "Όχι ευχαριστώ"
+  },
   "8b1946f965": {
     "translation": "Για να συνεχίσετε την επεξεργασία, αντιγράψτε το δωμάτιο στα αρχεία σας."
   },
+  "8c2d3d730c": {
+    "translation": "Ελέγξτε το email σας για έναν κωδικό επαλήθευσης."
+  },
   "8eb2c00e96": {
     "translation": "Κοινή χρήση μαζί σας"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Αντιγραφή στα αρχεία μου"
   },
+  "930390d222": {
+    "translation": "Αντιγραμμένος σύνδεσμος πρόσκλησης"
+  },
+  "95aacd4d4a": {
+    "translation": "Συνδεθείτε με την Google"
+  },
+  "95d2109dc8": {
+    "translation": "Δημιουργήστε με το tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Αυτόν τον μήνα"
   },
+  "985a4b720f": {
+    "translation": "Όροι Χρήσης"
+  },
+  "98c997a27e": {
+    "translation": "Προσθήκη συνδέσμου αρχείου"
+  },
   "9914a0ce04": {
     "translation": "Φως"
   },
+  "9b33f5c63c": {
+    "translation": "Δεν λάβατε κωδικό; <resend>Επαναποστολή</resend>."
+  },
   "9bef626805": {
     "translation": "Διαγραφή αρχείου"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Φόντο"
   },
+  "aa916767cf": {
+    "translation": "Συνδεθείτε για να αποδεχτείτε την πρόσκληση"
+  },
   "ab0df9ba36": {
     "translation": "Συμπληρώθηκε το όριο αρχείου"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Επισκέπτης χρήστης"
   },
+  "b357b524e7": {
+    "translation": "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
+  },
+  "b3d2db69fe": {
+    "translation": "URL αρχείου"
+  },
   "b6d4223e60": {
     "translation": "Συνδεθείτε"
   },
+  "b6f4a2ec63": {
+    "translation": "Ιδιοκτήτης"
+  },
   "b758336699": {
     "translation": "Αντιγραφή συνδέσμου"
   },
   "ba0318cb81": {
     "translation": "Συνδεθείτε για κοινοποίηση"
   },
-  "bb792693e2": {
-    "translation": "Ξεκαρφιτσώνω"
+  "bb93a7590f": {
+    "translation": "Αποδοχή και συμμετοχή στην ομάδα"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Μεταφόρτωση αρχείου .tldr…} other {Μεταφόρτωση {uploaded} από {total} αρχεία .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Κοινή χρήση από {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Ανεβάστε αρχεία .tldr"
-  },
   "c2276c9127": {
     "translation": "Μάθετε περισσότερα σχετικά με την κοινή χρήση."
   },
+  "c28aed8348": {
+    "translation": "Επιτρέψτε στα <cookies>analytics</cookies> να μας βοηθήσουν να βελτιώσουμε το tldraw."
+  },
   "c303bd1095": {
     "translation": "Δεν είναι δυνατή η δημοσίευση του αρχείου."
   },
   "c4b39a1cc3": {
     "translation": "Βασικά cookies"
   },
+  "c6155aaecc": {
+    "translation": "Όνομα ομάδας"
+  },
   "c655b27b1e": {
     "translation": "i18n: Long String"
   },
   "c6a00f137b": {
     "translation": "Καλώ"
   },
+  "c74ea6dbff": {
+    "translation": "Εμφάνιση λιγότερων"
+  },
   "c87aacf567": {
     "translation": "Αποσυνδεθείτε"
   },
+  "c9cc8cce24": {
+    "translation": "Εκτός"
+  },
   "cceaefbc20": {
     "translation": "Κοινή χρήση αυτού του αρχείου"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Εναλλαγή πλευρικής γραμμής"
   },
+  "d638a3344b": {
+    "translation": "Πριν ξεκινήσετε, αποδεχτείτε τους <tos>όρους χρήσης</tos> και την <privacy>πολιτική απορρήτου</privacy> μας."
+  },
   "d721757161": {
     "translation": "Θέμα"
   },
   "d876a9fe1a": {
     "translation": "Δοκιμάστε ξανά"
   },
+  "d88ad2dc74": {
+    "translation": "Αποδοχή και συνέχεια"
+  },
   "d9100f3e10": {
     "translation": "Μεταβείτε εδώ για να δείτε το περιεχόμενο"
   },
+  "d9e35d0f55": {
+    "translation": "Έχετε φτάσει τον μέγιστο αριθμό ομάδων. Πρέπει να διαγράψετε τις παλιές ομάδες πριν δημιουργήσετε νέες."
+  },
   "dbbebf3c03": {
     "translation": "Πρόσκληση μόνο"
   },
+  "dcdaa754fe": {
+    "translation": "Μη έγκυρη διεύθυνση URL αρχείου tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Σημαίες εντοπισμού σφαλμάτων εφαρμογών"
   },
+  "e0c88179b3": {
+    "translation": "Πρόσκληση μελών"
+  },
+  "e2198d6228": {
+    "translation": "Αντιγραφή συνδέσμου πρόσκλησης"
+  },
   "e2ae80a510": {
     "translation": "Νομική περίληψη"
   },
+  "e3afed0047": {
+    "translation": "Διαχειριστής"
+  },
   "e404559826": {
     "translation": "Όροι παροχής υπηρεσιών"
   },
-  "e78e14c5f1": {
-    "translation": "Καρφίτσα"
+  "e81c4e4f2b": {
+    "translation": "ή"
+  },
+  "ea0626ac5a": {
+    "translation": "Ζώνη κινδύνου"
   },
   "ea4788705e": {
     "translation": "Ματαίωση"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Διαβάστε την <a>πολιτική μας για τα cookie</a> για να μάθετε περισσότερα."
   },
+  "ef53538ae4": {
+    "translation": "Μέλη"
+  },
   "ef7de3f485": {
     "translation": "επιλεγμένο"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Ρυθμίσεις"
   },
+  "f714e36843": {
+    "translation": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν την ομάδα;"
+  },
+  "fa2ead697d": {
+    "translation": "Πολιτική Απορρήτου"
+  },
   "fb15c53f22": {
     "translation": "Θεατής"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Αντιγράφηκε ο σύνδεσμος"
   },
+  "ff7a814974": {
+    "translation": "Προσθήκη συνδέσμου αρχείου…"
+  },
   "ffcd73e997": {
     "translation": "Εισαγωγή αρχείου…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/en.json b/apps/dotcom/client/public/tla/locales/en.json
index 906dd59cc962..e0ef30c87bb0 100644
--- a/apps/dotcom/client/public/tla/locales/en.json
+++ b/apps/dotcom/client/public/tla/locales/en.json
@@ -2,15 +2,15 @@
   "0095a9fa74": {
     "translation": "Export"
   },
+  "038c9b4432": {
+    "translation": "Fairy’s personality"
+  },
   "03b3e13197": {
     "translation": "Drag the file into the sidebar on this page. Or select the 'Import file' option from the user menu."
   },
   "043973ec1f": {
     "translation": "Still having trouble? {GetHelpLink}"
   },
-  "05596b840b": {
-    "translation": "Open tldraw."
-  },
   "06b9281e39": {
     "translation": "Auto"
   },
@@ -23,24 +23,48 @@
   "08bd40c754": {
     "translation": "Account"
   },
+  "090b807281": {
+    "translation": "Spiky"
+  },
   "0b27918290": {
     "translation": "File"
   },
   "0b9a4cde72": {
     "translation": "File menu"
   },
+  "0befa10111": {
+    "translation": "Fairies"
+  },
   "0d1f2bb523": {
     "translation": "Send feedback"
   },
   "110a4b01be": {
     "translation": "Publish"
   },
+  "11a755d598": {
+    "translation": "Stop"
+  },
+  "129b9e34ea": {
+    "translation": "Leave group"
+  },
+  "12a6766ba1": {
+    "translation": "Unpin file"
+  },
   "12c8a9838c": {
     "translation": "Try the tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Export as"
   },
+  "141c7239d3": {
+    "translation": "Fairy customization"
+  },
+  "146ffe2fd9": {
+    "translation": "Show more"
+  },
+  "14d65465b7": {
+    "translation": "Delete group"
+  },
   "181b90f889": {
     "translation": "Create file"
   },
@@ -50,33 +74,69 @@
   "1dd1c5fb7f": {
     "translation": "Today"
   },
+  "1e38506832": {
+    "translation": "Go to fairy"
+  },
+  "1fe250ea06": {
+    "translation": "Instruct the group…"
+  },
   "20976e7bec": {
     "translation": "Room is full"
   },
   "21bfb2dc2e": {
     "translation": "This room is approaching its size limit. Consider removing some content or starting a new file."
   },
+  "2445e5e347": {
+    "translation": "Create group"
+  },
   "250ddea65c": {
     "translation": "About tldraw"
   },
+  "2811a731bb": {
+    "translation": "Customize fairy"
+  },
+  "284d5cd0dd": {
+    "translation": "Model:"
+  },
   "299cb00a7a": {
     "translation": "Upload failed"
   },
+  "2c3ef76333": {
+    "translation": "My files"
+  },
   "2deec2cb74": {
     "translation": "This room has reached its size limit and changes might no longer be saved. Remove some content or start a new file."
   },
+  "2e86e6853d": {
+    "translation": "Select leader"
+  },
   "31246941ad": {
     "translation": "You need to sign in to view this file."
   },
   "31418ce4ad": {
     "translation": "i18n: Highlight Missing"
   },
+  "32210b37e4": {
+    "translation": "Add link"
+  },
+  "324a0f3182": {
+    "translation": "Back to tldraw"
+  },
   "335defdafe": {
     "translation": "Please try refreshing the page."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3a295397e6": {
+    "translation": "Ask for help"
+  },
+  "3a77f951ca": {
+    "translation": "Add a new task…"
+  },
+  "3bc7d6ea2f": {
+    "translation": "Continue with email"
+  },
   "3bd1b98dbd": {
     "translation": "Unable to publish the changes."
   },
@@ -86,6 +146,9 @@
   "3d0238bf16": {
     "translation": "Accept all"
   },
+  "4131ec34ef": {
+    "translation": "Bald"
+  },
   "42e53c47c1": {
     "translation": "Contact the owner to request access."
   },
@@ -95,18 +158,48 @@
   "46137245cd": {
     "translation": "Thanks for helping us improve tldraw!"
   },
+  "465a8a92a4": {
+    "translation": "No fairies selected"
+  },
   "47839e47a5": {
     "translation": "tldraw"
   },
+  "47f493a590": {
+    "translation": "Pin file"
+  },
+  "49049467ff": {
+    "translation": "Paste tldraw file URL..."
+  },
   "4908687e50": {
     "translation": "Are you sure you want to forget this file?"
   },
+  "49ee308734": {
+    "translation": "Name"
+  },
+  "4b3e8439d5": {
+    "translation": "Leader fairy will be given orchestration power"
+  },
   "4d0d3ddec9": {
     "translation": "This site uses cookies to make the app work and to collect analytics."
   },
   "4d1c8263ba": {
     "translation": "Reload"
   },
+  "4da5988a2e": {
+    "translation": "Delete group…"
+  },
+  "4e6fbf032b": {
+    "translation": "Are you sure you want to delete this group? This action cannot be undone."
+  },
+  "4e98378836": {
+    "translation": "Personality"
+  },
+  "4ef3716596": {
+    "translation": "Unfollow fairy"
+  },
+  "4f827717f7": {
+    "translation": "Pointy"
+  },
   "50db1b7e1e": {
     "translation": "Unable to unpublish the file."
   },
@@ -116,9 +209,6 @@
   "54286b1d01": {
     "translation": "Collaborator limit reached"
   },
-  "54d240fa41": {
-    "translation": "Please slow down."
-  },
   "554a05155c": {
     "translation": "Still having trouble? <a>Report a problem</a>"
   },
@@ -131,6 +221,9 @@
   "56c34c6410": {
     "translation": "Privacy policy"
   },
+  "5a86b22fa0": {
+    "translation": "Drag files here, <create>create a file</create>, or <invite>copy invite link</invite> to get started."
+  },
   "5a95a425f7": {
     "translation": "Share"
   },
@@ -143,9 +236,15 @@
   "5bec508475": {
     "translation": "Old browser detected. Please update your browser to use this app."
   },
+  "5c6fe42bc2": {
+    "translation": "Revoke this link and create a new one."
+  },
   "5d26ae7550": {
     "translation": "We failed to upload some of the content you created before you signed in."
   },
+  "5ea8bb44be": {
+    "translation": "You have been invited to join group:"
+  },
   "5f3c333678": {
     "translation": "Feedback submitted"
   },
@@ -158,12 +257,24 @@
   "625fd29749": {
     "translation": "Older"
   },
+  "639bae9ac6": {
+    "translation": "you"
+  },
+  "64ebe56d8c": {
+    "translation": "Click to remove or drag to move"
+  },
+  "65709fd250": {
+    "translation": "Task list"
+  },
   "6609dd239e": {
     "translation": "Something went wrong"
   },
   "6637a98151": {
     "translation": "A new version of tldraw is available. Please reload the page to continue."
   },
+  "6832ac5936": {
+    "translation": "Enter your email address"
+  },
   "6a26f54883": {
     "translation": "Help"
   },
@@ -173,6 +284,9 @@
   "6dfc62f621": {
     "translation": "Follow these steps to import the content manually:"
   },
+  "70222abcfc": {
+    "translation": "Group settings"
+  },
   "70a6facb9d": {
     "translation": "This week"
   },
@@ -200,36 +314,63 @@
   "7697920637": {
     "translation": "Please reload"
   },
+  "76dea3c9ca": {
+    "translation": "tldraw is a free online whiteboard. Create an account to save your files and work with your friends."
+  },
   "777f9e90cf": {
     "translation": "Invalid request."
   },
+  "7835039819": {
+    "translation": "Propeller"
+  },
   "78e9815992": {
     "translation": "Got it"
   },
   "797799f35e": {
     "translation": "Submit an issue on GitHub"
   },
+  "7a3113b0ba": {
+    "translation": "Drag to canvas"
+  },
   "7b1329f5ca": {
     "translation": "User manual"
   },
+  "7b5449bd84": {
+    "translation": "Antenna"
+  },
   "7be10fc592": {
     "translation": "Restore version"
   },
+  "7c0747a5df": {
+    "translation": "Open tldraw"
+  },
   "7cb5f8b4a5": {
     "translation": "Forget"
   },
+  "7cfe6c43dc": {
+    "translation": "Leave group…"
+  },
   "7daeced9ff": {
     "translation": "Publish changes"
   },
+  "7e94fd31ac": {
+    "translation": "Create project"
+  },
   "7fcdcc6455": {
     "translation": "Forget file"
   },
   "801ab24683": {
     "translation": "Download"
   },
+  "80a3d8a5bb": {
+    "translation": "Log response time (solo mode only)"
+  },
   "815e116a2e": {
     "translation": "Have a bug, issue, or idea for tldraw? Let us know! Fill out this form and we will follow up over email if needed. You can also <discord>chat with us on Discord</discord> or <github>submit an issue on GitHub</github>."
   },
+  "81d48c2f3a": {
+    "translation": "Show tasks on canvas"
+  },
   "85a082de1b": {
     "translation": "Please refresh the page to get the latest version of tldraw."
   },
@@ -239,9 +380,15 @@
   "86c66437fd": {
     "translation": "Rename file"
   },
+  "8ad4303b83": {
+    "translation": "No thanks"
+  },
   "8b1946f965": {
     "translation": "To continue editing please copy the room to your files."
   },
+  "8c2d3d730c": {
+    "translation": "Check your email for a verification code."
+  },
   "8eb2c00e96": {
     "translation": "Shared with you"
   },
@@ -257,15 +404,48 @@
   "91e49bb0eb": {
     "translation": "Copy to my files"
   },
+  "930390d222": {
+    "translation": "Copied invite link"
+  },
+  "93346fdd70": {
+    "translation": "Ears"
+  },
+  "93dfe9fbbe": {
+    "translation": "Deselect fairy"
+  },
+  "94966d9074": {
+    "translation": "Send"
+  },
+  "95aacd4d4a": {
+    "translation": "Sign in with Google"
+  },
   "95d2109dc8": {
     "translation": "Build with the tldraw SDK"
   },
   "96165d6df5": {
     "translation": "This month"
   },
+  "97a9f16b2e": {
+    "translation": "New fairy"
+  },
+  "985a4b720f": {
+    "translation": "Terms of Use"
+  },
+  "98c997a27e": {
+    "translation": "Add file link"
+  },
+  "98e528aac6": {
+    "translation": "Switch to fairy chat"
+  },
   "9914a0ce04": {
     "translation": "Light"
   },
+  "9953e9946b": {
+    "translation": "Debug view"
+  },
+  "9b33f5c63c": {
+    "translation": "Didn’t receive a code? <resend>Resend</resend>."
+  },
   "9bef626805": {
     "translation": "Delete file"
   },
@@ -287,6 +467,9 @@
   "a104439641": {
     "translation": "Padding"
   },
+  "a10d7a62aa": {
+    "translation": "Hat"
+  },
   "a18366b217": {
     "translation": "Dark"
   },
@@ -296,18 +479,33 @@
   "a239905023": {
     "translation": "Export image"
   },
+  "a2f0372a75": {
+    "translation": "Switch to task list"
+  },
   "a3debabee7": {
     "translation": "Cookie policy"
   },
+  "a3e932550c": {
+    "translation": "Fairy’s name"
+  },
   "a4d3b161ce": {
     "translation": "Submit"
   },
+  "a4e2d4d837": {
+    "translation": "Reset all chats"
+  },
+  "a4ffdcf0dc": {
+    "translation": "Top"
+  },
   "a6cc403d56": {
     "translation": "Anyone with the link"
   },
   "a768caa988": {
     "translation": "Analytics"
   },
+  "a885eb91ac": {
+    "translation": "Leader fairy selection"
+  },
   "a9ded1e5ce": {
     "translation": "Background"
   },
@@ -321,17 +519,29 @@
   "b028909917": {
     "translation": "Guest user"
   },
+  "b357b524e7": {
+    "translation": "Email address"
+  },
+  "b3d2db69fe": {
+    "translation": "File URL"
+  },
   "b6d4223e60": {
     "translation": "Sign in"
   },
+  "b6f4a2ec63": {
+    "translation": "Owner"
+  },
   "b758336699": {
     "translation": "Copy link"
   },
+  "b8996797b9": {
+    "translation": "Hide tasks on canvas"
+  },
   "ba0318cb81": {
     "translation": "Sign in to share"
   },
-  "bb792693e2": {
-    "translation": "Unpin"
+  "bb93a7590f": {
+    "translation": "Accept and join group"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Uploading .tldr file…} other {Uploading {uploaded} of {total} .tldr files…}}"
@@ -339,27 +549,45 @@
   "bc88b0e89e": {
     "translation": "Shared by {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Upload .tldr files"
-  },
   "c2276c9127": {
     "translation": "Learn more about sharing."
   },
+  "c28aed8348": {
+    "translation": "Allow <cookies>analytics</cookies> to help us improve tldraw."
+  },
+  "c2ad21c079": {
+    "translation": "Hair"
+  },
   "c303bd1095": {
     "translation": "Unable to publish the file."
   },
   "c4b39a1cc3": {
     "translation": "Essential cookies"
   },
+  "c6155aaecc": {
+    "translation": "Group name"
+  },
   "c655b27b1e": {
     "translation": "i18n: Long String"
   },
   "c6a00f137b": {
     "translation": "Invite"
   },
+  "c74ea6dbff": {
+    "translation": "Show less"
+  },
   "c87aacf567": {
     "translation": "Sign out"
   },
+  "c9b04e7b53": {
+    "translation": "Deselect leader"
+  },
+  "c9cc8cce24": {
+    "translation": "Save"
+  },
+  "cb93643511": {
+    "translation": "Summon fairy"
+  },
   "cceaefbc20": {
     "translation": "Share this file"
   },
@@ -372,32 +600,77 @@
   "d3d2e61733": {
     "translation": "Close"
   },
+  "d46632fe1f": {
+    "translation": "Too many requests. Please slow down."
+  },
   "d4bbf74f3e": {
     "translation": "Toggle sidebar"
   },
+  "d5f491d157": {
+    "translation": "Follow fairy"
+  },
+  "d638a3344b": {
+    "translation": "Before you start, please accept our <tos>terms of use</tos> and <privacy>privacy policy</privacy>."
+  },
   "d721757161": {
     "translation": "Theme"
   },
+  "d739f35e18": {
+    "translation": "Whisper to {name}…"
+  },
+  "d7bc9d5a2e": {
+    "translation": "Delete task"
+  },
+  "d856d53da4": {
+    "translation": "No leader selected"
+  },
   "d876a9fe1a": {
     "translation": "Try Again"
   },
+  "d88ad2dc74": {
+    "translation": "Accept and continue"
+  },
   "d9100f3e10": {
     "translation": "Go here to see the content"
   },
+  "d9e35d0f55": {
+    "translation": "You have reached the maximum number of groups. You need to delete old groups before creating new ones."
+  },
   "dbbebf3c03": {
     "translation": "Invite only"
   },
+  "dcdaa754fe": {
+    "translation": "Invalid tldraw file URL"
+  },
+  "de290d52ef": {
+    "translation": "Select a fairy on the right to chat with"
+  },
   "dfdb78a4e4": {
     "translation": "App debug flags"
   },
+  "e0c88179b3": {
+    "translation": "Invite members"
+  },
+  "e2198d6228": {
+    "translation": "Copy invite link"
+  },
   "e2ae80a510": {
     "translation": "Legal summary"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Terms of service"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "or"
+  },
+  "ea0626ac5a": {
+    "translation": "Danger zone"
+  },
+  "ea181d98ca": {
+    "translation": "Select fairy"
   },
   "ea4788705e": {
     "translation": "Cancel"
@@ -420,9 +693,18 @@
   "ede55d955f": {
     "translation": "Read our <a>cookie policy</a> to learn more."
   },
+  "eecad1e370": {
+    "translation": "Delete fairy"
+  },
+  "ef53538ae4": {
+    "translation": "Members"
+  },
   "ef7de3f485": {
     "translation": "selected"
   },
+  "efb2d9d471": {
+    "translation": "Todo list"
+  },
   "f09b16bc5f": {
     "translation": "We use cookies to keep you logged in, to sync your files, and to collect analytics to help us improve tldraw."
   },
@@ -435,21 +717,45 @@
   "f2a6c498fb": {
     "translation": "Delete"
   },
-  "f43fb62093": {
-    "translation": "Back to tldraw."
-  },
   "f4f70727dc": {
     "translation": "Settings"
   },
+  "f6ae34b4ba": {
+    "translation": "Reset all wands"
+  },
+  "f714e36843": {
+    "translation": "Are you sure you want to leave this group?"
+  },
+  "f7d5ee6855": {
+    "translation": "Select a leader first…"
+  },
+  "f87386b4ba": {
+    "translation": "Summon all fairies"
+  },
+  "fa2ead697d": {
+    "translation": "Privacy Policy"
+  },
   "fb15c53f22": {
     "translation": "Viewer"
   },
+  "fcd66d76d6": {
+    "translation": "Delete all fairies"
+  },
+  "fd11eafb92": {
+    "translation": "Disband projects"
+  },
   "fd1be3efcf": {
     "translation": "Are you sure you want to delete this file?"
   },
   "fed5ec05eb": {
     "translation": "Copied link"
   },
+  "ff7276d298": {
+    "translation": "Reset chat"
+  },
+  "ff7a814974": {
+    "translation": "Add file link…"
+  },
   "ffcd73e997": {
     "translation": "Import file…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/es.json b/apps/dotcom/client/public/tla/locales/es.json
index 6a073c9dc7d8..6e256d0a278b 100644
--- a/apps/dotcom/client/public/tla/locales/es.json
+++ b/apps/dotcom/client/public/tla/locales/es.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Cuenta"
   },
+  "08d2d725a9": {
+    "translation": "Crea una cuenta gratuita para guardar tu trabajo, colaborar en tiempo real y mucho más."
+  },
   "0b27918290": {
     "translation": "Archivo"
   },
   "0b9a4cde72": {
     "translation": "Menú de archivo"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw es una pizarra virtual gratuita e instantánea."
+  },
   "0d1f2bb523": {
     "translation": "Enviar comentarios"
   },
   "110a4b01be": {
     "translation": "Publicar"
   },
+  "129b9e34ea": {
+    "translation": "Grupo de salida"
+  },
+  "12a6766ba1": {
+    "translation": "Desanclar archivo"
+  },
   "12c8a9838c": {
     "translation": "Pruebe el SDK de tldraw"
   },
   "13ddd375ad": {
     "translation": "Exportar como"
   },
+  "146ffe2fd9": {
+    "translation": "Mostrar más"
+  },
+  "14d65465b7": {
+    "translation": "Eliminar grupo"
+  },
   "181b90f889": {
     "translation": "Crear archivo"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Esta sala está llegando a su límite de tamaño. Considere eliminar contenido o crear un nuevo archivo."
   },
+  "2445e5e347": {
+    "translation": "Crear grupo"
+  },
   "250ddea65c": {
     "translation": "Acerca de tldraw"
   },
   "299cb00a7a": {
     "translation": "Error al cargar"
   },
+  "2c3ef76333": {
+    "translation": "Mis archivos"
+  },
   "2deec2cb74": {
     "translation": "Esta sala ha alcanzado su límite de tamaño y es posible que los cambios ya no se guarden. Elimina contenido o crea un nuevo archivo."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: falta resaltado"
   },
+  "32210b37e4": {
+    "translation": "Agregar enlace"
+  },
   "335defdafe": {
     "translation": "Pruebe a actualizar la página."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continúa con el correo electrónico"
+  },
   "3bd1b98dbd": {
     "translation": "No se han podido publicar los cambios."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Por favor recarga"
+  "47f493a590": {
+    "translation": "Archivo de pines"
   },
-  "764671e008": {
-    "translation": "Chatea con nosotros en Discord"
+  "49049467ff": {
+    "translation": "Pegue la URL del archivo tldraw..."
   },
   "4908687e50": {
     "translation": "¿Seguro que quiere olvidar este archivo?"
   },
+  "49ee308734": {
+    "translation": "Nombre"
+  },
   "4d0d3ddec9": {
     "translation": "Este sitio utiliza cookies para que la aplicación funcione y para recopilar análisis."
   },
   "4d1c8263ba": {
     "translation": "Volver a cargar"
   },
+  "4da5988a2e": {
+    "translation": "Eliminar grupo…"
+  },
+  "4e6fbf032b": {
+    "translation": "¿Seguro que quieres eliminar este grupo? Esta acción no se puede deshacer."
+  },
   "50db1b7e1e": {
     "translation": "No se ha podido anular la publicación del archivo."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Política de privacidad"
   },
+  "5a86b22fa0": {
+    "translation": "Arrastra los archivos aquí, <create>crea un archivo</create> o <invite>copia el enlace de invitación</invite> para empezar."
+  },
   "5a95a425f7": {
     "translation": "Compartir"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Se detectó un navegador antiguo. Actualice su navegador para usar esta aplicación."
   },
+  "5c6fe42bc2": {
+    "translation": "Revoca este enlace y crea uno nuevo."
+  },
   "5d26ae7550": {
     "translation": "No hemos podido subir parte del contenido que creó antes de iniciar sesión."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Más antiguo"
   },
+  "639bae9ac6": {
+    "translation": "tú"
+  },
   "6609dd239e": {
     "translation": "Algo ha ido mal"
   },
   "6637a98151": {
     "translation": "Hay una nueva versión de tldraw disponible. Vuelva a cargar la página para continuar."
   },
+  "68257bb646": {
+    "translation": "Has sido invitado al grupo <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Introduce tu dirección de correo electrónico"
+  },
   "6a26f54883": {
     "translation": "Ayuda"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Siga estos pasos para importar el contenido de forma manual:"
   },
+  "70222abcfc": {
+    "translation": "Configuración de grupo"
+  },
   "70a6facb9d": {
     "translation": "Esta semana"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Administrar cookies"
   },
+  "7697920637": {
+    "translation": "Por favor recarga"
+  },
+  "764671e008": {
+    "translation": "Chatea con nosotros en Discord"
+  },
   "777f9e90cf": {
     "translation": "Solicitud no válida."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Olvidar"
   },
+  "7cfe6c43dc": {
+    "translation": "Salir del grupo…"
+  },
   "7daeced9ff": {
     "translation": "Publicar cambios"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Cambiar el nombre del archivo"
   },
+  "8ad4303b83": {
+    "translation": "No, gracias"
+  },
   "8b1946f965": {
     "translation": "Para continuar editando, copie la sala a sus archivos."
   },
+  "8c2d3d730c": {
+    "translation": "Comprueba tu correo electrónico para encontrar un código de verificación."
+  },
   "8eb2c00e96": {
     "translation": "Compartido con usted"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copiar en mis archivos"
   },
+  "930390d222": {
+    "translation": "Enlace de invitación copiado"
+  },
+  "95aacd4d4a": {
+    "translation": "Inicia sesión con Google"
+  },
+  "95d2109dc8": {
+    "translation": "Construir con el SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "Este mes"
   },
+  "985a4b720f": {
+    "translation": "Condiciones de uso"
+  },
+  "98c997a27e": {
+    "translation": "Agregar enlace de archivo"
+  },
   "9914a0ce04": {
     "translation": "Claro"
   },
+  "9b33f5c63c": {
+    "translation": "¿No recibiste un código? <resend>Reenviar</resend>."
+  },
   "9bef626805": {
     "translation": "Eliminar archivo"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Fondo"
   },
+  "aa916767cf": {
+    "translation": "Inicia sesión para aceptar la invitación"
+  },
   "ab0df9ba36": {
     "translation": "Se alcanzó el límite de archivos"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Usuario invitado"
   },
+  "b357b524e7": {
+    "translation": "Dirección de correo electrónico"
+  },
+  "b3d2db69fe": {
+    "translation": "URL del archivo"
+  },
   "b6d4223e60": {
     "translation": "Iniciar sesión"
   },
+  "b6f4a2ec63": {
+    "translation": "Dueño"
+  },
   "b758336699": {
     "translation": "Copiar enlace"
   },
   "ba0318cb81": {
     "translation": "Inicia sesión para compartir"
   },
-  "bb792693e2": {
-    "translation": "Desanclar"
+  "bb93a7590f": {
+    "translation": "Aceptar y unirse al grupo"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Subiendo archivo .tldr…} other {Cargando {uploaded} de {total} archivos .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Compartido por {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Cargar archivos .tldr"
-  },
   "c2276c9127": {
     "translation": "Más información sobre el uso compartido."
   },
+  "c28aed8348": {
+    "translation": "Permitir <cookies>analytics</cookies> para ayudarnos a mejorar tldraw."
+  },
   "c303bd1095": {
     "translation": "No se ha podido publicar el archivo."
   },
   "c4b39a1cc3": {
     "translation": "Cookies esenciales"
   },
+  "c6155aaecc": {
+    "translation": "Nombre del grupo"
+  },
   "c655b27b1e": {
     "translation": "i18n: cadena larga"
   },
   "c6a00f137b": {
     "translation": "Invitar"
   },
+  "c74ea6dbff": {
+    "translation": "Mostrar menos"
+  },
   "c87aacf567": {
     "translation": "Cerrar sesión"
   },
+  "c9cc8cce24": {
+    "translation": "Ahorrar"
+  },
   "cceaefbc20": {
     "translation": "Compartir este archivo"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Alternar barra lateral"
   },
+  "d638a3344b": {
+    "translation": "Antes de comenzar, acepte nuestros <tos>términos de uso</tos> y nuestra <privacy>política de privacidad</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Inténtelo de nuevo"
   },
+  "d88ad2dc74": {
+    "translation": "Aceptar y continuar"
+  },
   "d9100f3e10": {
     "translation": "Vaya aquí para ver el contenido"
   },
+  "d9e35d0f55": {
+    "translation": "Has alcanzado el número máximo de grupos. Debes eliminar los grupos antiguos antes de crear otros nuevos."
+  },
   "dbbebf3c03": {
     "translation": "Solo invitar"
   },
+  "dcdaa754fe": {
+    "translation": "URL de archivo tldraw no válida"
+  },
   "dfdb78a4e4": {
     "translation": "Indicadores de depuración de la aplicación"
   },
+  "e0c88179b3": {
+    "translation": "Invitar a los miembros"
+  },
+  "e2198d6228": {
+    "translation": "Copiar enlace de invitación"
+  },
   "e2ae80a510": {
     "translation": "Resumen legal"
   },
+  "e3afed0047": {
+    "translation": "Administración"
+  },
   "e404559826": {
     "translation": "Condiciones de servicio"
   },
-  "e78e14c5f1": {
-    "translation": "Anclar"
+  "e81c4e4f2b": {
+    "translation": "o"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona de peligro"
   },
   "ea4788705e": {
     "translation": "Cancelar"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Lea nuestra <a>política de cookies</a> para obtener más información."
   },
+  "ef53538ae4": {
+    "translation": "Miembros"
+  },
   "ef7de3f485": {
     "translation": "seleccionado"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Ajustes"
   },
+  "f714e36843": {
+    "translation": "¿Estás seguro de que quieres abandonar este grupo?"
+  },
+  "fa2ead697d": {
+    "translation": "política de privacidad"
+  },
   "fb15c53f22": {
     "translation": "Espectador"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Enlace copiado"
   },
+  "ff7a814974": {
+    "translation": "Agregar enlace de archivo…"
+  },
   "ffcd73e997": {
     "translation": "Importar archivo…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/fa.json b/apps/dotcom/client/public/tla/locales/fa.json
index 376226848260..d14c19755820 100644
--- a/apps/dotcom/client/public/tla/locales/fa.json
+++ b/apps/dotcom/client/public/tla/locales/fa.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "حساب کاربری"
   },
+  "08d2d725a9": {
+    "translation": "برای ذخیره کار خود، همکاری در لحظه و موارد دیگر، یک حساب کاربری رایگان ایجاد کنید."
+  },
   "0b27918290": {
     "translation": "فایل"
   },
   "0b9a4cde72": {
     "translation": "منوی فایل"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw یک تخته سفید مجازی رایگان و فوری است."
+  },
   "0d1f2bb523": {
     "translation": "ارسال بازخورد"
   },
   "110a4b01be": {
     "translation": "منتشر کنید"
   },
+  "129b9e34ea": {
+    "translation": "گروه را ترک کنید"
+  },
+  "12a6766ba1": {
+    "translation": "فایل را از حالت پین خارج کنید"
+  },
   "12c8a9838c": {
     "translation": "کیت توسعه نرم‌افزار tldraw را امتحان کنید"
   },
   "13ddd375ad": {
     "translation": "صادرات به عنوان"
   },
+  "146ffe2fd9": {
+    "translation": "نمایش بیشتر"
+  },
+  "14d65465b7": {
+    "translation": "حذف گروه"
+  },
   "181b90f889": {
     "translation": "فایل ایجاد کنید"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "این اتاق به محدودیت اندازه خود نزدیک می‌شود. حذف برخی از محتوا یا شروع یک فایل جدید را در نظر بگیرید."
   },
+  "2445e5e347": {
+    "translation": "ایجاد گروه"
+  },
   "250ddea65c": {
     "translation": "درباره tldraw"
   },
   "299cb00a7a": {
     "translation": "آپلود انجام نشد"
   },
+  "2c3ef76333": {
+    "translation": "فایل‌های من"
+  },
   "2deec2cb74": {
     "translation": "این اتاق به محدودیت اندازه خود رسیده است و ممکن است تغییرات دیگر ذخیره نشوند. برخی از محتوا را حذف کنید یا یک فایل جدید شروع کنید."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Highlight Missing"
   },
+  "32210b37e4": {
+    "translation": "افزودن لینک"
+  },
   "335defdafe": {
     "translation": "لطفاً صفحه را بازخوانی کنید."
   },
   "344a7f427f": {
     "translation": "ویرایشگر"
   },
+  "3bc7d6ea2f": {
+    "translation": "ادامه با ایمیل"
+  },
   "3bd1b98dbd": {
     "translation": "امکان انتشار تغییرات وجود ندارد."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "ترسیم کنید"
   },
-  "7697920637": {
-    "translation": "لطفاً دوباره بارگیری کنید"
+  "47f493a590": {
+    "translation": "فایل پین"
   },
-  "764671e008": {
-    "translation": "با ما در Discord چت کنید"
+  "49049467ff": {
+    "translation": "آدرس فایل tldraw را جایگذاری کنید..."
   },
   "4908687e50": {
     "translation": "آیا مطمئن هستید که می خواهید این فایل را فراموش کنید؟"
   },
+  "49ee308734": {
+    "translation": "نام"
+  },
   "4d0d3ddec9": {
     "translation": "این سایت از کوکی‌ها برای عملکرد برنامه و جمع‌آوری تحلیل‌ها استفاده می‌کند."
   },
   "4d1c8263ba": {
     "translation": "بارگذاری مجدد"
   },
+  "4da5988a2e": {
+    "translation": "حذف گروه…"
+  },
+  "4e6fbf032b": {
+    "translation": "آیا مطمئن هستید که می‌خواهید این گروه را حذف کنید؟ این اقدام قابل بازگشت نیست."
+  },
   "50db1b7e1e": {
     "translation": "امکان لغو انتشار فایل وجود ندارد."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "سیاست حفظ حریم خصوصی"
   },
+  "5a86b22fa0": {
+    "translation": "برای شروع، فایل‌ها را به اینجا بکشید، <create>یک فایل ایجاد کنید</create>، یا <invite>لینک دعوت را کپی کنید</invite>."
+  },
   "5a95a425f7": {
     "translation": "به اشتراک بگذارید"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "مرورگر قدیمی شناسایی شد. لطفاً برای استفاده از این برنامه، مرورگر خود را به‌روزرسانی کنید."
   },
+  "5c6fe42bc2": {
+    "translation": "این لینک را لغو کنید و یک لینک جدید ایجاد کنید."
+  },
   "5d26ae7550": {
     "translation": "ما نتوانستیم برخی از محتوایی را که قبل از ورود به سیستم ایجاد کرده‌اید آپلود کنیم."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "قدیمی تر"
   },
+  "639bae9ac6": {
+    "translation": "شما"
+  },
   "6609dd239e": {
     "translation": "مشکلی پیش آمد"
   },
   "6637a98151": {
     "translation": "نسخه جدید tldraw موجود است. لطفاً برای ادامه صفحه را دوباره بارگیری کنید."
   },
+  "68257bb646": {
+    "translation": "شما به گروه <br></br><groupName></groupName> دعوت شده‌اید."
+  },
+  "6832ac5936": {
+    "translation": "آدرس ایمیل خود را وارد کنید"
+  },
   "6a26f54883": {
     "translation": "کمک کنید"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "برای وارد کردن دستی محتوا مراحل زیر را دنبال کنید:"
   },
+  "70222abcfc": {
+    "translation": "تنظیمات گروه"
+  },
   "70a6facb9d": {
     "translation": "این هفته"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "مدیریت کوکی ها"
   },
+  "7697920637": {
+    "translation": "لطفاً دوباره بارگیری کنید"
+  },
+  "764671e008": {
+    "translation": "با ما در Discord چت کنید"
+  },
   "777f9e90cf": {
     "translation": "درخواست نامعتبر"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "فراموش کن"
   },
+  "7cfe6c43dc": {
+    "translation": "گروه را ترک کنید…"
+  },
   "7daeced9ff": {
     "translation": "انتشار تغییرات"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "تغییر نام فایل"
   },
+  "8ad4303b83": {
+    "translation": "نه ممنون"
+  },
   "8b1946f965": {
     "translation": "برای ادامه ویرایش، لطفاً اتاق را به فایل‌های خود کپی کنید."
   },
+  "8c2d3d730c": {
+    "translation": "برای دریافت کد تایید، ایمیل خود را بررسی کنید."
+  },
   "8eb2c00e96": {
     "translation": "با شما به اشتراک گذاشته شده است"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "در فایل های من کپی کنید"
   },
+  "930390d222": {
+    "translation": "لینک دعوت کپی شده"
+  },
+  "95aacd4d4a": {
+    "translation": "با گوگل وارد شوید"
+  },
+  "95d2109dc8": {
+    "translation": "با tldraw SDK بسازید"
+  },
   "96165d6df5": {
     "translation": "این ماه"
   },
+  "985a4b720f": {
+    "translation": "شرایط استفاده"
+  },
+  "98c997a27e": {
+    "translation": "اضافه کردن لینک فایل"
+  },
   "9914a0ce04": {
     "translation": "نور"
   },
+  "9b33f5c63c": {
+    "translation": "کدی دریافت نکردید؟ <resend>ارسال مجدد</resend>."
+  },
   "9bef626805": {
     "translation": "حذف فایل"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "پس زمینه"
   },
+  "aa916767cf": {
+    "translation": "برای پذیرش دعوتنامه وارد شوید"
+  },
   "ab0df9ba36": {
     "translation": "به محدودیت فایل رسیده است"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "کاربر مهمان"
   },
+  "b357b524e7": {
+    "translation": "آدرس ایمیل"
+  },
+  "b3d2db69fe": {
+    "translation": "آدرس فایل"
+  },
   "b6d4223e60": {
     "translation": "وارد شوید"
   },
+  "b6f4a2ec63": {
+    "translation": "مالک"
+  },
   "b758336699": {
     "translation": "لینک را کپی کنید"
   },
   "ba0318cb81": {
     "translation": "برای اشتراک‌گذاری وارد شوید"
   },
-  "bb792693e2": {
-    "translation": "پین را بردارید"
+  "bb93a7590f": {
+    "translation": "پذیرش و عضویت در گروه"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {در حال آپلود فایل tldr.…} other {در حال آپلود {uploaded} از {total} فایل‌های tldr.…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "به اشتراک گذاشته شده توسط {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "فایل های tldr. را آپلود کنید"
-  },
   "c2276c9127": {
     "translation": "درباره اشتراک گذاری بیشتر بدانید."
   },
+  "c28aed8348": {
+    "translation": "به <cookies>analytics</cookies> اجازه دهید تا به ما در بهبود tldraw کمک کند."
+  },
   "c303bd1095": {
     "translation": "امکان انتشار فایل وجود ندارد."
   },
   "c4b39a1cc3": {
     "translation": "کوکی‌های ضروری"
   },
+  "c6155aaecc": {
+    "translation": "نام گروه"
+  },
   "c655b27b1e": {
     "translation": "i18n: رشته بلند"
   },
   "c6a00f137b": {
     "translation": "دعوت کنید"
   },
+  "c74ea6dbff": {
+    "translation": "نمایش کمتر"
+  },
   "c87aacf567": {
     "translation": "از سیستم خارج شوید"
   },
+  "c9cc8cce24": {
+    "translation": "ذخیره"
+  },
   "cceaefbc20": {
     "translation": "این فایل را به اشتراک بگذارید"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "نوار کناری را تغییر دهید"
   },
+  "d638a3344b": {
+    "translation": "قبل از شروع، لطفاً <tos>شرایط استفاده</tos> و <privacy>سیاست حفظ حریم خصوصی</privacy> ما را بپذیرید."
+  },
   "d721757161": {
     "translation": "موضوع"
   },
   "d876a9fe1a": {
     "translation": "دوباره امتحان کنید"
   },
+  "d88ad2dc74": {
+    "translation": "بپذیرید و ادامه دهید"
+  },
   "d9100f3e10": {
     "translation": "برای دیدن مطالب به اینجا بروید"
   },
+  "d9e35d0f55": {
+    "translation": "شما به حداکثر تعداد گروه‌ها رسیده‌اید. قبل از ایجاد گروه‌های جدید، باید گروه‌های قدیمی را حذف کنید."
+  },
   "dbbebf3c03": {
     "translation": "فقط دعوت کنید"
   },
+  "dcdaa754fe": {
+    "translation": "آدرس فایل tldraw نامعتبر است"
+  },
   "dfdb78a4e4": {
     "translation": "پرچم‌های اشکال‌زدایی برنامه"
   },
+  "e0c88179b3": {
+    "translation": "دعوت از اعضا"
+  },
+  "e2198d6228": {
+    "translation": "کپی کردن لینک دعوت"
+  },
   "e2ae80a510": {
     "translation": "خلاصه حقوقی"
   },
+  "e3afed0047": {
+    "translation": "مدیر"
+  },
   "e404559826": {
     "translation": "شرایط خدمات"
   },
-  "e78e14c5f1": {
-    "translation": "سنجاق"
+  "e81c4e4f2b": {
+    "translation": "یا"
+  },
+  "ea0626ac5a": {
+    "translation": "منطقه خطر"
   },
   "ea4788705e": {
     "translation": "لغو کنید"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "برای کسب اطلاعات بیشتر، <a>سیاست کوکی</a> ما را مطالعه کنید."
   },
+  "ef53538ae4": {
+    "translation": "اعضا"
+  },
   "ef7de3f485": {
     "translation": "انتخاب شده"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "تنظیمات"
   },
+  "f714e36843": {
+    "translation": "مطمئنی که می‌خوای از این گروه بری؟"
+  },
+  "fa2ead697d": {
+    "translation": "سیاست حفظ حریم خصوصی"
+  },
   "fb15c53f22": {
     "translation": "بیننده"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "لینک کپی شده"
   },
+  "ff7a814974": {
+    "translation": "اضافه کردن لینک فایل…"
+  },
   "ffcd73e997": {
     "translation": "وارد کردن فایل…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/fi.json b/apps/dotcom/client/public/tla/locales/fi.json
index 405b62e7ad91..062e05f686dd 100644
--- a/apps/dotcom/client/public/tla/locales/fi.json
+++ b/apps/dotcom/client/public/tla/locales/fi.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Tili"
   },
+  "08d2d725a9": {
+    "translation": "Luo ilmainen tili tallentaaksesi työsi, tehdäksesi yhteistyötä reaaliajassa ja paljon muuta."
+  },
   "0b27918290": {
     "translation": "Tiedosto"
   },
   "0b9a4cde72": {
     "translation": "Tiedosto-valikko"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw on ilmainen ja pikaisesti käytettävä virtuaalinen valkotaulu."
+  },
   "0d1f2bb523": {
     "translation": "Lähetä palautetta"
   },
   "110a4b01be": {
     "translation": "Julkaista"
   },
+  "129b9e34ea": {
+    "translation": "Poistu ryhmästä"
+  },
+  "12a6766ba1": {
+    "translation": "Irrota tiedosto"
+  },
   "12c8a9838c": {
     "translation": "Kokeile tldraw SDK:ta"
   },
   "13ddd375ad": {
     "translation": "Vie nimellä"
   },
+  "146ffe2fd9": {
+    "translation": "Näytä lisää"
+  },
+  "14d65465b7": {
+    "translation": "Poista ryhmä"
+  },
   "181b90f889": {
     "translation": "Luo tiedosto"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Tämä huone lähestyy kokorajoitustaan. Harkitse sisällön poistamista tai uuden tiedoston aloittamista."
   },
+  "2445e5e347": {
+    "translation": "Luo ryhmä"
+  },
   "250ddea65c": {
     "translation": "Tietoja tldraw'sta"
   },
   "299cb00a7a": {
     "translation": "Lataus epäonnistui"
   },
+  "2c3ef76333": {
+    "translation": "Omat tiedostoni"
+  },
   "2deec2cb74": {
     "translation": "Tämä huone on saavuttanut kokorajoituksensa, eikä muutoksia ehkä enää tallenneta. Poista sisältöä tai aloita uusi tiedosto."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Korosta puuttuu"
   },
+  "32210b37e4": {
+    "translation": "Lisää linkki"
+  },
   "335defdafe": {
     "translation": "Yritä päivittää sivu."
   },
   "344a7f427f": {
     "translation": "Toimittaja"
   },
+  "3bc7d6ea2f": {
+    "translation": "Jatka sähköpostitse"
+  },
   "3bd1b98dbd": {
     "translation": "Muutoksia ei voi julkaista."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Lataa uudelleen"
+  "47f493a590": {
+    "translation": "Kiinnitä tiedosto"
   },
-  "764671e008": {
-    "translation": "Keskustele kanssamme Discordissa"
+  "49049467ff": {
+    "translation": "Liitä tldraw-tiedoston URL-osoite..."
   },
   "4908687e50": {
     "translation": "Haluatko varmasti unohtaa tämän tiedoston?"
   },
+  "49ee308734": {
+    "translation": "Nimi"
+  },
   "4d0d3ddec9": {
     "translation": "Tämä sivusto käyttää evästeitä sovelluksen toiminnan varmistamiseksi ja analytiikkatietojen keräämiseksi."
   },
   "4d1c8263ba": {
     "translation": "Lataa uudelleen"
   },
+  "4da5988a2e": {
+    "translation": "Poista ryhmä…"
+  },
+  "4e6fbf032b": {
+    "translation": "Haluatko varmasti poistaa tämän ryhmän? Tätä toimintoa ei voi perua."
+  },
   "50db1b7e1e": {
     "translation": "Tiedoston julkaisua ei voi peruuttaa."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Tietosuojakäytäntö"
   },
+  "5a86b22fa0": {
+    "translation": "Vedä tiedostot tähän, <create>luo tiedosto</create> tai <invite>kopioi kutsulinkki</invite> aloittaaksesi."
+  },
   "5a95a425f7": {
     "translation": "Jakaa"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Vanha selain havaittu. Päivitä selaimesi käyttääksesi tätä sovellusta."
   },
+  "5c6fe42bc2": {
+    "translation": "Peruuta tämä linkki ja luo uusi."
+  },
   "5d26ae7550": {
     "translation": "Emme pystyneet lataamaan osaa sisällöstä, jonka loit ennen kirjautumista."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Vanhempi"
   },
+  "639bae9ac6": {
+    "translation": "sinä"
+  },
   "6609dd239e": {
     "translation": "Jotain meni pieleen"
   },
   "6637a98151": {
     "translation": "Uusi versio tldraw:sta on saatavilla. Jatka lataamalla sivu uudelleen."
   },
+  "68257bb646": {
+    "translation": "Sinut on kutsuttu ryhmään <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Anna sähköpostiosoitteesi"
+  },
   "6a26f54883": {
     "translation": "Auttaa"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Tuo sisältö manuaalisesti seuraavasti:"
   },
+  "70222abcfc": {
+    "translation": "Ryhmän asetukset"
+  },
   "70a6facb9d": {
     "translation": "Tällä viikolla"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Hallinnoi evästeitä"
   },
+  "7697920637": {
+    "translation": "Lataa uudelleen"
+  },
+  "764671e008": {
+    "translation": "Keskustele kanssamme Discordissa"
+  },
   "777f9e90cf": {
     "translation": "Virheellinen pyyntö."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Unohtaa"
   },
+  "7cfe6c43dc": {
+    "translation": "Poistu ryhmästä…"
+  },
   "7daeced9ff": {
     "translation": "Julkaise muutokset"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Nimeä tiedosto uudelleen"
   },
+  "8ad4303b83": {
+    "translation": "Ei kiitos"
+  },
   "8b1946f965": {
     "translation": "Jatkaaksesi muokkaamista, kopioi huone tiedostoihisi."
   },
+  "8c2d3d730c": {
+    "translation": "Tarkista sähköpostistasi vahvistuskoodi."
+  },
   "8eb2c00e96": {
     "translation": "Jaettu kanssasi"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopioi tiedostoihini"
   },
+  "930390d222": {
+    "translation": "Kutsulinkki kopioitu"
+  },
+  "95aacd4d4a": {
+    "translation": "Kirjaudu sisään Googlella"
+  },
+  "95d2109dc8": {
+    "translation": "Rakenna tldraw SDK:lla"
+  },
   "96165d6df5": {
     "translation": "Tämä kuukausi"
   },
+  "985a4b720f": {
+    "translation": "Käyttöehdot"
+  },
+  "98c997a27e": {
+    "translation": "Lisää tiedostolinkki"
+  },
   "9914a0ce04": {
     "translation": "Kevyt"
   },
+  "9b33f5c63c": {
+    "translation": "Etkö saanut koodia? <resend>Lähetä uudelleen</resend>."
+  },
   "9bef626805": {
     "translation": "Poista tiedosto"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Tausta"
   },
+  "aa916767cf": {
+    "translation": "Kirjaudu sisään hyväksyäksesi kutsun"
+  },
   "ab0df9ba36": {
     "translation": "Tiedostoraja saavutettu"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Vieraskäyttäjä"
   },
+  "b357b524e7": {
+    "translation": "Sähköpostiosoite"
+  },
+  "b3d2db69fe": {
+    "translation": "Tiedoston URL-osoite"
+  },
   "b6d4223e60": {
     "translation": "Kirjaudu sisään"
   },
+  "b6f4a2ec63": {
+    "translation": "Omistaja"
+  },
   "b758336699": {
     "translation": "Kopioi linkki"
   },
   "ba0318cb81": {
     "translation": "Kirjaudu sisään jakaaksesi"
   },
-  "bb792693e2": {
-    "translation": "Irrota kiinnitys"
+  "bb93a7590f": {
+    "translation": "Hyväksy ja liity ryhmään"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Ladataan .tldr-tiedostoa…} other {Ladataan {uploaded} / {total} .tldr-tiedostosta…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Jakaja {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Lataa .tldr-tiedostoja"
-  },
   "c2276c9127": {
     "translation": "Lisätietoja jakamisesta."
   },
+  "c28aed8348": {
+    "translation": "Salli <cookies>analytics</cookies>-palvelun auttaa meitä parantamaan tldrawia."
+  },
   "c303bd1095": {
     "translation": "Tiedostoa ei voi julkaista."
   },
   "c4b39a1cc3": {
     "translation": "Välttämättömät evästeet"
   },
+  "c6155aaecc": {
+    "translation": "Ryhmän nimi"
+  },
   "c655b27b1e": {
     "translation": "i18n: Pitkä merkkijono"
   },
   "c6a00f137b": {
     "translation": "Kutsu"
   },
+  "c74ea6dbff": {
+    "translation": "Näytä vähemmän"
+  },
   "c87aacf567": {
     "translation": "Kirjaudu ulos"
   },
+  "c9cc8cce24": {
+    "translation": "Tallentaa"
+  },
   "cceaefbc20": {
     "translation": "Jaa tämä tiedosto"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Vaihda sivupalkki"
   },
+  "d638a3344b": {
+    "translation": "Ennen kuin aloitat, hyväksy <tos>käyttöehtomme</tos> ja <privacy>tietosuojakäytäntömme</privacy>."
+  },
   "d721757161": {
     "translation": "Teema"
   },
   "d876a9fe1a": {
     "translation": "Yritä uudelleen"
   },
+  "d88ad2dc74": {
+    "translation": "Hyväksy ja jatka"
+  },
   "d9100f3e10": {
     "translation": "Siirry tänne nähdäksesi sisällön"
   },
+  "d9e35d0f55": {
+    "translation": "Olet saavuttanut ryhmien enimmäismäärän. Sinun on poistettava vanhoja ryhmiä ennen uusien luomista."
+  },
   "dbbebf3c03": {
     "translation": "Vain kutsu"
   },
+  "dcdaa754fe": {
+    "translation": "Virheellinen tldraw-tiedoston URL-osoite"
+  },
   "dfdb78a4e4": {
     "translation": "Sovelluksen virheenkorjausliput"
   },
+  "e0c88179b3": {
+    "translation": "Kutsu jäseniä"
+  },
+  "e2198d6228": {
+    "translation": "Kopioi kutsulinkki"
+  },
   "e2ae80a510": {
     "translation": "Oikeudellinen yhteenveto"
   },
+  "e3afed0047": {
+    "translation": "Ylläpitäjä"
+  },
   "e404559826": {
     "translation": "Palveluehdot"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "tai"
+  },
+  "ea0626ac5a": {
+    "translation": "Vaara-alue"
   },
   "ea4788705e": {
     "translation": "Peruuttaa"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Lue lisää <a>evästekäytännöstämme</a>."
   },
+  "ef53538ae4": {
+    "translation": "Jäsenet"
+  },
   "ef7de3f485": {
     "translation": "valittu"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Asetukset"
   },
+  "f714e36843": {
+    "translation": "Haluatko varmasti poistua tästä ryhmästä?"
+  },
+  "fa2ead697d": {
+    "translation": "Tietosuojakäytäntö"
+  },
   "fb15c53f22": {
     "translation": "Katsoja"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Linkki kopioitu"
   },
+  "ff7a814974": {
+    "translation": "Lisää tiedostolinkki…"
+  },
   "ffcd73e997": {
     "translation": "Tuo tiedosto…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/fr.json b/apps/dotcom/client/public/tla/locales/fr.json
index ebc5ef0c37cc..e4c5d71be9d6 100644
--- a/apps/dotcom/client/public/tla/locales/fr.json
+++ b/apps/dotcom/client/public/tla/locales/fr.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Compte"
   },
+  "08d2d725a9": {
+    "translation": "Créez un compte gratuit pour sauvegarder votre travail, collaborer en temps réel et bien plus encore."
+  },
   "0b27918290": {
     "translation": "Fichier"
   },
   "0b9a4cde72": {
     "translation": "Menu du fichier"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw est un tableau blanc virtuel gratuit et instantané."
+  },
   "0d1f2bb523": {
     "translation": "Envoyer des commentaires"
   },
   "110a4b01be": {
     "translation": "Publier"
   },
+  "129b9e34ea": {
+    "translation": "Quitter le groupe"
+  },
+  "12a6766ba1": {
+    "translation": "Détacher le fichier"
+  },
   "12c8a9838c": {
     "translation": "Essayez le SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Exporter en tant que"
   },
+  "146ffe2fd9": {
+    "translation": "Afficher plus"
+  },
+  "14d65465b7": {
+    "translation": "Supprimer le groupe"
+  },
   "181b90f889": {
     "translation": "Créer un fichier"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Cette salle approche de sa taille maximale. Envisagez de supprimer du contenu ou de créer un nouveau fichier."
   },
+  "2445e5e347": {
+    "translation": "Créer un groupe"
+  },
   "250ddea65c": {
     "translation": "À propos de tldraw"
   },
   "299cb00a7a": {
     "translation": "Échec de l'importation"
   },
+  "2c3ef76333": {
+    "translation": "Mes fichiers"
+  },
   "2deec2cb74": {
     "translation": "Cette salle a atteint sa taille maximale et les modifications risquent de ne plus être enregistrées. Supprimez du contenu ou créez un nouveau fichier."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n : surlignement manquant"
   },
+  "32210b37e4": {
+    "translation": "Ajouter un lien"
+  },
   "335defdafe": {
     "translation": "Veuillez essayer de recharger la page."
   },
   "344a7f427f": {
     "translation": "Éditeur"
   },
+  "3bc7d6ea2f": {
+    "translation": "Poursuivre par courriel"
+  },
   "3bd1b98dbd": {
     "translation": "Impossible de publier les modifications."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Veuillez recharger"
+  "47f493a590": {
+    "translation": "Fichier d'épingles"
   },
-  "764671e008": {
-    "translation": "Discutez avec nous sur Discord"
+  "49049467ff": {
+    "translation": "Collez l'URL du fichier tldraw..."
   },
   "4908687e50": {
     "translation": "Voulez-vous vraiment oublier ce fichier ?"
   },
+  "49ee308734": {
+    "translation": "Nom"
+  },
   "4d0d3ddec9": {
     "translation": "Ce site utilise des cookies pour faire fonctionner l'application et collecter des analyses."
   },
   "4d1c8263ba": {
     "translation": "Recharger"
   },
+  "4da5988a2e": {
+    "translation": "Supprimer le groupe…"
+  },
+  "4e6fbf032b": {
+    "translation": "Êtes-vous sûr de vouloir supprimer ce groupe ? Cette action est irréversible."
+  },
   "50db1b7e1e": {
     "translation": "Impossible d'annuler la publication du fichier."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Politique de confidentialité"
   },
+  "5a86b22fa0": {
+    "translation": "Glissez-déposez les fichiers ici, <create>créer un fichier</create> ou <invite>copier le lien d'invitation</invite> pour commencer."
+  },
   "5a95a425f7": {
     "translation": "Partager"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Ancien navigateur détecté. Veuillez mettre à jour votre navigateur pour utiliser cette application."
   },
+  "5c6fe42bc2": {
+    "translation": "Révoquez ce lien et créez-en un nouveau."
+  },
   "5d26ae7550": {
     "translation": "Nous n'avons pas réussi à importer une partie du contenu que vous avez créé avant de vous connecter."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Plus ancien"
   },
+  "639bae9ac6": {
+    "translation": "toi"
+  },
   "6609dd239e": {
     "translation": "Une erreur s'est produite"
   },
   "6637a98151": {
     "translation": "Une nouvelle version de tldraw est disponible. Veuillez recharger la page pour continuer."
   },
+  "68257bb646": {
+    "translation": "Vous avez été invité à rejoindre le groupe <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Saisissez votre adresse e-mail"
+  },
   "6a26f54883": {
     "translation": "Aide"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Suivez ces étapes pour importer le contenu manuellement :"
   },
+  "70222abcfc": {
+    "translation": "Paramètres de groupe"
+  },
   "70a6facb9d": {
     "translation": "Cette semaine"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Gérer les cookies"
   },
+  "7697920637": {
+    "translation": "Veuillez recharger"
+  },
+  "764671e008": {
+    "translation": "Discutez avec nous sur Discord"
+  },
   "777f9e90cf": {
     "translation": "Demande invalide."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Oublier"
   },
+  "7cfe6c43dc": {
+    "translation": "Quitter le groupe…"
+  },
   "7daeced9ff": {
     "translation": "Publier les modifications"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Renommer le fichier"
   },
+  "8ad4303b83": {
+    "translation": "Non merci"
+  },
   "8b1946f965": {
     "translation": "Pour continuer l'édition, veuillez copier la pièce dans vos fichiers."
   },
+  "8c2d3d730c": {
+    "translation": "Consultez votre boîte mail pour obtenir un code de vérification."
+  },
   "8eb2c00e96": {
     "translation": "Partagé avec vous"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copier dans mes fichiers"
   },
+  "930390d222": {
+    "translation": "Lien d'invitation copié"
+  },
+  "95aacd4d4a": {
+    "translation": "Se connecter avec Google"
+  },
+  "95d2109dc8": {
+    "translation": "Construire avec le SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "Ce mois-ci"
   },
+  "985a4b720f": {
+    "translation": "Conditions d'utilisation"
+  },
+  "98c997a27e": {
+    "translation": "Ajouter un lien vers le fichier"
+  },
   "9914a0ce04": {
     "translation": "Clair"
   },
+  "9b33f5c63c": {
+    "translation": "Vous n'avez pas reçu de code ? <resend>Renvoyer</resend>."
+  },
   "9bef626805": {
     "translation": "Supprimer le fichier"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Arrière-plan"
   },
+  "aa916767cf": {
+    "translation": "Connectez-vous pour accepter l'invitation"
+  },
   "ab0df9ba36": {
     "translation": "Limite de fichier atteinte"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Utilisateur invité"
   },
+  "b357b524e7": {
+    "translation": "Adresse email"
+  },
+  "b3d2db69fe": {
+    "translation": "URL du fichier"
+  },
   "b6d4223e60": {
     "translation": "Se connecter"
   },
+  "b6f4a2ec63": {
+    "translation": "Propriétaire"
+  },
   "b758336699": {
     "translation": "Copier le lien"
   },
   "ba0318cb81": {
     "translation": "Connectez-vous pour partager"
   },
-  "bb792693e2": {
-    "translation": "Désépingler"
+  "bb93a7590f": {
+    "translation": "Accepter et rejoindre le groupe"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Téléchargement du fichier .tldr…} other {Téléchargement de {uploaded} sur {total} fichiers .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Partagé par {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Importer des fichiers .tldr"
-  },
   "c2276c9127": {
     "translation": "En savoir plus sur le partage."
   },
+  "c28aed8348": {
+    "translation": "Autorisez les <cookies>analytics</cookies> pour nous aider à améliorer tldraw."
+  },
   "c303bd1095": {
     "translation": "Impossible de publier le fichier."
   },
   "c4b39a1cc3": {
     "translation": "Cookies essentiels"
   },
+  "c6155aaecc": {
+    "translation": "Nom du groupe"
+  },
   "c655b27b1e": {
     "translation": "i18n : chaîne longue"
   },
   "c6a00f137b": {
     "translation": "Inviter"
   },
+  "c74ea6dbff": {
+    "translation": "Afficher moins"
+  },
   "c87aacf567": {
     "translation": "Se déconnecter"
   },
+  "c9cc8cce24": {
+    "translation": "Sauvegarder"
+  },
   "cceaefbc20": {
     "translation": "Partager ce fichier"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Activer/désactiver la barre latérale"
   },
+  "d638a3344b": {
+    "translation": "Avant de commencer, veuillez accepter nos <tos>conditions d'utilisation</tos> et notre <privacy>politique de confidentialité</privacy>."
+  },
   "d721757161": {
     "translation": "Thème"
   },
   "d876a9fe1a": {
     "translation": "Réessayer"
   },
+  "d88ad2dc74": {
+    "translation": "Accepter et continuer"
+  },
   "d9100f3e10": {
     "translation": "Le contenu se trouve ici"
   },
+  "d9e35d0f55": {
+    "translation": "Vous avez atteint le nombre maximal de groupes. Vous devez supprimer les anciens groupes avant d'en créer de nouveaux."
+  },
   "dbbebf3c03": {
     "translation": "Invitation uniquement"
   },
+  "dcdaa754fe": {
+    "translation": "URL de fichier tldraw invalide"
+  },
   "dfdb78a4e4": {
     "translation": "Indicateurs de débogage de l'application"
   },
+  "e0c88179b3": {
+    "translation": "Inviter des membres"
+  },
+  "e2198d6228": {
+    "translation": "Copier le lien d'invitation"
+  },
   "e2ae80a510": {
     "translation": "Résumé juridique"
   },
+  "e3afed0047": {
+    "translation": "Administrateur"
+  },
   "e404559826": {
     "translation": "Conditions d'utilisation"
   },
-  "e78e14c5f1": {
-    "translation": "Épingler"
+  "e81c4e4f2b": {
+    "translation": "ou"
+  },
+  "ea0626ac5a": {
+    "translation": "Zone dangereuse"
   },
   "ea4788705e": {
     "translation": "Annuler"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Lisez notre <a>politique relative aux cookies</a> pour en savoir plus."
   },
+  "ef53538ae4": {
+    "translation": "Membres"
+  },
   "ef7de3f485": {
     "translation": "choisi"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Paramètres"
   },
+  "f714e36843": {
+    "translation": "Êtes-vous sûr(e) de vouloir quitter ce groupe ?"
+  },
+  "fa2ead697d": {
+    "translation": "politique de confidentialité"
+  },
   "fb15c53f22": {
     "translation": "Visionneuse"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Lien copié"
   },
+  "ff7a814974": {
+    "translation": "Ajouter un lien vers le fichier…"
+  },
   "ffcd73e997": {
     "translation": "Importer un fichier…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/gl.json b/apps/dotcom/client/public/tla/locales/gl.json
index 6e306af4fa15..cc4b42bce1f4 100644
--- a/apps/dotcom/client/public/tla/locales/gl.json
+++ b/apps/dotcom/client/public/tla/locales/gl.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Conta"
   },
+  "08d2d725a9": {
+    "translation": "Crea unha conta gratuíta para gardar o teu traballo, colaborar en tempo real e moito máis."
+  },
   "0b27918290": {
     "translation": "Arquivo"
   },
   "0b9a4cde72": {
     "translation": "Menú Ficheiro"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw é unha pizarra virtual gratuíta e instantánea."
+  },
   "0d1f2bb523": {
     "translation": "Enviar comentarios"
   },
   "110a4b01be": {
     "translation": "Publicar"
   },
+  "129b9e34ea": {
+    "translation": "Abandonar o grupo"
+  },
+  "12a6766ba1": {
+    "translation": "Desfixar ficheiro"
+  },
   "12c8a9838c": {
     "translation": "Proba o SDK de tldraw"
   },
   "13ddd375ad": {
     "translation": "Exportar como"
   },
+  "146ffe2fd9": {
+    "translation": "Mostrar máis"
+  },
+  "14d65465b7": {
+    "translation": "Eliminar grupo"
+  },
   "181b90f889": {
     "translation": "Crear ficheiro"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Esta sala está a chegar ao seu límite de tamaño. Considera eliminar parte do contido ou comezar un novo ficheiro."
   },
+  "2445e5e347": {
+    "translation": "Crear grupo"
+  },
   "250ddea65c": {
     "translation": "Acerca de tldraw"
   },
   "299cb00a7a": {
     "translation": "Produciuse un erro na carga"
   },
+  "2c3ef76333": {
+    "translation": "Os meus ficheiros"
+  },
   "2deec2cb74": {
     "translation": "Esta sala alcanzou o seu límite de tamaño e é posible que os cambios xa non se garden. Elimina parte do contido ou comeza un ficheiro novo."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Falta resaltar"
   },
+  "32210b37e4": {
+    "translation": "Engadir ligazón"
+  },
   "335defdafe": {
     "translation": "Proba a actualizar a páxina."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continuar co correo electrónico"
+  },
   "3bd1b98dbd": {
     "translation": "Non se poden publicar os cambios."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Volve cargar"
+  "47f493a590": {
+    "translation": "Ficheiro fixado"
   },
-  "764671e008": {
-    "translation": "Chatea connosco en Discord"
+  "49049467ff": {
+    "translation": "Pegar o URL do ficheiro tldraw..."
   },
   "4908687e50": {
     "translation": "Estás seguro de que queres esquecer este ficheiro?"
   },
+  "49ee308734": {
+    "translation": "Nome"
+  },
   "4d0d3ddec9": {
     "translation": "Este sitio usa cookies para que a aplicación funcione e para recompilar análises."
   },
   "4d1c8263ba": {
     "translation": "Recarga"
   },
+  "4da5988a2e": {
+    "translation": "Eliminar grupo…"
+  },
+  "4e6fbf032b": {
+    "translation": "Seguro que queres eliminar este grupo? Esta acción non se pode desfacer."
+  },
   "50db1b7e1e": {
     "translation": "Non se puido anular a publicación do ficheiro."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Política de privacidade"
   },
+  "5a86b22fa0": {
+    "translation": "Arrastra ficheiros aquí, <create>crea un ficheiro</create> ou <invite>copia a ligazón de invitación</invite> para comezar."
+  },
   "5a95a425f7": {
     "translation": "Compartir"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Detectouse un navegador antigo. Actualízao para usar esta aplicación."
   },
+  "5c6fe42bc2": {
+    "translation": "Revoga esta ligazón e crea unha nova."
+  },
   "5d26ae7550": {
     "translation": "Non puidemos cargar parte do contido que creaches antes de iniciar sesión."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Máis vello"
   },
+  "639bae9ac6": {
+    "translation": "ti"
+  },
   "6609dd239e": {
     "translation": "Algo saíu mal"
   },
   "6637a98151": {
     "translation": "Hai unha nova versión de tldraw dispoñible. Volve cargar a páxina para continuar."
   },
+  "68257bb646": {
+    "translation": "Convidáronte ao grupo <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Introduce o teu enderezo de correo electrónico"
+  },
   "6a26f54883": {
     "translation": "Axuda"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Siga estes pasos para importar o contido manualmente:"
   },
+  "70222abcfc": {
+    "translation": "Configuración do grupo"
+  },
   "70a6facb9d": {
     "translation": "Esta semana"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Xestionar cookies"
   },
+  "7697920637": {
+    "translation": "Volve cargar"
+  },
+  "764671e008": {
+    "translation": "Chatea connosco en Discord"
+  },
   "777f9e90cf": {
     "translation": "Solicitude non válida."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Esquece"
   },
+  "7cfe6c43dc": {
+    "translation": "Abandonar o grupo…"
+  },
   "7daeced9ff": {
     "translation": "Publicar cambios"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Cambiar o nome do ficheiro"
   },
+  "8ad4303b83": {
+    "translation": "Non, grazas."
+  },
   "8b1946f965": {
     "translation": "Para continuar coa edición, copia a sala nos teus ficheiros."
   },
+  "8c2d3d730c": {
+    "translation": "Consulta o teu correo electrónico para obter un código de verificación."
+  },
   "8eb2c00e96": {
     "translation": "Compartido contigo"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copiar nos meus ficheiros"
   },
+  "930390d222": {
+    "translation": "Ligazón de invitación copiada"
+  },
+  "95aacd4d4a": {
+    "translation": "Iniciar sesión con Google"
+  },
+  "95d2109dc8": {
+    "translation": "Compilar co SDK de tldraw"
+  },
   "96165d6df5": {
     "translation": "Este mes"
   },
+  "985a4b720f": {
+    "translation": "Condicións de uso"
+  },
+  "98c997a27e": {
+    "translation": "Engadir ligazón ao ficheiro"
+  },
   "9914a0ce04": {
     "translation": "Luz"
   },
+  "9b33f5c63c": {
+    "translation": "Non recibiches o código? <resend>Volver enviar</resend>."
+  },
   "9bef626805": {
     "translation": "Eliminar ficheiro"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Fondo"
   },
+  "aa916767cf": {
+    "translation": "Inicia sesión para aceptar a invitación"
+  },
   "ab0df9ba36": {
     "translation": "Alcanzouse o límite de ficheiros"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Usuario convidado"
   },
+  "b357b524e7": {
+    "translation": "Enderezo de correo electrónico"
+  },
+  "b3d2db69fe": {
+    "translation": "URL do ficheiro"
+  },
   "b6d4223e60": {
     "translation": "Inicia sesión"
   },
+  "b6f4a2ec63": {
+    "translation": "Propietario"
+  },
   "b758336699": {
     "translation": "Copiar ligazón"
   },
   "ba0318cb81": {
     "translation": "Inicia sesión para compartir"
   },
-  "bb792693e2": {
-    "translation": "Desfixo"
+  "bb93a7590f": {
+    "translation": "Aceptar e unirse ao grupo"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Cargando ficheiro .tldr...} other {Cargando {uploaded} de {total} ficheiros .tldr...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Compartido por {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Carga ficheiros .tldr"
-  },
   "c2276c9127": {
     "translation": "Obtén máis información sobre como compartir."
   },
+  "c28aed8348": {
+    "translation": "Permite que as <cookies>analytics</cookies> nos axuden a mellorar tldraw."
+  },
   "c303bd1095": {
     "translation": "Non se puido publicar o ficheiro."
   },
   "c4b39a1cc3": {
     "translation": "Galletas esenciais"
   },
+  "c6155aaecc": {
+    "translation": "Nome do grupo"
+  },
   "c655b27b1e": {
     "translation": "i18n: Corda longa"
   },
   "c6a00f137b": {
     "translation": "Invitar"
   },
+  "c74ea6dbff": {
+    "translation": "Mostrar menos"
+  },
   "c87aacf567": {
     "translation": "Pechar sesión"
   },
+  "c9cc8cce24": {
+    "translation": "Gardar"
+  },
   "cceaefbc20": {
     "translation": "Comparte este ficheiro"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Alterna a barra lateral"
   },
+  "d638a3344b": {
+    "translation": "Antes de comezar, acepta as nosas <tos>condicións de uso</tos> e a nosa <privacy>política de privacidade</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Téntao de novo"
   },
+  "d88ad2dc74": {
+    "translation": "Aceptar e continuar"
+  },
   "d9100f3e10": {
     "translation": "Entra aquí para ver o contido"
   },
+  "d9e35d0f55": {
+    "translation": "Alcanzaches o número máximo de grupos. Debes eliminar os grupos antigos antes de crear outros novos."
+  },
   "dbbebf3c03": {
     "translation": "Só invitar"
   },
+  "dcdaa754fe": {
+    "translation": "URL de ficheiro tldraw non válida"
+  },
   "dfdb78a4e4": {
     "translation": "Marcadores de depuración de aplicacións"
   },
+  "e0c88179b3": {
+    "translation": "Convidar membros"
+  },
+  "e2198d6228": {
+    "translation": "Copiar ligazón de invitación"
+  },
   "e2ae80a510": {
     "translation": "Resumo legal"
   },
+  "e3afed0047": {
+    "translation": "Administrador"
+  },
   "e404559826": {
     "translation": "Condicións do servizo"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "ou"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona de perigo"
   },
   "ea4788705e": {
     "translation": "Cancelar"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Lea a nosa <a>política de cookies</a> para obter máis información."
   },
+  "ef53538ae4": {
+    "translation": "Membros"
+  },
   "ef7de3f485": {
     "translation": "seleccionado"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Configuración"
   },
+  "f714e36843": {
+    "translation": "Seguro que queres saír deste grupo?"
+  },
+  "fa2ead697d": {
+    "translation": "Política de privacidade"
+  },
   "fb15c53f22": {
     "translation": "Visor"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Ligazón copiada"
   },
+  "ff7a814974": {
+    "translation": "Engadir ligazón ao ficheiro…"
+  },
   "ffcd73e997": {
     "translation": "Importar ficheiro…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/gu-in.json b/apps/dotcom/client/public/tla/locales/gu-in.json
index e6c2eeb5f55a..f62bba93cec4 100644
--- a/apps/dotcom/client/public/tla/locales/gu-in.json
+++ b/apps/dotcom/client/public/tla/locales/gu-in.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "ખાતું"
   },
+  "08d2d725a9": {
+    "translation": "તમારા કાર્યને સાચવવા, રીઅલ-ટાઇમમાં સહયોગ કરવા અને વધુ કરવા માટે એક મફત એકાઉન્ટ બનાવો."
+  },
   "0b27918290": {
     "translation": "ફાઈલ"
   },
   "0b9a4cde72": {
     "translation": "ફાઇલ મેનુ"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw એ એક મફત અને ત્વરિત વર્ચ્યુઅલ વ્હાઇટબોર્ડ છે."
+  },
   "0d1f2bb523": {
     "translation": "પ્રતિસાદ મોકલો"
   },
   "110a4b01be": {
     "translation": "પ્રકાશિત કરો"
   },
+  "129b9e34ea": {
+    "translation": "જૂથ છોડો"
+  },
+  "12a6766ba1": {
+    "translation": "ફાઇલ અનપિન કરો"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK અજમાવી જુઓ"
   },
   "13ddd375ad": {
     "translation": "તરીકે નિકાસ કરો"
   },
+  "146ffe2fd9": {
+    "translation": "વધુ બતાવો"
+  },
+  "14d65465b7": {
+    "translation": "જૂથ કાઢી નાખો"
+  },
   "181b90f889": {
     "translation": "ફાઈલ બનાવો"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "આ રૂમ તેની કદ મર્યાદાની નજીક પહોંચી રહ્યો છે. કેટલીક સામગ્રી દૂર કરવાનું અથવા નવી ફાઇલ શરૂ કરવાનું વિચારો."
   },
+  "2445e5e347": {
+    "translation": "જૂથ બનાવો"
+  },
   "250ddea65c": {
     "translation": "tldraw વિશે"
   },
   "299cb00a7a": {
     "translation": "અપલોડ નિષ્ફળ થયું"
   },
+  "2c3ef76333": {
+    "translation": "મારી ફાઇલો"
+  },
   "2deec2cb74": {
     "translation": "આ રૂમ તેની કદ મર્યાદા સુધી પહોંચી ગયો છે અને ફેરફારો હવે સાચવી શકાશે નહીં. કેટલીક સામગ્રી દૂર કરો અથવા નવી ફાઇલ શરૂ કરો."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: હાઇલાઇટ ખૂટે છે"
   },
+  "32210b37e4": {
+    "translation": "લિંક ઉમેરો"
+  },
   "335defdafe": {
     "translation": "કૃપા કરીને પૃષ્ઠને તાજું કરવાનો પ્રયાસ કરો."
   },
   "344a7f427f": {
     "translation": "સંપાદક"
   },
+  "3bc7d6ea2f": {
+    "translation": "ઇમેઇલ સાથે ચાલુ રાખો"
+  },
   "3bd1b98dbd": {
     "translation": "ફેરફારો પ્રકાશિત કરવામાં અસમર્થ."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "કૃપા કરીને ફરીથી લોડ કરો"
+  "47f493a590": {
+    "translation": "ફાઇલ પિન કરો"
   },
-  "764671e008": {
-    "translation": "ડિસ્કોર્ડ પર અમારી સાથે ચેટ કરો"
+  "49049467ff": {
+    "translation": "tldraw ફાઇલ URL પેસ્ટ કરો..."
   },
   "4908687e50": {
     "translation": "શું તમે ખરેખર આ ફાઇલને ભૂલી જવા માંગો છો?"
   },
+  "49ee308734": {
+    "translation": "નામ"
+  },
   "4d0d3ddec9": {
     "translation": "આ સાઇટ એપ્લિકેશનને કાર્યરત કરવા અને વિશ્લેષણ એકત્રિત કરવા માટે કૂકીઝનો ઉપયોગ કરે છે."
   },
   "4d1c8263ba": {
     "translation": "ફરીથી લોડ કરો"
   },
+  "4da5988a2e": {
+    "translation": "જૂથ કાઢી નાખો..."
+  },
+  "4e6fbf032b": {
+    "translation": "શું તમે ખરેખર આ જૂથ કાઢી નાખવા માંગો છો? આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી."
+  },
   "50db1b7e1e": {
     "translation": "ફાઇલને અપ્રકાશિત કરવામાં અસમર્થ."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "ગોપનીયતા નીતિ"
   },
+  "5a86b22fa0": {
+    "translation": "શરૂ કરવા માટે ફાઇલોને અહીં ખેંચો, <create>ફાઇલ બનાવો</create> અથવા <invite>આમંત્રણ લિંક કૉપિ કરો</invite>."
+  },
   "5a95a425f7": {
     "translation": "શેર કરો"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "જૂનું બ્રાઉઝર મળ્યું. આ એપ્લિકેશનનો ઉપયોગ કરવા માટે કૃપા કરીને તમારા બ્રાઉઝરને અપડેટ કરો."
   },
+  "5c6fe42bc2": {
+    "translation": "આ લિંક રદ કરો અને એક નવી બનાવો."
+  },
   "5d26ae7550": {
     "translation": "તમે સાઇન ઇન કરો તે પહેલાં તમે બનાવેલી કેટલીક સામગ્રી અપલોડ કરવામાં અમે નિષ્ફળ ગયા."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "જૂની"
   },
+  "639bae9ac6": {
+    "translation": "તમે"
+  },
   "6609dd239e": {
     "translation": "કંઈક ખોટું થયું"
   },
   "6637a98151": {
     "translation": "tldraw નું નવું વર્ઝન ઉપલબ્ધ છે. ચાલુ રાખવા માટે કૃપા કરીને પેજ ફરીથી લોડ કરો."
   },
+  "68257bb646": {
+    "translation": "તમને ગ્રુપમાં આમંત્રિત કરવામાં આવ્યા છે <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "તમારું ઇમેઇલ સરનામું દાખલ કરો"
+  },
   "6a26f54883": {
     "translation": "મદદ"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "સામગ્રીને મેન્યુઅલી આયાત કરવા માટે આ પગલાં અનુસરો:"
   },
+  "70222abcfc": {
+    "translation": "ગ્રુપ સેટિંગ્સ"
+  },
   "70a6facb9d": {
     "translation": "આ અઠવાડિયે"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "કૂકીઝ મેનેજ કરો"
   },
+  "7697920637": {
+    "translation": "કૃપા કરીને ફરીથી લોડ કરો"
+  },
+  "764671e008": {
+    "translation": "ડિસ્કોર્ડ પર અમારી સાથે ચેટ કરો"
+  },
   "777f9e90cf": {
     "translation": "અમાન્ય વિનંતી."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "ભૂલી જાવ"
   },
+  "7cfe6c43dc": {
+    "translation": "જૂથ છોડો…"
+  },
   "7daeced9ff": {
     "translation": "ફેરફારો પ્રકાશિત કરો"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ફાઇલનું નામ બદલો"
   },
+  "8ad4303b83": {
+    "translation": "ના આભાર"
+  },
   "8b1946f965": {
     "translation": "સંપાદન ચાલુ રાખવા માટે કૃપા કરીને રૂમને તમારી ફાઇલોમાં કૉપિ કરો."
   },
+  "8c2d3d730c": {
+    "translation": "ચકાસણી કોડ માટે તમારો ઇમેઇલ તપાસો."
+  },
   "8eb2c00e96": {
     "translation": "તમારી સાથે શેર કર્યું"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "મારી ફાઇલોમાં કૉપિ કરો"
   },
+  "930390d222": {
+    "translation": "આમંત્રણ લિંક કૉપિ કરી"
+  },
+  "95aacd4d4a": {
+    "translation": "ગુગલ સાથે સાઇન ઇન કરો"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK વડે બનાવો"
+  },
   "96165d6df5": {
     "translation": "આ મહિને"
   },
+  "985a4b720f": {
+    "translation": "ઉપયોગની શરતો"
+  },
+  "98c997a27e": {
+    "translation": "ફાઇલ લિંક ઉમેરો"
+  },
   "9914a0ce04": {
     "translation": "પ્રકાશ"
   },
+  "9b33f5c63c": {
+    "translation": "કોડ મળ્યો નથી? <resend>ફરીથી મોકલો</resend>."
+  },
   "9bef626805": {
     "translation": "ફાઇલ કાઢી નાખો"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "પૃષ્ઠભૂમિ"
   },
+  "aa916767cf": {
+    "translation": "આમંત્રણ સ્વીકારવા માટે સાઇન ઇન કરો"
+  },
   "ab0df9ba36": {
     "translation": "ફાઇલ મર્યાદા પહોંચી"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "મહેમાન વપરાશકર્તા"
   },
+  "b357b524e7": {
+    "translation": "ઇમેઇલ સરનામું"
+  },
+  "b3d2db69fe": {
+    "translation": "ફાઇલ URL"
+  },
   "b6d4223e60": {
     "translation": "સાઇન ઇન કરો"
   },
+  "b6f4a2ec63": {
+    "translation": "માલિક"
+  },
   "b758336699": {
     "translation": "લિંક કૉપિ કરો"
   },
   "ba0318cb81": {
     "translation": "શેર કરવા માટે સાઇન ઇન કરો"
   },
-  "bb792693e2": {
-    "translation": "અનપિન કરો"
+  "bb93a7590f": {
+    "translation": "સ્વીકારો અને જૂથમાં જોડાઓ"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr ફાઇલ અપલોડ કરી રહ્યું છે…} other {{total} .tldr ફાઇલોમાંથી {uploaded} અપલોડ કરી રહ્યું છે...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} દ્વારા શેર કરેલ"
   },
-  "bcb62136a3": {
-    "translation": ".tldr ફાઇલો અપલોડ કરો"
-  },
   "c2276c9127": {
     "translation": "શેર કરવા વિશે વધુ જાણો."
   },
+  "c28aed8348": {
+    "translation": "tldraw ને સુધારવામાં અમારી સહાય કરવા માટે <cookies>analytics</cookies> ને મંજૂરી આપો."
+  },
   "c303bd1095": {
     "translation": "ફાઇલ પ્રકાશિત કરવામાં અસમર્થ."
   },
   "c4b39a1cc3": {
     "translation": "આવશ્યક કૂકીઝ"
   },
+  "c6155aaecc": {
+    "translation": "જૂથનું નામ"
+  },
   "c655b27b1e": {
     "translation": "i18n: લાંબી સ્ટ્રિંગ"
   },
   "c6a00f137b": {
     "translation": "આમંત્રણ આપો"
   },
+  "c74ea6dbff": {
+    "translation": "ઓછું બતાવો"
+  },
   "c87aacf567": {
     "translation": "સાઇન આઉટ કરો"
   },
+  "c9cc8cce24": {
+    "translation": "સાચવો"
+  },
   "cceaefbc20": {
     "translation": "આ ફાઇલ શેર કરો"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "સાઇડબારને ટૉગલ કરો"
   },
+  "d638a3344b": {
+    "translation": "શરૂ કરતા પહેલા, કૃપા કરીને અમારી <tos>ઉપયોગની શરતો</tos> અને <privacy>ગોપનીયતા નીતિ</privacy> સ્વીકારો."
+  },
   "d721757161": {
     "translation": "થીમ"
   },
   "d876a9fe1a": {
     "translation": "ફરી પ્રયાસ કરો"
   },
+  "d88ad2dc74": {
+    "translation": "સ્વીકારો અને ચાલુ રાખો"
+  },
   "d9100f3e10": {
     "translation": "સામગ્રી જોવા માટે અહીં જાઓ"
   },
+  "d9e35d0f55": {
+    "translation": "તમે જૂથોની મહત્તમ સંખ્યા પર પહોંચી ગયા છો. નવા જૂથો બનાવતા પહેલા તમારે જૂના જૂથો કાઢી નાખવાની જરૂર છે."
+  },
   "dbbebf3c03": {
     "translation": "ફક્ત આમંત્રણ આપો"
   },
+  "dcdaa754fe": {
+    "translation": "અમાન્ય tldraw ફાઇલ URL"
+  },
   "dfdb78a4e4": {
     "translation": "એપ્લિકેશન ડીબગ ફ્લેગ્સ"
   },
+  "e0c88179b3": {
+    "translation": "સભ્યોને આમંત્રિત કરો"
+  },
+  "e2198d6228": {
+    "translation": "આમંત્રણ લિંક કૉપિ કરો"
+  },
   "e2ae80a510": {
     "translation": "કાનૂની સારાંશ"
   },
+  "e3afed0047": {
+    "translation": "એડમિન"
+  },
   "e404559826": {
     "translation": "સેવાની શરતો"
   },
-  "e78e14c5f1": {
-    "translation": "પિન"
+  "e81c4e4f2b": {
+    "translation": "અથવા"
+  },
+  "ea0626ac5a": {
+    "translation": "જોખમ ક્ષેત્ર"
   },
   "ea4788705e": {
     "translation": "રદ કરો"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "વધુ જાણવા માટે અમારી <a>કૂકી નીતિ</a> વાંચો."
   },
+  "ef53538ae4": {
+    "translation": "સભ્યો"
+  },
   "ef7de3f485": {
     "translation": "પસંદ કરેલ"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "સેટિંગ્સ"
   },
+  "f714e36843": {
+    "translation": "શું તમે ખરેખર આ જૂથ છોડવા માંગો છો?"
+  },
+  "fa2ead697d": {
+    "translation": "ગોપનીયતા નીતિ"
+  },
   "fb15c53f22": {
     "translation": "દર્શક"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "લિંક કોપી કરી"
   },
+  "ff7a814974": {
+    "translation": "ફાઇલ લિંક ઉમેરો…"
+  },
   "ffcd73e997": {
     "translation": "ફાઇલ આયાત કરો..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/he.json b/apps/dotcom/client/public/tla/locales/he.json
index 8944cdbcaf94..651fec9ba827 100644
--- a/apps/dotcom/client/public/tla/locales/he.json
+++ b/apps/dotcom/client/public/tla/locales/he.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "חֶשְׁבּוֹן"
   },
+  "08d2d725a9": {
+    "translation": "צור חשבון חינמי כדי לשמור את עבודתך, לשתף פעולה בזמן אמת ועוד."
+  },
   "0b27918290": {
     "translation": "קובץ"
   },
   "0b9a4cde72": {
     "translation": "תפריט קבצים"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw הוא לוח לבן וירטואלי חינמי ומיידי."
+  },
   "0d1f2bb523": {
     "translation": "שלח משוב"
   },
   "110a4b01be": {
     "translation": "פרסום"
   },
+  "129b9e34ea": {
+    "translation": "עזוב את הקבוצה"
+  },
+  "12a6766ba1": {
+    "translation": "ביטול הצמדת קובץ"
+  },
   "12c8a9838c": {
     "translation": "נסה את ערכת פיתוח התוכנה tldraw"
   },
   "13ddd375ad": {
     "translation": "ייצא בשם"
   },
+  "146ffe2fd9": {
+    "translation": "הצג עוד"
+  },
+  "14d65465b7": {
+    "translation": "מחיקת קבוצה"
+  },
   "181b90f889": {
     "translation": "יצירת קובץ"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "החדר הזה מתקרב למגבלת הגודל שלו. שקול להסיר חלק מהתוכן או להתחיל קובץ חדש."
   },
+  "2445e5e347": {
+    "translation": "צור קבוצה"
+  },
   "250ddea65c": {
     "translation": "אודות tldraw"
   },
   "299cb00a7a": {
     "translation": "ההעלאה נכשלה"
   },
+  "2c3ef76333": {
+    "translation": "הקבצים שלי"
+  },
   "2deec2cb74": {
     "translation": "חדר זה הגיע למגבלת הגודל שלו וייתכן שלא יישמרו עוד שינויים. יש להסיר חלק מהתוכן או להתחיל קובץ חדש."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: הדגש חסר"
   },
+  "32210b37e4": {
+    "translation": "הוסף קישור"
+  },
   "335defdafe": {
     "translation": "אנא נסו לרענן את הדף."
   },
   "344a7f427f": {
     "translation": "עוֹרֵך"
   },
+  "3bc7d6ea2f": {
+    "translation": "המשך עם הדוא\"ל"
+  },
   "3bd1b98dbd": {
     "translation": "לא ניתן לפרסם את השינויים."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "נא לטעון מחדש"
+  "47f493a590": {
+    "translation": "קובץ הצמדה"
   },
-  "764671e008": {
-    "translation": "צ'אט איתנו בדיסקורד"
+  "49049467ff": {
+    "translation": "הדבק את כתובת ה-URL של קובץ tldraw..."
   },
   "4908687e50": {
     "translation": "רוצה בוודאות לשכוח את הקובץ הזה?"
   },
+  "49ee308734": {
+    "translation": "שֵׁם"
+  },
   "4d0d3ddec9": {
     "translation": "אתר זה משתמש בקובצי Cookie כדי שהאפליקציה תפעל ולאסוף נתונים אנליטיים."
   },
   "4d1c8263ba": {
     "translation": "לטעון מחדש"
   },
+  "4da5988a2e": {
+    "translation": "מחיקת קבוצה…"
+  },
+  "4e6fbf032b": {
+    "translation": "האם אתה בטוח שברצונך למחוק קבוצה זו? פעולה זו אינה ניתנת לביטול."
+  },
   "50db1b7e1e": {
     "translation": "לא ניתן לבטל את פרסום הקובץ."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "מדיניות הפרטיות"
   },
+  "5a86b22fa0": {
+    "translation": "גררו קבצים לכאן, <create>צרו קובץ</create>, או <invite>העתיקו את קישור ההזמנה</invite> כדי להתחיל."
+  },
   "5a95a425f7": {
     "translation": "שיתוף"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "זוהה דפדפן ישן. אנא עדכן את הדפדפן שלך כדי להשתמש באפליקציה זו."
   },
+  "5c6fe42bc2": {
+    "translation": "בטל קישור זה וצור קישור חדש."
+  },
   "5d26ae7550": {
     "translation": "לא הצלחנו להעלות חלק מהתוכן שיצרת לפני שנכנסת."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "ישן יותר"
   },
+  "639bae9ac6": {
+    "translation": "אַתָה"
+  },
   "6609dd239e": {
     "translation": "משהו השתבש"
   },
   "6637a98151": {
     "translation": "גרסה חדשה של tldraw זמינה. אנא טען מחדש את הדף כדי להמשיך."
   },
+  "68257bb646": {
+    "translation": "הוזמנת לקבוצה <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "הזן את כתובת הדוא\"ל שלך"
+  },
   "6a26f54883": {
     "translation": "עזרה"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "כדי לייבא את התוכן באופן ידני יש לבצע את השלבים הבאים:"
   },
+  "70222abcfc": {
+    "translation": "הגדרות קבוצה"
+  },
   "70a6facb9d": {
     "translation": "השבוע"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "נהל עוגיות"
   },
+  "7697920637": {
+    "translation": "נא לטעון מחדש"
+  },
+  "764671e008": {
+    "translation": "צ'אט איתנו בדיסקורד"
+  },
   "777f9e90cf": {
     "translation": "בקשה לא חוקית."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "לשכוח"
   },
+  "7cfe6c43dc": {
+    "translation": "עזוב את הקבוצה…"
+  },
   "7daeced9ff": {
     "translation": "פרסום שינויים"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "שנה את שם הקובץ"
   },
+  "8ad4303b83": {
+    "translation": "לא תודה"
+  },
   "8b1946f965": {
     "translation": "כדי להמשיך בעריכה, אנא העתיקו את החדר לקבצים שלכם."
   },
+  "8c2d3d730c": {
+    "translation": "בדוק את האימייל שלך עבור קוד אימות."
+  },
   "8eb2c00e96": {
     "translation": "משותף איתך"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "העתקה לקבצים שלי"
   },
+  "930390d222": {
+    "translation": "קישור ההזמנה הועתק"
+  },
+  "95aacd4d4a": {
+    "translation": "התחברות עם גוגל"
+  },
+  "95d2109dc8": {
+    "translation": "בנה עם ערכת פיתוח התוכנה tldraw"
+  },
   "96165d6df5": {
     "translation": "החודש הזה"
   },
+  "985a4b720f": {
+    "translation": "תנאי שימוש"
+  },
+  "98c997a27e": {
+    "translation": "הוסף קישור לקובץ"
+  },
   "9914a0ce04": {
     "translation": "תאורה"
   },
+  "9b33f5c63c": {
+    "translation": "לא קיבלת קוד? <resend>שלח שוב</resend>."
+  },
   "9bef626805": {
     "translation": "מחיקת קובץ"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "רקע"
   },
+  "aa916767cf": {
+    "translation": "היכנס כדי לקבל את ההזמנה"
+  },
   "ab0df9ba36": {
     "translation": "הגעת למגבלת הקבצים"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "משתמש אורח"
   },
+  "b357b524e7": {
+    "translation": "כתובת דוא\"ל"
+  },
+  "b3d2db69fe": {
+    "translation": "כתובת אתר של הקובץ"
+  },
   "b6d4223e60": {
     "translation": "כניסה"
   },
+  "b6f4a2ec63": {
+    "translation": "בַּעַל"
+  },
   "b758336699": {
     "translation": "העתקת קישור"
   },
   "ba0318cb81": {
     "translation": "היכנס כדי לשתף"
   },
-  "bb792693e2": {
-    "translation": "ביטול נעיצה"
+  "bb93a7590f": {
+    "translation": "אישור והצטרפות לקבוצה"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {מעלה קובץ tldr...} two {} many {} other {מעלה {uploaded} של {total} קבצי tldr...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "משותף על ידי {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "העלאת קבצי .tldr"
-  },
   "c2276c9127": {
     "translation": "למידע נוסף על שיתוף."
   },
+  "c28aed8348": {
+    "translation": "אפשרו ל-<cookies>analytics</cookies> לעזור לנו לשפר את tldraw."
+  },
   "c303bd1095": {
     "translation": "לא ניתן לפרסם את הקובץ."
   },
   "c4b39a1cc3": {
     "translation": "עוגיות חיוניות"
   },
+  "c6155aaecc": {
+    "translation": "שם הקבוצה"
+  },
   "c655b27b1e": {
     "translation": "i18n: מחרוזת ארוכה"
   },
   "c6a00f137b": {
     "translation": "הזמנה"
   },
+  "c74ea6dbff": {
+    "translation": "הצג פחות"
+  },
   "c87aacf567": {
     "translation": "יציאה"
   },
+  "c9cc8cce24": {
+    "translation": "לְהַצִיל"
+  },
   "cceaefbc20": {
     "translation": "לשתף את הקובץ הזה"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "החלפת סרגל הצד"
   },
+  "d638a3344b": {
+    "translation": "לפני שתתחיל, אנא קבל את <tos>תנאי השימוש</tos> ואת <privacy>מדיניות הפרטיות</privacy> שלנו."
+  },
   "d721757161": {
     "translation": "נושא"
   },
   "d876a9fe1a": {
     "translation": "לנסות שוב"
   },
+  "d88ad2dc74": {
+    "translation": "קבל והמשך"
+  },
   "d9100f3e10": {
     "translation": "כנסו לכאן כדי לראות את התוכן"
   },
+  "d9e35d0f55": {
+    "translation": "הגעת למספר הקבוצות המרבי. עליך למחוק קבוצות ישנות לפני יצירת חדשות."
+  },
   "dbbebf3c03": {
     "translation": "הזמנה בלבד"
   },
+  "dcdaa754fe": {
+    "translation": "כתובת URL לא חוקית של קובץ tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "דגלי ניפוי באגים באפליקציה"
   },
+  "e0c88179b3": {
+    "translation": "הזמנת חברים"
+  },
+  "e2198d6228": {
+    "translation": "העתקת קישור ההזמנה"
+  },
   "e2ae80a510": {
     "translation": "סיכום משפטי"
   },
+  "e3afed0047": {
+    "translation": "מנהל"
+  },
   "e404559826": {
     "translation": "תנאי שירות"
   },
-  "e78e14c5f1": {
-    "translation": "נעיצה"
+  "e81c4e4f2b": {
+    "translation": "אוֹ"
+  },
+  "ea0626ac5a": {
+    "translation": "אזור סכנה"
   },
   "ea4788705e": {
     "translation": "ביטול"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "קרא את <a>מדיניות העוגיות</a> שלנו למידע נוסף."
   },
+  "ef53538ae4": {
+    "translation": "חברים"
+  },
   "ef7de3f485": {
     "translation": "נִבחָר"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "הגדרות"
   },
+  "f714e36843": {
+    "translation": "האם אתה בטוח שאתה רוצה לעזוב את הקבוצה הזו?"
+  },
+  "fa2ead697d": {
+    "translation": "מדיניות פרטיות"
+  },
   "fb15c53f22": {
     "translation": "צופה"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "הקישור הועתק"
   },
+  "ff7a814974": {
+    "translation": "הוסף קישור לקובץ…"
+  },
   "ffcd73e997": {
     "translation": "ייבוא ​​קובץ…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/hi-in.json b/apps/dotcom/client/public/tla/locales/hi-in.json
index 10df3ad7b61f..da5a625339ec 100644
--- a/apps/dotcom/client/public/tla/locales/hi-in.json
+++ b/apps/dotcom/client/public/tla/locales/hi-in.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "खाता"
   },
+  "08d2d725a9": {
+    "translation": "अपना कार्य सहेजने, वास्तविक समय में सहयोग करने, आदि के लिए एक निःशुल्क खाता बनाएं।"
+  },
   "0b27918290": {
     "translation": "फ़ाइल"
   },
   "0b9a4cde72": {
     "translation": "फ़ाइल मेनू"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw एक निःशुल्क और त्वरित वर्चुअल व्हाइटबोर्ड है।"
+  },
   "0d1f2bb523": {
     "translation": "प्रतिक्रिया भेजें"
   },
   "110a4b01be": {
     "translation": "पब्लिश करें"
   },
+  "129b9e34ea": {
+    "translation": "समूह छोड़ दें"
+  },
+  "12a6766ba1": {
+    "translation": "फ़ाइल अनपिन करें"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK आज़माएँ"
   },
   "13ddd375ad": {
     "translation": "के रूप में एक्सपोर्ट करें"
   },
+  "146ffe2fd9": {
+    "translation": "और दिखाएँ"
+  },
+  "14d65465b7": {
+    "translation": "समूह हटाएं"
+  },
   "181b90f889": {
     "translation": "फ़ाइल बनाएँ"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "यह कमरा अपनी आकार सीमा के करीब पहुँच रहा है। कुछ सामग्री हटाने या नई फ़ाइल शुरू करने पर विचार करें।"
   },
+  "2445e5e347": {
+    "translation": "समूह बनाना"
+  },
   "250ddea65c": {
     "translation": "tldraw के बारे में"
   },
   "299cb00a7a": {
     "translation": "अपलोड करना विफल रहा"
   },
+  "2c3ef76333": {
+    "translation": "मेरी फ़ाइलें"
+  },
   "2deec2cb74": {
     "translation": "यह कमरा अपनी आकार सीमा तक पहुँच गया है और हो सकता है कि इसमें किए गए बदलाव अब सेव न हों। कुछ सामग्री हटाएँ या नई फ़ाइल शुरू करें।"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: हाइलाइट मिसींग है"
   },
+  "32210b37e4": {
+    "translation": "लिंक जोड़ें"
+  },
   "335defdafe": {
     "translation": "कृपया पेज को रिफ्रेश करने की कोशिश करें।"
   },
   "344a7f427f": {
     "translation": "एडिटर"
   },
+  "3bc7d6ea2f": {
+    "translation": "ईमेल के साथ जारी रखें"
+  },
   "3bd1b98dbd": {
     "translation": "बदलावों को पब्लिश करने में असमर्थ।"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "कृपया पुनः लोड करें"
+  "47f493a590": {
+    "translation": "फ़ाइल पिन करें"
   },
-  "764671e008": {
-    "translation": "डिस्कॉर्ड पर हमसे चैट करें"
+  "49049467ff": {
+    "translation": "tldraw फ़ाइल URL चिपकाएँ..."
   },
   "4908687e50": {
     "translation": "क्या आप वाकई इस फाइल को भूलना चाहते है?"
   },
+  "49ee308734": {
+    "translation": "नाम"
+  },
   "4d0d3ddec9": {
     "translation": "यह साइट ऐप को चलाने और विश्लेषण एकत्र करने के लिए कुकीज़ का उपयोग करती है।"
   },
   "4d1c8263ba": {
     "translation": "दोबारा लोड करें"
   },
+  "4da5988a2e": {
+    "translation": "समूह हटाएँ..."
+  },
+  "4e6fbf032b": {
+    "translation": "क्या आप वाकई इस समूह को हटाना चाहते हैं? यह कार्रवाई पूर्ववत नहीं की जा सकती।"
+  },
   "50db1b7e1e": {
     "translation": "फाइल अनपब्लिश करने में असमर्थ।"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "गोपनीयता नीति"
   },
+  "5a86b22fa0": {
+    "translation": "आरंभ करने के लिए फ़ाइलों को यहां खींचें, <create>फ़ाइल बनाएं</create>, या <invite>आमंत्रण लिंक कॉपी करें</invite>."
+  },
   "5a95a425f7": {
     "translation": "शेयर करें"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "पुराना ब्राउज़र पाया गया। कृपया इस ऐप का उपयोग करने के लिए अपना ब्राउज़र अपडेट करें।"
   },
+  "5c6fe42bc2": {
+    "translation": "इस लिंक को निरस्त करें और नया लिंक बनाएं."
+  },
   "5d26ae7550": {
     "translation": "हम कुछ कंटेंट अपलोड करने में विफल रहे जो आपने साइन इन करने से पहले बनाई थी।"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "पुराना"
   },
+  "639bae9ac6": {
+    "translation": "आप"
+  },
   "6609dd239e": {
     "translation": "कुछ गलत हुआ"
   },
   "6637a98151": {
     "translation": "tldraw का नया संस्करण उपलब्ध है। कृपया जारी रखने के लिए पृष्ठ को पुनः लोड करें।"
   },
+  "68257bb646": {
+    "translation": "आपको समूह <br></br><groupName></groupName> में आमंत्रित किया गया है"
+  },
+  "6832ac5936": {
+    "translation": "अपना ईमेल पता दर्ज करें"
+  },
   "6a26f54883": {
     "translation": "सहायता"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "कंटेंट को मैन्युअल रूप से इम्पोर्ट करने के लिए इन स्टेप्स को फॉलो करें :"
   },
+  "70222abcfc": {
+    "translation": "समूह सेटिंग्स"
+  },
   "70a6facb9d": {
     "translation": "इस हफ्ते"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "कुकीज़ प्रबंधित करें"
   },
+  "7697920637": {
+    "translation": "कृपया पुनः लोड करें"
+  },
+  "764671e008": {
+    "translation": "डिस्कॉर्ड पर हमसे चैट करें"
+  },
   "777f9e90cf": {
     "translation": "अमान्य रिक्वेस्ट।"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "भूल जाएँ"
   },
+  "7cfe6c43dc": {
+    "translation": "समूह छोड़ दें…"
+  },
   "7daeced9ff": {
     "translation": "बदलावों को पब्लिश करें"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "फ़ाइल का नाम बदलें"
   },
+  "8ad4303b83": {
+    "translation": "जी नहीं, धन्यवाद"
+  },
   "8b1946f965": {
     "translation": "संपादन जारी रखने के लिए कृपया कमरे को अपनी फ़ाइलों में कॉपी करें।"
   },
+  "8c2d3d730c": {
+    "translation": "सत्यापन कोड के लिए अपना ईमेल जांचें."
+  },
   "8eb2c00e96": {
     "translation": "आपके साथ शेयर किया गया"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "मेरी फाइलों में कॉपी करें"
   },
+  "930390d222": {
+    "translation": "आमंत्रण लिंक कॉपी किया गया"
+  },
+  "95aacd4d4a": {
+    "translation": "Google के साथ साइन इन करें"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK के साथ बनाएँ"
+  },
   "96165d6df5": {
     "translation": "इस महीने"
   },
+  "985a4b720f": {
+    "translation": "उपयोग की शर्तें"
+  },
+  "98c997a27e": {
+    "translation": "फ़ाइल लिंक जोड़ें"
+  },
   "9914a0ce04": {
     "translation": "लाइट"
   },
+  "9b33f5c63c": {
+    "translation": "कोड प्राप्त नहीं हुआ? <resend>पुनः भेजें</resend>."
+  },
   "9bef626805": {
     "translation": "फाइल डिलीट करें"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "बैकग्राउंड"
   },
+  "aa916767cf": {
+    "translation": "आमंत्रण स्वीकार करने के लिए साइन इन करें"
+  },
   "ab0df9ba36": {
     "translation": "फ़ाइल सीमा पूरी हो गई"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "अतिथि उपयोगकर्ता"
   },
+  "b357b524e7": {
+    "translation": "मेल पता"
+  },
+  "b3d2db69fe": {
+    "translation": "फ़ाइल URL"
+  },
   "b6d4223e60": {
     "translation": "साइन इन करें"
   },
+  "b6f4a2ec63": {
+    "translation": "मालिक"
+  },
   "b758336699": {
     "translation": "लिंक कॉपी करें"
   },
   "ba0318cb81": {
     "translation": "साझा करने के लिए साइन इन करें"
   },
-  "bb792693e2": {
-    "translation": "अनपिन करें"
+  "bb93a7590f": {
+    "translation": "स्वीकार करें और समूह में शामिल हों"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr फ़ाइल अपलोड हो रही है…} other {{uploaded} में से {total} .tldr फ़ाइलें अपलोड हो रही हैं…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} के द्वारा शेयर किया गया"
   },
-  "bcb62136a3": {
-    "translation": ".tldr फाइलें अपलोड करें"
-  },
   "c2276c9127": {
     "translation": "शेयर करने के बारे में ज्यादा जानें"
   },
+  "c28aed8348": {
+    "translation": "<cookies>एनालिटिक्स</cookies> को अनुमति दें ताकि हम tldraw को बेहतर बना सकें."
+  },
   "c303bd1095": {
     "translation": "फाइल पब्लिश करने में असमर्थ।"
   },
   "c4b39a1cc3": {
     "translation": "आवश्यक कुकीज़"
   },
+  "c6155aaecc": {
+    "translation": "समूह नाम"
+  },
   "c655b27b1e": {
     "translation": "i18n: लंबी स्ट्रिंग"
   },
   "c6a00f137b": {
     "translation": "इन्वाइट करें"
   },
+  "c74ea6dbff": {
+    "translation": "कम दिखाएं"
+  },
   "c87aacf567": {
     "translation": "साइन आउट करें"
   },
+  "c9cc8cce24": {
+    "translation": "बचाना"
+  },
   "cceaefbc20": {
     "translation": "इस फाइल को शेयर करें"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "साइडबार टॉगल करें"
   },
+  "d638a3344b": {
+    "translation": "शुरू करने से पहले, कृपया हमारी <tos>उपयोग की शर्तें</tos> और <privacy>गोपनीयता नीति</privacy> स्वीकार करें।"
+  },
   "d721757161": {
     "translation": "थीम"
   },
   "d876a9fe1a": {
     "translation": "दोबारा कोशिश करें"
   },
+  "d88ad2dc74": {
+    "translation": "स्वीकार करें और जारी रखें"
+  },
   "d9100f3e10": {
     "translation": "कंटेंट को देखने के लिए यहाँ जाएँ"
   },
+  "d9e35d0f55": {
+    "translation": "आप समूहों की अधिकतम संख्या तक पहुँच गए हैं। नए समूह बनाने से पहले आपको पुराने समूह हटाने होंगे।"
+  },
   "dbbebf3c03": {
     "translation": "सिर्फ इन्वाइट करें"
   },
+  "dcdaa754fe": {
+    "translation": "अमान्य tldraw फ़ाइल URL"
+  },
   "dfdb78a4e4": {
     "translation": "ऐप डिबग फ्लैग्स"
   },
+  "e0c88179b3": {
+    "translation": "सदस्यों को आमंत्रित करो"
+  },
+  "e2198d6228": {
+    "translation": "आमंत्रण लिंक कॉपी करें"
+  },
   "e2ae80a510": {
     "translation": "कानूनी सारांश"
   },
+  "e3afed0047": {
+    "translation": "व्यवस्थापक"
+  },
   "e404559826": {
     "translation": "सेवा की शर्तें"
   },
-  "e78e14c5f1": {
-    "translation": "पिन करें"
+  "e81c4e4f2b": {
+    "translation": "या"
+  },
+  "ea0626ac5a": {
+    "translation": "खतरा क्षेत्र"
   },
   "ea4788705e": {
     "translation": "कैंसिल करें"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "अधिक जानने के लिए हमारी <a>कुकी नीति</a> पढ़ें."
   },
+  "ef53538ae4": {
+    "translation": "सदस्यों"
+  },
   "ef7de3f485": {
     "translation": "चयनित"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "सेटिंग्स"
   },
+  "f714e36843": {
+    "translation": "क्या आप वाकई इस समूह को छोड़ना चाहते हैं?"
+  },
+  "fa2ead697d": {
+    "translation": "गोपनीयता नीति"
+  },
   "fb15c53f22": {
     "translation": "व्यूअर"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "लिंक को कॉपी किया गया"
   },
+  "ff7a814974": {
+    "translation": "फ़ाइल लिंक जोड़ें..."
+  },
   "ffcd73e997": {
     "translation": "फ़ाइल आयात करें…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/hr.json b/apps/dotcom/client/public/tla/locales/hr.json
index 1a67fb8deadf..d24c1459f2bc 100644
--- a/apps/dotcom/client/public/tla/locales/hr.json
+++ b/apps/dotcom/client/public/tla/locales/hr.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Račun"
   },
+  "08d2d725a9": {
+    "translation": "Izradite besplatan račun za spremanje svog rada, suradnju u stvarnom vremenu i još mnogo toga."
+  },
   "0b27918290": {
     "translation": "File"
   },
   "0b9a4cde72": {
     "translation": "Izbornik datoteka"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw je besplatna i trenutna virtualna bijela ploča."
+  },
   "0d1f2bb523": {
     "translation": "Pošalji povratne informacije"
   },
   "110a4b01be": {
     "translation": "Objaviti"
   },
+  "129b9e34ea": {
+    "translation": "Napusti grupu"
+  },
+  "12a6766ba1": {
+    "translation": "Otkvači datoteku"
+  },
   "12c8a9838c": {
     "translation": "Isprobajte tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Izvezi kao"
   },
+  "146ffe2fd9": {
+    "translation": "Prikaži više"
+  },
+  "14d65465b7": {
+    "translation": "Izbriši grupu"
+  },
   "181b90f889": {
     "translation": "Stvori datoteku"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Ova soba se približava ograničenju veličine. Razmislite o uklanjanju dijela sadržaja ili pokretanju nove datoteke."
   },
+  "2445e5e347": {
+    "translation": "Stvori grupu"
+  },
   "250ddea65c": {
     "translation": "O tldrawu"
   },
   "299cb00a7a": {
     "translation": "Prijenos nije uspio"
   },
+  "2c3ef76333": {
+    "translation": "Moje datoteke"
+  },
   "2deec2cb74": {
     "translation": "Ova je soba dosegla ograničenje veličine i promjene se možda više neće moći spremiti. Uklonite dio sadržaja ili započnite novu datoteku."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Oznaka nedostaje"
   },
+  "32210b37e4": {
+    "translation": "Dodaj vezu"
+  },
   "335defdafe": {
     "translation": "Pokušajte osvježiti stranicu."
   },
   "344a7f427f": {
     "translation": "Urednik"
   },
+  "3bc7d6ea2f": {
+    "translation": "Nastavite s e-poštom"
+  },
   "3bd1b98dbd": {
     "translation": "Nije moguće objaviti promjene."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Molimo ponovno učitajte"
+  "47f493a590": {
+    "translation": "Prikvači datoteku"
   },
-  "764671e008": {
-    "translation": "Razgovarajte s nama na Discordu"
+  "49049467ff": {
+    "translation": "Zalijepi URL tldraw datoteke..."
   },
   "4908687e50": {
     "translation": "Jeste li sigurni da želite zaboraviti ovu datoteku?"
   },
+  "49ee308734": {
+    "translation": "Ime"
+  },
   "4d0d3ddec9": {
     "translation": "Ova stranica koristi kolačiće kako bi aplikacija funkcionirala i prikupljala analitičke podatke."
   },
   "4d1c8263ba": {
     "translation": "Ponovno učitaj"
   },
+  "4da5988a2e": {
+    "translation": "Izbriši grupu…"
+  },
+  "4e6fbf032b": {
+    "translation": "Jeste li sigurni da želite izbrisati ovu grupu? Ova se radnja ne može poništiti."
+  },
   "50db1b7e1e": {
     "translation": "Nije moguće poništiti objavu datoteke."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Politika privatnosti"
   },
+  "5a86b22fa0": {
+    "translation": "Povucite datoteke ovdje, <create>izradite datoteku</create> ili <invite>kopirajte poveznicu za poziv</invite> da biste započeli."
+  },
   "5a95a425f7": {
     "translation": "Udio"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Otkriven je stari preglednik. Ažurirajte preglednik da biste mogli koristiti ovu aplikaciju."
   },
+  "5c6fe42bc2": {
+    "translation": "Poništi ovu vezu i stvori novu."
+  },
   "5d26ae7550": {
     "translation": "Nismo uspjeli prenijeti dio sadržaja koji ste izradili prije nego što ste se prijavili."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Starije"
   },
+  "639bae9ac6": {
+    "translation": "vas"
+  },
   "6609dd239e": {
     "translation": "Nešto nije u redu"
   },
   "6637a98151": {
     "translation": "Dostupna je nova verzija tldraw-a. Ponovno učitajte stranicu za nastavak."
   },
+  "68257bb646": {
+    "translation": "Pozvani ste u grupu <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Unesite svoju adresu e-pošte"
+  },
   "6a26f54883": {
     "translation": "Pomoć"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Slijedite ove korake za ručni uvoz sadržaja:"
   },
+  "70222abcfc": {
+    "translation": "Postavke grupe"
+  },
   "70a6facb9d": {
     "translation": "Ovaj tjedan"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Upravljanje kolačićima"
   },
+  "7697920637": {
+    "translation": "Molimo ponovno učitajte"
+  },
+  "764671e008": {
+    "translation": "Razgovarajte s nama na Discordu"
+  },
   "777f9e90cf": {
     "translation": "Neispravan zahtjev."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Zaboraviti"
   },
+  "7cfe6c43dc": {
+    "translation": "Napusti grupu…"
+  },
   "7daeced9ff": {
     "translation": "Objavi promjene"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Preimenuj datoteku"
   },
+  "8ad4303b83": {
+    "translation": "Ne hvala"
+  },
   "8b1946f965": {
     "translation": "Za nastavak uređivanja kopirajte sobu u svoje datoteke."
   },
+  "8c2d3d730c": {
+    "translation": "Provjerite svoju e-poštu za kod za potvrdu."
+  },
   "8eb2c00e96": {
     "translation": "Podijeljeno s vama"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopiraj u moje datoteke"
   },
+  "930390d222": {
+    "translation": "Kopirana je poveznica za poziv"
+  },
+  "95aacd4d4a": {
+    "translation": "Prijava putem Googlea"
+  },
+  "95d2109dc8": {
+    "translation": "Izgradite s tldraw SDK-om"
+  },
   "96165d6df5": {
     "translation": "Ovaj mjesec"
   },
+  "985a4b720f": {
+    "translation": "Uvjeti korištenja"
+  },
+  "98c997a27e": {
+    "translation": "Dodaj vezu do datoteke"
+  },
   "9914a0ce04": {
     "translation": "Svjetlo"
   },
+  "9b33f5c63c": {
+    "translation": "Niste primili kôd? <resend>Ponovno pošalji</resend>."
+  },
   "9bef626805": {
     "translation": "Izbriši datoteku"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Pozadina"
   },
+  "aa916767cf": {
+    "translation": "Prijavite se da biste prihvatili pozivnicu"
+  },
   "ab0df9ba36": {
     "translation": "Dosegnuto je ograničenje datoteke"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gostujući korisnik"
   },
+  "b357b524e7": {
+    "translation": "E-mail adresa"
+  },
+  "b3d2db69fe": {
+    "translation": "URL datoteke"
+  },
   "b6d4223e60": {
     "translation": "Prijavite se"
   },
+  "b6f4a2ec63": {
+    "translation": "Vlasnik"
+  },
   "b758336699": {
     "translation": "Kopiraj vezu"
   },
   "ba0318cb81": {
     "translation": "Prijavite se za dijeljenje"
   },
-  "bb792693e2": {
-    "translation": "Otkvači"
+  "bb93a7590f": {
+    "translation": "Prihvati i pridruži se grupi"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Prijenos .tldr datoteke…} few {} other {Prijenos {uploaded} od {total} .tldr datoteka…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Dijeli {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Učitajte .tldr datoteke"
-  },
   "c2276c9127": {
     "translation": "Saznajte više o dijeljenju."
   },
+  "c28aed8348": {
+    "translation": "Dopustite <cookies>analytics</cookies> kako biste nam pomogli poboljšati tldraw."
+  },
   "c303bd1095": {
     "translation": "Nije moguće objaviti datoteku."
   },
   "c4b39a1cc3": {
     "translation": "Osnovni kolačići"
   },
+  "c6155aaecc": {
+    "translation": "Naziv grupe"
+  },
   "c655b27b1e": {
     "translation": "i18n: Dugi niz"
   },
   "c6a00f137b": {
     "translation": "Pozvati"
   },
+  "c74ea6dbff": {
+    "translation": "Prikaži manje"
+  },
   "c87aacf567": {
     "translation": "Odjavi se"
   },
+  "c9cc8cce24": {
+    "translation": "Uštedjeti"
+  },
   "cceaefbc20": {
     "translation": "Podijelite ovu datoteku"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Uključi/isključi bočnu traku"
   },
+  "d638a3344b": {
+    "translation": "Prije nego što započnete, molimo vas da prihvatite naše <tos>uvjete korištenja</tos> i <privacy>pravila privatnosti</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Pokušajte ponovno"
   },
+  "d88ad2dc74": {
+    "translation": "Prihvati i nastavi"
+  },
   "d9100f3e10": {
     "translation": "Idite ovdje da vidite sadržaj"
   },
+  "d9e35d0f55": {
+    "translation": "Dosegli ste maksimalan broj grupa. Morate izbrisati stare grupe prije nego što stvorite nove."
+  },
   "dbbebf3c03": {
     "translation": "Samo na poziv"
   },
+  "dcdaa754fe": {
+    "translation": "Nevažeći URL datoteke tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Oznake za otklanjanje pogrešaka aplikacije"
   },
+  "e0c88179b3": {
+    "translation": "Pozovi članove"
+  },
+  "e2198d6228": {
+    "translation": "Kopiraj poveznicu za pozivnicu"
+  },
   "e2ae80a510": {
     "translation": "Pravni sažetak"
   },
+  "e3afed0047": {
+    "translation": "Administrator"
+  },
   "e404559826": {
     "translation": "Uvjeti usluge"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "ili"
+  },
+  "ea0626ac5a": {
+    "translation": "Opasna zona"
   },
   "ea4788705e": {
     "translation": "Otkazati"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Pročitajte našu <a>pravila o kolačićima</a> kako biste saznali više."
   },
+  "ef53538ae4": {
+    "translation": "Članovi"
+  },
   "ef7de3f485": {
     "translation": "odabrano"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Postavke"
   },
+  "f714e36843": {
+    "translation": "Jeste li sigurni da želite napustiti ovu grupu?"
+  },
+  "fa2ead697d": {
+    "translation": "Pravila o privatnosti"
+  },
   "fb15c53f22": {
     "translation": "Gledatelj"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Kopirana veza"
   },
+  "ff7a814974": {
+    "translation": "Dodaj poveznicu na datoteku…"
+  },
   "ffcd73e997": {
     "translation": "Uvoz datoteke…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/hu.json b/apps/dotcom/client/public/tla/locales/hu.json
index 887ebea9c4b4..8d193d53392b 100644
--- a/apps/dotcom/client/public/tla/locales/hu.json
+++ b/apps/dotcom/client/public/tla/locales/hu.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Fiók"
   },
+  "08d2d725a9": {
+    "translation": "Hozz létre egy ingyenes fiókot a munkád mentéséhez, valós idejű együttműködéshez és sok máshoz."
+  },
   "0b27918290": {
     "translation": "Fájl"
   },
   "0b9a4cde72": {
     "translation": "Fájl menü"
   },
+  "0beb3ca97b": {
+    "translation": "A tldraw egy ingyenes és azonnal használható virtuális tábla."
+  },
   "0d1f2bb523": {
     "translation": "Visszajelzés küldése"
   },
   "110a4b01be": {
     "translation": "Közzététel"
   },
+  "129b9e34ea": {
+    "translation": "Kilépés a csoportból"
+  },
+  "12a6766ba1": {
+    "translation": "Fájl rögzítésének feloldása"
+  },
   "12c8a9838c": {
     "translation": "Próbáld ki a tldraw SDK-t"
   },
   "13ddd375ad": {
     "translation": "Exportálás másként"
   },
+  "146ffe2fd9": {
+    "translation": "Mutass többet"
+  },
+  "14d65465b7": {
+    "translation": "Csoport törlése"
+  },
   "181b90f889": {
     "translation": "Fájl létrehozása"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Ez a szoba közeledik a méretkorlátjához. Fontolja meg néhány tartalom eltávolítását vagy új fájl létrehozását."
   },
+  "2445e5e347": {
+    "translation": "Csoport létrehozása"
+  },
   "250ddea65c": {
     "translation": "A tldraw-ról"
   },
   "299cb00a7a": {
     "translation": "A feltöltés sikertelen"
   },
+  "2c3ef76333": {
+    "translation": "Saját fájlok"
+  },
   "2deec2cb74": {
     "translation": "Ez a szoba elérte a méretkorlátját, és előfordulhat, hogy a módosítások már nem menthetők. Távolítson el néhány tartalmat, vagy hozzon létre egy új fájlt."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Hiányzó kiemelés"
   },
+  "32210b37e4": {
+    "translation": "Link hozzáadása"
+  },
   "335defdafe": {
     "translation": "Kérjük, próbálja meg frissíteni az oldalt."
   },
   "344a7f427f": {
     "translation": "Szerkesztő"
   },
+  "3bc7d6ea2f": {
+    "translation": "Folytatás e-mailben"
+  },
   "3bd1b98dbd": {
     "translation": "Nem sikerült közzétenni a változtatásokat."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Kérjük, töltse újra"
+  "47f493a590": {
+    "translation": "Fájl rögzítése"
   },
-  "764671e008": {
-    "translation": "Csevegés velünk a Discordon"
+  "49049467ff": {
+    "translation": "Tldraw fájl URL-címének beillesztése..."
   },
   "4908687e50": {
     "translation": "Biztosan elfelejti ezt a fájlt?"
   },
+  "49ee308734": {
+    "translation": "Név"
+  },
   "4d0d3ddec9": {
     "translation": "Ez az oldal sütiket használ az alkalmazás működéséhez és elemzések gyűjtéséhez."
   },
   "4d1c8263ba": {
     "translation": "Újratöltés"
   },
+  "4da5988a2e": {
+    "translation": "Csoport törlése…"
+  },
+  "4e6fbf032b": {
+    "translation": "Biztosan törölni szeretné ezt a csoportot? Ez a művelet nem vonható vissza."
+  },
   "50db1b7e1e": {
     "translation": "Nem lehet visszavonni a fájl közzétételét."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Adatvédelmi szabályzat"
   },
+  "5a86b22fa0": {
+    "translation": "Húzd ide a fájlokat, <create>hozz létre egy fájlt</create>, vagy <invite>másold ki a meghívó linket</invite> a kezdéshez."
+  },
   "5a95a425f7": {
     "translation": "Részesedés"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Régi böngésző észlelve. Kérjük, frissítse böngészőjét az alkalmazás használatához."
   },
+  "5c6fe42bc2": {
+    "translation": "Vonja vissza ezt a linket, és hozzon létre egy újat."
+  },
   "5d26ae7550": {
     "translation": "Nem sikerült feltöltenünk a bejelentkezés előtt létrehozott tartalmak egy részét."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Régebbi"
   },
+  "639bae9ac6": {
+    "translation": "te"
+  },
   "6609dd239e": {
     "translation": "Valami elromlott"
   },
   "6637a98151": {
     "translation": "Elérhető a tldraw új verziója. A folytatáshoz töltse be újra az oldalt."
   },
+  "68257bb646": {
+    "translation": "Meghívtak a(z) <br></br><groupName></groupName> csoportba"
+  },
+  "6832ac5936": {
+    "translation": "Add meg az e-mail címed"
+  },
   "6a26f54883": {
     "translation": "Segítség"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Kövesse az alábbi lépéseket a tartalom kézi importálásához:"
   },
+  "70222abcfc": {
+    "translation": "Csoportbeállítások"
+  },
   "70a6facb9d": {
     "translation": "Ezen a héten"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Cookie-k kezelése"
   },
+  "7697920637": {
+    "translation": "Kérjük, töltse újra"
+  },
+  "764671e008": {
+    "translation": "Csevegés velünk a Discordon"
+  },
   "777f9e90cf": {
     "translation": "Érvénytelen kérés."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Felejtsd el"
   },
+  "7cfe6c43dc": {
+    "translation": "Kilépés a csoportból…"
+  },
   "7daeced9ff": {
     "translation": "Módosítások közzététele"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Fájl átnevezése"
   },
+  "8ad4303b83": {
+    "translation": "Nem, köszönöm"
+  },
   "8b1946f965": {
     "translation": "A szerkesztés folytatásához másold át a szobát a fájljaid közé."
   },
+  "8c2d3d730c": {
+    "translation": "Ellenőrizd az e-mailjeidet, hogy érkezett-e egy ellenőrző kód."
+  },
   "8eb2c00e96": {
     "translation": "Megosztva veled"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Másolás a fájljaim közé"
   },
+  "930390d222": {
+    "translation": "Meghívólink másolva"
+  },
+  "95aacd4d4a": {
+    "translation": "Bejelentkezés Google-fiókkal"
+  },
+  "95d2109dc8": {
+    "translation": "Fordítás a tldraw SDK-val"
+  },
   "96165d6df5": {
     "translation": "Ebben a hónapban"
   },
+  "985a4b720f": {
+    "translation": "Felhasználási feltételek"
+  },
+  "98c997a27e": {
+    "translation": "Fájllink hozzáadása"
+  },
   "9914a0ce04": {
     "translation": "Fény"
   },
+  "9b33f5c63c": {
+    "translation": "Nem kaptad meg a kódot? <resend>Újraküldés</resend>."
+  },
   "9bef626805": {
     "translation": "Fájl törlése"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Háttér"
   },
+  "aa916767cf": {
+    "translation": "Jelentkezzen be a meghívás elfogadásához"
+  },
   "ab0df9ba36": {
     "translation": "Elérte a fájlkorlátot"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Vendégfelhasználó"
   },
+  "b357b524e7": {
+    "translation": "E-mail cím"
+  },
+  "b3d2db69fe": {
+    "translation": "Fájl URL-címe"
+  },
   "b6d4223e60": {
     "translation": "Jelentkezzen be"
   },
+  "b6f4a2ec63": {
+    "translation": "Tulajdonos"
+  },
   "b758336699": {
     "translation": "Link másolása"
   },
   "ba0318cb81": {
     "translation": "Jelentkezzen be a megosztáshoz"
   },
-  "bb792693e2": {
-    "translation": "Kibont"
+  "bb93a7590f": {
+    "translation": "Elfogadás és csatlakozás a csoporthoz"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr fájl feltöltése…} other {{total} .tldr fájlból {uploaded} feltöltése…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Megosztva: {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Töltsön fel .tldr fájlokat"
-  },
   "c2276c9127": {
     "translation": "További információ a megosztásról."
   },
+  "c28aed8348": {
+    "translation": "Engedélyezd az <cookies>analytics</cookies> használatát a tldraw fejlesztéséhez."
+  },
   "c303bd1095": {
     "translation": "Nem lehet közzétenni a fájlt."
   },
   "c4b39a1cc3": {
     "translation": "Alapvető sütik"
   },
+  "c6155aaecc": {
+    "translation": "Csoport neve"
+  },
   "c655b27b1e": {
     "translation": "i18n: Hosszú karakterlánc"
   },
   "c6a00f137b": {
     "translation": "Meghív"
   },
+  "c74ea6dbff": {
+    "translation": "Kevesebb megjelenítése"
+  },
   "c87aacf567": {
     "translation": "Jelentkezzen ki"
   },
+  "c9cc8cce24": {
+    "translation": "Megtakarítás"
+  },
   "cceaefbc20": {
     "translation": "Ossza meg ezt a fájlt"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Oldalsáv váltása"
   },
+  "d638a3344b": {
+    "translation": "Mielőtt elkezdené, kérjük, fogadja el a <tos>felhasználási feltételeinket</tos> és az <privacy>adatvédelmi irányelveinket</privacy>."
+  },
   "d721757161": {
     "translation": "Téma"
   },
   "d876a9fe1a": {
     "translation": "Próbáld újra"
   },
+  "d88ad2dc74": {
+    "translation": "Elfogadom és folytatom"
+  },
   "d9100f3e10": {
     "translation": "Menjen ide a tartalom megtekintéséhez"
   },
+  "d9e35d0f55": {
+    "translation": "Elérte a csoportok maximális számát. Új csoportok létrehozása előtt törölnie kell a régieket."
+  },
   "dbbebf3c03": {
     "translation": "Csak meghívással"
   },
+  "dcdaa754fe": {
+    "translation": "Érvénytelen tldraw fájl URL"
+  },
   "dfdb78a4e4": {
     "translation": "Alkalmazás-hibakeresési jelzők"
   },
+  "e0c88179b3": {
+    "translation": "Tagok meghívása"
+  },
+  "e2198d6228": {
+    "translation": "Meghívólink másolása"
+  },
   "e2ae80a510": {
     "translation": "Jogi összefoglaló"
   },
+  "e3afed0047": {
+    "translation": "Adminisztrátor"
+  },
   "e404559826": {
     "translation": "Szolgáltatási feltételek"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "vagy"
+  },
+  "ea0626ac5a": {
+    "translation": "Veszélyes zóna"
   },
   "ea4788705e": {
     "translation": "Mégsem"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "További információért olvassa el <a>süti szabályzatunkat</a>."
   },
+  "ef53538ae4": {
+    "translation": "Tagok"
+  },
   "ef7de3f485": {
     "translation": "kiválasztott"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Beállítások"
   },
+  "f714e36843": {
+    "translation": "Biztosan kilépsz ebből a csoportból?"
+  },
+  "fa2ead697d": {
+    "translation": "Adatvédelmi irányelvek"
+  },
   "fb15c53f22": {
     "translation": "Néző"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Link másolva"
   },
+  "ff7a814974": {
+    "translation": "Fájllink hozzáadása…"
+  },
   "ffcd73e997": {
     "translation": "Fájl importálása…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/id.json b/apps/dotcom/client/public/tla/locales/id.json
index d3dd4f071f9a..2d614190b727 100644
--- a/apps/dotcom/client/public/tla/locales/id.json
+++ b/apps/dotcom/client/public/tla/locales/id.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Akun"
   },
+  "08d2d725a9": {
+    "translation": "Buat akun gratis untuk menyimpan pekerjaan Anda, berkolaborasi secara real-time, dan banyak lagi."
+  },
   "0b27918290": {
     "translation": "File"
   },
   "0b9a4cde72": {
     "translation": "Menu file"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw adalah papan tulis virtual yang gratis dan instan."
+  },
   "0d1f2bb523": {
     "translation": "Kirimkan masukan"
   },
   "110a4b01be": {
     "translation": "Terbitkan"
   },
+  "129b9e34ea": {
+    "translation": "Keluar dari grup"
+  },
+  "12a6766ba1": {
+    "translation": "Lepaskan sematan file"
+  },
   "12c8a9838c": {
     "translation": "Coba tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Ekspor sebagai"
   },
+  "146ffe2fd9": {
+    "translation": "Tampilkan lebih banyak"
+  },
+  "14d65465b7": {
+    "translation": "Hapus grup"
+  },
   "181b90f889": {
     "translation": "Buat file"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Ruangan ini hampir mencapai batas ukurannya. Pertimbangkan untuk menghapus beberapa konten atau memulai berkas baru."
   },
+  "2445e5e347": {
+    "translation": "Buat grup"
+  },
   "250ddea65c": {
     "translation": "Tentang tldraw"
   },
   "299cb00a7a": {
     "translation": "Pengunggahan gagal"
   },
+  "2c3ef76333": {
+    "translation": "File saya"
+  },
   "2deec2cb74": {
     "translation": "Ruangan ini telah mencapai batas ukuran dan perubahan mungkin tidak dapat disimpan lagi. Hapus beberapa konten atau buat berkas baru."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Sorotan Tidak Ada"
   },
+  "32210b37e4": {
+    "translation": "Tambahkan tautan"
+  },
   "335defdafe": {
     "translation": "Coba muat ulang halaman."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Lanjutkan dengan email"
+  },
   "3bd1b98dbd": {
     "translation": "Tidak dapat menerbitkan perubahan."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Silakan muat ulang"
+  "47f493a590": {
+    "translation": "Berkas pin"
   },
-  "764671e008": {
-    "translation": "Ngobrol dengan kami di Discord"
+  "49049467ff": {
+    "translation": "Tempel URL berkas tldraw..."
   },
   "4908687e50": {
     "translation": "Yakin ingin mengabaikan file ini?"
   },
+  "49ee308734": {
+    "translation": "Nama"
+  },
   "4d0d3ddec9": {
     "translation": "Situs ini menggunakan cookie untuk membuat aplikasi berfungsi dan mengumpulkan analitik."
   },
   "4d1c8263ba": {
     "translation": "Muat ulang"
   },
+  "4da5988a2e": {
+    "translation": "Hapus grup…"
+  },
+  "4e6fbf032b": {
+    "translation": "Yakin ingin menghapus grup ini? Tindakan ini tidak dapat dibatalkan."
+  },
   "50db1b7e1e": {
     "translation": "Tidak dapat membatalkan penerbitan file."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Kebijakan privasi"
   },
+  "5a86b22fa0": {
+    "translation": "Seret file ke sini, <create>buat file</create>,create atau <invite>salin tautan undangan</invite> untuk memulai."
+  },
   "5a95a425f7": {
     "translation": "Bagikan"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Browser lama terdeteksi. Harap perbarui browser Anda untuk menggunakan aplikasi ini."
   },
+  "5c6fe42bc2": {
+    "translation": "Cabut tautan ini dan buat yang baru."
+  },
   "5d26ae7550": {
     "translation": "Kami gagal mengunggah beberapa konten yang Anda buat sebelum masuk."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Lebih lama"
   },
+  "639bae9ac6": {
+    "translation": "Anda"
+  },
   "6609dd239e": {
     "translation": "Terjadi kesalahan"
   },
   "6637a98151": {
     "translation": "Versi baru tldraw telah tersedia. Silakan muat ulang halaman untuk melanjutkan."
   },
+  "68257bb646": {
+    "translation": "Anda telah diundang ke grup <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Masukkan alamat email Anda"
+  },
   "6a26f54883": {
     "translation": "Bantuan"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Ikuti langkah berikut untuk mengimpor konten secara manual:"
   },
+  "70222abcfc": {
+    "translation": "Pengaturan grup"
+  },
   "70a6facb9d": {
     "translation": "Minggu ini"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Kelola cookie"
   },
+  "7697920637": {
+    "translation": "Silakan muat ulang"
+  },
+  "764671e008": {
+    "translation": "Ngobrol dengan kami di Discord"
+  },
   "777f9e90cf": {
     "translation": "Permintaan tidak valid."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Abaikan"
   },
+  "7cfe6c43dc": {
+    "translation": "Keluar dari grup…"
+  },
   "7daeced9ff": {
     "translation": "Terbitkan perubahan"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Ganti nama berkas"
   },
+  "8ad4303b83": {
+    "translation": "Tidak, terima kasih"
+  },
   "8b1946f965": {
     "translation": "Untuk meneruskan pengeditan, salin ruangan ke berkas Anda."
   },
+  "8c2d3d730c": {
+    "translation": "Periksa email Anda untuk mendapatkan kode verifikasi."
+  },
   "8eb2c00e96": {
     "translation": "Dibagikan kepada Anda"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Salin ke file saya"
   },
+  "930390d222": {
+    "translation": "Salin tautan undangan"
+  },
+  "95aacd4d4a": {
+    "translation": "Masuk dengan Google"
+  },
+  "95d2109dc8": {
+    "translation": "Membangun dengan tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Bulan ini"
   },
+  "985a4b720f": {
+    "translation": "Ketentuan Penggunaan"
+  },
+  "98c997a27e": {
+    "translation": "Tambahkan tautan berkas"
+  },
   "9914a0ce04": {
     "translation": "Cahaya"
   },
+  "9b33f5c63c": {
+    "translation": "Tidak menerima kode? <resend>Kirim ulang</resend>."
+  },
   "9bef626805": {
     "translation": "Hapus file"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Latar belakang"
   },
+  "aa916767cf": {
+    "translation": "Masuk untuk menerima undangan"
+  },
   "ab0df9ba36": {
     "translation": "Batas berkas tercapai"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Pengguna tamu"
   },
+  "b357b524e7": {
+    "translation": "Alamat email"
+  },
+  "b3d2db69fe": {
+    "translation": "URL berkas"
+  },
   "b6d4223e60": {
     "translation": "Masuk"
   },
+  "b6f4a2ec63": {
+    "translation": "Pemilik"
+  },
   "b758336699": {
     "translation": "Salin tautan"
   },
   "ba0318cb81": {
     "translation": "Masuk untuk berbagi"
   },
-  "bb792693e2": {
-    "translation": "Lepaskan"
+  "bb93a7590f": {
+    "translation": "Terima dan bergabung dengan grup"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {Mengunggah {uploaded} dari {total} file .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Dibagikan oleh {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Unggah file .tldr"
-  },
   "c2276c9127": {
     "translation": "Pelajari lebih lanjut tentang berbagi."
   },
+  "c28aed8348": {
+    "translation": "Izinkan <cookies>analytics</cookies> membantu kami meningkatkan tldraw."
+  },
   "c303bd1095": {
     "translation": "Tidak dapat menerbitkan file."
   },
   "c4b39a1cc3": {
     "translation": "Cookie penting"
   },
+  "c6155aaecc": {
+    "translation": "Nama grup"
+  },
   "c655b27b1e": {
     "translation": "i18n: Deret Panjang"
   },
   "c6a00f137b": {
     "translation": "Undang"
   },
+  "c74ea6dbff": {
+    "translation": "Tampilkan lebih sedikit"
+  },
   "c87aacf567": {
     "translation": "Keluar"
   },
+  "c9cc8cce24": {
+    "translation": "Menyimpan"
+  },
   "cceaefbc20": {
     "translation": "Bagikan file ini"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Alihkan bilah samping"
   },
+  "d638a3344b": {
+    "translation": "Sebelum memulai, harap terima <tos>persyaratan penggunaan</tos> dan <privacy>kebijakan privasi</privacy> kami."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Coba Lagi"
   },
+  "d88ad2dc74": {
+    "translation": "Terima dan lanjutkan"
+  },
   "d9100f3e10": {
     "translation": "Klik di sini untuk melihat konten"
   },
+  "d9e35d0f55": {
+    "translation": "Anda telah mencapai jumlah grup maksimum. Anda perlu menghapus grup lama sebelum membuat grup baru."
+  },
   "dbbebf3c03": {
     "translation": "Hanya mengundang"
   },
+  "dcdaa754fe": {
+    "translation": "URL file tldraw tidak valid"
+  },
   "dfdb78a4e4": {
     "translation": "Bendera debug aplikasi"
   },
+  "e0c88179b3": {
+    "translation": "Undang anggota"
+  },
+  "e2198d6228": {
+    "translation": "Salin tautan undangan"
+  },
   "e2ae80a510": {
     "translation": "Ringkasan hukum"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Ketentuan Layanan"
   },
-  "e78e14c5f1": {
-    "translation": "Sematkan"
+  "e81c4e4f2b": {
+    "translation": "atau"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona bahaya"
   },
   "ea4788705e": {
     "translation": "Batal"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Baca <a>kebijakan cookie</a> kami untuk mempelajari lebih lanjut."
   },
+  "ef53538ae4": {
+    "translation": "Anggota"
+  },
   "ef7de3f485": {
     "translation": "terpilih"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Pengaturan"
   },
+  "f714e36843": {
+    "translation": "Apakah Anda yakin ingin meninggalkan grup ini?"
+  },
+  "fa2ead697d": {
+    "translation": "Kebijakan Privasi"
+  },
   "fb15c53f22": {
     "translation": "Audiens"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Tautan disalin"
   },
+  "ff7a814974": {
+    "translation": "Tambahkan tautan berkas…"
+  },
   "ffcd73e997": {
     "translation": "Impor berkas…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/it.json b/apps/dotcom/client/public/tla/locales/it.json
index 8a66bee6d2aa..07b67b422ce6 100644
--- a/apps/dotcom/client/public/tla/locales/it.json
+++ b/apps/dotcom/client/public/tla/locales/it.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Account"
   },
+  "08d2d725a9": {
+    "translation": "Crea un account gratuito per salvare il tuo lavoro, collaborare in tempo reale e altro ancora."
+  },
   "0b27918290": {
     "translation": "File"
   },
   "0b9a4cde72": {
     "translation": "Menu file"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw è una lavagna virtuale gratuita e istantanea."
+  },
   "0d1f2bb523": {
     "translation": "Invia feedback"
   },
   "110a4b01be": {
     "translation": "Pubblica"
   },
+  "129b9e34ea": {
+    "translation": "Lascia il gruppo"
+  },
+  "12a6766ba1": {
+    "translation": "Sblocca il file"
+  },
   "12c8a9838c": {
     "translation": "Prova l'SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Esporta come"
   },
+  "146ffe2fd9": {
+    "translation": "Mostra altro"
+  },
+  "14d65465b7": {
+    "translation": "Elimina gruppo"
+  },
   "181b90f889": {
     "translation": "Crea file"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Questa stanza sta per raggiungere il limite di dimensioni. Valuta la possibilità di rimuovere alcuni contenuti o di creare un nuovo file."
   },
+  "2445e5e347": {
+    "translation": "Crea gruppo"
+  },
   "250ddea65c": {
     "translation": "Informazioni su tldraw"
   },
   "299cb00a7a": {
     "translation": "Caricamento non riuscito"
   },
+  "2c3ef76333": {
+    "translation": "I miei file"
+  },
   "2deec2cb74": {
     "translation": "Questa stanza ha raggiunto il limite di dimensioni e le modifiche potrebbero non essere più salvate. Rimuovi alcuni contenuti o crea un nuovo file."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: evidenziazione mancante"
   },
+  "32210b37e4": {
+    "translation": "Aggiungi collegamento"
+  },
   "335defdafe": {
     "translation": "Prova a ricaricare la pagina."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continua con l'email"
+  },
   "3bd1b98dbd": {
     "translation": "Impossibile pubblicare le modifiche."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Per favore ricarica"
+  "47f493a590": {
+    "translation": "File Pin"
   },
-  "764671e008": {
-    "translation": "Chatta con noi su Discord"
+  "49049467ff": {
+    "translation": "Incolla l'URL del file tldraw..."
   },
   "4908687e50": {
     "translation": "Confermi di voler dimenticare questo file?"
   },
+  "49ee308734": {
+    "translation": "Nome"
+  },
   "4d0d3ddec9": {
     "translation": "Questo sito utilizza i cookie per far funzionare l'app e per raccogliere dati analitici."
   },
   "4d1c8263ba": {
     "translation": "Ricarica"
   },
+  "4da5988a2e": {
+    "translation": "Elimina gruppo…"
+  },
+  "4e6fbf032b": {
+    "translation": "Vuoi davvero eliminare questo gruppo? Questa azione non può essere annullata."
+  },
   "50db1b7e1e": {
     "translation": "Impossibile annullare la pubblicazione del file."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Politica sulla riservatezza"
   },
+  "5a86b22fa0": {
+    "translation": "Trascina i file qui, <create>crea un file</create> o <invite>copia il link di invito</invite> per iniziare."
+  },
   "5a95a425f7": {
     "translation": "Condividi"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Rilevato browser obsoleto. Aggiorna il browser per utilizzare questa app."
   },
+  "5c6fe42bc2": {
+    "translation": "Revoca questo collegamento e creane uno nuovo."
+  },
   "5d26ae7550": {
     "translation": "Impossibile caricare alcuni dei contenuti che hai creato prima di accedere."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Meno recenti"
   },
+  "639bae9ac6": {
+    "translation": "Voi"
+  },
   "6609dd239e": {
     "translation": "Si è verificato un errore"
   },
   "6637a98151": {
     "translation": "È disponibile una nuova versione di tldraw. Ricarica la pagina per continuare."
   },
+  "68257bb646": {
+    "translation": "Sei stato invitato al gruppo <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Inserisci il tuo indirizzo email"
+  },
   "6a26f54883": {
     "translation": "Aiuto"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Per importare il contenuto manualmente, segui questi passaggi:"
   },
+  "70222abcfc": {
+    "translation": "Impostazioni di gruppo"
+  },
   "70a6facb9d": {
     "translation": "Questa settimana"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Gestisci i cookie"
   },
+  "7697920637": {
+    "translation": "Per favore ricarica"
+  },
+  "764671e008": {
+    "translation": "Chatta con noi su Discord"
+  },
   "777f9e90cf": {
     "translation": "Richiesta non valida."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Dimentica"
   },
+  "7cfe6c43dc": {
+    "translation": "Lascia il gruppo…"
+  },
   "7daeced9ff": {
     "translation": "Pubblica le modifiche"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Rinomina file"
   },
+  "8ad4303b83": {
+    "translation": "No grazie"
+  },
   "8b1946f965": {
     "translation": "Per continuare la modifica, copia la stanza nei tuoi file."
   },
+  "8c2d3d730c": {
+    "translation": "Controlla la tua email per un codice di verifica."
+  },
   "8eb2c00e96": {
     "translation": "Condivisi con te"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copia nei miei file"
   },
+  "930390d222": {
+    "translation": "Link di invito copiato"
+  },
+  "95aacd4d4a": {
+    "translation": "Accedi con Google"
+  },
+  "95d2109dc8": {
+    "translation": "Costruisci con l'SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "Questo mese"
   },
+  "985a4b720f": {
+    "translation": "Termini di utilizzo"
+  },
+  "98c997a27e": {
+    "translation": "Aggiungi collegamento al file"
+  },
   "9914a0ce04": {
     "translation": "Chiaro"
   },
+  "9b33f5c63c": {
+    "translation": "Non hai ricevuto il codice? <resend>Invia di nuovo</resend>."
+  },
   "9bef626805": {
     "translation": "Elimina file"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Sfondo"
   },
+  "aa916767cf": {
+    "translation": "Accedi per accettare l'invito"
+  },
   "ab0df9ba36": {
     "translation": "Limite file raggiunto"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Utente ospite"
   },
+  "b357b524e7": {
+    "translation": "Indirizzo e-mail"
+  },
+  "b3d2db69fe": {
+    "translation": "URL del file"
+  },
   "b6d4223e60": {
     "translation": "Accedi"
   },
+  "b6f4a2ec63": {
+    "translation": "Proprietario"
+  },
   "b758336699": {
     "translation": "Copia link"
   },
   "ba0318cb81": {
     "translation": "Accedi per condividere"
   },
-  "bb792693e2": {
-    "translation": "Rimuovi"
+  "bb93a7590f": {
+    "translation": "Accetta e unisciti al gruppo"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Caricamento del file .tldr…} other {Caricamento di {uploaded} di {total} file .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Condivisi da {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Carica file .tldr"
-  },
   "c2276c9127": {
     "translation": "Maggiori informazioni sulla condivisione."
   },
+  "c28aed8348": {
+    "translation": "Consenti <cookies>analytics</cookies> per aiutarci a migliorare tldraw."
+  },
   "c303bd1095": {
     "translation": "Impossibile pubblicare il file."
   },
   "c4b39a1cc3": {
     "translation": "Cookie essenziali"
   },
+  "c6155aaecc": {
+    "translation": "Nome del gruppo"
+  },
   "c655b27b1e": {
     "translation": "i18n: stringa lunga"
   },
   "c6a00f137b": {
     "translation": "Invita"
   },
+  "c74ea6dbff": {
+    "translation": "Mostra meno"
+  },
   "c87aacf567": {
     "translation": "Esci"
   },
+  "c9cc8cce24": {
+    "translation": "Salva"
+  },
   "cceaefbc20": {
     "translation": "Condividi questo file"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Attiva/disattiva barra laterale"
   },
+  "d638a3344b": {
+    "translation": "Prima di iniziare, accetta i nostri <tos>termini di utilizzo</tos> e la nostra <privacy>informativa sulla privacy</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Riprova"
   },
+  "d88ad2dc74": {
+    "translation": "Accetta e continua"
+  },
   "d9100f3e10": {
     "translation": "Vai qui per vedere i contenuti"
   },
+  "d9e35d0f55": {
+    "translation": "Hai raggiunto il numero massimo di gruppi. Devi eliminare i vecchi gruppi prima di crearne di nuovi."
+  },
   "dbbebf3c03": {
     "translation": "Solo su invito"
   },
+  "dcdaa754fe": {
+    "translation": "URL del file tldraw non valido"
+  },
   "dfdb78a4e4": {
     "translation": "Flag di debug dell'app"
   },
+  "e0c88179b3": {
+    "translation": "Invita i membri"
+  },
+  "e2198d6228": {
+    "translation": "Copia il link di invito"
+  },
   "e2ae80a510": {
     "translation": "Riepilogo legale"
   },
+  "e3afed0047": {
+    "translation": "Amministratore"
+  },
   "e404559826": {
     "translation": "Termini di servizio"
   },
-  "e78e14c5f1": {
-    "translation": "Fissa in alto"
+  "e81c4e4f2b": {
+    "translation": "O"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona pericolosa"
   },
   "ea4788705e": {
     "translation": "Annulla"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Per saperne di più, leggi la nostra <a>informativa sui cookie</a>."
   },
+  "ef53538ae4": {
+    "translation": "Membri"
+  },
   "ef7de3f485": {
     "translation": "selezionato"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Impostazioni"
   },
+  "f714e36843": {
+    "translation": "Sei sicuro di voler abbandonare questo gruppo?"
+  },
+  "fa2ead697d": {
+    "translation": "politica sulla riservatezza"
+  },
   "fb15c53f22": {
     "translation": "Visualizzatore"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Link copiato"
   },
+  "ff7a814974": {
+    "translation": "Aggiungi collegamento al file…"
+  },
   "ffcd73e997": {
     "translation": "Importa file…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ja.json b/apps/dotcom/client/public/tla/locales/ja.json
index 316eb4fad847..7ca7bd645b04 100644
--- a/apps/dotcom/client/public/tla/locales/ja.json
+++ b/apps/dotcom/client/public/tla/locales/ja.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "アカウント"
   },
+  "08d2d725a9": {
+    "translation": "無料アカウントを作成すると、作業の保存、リアルタイムでの共同作業などが行えます。"
+  },
   "0b27918290": {
     "translation": "ファイル"
   },
   "0b9a4cde72": {
     "translation": "ファイルメニュー"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw は、無料ですぐに使える仮想ホワイトボードです。"
+  },
   "0d1f2bb523": {
     "translation": "フィードバックを送信"
   },
   "110a4b01be": {
     "translation": "公開"
   },
+  "129b9e34ea": {
+    "translation": "グループを脱退"
+  },
+  "12a6766ba1": {
+    "translation": "ファイルのピンを外す"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDKを試す"
   },
   "13ddd375ad": {
     "translation": "形式を選択してエクスポート"
   },
+  "146ffe2fd9": {
+    "translation": "もっと見る"
+  },
+  "14d65465b7": {
+    "translation": "グループを削除"
+  },
   "181b90f889": {
     "translation": "ファイルを作成"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "このルームのサイズ制限に近づいています。一部のコンテンツを削除するか、新しいファイルを作成することを検討してください。"
   },
+  "2445e5e347": {
+    "translation": "グループを作成"
+  },
   "250ddea65c": {
     "translation": "tldrawについて"
   },
   "299cb00a7a": {
     "translation": "アップロードに失敗しました"
   },
+  "2c3ef76333": {
+    "translation": "私のファイル"
+  },
   "2deec2cb74": {
     "translation": "このルームはサイズ制限に達したため、変更内容が保存されない可能性があります。コンテンツの一部を削除するか、新しいファイルを作成してください。"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n：ハイライト不足"
   },
+  "32210b37e4": {
+    "translation": "リンクを追加"
+  },
   "335defdafe": {
     "translation": "ページの再読み込みをお試しください。"
   },
   "344a7f427f": {
     "translation": "エディタ"
   },
+  "3bc7d6ea2f": {
+    "translation": "メールで続行"
+  },
   "3bd1b98dbd": {
     "translation": "変更内容を公開できません。"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "再読み込みしてください"
+  "47f493a590": {
+    "translation": "ピンファイル"
   },
-  "764671e008": {
-    "translation": "Discordでチャットしましょう"
+  "49049467ff": {
+    "translation": "tldraw ファイルの URL を貼り付けます..."
   },
   "4908687e50": {
     "translation": "このファイルを無視しても本当によろしいですか？"
   },
+  "49ee308734": {
+    "translation": "名前"
+  },
   "4d0d3ddec9": {
     "translation": "このサイトでは、アプリの動作と分析情報の収集のために Cookie を使用します。"
   },
   "4d1c8263ba": {
     "translation": "再読み込み"
   },
+  "4da5988a2e": {
+    "translation": "グループを削除…"
+  },
+  "4e6fbf032b": {
+    "translation": "このグループを削除してもよろしいですか? この操作は元に戻せません。"
+  },
   "50db1b7e1e": {
     "translation": "ファイルの公開を取り消しできません。"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "プライバシーポリシー"
   },
+  "5a86b22fa0": {
+    "translation": "開始するには、ファイルをここにドラッグするか、<create>ファイルを作成</create>するか、<invite>招待リンクをコピー</invite>してください。"
+  },
   "5a95a425f7": {
     "translation": "共有"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "古いブラウザが検出されました。このアプリを使用するにはブラウザを更新してください。"
   },
+  "5c6fe42bc2": {
+    "translation": "このリンクを取り消して新しいリンクを作成してください。"
+  },
   "5d26ae7550": {
     "translation": "サインイン前に作成されたコンテンツの一部のアップロードに失敗しました。"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "より古い"
   },
+  "639bae9ac6": {
+    "translation": "あなた"
+  },
   "6609dd239e": {
     "translation": "エラーが発生しました"
   },
   "6637a98151": {
     "translation": "tldraw の新しいバージョンが利用可能です。続行するにはページを再読み込みしてください。"
   },
+  "68257bb646": {
+    "translation": "グループ <br></br><groupName></groupName> に招待されました"
+  },
+  "6832ac5936": {
+    "translation": "メールアドレスを入力してください"
+  },
   "6a26f54883": {
     "translation": "ヘルプ"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "コンテンツを手動でインポートするには、次の手順に従ってください。"
   },
+  "70222abcfc": {
+    "translation": "グループ設定"
+  },
   "70a6facb9d": {
     "translation": "今週"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "クッキーを管理する"
   },
+  "7697920637": {
+    "translation": "再読み込みしてください"
+  },
+  "764671e008": {
+    "translation": "Discordでチャットしましょう"
+  },
   "777f9e90cf": {
     "translation": "無効なリクエストです。"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "無視する"
   },
+  "7cfe6c43dc": {
+    "translation": "グループを脱退…"
+  },
   "7daeced9ff": {
     "translation": "変更内容を公開"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ファイル名を変更する"
   },
+  "8ad4303b83": {
+    "translation": "結構です"
+  },
   "8b1946f965": {
     "translation": "編集を続けるには、部屋をファイルにコピーしてください。"
   },
+  "8c2d3d730c": {
+    "translation": "確認コードをメールで確認してください。"
+  },
   "8eb2c00e96": {
     "translation": "あなたと共有しました"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "自分のファイルにコピー"
   },
+  "930390d222": {
+    "translation": "招待リンクをコピーしました"
+  },
+  "95aacd4d4a": {
+    "translation": "Googleでログイン"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDKでビルドする"
+  },
   "96165d6df5": {
     "translation": "今月"
   },
+  "985a4b720f": {
+    "translation": "利用規約"
+  },
+  "98c997a27e": {
+    "translation": "ファイルリンクを追加"
+  },
   "9914a0ce04": {
     "translation": "ライト"
   },
+  "9b33f5c63c": {
+    "translation": "コードが届きませんか？ <resend>再送信</resend>"
+  },
   "9bef626805": {
     "translation": "ファイルを削除"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "背景"
   },
+  "aa916767cf": {
+    "translation": "招待を承諾するにはサインインしてください"
+  },
   "ab0df9ba36": {
     "translation": "ファイル制限に達しました"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "ゲストユーザー"
   },
+  "b357b524e7": {
+    "translation": "電子メールアドレス"
+  },
+  "b3d2db69fe": {
+    "translation": "ファイルURL"
+  },
   "b6d4223e60": {
     "translation": "サインイン"
   },
+  "b6f4a2ec63": {
+    "translation": "所有者"
+  },
   "b758336699": {
     "translation": "リンクをコピー"
   },
   "ba0318cb81": {
     "translation": "共有するにはサインインしてください"
   },
-  "bb792693e2": {
-    "translation": "ピン留めを解除"
+  "bb93a7590f": {
+    "translation": "承認してグループに参加する"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {{uploaded} 件中 {total} 件の .tldr ファイルをアップロードしています…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName}さんが共有"
   },
-  "bcb62136a3": {
-    "translation": "tldrファイルをアップロード"
-  },
   "c2276c9127": {
     "translation": "共有についてさらに詳しく。"
   },
+  "c28aed8348": {
+    "translation": "tldraw を改善するために、<cookies>analytics</cookies> を許可します。"
+  },
   "c303bd1095": {
     "translation": "ファイルを公開できません"
   },
   "c4b39a1cc3": {
     "translation": "必須クッキー"
   },
+  "c6155aaecc": {
+    "translation": "グループ名"
+  },
   "c655b27b1e": {
     "translation": "i18n：長い文字列"
   },
   "c6a00f137b": {
     "translation": "招待する"
   },
+  "c74ea6dbff": {
+    "translation": "表示を減らす"
+  },
   "c87aacf567": {
     "translation": "サインアウト"
   },
+  "c9cc8cce24": {
+    "translation": "保存"
+  },
   "cceaefbc20": {
     "translation": "このファイルを共有"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "サイドバーを切り替え"
   },
+  "d638a3344b": {
+    "translation": "始める前に、<tos>利用規約</tos>と<privacy>プライバシーポリシー</privacy>に同意してください。"
+  },
   "d721757161": {
     "translation": "テーマ"
   },
   "d876a9fe1a": {
     "translation": "再試行"
   },
+  "d88ad2dc74": {
+    "translation": "同意して続行"
+  },
   "d9100f3e10": {
     "translation": "コンテンツを見るにはこちらへ移動してください"
   },
+  "d9e35d0f55": {
+    "translation": "グループの最大数に達しました。新しいグループを作成する前に、古いグループを削除する必要があります。"
+  },
   "dbbebf3c03": {
     "translation": "招待のみ"
   },
+  "dcdaa754fe": {
+    "translation": "無効なtldrawファイルURL"
+  },
   "dfdb78a4e4": {
     "translation": "デバッグのフラグを追加"
   },
+  "e0c88179b3": {
+    "translation": "メンバーを招待する"
+  },
+  "e2198d6228": {
+    "translation": "招待リンクをコピー"
+  },
   "e2ae80a510": {
     "translation": "法的概要"
   },
+  "e3afed0047": {
+    "translation": "管理者"
+  },
   "e404559826": {
     "translation": "利用規約"
   },
-  "e78e14c5f1": {
-    "translation": "ピン留めする"
+  "e81c4e4f2b": {
+    "translation": "または"
+  },
+  "ea0626ac5a": {
+    "translation": "危険地帯"
   },
   "ea4788705e": {
     "translation": "キャンセル"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "詳細については、<a>Cookie ポリシー</a> をお読みください。"
   },
+  "ef53538ae4": {
+    "translation": "メンバー"
+  },
   "ef7de3f485": {
     "translation": "選択された"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "設定"
   },
+  "f714e36843": {
+    "translation": "このグループを脱退してもよろしいですか?"
+  },
+  "fa2ead697d": {
+    "translation": "プライバシーポリシー"
+  },
   "fb15c53f22": {
     "translation": "ビューア"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "コピーしたリンク"
   },
+  "ff7a814974": {
+    "translation": "ファイルリンクを追加…"
+  },
   "ffcd73e997": {
     "translation": "ファイルをインポート…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/km-kh.json b/apps/dotcom/client/public/tla/locales/km-kh.json
index 383f984dc9cf..3eb3583f6feb 100644
--- a/apps/dotcom/client/public/tla/locales/km-kh.json
+++ b/apps/dotcom/client/public/tla/locales/km-kh.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "គណនី"
   },
+  "08d2d725a9": {
+    "translation": "បង្កើតគណនីឥតគិតថ្លៃ ដើម្បីរក្សាទុកការងាររបស់អ្នក សហការក្នុងពេលជាក់ស្តែង និងច្រើនទៀត។"
+  },
   "0b27918290": {
     "translation": "ឯកសារ"
   },
   "0b9a4cde72": {
     "translation": "ម៉ឺនុយឯកសារ"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw គឺជាក្តារខៀននិម្មិតឥតគិតថ្លៃ និងភ្លាមៗ។"
+  },
   "0d1f2bb523": {
     "translation": "ផ្ញើមតិកែលម្អ"
   },
   "110a4b01be": {
     "translation": "បោះពុម្ពផ្សាយ"
   },
+  "129b9e34ea": {
+    "translation": "ចាកចេញពីក្រុម"
+  },
+  "12a6766ba1": {
+    "translation": "ដកការខ្ទាស់ឯកសារ"
+  },
   "12c8a9838c": {
     "translation": "សាកល្បង tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "នាំចេញជា"
   },
+  "146ffe2fd9": {
+    "translation": "បង្ហាញច្រើនទៀត"
+  },
+  "14d65465b7": {
+    "translation": "លុបក្រុម"
+  },
   "181b90f889": {
     "translation": "បង្កើតឯកសារ"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "បន្ទប់នេះជិតដល់ដែនកំណត់ទំហំរបស់វា។ ពិចារណាលុបខ្លឹមសារខ្លះចេញ ឬចាប់ផ្តើមឯកសារថ្មី។"
   },
+  "2445e5e347": {
+    "translation": "បង្កើតក្រុម"
+  },
   "250ddea65c": {
     "translation": "អំពី tldraw"
   },
   "299cb00a7a": {
     "translation": "ការបង្ហោះបានបរាជ័យ"
   },
+  "2c3ef76333": {
+    "translation": "ឯកសាររបស់ខ្ញុំ"
+  },
   "2deec2cb74": {
     "translation": "បន្ទប់នេះបានឈានដល់ដែនកំណត់ទំហំរបស់វា ហើយការផ្លាស់ប្តូរអាចនឹងមិនត្រូវបានរក្សាទុកទៀតទេ។ លុបខ្លឹមសារខ្លះចេញ ឬចាប់ផ្តើមឯកសារថ្មី។"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: បន្លិចបាត់"
   },
+  "32210b37e4": {
+    "translation": "បន្ថែមតំណ"
+  },
   "335defdafe": {
     "translation": "សូមព្យាយាមផ្ទុកទំព័រឡើងវិញ។"
   },
   "344a7f427f": {
     "translation": "កម្មវិធីនិពន្ធ"
   },
+  "3bc7d6ea2f": {
+    "translation": "បន្តជាមួយអ៊ីមែល"
+  },
   "3bd1b98dbd": {
     "translation": "មិនអាចបោះផ្សាយការផ្លាស់ប្តូរបានទេ។"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "សូមផ្ទុកឡើងវិញ"
+  "47f493a590": {
+    "translation": "ខ្ទាស់ឯកសារ"
   },
-  "764671e008": {
-    "translation": "ជជែកជាមួយពួកយើងនៅលើ Discord"
+  "49049467ff": {
+    "translation": "បិទភ្ជាប់ URL ឯកសារ tldraw..."
   },
   "4908687e50": {
     "translation": "តើអ្នកប្រាកដថាចង់បំភ្លេចឯកសារនេះទេ?"
   },
+  "49ee308734": {
+    "translation": "ឈ្មោះ"
+  },
   "4d0d3ddec9": {
     "translation": "គេហទំព័រនេះប្រើខូគីដើម្បីធ្វើឱ្យកម្មវិធីដំណើរការ និងប្រមូលការវិភាគ។"
   },
   "4d1c8263ba": {
     "translation": "ផ្ទុកឡើងវិញ"
   },
+  "4da5988a2e": {
+    "translation": "លុបក្រុម..."
+  },
+  "4e6fbf032b": {
+    "translation": "តើអ្នកប្រាកដថាចង់លុបក្រុមនេះទេ? សកម្មភាពនេះមិនអាចត្រឡប់វិញបានទេ។"
+  },
   "50db1b7e1e": {
     "translation": "មិន​អាច​លុប​ផ្សាយ​ឯកសារ​បាន​ទេ។"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "គោលការណ៍ឯកជនភាព"
   },
+  "5a86b22fa0": {
+    "translation": "អូសឯកសារនៅទីនេះ <create>បង្កើតឯកសារ</create> ឬ <invite>ចម្លងតំណអញ្ជើញ</invite> ដើម្បីចាប់ផ្តើម។"
+  },
   "5a95a425f7": {
     "translation": "ចែករំលែក"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "កម្មវិធីរុករកចាស់ត្រូវបានរកឃើញ។ សូមអាប់ដេតកម្មវិធីរុករកតាមអ៊ីនធឺណិតរបស់អ្នក ដើម្បីប្រើកម្មវិធីនេះ។"
   },
+  "5c6fe42bc2": {
+    "translation": "ដកហូតតំណនេះ ហើយបង្កើតថ្មីមួយ។"
+  },
   "5d26ae7550": {
     "translation": "យើងបរាជ័យក្នុងការបង្ហោះមាតិកាមួយចំនួនដែលអ្នកបានបង្កើតមុនពេលអ្នកចូល។"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "ចាស់ជាង"
   },
+  "639bae9ac6": {
+    "translation": "អ្នក"
+  },
   "6609dd239e": {
     "translation": "មានអ្វីមួយខុសប្រក្រតី"
   },
   "6637a98151": {
     "translation": "កំណែថ្មីនៃ tldraw មាន។ សូមផ្ទុកទំព័រឡើងវិញដើម្បីបន្ត។"
   },
+  "68257bb646": {
+    "translation": "អ្នកត្រូវបានអញ្ជើញឱ្យចូលរួមក្នុងក្រុម <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "បញ្ចូលអាសយដ្ឋានអ៊ីមែលរបស់អ្នក។"
+  },
   "6a26f54883": {
     "translation": "ជំនួយ"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "អនុវត្តតាមជំហានទាំងនេះដើម្បីនាំចូលមាតិកាដោយដៃ៖"
   },
+  "70222abcfc": {
+    "translation": "ការកំណត់ក្រុម"
+  },
   "70a6facb9d": {
     "translation": "សប្តាហ៍នេះ។"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "គ្រប់គ្រងខូគី"
   },
+  "7697920637": {
+    "translation": "សូមផ្ទុកឡើងវិញ"
+  },
+  "764671e008": {
+    "translation": "ជជែកជាមួយពួកយើងនៅលើ Discord"
+  },
   "777f9e90cf": {
     "translation": "សំណើមិនត្រឹមត្រូវ។"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "ភ្លេច"
   },
+  "7cfe6c43dc": {
+    "translation": "ចាកចេញពីក្រុម…"
+  },
   "7daeced9ff": {
     "translation": "បោះផ្សាយការផ្លាស់ប្តូរ"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ប្តូរឈ្មោះឯកសារ"
   },
+  "8ad4303b83": {
+    "translation": "ទេ អរគុណ"
+  },
   "8b1946f965": {
     "translation": "ដើម្បីបន្តកែសម្រួល សូមចម្លងបន្ទប់ទៅឯកសាររបស់អ្នក។"
   },
+  "8c2d3d730c": {
+    "translation": "ពិនិត្យអ៊ីមែលរបស់អ្នកសម្រាប់លេខកូដផ្ទៀងផ្ទាត់។"
+  },
   "8eb2c00e96": {
     "translation": "ចែករំលែកជាមួយអ្នក"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "ចម្លងទៅឯកសាររបស់ខ្ញុំ"
   },
+  "930390d222": {
+    "translation": "បានចម្លងតំណអញ្ជើញ"
+  },
+  "95aacd4d4a": {
+    "translation": "ចូលជាមួយ Google"
+  },
+  "95d2109dc8": {
+    "translation": "បង្កើតជាមួយ tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "ខែនេះ។"
   },
+  "985a4b720f": {
+    "translation": "ល័ក្ខខ័ណ្ឌនៃការប្រើប្រាស់"
+  },
+  "98c997a27e": {
+    "translation": "បន្ថែមតំណឯកសារ"
+  },
   "9914a0ce04": {
     "translation": "ពន្លឺ"
   },
+  "9b33f5c63c": {
+    "translation": "មិនបានទទួលលេខកូដមែនទេ? <resend>ផ្ញើឡើងវិញ</resend>។"
+  },
   "9bef626805": {
     "translation": "លុបឯកសារ"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "ផ្ទៃខាងក្រោយ"
   },
+  "aa916767cf": {
+    "translation": "ចូល​ដើម្បី​ទទួល​យក​ការ​អញ្ជើញ"
+  },
   "ab0df9ba36": {
     "translation": "ឈានដល់ដែនកំណត់ឯកសារ"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "អ្នកប្រើប្រាស់ភ្ញៀវ"
   },
+  "b357b524e7": {
+    "translation": "អាសយដ្ឋានអ៊ីមែល"
+  },
+  "b3d2db69fe": {
+    "translation": "URL ឯកសារ"
+  },
   "b6d4223e60": {
     "translation": "ចូល"
   },
+  "b6f4a2ec63": {
+    "translation": "ម្ចាស់"
+  },
   "b758336699": {
     "translation": "ចម្លងតំណ"
   },
   "ba0318cb81": {
     "translation": "ចូលដើម្បីចែករំលែក"
   },
-  "bb792693e2": {
-    "translation": "ដកខ្ទាស់"
+  "bb93a7590f": {
+    "translation": "ទទួលយក និងចូលរួមក្រុម"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {កំពុងបង្ហោះ {uploaded} នៃ {total} .tldr files…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "ចែករំលែកដោយ {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "ផ្ទុកឡើងឯកសារ .tldr"
-  },
   "c2276c9127": {
     "translation": "ស្វែងយល់បន្ថែមអំពីការចែករំលែក។"
   },
+  "c28aed8348": {
+    "translation": "អនុញ្ញាតឱ្យ <cookies>analytics</cookies> ដើម្បីជួយយើងកែលម្អ tldraw ។"
+  },
   "c303bd1095": {
     "translation": "មិនអាចបោះពុម្ពឯកសារបានទេ។"
   },
   "c4b39a1cc3": {
     "translation": "ខូឃីសំខាន់ៗ"
   },
+  "c6155aaecc": {
+    "translation": "ឈ្មោះក្រុម"
+  },
   "c655b27b1e": {
     "translation": "i18n: ខ្សែវែង"
   },
   "c6a00f137b": {
     "translation": "អញ្ជើញ"
   },
+  "c74ea6dbff": {
+    "translation": "បង្ហាញតិច"
+  },
   "c87aacf567": {
     "translation": "ចេញ"
   },
+  "c9cc8cce24": {
+    "translation": "រក្សាទុក"
+  },
   "cceaefbc20": {
     "translation": "ចែករំលែកឯកសារនេះ។"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "បិទបើករបារចំហៀង"
   },
+  "d638a3344b": {
+    "translation": "មុនពេលអ្នកចាប់ផ្តើម សូមទទួលយក <tos>លក្ខខណ្ឌប្រើប្រាស់</tos> និង <privacy>គោលការណ៍ឯកជនភាព</privacy> របស់យើង។"
+  },
   "d721757161": {
     "translation": "ប្រធានបទ"
   },
   "d876a9fe1a": {
     "translation": "ព្យាយាមម្តងទៀត"
   },
+  "d88ad2dc74": {
+    "translation": "ទទួលយកហើយបន្ត"
+  },
   "d9100f3e10": {
     "translation": "ទៅទីនេះដើម្បីមើលខ្លឹមសារ"
   },
+  "d9e35d0f55": {
+    "translation": "អ្នកបានឈានដល់ចំនួនក្រុមអតិបរមាហើយ។ អ្នកត្រូវលុបក្រុមចាស់មុននឹងបង្កើតក្រុមថ្មី។"
+  },
   "dbbebf3c03": {
     "translation": "អញ្ជើញតែប៉ុណ្ណោះ"
   },
+  "dcdaa754fe": {
+    "translation": "URL ឯកសារ tldraw មិនត្រឹមត្រូវ"
+  },
   "dfdb78a4e4": {
     "translation": "ទង់បំបាត់កំហុសកម្មវិធី"
   },
+  "e0c88179b3": {
+    "translation": "អញ្ជើញសមាជិក"
+  },
+  "e2198d6228": {
+    "translation": "ចម្លងតំណអញ្ជើញ"
+  },
   "e2ae80a510": {
     "translation": "សង្ខេបច្បាប់"
   },
+  "e3afed0047": {
+    "translation": "អ្នកគ្រប់គ្រង"
+  },
   "e404559826": {
     "translation": "ល័ក្ខខ័ណ្ឌនៃសេវាកម្ម"
   },
-  "e78e14c5f1": {
-    "translation": "ម្ជុល"
+  "e81c4e4f2b": {
+    "translation": "ឬ"
+  },
+  "ea0626ac5a": {
+    "translation": "តំបន់គ្រោះថ្នាក់"
   },
   "ea4788705e": {
     "translation": "បោះបង់"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "សូមអាន <a>គោលការណ៍ខូគី</a> របស់យើងដើម្បីស្វែងយល់បន្ថែម។"
   },
+  "ef53538ae4": {
+    "translation": "សមាជិក"
+  },
   "ef7de3f485": {
     "translation": "បានជ្រើសរើស"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "ការកំណត់"
   },
+  "f714e36843": {
+    "translation": "តើអ្នកប្រាកដថាចង់ចាកចេញពីក្រុមនេះទេ?"
+  },
+  "fa2ead697d": {
+    "translation": "គោលការណ៍ឯកជនភាព"
+  },
   "fb15c53f22": {
     "translation": "អ្នកមើល"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "បានចម្លងតំណ"
   },
+  "ff7a814974": {
+    "translation": "បន្ថែមតំណឯកសារ…"
+  },
   "ffcd73e997": {
     "translation": "នាំចូលឯកសារ..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/kn.json b/apps/dotcom/client/public/tla/locales/kn.json
index 409ebe3229e7..9b2ea98ed9e4 100644
--- a/apps/dotcom/client/public/tla/locales/kn.json
+++ b/apps/dotcom/client/public/tla/locales/kn.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "ಖಾತೆ"
   },
+  "08d2d725a9": {
+    "translation": "ನಿಮ್ಮ ಕೆಲಸವನ್ನು ಉಳಿಸಲು, ನೈಜ ಸಮಯದಲ್ಲಿ ಸಹಯೋಗಿಸಲು ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಲು ಉಚಿತ ಖಾತೆಯನ್ನು ರಚಿಸಿ."
+  },
   "0b27918290": {
     "translation": "ಫೈಲ್"
   },
   "0b9a4cde72": {
     "translation": "ಫೈಲ್ ಮೆನು"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ಒಂದು ಉಚಿತ ಮತ್ತು ತ್ವರಿತ ವರ್ಚುವಲ್ ವೈಟ್‌ಬೋರ್ಡ್ ಆಗಿದೆ."
+  },
   "0d1f2bb523": {
     "translation": "ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"
   },
   "110a4b01be": {
     "translation": "ಪ್ರಕಟಿಸಿ"
   },
+  "129b9e34ea": {
+    "translation": "ಗುಂಪನ್ನು ತೊರೆಯಿರಿ"
+  },
+  "12a6766ba1": {
+    "translation": "ಫೈಲ್ ಅನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡಿ"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK ಪ್ರಯತ್ನಿಸಿ ನೋಡಿ"
   },
   "13ddd375ad": {
     "translation": "ರಫ್ತು ಮಾಡಿ"
   },
+  "146ffe2fd9": {
+    "translation": "ಇನ್ನಷ್ಟು ತೋರಿಸು"
+  },
+  "14d65465b7": {
+    "translation": "ಗುಂಪನ್ನು ಅಳಿಸಿ"
+  },
   "181b90f889": {
     "translation": "ಫೈಲ್ ರಚಿಸಿ"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "ಈ ಕೋಣೆಯ ಗಾತ್ರದ ಮಿತಿಯನ್ನು ಸಮೀಪಿಸುತ್ತಿದೆ. ಕೆಲವು ವಿಷಯವನ್ನು ತೆಗೆದುಹಾಕುವುದನ್ನು ಅಥವಾ ಹೊಸ ಫೈಲ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸುವುದನ್ನು ಪರಿಗಣಿಸಿ."
   },
+  "2445e5e347": {
+    "translation": "ಗುಂಪನ್ನು ರಚಿಸಿ"
+  },
   "250ddea65c": {
     "translation": "ಟಿಎಲ್‌ಡ್ರಾ ಬಗ್ಗೆ"
   },
   "299cb00a7a": {
     "translation": "ಅಪ್‌ಲೋಡ್ ವಿಫಲವಾಗಿದೆ"
   },
+  "2c3ef76333": {
+    "translation": "ನನ್ನ ಫೈಲ್‌ಗಳು"
+  },
   "2deec2cb74": {
     "translation": "ಈ ಕೋಣೆಯ ಗಾತ್ರದ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ ಮತ್ತು ಬದಲಾವಣೆಗಳನ್ನು ಇನ್ನು ಮುಂದೆ ಉಳಿಸಲಾಗುವುದಿಲ್ಲ. ಕೆಲವು ವಿಷಯವನ್ನು ತೆಗೆದುಹಾಕಿ ಅಥವಾ ಹೊಸ ಫೈಲ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: ಹೈಲೈಟ್ ಕಾಣೆಯಾಗಿದೆ"
   },
+  "32210b37e4": {
+    "translation": "ಲಿಂಕ್ ಸೇರಿಸಿ"
+  },
   "335defdafe": {
     "translation": "ದಯವಿಟ್ಟು ಪುಟವನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."
   },
   "344a7f427f": {
     "translation": "ಸಂಪಾದಕ"
   },
+  "3bc7d6ea2f": {
+    "translation": "ಇಮೇಲ್ ಮೂಲಕ ಮುಂದುವರಿಸಿ"
+  },
   "3bd1b98dbd": {
     "translation": "ಬದಲಾವಣೆಗಳನ್ನು ಪ್ರಕಟಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "ಡ್ರಾ"
   },
-  "7697920637": {
-    "translation": "ದಯವಿಟ್ಟು ಮರುಲೋಡ್ ಮಾಡಿ"
+  "47f493a590": {
+    "translation": "ಪಿನ್ ಫೈಲ್"
   },
-  "764671e008": {
-    "translation": "ಡಿಸ್ಕಾರ್ಡ್‌ನಲ್ಲಿ ನಮ್ಮೊಂದಿಗೆ ಚಾಟ್ ಮಾಡಿ"
+  "49049467ff": {
+    "translation": "tldraw ಫೈಲ್ URL ಅಂಟಿಸಿ..."
   },
   "4908687e50": {
     "translation": "ಈ ಫೈಲ್ ಅನ್ನು ಮರೆಯಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?"
   },
+  "49ee308734": {
+    "translation": "ಹೆಸರು"
+  },
   "4d0d3ddec9": {
     "translation": "ಅಪ್ಲಿಕೇಶನ್ ಕೆಲಸ ಮಾಡಲು ಮತ್ತು ವಿಶ್ಲೇಷಣೆಗಳನ್ನು ಸಂಗ್ರಹಿಸಲು ಈ ಸೈಟ್ ಕುಕೀಗಳನ್ನು ಬಳಸುತ್ತದೆ."
   },
   "4d1c8263ba": {
     "translation": "ಮರುಲೋಡ್ ಮಾಡಿ"
   },
+  "4da5988a2e": {
+    "translation": "ಗುಂಪನ್ನು ಅಳಿಸಿ..."
+  },
+  "4e6fbf032b": {
+    "translation": "ಈ ಗುಂಪನ್ನು ಅಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."
+  },
   "50db1b7e1e": {
     "translation": "ಫೈಲ್ ಅನ್ನು ಅಪ್ರಕಟಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "ಗೌಪ್ಯತೆ ನೀತಿ"
   },
+  "5a86b22fa0": {
+    "translation": "ಪ್ರಾರಂಭಿಸಲು ಫೈಲ್‌ಗಳನ್ನು ಇಲ್ಲಿಗೆ ಎಳೆಯಿರಿ, <create> ಫೈಲ್ ರಚಿಸಿ</create>, ಅಥವಾ <invite> ಆಹ್ವಾನ ಲಿಂಕ್ ಅನ್ನು ನಕಲಿಸಿ</invite>."
+  },
   "5a95a425f7": {
     "translation": "ಹಂಚಿಕೊಳ್ಳಿ"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "ಹಳೆಯ ಬ್ರೌಸರ್ ಪತ್ತೆಯಾಗಿದೆ. ಈ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಲು ದಯವಿಟ್ಟು ನಿಮ್ಮ ಬ್ರೌಸರ್ ಅನ್ನು ನವೀಕರಿಸಿ."
   },
+  "5c6fe42bc2": {
+    "translation": "ಈ ಲಿಂಕ್ ಅನ್ನು ಹಿಂತೆಗೆದುಕೊಳ್ಳಿ ಮತ್ತು ಹೊಸದನ್ನು ರಚಿಸಿ."
+  },
   "5d26ae7550": {
     "translation": "ನೀವು ಸೈನ್ ಇನ್ ಮಾಡುವ ಮೊದಲು ನೀವು ರಚಿಸಿದ ಕೆಲವು ವಿಷಯವನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲು ನಾವು ವಿಫಲರಾಗಿದ್ದೇವೆ."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "ಹಳೆಯದು"
   },
+  "639bae9ac6": {
+    "translation": "ನೀವು"
+  },
   "6609dd239e": {
     "translation": "ಏನೋ ತಪ್ಪಾಗಿದೆ"
   },
   "6637a98151": {
     "translation": "tldraw ನ ಹೊಸ ಆವೃತ್ತಿ ಲಭ್ಯವಿದೆ. ಮುಂದುವರಿಯಲು ದಯವಿಟ್ಟು ಪುಟವನ್ನು ಮರುಲೋಡ್ ಮಾಡಿ."
   },
+  "68257bb646": {
+    "translation": "ನಿಮ್ಮನ್ನು <br></br><groupName></groupName> ಗುಂಪಿಗೆ ಆಹ್ವಾನಿಸಲಾಗಿದೆ."
+  },
+  "6832ac5936": {
+    "translation": "ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ"
+  },
   "6a26f54883": {
     "translation": "ಸಹಾಯ"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "ವಿಷಯವನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ಆಮದು ಮಾಡಿಕೊಳ್ಳಲು ಈ ಹಂತಗಳನ್ನು ಅನುಸರಿಸಿ:"
   },
+  "70222abcfc": {
+    "translation": "ಗುಂಪು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
+  },
   "70a6facb9d": {
     "translation": "ಈ ವಾರ"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "ಕುಕೀಗಳನ್ನು ನಿರ್ವಹಿಸಿ"
   },
+  "7697920637": {
+    "translation": "ದಯವಿಟ್ಟು ಮರುಲೋಡ್ ಮಾಡಿ"
+  },
+  "764671e008": {
+    "translation": "ಡಿಸ್ಕಾರ್ಡ್‌ನಲ್ಲಿ ನಮ್ಮೊಂದಿಗೆ ಚಾಟ್ ಮಾಡಿ"
+  },
   "777f9e90cf": {
     "translation": "ಅಮಾನ್ಯ ವಿನಂತಿ."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "ಮರೆತುಬಿಡಿ"
   },
+  "7cfe6c43dc": {
+    "translation": "ಗುಂಪನ್ನು ತೊರೆಯಿರಿ..."
+  },
   "7daeced9ff": {
     "translation": "ಬದಲಾವಣೆಗಳನ್ನು ಪ್ರಕಟಿಸಿ"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ಫೈಲ್ ಅನ್ನು ಮರುಹೆಸರಿಸಿ"
   },
+  "8ad4303b83": {
+    "translation": "ಬೇಡ ಧನ್ಯವಾದಗಳು"
+  },
   "8b1946f965": {
     "translation": "ಸಂಪಾದನೆಯನ್ನು ಮುಂದುವರಿಸಲು ದಯವಿಟ್ಟು ಕೊಠಡಿಯನ್ನು ನಿಮ್ಮ ಫೈಲ್‌ಗಳಿಗೆ ನಕಲಿಸಿ."
   },
+  "8c2d3d730c": {
+    "translation": "ಪರಿಶೀಲನಾ ಕೋಡ್‌ಗಾಗಿ ನಿಮ್ಮ ಇಮೇಲ್ ಪರಿಶೀಲಿಸಿ."
+  },
   "8eb2c00e96": {
     "translation": "ನಿಮ್ಮೊಂದಿಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "ನನ್ನ ಫೈಲ್‌ಗಳಿಗೆ ನಕಲಿಸಿ"
   },
+  "930390d222": {
+    "translation": "ಆಹ್ವಾನ ಲಿಂಕ್ ನಕಲಿಸಲಾಗಿದೆ"
+  },
+  "95aacd4d4a": {
+    "translation": "Google ನೊಂದಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK ಬಳಸಿ ನಿರ್ಮಿಸಿ"
+  },
   "96165d6df5": {
     "translation": "ಈ ತಿಂಗಳು"
   },
+  "985a4b720f": {
+    "translation": "ಬಳಕೆಯ ನಿಯಮಗಳು"
+  },
+  "98c997a27e": {
+    "translation": "ಫೈಲ್ ಲಿಂಕ್ ಸೇರಿಸಿ"
+  },
   "9914a0ce04": {
     "translation": "ಬೆಳಕು"
   },
+  "9b33f5c63c": {
+    "translation": "ಕೋಡ್ ಸಿಗಲಿಲ್ಲವೇ? <resend>ಮತ್ತೆ ಕಳುಹಿಸಿ</resend>."
+  },
   "9bef626805": {
     "translation": "ಫೈಲ್ ಅಳಿಸಿ"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "ಹಿನ್ನೆಲೆ"
   },
+  "aa916767cf": {
+    "translation": "ಆಹ್ವಾನವನ್ನು ಸ್ವೀಕರಿಸಲು ಸೈನ್ ಇನ್ ಮಾಡಿ"
+  },
   "ab0df9ba36": {
     "translation": "ಫೈಲ್ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "ಅತಿಥಿ ಬಳಕೆದಾರ"
   },
+  "b357b524e7": {
+    "translation": "ಇಮೇಲ್ ವಿಳಾಸ"
+  },
+  "b3d2db69fe": {
+    "translation": "ಫೈಲ್ URL"
+  },
   "b6d4223e60": {
     "translation": "ಸೈನ್ ಇನ್ ಮಾಡಿ"
   },
+  "b6f4a2ec63": {
+    "translation": "ಮಾಲೀಕ"
+  },
   "b758336699": {
     "translation": "ಲಿಂಕ್ ನಕಲಿಸಿ"
   },
   "ba0318cb81": {
     "translation": "ಹಂಚಿಕೊಳ್ಳಲು ಸೈನ್ ಇನ್ ಮಾಡಿ"
   },
-  "bb792693e2": {
-    "translation": "ಅನ್‌ಪಿನ್ ಮಾಡಿ"
+  "bb93a7590f": {
+    "translation": "ಗುಂಪನ್ನು ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಸೇರಿ"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr ಫೈಲ್ ಅನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…} other {{total} .tldr ಫೈಲ್‌ಗಳಲ್ಲಿ {uploaded} ಅನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಲಾಗಿದೆ"
   },
-  "bcb62136a3": {
-    "translation": ".tldr ಫೈಲ್‌ಗಳನ್ನು ಅಪ್‌ಲೋಡ್ ಮಾಡಿ"
-  },
   "c2276c9127": {
     "translation": "ಹಂಚಿಕೊಳ್ಳುವ ಕುರಿತು ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ."
   },
+  "c28aed8348": {
+    "translation": "tldraw ಸುಧಾರಿಸಲು ನಮಗೆ ಸಹಾಯ ಮಾಡಲು <cookies>analytics</cookies> ಅನ್ನು ಅನುಮತಿಸಿ."
+  },
   "c303bd1095": {
     "translation": "ಫೈಲ್ ಅನ್ನು ಪ್ರಕಟಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."
   },
   "c4b39a1cc3": {
     "translation": "ಅಗತ್ಯ ಕುಕೀಗಳು"
   },
+  "c6155aaecc": {
+    "translation": "ಗುಂಪಿನ ಹೆಸರು"
+  },
   "c655b27b1e": {
     "translation": "i18n: ಲಾಂಗ್ ಸ್ಟ್ರಿಂಗ್"
   },
   "c6a00f137b": {
     "translation": "ಆಹ್ವಾನಿಸಿ"
   },
+  "c74ea6dbff": {
+    "translation": "ಕಡಿಮೆ ತೋರಿಸಿ"
+  },
   "c87aacf567": {
     "translation": "ಸೈನ್ ಔಟ್ ಮಾಡಿ"
   },
+  "c9cc8cce24": {
+    "translation": "ಉಳಿಸಿ"
+  },
   "cceaefbc20": {
     "translation": "ಈ ಫೈಲ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "ಸೈಡ್‌ಬಾರ್ ಅನ್ನು ಟಾಗಲ್ ಮಾಡಿ"
   },
+  "d638a3344b": {
+    "translation": "ನೀವು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು, ದಯವಿಟ್ಟು ನಮ್ಮ <tos>ಬಳಕೆಯ ನಿಯಮಗಳು</tos> ಮತ್ತು <privacy>ಗೌಪ್ಯತೆ ನೀತಿ</privacy>ಯನ್ನು ಒಪ್ಪಿಕೊಳ್ಳಿ."
+  },
   "d721757161": {
     "translation": "ಥೀಮ್"
   },
   "d876a9fe1a": {
     "translation": "ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"
   },
+  "d88ad2dc74": {
+    "translation": "ಸ್ವೀಕರಿಸಿ ಮತ್ತು ಮುಂದುವರಿಸಿ"
+  },
   "d9100f3e10": {
     "translation": "ವಿಷಯವನ್ನು ನೋಡಲು ಇಲ್ಲಿಗೆ ಹೋಗಿ"
   },
+  "d9e35d0f55": {
+    "translation": "ನೀವು ಗುಂಪುಗಳ ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯನ್ನು ತಲುಪಿದ್ದೀರಿ. ಹೊಸ ಗುಂಪುಗಳನ್ನು ರಚಿಸುವ ಮೊದಲು ನೀವು ಹಳೆಯ ಗುಂಪುಗಳನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."
+  },
   "dbbebf3c03": {
     "translation": "ಆಮಂತ್ರಣ ಮಾತ್ರ"
   },
+  "dcdaa754fe": {
+    "translation": "ಅಮಾನ್ಯವಾದ tldraw ಫೈಲ್ URL"
+  },
   "dfdb78a4e4": {
     "translation": "ಅಪ್ಲಿಕೇಶನ್ ಡೀಬಗ್ ಫ್ಲ್ಯಾಗ್‌ಗಳು"
   },
+  "e0c88179b3": {
+    "translation": "ಸದಸ್ಯರನ್ನು ಆಹ್ವಾನಿಸಿ"
+  },
+  "e2198d6228": {
+    "translation": "ಆಹ್ವಾನ ಲಿಂಕ್ ನಕಲಿಸಿ"
+  },
   "e2ae80a510": {
     "translation": "ಕಾನೂನು ಸಾರಾಂಶ"
   },
+  "e3afed0047": {
+    "translation": "ನಿರ್ವಾಹಕ"
+  },
   "e404559826": {
     "translation": "ಸೇವಾ ನಿಯಮಗಳು"
   },
-  "e78e14c5f1": {
-    "translation": "ಪಿನ್"
+  "e81c4e4f2b": {
+    "translation": "ಅಥವಾ"
+  },
+  "ea0626ac5a": {
+    "translation": "ಅಪಾಯ ವಲಯ"
   },
   "ea4788705e": {
     "translation": "ರದ್ದುಮಾಡಿ"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "ಇನ್ನಷ್ಟು ತಿಳಿದುಕೊಳ್ಳಲು ನಮ್ಮ <a>ಕುಕೀ ನೀತಿಯನ್ನು</a> ಓದಿ."
   },
+  "ef53538ae4": {
+    "translation": "ಸದಸ್ಯರು"
+  },
   "ef7de3f485": {
     "translation": "ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
   },
+  "f714e36843": {
+    "translation": "ನೀವು ಈ ಗುಂಪನ್ನು ತೊರೆಯಲು ಖಚಿತವಾಗಿ ಬಯಸುತ್ತೀರಾ?"
+  },
+  "fa2ead697d": {
+    "translation": "ಗೌಪ್ಯತಾ ನೀತಿ"
+  },
   "fb15c53f22": {
     "translation": "ವೀಕ್ಷಕ"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "ನಕಲಿಸಲಾದ ಲಿಂಕ್"
   },
+  "ff7a814974": {
+    "translation": "ಫೈಲ್ ಲಿಂಕ್ ಸೇರಿಸಿ..."
+  },
   "ffcd73e997": {
     "translation": "ಫೈಲ್ ಆಮದು ಮಾಡಿ..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/ko-kr.json b/apps/dotcom/client/public/tla/locales/ko-kr.json
index f851029090d8..1d52b0498a23 100644
--- a/apps/dotcom/client/public/tla/locales/ko-kr.json
+++ b/apps/dotcom/client/public/tla/locales/ko-kr.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "계정"
   },
+  "08d2d725a9": {
+    "translation": "무료 계정을 만들어서 작업 내용을 저장하고, 실시간으로 협업하고, 다양한 기능을 활용하세요."
+  },
   "0b27918290": {
     "translation": "파일"
   },
   "0b9a4cde72": {
     "translation": "파일 메뉴"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw는 무료로 즉시 사용할 수 있는 가상 화이트보드입니다."
+  },
   "0d1f2bb523": {
     "translation": "피드백 보내기"
   },
   "110a4b01be": {
     "translation": "게시"
   },
+  "129b9e34ea": {
+    "translation": "그룹 탈퇴"
+  },
+  "12a6766ba1": {
+    "translation": "파일 고정 해제"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK를 사용해 보세요"
   },
   "13ddd375ad": {
     "translation": "내보내기 형식"
   },
+  "146ffe2fd9": {
+    "translation": "더 보기"
+  },
+  "14d65465b7": {
+    "translation": "그룹 삭제"
+  },
   "181b90f889": {
     "translation": "파일 생성"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "이 방의 크기 제한에 거의 도달했습니다. 일부 콘텐츠를 삭제하거나 새 파일을 만들어 보세요."
   },
+  "2445e5e347": {
+    "translation": "그룹 만들기"
+  },
   "250ddea65c": {
     "translation": "tldraw에 대하여"
   },
   "299cb00a7a": {
     "translation": "업로드 실패"
   },
+  "2c3ef76333": {
+    "translation": "내 파일"
+  },
   "2deec2cb74": {
     "translation": "이 채팅방은 크기 제한에 도달하여 변경 사항이 더 이상 저장되지 않을 수 있습니다. 일부 콘텐츠를 삭제하거나 새 파일을 시작하세요."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n(국제화): 하이라이트 누락"
   },
+  "32210b37e4": {
+    "translation": "링크 추가"
+  },
   "335defdafe": {
     "translation": "페이지를 새로 고침해 주세요."
   },
   "344a7f427f": {
     "translation": "편집기"
   },
+  "3bc7d6ea2f": {
+    "translation": "이메일로 계속하기"
+  },
   "3bd1b98dbd": {
     "translation": "변경 사항을 게시할 수 없습니다."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "다시 로드해주세요"
+  "47f493a590": {
+    "translation": "핀 파일"
   },
-  "764671e008": {
-    "translation": "Discord에서 우리와 채팅하세요"
+  "49049467ff": {
+    "translation": "tldraw 파일 URL을 붙여넣습니다..."
   },
   "4908687e50": {
     "translation": "이 파일을 무시하시겠습니까?"
   },
+  "49ee308734": {
+    "translation": "이름"
+  },
   "4d0d3ddec9": {
     "translation": "이 사이트에서는 앱을 작동시키고 분석 정보를 수집하기 위해 쿠키를 사용합니다."
   },
   "4d1c8263ba": {
     "translation": "다시 로드"
   },
+  "4da5988a2e": {
+    "translation": "그룹 삭제…"
+  },
+  "4e6fbf032b": {
+    "translation": "이 그룹을 삭제하시겠습니까? 이 작업은 실행 취소할 수 없습니다."
+  },
   "50db1b7e1e": {
     "translation": "파일 게시를 취소할 수 없습니다."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "개인정보 보호정책"
   },
+  "5a86b22fa0": {
+    "translation": "시작하려면 파일을 여기로 끌어다 놓거나, <create>파일을 생성</create>하거나, <invite>초대 링크 복사</invite>하세요."
+  },
   "5a95a425f7": {
     "translation": "공유"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "이전 브라우저가 감지되었습니다. 이 앱을 사용하려면 브라우저를 업데이트하세요."
   },
+  "5c6fe42bc2": {
+    "translation": "이 링크를 취소하고 새 링크를 만드세요."
+  },
   "5d26ae7550": {
     "translation": "로그인하기 전에 생성하신 콘텐츠 중 일부를 업로드하지 못했습니다."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "이전"
   },
+  "639bae9ac6": {
+    "translation": "너"
+  },
   "6609dd239e": {
     "translation": "문제가 발생했습니다"
   },
   "6637a98151": {
     "translation": "tldraw의 새 버전이 출시되었습니다. 계속하려면 페이지를 다시 로드하세요."
   },
+  "68257bb646": {
+    "translation": "<br></br><groupName></groupName> 그룹에 초대되었습니다."
+  },
+  "6832ac5936": {
+    "translation": "이메일 주소를 입력하세요"
+  },
   "6a26f54883": {
     "translation": "도움말"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "수동으로 콘텐츠를 가져오려면 다음 단계를 따르세요."
   },
+  "70222abcfc": {
+    "translation": "그룹 설정"
+  },
   "70a6facb9d": {
     "translation": "이번 주"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "쿠키 관리"
   },
+  "7697920637": {
+    "translation": "다시 로드해주세요"
+  },
+  "764671e008": {
+    "translation": "Discord에서 우리와 채팅하세요"
+  },
   "777f9e90cf": {
     "translation": "유효하지 않은 요청입니다."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "무시"
   },
+  "7cfe6c43dc": {
+    "translation": "그룹 탈퇴…"
+  },
   "7daeced9ff": {
     "translation": "변경 사항 게시"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "파일 이름 바꾸기"
   },
+  "8ad4303b83": {
+    "translation": "아니요, 고맙습니다"
+  },
   "8b1946f965": {
     "translation": "편집을 계속하려면 해당 방을 파일로 복사하세요."
   },
+  "8c2d3d730c": {
+    "translation": "이메일에서 인증 코드를 확인하세요."
+  },
   "8eb2c00e96": {
     "translation": "나와 공유됨"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "내 파일로 복사"
   },
+  "930390d222": {
+    "translation": "초대 링크 복사됨"
+  },
+  "95aacd4d4a": {
+    "translation": "Google로 로그인"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK로 빌드"
+  },
   "96165d6df5": {
     "translation": "이번 달"
   },
+  "985a4b720f": {
+    "translation": "이용 약관"
+  },
+  "98c997a27e": {
+    "translation": "파일 링크 추가"
+  },
   "9914a0ce04": {
     "translation": "라이트"
   },
+  "9b33f5c63c": {
+    "translation": "코드를 받지 못하셨나요? <resend>다시 보내기</resend>."
+  },
   "9bef626805": {
     "translation": "파일 삭제"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "배경"
   },
+  "aa916767cf": {
+    "translation": "초대를 수락하려면 로그인하세요"
+  },
   "ab0df9ba36": {
     "translation": "파일 제한에 도달했습니다"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "게스트 사용자"
   },
+  "b357b524e7": {
+    "translation": "이메일 주소"
+  },
+  "b3d2db69fe": {
+    "translation": "파일 URL"
+  },
   "b6d4223e60": {
     "translation": "로그인"
   },
+  "b6f4a2ec63": {
+    "translation": "소유자"
+  },
   "b758336699": {
     "translation": "링크 복사"
   },
   "ba0318cb81": {
     "translation": "공유하려면 로그인하세요"
   },
-  "bb792693e2": {
-    "translation": "고정 해제"
+  "bb93a7590f": {
+    "translation": "그룹 수락 및 가입"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {{uploaded}개 중 {total}개의 .tldr 파일을 업로드하는 중…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} 님이 공유함"
   },
-  "bcb62136a3": {
-    "translation": ".tldr 파일 업로드"
-  },
   "c2276c9127": {
     "translation": "공유에 대해 자세히 알아보세요."
   },
+  "c28aed8348": {
+    "translation": "<cookies>analytics</cookies>를 허용하여 tldraw를 개선하세요."
+  },
   "c303bd1095": {
     "translation": "이 파일을 게시할 수 없습니다."
   },
   "c4b39a1cc3": {
     "translation": "필수 쿠키"
   },
+  "c6155aaecc": {
+    "translation": "그룹 이름"
+  },
   "c655b27b1e": {
     "translation": "i18n(국제화): 롱 스트링"
   },
   "c6a00f137b": {
     "translation": "초대"
   },
+  "c74ea6dbff": {
+    "translation": "덜 보기"
+  },
   "c87aacf567": {
     "translation": "로그아웃"
   },
+  "c9cc8cce24": {
+    "translation": "구하다"
+  },
   "cceaefbc20": {
     "translation": "이 파일 공유"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "사이드바 전환"
   },
+  "d638a3344b": {
+    "translation": "시작하기에 앞서, <tos>이용약관</tos> 및 <privacy>개인정보처리방침</privacy>에 동의해 주시기 바랍니다."
+  },
   "d721757161": {
     "translation": "테마"
   },
   "d876a9fe1a": {
     "translation": "다시 시도"
   },
+  "d88ad2dc74": {
+    "translation": "수락하고 계속하세요"
+  },
   "d9100f3e10": {
     "translation": "여기로 이동하여 콘텐츠 보기"
   },
+  "d9e35d0f55": {
+    "translation": "최대 그룹 수에 도달했습니다. 새 그룹을 만들려면 기존 그룹을 삭제해야 합니다."
+  },
   "dbbebf3c03": {
     "translation": "초대만"
   },
+  "dcdaa754fe": {
+    "translation": "잘못된 tldraw 파일 URL"
+  },
   "dfdb78a4e4": {
     "translation": "앱 디버그 신고"
   },
+  "e0c88179b3": {
+    "translation": "회원 초대"
+  },
+  "e2198d6228": {
+    "translation": "초대 링크 복사"
+  },
   "e2ae80a510": {
     "translation": "법적 요약"
   },
+  "e3afed0047": {
+    "translation": "관리자"
+  },
   "e404559826": {
     "translation": "서비스 약관"
   },
-  "e78e14c5f1": {
-    "translation": "고정"
+  "e81c4e4f2b": {
+    "translation": "또는"
+  },
+  "ea0626ac5a": {
+    "translation": "위험 구역"
   },
   "ea4788705e": {
     "translation": "취소"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "자세한 내용을 알아보려면 <a>쿠키 정책</a>을 읽어보세요."
   },
+  "ef53538ae4": {
+    "translation": "회원들"
+  },
   "ef7de3f485": {
     "translation": "선택된"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "설정"
   },
+  "f714e36843": {
+    "translation": "정말로 이 그룹을 떠나시겠습니까?"
+  },
+  "fa2ead697d": {
+    "translation": "개인정보 보호정책"
+  },
   "fb15c53f22": {
     "translation": "뷰어"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "복사된 링크"
   },
+  "ff7a814974": {
+    "translation": "파일 링크 추가…"
+  },
   "ffcd73e997": {
     "translation": "파일 가져오기…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ml.json b/apps/dotcom/client/public/tla/locales/ml.json
index ffcc5779f95e..4bc8557076a8 100644
--- a/apps/dotcom/client/public/tla/locales/ml.json
+++ b/apps/dotcom/client/public/tla/locales/ml.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "അക്കൗണ്ട്"
   },
+  "08d2d725a9": {
+    "translation": "നിങ്ങളുടെ ജോലി സംരക്ഷിക്കാനും, തത്സമയം സഹകരിക്കാനും, മറ്റും ഒരു സൗജന്യ അക്കൗണ്ട് സൃഷ്ടിക്കുക."
+  },
   "0b27918290": {
     "translation": "ഫയൽ"
   },
   "0b9a4cde72": {
     "translation": "ഫയൽ മെനു"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ഒരു സൗജന്യവും തൽക്ഷണവുമായ വെർച്വൽ വൈറ്റ്‌ബോർഡാണ്."
+  },
   "0d1f2bb523": {
     "translation": "ഫീഡ്‌ബാക്ക് അയയ്‌ക്കുക"
   },
   "110a4b01be": {
     "translation": "പ്രസിദ്ധീകരിക്കുക"
   },
+  "129b9e34ea": {
+    "translation": "ഗ്രൂപ്പ് വിടുക"
+  },
+  "12a6766ba1": {
+    "translation": "ഫയൽ അൺപിൻ ചെയ്യുക"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK പരീക്ഷിച്ചു നോക്കൂ"
   },
   "13ddd375ad": {
     "translation": "ആയി കയറ്റുമതി ചെയ്യുക"
   },
+  "146ffe2fd9": {
+    "translation": "കൂടുതൽ കാണിക്കുക"
+  },
+  "14d65465b7": {
+    "translation": "ഗ്രൂപ്പ് ഇല്ലാതാക്കുക"
+  },
   "181b90f889": {
     "translation": "ഫയൽ സൃഷ്ടിക്കുക"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "ഈ മുറിയുടെ വലുപ്പ പരിധി അടുക്കുന്നു. കുറച്ച് ഉള്ളടക്കം നീക്കം ചെയ്യുന്നതോ പുതിയൊരു ഫയൽ ആരംഭിക്കുന്നതോ പരിഗണിക്കുക."
   },
+  "2445e5e347": {
+    "translation": "ഗ്രൂപ്പ് സൃഷ്ടിക്കുക"
+  },
   "250ddea65c": {
     "translation": "tldraw-നെക്കുറിച്ച്"
   },
   "299cb00a7a": {
     "translation": "അപ്‌ലോഡ് പരാജയപ്പെട്ടു"
   },
+  "2c3ef76333": {
+    "translation": "എന്റെ ഫയലുകൾ"
+  },
   "2deec2cb74": {
     "translation": "ഈ മുറിയുടെ വലുപ്പ പരിധി എത്തിയിരിക്കുന്നു, മാറ്റങ്ങൾ ഇനി സംരക്ഷിക്കാൻ കഴിഞ്ഞേക്കില്ല. കുറച്ച് ഉള്ളടക്കം നീക്കം ചെയ്യുക അല്ലെങ്കിൽ ഒരു പുതിയ ഫയൽ ആരംഭിക്കുക."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: ഹൈലൈറ്റ് നഷ്‌ടമായി"
   },
+  "32210b37e4": {
+    "translation": "ലിങ്ക് ചേർക്കുക"
+  },
   "335defdafe": {
     "translation": "പേജ് പുതുക്കാൻ ശ്രമിക്കുക."
   },
   "344a7f427f": {
     "translation": "എഡിറ്റർ"
   },
+  "3bc7d6ea2f": {
+    "translation": "ഇമെയിൽ വഴി തുടരുക"
+  },
   "3bd1b98dbd": {
     "translation": "മാറ്റങ്ങൾ പ്രസിദ്ധീകരിക്കാൻ കഴിയുന്നില്ല."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "ദയവായി വീണ്ടും ലോഡുചെയ്യുക"
+  "47f493a590": {
+    "translation": "ഫയൽ പിൻ ചെയ്യുക"
   },
-  "764671e008": {
-    "translation": "ഡിസ്കോർഡിൽ ഞങ്ങളുമായി ചാറ്റ് ചെയ്യൂ"
+  "49049467ff": {
+    "translation": "tldraw ഫയലിന്റെ URL ഒട്ടിക്കുക..."
   },
   "4908687e50": {
     "translation": "ഈ ഫയൽ മറക്കണമെന്ന് തീർച്ചയാണോ?"
   },
+  "49ee308734": {
+    "translation": "പേര്"
+  },
   "4d0d3ddec9": {
     "translation": "ആപ്പ് പ്രവർത്തിപ്പിക്കുന്നതിനും അനലിറ്റിക്‌സ് ശേഖരിക്കുന്നതിനും ഈ സൈറ്റ് കുക്കികൾ ഉപയോഗിക്കുന്നു."
   },
   "4d1c8263ba": {
     "translation": "വീണ്ടും ലോഡുചെയ്യുക"
   },
+  "4da5988a2e": {
+    "translation": "ഗ്രൂപ്പ് ഇല്ലാതാക്കുക..."
+  },
+  "4e6fbf032b": {
+    "translation": "ഈ ഗ്രൂപ്പ് ഇല്ലാതാക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ? ഈ പ്രവർത്തനം പഴയപടിയാക്കാൻ കഴിയില്ല."
+  },
   "50db1b7e1e": {
     "translation": "ഫയൽ പ്രസിദ്ധീകരിച്ചത് മാറ്റാനായില്ല."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "സ്വകാര്യതാ നയം"
   },
+  "5a86b22fa0": {
+    "translation": "ആരംഭിക്കുന്നതിന് ഫയലുകൾ ഇവിടെ വലിച്ചിടുക, <create> ഒരു ഫയൽ സൃഷ്ടിക്കുക</create>, അല്ലെങ്കിൽ <invite> ക്ഷണ ലിങ്ക് പകർത്തുക</invite> ചെയ്യുക."
+  },
   "5a95a425f7": {
     "translation": "പങ്കിടുക"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "പഴയ ബ്രൗസർ കണ്ടെത്തി. ഈ ആപ്പ് ഉപയോഗിക്കാൻ നിങ്ങളുടെ ബ്രൗസർ അപ്‌ഡേറ്റ് ചെയ്യുക."
   },
+  "5c6fe42bc2": {
+    "translation": "ഈ ലിങ്ക് റദ്ദാക്കി പുതിയൊരെണ്ണം സൃഷ്ടിക്കുക."
+  },
   "5d26ae7550": {
     "translation": "നിങ്ങൾ സൈൻ ഇൻ ചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾ സൃഷ്‌ടിച്ച ചില ഉള്ളടക്കങ്ങൾ അപ്‌ലോഡ് ചെയ്യുന്നതിൽ ഞങ്ങൾ പരാജയപ്പെട്ടു."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "പഴയത്"
   },
+  "639bae9ac6": {
+    "translation": "നീ"
+  },
   "6609dd239e": {
     "translation": "എന്തോ കുഴപ്പം സംഭവിച്ചു"
   },
   "6637a98151": {
     "translation": "tldraw യുടെ പുതിയ പതിപ്പ് ലഭ്യമാണ്. തുടരാൻ പേജ് വീണ്ടും ലോഡുചെയ്യുക."
   },
+  "68257bb646": {
+    "translation": "നിങ്ങളെ <br></br><groupName></groupName> എന്ന ഗ്രൂപ്പിലേക്ക് ക്ഷണിച്ചിരിക്കുന്നു."
+  },
+  "6832ac5936": {
+    "translation": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം നൽകുക"
+  },
   "6a26f54883": {
     "translation": "സഹായം"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "ഉള്ളടക്കം നേരിട്ട് ഇറക്കുമതി ചെയ്യാൻ ഈ ഘട്ടങ്ങൾ പാലിക്കുക:"
   },
+  "70222abcfc": {
+    "translation": "ഗ്രൂപ്പ് ക്രമീകരണങ്ങൾ"
+  },
   "70a6facb9d": {
     "translation": "ഈ ആഴ്ച"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "കുക്കികൾ നിയന്ത്രിക്കുക"
   },
+  "7697920637": {
+    "translation": "ദയവായി വീണ്ടും ലോഡുചെയ്യുക"
+  },
+  "764671e008": {
+    "translation": "ഡിസ്കോർഡിൽ ഞങ്ങളുമായി ചാറ്റ് ചെയ്യൂ"
+  },
   "777f9e90cf": {
     "translation": "അസാധുവായ അഭ്യർത്ഥന."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "മറക്കുക"
   },
+  "7cfe6c43dc": {
+    "translation": "ഗ്രൂപ്പ് വിടുക..."
+  },
   "7daeced9ff": {
     "translation": "മാറ്റങ്ങൾ പ്രസിദ്ധീകരിക്കുക"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ഫയലിൻ്റെ പേരുമാറ്റുക"
   },
+  "8ad4303b83": {
+    "translation": "വേണ്ട, നന്ദി"
+  },
   "8b1946f965": {
     "translation": "എഡിറ്റ് ചെയ്യുന്നത് തുടരാൻ, റൂം നിങ്ങളുടെ ഫയലുകളിലേക്ക് പകർത്തുക."
   },
+  "8c2d3d730c": {
+    "translation": "സ്ഥിരീകരണ കോഡിനായി നിങ്ങളുടെ ഇമെയിൽ പരിശോധിക്കുക."
+  },
   "8eb2c00e96": {
     "translation": "നിങ്ങളുമായി പങ്കിട്ടു"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "എൻ്റെ ഫയലുകളിലേക്ക് പകർത്തുക"
   },
+  "930390d222": {
+    "translation": "ക്ഷണ ലിങ്ക് പകർത്തി"
+  },
+  "95aacd4d4a": {
+    "translation": "Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK ഉപയോഗിച്ച് നിർമ്മിക്കുക"
+  },
   "96165d6df5": {
     "translation": "ഈ മാസം"
   },
+  "985a4b720f": {
+    "translation": "ഉപയോഗ നിബന്ധനകൾ"
+  },
+  "98c997a27e": {
+    "translation": "ഫയൽ ലിങ്ക് ചേർക്കുക"
+  },
   "9914a0ce04": {
     "translation": "വെളിച്ചം"
   },
+  "9b33f5c63c": {
+    "translation": "കോഡ് ലഭിച്ചില്ലേ? <resend>വീണ്ടും അയയ്ക്കുക</resend>."
+  },
   "9bef626805": {
     "translation": "ഫയൽ ഇല്ലാതാക്കുക"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "പശ്ചാത്തലം"
   },
+  "aa916767cf": {
+    "translation": "ക്ഷണം സ്വീകരിക്കാൻ സൈൻ ഇൻ ചെയ്യുക"
+  },
   "ab0df9ba36": {
     "translation": "ഫയൽ പരിധി എത്തി"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "അതിഥി ഉപയോക്താവ്"
   },
+  "b357b524e7": {
+    "translation": "ഇമെയിൽ വിലാസം"
+  },
+  "b3d2db69fe": {
+    "translation": "ഫയൽ URL"
+  },
   "b6d4223e60": {
     "translation": "സൈൻ ഇൻ"
   },
+  "b6f4a2ec63": {
+    "translation": "ഉടമസ്ഥൻ"
+  },
   "b758336699": {
     "translation": "ലിങ്ക് പകർത്തുക"
   },
   "ba0318cb81": {
     "translation": "പങ്കിടാൻ സൈൻ ഇൻ ചെയ്യുക"
   },
-  "bb792693e2": {
-    "translation": "അൺപിൻ ചെയ്യുക"
+  "bb93a7590f": {
+    "translation": "അംഗീകരിച്ച് ഗ്രൂപ്പിൽ ചേരുക"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr ഫയൽ അപ്‌ലോഡ് ചെയ്യുന്നു…} other {{total} .tldr ഫയലുകളിൽ {uploaded} അപ്‌ലോഡ് ചെയ്യുന്നു…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "പങ്കിട്ടത് {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": ".tldr ഫയലുകൾ അപ്‌ലോഡ് ചെയ്യുക"
-  },
   "c2276c9127": {
     "translation": "പങ്കിടുന്നതിനെക്കുറിച്ച് കൂടുതലറിയുക."
   },
+  "c28aed8348": {
+    "translation": "tldraw മെച്ചപ്പെടുത്താൻ ഞങ്ങളെ സഹായിക്കുന്നതിന് <cookies>analytics</cookies> അനുവദിക്കുക."
+  },
   "c303bd1095": {
     "translation": "ഫയൽ പ്രസിദ്ധീകരിക്കാനായില്ല."
   },
   "c4b39a1cc3": {
     "translation": "അവശ്യ കുക്കികൾ"
   },
+  "c6155aaecc": {
+    "translation": "ഗ്രൂപ്പിന്റെ പേര്"
+  },
   "c655b27b1e": {
     "translation": "i18n: നീണ്ട സ്ട്രിംഗ്"
   },
   "c6a00f137b": {
     "translation": "ക്ഷണിക്കുക"
   },
+  "c74ea6dbff": {
+    "translation": "കുറച്ച് കാണിക്കുക"
+  },
   "c87aacf567": {
     "translation": "സൈൻ ഔട്ട്"
   },
+  "c9cc8cce24": {
+    "translation": "രക്ഷിക്കും"
+  },
   "cceaefbc20": {
     "translation": "ഈ ഫയൽ പങ്കിടുക"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "സൈഡ്‌ബാർ ടോഗിൾ ചെയ്യുക"
   },
+  "d638a3344b": {
+    "translation": "ആരംഭിക്കുന്നതിന് മുമ്പ്, ദയവായി ഞങ്ങളുടെ <tos>ഉപയോഗ നിബന്ധനകൾ</tos>, <privacy>സ്വകാര്യതാ നയം</privacy> എന്നിവ അംഗീകരിക്കുക."
+  },
   "d721757161": {
     "translation": "തീം"
   },
   "d876a9fe1a": {
     "translation": "വീണ്ടും ശ്രമിക്കുക"
   },
+  "d88ad2dc74": {
+    "translation": "അംഗീകരിച്ച് തുടരുക"
+  },
   "d9100f3e10": {
     "translation": "ഉള്ളടക്കം കാണാൻ ഇവിടെ പോകുക"
   },
+  "d9e35d0f55": {
+    "translation": "നിങ്ങൾ ഗ്രൂപ്പുകളുടെ പരമാവധി എണ്ണത്തിലെത്തി. പുതിയവ സൃഷ്ടിക്കുന്നതിന് മുമ്പ് പഴയ ഗ്രൂപ്പുകൾ ഇല്ലാതാക്കേണ്ടതുണ്ട്."
+  },
   "dbbebf3c03": {
     "translation": "ക്ഷണിക്കുക മാത്രം"
   },
+  "dcdaa754fe": {
+    "translation": "tldraw ഫയൽ URL അസാധുവാണ്."
+  },
   "dfdb78a4e4": {
     "translation": "ആപ്പ് ഡീബഗ് ഫ്ലാഗുകൾ"
   },
+  "e0c88179b3": {
+    "translation": "അംഗങ്ങളെ ക്ഷണിക്കുക"
+  },
+  "e2198d6228": {
+    "translation": "ക്ഷണ ലിങ്ക് പകർത്തുക"
+  },
   "e2ae80a510": {
     "translation": "നിയമപരമായ സംഗ്രഹം"
   },
+  "e3afed0047": {
+    "translation": "അഡ്മിൻ"
+  },
   "e404559826": {
     "translation": "സേവന നിബന്ധനകൾ"
   },
-  "e78e14c5f1": {
-    "translation": "പിൻ"
+  "e81c4e4f2b": {
+    "translation": "അല്ലെങ്കിൽ"
+  },
+  "ea0626ac5a": {
+    "translation": "അപകട മേഖല"
   },
   "ea4788705e": {
     "translation": "റദ്ദാക്കുക"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "കൂടുതലറിയാൻ ഞങ്ങളുടെ <a>കുക്കി നയം</a> വായിക്കുക."
   },
+  "ef53538ae4": {
+    "translation": "അംഗങ്ങൾ"
+  },
   "ef7de3f485": {
     "translation": "തിരഞ്ഞെടുത്തു"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "ക്രമീകരണങ്ങൾ"
   },
+  "f714e36843": {
+    "translation": "ഈ ഗ്രൂപ്പ് വിടണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"
+  },
+  "fa2ead697d": {
+    "translation": "സ്വകാര്യതാ നയം"
+  },
   "fb15c53f22": {
     "translation": "കാഴ്ചക്കാരൻ"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "പകർത്തിയ ലിങ്ക്"
   },
+  "ff7a814974": {
+    "translation": "ഫയൽ ലിങ്ക് ചേർക്കുക..."
+  },
   "ffcd73e997": {
     "translation": "ഫയൽ ഇറക്കുമതി ചെയ്യുക..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/mr.json b/apps/dotcom/client/public/tla/locales/mr.json
index f1cade9fa09f..72a539936a40 100644
--- a/apps/dotcom/client/public/tla/locales/mr.json
+++ b/apps/dotcom/client/public/tla/locales/mr.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "खाते"
   },
+  "08d2d725a9": {
+    "translation": "तुमचे काम जतन करण्यासाठी, रिअल-टाइममध्ये सहयोग करण्यासाठी आणि बरेच काही करण्यासाठी एक मोफत खाते तयार करा."
+  },
   "0b27918290": {
     "translation": "फाईल"
   },
   "0b9a4cde72": {
     "translation": "फाइल मेनू"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw हा एक मोफत आणि त्वरित व्हर्च्युअल व्हाईटबोर्ड आहे."
+  },
   "0d1f2bb523": {
     "translation": "अभिप्राय पाठवा"
   },
   "110a4b01be": {
     "translation": "प्रकाशित करा"
   },
+  "129b9e34ea": {
+    "translation": "गट सोडा"
+  },
+  "12a6766ba1": {
+    "translation": "फाइल अनपिन करा"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK वापरून पहा."
   },
   "13ddd375ad": {
     "translation": "म्हणून निर्यात करा"
   },
+  "146ffe2fd9": {
+    "translation": "अजून दाखवा"
+  },
+  "14d65465b7": {
+    "translation": "गट हटवा"
+  },
   "181b90f889": {
     "translation": "फाइल तयार करा"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "ही खोली त्याच्या आकार मर्यादेपर्यंत पोहोचत आहे. काही सामग्री काढून टाकण्याचा किंवा नवीन फाइल सुरू करण्याचा विचार करा."
   },
+  "2445e5e347": {
+    "translation": "गट तयार करा"
+  },
   "250ddea65c": {
     "translation": "tldraw बद्दल"
   },
   "299cb00a7a": {
     "translation": "अपलोड अयशस्वी"
   },
+  "2c3ef76333": {
+    "translation": "माझ्या फायली"
+  },
   "2deec2cb74": {
     "translation": "या रूमने आकार मर्यादा गाठली आहे आणि बदल कदाचित आता सेव्ह केले जाणार नाहीत. काही आशय काढून टाका किंवा नवीन फाइल सुरू करा."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: हायलाइट गहाळ"
   },
+  "32210b37e4": {
+    "translation": "लिंक जोडा"
+  },
   "335defdafe": {
     "translation": "कृपया पृष्ठ रीफ्रेश करण्याचा प्रयत्न करा."
   },
   "344a7f427f": {
     "translation": "संपादक"
   },
+  "3bc7d6ea2f": {
+    "translation": "ईमेलसह सुरू ठेवा"
+  },
   "3bd1b98dbd": {
     "translation": "बदल प्रकाशित करण्यात अक्षम."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "कृपया रीलोड करा"
+  "47f493a590": {
+    "translation": "फाइल पिन करा"
   },
-  "764671e008": {
-    "translation": "डिस्कॉर्डवर आमच्याशी गप्पा मारा"
+  "49049467ff": {
+    "translation": "tldraw फाइलची URL पेस्ट करा..."
   },
   "4908687e50": {
     "translation": "तुमची खात्री आहे की तुम्ही ही फाइल विसरू इच्छिता?"
   },
+  "49ee308734": {
+    "translation": "नाव"
+  },
   "4d0d3ddec9": {
     "translation": "ही साइट अ‍ॅपला काम करण्यासाठी आणि विश्लेषणे गोळा करण्यासाठी कुकीज वापरते."
   },
   "4d1c8263ba": {
     "translation": "रीलोड करा"
   },
+  "4da5988a2e": {
+    "translation": "गट हटवा..."
+  },
+  "4e6fbf032b": {
+    "translation": "तुम्हाला हा गट नक्की हटवायचा आहे का? ही कृती पूर्ववत करता येणार नाही."
+  },
   "50db1b7e1e": {
     "translation": "फाइल अप्रकाशित करण्यात अक्षम."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "गोपनीयता धोरण"
   },
+  "5a86b22fa0": {
+    "translation": "सुरुवात करण्यासाठी फायली येथे ड्रॅग करा, <create>फाइल तयार करा</create> किंवा <invite>निमंत्रण लिंक कॉपी करा</invite> करा."
+  },
   "5a95a425f7": {
     "translation": "शेअर करा"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "जुना ब्राउझर आढळला. हे अ‍ॅप वापरण्यासाठी कृपया तुमचा ब्राउझर अपडेट करा."
   },
+  "5c6fe42bc2": {
+    "translation": "ही लिंक रद्द करा आणि एक नवीन तयार करा."
+  },
   "5d26ae7550": {
     "translation": "तुम्ही साइन इन करण्यापूर्वी तुम्ही तयार केलेली काही सामग्री अपलोड करण्यात आम्ही अयशस्वी झालो."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "जुने"
   },
+  "639bae9ac6": {
+    "translation": "तू"
+  },
   "6609dd239e": {
     "translation": "काहीतरी चूक झाली"
   },
   "6637a98151": {
     "translation": "tldraw ची नवीन आवृत्ती उपलब्ध आहे. पुढे सुरू ठेवण्यासाठी कृपया पेज रीलोड करा."
   },
+  "68257bb646": {
+    "translation": "तुम्हाला गटात आमंत्रित केले आहे <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "तुमचा ईमेल पत्ता प्रविष्ट करा."
+  },
   "6a26f54883": {
     "translation": "मदत करा"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "सामग्री व्यक्तिचलितपणे आयात करण्यासाठी या चरणांचे अनुसरण करा:"
   },
+  "70222abcfc": {
+    "translation": "गट सेटिंग्ज"
+  },
   "70a6facb9d": {
     "translation": "या आठवड्यात"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "कुकीज व्यवस्थापित करा"
   },
+  "7697920637": {
+    "translation": "कृपया रीलोड करा"
+  },
+  "764671e008": {
+    "translation": "डिस्कॉर्डवर आमच्याशी गप्पा मारा"
+  },
   "777f9e90cf": {
     "translation": "अवैध विनंती."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "विसरून जा"
   },
+  "7cfe6c43dc": {
+    "translation": "गट सोडा..."
+  },
   "7daeced9ff": {
     "translation": "बदल प्रकाशित करा"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "फाइलचे नाव बदला"
   },
+  "8ad4303b83": {
+    "translation": "नाही धन्यवाद"
+  },
   "8b1946f965": {
     "translation": "संपादन सुरू ठेवण्यासाठी कृपया तुमच्या फाइल्समध्ये रूम कॉपी करा."
   },
+  "8c2d3d730c": {
+    "translation": "पडताळणी कोडसाठी तुमचा ईमेल तपासा."
+  },
   "8eb2c00e96": {
     "translation": "तुमच्यासोबत शेअर केले"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "माझ्या फाइल्समध्ये कॉपी करा"
   },
+  "930390d222": {
+    "translation": "आमंत्रण लिंक कॉपी केली"
+  },
+  "95aacd4d4a": {
+    "translation": "गुगल वापरून साइन इन करा"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK वापरून तयार करा"
+  },
   "96165d6df5": {
     "translation": "या महिन्यात"
   },
+  "985a4b720f": {
+    "translation": "वापराच्या अटी"
+  },
+  "98c997a27e": {
+    "translation": "फाइल लिंक जोडा"
+  },
   "9914a0ce04": {
     "translation": "प्रकाश"
   },
+  "9b33f5c63c": {
+    "translation": "कोड मिळाला नाही का? <resend>पुन्हा पाठवा</resend>."
+  },
   "9bef626805": {
     "translation": "फाइल हटवा"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "पार्श्वभूमी"
   },
+  "aa916767cf": {
+    "translation": "आमंत्रण स्वीकारण्यासाठी साइन इन करा"
+  },
   "ab0df9ba36": {
     "translation": "फाइल मर्यादा गाठली"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "पाहुणा वापरकर्ता"
   },
+  "b357b524e7": {
+    "translation": "ईमेल पत्ता"
+  },
+  "b3d2db69fe": {
+    "translation": "फाइल URL"
+  },
   "b6d4223e60": {
     "translation": "साइन इन करा"
   },
+  "b6f4a2ec63": {
+    "translation": "मालक"
+  },
   "b758336699": {
     "translation": "लिंक कॉपी करा"
   },
   "ba0318cb81": {
     "translation": "शेअर करण्यासाठी साइन इन करा"
   },
-  "bb792693e2": {
-    "translation": "अनपिन करा"
+  "bb93a7590f": {
+    "translation": "स्वीकारा आणि गटात सामील व्हा"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr फाइल अपलोड करत आहे...} other {{total} .tldr फायलींपैकी {uploaded} अपलोड करत आहे...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} द्वारे शेअर केलेले"
   },
-  "bcb62136a3": {
-    "translation": ".tldr फाइल अपलोड करा"
-  },
   "c2276c9127": {
     "translation": "शेअर करण्याबद्दल अधिक जाणून घ्या."
   },
+  "c28aed8348": {
+    "translation": "tldraw सुधारण्यास मदत करण्यासाठी <cookies>analytics</cookies> ला अनुमती द्या."
+  },
   "c303bd1095": {
     "translation": "फाइल प्रकाशित करण्यात अक्षम."
   },
   "c4b39a1cc3": {
     "translation": "आवश्यक कुकीज"
   },
+  "c6155aaecc": {
+    "translation": "गटाचे नाव"
+  },
   "c655b27b1e": {
     "translation": "i18n: लांब स्ट्रिंग"
   },
   "c6a00f137b": {
     "translation": "आमंत्रित करा"
   },
+  "c74ea6dbff": {
+    "translation": "कमी दाखवा"
+  },
   "c87aacf567": {
     "translation": "साइन आउट करा"
   },
+  "c9cc8cce24": {
+    "translation": "जतन करा"
+  },
   "cceaefbc20": {
     "translation": "ही फाईल शेअर करा"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "साइडबार टॉगल करा"
   },
+  "d638a3344b": {
+    "translation": "तुम्ही सुरुवात करण्यापूर्वी, कृपया आमच्या <tos>वापराच्या अटी</tos> आणि <privacy>गोपनीयता धोरण</privacy> स्वीकारा."
+  },
   "d721757161": {
     "translation": "थीम"
   },
   "d876a9fe1a": {
     "translation": "पुन्हा प्रयत्न करा"
   },
+  "d88ad2dc74": {
+    "translation": "स्वीकारा आणि सुरू ठेवा"
+  },
   "d9100f3e10": {
     "translation": "सामग्री पाहण्यासाठी येथे जा"
   },
+  "d9e35d0f55": {
+    "translation": "तुम्ही गटांची कमाल संख्या गाठली आहे. नवीन गट तयार करण्यापूर्वी तुम्हाला जुने गट हटवावे लागतील."
+  },
   "dbbebf3c03": {
     "translation": "फक्त आमंत्रित करा"
   },
+  "dcdaa754fe": {
+    "translation": "चुकीची tldraw फाइल URL"
+  },
   "dfdb78a4e4": {
     "translation": "ॲप डीबग ध्वज"
   },
+  "e0c88179b3": {
+    "translation": "सदस्यांना आमंत्रित करा"
+  },
+  "e2198d6228": {
+    "translation": "आमंत्रण लिंक कॉपी करा"
+  },
   "e2ae80a510": {
     "translation": "कायदेशीर सारांश"
   },
+  "e3afed0047": {
+    "translation": "प्रशासन"
+  },
   "e404559826": {
     "translation": "सेवा अटी"
   },
-  "e78e14c5f1": {
-    "translation": "पिन"
+  "e81c4e4f2b": {
+    "translation": "किंवा"
+  },
+  "ea0626ac5a": {
+    "translation": "धोक्याचा झोन"
   },
   "ea4788705e": {
     "translation": "रद्द करा"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "अधिक जाणून घेण्यासाठी आमची <a>कुकी धोरण</a> वाचा."
   },
+  "ef53538ae4": {
+    "translation": "सदस्य"
+  },
   "ef7de3f485": {
     "translation": "निवडलेले"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "सेटिंग्ज"
   },
+  "f714e36843": {
+    "translation": "तुम्हाला नक्की हा गट सोडायचा आहे का?"
+  },
+  "fa2ead697d": {
+    "translation": "गोपनीयता धोरण"
+  },
   "fb15c53f22": {
     "translation": "दर्शक"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "लिंक कॉपी केली"
   },
+  "ff7a814974": {
+    "translation": "फाइल लिंक जोडा..."
+  },
   "ffcd73e997": {
     "translation": "फाइल इंपोर्ट करा..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/ms.json b/apps/dotcom/client/public/tla/locales/ms.json
index 0c368263c147..00e5898758e5 100644
--- a/apps/dotcom/client/public/tla/locales/ms.json
+++ b/apps/dotcom/client/public/tla/locales/ms.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Akaun"
   },
+  "08d2d725a9": {
+    "translation": "Cipta akaun percuma untuk menyimpan kerja anda, bekerjasama dalam masa nyata dan banyak lagi."
+  },
   "0b27918290": {
     "translation": "Fail"
   },
   "0b9a4cde72": {
     "translation": "menu fail"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ialah papan putih maya percuma dan segera."
+  },
   "0d1f2bb523": {
     "translation": "Hantar maklum balas"
   },
   "110a4b01be": {
     "translation": "Terbitkan"
   },
+  "129b9e34ea": {
+    "translation": "Tinggalkan kumpulan"
+  },
+  "12a6766ba1": {
+    "translation": "Nyahsemat fail"
+  },
   "12c8a9838c": {
     "translation": "Cuba tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Eksport sebagai"
   },
+  "146ffe2fd9": {
+    "translation": "Tunjukkan lagi"
+  },
+  "14d65465b7": {
+    "translation": "Padamkan kumpulan"
+  },
   "181b90f889": {
     "translation": "Buat fail"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Bilik ini menghampiri had saiznya. Pertimbangkan untuk mengalih keluar beberapa kandungan atau memulakan fail baharu."
   },
+  "2445e5e347": {
+    "translation": "Buat kumpulan"
+  },
   "250ddea65c": {
     "translation": "Mengenai tldraw"
   },
   "299cb00a7a": {
     "translation": "Muat naik gagal"
   },
+  "2c3ef76333": {
+    "translation": "Fail saya"
+  },
   "2deec2cb74": {
     "translation": "Bilik ini telah mencapai had saiznya dan perubahan mungkin tidak disimpan lagi. Alih keluar beberapa kandungan atau mulakan fail baharu."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Serlahkan Hilang"
   },
+  "32210b37e4": {
+    "translation": "Tambah pautan"
+  },
   "335defdafe": {
     "translation": "Sila cuba muat semula halaman."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Teruskan dengan e-mel"
+  },
   "3bd1b98dbd": {
     "translation": "Tidak dapat menerbitkan perubahan."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Sila muat semula"
+  "47f493a590": {
+    "translation": "Pin fail"
   },
-  "764671e008": {
-    "translation": "Berbual dengan kami di Discord"
+  "49049467ff": {
+    "translation": "Tampalkan URL fail tdraw..."
   },
   "4908687e50": {
     "translation": "Adakah anda pasti mahu melupakan fail ini?"
   },
+  "49ee308734": {
+    "translation": "Nama"
+  },
   "4d0d3ddec9": {
     "translation": "Tapak ini menggunakan kuki untuk menjadikan apl berfungsi dan mengumpul analitik."
   },
   "4d1c8263ba": {
     "translation": "Muat semula"
   },
+  "4da5988a2e": {
+    "translation": "Padamkan kumpulan…"
+  },
+  "4e6fbf032b": {
+    "translation": "Adakah anda pasti mahu memadamkan kumpulan ini? Tindakan ini tidak boleh dibuat asal."
+  },
   "50db1b7e1e": {
     "translation": "Tidak dapat menyahterbitkan fail."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Dasar privasi"
   },
+  "5a86b22fa0": {
+    "translation": "Seret fail ke sini, <create>buat fail</create> atau <invite>copy link invite</invite> untuk bermula."
+  },
   "5a95a425f7": {
     "translation": "Kongsi"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Pelayar lama dikesan. Sila kemas kini pelayar anda untuk menggunakan aplikasi ini."
   },
+  "5c6fe42bc2": {
+    "translation": "Batalkan pautan ini dan buat yang baharu."
+  },
   "5d26ae7550": {
     "translation": "Kami gagal memuat naik beberapa kandungan yang anda buat sebelum anda melog masuk."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Lebih tua"
   },
+  "639bae9ac6": {
+    "translation": "awak"
+  },
   "6609dd239e": {
     "translation": "Sesuatu telah berlaku"
   },
   "6637a98151": {
     "translation": "Versi baharu tldraw tersedia. Sila muat semula halaman untuk meneruskan."
   },
+  "68257bb646": {
+    "translation": "Anda telah dijemput ke kumpulan <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Masukkan alamat e-mel anda"
+  },
   "6a26f54883": {
     "translation": "Tolong"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Ikuti langkah ini untuk mengimport kandungan secara manual:"
   },
+  "70222abcfc": {
+    "translation": "Tetapan kumpulan"
+  },
   "70a6facb9d": {
     "translation": "minggu ini"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Uruskan kuki"
   },
+  "7697920637": {
+    "translation": "Sila muat semula"
+  },
+  "764671e008": {
+    "translation": "Berbual dengan kami di Discord"
+  },
   "777f9e90cf": {
     "translation": "Permintaan tidak sah."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "lupa"
   },
+  "7cfe6c43dc": {
+    "translation": "Tinggalkan kumpulan…"
+  },
   "7daeced9ff": {
     "translation": "Terbitkan perubahan"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Namakan semula fail"
   },
+  "8ad4303b83": {
+    "translation": "Tidak terima kasih"
+  },
   "8b1946f965": {
     "translation": "Untuk meneruskan pengeditan sila salin bilik ke fail anda."
   },
+  "8c2d3d730c": {
+    "translation": "Semak e-mel anda untuk mendapatkan kod pengesahan."
+  },
   "8eb2c00e96": {
     "translation": "Dikongsi dengan anda"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Salin ke fail saya"
   },
+  "930390d222": {
+    "translation": "Pautan jemputan disalin"
+  },
+  "95aacd4d4a": {
+    "translation": "Log masuk dengan Google"
+  },
+  "95d2109dc8": {
+    "translation": "Bina dengan tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "bulan ini"
   },
+  "985a4b720f": {
+    "translation": "Syarat Penggunaan"
+  },
+  "98c997a27e": {
+    "translation": "Tambah pautan fail"
+  },
   "9914a0ce04": {
     "translation": "Cahaya"
   },
+  "9b33f5c63c": {
+    "translation": "Tidak menerima kod? <resend>Hantar semula</resend>."
+  },
   "9bef626805": {
     "translation": "Padam fail"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Latar belakang"
   },
+  "aa916767cf": {
+    "translation": "Log masuk untuk menerima jemputan"
+  },
   "ab0df9ba36": {
     "translation": "Had fail dicapai"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Pengguna tetamu"
   },
+  "b357b524e7": {
+    "translation": "Alamat e-mel"
+  },
+  "b3d2db69fe": {
+    "translation": "URL fail"
+  },
   "b6d4223e60": {
     "translation": "Log masuk"
   },
+  "b6f4a2ec63": {
+    "translation": "Pemilik"
+  },
   "b758336699": {
     "translation": "Salin pautan"
   },
   "ba0318cb81": {
     "translation": "Log masuk untuk berkongsi"
   },
-  "bb792693e2": {
-    "translation": "Nyahsemat"
+  "bb93a7590f": {
+    "translation": "Terima dan sertai kumpulan"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {Memuat naik {uploaded} daripada {total} fail .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Dikongsi oleh {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Muat naik fail .tldr"
-  },
   "c2276c9127": {
     "translation": "Ketahui lebih lanjut tentang perkongsian."
   },
+  "c28aed8348": {
+    "translation": "Benarkan <cookies>analitik</cookies> untuk membantu kami meningkatkan tldraw."
+  },
   "c303bd1095": {
     "translation": "Tidak dapat menerbitkan fail."
   },
   "c4b39a1cc3": {
     "translation": "Kuki penting"
   },
+  "c6155aaecc": {
+    "translation": "Nama kumpulan"
+  },
   "c655b27b1e": {
     "translation": "i18n: Rentetan Panjang"
   },
   "c6a00f137b": {
     "translation": "Jemput"
   },
+  "c74ea6dbff": {
+    "translation": "Tunjukkan lebih sedikit"
+  },
   "c87aacf567": {
     "translation": "Log keluar"
   },
+  "c9cc8cce24": {
+    "translation": "Jimat"
+  },
   "cceaefbc20": {
     "translation": "Kongsi fail ini"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Togol bar sisi"
   },
+  "d638a3344b": {
+    "translation": "Sebelum anda mula, sila terima <tos>syarat penggunaan</tos> dan <privacy>dasar privasi</privacy> kami."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Cuba Lagi"
   },
+  "d88ad2dc74": {
+    "translation": "Terima dan teruskan"
+  },
   "d9100f3e10": {
     "translation": "Pergi ke sini untuk melihat kandungannya"
   },
+  "d9e35d0f55": {
+    "translation": "Anda telah mencapai bilangan maksimum kumpulan. Anda perlu memadamkan kumpulan lama sebelum membuat kumpulan baharu."
+  },
   "dbbebf3c03": {
     "translation": "Jemput sahaja"
   },
+  "dcdaa754fe": {
+    "translation": "URL fail tldraw tidak sah"
+  },
   "dfdb78a4e4": {
     "translation": "Bendera nyahpepijat apl"
   },
+  "e0c88179b3": {
+    "translation": "Jemput ahli"
+  },
+  "e2198d6228": {
+    "translation": "Salin pautan jemputan"
+  },
   "e2ae80a510": {
     "translation": "Ringkasan undang-undang"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Syarat perkhidmatan"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "atau"
+  },
+  "ea0626ac5a": {
+    "translation": "Zon bahaya"
   },
   "ea4788705e": {
     "translation": "Batal"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Baca <a>dasar kuki</a> kami untuk mengetahui lebih lanjut."
   },
+  "ef53538ae4": {
+    "translation": "ahli"
+  },
   "ef7de3f485": {
     "translation": "dipilih"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "tetapan"
   },
+  "f714e36843": {
+    "translation": "Adakah anda pasti mahu meninggalkan kumpulan ini?"
+  },
+  "fa2ead697d": {
+    "translation": "Dasar Privasi"
+  },
   "fb15c53f22": {
     "translation": "Penonton"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "pautan disalin"
   },
+  "ff7a814974": {
+    "translation": "Tambahkan pautan fail…"
+  },
   "ffcd73e997": {
     "translation": "Import fail…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ne.json b/apps/dotcom/client/public/tla/locales/ne.json
index 9c95ac829b7a..4c84e9370cc4 100644
--- a/apps/dotcom/client/public/tla/locales/ne.json
+++ b/apps/dotcom/client/public/tla/locales/ne.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "खाता"
   },
+  "08d2d725a9": {
+    "translation": "आफ्नो काम बचत गर्न, वास्तविक समयमा सहकार्य गर्न र थप कुराहरू गर्न नि:शुल्क खाता सिर्जना गर्नुहोस्।"
+  },
   "0b27918290": {
     "translation": "फाइल"
   },
   "0b9a4cde72": {
     "translation": "फाइल मेनु"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw एक नि:शुल्क र तत्काल भर्चुअल व्हाइटबोर्ड हो।"
+  },
   "0d1f2bb523": {
     "translation": "प्रतिक्रिया पठाउनुहोस्"
   },
   "110a4b01be": {
     "translation": "प्रकाशित गर्नुहोस्"
   },
+  "129b9e34ea": {
+    "translation": "समूह छोड्नुहोस्"
+  },
+  "12a6766ba1": {
+    "translation": "फाइल अनपिन गर्नुहोस्"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK प्रयोग गरी हेर्नुहोस्"
   },
   "13ddd375ad": {
     "translation": "को रूपमा निर्यात गर्नुहोस्"
   },
+  "146ffe2fd9": {
+    "translation": "थप देखाउनुहोस्"
+  },
+  "14d65465b7": {
+    "translation": "समूह मेटाउनुहोस्"
+  },
   "181b90f889": {
     "translation": "फाइल सिर्जना गर्नुहोस्"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "यो कोठा यसको आकार सीमा नजिकिँदै छ। केही सामग्री हटाउने वा नयाँ फाइल सुरु गर्ने विचार गर्नुहोस्।"
   },
+  "2445e5e347": {
+    "translation": "समूह सिर्जना गर्नुहोस्"
+  },
   "250ddea65c": {
     "translation": "tldraw को बारेमा"
   },
   "299cb00a7a": {
     "translation": "अपलोड असफल भयो"
   },
+  "2c3ef76333": {
+    "translation": "मेरा फाइलहरू"
+  },
   "2deec2cb74": {
     "translation": "यो कोठाको आकार सीमा पुगेको छ र परिवर्तनहरू अब सुरक्षित नहुन सक्छन्। केही सामग्री हटाउनुहोस् वा नयाँ फाइल सुरु गर्नुहोस्।"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: छुटेको हाइलाइट गर्नुहोस्"
   },
+  "32210b37e4": {
+    "translation": "लिङ्क थप्नुहोस्"
+  },
   "335defdafe": {
     "translation": "कृपया पृष्ठ रिफ्रेस गर्ने प्रयास गर्नुहोस्।"
   },
   "344a7f427f": {
     "translation": "सम्पादक"
   },
+  "3bc7d6ea2f": {
+    "translation": "इमेलको साथ जारी राख्नुहोस्"
+  },
   "3bd1b98dbd": {
     "translation": "परिवर्तनहरू प्रकाशित गर्न असमर्थ।"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "कृपया पुन: लोड गर्नुहोस्"
+  "47f493a590": {
+    "translation": "फाइल पिन गर्नुहोस्"
   },
-  "764671e008": {
-    "translation": "Discord मा हामीसँग कुराकानी गर्नुहोस्"
+  "49049467ff": {
+    "translation": "tldraw फाइलको URL टाँस्नुहोस्..."
   },
   "4908687e50": {
     "translation": "के तपाइँ यो फाइल बिर्सन निश्चित हुनुहुन्छ?"
   },
+  "49ee308734": {
+    "translation": "नाम"
+  },
   "4d0d3ddec9": {
     "translation": "यो साइटले एपलाई काम गर्न र विश्लेषण सङ्कलन गर्न कुकीहरू प्रयोग गर्छ।"
   },
   "4d1c8263ba": {
     "translation": "पुन: लोड गर्नुहोस्"
   },
+  "4da5988a2e": {
+    "translation": "समूह मेटाउनुहोस्..."
+  },
+  "4e6fbf032b": {
+    "translation": "के तपाईं यो समूह मेटाउन निश्चित हुनुहुन्छ? यो कार्य पूर्ववत गर्न सकिँदैन।"
+  },
   "50db1b7e1e": {
     "translation": "फाइल अप्रकाशित गर्न असमर्थ।"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "गोपनीयता नीति"
   },
+  "5a86b22fa0": {
+    "translation": "सुरु गर्न फाइलहरू यहाँ तान्नुहोस्, <create>फाइल सिर्जना गर्नुहोस्</create>, वा <invite>निमन्त्रणा लिङ्क प्रतिलिपि गर्नुहोस्</invite>।"
+  },
   "5a95a425f7": {
     "translation": "सेयर गर्नुहोस्"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "पुरानो ब्राउजर पत्ता लाग्यो। यो एप प्रयोग गर्न कृपया आफ्नो ब्राउजर अपडेट गर्नुहोस्।"
   },
+  "5c6fe42bc2": {
+    "translation": "यो लिङ्क रद्द गर्नुहोस् र नयाँ लिङ्क सिर्जना गर्नुहोस्।"
+  },
   "5d26ae7550": {
     "translation": "हामीले तपाईंले साइन इन गर्नु अघि तपाईंले सिर्जना गर्नुभएको केही सामग्री अपलोड गर्न असफल भयो।"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "पुरानो"
   },
+  "639bae9ac6": {
+    "translation": "तिमी"
+  },
   "6609dd239e": {
     "translation": "केही गडबड भयो"
   },
   "6637a98151": {
     "translation": "tldraw को नयाँ संस्करण उपलब्ध छ। जारी राख्न कृपया पृष्ठ पुन: लोड गर्नुहोस्।"
   },
+  "68257bb646": {
+    "translation": "तपाईंलाई समूहमा आमन्त्रित गरिएको छ <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "आफ्नो इमेल ठेगाना प्रविष्ट गर्नुहोस्।"
+  },
   "6a26f54883": {
     "translation": "मद्दत गर्नुहोस्"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "म्यानुअल रूपमा सामग्री आयात गर्न यी चरणहरू पालना गर्नुहोस्:"
   },
+  "70222abcfc": {
+    "translation": "समूह सेटिङहरू"
+  },
   "70a6facb9d": {
     "translation": "यो हप्ता"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "कुकीहरू प्रबन्ध गर्नुहोस्"
   },
+  "7697920637": {
+    "translation": "कृपया पुन: लोड गर्नुहोस्"
+  },
+  "764671e008": {
+    "translation": "Discord मा हामीसँग कुराकानी गर्नुहोस्"
+  },
   "777f9e90cf": {
     "translation": "अवैध अनुरोध।"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "बिर्सनुहोस्"
   },
+  "7cfe6c43dc": {
+    "translation": "समूह छोड्नुहोस्..."
+  },
   "7daeced9ff": {
     "translation": "परिवर्तनहरू प्रकाशित गर्नुहोस्"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "फाइल पुन: नामाकरण गर्नुहोस्"
   },
+  "8ad4303b83": {
+    "translation": "होइन, धन्यवाद"
+  },
   "8b1946f965": {
     "translation": "सम्पादन जारी राख्न कृपया कोठालाई आफ्ना फाइलहरूमा प्रतिलिपि गर्नुहोस्।"
   },
+  "8c2d3d730c": {
+    "translation": "प्रमाणीकरण कोडको लागि आफ्नो इमेल जाँच गर्नुहोस्।"
+  },
   "8eb2c00e96": {
     "translation": "तपाईंसँग साझेदारी गरियो"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "मेरो फाइलहरूमा प्रतिलिपि गर्नुहोस्"
   },
+  "930390d222": {
+    "translation": "निमन्त्रणा लिङ्क प्रतिलिपि गरियो"
+  },
+  "95aacd4d4a": {
+    "translation": "गुगल मार्फत साइन इन गर्नुहोस्"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK प्रयोग गरेर निर्माण गर्नुहोस्"
+  },
   "96165d6df5": {
     "translation": "यो महिना"
   },
+  "985a4b720f": {
+    "translation": "प्रयोगका सर्तहरू"
+  },
+  "98c997a27e": {
+    "translation": "फाइलको लिङ्क थप्नुहोस्"
+  },
   "9914a0ce04": {
     "translation": "उज्यालो"
   },
+  "9b33f5c63c": {
+    "translation": "कोड प्राप्त गर्नुभएन? <resend> पुन: पठाउनुहोस्</resend>।"
+  },
   "9bef626805": {
     "translation": "फाइल मेटाउनुहोस्"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "पृष्ठभूमि"
   },
+  "aa916767cf": {
+    "translation": "निमन्त्रणा स्वीकार गर्न साइन इन गर्नुहोस्"
+  },
   "ab0df9ba36": {
     "translation": "फाइल सीमा पुग्यो"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "अतिथि प्रयोगकर्ता"
   },
+  "b357b524e7": {
+    "translation": "इमेल ठेगाना"
+  },
+  "b3d2db69fe": {
+    "translation": "फाइल URL"
+  },
   "b6d4223e60": {
     "translation": "साइन इन गर्नुहोस्"
   },
+  "b6f4a2ec63": {
+    "translation": "मालिक"
+  },
   "b758336699": {
     "translation": "लिङ्क प्रतिलिपि गर्नुहोस्"
   },
   "ba0318cb81": {
     "translation": "साझेदारी गर्न साइन इन गर्नुहोस्"
   },
-  "bb792693e2": {
-    "translation": "अनपिन गर्नुहोस्"
+  "bb93a7590f": {
+    "translation": "स्वीकार गर्नुहोस् र समूहमा सामेल हुनुहोस्"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr फाइल अपलोड गर्दै...} other {{total} .tldr फाइलहरू मध्ये {uploaded} अपलोड गरिँदै...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} द्वारा साझा गरिएको"
   },
-  "bcb62136a3": {
-    "translation": "tldr फाइलहरू अपलोड गर्नुहोस्"
-  },
   "c2276c9127": {
     "translation": "साझेदारी बारे थप जान्नुहोस्।"
   },
+  "c28aed8348": {
+    "translation": "tldraw सुधार गर्न हामीलाई मद्दत गर्न <cookies>analytics</cookies> लाई अनुमति दिनुहोस्।"
+  },
   "c303bd1095": {
     "translation": "फाइल प्रकाशित गर्न असमर्थ।"
   },
   "c4b39a1cc3": {
     "translation": "आवश्यक कुकीजहरू"
   },
+  "c6155aaecc": {
+    "translation": "समूहको नाम"
+  },
   "c655b27b1e": {
     "translation": "i18n: लामो स्ट्रिङ"
   },
   "c6a00f137b": {
     "translation": "आमन्त्रित गर्नुहोस्"
   },
+  "c74ea6dbff": {
+    "translation": "कम देखाउनुहोस्"
+  },
   "c87aacf567": {
     "translation": "साइन आउट गर्नुहोस्"
   },
+  "c9cc8cce24": {
+    "translation": "बचत गर्नुहोस्"
+  },
   "cceaefbc20": {
     "translation": "यो फाइल साझेदारी गर्नुहोस्"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "साइडबार टगल गर्नुहोस्"
   },
+  "d638a3344b": {
+    "translation": "सुरु गर्नु अघि, कृपया हाम्रो <tos>प्रयोगका सर्तहरू</tos> र <privacy>गोपनीयता नीति</privacy> स्वीकार गर्नुहोस्।"
+  },
   "d721757161": {
     "translation": "विषयवस्तु"
   },
   "d876a9fe1a": {
     "translation": "फेरि प्रयास गर्नुहोस्"
   },
+  "d88ad2dc74": {
+    "translation": "स्वीकार गर्नुहोस् र जारी राख्नुहोस्"
+  },
   "d9100f3e10": {
     "translation": "सामग्री हेर्न यहाँ जानुहोस्"
   },
+  "d9e35d0f55": {
+    "translation": "तपाईंले समूहहरूको अधिकतम संख्यामा पुग्नुभएको छ। नयाँ समूहहरू सिर्जना गर्नु अघि तपाईंले पुराना समूहहरू मेटाउन आवश्यक छ।"
+  },
   "dbbebf3c03": {
     "translation": "निमन्त्रणा मात्र"
   },
+  "dcdaa754fe": {
+    "translation": "अमान्य tldraw फाइल URL"
+  },
   "dfdb78a4e4": {
     "translation": "एप डिबग फ्ल्यागहरू"
   },
+  "e0c88179b3": {
+    "translation": "सदस्यहरूलाई आमन्त्रित गर्नुहोस्"
+  },
+  "e2198d6228": {
+    "translation": "निमन्त्रणाको लिङ्क प्रतिलिपि गर्नुहोस्"
+  },
   "e2ae80a510": {
     "translation": "कानुनी सारांश"
   },
+  "e3afed0047": {
+    "translation": "व्यवस्थापक"
+  },
   "e404559826": {
     "translation": "सेवाका सर्तहरू"
   },
-  "e78e14c5f1": {
-    "translation": "पिन"
+  "e81c4e4f2b": {
+    "translation": "वा"
+  },
+  "ea0626ac5a": {
+    "translation": "खतरा क्षेत्र"
   },
   "ea4788705e": {
     "translation": "रद्द गर्नुहोस्"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "थप जान्नको लागि हाम्रो <a>कुकी नीति</a> पढ्नुहोस्।"
   },
+  "ef53538ae4": {
+    "translation": "सदस्यहरू"
+  },
   "ef7de3f485": {
     "translation": "चयन गरिएको"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "सेटिङहरू"
   },
+  "f714e36843": {
+    "translation": "के तपाईं यो समूह छोड्न निश्चित हुनुहुन्छ?"
+  },
+  "fa2ead697d": {
+    "translation": "गोपनीयता नीति"
+  },
   "fb15c53f22": {
     "translation": "दर्शक"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "प्रतिलिपि गरिएको लिङ्क"
   },
+  "ff7a814974": {
+    "translation": "फाइलको लिङ्क थप्नुहोस्..."
+  },
   "ffcd73e997": {
     "translation": "फाइल आयात गर्नुहोस्..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/nl.json b/apps/dotcom/client/public/tla/locales/nl.json
index abfcf0178bf4..efe1b0f38c00 100644
--- a/apps/dotcom/client/public/tla/locales/nl.json
+++ b/apps/dotcom/client/public/tla/locales/nl.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Rekening"
   },
+  "08d2d725a9": {
+    "translation": "Maak een gratis account aan om uw werk op te slaan, in realtime samen te werken en meer."
+  },
   "0b27918290": {
     "translation": "Bestand"
   },
   "0b9a4cde72": {
     "translation": "Bestandsmenu"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw is een gratis en direct beschikbaar virtueel whiteboard."
+  },
   "0d1f2bb523": {
     "translation": "Feedback sturen"
   },
   "110a4b01be": {
     "translation": "Publiceren"
   },
+  "129b9e34ea": {
+    "translation": "Groep verlaten"
+  },
+  "12a6766ba1": {
+    "translation": "Bestand losmaken"
+  },
   "12c8a9838c": {
     "translation": "Probeer de tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Exporteren als"
   },
+  "146ffe2fd9": {
+    "translation": "Meer weergeven"
+  },
+  "14d65465b7": {
+    "translation": "Groep verwijderen"
+  },
   "181b90f889": {
     "translation": "Bestand aanmaken"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Deze ruimte nadert zijn maximale grootte. Overweeg om wat inhoud te verwijderen of een nieuw bestand te maken."
   },
+  "2445e5e347": {
+    "translation": "Groep aanmaken"
+  },
   "250ddea65c": {
     "translation": "Over tldraw"
   },
   "299cb00a7a": {
     "translation": "Uploaden mislukt"
   },
+  "2c3ef76333": {
+    "translation": "Mijn bestanden"
+  },
   "2deec2cb74": {
     "translation": "Deze ruimte heeft de maximale bestandsgrootte bereikt en wijzigingen worden mogelijk niet meer opgeslagen. Verwijder wat inhoud of begin een nieuw bestand."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Markering ontbreekt"
   },
+  "32210b37e4": {
+    "translation": "Link toevoegen"
+  },
   "335defdafe": {
     "translation": "Probeer de pagina te vernieuwen."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Doorgaan met e-mail"
+  },
   "3bd1b98dbd": {
     "translation": "De wijzigingen konden niet worden gepubliceerd."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Gelieve opnieuw te laden"
+  "47f493a590": {
+    "translation": "Pinbestand"
   },
-  "764671e008": {
-    "translation": "Chat met ons op Discord"
+  "49049467ff": {
+    "translation": "Plak de URL van het tldraw-bestand..."
   },
   "4908687e50": {
     "translation": "Weet u zeker dat u dit bestand wilt vergeten?"
   },
+  "49ee308734": {
+    "translation": "Naam"
+  },
   "4d0d3ddec9": {
     "translation": "Deze site maakt gebruik van cookies om de app te laten werken en om analyses te verzamelen."
   },
   "4d1c8263ba": {
     "translation": "Opnieuw laden"
   },
+  "4da5988a2e": {
+    "translation": "Groep verwijderen…"
+  },
+  "4e6fbf032b": {
+    "translation": "Weet u zeker dat u deze groep wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt."
+  },
   "50db1b7e1e": {
     "translation": "De publicatie van het bestand kan niet ongedaan worden gemaakt."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Privacybeleid"
   },
+  "5a86b22fa0": {
+    "translation": "Sleep bestanden hierheen, <create>maak een bestand</create> of <invite>kopieer de uitnodigingslink</invite> om te beginnen."
+  },
   "5a95a425f7": {
     "translation": "Deel"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Oude browser gedetecteerd. Werk uw browser bij om deze app te gebruiken."
   },
+  "5c6fe42bc2": {
+    "translation": "Trek deze link in en maak een nieuwe."
+  },
   "5d26ae7550": {
     "translation": "Een deel van de content die u hebt gemaakt voordat u zich aanmeldde, is niet geüpload."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Ouder"
   },
+  "639bae9ac6": {
+    "translation": "Jij"
+  },
   "6609dd239e": {
     "translation": "Er is iets fout gegaan"
   },
   "6637a98151": {
     "translation": "Er is een nieuwe versie van tldraw beschikbaar. Laad de pagina opnieuw om verder te gaan."
   },
+  "68257bb646": {
+    "translation": "Je bent uitgenodigd voor groep <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Voer uw e-mailadres in"
+  },
   "6a26f54883": {
     "translation": "Hulp"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Volg deze stappen om de inhoud handmatig te importeren:"
   },
+  "70222abcfc": {
+    "translation": "Groepsinstellingen"
+  },
   "70a6facb9d": {
     "translation": "Deze week"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Cookies beheren"
   },
+  "7697920637": {
+    "translation": "Gelieve opnieuw te laden"
+  },
+  "764671e008": {
+    "translation": "Chat met ons op Discord"
+  },
   "777f9e90cf": {
     "translation": "Ongeldig verzoek."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Vergeten"
   },
+  "7cfe6c43dc": {
+    "translation": "Groep verlaten…"
+  },
   "7daeced9ff": {
     "translation": "Wijzigingen publiceren"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Bestand hernoemen"
   },
+  "8ad4303b83": {
+    "translation": "Nee bedankt"
+  },
   "8b1946f965": {
     "translation": "Om door te kunnen gaan met bewerken, kopieer je de kamer naar je bestanden."
   },
+  "8c2d3d730c": {
+    "translation": "Controleer uw e-mail voor een verificatiecode."
+  },
   "8eb2c00e96": {
     "translation": "Gedeeld met jou"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopieer naar mijn bestanden"
   },
+  "930390d222": {
+    "translation": "Gekopieerde uitnodigingslink"
+  },
+  "95aacd4d4a": {
+    "translation": "Aanmelden met Google"
+  },
+  "95d2109dc8": {
+    "translation": "Bouwen met de tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Deze maand"
   },
+  "985a4b720f": {
+    "translation": "Gebruiksvoorwaarden"
+  },
+  "98c997a27e": {
+    "translation": "Bestandslink toevoegen"
+  },
   "9914a0ce04": {
     "translation": "Licht"
   },
+  "9b33f5c63c": {
+    "translation": "Geen code ontvangen? <resend>Opnieuw verzenden</resend>."
+  },
   "9bef626805": {
     "translation": "Bestand verwijderen"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Achtergrond"
   },
+  "aa916767cf": {
+    "translation": "Meld u aan om de uitnodiging te accepteren"
+  },
   "ab0df9ba36": {
     "translation": "Bestandslimiet bereikt"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gastgebruiker"
   },
+  "b357b524e7": {
+    "translation": "E-mailadres"
+  },
+  "b3d2db69fe": {
+    "translation": "Bestands-URL"
+  },
   "b6d4223e60": {
     "translation": "Aanmelden"
   },
+  "b6f4a2ec63": {
+    "translation": "Eigenaar"
+  },
   "b758336699": {
     "translation": "Link kopiëren"
   },
   "ba0318cb81": {
     "translation": "Meld je aan om te delen"
   },
-  "bb792693e2": {
-    "translation": "Losmaken"
+  "bb93a7590f": {
+    "translation": "Accepteren en lid worden van de groep"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Uploaden van .tldr-bestand…} other {Uploaden van {uploaded} van {total} .tldr-bestanden…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Gedeeld door {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Upload .tldr-bestanden"
-  },
   "c2276c9127": {
     "translation": "Meer informatie over delen."
   },
+  "c28aed8348": {
+    "translation": "Sta <cookies>analytics</cookies> toe om ons te helpen tldraw te verbeteren."
+  },
   "c303bd1095": {
     "translation": "Het bestand kan niet worden gepubliceerd."
   },
   "c4b39a1cc3": {
     "translation": "Essentiële cookies"
   },
+  "c6155aaecc": {
+    "translation": "Groepsnaam"
+  },
   "c655b27b1e": {
     "translation": "i18n: Lange reeks"
   },
   "c6a00f137b": {
     "translation": "Uitnodiging"
   },
+  "c74ea6dbff": {
+    "translation": "Minder weergeven"
+  },
   "c87aacf567": {
     "translation": "Afmelden"
   },
+  "c9cc8cce24": {
+    "translation": "Redden"
+  },
   "cceaefbc20": {
     "translation": "Deel dit bestand"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Schakel zijbalk in"
   },
+  "d638a3344b": {
+    "translation": "Voordat u begint, accepteert u onze <tos>gebruiksvoorwaarden</tos> en ons <privacy>privacybeleid</privacy>."
+  },
   "d721757161": {
     "translation": "Thema"
   },
   "d876a9fe1a": {
     "translation": "Probeer het opnieuw"
   },
+  "d88ad2dc74": {
+    "translation": "Accepteren en doorgaan"
+  },
   "d9100f3e10": {
     "translation": "Ga hierheen om de inhoud te bekijken"
   },
+  "d9e35d0f55": {
+    "translation": "Je hebt het maximale aantal groepen bereikt. Je moet oude groepen verwijderen voordat je nieuwe kunt aanmaken."
+  },
   "dbbebf3c03": {
     "translation": "Alleen op uitnodiging"
   },
+  "dcdaa754fe": {
+    "translation": "Ongeldige tldraw-bestands-URL"
+  },
   "dfdb78a4e4": {
     "translation": "App-debug vlaggen"
   },
+  "e0c88179b3": {
+    "translation": "Nodig leden uit"
+  },
+  "e2198d6228": {
+    "translation": "Kopieer uitnodigingslink"
+  },
   "e2ae80a510": {
     "translation": "Juridische samenvatting"
   },
+  "e3afed0047": {
+    "translation": "Beheerder"
+  },
   "e404559826": {
     "translation": "Servicevoorwaarden"
   },
-  "e78e14c5f1": {
-    "translation": "Vastmaken"
+  "e81c4e4f2b": {
+    "translation": "of"
+  },
+  "ea0626ac5a": {
+    "translation": "Gevarenzone"
   },
   "ea4788705e": {
     "translation": "Annuleren"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Lees ons <a>cookiebeleid</a> voor meer informatie."
   },
+  "ef53538ae4": {
+    "translation": "Leden"
+  },
   "ef7de3f485": {
     "translation": "gekozen"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Instellingen"
   },
+  "f714e36843": {
+    "translation": "Weet u zeker dat u deze groep wilt verlaten?"
+  },
+  "fa2ead697d": {
+    "translation": "Privacybeleid"
+  },
   "fb15c53f22": {
     "translation": "Kijker"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Gekopieerde link"
   },
+  "ff7a814974": {
+    "translation": "Bestandskoppeling toevoegen…"
+  },
   "ffcd73e997": {
     "translation": "Bestand importeren…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/no.json b/apps/dotcom/client/public/tla/locales/no.json
index edb6bf8eed67..8ad129817180 100644
--- a/apps/dotcom/client/public/tla/locales/no.json
+++ b/apps/dotcom/client/public/tla/locales/no.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Konto"
   },
+  "08d2d725a9": {
+    "translation": "Opprett en gratis konto for å lagre arbeidet ditt, samarbeide i sanntid og mer."
+  },
   "0b27918290": {
     "translation": "Fil"
   },
   "0b9a4cde72": {
     "translation": "Fil-menyen"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw er en gratis og umiddelbar virtuell tavle."
+  },
   "0d1f2bb523": {
     "translation": "Send tilbakemelding"
   },
   "110a4b01be": {
     "translation": "Utgi"
   },
+  "129b9e34ea": {
+    "translation": "Forlat gruppen"
+  },
+  "12a6766ba1": {
+    "translation": "Løsne filen"
+  },
   "12c8a9838c": {
     "translation": "Prøv tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Eksporter som"
   },
+  "146ffe2fd9": {
+    "translation": "Vis mer"
+  },
+  "14d65465b7": {
+    "translation": "Slett gruppe"
+  },
   "181b90f889": {
     "translation": "Opprett fil"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Dette rommet nærmer seg størrelsesgrensen. Vurder å fjerne noe innhold eller starte en ny fil."
   },
+  "2445e5e347": {
+    "translation": "Opprett gruppe"
+  },
   "250ddea65c": {
     "translation": "Om tldraw"
   },
   "299cb00a7a": {
     "translation": "Opplasting mislyktes"
   },
+  "2c3ef76333": {
+    "translation": "Mine filer"
+  },
   "2deec2cb74": {
     "translation": "Dette rommet har nådd størrelsesgrensen, og endringene kan kanskje ikke lenger lagres. Fjern noe innhold eller start en ny fil."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Utheving mangler"
   },
+  "32210b37e4": {
+    "translation": "Legg til lenke"
+  },
   "335defdafe": {
     "translation": "Prøv å oppdatere siden."
   },
   "344a7f427f": {
     "translation": "Redaktør"
   },
+  "3bc7d6ea2f": {
+    "translation": "Fortsett med e-post"
+  },
   "3bd1b98dbd": {
     "translation": "Kan ikke publisere endringene."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldra"
   },
-  "7697920637": {
-    "translation": "Last inn på nytt"
+  "47f493a590": {
+    "translation": "Fest filen"
   },
-  "764671e008": {
-    "translation": "Chat med oss ​​på Discord"
+  "49049467ff": {
+    "translation": "Lim inn URL-en til tldraw-filen..."
   },
   "4908687e50": {
     "translation": "Er du sikker på at du vil glemme denne filen?"
   },
+  "49ee308734": {
+    "translation": "Navn"
+  },
   "4d0d3ddec9": {
     "translation": "Dette nettstedet bruker informasjonskapsler for å få appen til å fungere og for å samle inn analyser."
   },
   "4d1c8263ba": {
     "translation": "Last inn på nytt"
   },
+  "4da5988a2e": {
+    "translation": "Slett gruppe…"
+  },
+  "4e6fbf032b": {
+    "translation": "Er du sikker på at du vil slette denne gruppen? Denne handlingen kan ikke angres."
+  },
   "50db1b7e1e": {
     "translation": "Kan ikke oppheve publiseringen av filen."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Personvernerklæring"
   },
+  "5a86b22fa0": {
+    "translation": "Dra filer hit, <create>opprett en fil</create>, eller <invite>kopier invitasjonslenken</invite> for å komme i gang."
+  },
   "5a95a425f7": {
     "translation": "Dele"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Gammel nettleser oppdaget. Oppdater nettleseren din for å bruke denne appen."
   },
+  "5c6fe42bc2": {
+    "translation": "Tilbakekalle denne lenken og opprett en ny."
+  },
   "5d26ae7550": {
     "translation": "Vi klarte ikke å laste opp noe av innholdet du opprettet før du logget på."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Eldre"
   },
+  "639bae9ac6": {
+    "translation": "du"
+  },
   "6609dd239e": {
     "translation": "Noe gikk galt"
   },
   "6637a98151": {
     "translation": "En ny versjon av tldraw er tilgjengelig. Last inn siden på nytt for å fortsette."
   },
+  "68257bb646": {
+    "translation": "Du har blitt invitert til gruppen <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Skriv inn e-postadressen din"
+  },
   "6a26f54883": {
     "translation": "Hjelp"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Følg disse trinnene for å importere innholdet manuelt:"
   },
+  "70222abcfc": {
+    "translation": "Gruppeinnstillinger"
+  },
   "70a6facb9d": {
     "translation": "Denne uken"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Administrer informasjonskapsler"
   },
+  "7697920637": {
+    "translation": "Last inn på nytt"
+  },
+  "764671e008": {
+    "translation": "Chat med oss ​​på Discord"
+  },
   "777f9e90cf": {
     "translation": "Ugyldig forespørsel."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Glemme"
   },
+  "7cfe6c43dc": {
+    "translation": "Forlat gruppen…"
+  },
   "7daeced9ff": {
     "translation": "Publiser endringer"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Gi nytt navn til filen"
   },
+  "8ad4303b83": {
+    "translation": "Nei takk"
+  },
   "8b1946f965": {
     "translation": "For å fortsette redigeringen, kopier rommet til filene dine."
   },
+  "8c2d3d730c": {
+    "translation": "Sjekk e-posten din for en bekreftelseskode."
+  },
   "8eb2c00e96": {
     "translation": "Delt med deg"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopier til filene mine"
   },
+  "930390d222": {
+    "translation": "Kopierte invitasjonslenken"
+  },
+  "95aacd4d4a": {
+    "translation": "Logg inn med Google"
+  },
+  "95d2109dc8": {
+    "translation": "Bygg med tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Denne måneden"
   },
+  "985a4b720f": {
+    "translation": "Bruksvilkår"
+  },
+  "98c997a27e": {
+    "translation": "Legg til fillenke"
+  },
   "9914a0ce04": {
     "translation": "Lys"
   },
+  "9b33f5c63c": {
+    "translation": "Fikk du ikke en kode? <resend>Send på nytt</resend>."
+  },
   "9bef626805": {
     "translation": "Slett fil"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Bakgrunn"
   },
+  "aa916767cf": {
+    "translation": "Logg inn for å godta invitasjonen"
+  },
   "ab0df9ba36": {
     "translation": "Filgrense nådd"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gjestebruker"
   },
+  "b357b524e7": {
+    "translation": "E-postadresse"
+  },
+  "b3d2db69fe": {
+    "translation": "Fil-URL"
+  },
   "b6d4223e60": {
     "translation": "Logg på"
   },
+  "b6f4a2ec63": {
+    "translation": "Eier"
+  },
   "b758336699": {
     "translation": "Kopier lenken"
   },
   "ba0318cb81": {
     "translation": "Logg inn for å dele"
   },
-  "bb792693e2": {
-    "translation": "Løsne"
+  "bb93a7590f": {
+    "translation": "Godta og bli med i gruppen"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Laster opp .tldr-fil …} other {Laster opp {uploaded} av {total} .tldr-filer …}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Delt av {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Last opp .tldr-filer"
-  },
   "c2276c9127": {
     "translation": "Finn ut mer om deling."
   },
+  "c28aed8348": {
+    "translation": "Tillat <cookies>analyse</cookies> for å hjelpe oss med å forbedre tldraw."
+  },
   "c303bd1095": {
     "translation": "Kan ikke publisere filen."
   },
   "c4b39a1cc3": {
     "translation": "Viktige informasjonskapsler"
   },
+  "c6155aaecc": {
+    "translation": "Gruppenavn"
+  },
   "c655b27b1e": {
     "translation": "i18n: Lang streng"
   },
   "c6a00f137b": {
     "translation": "Invitere"
   },
+  "c74ea6dbff": {
+    "translation": "Vis mindre"
+  },
   "c87aacf567": {
     "translation": "Logg ut"
   },
+  "c9cc8cce24": {
+    "translation": "Spare"
+  },
   "cceaefbc20": {
     "translation": "Del denne filen"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Bytt sidefelt"
   },
+  "d638a3344b": {
+    "translation": "Før du starter, vennligst godta våre <tos>bruksvilkår</tos> og <privacy>personvernerklæring</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Prøv igjen"
   },
+  "d88ad2dc74": {
+    "translation": "Godta og fortsett"
+  },
   "d9100f3e10": {
     "translation": "Gå hit for å se innholdet"
   },
+  "d9e35d0f55": {
+    "translation": "Du har nådd maksimalt antall grupper. Du må slette gamle grupper før du oppretter nye."
+  },
   "dbbebf3c03": {
     "translation": "Kun invitasjon"
   },
+  "dcdaa754fe": {
+    "translation": "Ugyldig URL-adresse for tldraw-filen"
+  },
   "dfdb78a4e4": {
     "translation": "App-feilsøkingsflagg"
   },
+  "e0c88179b3": {
+    "translation": "Inviter medlemmer"
+  },
+  "e2198d6228": {
+    "translation": "Kopier invitasjonslenken"
+  },
   "e2ae80a510": {
     "translation": "Juridisk sammendrag"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Vilkår for bruk"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "eller"
+  },
+  "ea0626ac5a": {
+    "translation": "Faresone"
   },
   "ea4788705e": {
     "translation": "Kansellere"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Les vår <a>policy for informasjonskapsler</a> for å lære mer."
   },
+  "ef53538ae4": {
+    "translation": "Medlemmer"
+  },
   "ef7de3f485": {
     "translation": "valgt"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Innstillinger"
   },
+  "f714e36843": {
+    "translation": "Er du sikker på at du vil forlate denne gruppen?"
+  },
+  "fa2ead697d": {
+    "translation": "Personvernerklæring"
+  },
   "fb15c53f22": {
     "translation": "Seer"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Kopiert lenke"
   },
+  "ff7a814974": {
+    "translation": "Legg til fillenke…"
+  },
   "ffcd73e997": {
     "translation": "Importer fil…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/pa.json b/apps/dotcom/client/public/tla/locales/pa.json
index 739cef679a8c..2a6d721bf1d2 100644
--- a/apps/dotcom/client/public/tla/locales/pa.json
+++ b/apps/dotcom/client/public/tla/locales/pa.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "ਖਾਤਾ"
   },
+  "08d2d725a9": {
+    "translation": "ਆਪਣੇ ਕੰਮ ਨੂੰ ਸੁਰੱਖਿਅਤ ਕਰਨ, ਰੀਅਲ-ਟਾਈਮ ਵਿੱਚ ਸਹਿਯੋਗ ਕਰਨ ਅਤੇ ਹੋਰ ਬਹੁਤ ਕੁਝ ਕਰਨ ਲਈ ਇੱਕ ਮੁਫ਼ਤ ਖਾਤਾ ਬਣਾਓ।"
+  },
   "0b27918290": {
     "translation": "ਫਾਈਲ"
   },
   "0b9a4cde72": {
     "translation": "ਫਾਈਲ ਮੀਨੂ"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ਇੱਕ ਮੁਫ਼ਤ ਅਤੇ ਤੁਰੰਤ ਵਰਚੁਅਲ ਵ੍ਹਾਈਟਬੋਰਡ ਹੈ।"
+  },
   "0d1f2bb523": {
     "translation": "ਫੀਡਬੈਕ ਭੇਜੋ"
   },
   "110a4b01be": {
     "translation": "ਪ੍ਰਕਾਸ਼ਿਤ ਕਰੋ"
   },
+  "129b9e34ea": {
+    "translation": "ਗਰੁੱਪ ਛੱਡੋ"
+  },
+  "12a6766ba1": {
+    "translation": "ਫਾਈਲ ਨੂੰ ਅਨਪਿੰਨ ਕਰੋ"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK ਅਜ਼ਮਾਓ।"
   },
   "13ddd375ad": {
     "translation": "ਦੇ ਰੂਪ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"
   },
+  "146ffe2fd9": {
+    "translation": "ਹੋਰ ਦਿਖਾਓ"
+  },
+  "14d65465b7": {
+    "translation": "ਗਰੁੱਪ ਮਿਟਾਓ"
+  },
   "181b90f889": {
     "translation": "ਫਾਈਲ ਬਣਾਓ"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "ਇਹ ਕਮਰਾ ਆਪਣੀ ਆਕਾਰ ਸੀਮਾ ਦੇ ਨੇੜੇ ਆ ਰਿਹਾ ਹੈ। ਕੁਝ ਸਮੱਗਰੀ ਨੂੰ ਹਟਾਉਣ ਜਾਂ ਇੱਕ ਨਵੀਂ ਫਾਈਲ ਸ਼ੁਰੂ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰ ਕਰੋ।"
   },
+  "2445e5e347": {
+    "translation": "ਗਰੁੱਪ ਬਣਾਓ"
+  },
   "250ddea65c": {
     "translation": "tldraw ਬਾਰੇ"
   },
   "299cb00a7a": {
     "translation": "ਅੱਪਲੋਡ ਅਸਫਲ ਰਿਹਾ"
   },
+  "2c3ef76333": {
+    "translation": "ਮੇਰੀਆਂ ਫਾਈਲਾਂ"
+  },
   "2deec2cb74": {
     "translation": "ਇਹ ਕਮਰਾ ਆਪਣੀ ਆਕਾਰ ਸੀਮਾ 'ਤੇ ਪਹੁੰਚ ਗਿਆ ਹੈ ਅਤੇ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਹੁਣ ਬਦਲਾਅ ਸੁਰੱਖਿਅਤ ਨਾ ਕੀਤੇ ਜਾਣ। ਕੁਝ ਸਮੱਗਰੀ ਹਟਾਓ ਜਾਂ ਇੱਕ ਨਵੀਂ ਫਾਈਲ ਸ਼ੁਰੂ ਕਰੋ।"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: ਹਾਈਲਾਈਟ ਗੁੰਮ ਹੈ"
   },
+  "32210b37e4": {
+    "translation": "ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ"
+  },
   "335defdafe": {
     "translation": "ਕਿਰਪਾ ਕਰਕੇ ਪੰਨੇ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
   },
   "344a7f427f": {
     "translation": "ਸੰਪਾਦਕ"
   },
+  "3bc7d6ea2f": {
+    "translation": "ਈਮੇਲ ਨਾਲ ਜਾਰੀ ਰੱਖੋ"
+  },
   "3bd1b98dbd": {
     "translation": "ਤਬਦੀਲੀਆਂ ਨੂੰ ਪ੍ਰਕਾਸ਼ਿਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ।"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "ਕਿਰਪਾ ਕਰਕੇ ਰੀਲੋਡ ਕਰੋ"
+  "47f493a590": {
+    "translation": "ਫਾਈਲ ਪਿੰਨ ਕਰੋ"
   },
-  "764671e008": {
-    "translation": "ਡਿਸਕਾਰਡ 'ਤੇ ਸਾਡੇ ਨਾਲ ਗੱਲਬਾਤ ਕਰੋ"
+  "49049467ff": {
+    "translation": "tldraw ਫਾਈਲ URL ਪੇਸਟ ਕਰੋ..."
   },
   "4908687e50": {
     "translation": "ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਇਸ ਫ਼ਾਈਲ ਨੂੰ ਭੁੱਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
   },
+  "49ee308734": {
+    "translation": "ਨਾਮ"
+  },
   "4d0d3ddec9": {
     "translation": "ਇਹ ਸਾਈਟ ਐਪ ਨੂੰ ਕੰਮ ਕਰਨ ਅਤੇ ਵਿਸ਼ਲੇਸ਼ਣ ਇਕੱਠਾ ਕਰਨ ਲਈ ਕੂਕੀਜ਼ ਦੀ ਵਰਤੋਂ ਕਰਦੀ ਹੈ।"
   },
   "4d1c8263ba": {
     "translation": "ਰੀਲੋਡ ਕਰੋ"
   },
+  "4da5988a2e": {
+    "translation": "ਗਰੁੱਪ ਮਿਟਾਓ..."
+  },
+  "4e6fbf032b": {
+    "translation": "ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਇਸ ਸਮੂਹ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"
+  },
   "50db1b7e1e": {
     "translation": "ਫ਼ਾਈਲ ਨੂੰ ਅਣਪ੍ਰਕਾਸ਼ਿਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ।"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "ਪਰਾਈਵੇਟ ਨੀਤੀ"
   },
+  "5a86b22fa0": {
+    "translation": "ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਫਾਈਲਾਂ ਨੂੰ ਇੱਥੇ ਘਸੀਟੋ, <create>ਇੱਕ ਫਾਈਲ ਬਣਾਓ</create>, ਜਾਂ <invite>ਸੱਦਾ ਲਿੰਕ ਕਾਪੀ ਕਰੋ</invite>।"
+  },
   "5a95a425f7": {
     "translation": "ਸ਼ੇਅਰ ਕਰੋ"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "ਪੁਰਾਣਾ ਬ੍ਰਾਊਜ਼ਰ ਮਿਲਿਆ। ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਬ੍ਰਾਊਜ਼ਰ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ।"
   },
+  "5c6fe42bc2": {
+    "translation": "ਇਸ ਲਿੰਕ ਨੂੰ ਰੱਦ ਕਰੋ ਅਤੇ ਇੱਕ ਨਵਾਂ ਬਣਾਓ।"
+  },
   "5d26ae7550": {
     "translation": "ਅਸੀਂ ਤੁਹਾਡੇ ਸਾਈਨ ਇਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਦੁਆਰਾ ਬਣਾਈ ਗਈ ਸਮੱਗਰੀ ਵਿੱਚੋਂ ਕੁਝ ਨੂੰ ਅੱਪਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ ਰਹੇ।"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "ਪੁਰਾਣੀ"
   },
+  "639bae9ac6": {
+    "translation": "ਤੁਸੀਂ"
+  },
   "6609dd239e": {
     "translation": "ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ"
   },
   "6637a98151": {
     "translation": "tldraw ਦਾ ਇੱਕ ਨਵਾਂ ਵਰਜਨ ਉਪਲਬਧ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਪੰਨੇ ਨੂੰ ਰੀਲੋਡ ਕਰੋ।"
   },
+  "68257bb646": {
+    "translation": "ਤੁਹਾਨੂੰ ਗਰੁੱਪ ਵਿੱਚ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "ਆਪਣਾ ਈਮੇਲ ਪਤਾ ਦਰਜ ਕਰੋ"
+  },
   "6a26f54883": {
     "translation": "ਮਦਦ ਕਰੋ"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "ਸਮੱਗਰੀ ਨੂੰ ਹੱਥੀਂ ਆਯਾਤ ਕਰਨ ਲਈ ਇਹਨਾਂ ਕਦਮਾਂ ਦੀ ਪਾਲਣਾ ਕਰੋ:"
   },
+  "70222abcfc": {
+    "translation": "ਗਰੁੱਪ ਸੈਟਿੰਗਾਂ"
+  },
   "70a6facb9d": {
     "translation": "ਇਸ ਹਫ਼ਤੇ"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "ਕੂਕੀਜ਼ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"
   },
+  "7697920637": {
+    "translation": "ਕਿਰਪਾ ਕਰਕੇ ਰੀਲੋਡ ਕਰੋ"
+  },
+  "764671e008": {
+    "translation": "ਡਿਸਕਾਰਡ 'ਤੇ ਸਾਡੇ ਨਾਲ ਗੱਲਬਾਤ ਕਰੋ"
+  },
   "777f9e90cf": {
     "translation": "ਅਵੈਧ ਬੇਨਤੀ।"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "ਭੁੱਲ ਜਾਓ"
   },
+  "7cfe6c43dc": {
+    "translation": "ਗਰੁੱਪ ਛੱਡੋ…"
+  },
   "7daeced9ff": {
     "translation": "ਤਬਦੀਲੀਆਂ ਪ੍ਰਕਾਸ਼ਿਤ ਕਰੋ"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ਫਾਈਲ ਦਾ ਨਾਮ ਬਦਲੋ"
   },
+  "8ad4303b83": {
+    "translation": "ਨਹੀਂ ਧੰਨਵਾਦ"
+  },
   "8b1946f965": {
     "translation": "ਸੰਪਾਦਨ ਜਾਰੀ ਰੱਖਣ ਲਈ ਕਿਰਪਾ ਕਰਕੇ ਕਮਰੇ ਨੂੰ ਆਪਣੀਆਂ ਫਾਈਲਾਂ ਵਿੱਚ ਕਾਪੀ ਕਰੋ।"
   },
+  "8c2d3d730c": {
+    "translation": "ਪੁਸ਼ਟੀਕਰਨ ਕੋਡ ਲਈ ਆਪਣੀ ਈਮੇਲ ਦੀ ਜਾਂਚ ਕਰੋ।"
+  },
   "8eb2c00e96": {
     "translation": "ਤੁਹਾਡੇ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "ਮੇਰੀਆਂ ਫਾਈਲਾਂ ਵਿੱਚ ਕਾਪੀ ਕਰੋ"
   },
+  "930390d222": {
+    "translation": "ਸੱਦਾ ਲਿੰਕ ਕਾਪੀ ਕੀਤਾ ਗਿਆ"
+  },
+  "95aacd4d4a": {
+    "translation": "ਗੂਗਲ ਨਾਲ ਸਾਈਨ ਇਨ ਕਰੋ"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK ਨਾਲ ਬਣਾਓ"
+  },
   "96165d6df5": {
     "translation": "ਇਸ ਮਹੀਨੇ"
   },
+  "985a4b720f": {
+    "translation": "ਵਰਤੋ ਦੀਆਂ ਸ਼ਰਤਾਂ"
+  },
+  "98c997a27e": {
+    "translation": "ਫਾਈਲ ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ"
+  },
   "9914a0ce04": {
     "translation": "ਰੋਸ਼ਨੀ"
   },
+  "9b33f5c63c": {
+    "translation": "ਕੀ ਕੋਡ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋਇਆ? <resend>ਮੁੜ ਭੇਜੋ</resend>।"
+  },
   "9bef626805": {
     "translation": "ਫਾਈਲ ਮਿਟਾਓ"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "ਪਿਛੋਕੜ"
   },
+  "aa916767cf": {
+    "translation": "ਸੱਦਾ ਸਵੀਕਾਰ ਕਰਨ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ"
+  },
   "ab0df9ba36": {
     "translation": "ਫਾਈਲ ਦੀ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ ਹੈ"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "ਮਹਿਮਾਨ ਉਪਭੋਗਤਾ"
   },
+  "b357b524e7": {
+    "translation": "ਈਮੇਲ ਪਤਾ"
+  },
+  "b3d2db69fe": {
+    "translation": "ਫਾਈਲ URL"
+  },
   "b6d4223e60": {
     "translation": "ਸਾਈਨ - ਇਨ"
   },
+  "b6f4a2ec63": {
+    "translation": "ਮਾਲਕ"
+  },
   "b758336699": {
     "translation": "ਲਿੰਕ ਕਾਪੀ ਕਰੋ"
   },
   "ba0318cb81": {
     "translation": "ਸਾਂਝਾ ਕਰਨ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ"
   },
-  "bb792693e2": {
-    "translation": "ਅਨਪਿੰਨ ਕਰੋ"
+  "bb93a7590f": {
+    "translation": "ਸਵੀਕਾਰ ਕਰੋ ਅਤੇ ਸਮੂਹ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr ਫਾਈਲ ਅੱਪਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ...} other {{total} .tldr ਫਾਈਲਾਂ ਵਿੱਚੋਂ {uploaded} ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} ਦੁਆਰਾ ਸਾਂਝਾ ਕੀਤਾ ਗਿਆ"
   },
-  "bcb62136a3": {
-    "translation": ".tldr ਫ਼ਾਈਲਾਂ ਅੱਪਲੋਡ ਕਰੋ"
-  },
   "c2276c9127": {
     "translation": "ਸਾਂਝਾ ਕਰਨ ਬਾਰੇ ਹੋਰ ਜਾਣੋ।"
   },
+  "c28aed8348": {
+    "translation": "tldraw ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਵਿੱਚ ਸਾਡੀ ਮਦਦ ਕਰਨ ਲਈ <cookies>ਵਿਸ਼ਲੇਸ਼ਣ</cookies> ਨੂੰ ਆਗਿਆ ਦਿਓ।"
+  },
   "c303bd1095": {
     "translation": "ਫ਼ਾਈਲ ਪ੍ਰਕਾਸ਼ਿਤ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ।"
   },
   "c4b39a1cc3": {
     "translation": "ਜ਼ਰੂਰੀ ਕੂਕੀਜ਼"
   },
+  "c6155aaecc": {
+    "translation": "ਸਮੂਹ ਦਾ ਨਾਮ"
+  },
   "c655b27b1e": {
     "translation": "i18n: ਲੰਬੀ ਸਤਰ"
   },
   "c6a00f137b": {
     "translation": "ਸੱਦਾ ਦਿਓ"
   },
+  "c74ea6dbff": {
+    "translation": "ਘੱਟ ਦਿਖਾਓ"
+  },
   "c87aacf567": {
     "translation": "ਸਾਇਨ ਆਉਟ"
   },
+  "c9cc8cce24": {
+    "translation": "ਸੇਵ ਕਰੋ"
+  },
   "cceaefbc20": {
     "translation": "ਇਸ ਫ਼ਾਈਲ ਨੂੰ ਸਾਂਝਾ ਕਰੋ"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "ਸਾਈਡਬਾਰ ਨੂੰ ਟੌਗਲ ਕਰੋ"
   },
+  "d638a3344b": {
+    "translation": "ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਕਿਰਪਾ ਕਰਕੇ ਸਾਡੀਆਂ <tos>ਵਰਤੋਂ ਦੀਆਂ ਸ਼ਰਤਾਂ</tos> ਅਤੇ <privacy>ਗੋਪਨੀਯਤਾ ਨੀਤੀ</privacy> ਨੂੰ ਸਵੀਕਾਰ ਕਰੋ।"
+  },
   "d721757161": {
     "translation": "ਥੀਮ"
   },
   "d876a9fe1a": {
     "translation": "ਫਿਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
   },
+  "d88ad2dc74": {
+    "translation": "ਸਵੀਕਾਰ ਕਰੋ ਅਤੇ ਜਾਰੀ ਰੱਖੋ"
+  },
   "d9100f3e10": {
     "translation": "ਸਮੱਗਰੀ ਨੂੰ ਦੇਖਣ ਲਈ ਇੱਥੇ ਜਾਓ"
   },
+  "d9e35d0f55": {
+    "translation": "ਤੁਸੀਂ ਸਮੂਹਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ 'ਤੇ ਪਹੁੰਚ ਗਏ ਹੋ। ਤੁਹਾਨੂੰ ਨਵੇਂ ਸਮੂਹ ਬਣਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਰਾਣੇ ਸਮੂਹਾਂ ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
+  },
   "dbbebf3c03": {
     "translation": "ਸਿਰਫ਼ ਸੱਦਾ ਦਿਓ"
   },
+  "dcdaa754fe": {
+    "translation": "ਅਵੈਧ tldraw ਫਾਈਲ URL"
+  },
   "dfdb78a4e4": {
     "translation": "ਐਪ ਡੀਬੱਗ ਫਲੈਗ"
   },
+  "e0c88179b3": {
+    "translation": "ਮੈਂਬਰਾਂ ਨੂੰ ਸੱਦਾ ਦਿਓ"
+  },
+  "e2198d6228": {
+    "translation": "ਸੱਦਾ ਲਿੰਕ ਕਾਪੀ ਕਰੋ"
+  },
   "e2ae80a510": {
     "translation": "ਕਾਨੂੰਨੀ ਸਾਰ"
   },
+  "e3afed0047": {
+    "translation": "ਐਡਮਿਨ"
+  },
   "e404559826": {
     "translation": "ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ"
   },
-  "e78e14c5f1": {
-    "translation": "ਪਿੰਨ"
+  "e81c4e4f2b": {
+    "translation": "ਜਾਂ"
+  },
+  "ea0626ac5a": {
+    "translation": "ਖ਼ਤਰੇ ਵਾਲਾ ਖੇਤਰ"
   },
   "ea4788705e": {
     "translation": "ਰੱਦ ਕਰੋ"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "ਹੋਰ ਜਾਣਨ ਲਈ ਸਾਡੀ <a>ਕੂਕੀ ਨੀਤੀ</a> ਪੜ੍ਹੋ।"
   },
+  "ef53538ae4": {
+    "translation": "ਮੈਂਬਰ"
+  },
   "ef7de3f485": {
     "translation": "ਚੁਣਿਆ ਗਿਆ"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "ਸੈਟਿੰਗਾਂ"
   },
+  "f714e36843": {
+    "translation": "ਕੀ ਤੁਸੀਂ ਪੱਕਾ ਇਸ ਸਮੂਹ ਨੂੰ ਛੱਡਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+  },
+  "fa2ead697d": {
+    "translation": "ਪਰਾਈਵੇਟ ਨੀਤੀ"
+  },
   "fb15c53f22": {
     "translation": "ਦਰਸ਼ਕ"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "ਲਿੰਕ ਕਾਪੀ ਕੀਤਾ ਗਿਆ"
   },
+  "ff7a814974": {
+    "translation": "ਫਾਈਲ ਲਿੰਕ ਸ਼ਾਮਲ ਕਰੋ…"
+  },
   "ffcd73e997": {
     "translation": "ਫਾਈਲ ਆਯਾਤ ਕਰੋ..."
   }
diff --git a/apps/dotcom/client/public/tla/locales/pl.json b/apps/dotcom/client/public/tla/locales/pl.json
index 13f97afdd152..ea505182758a 100644
--- a/apps/dotcom/client/public/tla/locales/pl.json
+++ b/apps/dotcom/client/public/tla/locales/pl.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Konto"
   },
+  "08d2d725a9": {
+    "translation": "Załóż bezpłatne konto, aby zapisać swoją pracę, współpracować w czasie rzeczywistym i nie tylko."
+  },
   "0b27918290": {
     "translation": "Plik"
   },
   "0b9a4cde72": {
     "translation": "Menu pliku"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw to darmowa i natychmiastowa wirtualna tablica."
+  },
   "0d1f2bb523": {
     "translation": "Wyślij opinię"
   },
   "110a4b01be": {
     "translation": "Opublikuj"
   },
+  "129b9e34ea": {
+    "translation": "Opuść grupę"
+  },
+  "12a6766ba1": {
+    "translation": "Odepnij plik"
+  },
   "12c8a9838c": {
     "translation": "Wypróbuj zestaw SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Eksportuj jako"
   },
+  "146ffe2fd9": {
+    "translation": "Pokaż więcej"
+  },
+  "14d65465b7": {
+    "translation": "Usuń grupę"
+  },
   "181b90f889": {
     "translation": "Utwórz plik"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Ten pokój zbliża się do limitu rozmiaru. Rozważ usunięcie części zawartości lub utworzenie nowego pliku."
   },
+  "2445e5e347": {
+    "translation": "Utwórz grupę"
+  },
   "250ddea65c": {
     "translation": "O tldraw"
   },
   "299cb00a7a": {
     "translation": "Przesyłanie nie powiodło się"
   },
+  "2c3ef76333": {
+    "translation": "Moje pliki"
+  },
   "2deec2cb74": {
     "translation": "Ten pokój osiągnął limit rozmiaru i zmiany mogą nie zostać zapisane. Usuń część zawartości lub utwórz nowy plik."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Brak wyróżnienia"
   },
+  "32210b37e4": {
+    "translation": "Dodaj link"
+  },
   "335defdafe": {
     "translation": "Spróbuj odświeżyć stronę."
   },
   "344a7f427f": {
     "translation": "Edytor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Kontynuuj z e-mailem"
+  },
   "3bd1b98dbd": {
     "translation": "Nie można opublikować zmian."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Proszę odświeżyć"
+  "47f493a590": {
+    "translation": "Przypnij plik"
   },
-  "764671e008": {
-    "translation": "Porozmawiaj z nami na Discordzie"
+  "49049467ff": {
+    "translation": "Wklej adres URL pliku tldraw..."
   },
   "4908687e50": {
     "translation": "Czy na pewno chcesz zapomnieć ten plik?"
   },
+  "49ee308734": {
+    "translation": "Nazwa"
+  },
   "4d0d3ddec9": {
     "translation": "Ta strona korzysta z plików cookie, aby umożliwić działanie aplikacji i zbierać dane analityczne."
   },
   "4d1c8263ba": {
     "translation": "Załaduj ponownie"
   },
+  "4da5988a2e": {
+    "translation": "Usuń grupę…"
+  },
+  "4e6fbf032b": {
+    "translation": "Czy na pewno chcesz usunąć tę grupę? Tej czynności nie można cofnąć."
+  },
   "50db1b7e1e": {
     "translation": "Nie można cofnąć publikacji pliku."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Polityka prywatności"
   },
+  "5a86b22fa0": {
+    "translation": "Przeciągnij pliki tutaj, <create>utwórz plik</create> lub <invite>skopiuj link zaproszenia</invite>, aby rozpocząć."
+  },
   "5a95a425f7": {
     "translation": "Podziel się"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Wykryto starą przeglądarkę. Zaktualizuj przeglądarkę, aby korzystać z tej aplikacji."
   },
+  "5c6fe42bc2": {
+    "translation": "Usuń ten link i utwórz nowy."
+  },
   "5d26ae7550": {
     "translation": "Nie udało nam się przesłać części treści utworzonych przed zalogowaniem."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Starszy"
   },
+  "639bae9ac6": {
+    "translation": "Ty"
+  },
   "6609dd239e": {
     "translation": "Coś poszło nie tak"
   },
   "6637a98151": {
     "translation": "Dostępna jest nowa wersja tldraw. Aby kontynuować, odśwież stronę."
   },
+  "68257bb646": {
+    "translation": "Zostałeś zaproszony do grupy <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Podaj swój adres e-mail"
+  },
   "6a26f54883": {
     "translation": "Pomoc"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Aby ręcznie zaimportować zawartość, wykonaj następujące czynności:"
   },
+  "70222abcfc": {
+    "translation": "Ustawienia grupy"
+  },
   "70a6facb9d": {
     "translation": "W tym tygodniu"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Zarządzaj plikami cookie"
   },
+  "7697920637": {
+    "translation": "Proszę odświeżyć"
+  },
+  "764671e008": {
+    "translation": "Porozmawiaj z nami na Discordzie"
+  },
   "777f9e90cf": {
     "translation": "Nieprawidłowe żądanie."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Zapomnij"
   },
+  "7cfe6c43dc": {
+    "translation": "Opuść grupę…"
+  },
   "7daeced9ff": {
     "translation": "Opublikuj zmiany"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Zmień nazwę pliku"
   },
+  "8ad4303b83": {
+    "translation": "Nie, dziękuję"
+  },
   "8b1946f965": {
     "translation": "Aby kontynuować edycję, skopiuj pokój do swoich plików."
   },
+  "8c2d3d730c": {
+    "translation": "Sprawdź swoją skrzynkę e-mail, aby uzyskać kod weryfikacyjny."
+  },
   "8eb2c00e96": {
     "translation": "Udostępniono Tobie"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopiuj do moich plików"
   },
+  "930390d222": {
+    "translation": "Skopiowano link zaproszenia"
+  },
+  "95aacd4d4a": {
+    "translation": "Zaloguj się za pomocą Google"
+  },
+  "95d2109dc8": {
+    "translation": "Kompilacja z użyciem zestawu SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "W tym miesiącu"
   },
+  "985a4b720f": {
+    "translation": "Warunki korzystania"
+  },
+  "98c997a27e": {
+    "translation": "Dodaj link do pliku"
+  },
   "9914a0ce04": {
     "translation": "Jasny"
   },
+  "9b33f5c63c": {
+    "translation": "Nie otrzymałeś kodu? <resend>Wyślij ponownie</resend>."
+  },
   "9bef626805": {
     "translation": "Usuń plik"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Tło"
   },
+  "aa916767cf": {
+    "translation": "Zaloguj się, aby zaakceptować zaproszenie"
+  },
   "ab0df9ba36": {
     "translation": "Osiągnięto limit plików"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Użytkownik gość"
   },
+  "b357b524e7": {
+    "translation": "Adres e-mail"
+  },
+  "b3d2db69fe": {
+    "translation": "Adres URL pliku"
+  },
   "b6d4223e60": {
     "translation": "Zaloguj się"
   },
+  "b6f4a2ec63": {
+    "translation": "Właściciel"
+  },
   "b758336699": {
     "translation": "Kopiuj link"
   },
   "ba0318cb81": {
     "translation": "Zaloguj się, aby udostępnić"
   },
-  "bb792693e2": {
-    "translation": "Odepnij"
+  "bb93a7590f": {
+    "translation": "Zaakceptuj i dołącz do grupy"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Przesyłanie pliku .tldr…} few {} many {} other {Przesyłanie {uploaded} z {total} plików .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Udostępniono przez {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Prześlij pliki .tldr"
-  },
   "c2276c9127": {
     "translation": "Dowiedz się więcej o udostępnianiu."
   },
+  "c28aed8348": {
+    "translation": "Zezwól na <cookies>analytics</cookies>, aby pomóc nam ulepszyć tldraw."
+  },
   "c303bd1095": {
     "translation": "Nie można opublikować pliku."
   },
   "c4b39a1cc3": {
     "translation": "Niezbędne pliki cookie"
   },
+  "c6155aaecc": {
+    "translation": "Nazwa grupy"
+  },
   "c655b27b1e": {
     "translation": "i18n: Długi ciąg"
   },
   "c6a00f137b": {
     "translation": "Zaproś"
   },
+  "c74ea6dbff": {
+    "translation": "Pokaż mniej"
+  },
   "c87aacf567": {
     "translation": "Wyloguj się"
   },
+  "c9cc8cce24": {
+    "translation": "Ratować"
+  },
   "cceaefbc20": {
     "translation": "Udostępnij ten plik"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Przełącz pasek boczny"
   },
+  "d638a3344b": {
+    "translation": "Przed rozpoczęciem prosimy o zaakceptowanie naszych <tos>warunków korzystania</tos> i <privacy>polityki prywatności</privacy>."
+  },
   "d721757161": {
     "translation": "Temat"
   },
   "d876a9fe1a": {
     "translation": "Spróbuj ponownie"
   },
+  "d88ad2dc74": {
+    "translation": "Akceptuj i kontynuuj"
+  },
   "d9100f3e10": {
     "translation": "Kliknij tutaj, aby zobaczyć zawartość"
   },
+  "d9e35d0f55": {
+    "translation": "Osiągnięto maksymalną liczbę grup. Aby utworzyć nowe, należy usunąć stare grupy."
+  },
   "dbbebf3c03": {
     "translation": "Tylko z zaproszeniem"
   },
+  "dcdaa754fe": {
+    "translation": "Nieprawidłowy adres URL pliku tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Oznaczenia debugowania aplikacji"
   },
+  "e0c88179b3": {
+    "translation": "Zaproś członków"
+  },
+  "e2198d6228": {
+    "translation": "Kopiuj link zaproszenia"
+  },
   "e2ae80a510": {
     "translation": "Podsumowanie prawne"
   },
+  "e3afed0047": {
+    "translation": "Administrator"
+  },
   "e404559826": {
     "translation": "Warunki korzystania z usługi"
   },
-  "e78e14c5f1": {
-    "translation": "Pinezka"
+  "e81c4e4f2b": {
+    "translation": "Lub"
+  },
+  "ea0626ac5a": {
+    "translation": "Strefa niebezpieczna"
   },
   "ea4788705e": {
     "translation": "Anuluj"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Aby dowiedzieć się więcej, przeczytaj naszą <a>politykę plików cookie</a>."
   },
+  "ef53538ae4": {
+    "translation": "Członkowie"
+  },
   "ef7de3f485": {
     "translation": "wybrany"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Ustawienia"
   },
+  "f714e36843": {
+    "translation": "Czy na pewno chcesz opuścić tę grupę?"
+  },
+  "fa2ead697d": {
+    "translation": "Polityka prywatności"
+  },
   "fb15c53f22": {
     "translation": "Oglądający"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Skopiowany link"
   },
+  "ff7a814974": {
+    "translation": "Dodaj link do pliku…"
+  },
   "ffcd73e997": {
     "translation": "Importuj plik…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/pt-br.json b/apps/dotcom/client/public/tla/locales/pt-br.json
index 4d4d858f3d31..c64618d04797 100644
--- a/apps/dotcom/client/public/tla/locales/pt-br.json
+++ b/apps/dotcom/client/public/tla/locales/pt-br.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Conta"
   },
+  "08d2d725a9": {
+    "translation": "Crie uma conta gratuita para salvar seu trabalho, colaborar em tempo real e muito mais."
+  },
   "0b27918290": {
     "translation": "Arquivo"
   },
   "0b9a4cde72": {
     "translation": "Guia do arquivo"
   },
+  "0beb3ca97b": {
+    "translation": "O tldraw é um quadro branco virtual gratuito e instantâneo."
+  },
   "0d1f2bb523": {
     "translation": "Enviar feedback"
   },
   "110a4b01be": {
     "translation": "Publicar"
   },
+  "129b9e34ea": {
+    "translation": "Sair do grupo"
+  },
+  "12a6766ba1": {
+    "translation": "Desafixar arquivo"
+  },
   "12c8a9838c": {
     "translation": "Experimente o SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Exportar como"
   },
+  "146ffe2fd9": {
+    "translation": "Mostrar mais"
+  },
+  "14d65465b7": {
+    "translation": "Excluir grupo"
+  },
   "181b90f889": {
     "translation": "Criar arquivo"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Esta sala está se aproximando do limite de tamanho. Considere remover algum conteúdo ou iniciar um novo arquivo."
   },
+  "2445e5e347": {
+    "translation": "Criar grupo"
+  },
   "250ddea65c": {
     "translation": "Sobre tldraw"
   },
   "299cb00a7a": {
     "translation": "Falha ao fazer upload"
   },
+  "2c3ef76333": {
+    "translation": "Meus arquivos"
+  },
   "2deec2cb74": {
     "translation": "Esta sala atingiu o limite de tamanho e as alterações podem não ser mais salvas. Remova algum conteúdo ou crie um novo arquivo."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Destaque ausente"
   },
+  "32210b37e4": {
+    "translation": "Adicionar link"
+  },
   "335defdafe": {
     "translation": "Tente atualizar a página."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continuar com o e-mail"
+  },
   "3bd1b98dbd": {
     "translation": "Não foi possível publicar as alterações."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Por favor recarregue"
+  "47f493a590": {
+    "translation": "Arquivo PIN"
   },
-  "764671e008": {
-    "translation": "Converse conosco no Discord"
+  "49049467ff": {
+    "translation": "Cole o URL do arquivo tldraw..."
   },
   "4908687e50": {
     "translation": "Tem certeza de que deseja esquecer este arquivo?"
   },
+  "49ee308734": {
+    "translation": "Nome"
+  },
   "4d0d3ddec9": {
     "translation": "Este site usa cookies para fazer o aplicativo funcionar e coletar análises."
   },
   "4d1c8263ba": {
     "translation": "Recarregar"
   },
+  "4da5988a2e": {
+    "translation": "Excluir grupo…"
+  },
+  "4e6fbf032b": {
+    "translation": "Tem certeza de que deseja excluir este grupo? Esta ação não pode ser desfeita."
+  },
   "50db1b7e1e": {
     "translation": "Não foi possível cancelar a publicação do arquivo."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Política de Privacidade"
   },
+  "5a86b22fa0": {
+    "translation": "Arraste os arquivos para cá, <create>criar um arquivo</create> ou <invite>copiar link de convite</invite> para começar."
+  },
   "5a95a425f7": {
     "translation": "Compartilhar"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Navegador antigo detectado. Atualize seu navegador para usar este aplicativo."
   },
+  "5c6fe42bc2": {
+    "translation": "Revogue este link e crie um novo."
+  },
   "5d26ae7550": {
     "translation": "Não foi possível fazer upload de parte do conteúdo que você criou antes de se conectar."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Anterior"
   },
+  "639bae9ac6": {
+    "translation": "você"
+  },
   "6609dd239e": {
     "translation": "Algo deu errado"
   },
   "6637a98151": {
     "translation": "Uma nova versão do tldraw está disponível. Recarregue a página para continuar."
   },
+  "68257bb646": {
+    "translation": "Você foi convidado(a) para o grupo <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Insira seu endereço de e-mail"
+  },
   "6a26f54883": {
     "translation": "Assistência"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Siga estas etapas para importar o conteúdo manualmente:"
   },
+  "70222abcfc": {
+    "translation": "Configurações de grupo"
+  },
   "70a6facb9d": {
     "translation": "Esta semana"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Gerenciar cookies"
   },
+  "7697920637": {
+    "translation": "Por favor recarregue"
+  },
+  "764671e008": {
+    "translation": "Converse conosco no Discord"
+  },
   "777f9e90cf": {
     "translation": "Solicitação inválida."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Esquecer"
   },
+  "7cfe6c43dc": {
+    "translation": "Sair do grupo…"
+  },
   "7daeced9ff": {
     "translation": "Publicar alterações"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Renomear arquivo"
   },
+  "8ad4303b83": {
+    "translation": "Não, obrigado"
+  },
   "8b1946f965": {
     "translation": "Para continuar editando, copie a sala para seus arquivos."
   },
+  "8c2d3d730c": {
+    "translation": "Verifique seu e-mail para obter um código de verificação."
+  },
   "8eb2c00e96": {
     "translation": "Compartilhado com você"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copiar para meus arquivos"
   },
+  "930390d222": {
+    "translation": "Link do convite copiado"
+  },
+  "95aacd4d4a": {
+    "translation": "Iniciar sessão com o Google"
+  },
+  "95d2109dc8": {
+    "translation": "Construir com o SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "Este mês"
   },
+  "985a4b720f": {
+    "translation": "Termos de Uso"
+  },
+  "98c997a27e": {
+    "translation": "Adicionar link do arquivo"
+  },
   "9914a0ce04": {
     "translation": "Modo claro"
   },
+  "9b33f5c63c": {
+    "translation": "Não recebeu o código? <resend>Reenviar</resend>."
+  },
   "9bef626805": {
     "translation": "Excluir arquivo"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Informações gerais"
   },
+  "aa916767cf": {
+    "translation": "Faça login para aceitar o convite."
+  },
   "ab0df9ba36": {
     "translation": "Limite de arquivo atingido"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Usuário convidado"
   },
+  "b357b524e7": {
+    "translation": "Endereço de email"
+  },
+  "b3d2db69fe": {
+    "translation": "URL do arquivo"
+  },
   "b6d4223e60": {
     "translation": "Fazer login"
   },
+  "b6f4a2ec63": {
+    "translation": "Proprietário"
+  },
   "b758336699": {
     "translation": "Copiar link"
   },
   "ba0318cb81": {
     "translation": "Entre para compartilhar"
   },
-  "bb792693e2": {
-    "translation": "Desafixar"
+  "bb93a7590f": {
+    "translation": "Aceitar e entrar no grupo"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Carregando arquivo .tldr…} other {Carregando {uploaded} de {total} arquivos .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Compartilhado por {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Fazer upload de arquivos .tldr"
-  },
   "c2276c9127": {
     "translation": "Saiba mais sobre como compartilhar."
   },
+  "c28aed8348": {
+    "translation": "Permitir <cookies>análises</cookies> para nos ajudar a melhorar o tldraw."
+  },
   "c303bd1095": {
     "translation": "Não foi possível publicar o arquivo."
   },
   "c4b39a1cc3": {
     "translation": "Cookies essenciais"
   },
+  "c6155aaecc": {
+    "translation": "Nome do grupo"
+  },
   "c655b27b1e": {
     "translation": "i18n: Sequência de caracteres longa"
   },
   "c6a00f137b": {
     "translation": "Convidar"
   },
+  "c74ea6dbff": {
+    "translation": "Mostrar menos"
+  },
   "c87aacf567": {
     "translation": "Sair"
   },
+  "c9cc8cce24": {
+    "translation": "Salvar"
+  },
   "cceaefbc20": {
     "translation": "Compartilhar este arquivo"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Alternar barra lateral"
   },
+  "d638a3344b": {
+    "translation": "Antes de começar, aceite nossos <tos>termos de uso</tos> e <privacy>política de privacidade</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Tente novamente"
   },
+  "d88ad2dc74": {
+    "translation": "Aceitar e continuar"
+  },
   "d9100f3e10": {
     "translation": "Clique aqui para visualizar o conteúdo"
   },
+  "d9e35d0f55": {
+    "translation": "Você atingiu o número máximo de grupos. É necessário excluir os grupos antigos antes de criar novos."
+  },
   "dbbebf3c03": {
     "translation": "Apenas para convidados"
   },
+  "dcdaa754fe": {
+    "translation": "URL de arquivo tldraw inválida"
+  },
   "dfdb78a4e4": {
     "translation": "Sinalizadores de depuração de aplicativos"
   },
+  "e0c88179b3": {
+    "translation": "Convide membros"
+  },
+  "e2198d6228": {
+    "translation": "Copiar link de convite"
+  },
   "e2ae80a510": {
     "translation": "Resumo jurídico"
   },
+  "e3afed0047": {
+    "translation": "Administrador"
+  },
   "e404559826": {
     "translation": "Termos de serviço"
   },
-  "e78e14c5f1": {
-    "translation": "Fixar"
+  "e81c4e4f2b": {
+    "translation": "ou"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona de perigo"
   },
   "ea4788705e": {
     "translation": "Cancelar"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Leia nossa <a>política de cookies</a> para saber mais."
   },
+  "ef53538ae4": {
+    "translation": "Membros"
+  },
   "ef7de3f485": {
     "translation": "selecionado"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Configurações"
   },
+  "f714e36843": {
+    "translation": "Tem certeza de que deseja sair deste grupo?"
+  },
+  "fa2ead697d": {
+    "translation": "política de Privacidade"
+  },
   "fb15c53f22": {
     "translation": "Visualizador"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Link copiado"
   },
+  "ff7a814974": {
+    "translation": "Adicionar link do arquivo…"
+  },
   "ffcd73e997": {
     "translation": "Importar arquivo…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/pt-pt.json b/apps/dotcom/client/public/tla/locales/pt-pt.json
index fe91a12dd4d1..c47c2f7cb709 100644
--- a/apps/dotcom/client/public/tla/locales/pt-pt.json
+++ b/apps/dotcom/client/public/tla/locales/pt-pt.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Conta"
   },
+  "08d2d725a9": {
+    "translation": "Crie uma conta gratuita para salvar seu trabalho, colaborar em tempo real e muito mais."
+  },
   "0b27918290": {
     "translation": "Ficheiro"
   },
   "0b9a4cde72": {
     "translation": "Menu Ficheiro"
   },
+  "0beb3ca97b": {
+    "translation": "O tldraw é um quadro branco virtual gratuito e instantâneo."
+  },
   "0d1f2bb523": {
     "translation": "Enviar feedback"
   },
   "110a4b01be": {
     "translation": "Publicar"
   },
+  "129b9e34ea": {
+    "translation": "Sair do grupo"
+  },
+  "12a6766ba1": {
+    "translation": "Desafixar arquivo"
+  },
   "12c8a9838c": {
     "translation": "Experimente o SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Exportar como"
   },
+  "146ffe2fd9": {
+    "translation": "Mostrar mais"
+  },
+  "14d65465b7": {
+    "translation": "Excluir grupo"
+  },
   "181b90f889": {
     "translation": "Criar ficheiro"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Esta sala está se aproximando do limite de tamanho. Considere remover algum conteúdo ou iniciar um novo arquivo."
   },
+  "2445e5e347": {
+    "translation": "Criar grupo"
+  },
   "250ddea65c": {
     "translation": "Sobre tldraw"
   },
   "299cb00a7a": {
     "translation": "O carregamento falhou"
   },
+  "2c3ef76333": {
+    "translation": "Meus arquivos"
+  },
   "2deec2cb74": {
     "translation": "Esta sala atingiu o limite de tamanho e as alterações podem não ser mais salvas. Remova algum conteúdo ou crie um novo arquivo."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Realce em falta"
   },
+  "32210b37e4": {
+    "translation": "Adicionar link"
+  },
   "335defdafe": {
     "translation": "Tente atualizar a página."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continuar com o e-mail"
+  },
   "3bd1b98dbd": {
     "translation": "Não foi possível publicar as alterações."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Por favor recarregue"
+  "47f493a590": {
+    "translation": "Arquivo PIN"
   },
-  "764671e008": {
-    "translation": "Converse conosco no Discord"
+  "49049467ff": {
+    "translation": "Cole o URL do arquivo tldraw..."
   },
   "4908687e50": {
     "translation": "Tem a certeza de que quer esquecer este ficheiro?"
   },
+  "49ee308734": {
+    "translation": "Nome"
+  },
   "4d0d3ddec9": {
     "translation": "Este site usa cookies para fazer o aplicativo funcionar e coletar análises."
   },
   "4d1c8263ba": {
     "translation": "Recarregar"
   },
+  "4da5988a2e": {
+    "translation": "Excluir grupo…"
+  },
+  "4e6fbf032b": {
+    "translation": "Tem certeza de que deseja excluir este grupo? Esta ação não pode ser desfeita."
+  },
   "50db1b7e1e": {
     "translation": "Não foi possível anular a publicação do ficheiro."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Política de Privacidade"
   },
+  "5a86b22fa0": {
+    "translation": "Arraste os arquivos para cá, <create>criar um arquivo</create> ou <invite>copiar link de convite</invite> para começar."
+  },
   "5a95a425f7": {
     "translation": "Partilhar"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Navegador antigo detectado. Atualize seu navegador para usar este aplicativo."
   },
+  "5c6fe42bc2": {
+    "translation": "Revogue este link e crie um novo."
+  },
   "5d26ae7550": {
     "translation": "Não conseguimos carregar alguns dos conteúdos que criou antes de iniciar sessão."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Mais antigo"
   },
+  "639bae9ac6": {
+    "translation": "você"
+  },
   "6609dd239e": {
     "translation": "Algo correu mal"
   },
   "6637a98151": {
     "translation": "Uma nova versão do tldraw está disponível. Recarregue a página para continuar."
   },
+  "68257bb646": {
+    "translation": "Você foi convidado(a) para o grupo <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Insira seu endereço de e-mail"
+  },
   "6a26f54883": {
     "translation": "Ajuda"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Siga estes passos para importar o conteúdo manualmente:"
   },
+  "70222abcfc": {
+    "translation": "Configurações de grupo"
+  },
   "70a6facb9d": {
     "translation": "Esta semana"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Gerenciar cookies"
   },
+  "7697920637": {
+    "translation": "Por favor recarregue"
+  },
+  "764671e008": {
+    "translation": "Converse conosco no Discord"
+  },
   "777f9e90cf": {
     "translation": "Pedido inválido."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Esquecer"
   },
+  "7cfe6c43dc": {
+    "translation": "Sair do grupo…"
+  },
   "7daeced9ff": {
     "translation": "Publicar alterações"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Renomear arquivo"
   },
+  "8ad4303b83": {
+    "translation": "Não, obrigado"
+  },
   "8b1946f965": {
     "translation": "Para continuar editando, copie a sala para seus arquivos."
   },
+  "8c2d3d730c": {
+    "translation": "Verifique seu e-mail para obter um código de verificação."
+  },
   "8eb2c00e96": {
     "translation": "Partilhado consigo"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copiar para os meus ficheiros"
   },
+  "930390d222": {
+    "translation": "Link do convite copiado"
+  },
+  "95aacd4d4a": {
+    "translation": "Iniciar sessão com o Google"
+  },
+  "95d2109dc8": {
+    "translation": "Construir com o SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "Este mês"
   },
+  "985a4b720f": {
+    "translation": "Termos de Uso"
+  },
+  "98c997a27e": {
+    "translation": "Adicionar link do arquivo"
+  },
   "9914a0ce04": {
     "translation": "Claro"
   },
+  "9b33f5c63c": {
+    "translation": "Não recebeu o código? <resend>Reenviar</resend>."
+  },
   "9bef626805": {
     "translation": "Eliminar ficheiro"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Fundo"
   },
+  "aa916767cf": {
+    "translation": "Faça login para aceitar o convite."
+  },
   "ab0df9ba36": {
     "translation": "Limite de arquivo atingido"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Usuário convidado"
   },
+  "b357b524e7": {
+    "translation": "Endereço de email"
+  },
+  "b3d2db69fe": {
+    "translation": "URL do arquivo"
+  },
   "b6d4223e60": {
     "translation": "Iniciar sessão"
   },
+  "b6f4a2ec63": {
+    "translation": "Proprietário"
+  },
   "b758336699": {
     "translation": "Copiar link"
   },
   "ba0318cb81": {
     "translation": "Entre para compartilhar"
   },
-  "bb792693e2": {
-    "translation": "Desafixar"
+  "bb93a7590f": {
+    "translation": "Aceitar e entrar no grupo"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Carregando arquivo .tldr…} other {Carregando {uploaded} de {total} arquivos .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Partilhado por {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Carregar ficheiros .tldr"
-  },
   "c2276c9127": {
     "translation": "Saiba mais sobre partilha."
   },
+  "c28aed8348": {
+    "translation": "Permitir <cookies>análises</cookies> para nos ajudar a melhorar o tldraw."
+  },
   "c303bd1095": {
     "translation": "Não foi possível publicar o ficheiro."
   },
   "c4b39a1cc3": {
     "translation": "Cookies essenciais"
   },
+  "c6155aaecc": {
+    "translation": "Nome do grupo"
+  },
   "c655b27b1e": {
     "translation": "i18n: String longa"
   },
   "c6a00f137b": {
     "translation": "Convidar"
   },
+  "c74ea6dbff": {
+    "translation": "Mostrar menos"
+  },
   "c87aacf567": {
     "translation": "Terminar sessão"
   },
+  "c9cc8cce24": {
+    "translation": "Salvar"
+  },
   "cceaefbc20": {
     "translation": "Partilhar este ficheiro"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Alternar barra lateral"
   },
+  "d638a3344b": {
+    "translation": "Antes de começar, aceite nossos <tos>termos de uso</tos> e <privacy>política de privacidade</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Tente de novo"
   },
+  "d88ad2dc74": {
+    "translation": "Aceitar e continuar"
+  },
   "d9100f3e10": {
     "translation": "Vá aqui para ver o conteúdo"
   },
+  "d9e35d0f55": {
+    "translation": "Você atingiu o número máximo de grupos. É necessário excluir os grupos antigos antes de criar novos."
+  },
   "dbbebf3c03": {
     "translation": "Apenas por convite"
   },
+  "dcdaa754fe": {
+    "translation": "URL de arquivo tldraw inválida"
+  },
   "dfdb78a4e4": {
     "translation": "Sinalizadores de depuração da aplicação"
   },
+  "e0c88179b3": {
+    "translation": "Convide membros"
+  },
+  "e2198d6228": {
+    "translation": "Copiar link de convite"
+  },
   "e2ae80a510": {
     "translation": "Resumo jurídico"
   },
+  "e3afed0047": {
+    "translation": "Administrador"
+  },
   "e404559826": {
     "translation": "Termos de serviço"
   },
-  "e78e14c5f1": {
-    "translation": "Afixar"
+  "e81c4e4f2b": {
+    "translation": "ou"
+  },
+  "ea0626ac5a": {
+    "translation": "Zona de perigo"
   },
   "ea4788705e": {
     "translation": "Cancelar"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Leia nossa <a>política de cookies</a> para saber mais."
   },
+  "ef53538ae4": {
+    "translation": "Membros"
+  },
   "ef7de3f485": {
     "translation": "selecionado"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Configurações"
   },
+  "f714e36843": {
+    "translation": "Tem certeza de que deseja sair deste grupo?"
+  },
+  "fa2ead697d": {
+    "translation": "política de Privacidade"
+  },
   "fb15c53f22": {
     "translation": "Visualizador"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Link copiado"
   },
+  "ff7a814974": {
+    "translation": "Adicionar link do arquivo…"
+  },
   "ffcd73e997": {
     "translation": "Importar arquivo…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ro.json b/apps/dotcom/client/public/tla/locales/ro.json
index 77ee40862817..566a64406e44 100644
--- a/apps/dotcom/client/public/tla/locales/ro.json
+++ b/apps/dotcom/client/public/tla/locales/ro.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Cont"
   },
+  "08d2d725a9": {
+    "translation": "Creează un cont gratuit pentru a-ți salva munca, a colabora în timp real și multe altele."
+  },
   "0b27918290": {
     "translation": "Fişier"
   },
   "0b9a4cde72": {
     "translation": "meniul Fișier"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw este o tablă albă virtuală gratuită și instantanee."
+  },
   "0d1f2bb523": {
     "translation": "Trimite feedback"
   },
   "110a4b01be": {
     "translation": "Publica"
   },
+  "129b9e34ea": {
+    "translation": "Părăsește grupul"
+  },
+  "12a6766ba1": {
+    "translation": "Anulează fixarea fișierului"
+  },
   "12c8a9838c": {
     "translation": "Încercați SDK-ul tldraw"
   },
   "13ddd375ad": {
     "translation": "Exportați ca"
   },
+  "146ffe2fd9": {
+    "translation": "Afișează mai multe"
+  },
+  "14d65465b7": {
+    "translation": "Ștergeți grupul"
+  },
   "181b90f889": {
     "translation": "Creați fișier"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Această cameră se apropie de limita de dimensiune. Luați în considerare eliminarea unei părți din conținut sau începerea unui fișier nou."
   },
+  "2445e5e347": {
+    "translation": "Creați un grup"
+  },
   "250ddea65c": {
     "translation": "Despre tldraw"
   },
   "299cb00a7a": {
     "translation": "Încărcarea nu a reușit"
   },
+  "2c3ef76333": {
+    "translation": "Fișierele mele"
+  },
   "2deec2cb74": {
     "translation": "Această cameră a atins limita de dimensiune și este posibil ca modificările să nu mai fie salvate. Eliminați o parte din conținut sau începeți un fișier nou."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Evidențiați Lipsă"
   },
+  "32210b37e4": {
+    "translation": "Adăugați link"
+  },
   "335defdafe": {
     "translation": "Vă rugăm să încercați să reîmprospătați pagina."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Continuă cu e-mailul"
+  },
   "3bd1b98dbd": {
     "translation": "Nu se pot publica modificările."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Vă rugăm să reîncărcați"
+  "47f493a590": {
+    "translation": "Fișier fixat"
   },
-  "764671e008": {
-    "translation": "Discutați cu noi pe Discord"
+  "49049467ff": {
+    "translation": "Lipiți adresa URL a fișierului tldraw..."
   },
   "4908687e50": {
     "translation": "Sigur vrei să uiți acest fișier?"
   },
+  "49ee308734": {
+    "translation": "Nume"
+  },
   "4d0d3ddec9": {
     "translation": "Acest site folosește cookie-uri pentru a face aplicația să funcționeze și pentru a colecta date analitice."
   },
   "4d1c8263ba": {
     "translation": "Reîncărcați"
   },
+  "4da5988a2e": {
+    "translation": "Ștergeți grupul…"
+  },
+  "4e6fbf032b": {
+    "translation": "Sigur doriți să ștergeți acest grup? Această acțiune nu poate fi anulată."
+  },
   "50db1b7e1e": {
     "translation": "Nu se poate anula publicarea fișierului."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Politica de confidențialitate"
   },
+  "5a86b22fa0": {
+    "translation": "Trageți fișierele aici, <create>creați un fișier</create> sau <invite>copiați linkul de invitație</invite> pentru a începe."
+  },
   "5a95a425f7": {
     "translation": "Distribuie"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Browser vechi detectat. Vă rugăm să actualizați browserul pentru a utiliza această aplicație."
   },
+  "5c6fe42bc2": {
+    "translation": "Revocați acest link și creați unul nou."
+  },
   "5d26ae7550": {
     "translation": "Nu am reușit să încărcăm o parte din conținutul pe care l-ați creat înainte de a vă conecta."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Mai în vârstă"
   },
+  "639bae9ac6": {
+    "translation": "tu"
+  },
   "6609dd239e": {
     "translation": "Ceva a mers prost"
   },
   "6637a98151": {
     "translation": "Este disponibilă o nouă versiune de tldraw. Vă rugăm să reîncărcați pagina pentru a continua."
   },
+  "68257bb646": {
+    "translation": "Ai fost invitat(ă) în grupul <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Introdu adresa ta de e-mail"
+  },
   "6a26f54883": {
     "translation": "Ajutor"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Urmați acești pași pentru a importa manual conținutul:"
   },
+  "70222abcfc": {
+    "translation": "Setări de grup"
+  },
   "70a6facb9d": {
     "translation": "În această săptămână"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Gestionați cookie-urile"
   },
+  "7697920637": {
+    "translation": "Vă rugăm să reîncărcați"
+  },
+  "764671e008": {
+    "translation": "Discutați cu noi pe Discord"
+  },
   "777f9e90cf": {
     "translation": "Solicitare nevalidă."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Uita"
   },
+  "7cfe6c43dc": {
+    "translation": "Părăsește grupul…"
+  },
   "7daeced9ff": {
     "translation": "Publicați modificările"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Redenumiți fișierul"
   },
+  "8ad4303b83": {
+    "translation": "Nu, mulțumesc"
+  },
   "8b1946f965": {
     "translation": "Pentru a continua editarea, vă rugăm să copiați camera în fișierele dvs."
   },
+  "8c2d3d730c": {
+    "translation": "Verifică-ți e-mailul pentru un cod de verificare."
+  },
   "8eb2c00e96": {
     "translation": "Împărtășită cu tine"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Copiați în fișierele mele"
   },
+  "930390d222": {
+    "translation": "Link de invitație copiat"
+  },
+  "95aacd4d4a": {
+    "translation": "Conectați-vă cu Google"
+  },
+  "95d2109dc8": {
+    "translation": "Construiți cu SDK-ul tldraw"
+  },
   "96165d6df5": {
     "translation": "Luna aceasta"
   },
+  "985a4b720f": {
+    "translation": "Termeni de utilizare"
+  },
+  "98c997a27e": {
+    "translation": "Adăugați linkul fișierului"
+  },
   "9914a0ce04": {
     "translation": "Aprinde"
   },
+  "9b33f5c63c": {
+    "translation": "Nu ați primit un cod? <resend>Retrimiteți</resend>."
+  },
   "9bef626805": {
     "translation": "Ștergeți fișierul"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Fundal"
   },
+  "aa916767cf": {
+    "translation": "Conectați-vă pentru a accepta invitația"
+  },
   "ab0df9ba36": {
     "translation": "Limita de fișiere a fost atinsă"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Utilizator invitat"
   },
+  "b357b524e7": {
+    "translation": "Adresa de e-mail"
+  },
+  "b3d2db69fe": {
+    "translation": "URL-ul fișierului"
+  },
   "b6d4223e60": {
     "translation": "Conectare"
   },
+  "b6f4a2ec63": {
+    "translation": "Proprietar"
+  },
   "b758336699": {
     "translation": "Copiați linkul"
   },
   "ba0318cb81": {
     "translation": "Conectați-vă pentru a partaja"
   },
-  "bb792693e2": {
-    "translation": "Anulați fixarea"
+  "bb93a7590f": {
+    "translation": "Acceptă și alătură-te grupului"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Se încarcă fișierul .tldr...} few {} other {Se încarcă {uploaded} din {total} fișiere .tldr...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Distribuit de {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Încărcați fișiere .tldr"
-  },
   "c2276c9127": {
     "translation": "Aflați mai multe despre partajare."
   },
+  "c28aed8348": {
+    "translation": "Permiteți `<cookies>analytics</cookies>` să ne ajute să îmbunătățim tldraw."
+  },
   "c303bd1095": {
     "translation": "Nu se poate publica fișierul."
   },
   "c4b39a1cc3": {
     "translation": "Cookie-uri esențiale"
   },
+  "c6155aaecc": {
+    "translation": "Numele grupului"
+  },
   "c655b27b1e": {
     "translation": "i18n: șir lung"
   },
   "c6a00f137b": {
     "translation": "Invita"
   },
+  "c74ea6dbff": {
+    "translation": "Afișează mai puțin"
+  },
   "c87aacf567": {
     "translation": "Sign out"
   },
+  "c9cc8cce24": {
+    "translation": "Salva"
+  },
   "cceaefbc20": {
     "translation": "Distribuiți acest fișier"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Comutați bara laterală"
   },
+  "d638a3344b": {
+    "translation": "Înainte de a începe, vă rugăm să acceptați <tos>termenii de utilizare</tos> și <privacy>politica de confidențialitate</privacy>."
+  },
   "d721757161": {
     "translation": "Temă"
   },
   "d876a9fe1a": {
     "translation": "Încearcă din nou"
   },
+  "d88ad2dc74": {
+    "translation": "Acceptați și continuați"
+  },
   "d9100f3e10": {
     "translation": "Intră aici pentru a vedea conținutul"
   },
+  "d9e35d0f55": {
+    "translation": "Ați atins numărul maxim de grupuri. Trebuie să ștergeți grupurile vechi înainte de a crea altele noi."
+  },
   "dbbebf3c03": {
     "translation": "Numai cu invitație"
   },
+  "dcdaa754fe": {
+    "translation": "Adresă URL fișier tldraw nevalidă"
+  },
   "dfdb78a4e4": {
     "translation": "Indicatori de depanare a aplicației"
   },
+  "e0c88179b3": {
+    "translation": "Invită membri"
+  },
+  "e2198d6228": {
+    "translation": "Copiați linkul de invitație"
+  },
   "e2ae80a510": {
     "translation": "Rezumat juridic"
   },
+  "e3afed0047": {
+    "translation": "Administrator"
+  },
   "e404559826": {
     "translation": "Termeni și condiții"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "sau"
+  },
+  "ea0626ac5a": {
+    "translation": "Zonă periculoasă"
   },
   "ea4788705e": {
     "translation": "Anula"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Citiți <a>politica noastră privind cookie-urile</a> pentru a afla mai multe."
   },
+  "ef53538ae4": {
+    "translation": "Membri"
+  },
   "ef7de3f485": {
     "translation": "selectat"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Setări"
   },
+  "f714e36843": {
+    "translation": "Sigur vrei să părăsești acest grup?"
+  },
+  "fa2ead697d": {
+    "translation": "Politica de confidențialitate"
+  },
   "fb15c53f22": {
     "translation": "Vizualizator"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Link copiat"
   },
+  "ff7a814974": {
+    "translation": "Adăugați linkul fișierului…"
+  },
   "ffcd73e997": {
     "translation": "Importați fișierul…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ru.json b/apps/dotcom/client/public/tla/locales/ru.json
index f42c0dfb6e83..8398aa11597e 100644
--- a/apps/dotcom/client/public/tla/locales/ru.json
+++ b/apps/dotcom/client/public/tla/locales/ru.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Счет"
   },
+  "08d2d725a9": {
+    "translation": "Создайте бесплатную учетную запись, чтобы сохранять свою работу, сотрудничать в режиме реального времени и многое другое."
+  },
   "0b27918290": {
     "translation": "Файл"
   },
   "0b9a4cde72": {
     "translation": "Меню «Файл»"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw — бесплатная и мгновенная виртуальная доска."
+  },
   "0d1f2bb523": {
     "translation": "Отправить отзыв"
   },
   "110a4b01be": {
     "translation": "Опубликовать"
   },
+  "129b9e34ea": {
+    "translation": "Покинуть группу"
+  },
+  "12a6766ba1": {
+    "translation": "Открепить файл"
+  },
   "12c8a9838c": {
     "translation": "Попробуйте tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Экспортировать как"
   },
+  "146ffe2fd9": {
+    "translation": "Показать больше"
+  },
+  "14d65465b7": {
+    "translation": "Удалить группу"
+  },
   "181b90f889": {
     "translation": "Создать файл"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Размер этой комнаты приближается к пределу. Попробуйте удалить часть контента или создать новый файл."
   },
+  "2445e5e347": {
+    "translation": "Создать группу"
+  },
   "250ddea65c": {
     "translation": "О tldraw"
   },
   "299cb00a7a": {
     "translation": "Загрузка не удалась"
   },
+  "2c3ef76333": {
+    "translation": "Мои файлы"
+  },
   "2deec2cb74": {
     "translation": "Размер этой комнаты достиг предела, и изменения, возможно, больше не будут сохраняться. Удалите часть контента или создайте новый файл."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Выделение отсутствует"
   },
+  "32210b37e4": {
+    "translation": "Добавить ссылку"
+  },
   "335defdafe": {
     "translation": "Попробуйте обновить страницу."
   },
   "344a7f427f": {
     "translation": "Редактор"
   },
+  "3bc7d6ea2f": {
+    "translation": "Продолжить с электронной почтой"
+  },
   "3bd1b98dbd": {
     "translation": "Невозможно опубликовать изменения."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Пожалуйста, перезагрузите"
+  "47f493a590": {
+    "translation": "Закрепить файл"
   },
-  "764671e008": {
-    "translation": "Пообщайтесь с нами в Discord"
+  "49049467ff": {
+    "translation": "Вставьте URL-адрес файла tldraw..."
   },
   "4908687e50": {
     "translation": "Вы уверены, что хотите забыть этот файл?"
   },
+  "49ee308734": {
+    "translation": "Имя"
+  },
   "4d0d3ddec9": {
     "translation": "Этот сайт использует файлы cookie для работы приложения и сбора аналитики."
   },
   "4d1c8263ba": {
     "translation": "Перезагрузить"
   },
+  "4da5988a2e": {
+    "translation": "Удалить группу…"
+  },
+  "4e6fbf032b": {
+    "translation": "Вы уверены, что хотите удалить эту группу? Это действие не может быть отменено."
+  },
   "50db1b7e1e": {
     "translation": "Невозможно отменить публикацию файла."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Политика конфиденциальности"
   },
+  "5a86b22fa0": {
+    "translation": "Перетащите файлы сюда, <create>создайте файл</create> или <invite>скопируйте ссылку приглашения</invite>, чтобы начать."
+  },
   "5a95a425f7": {
     "translation": "Поделиться"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Обнаружен старый браузер. Пожалуйста, обновите браузер, чтобы использовать это приложение."
   },
+  "5c6fe42bc2": {
+    "translation": "Отмените эту ссылку и создайте новую."
+  },
   "5d26ae7550": {
     "translation": "Нам не удалось загрузить некоторый контент, созданный вами до входа в систему."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Старше"
   },
+  "639bae9ac6": {
+    "translation": "ты"
+  },
   "6609dd239e": {
     "translation": "Что-то пошло не так"
   },
   "6637a98151": {
     "translation": "Доступна новая версия tldraw. Пожалуйста, перезагрузите страницу, чтобы продолжить."
   },
+  "68257bb646": {
+    "translation": "Вас пригласили в группу <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Введите свой адрес электронной почты"
+  },
   "6a26f54883": {
     "translation": "Справка"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Выполните следующие шаги, чтобы импортировать контент вручную:"
   },
+  "70222abcfc": {
+    "translation": "Настройки группы"
+  },
   "70a6facb9d": {
     "translation": "На этой неделе"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Управление куки-файлами"
   },
+  "7697920637": {
+    "translation": "Пожалуйста, перезагрузите"
+  },
+  "764671e008": {
+    "translation": "Пообщайтесь с нами в Discord"
+  },
   "777f9e90cf": {
     "translation": "Неверный запрос."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Забыть"
   },
+  "7cfe6c43dc": {
+    "translation": "Покинуть группу…"
+  },
   "7daeced9ff": {
     "translation": "Опубликовать изменения"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Переименовать файл"
   },
+  "8ad4303b83": {
+    "translation": "Нет, спасибо"
+  },
   "8b1946f965": {
     "translation": "Чтобы продолжить редактирование, скопируйте комнату в свои файлы."
   },
+  "8c2d3d730c": {
+    "translation": "Проверьте свою электронную почту на наличие проверочного кода."
+  },
   "8eb2c00e96": {
     "translation": "Поделился с вами"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Скопировать в мои файлы"
   },
+  "930390d222": {
+    "translation": "Скопированная ссылка-приглашение"
+  },
+  "95aacd4d4a": {
+    "translation": "Войти через Google"
+  },
+  "95d2109dc8": {
+    "translation": "Сборка с помощью tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "В этом месяце"
   },
+  "985a4b720f": {
+    "translation": "Условия эксплуатации"
+  },
+  "98c997a27e": {
+    "translation": "Добавить ссылку на файл"
+  },
   "9914a0ce04": {
     "translation": "Светлая"
   },
+  "9b33f5c63c": {
+    "translation": "Не получили код? <resend>Отправить повторно</resend>."
+  },
   "9bef626805": {
     "translation": "Удалить файл"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Фон"
   },
+  "aa916767cf": {
+    "translation": "Войдите, чтобы принять приглашение"
+  },
   "ab0df9ba36": {
     "translation": "Достигнут лимит файлов"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Гость-пользователь"
   },
+  "b357b524e7": {
+    "translation": "Адрес электронной почты"
+  },
+  "b3d2db69fe": {
+    "translation": "URL-адрес файла"
+  },
   "b6d4223e60": {
     "translation": "Войти"
   },
+  "b6f4a2ec63": {
+    "translation": "Владелец"
+  },
   "b758336699": {
     "translation": "Копировать ссылку"
   },
   "ba0318cb81": {
     "translation": "Войдите, чтобы поделиться"
   },
-  "bb792693e2": {
-    "translation": "Открепить"
+  "bb93a7590f": {
+    "translation": "Принять и присоединиться к группе"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Загрузка файла .tldr…} few {Загрузка файлов .tldr…} many {Загрузка файлов .tldr…} other {Загрузка {uploaded} из {total} файлов .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Поделился {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Загрузить файлы .tldr"
-  },
   "c2276c9127": {
     "translation": "Узнать больше о том, как поделиться."
   },
+  "c28aed8348": {
+    "translation": "Разрешите <cookies>аналитику</cookies> помочь нам улучшить tldraw."
+  },
   "c303bd1095": {
     "translation": "Невозможно опубликовать файл."
   },
   "c4b39a1cc3": {
     "translation": "Необходимые файлы cookie"
   },
+  "c6155aaecc": {
+    "translation": "Название группы"
+  },
   "c655b27b1e": {
     "translation": "i18n: Длинная строка"
   },
   "c6a00f137b": {
     "translation": "Пригласить"
   },
+  "c74ea6dbff": {
+    "translation": "Показать меньше"
+  },
   "c87aacf567": {
     "translation": "Выйти"
   },
+  "c9cc8cce24": {
+    "translation": "Сохранять"
+  },
   "cceaefbc20": {
     "translation": "Поделиться этим файлом"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Переключить боковую панель"
   },
+  "d638a3344b": {
+    "translation": "Прежде чем начать, пожалуйста, примите наши <tos>условия использования</tos> и <privacy>политику конфиденциальности</privacy>."
+  },
   "d721757161": {
     "translation": "Тема"
   },
   "d876a9fe1a": {
     "translation": "Попробуйте еще раз"
   },
+  "d88ad2dc74": {
+    "translation": "Принять и продолжить"
+  },
   "d9100f3e10": {
     "translation": "Перейдите сюда, чтобы посмотреть контент"
   },
+  "d9e35d0f55": {
+    "translation": "Вы достигли максимального количества групп. Перед созданием новых групп необходимо удалить старые."
+  },
   "dbbebf3c03": {
     "translation": "Только по приглашениям"
   },
+  "dcdaa754fe": {
+    "translation": "Неверный URL-адрес файла tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Флажки отладки приложений"
   },
+  "e0c88179b3": {
+    "translation": "Пригласить участников"
+  },
+  "e2198d6228": {
+    "translation": "Копировать ссылку приглашения"
+  },
   "e2ae80a510": {
     "translation": "Юридическое резюме"
   },
+  "e3afed0047": {
+    "translation": "Администратор"
+  },
   "e404559826": {
     "translation": "Условия обслуживания"
   },
-  "e78e14c5f1": {
-    "translation": "Прикрепить"
+  "e81c4e4f2b": {
+    "translation": "или"
+  },
+  "ea0626ac5a": {
+    "translation": "Опасная зона"
   },
   "ea4788705e": {
     "translation": "Отменить"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Чтобы узнать больше, ознакомьтесь с нашей <a>политикой в отношении файлов cookie</a>."
   },
+  "ef53538ae4": {
+    "translation": "Участники"
+  },
   "ef7de3f485": {
     "translation": "выбранный"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Настройки"
   },
+  "f714e36843": {
+    "translation": "Вы уверены, что хотите покинуть эту группу?"
+  },
+  "fa2ead697d": {
+    "translation": "политика конфиденциальности"
+  },
   "fb15c53f22": {
     "translation": "Просмотрщик"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Скопированная ссылка"
   },
+  "ff7a814974": {
+    "translation": "Добавить ссылку на файл…"
+  },
   "ffcd73e997": {
     "translation": "Импортировать файл…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/sl.json b/apps/dotcom/client/public/tla/locales/sl.json
index 8f54f4f3f5a3..20762ffb384d 100644
--- a/apps/dotcom/client/public/tla/locales/sl.json
+++ b/apps/dotcom/client/public/tla/locales/sl.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Račun"
   },
+  "08d2d725a9": {
+    "translation": "Ustvarite brezplačen račun za shranjevanje dela, sodelovanje v realnem času in še več."
+  },
   "0b27918290": {
     "translation": "Datoteka"
   },
   "0b9a4cde72": {
     "translation": "Meni datoteke"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw je brezplačna in takojšnja virtualna tabla."
+  },
   "0d1f2bb523": {
     "translation": "Pošlji povratne informacije"
   },
   "110a4b01be": {
     "translation": "Objavi"
   },
+  "129b9e34ea": {
+    "translation": "Zapusti skupino"
+  },
+  "12a6766ba1": {
+    "translation": "Odpri datoteko"
+  },
   "12c8a9838c": {
     "translation": "Preizkusite SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Izvozi kot"
   },
+  "146ffe2fd9": {
+    "translation": "Prikaži več"
+  },
+  "14d65465b7": {
+    "translation": "Izbriši skupino"
+  },
   "181b90f889": {
     "translation": "Ustvari datoteko"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Ta soba se bliža svoji omejitvi velikosti. Razmislite o odstranitvi nekaj vsebine ali ustvarjanju nove datoteke."
   },
+  "2445e5e347": {
+    "translation": "Ustvari skupino"
+  },
   "250ddea65c": {
     "translation": "O tldrawu"
   },
   "299cb00a7a": {
     "translation": "Nalaganje ni uspelo"
   },
+  "2c3ef76333": {
+    "translation": "Moje datoteke"
+  },
   "2deec2cb74": {
     "translation": "Ta soba je dosegla omejitev velikosti in spremembe morda ne bodo več shranjene. Odstranite nekaj vsebine ali začnite novo datoteko."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Oznaka manjka"
   },
+  "32210b37e4": {
+    "translation": "Dodaj povezavo"
+  },
   "335defdafe": {
     "translation": "Poskusite osvežiti stran."
   },
   "344a7f427f": {
     "translation": "Urednik"
   },
+  "3bc7d6ea2f": {
+    "translation": "Nadaljuj z e-pošto"
+  },
   "3bd1b98dbd": {
     "translation": "Ni mogoče objaviti sprememb."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Ponovno naložite"
+  "47f493a590": {
+    "translation": "Pripni datoteko"
   },
-  "764671e008": {
-    "translation": "Klepetajte z nami na Discordu"
+  "49049467ff": {
+    "translation": "Prilepi URL datoteke tldraw ..."
   },
   "4908687e50": {
     "translation": "Ali ste prepričani, da želite pozabiti to datoteko?"
   },
+  "49ee308734": {
+    "translation": "Ime"
+  },
   "4d0d3ddec9": {
     "translation": "To spletno mesto uporablja piškotke za delovanje aplikacije in zbiranje analitičnih podatkov."
   },
   "4d1c8263ba": {
     "translation": "Ponovno naloži"
   },
+  "4da5988a2e": {
+    "translation": "Izbriši skupino …"
+  },
+  "4e6fbf032b": {
+    "translation": "Ali ste prepričani, da želite izbrisati to skupino? Tega dejanja ni mogoče razveljaviti."
+  },
   "50db1b7e1e": {
     "translation": "Ni mogoče preklicati objave datoteke."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Politika zasebnosti"
   },
+  "5a86b22fa0": {
+    "translation": "Za začetek povlecite datoteke sem, <create>ustvarite datoteko</create> ali <invite>kopirajte povezavo za povabilo</invite>."
+  },
   "5a95a425f7": {
     "translation": "Deli"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Zaznan je bil star brskalnik. Za uporabo te aplikacije posodobite brskalnik."
   },
+  "5c6fe42bc2": {
+    "translation": "Prekliči to povezavo in ustvari novo."
+  },
   "5d26ae7550": {
     "translation": "Nekatere vsebine, ki ste jo ustvarili, preden ste se prijavili, nismo uspeli naložiti."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Starejši"
   },
+  "639bae9ac6": {
+    "translation": "ti"
+  },
   "6609dd239e": {
     "translation": "Nekaj je šlo narobe"
   },
   "6637a98151": {
     "translation": "Na voljo je nova različica tldraw. Za nadaljevanje znova naložite stran."
   },
+  "68257bb646": {
+    "translation": "Povabljeni ste bili v skupino <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Vnesite svoj e-poštni naslov"
+  },
   "6a26f54883": {
     "translation": "Pomoč"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Za ročni uvoz vsebine sledite tem korakom:"
   },
+  "70222abcfc": {
+    "translation": "Nastavitve skupine"
+  },
   "70a6facb9d": {
     "translation": "Ta teden"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Upravljanje piškotkov"
   },
+  "7697920637": {
+    "translation": "Ponovno naložite"
+  },
+  "764671e008": {
+    "translation": "Klepetajte z nami na Discordu"
+  },
   "777f9e90cf": {
     "translation": "Neveljavna zahteva."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Pozabi"
   },
+  "7cfe6c43dc": {
+    "translation": "Zapusti skupino …"
+  },
   "7daeced9ff": {
     "translation": "Objavi spremembe"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Preimenuj datoteko"
   },
+  "8ad4303b83": {
+    "translation": "Ne, hvala."
+  },
   "8b1946f965": {
     "translation": "Za nadaljevanje urejanja kopirajte sobo v svoje datoteke."
   },
+  "8c2d3d730c": {
+    "translation": "Preverite svojo e-pošto za potrditveno kodo."
+  },
   "8eb2c00e96": {
     "translation": "V skupni rabi z vami"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopiraj v moje datoteke"
   },
+  "930390d222": {
+    "translation": "Povezava za povabilo je bila kopirana"
+  },
+  "95aacd4d4a": {
+    "translation": "Prijava z Googlom"
+  },
+  "95d2109dc8": {
+    "translation": "Zgradite s kompletom za razvoj programske opreme tldraw"
+  },
   "96165d6df5": {
     "translation": "Ta mesec"
   },
+  "985a4b720f": {
+    "translation": "Pogoji uporabe"
+  },
+  "98c997a27e": {
+    "translation": "Dodaj povezavo do datoteke"
+  },
   "9914a0ce04": {
     "translation": "Svetlo"
   },
+  "9b33f5c63c": {
+    "translation": "Niste prejeli kode? <resend>Ponovno pošlji</resend>."
+  },
   "9bef626805": {
     "translation": "Izbriši datoteko"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Ozadje"
   },
+  "aa916767cf": {
+    "translation": "Prijavite se, da sprejmete povabilo"
+  },
   "ab0df9ba36": {
     "translation": "Dosežena je omejitev datotek"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gostujoči uporabnik"
   },
+  "b357b524e7": {
+    "translation": "E-poštni naslov"
+  },
+  "b3d2db69fe": {
+    "translation": "URL datoteke"
+  },
   "b6d4223e60": {
     "translation": "Prijava"
   },
+  "b6f4a2ec63": {
+    "translation": "Lastnik"
+  },
   "b758336699": {
     "translation": "Kopiraj povezavo"
   },
   "ba0318cb81": {
     "translation": "Prijavite se za skupno rabo"
   },
-  "bb792693e2": {
-    "translation": "Odpni"
+  "bb93a7590f": {
+    "translation": "Sprejmi in se pridruži skupini"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Nalaganje datoteke .tldr …} two {} few {} other {Nalaganje {uploaded} od {total} datotek .tldr …}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Delil {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Naložite datoteke .tldr"
-  },
   "c2276c9127": {
     "translation": "Preberite več o skupni rabi."
   },
+  "c28aed8348": {
+    "translation": "Dovoli <cookies>analytics</cookies>, da nam pomaga izboljšati tldraw."
+  },
   "c303bd1095": {
     "translation": "Datoteke ni mogoče objaviti."
   },
   "c4b39a1cc3": {
     "translation": "Bistveni piškotki"
   },
+  "c6155aaecc": {
+    "translation": "Ime skupine"
+  },
   "c655b27b1e": {
     "translation": "i18n: dolg niz"
   },
   "c6a00f137b": {
     "translation": "Povabi"
   },
+  "c74ea6dbff": {
+    "translation": "Prikaži manj"
+  },
   "c87aacf567": {
     "translation": "Odjava"
   },
+  "c9cc8cce24": {
+    "translation": "Shrani"
+  },
   "cceaefbc20": {
     "translation": "Delite to datoteko"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Preklopi stransko vrstico"
   },
+  "d638a3344b": {
+    "translation": "Preden začnete, sprejmite naše <tos>pogoje uporabe</tos> in <privacy>politiko zasebnosti</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Poskusi znova"
   },
+  "d88ad2dc74": {
+    "translation": "Sprejmi in nadaljuj"
+  },
   "d9100f3e10": {
     "translation": "Za ogled vsebine pojdite sem"
   },
+  "d9e35d0f55": {
+    "translation": "Dosegli ste največje dovoljeno število skupin. Preden ustvarite nove skupine, morate izbrisati stare."
+  },
   "dbbebf3c03": {
     "translation": "Samo povabljeni"
   },
+  "dcdaa754fe": {
+    "translation": "Neveljaven URL datoteke tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Zastavice za odpravljanje napak v aplikaciji"
   },
+  "e0c88179b3": {
+    "translation": "Povabi člane"
+  },
+  "e2198d6228": {
+    "translation": "Kopiraj povezavo za povabilo"
+  },
   "e2ae80a510": {
     "translation": "Pravni povzetek"
   },
+  "e3afed0047": {
+    "translation": "Skrbnik"
+  },
   "e404559826": {
     "translation": "Pogoji storitve"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "ali"
+  },
+  "ea0626ac5a": {
+    "translation": "Nevarno območje"
   },
   "ea4788705e": {
     "translation": "Prekliči"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Za več informacij preberite našo <a>pravilnik o piškotkih</a>."
   },
+  "ef53538ae4": {
+    "translation": "Člani"
+  },
   "ef7de3f485": {
     "translation": "izbrano"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Nastavitve"
   },
+  "f714e36843": {
+    "translation": "Ali ste prepričani, da želite zapustiti to skupino?"
+  },
+  "fa2ead697d": {
+    "translation": "Pravilnik o zasebnosti"
+  },
   "fb15c53f22": {
     "translation": "Gledalec"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Povezava kopirana"
   },
+  "ff7a814974": {
+    "translation": "Dodaj povezavo do datoteke …"
+  },
   "ffcd73e997": {
     "translation": "Uvozi datoteko …"
   }
diff --git a/apps/dotcom/client/public/tla/locales/so.json b/apps/dotcom/client/public/tla/locales/so.json
index 269034dff2ad..91d4b46a842d 100644
--- a/apps/dotcom/client/public/tla/locales/so.json
+++ b/apps/dotcom/client/public/tla/locales/so.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Xisaab"
   },
+  "08d2d725a9": {
+    "translation": "Abuur akoon bilaasha si aad u badbaadiso shaqadaada, wax wada qabsato wakhtiga dhabta ah, iyo in ka badan."
+  },
   "0b27918290": {
     "translation": "Faylka"
   },
   "0b9a4cde72": {
     "translation": "Liiska faylka"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw waa sabuur cad oo bilaash ah oo degdeg ah."
+  },
   "0d1f2bb523": {
     "translation": "Soo dir jawaab celin"
   },
   "110a4b01be": {
     "translation": "Daabac"
   },
+  "129b9e34ea": {
+    "translation": "Ka tag kooxda"
+  },
+  "12a6766ba1": {
+    "translation": "Furaha faylka"
+  },
   "12c8a9838c": {
     "translation": "Isku day tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "Dhoofinta sida"
   },
+  "146ffe2fd9": {
+    "translation": "Wax badan muuji"
+  },
+  "14d65465b7": {
+    "translation": "Kooxda tirtir"
+  },
   "181b90f889": {
     "translation": "Samee fayl"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Qolkan waxa uu ku soo dhawaanayaa cabbirkiisa. Tixgeli inaad tirtirto qaar ka mid ah nuxurka ama bilawdo fayl cusub."
   },
+  "2445e5e347": {
+    "translation": "Abuur koox"
+  },
   "250ddea65c": {
     "translation": "Ku saabsan tldraw"
   },
   "299cb00a7a": {
     "translation": "Soo dejintu waa fashilantay"
   },
+  "2c3ef76333": {
+    "translation": "Galalkayga"
+  },
   "2deec2cb74": {
     "translation": "Qolkaani waxa uu gaadhay xadka cabbirkiisa waxaana laga yaabaa in isbeddelada aan la kaydin. Ka saar qaar ka mid ah nuxurka ama bilow fayl cusub."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Iftiimin Maqan"
   },
+  "32210b37e4": {
+    "translation": "Kudar xiriiriyaha"
+  },
   "335defdafe": {
     "translation": "Fadlan isku day inaad dib u cusbooneysiiso bogga"
   },
   "344a7f427f": {
     "translation": "Tafatire"
   },
+  "3bc7d6ea2f": {
+    "translation": "Ku sii wad iimaylka"
+  },
   "3bd1b98dbd": {
     "translation": "Ma daabici karo isbeddellada"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Fadlan dib u soo deji"
+  "47f493a590": {
+    "translation": "Gal gal"
   },
-  "764671e008": {
-    "translation": "Nagala hadal Discord"
+  "49049467ff": {
+    "translation": "Ku dheji URL faylka tldraw..."
   },
   "4908687e50": {
     "translation": "Ma hubtaa inaad rabto inaad ilowdo faylkan?"
   },
+  "49ee308734": {
+    "translation": "Magaca"
+  },
   "4d0d3ddec9": {
     "translation": "Goobtani waxay isticmaashaa cookies si ay abka uga dhigto mid shaqaynaysa iyo si ay u ururiso falanqaynta."
   },
   "4d1c8263ba": {
     "translation": "Dib u soo deji"
   },
+  "4da5988a2e": {
+    "translation": "Tirtir kooxda…"
+  },
+  "4e6fbf032b": {
+    "translation": "Ma hubtaa inaad doonayso inaad tirtirto kooxdan? Tallaabadan lama noqon karo."
+  },
   "50db1b7e1e": {
     "translation": "Lama daabici karo faylka"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Siyaasada gaarka ah"
   },
+  "5a86b22fa0": {
+    "translation": "Halkan ku soo jiid faylasha, <create>abuur fayl</create>, ama <invite>koobiyi xidhiidhka martiqaadka</invite> si aad u bilowdo."
+  },
   "5a95a425f7": {
     "translation": "La wadaag"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "browser hore waa la helay Fadlan cusboonaysii biraawsarkaaga si aad u isticmaasho abkan."
   },
+  "5c6fe42bc2": {
+    "translation": "Ka noqo xiriirkan oo samee mid cusub."
+  },
   "5d26ae7550": {
     "translation": "Waanu ku guuldareysanay inaan soo rarno qayb ka mid ah macluumaadka aad abuurtay ka hor inta aanad soo galin"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Ka weyn"
   },
+  "639bae9ac6": {
+    "translation": "adiga"
+  },
   "6609dd239e": {
     "translation": "Wax baa khaldamay"
   },
   "6637a98151": {
     "translation": "Nooc cusub oo tldraw ah ayaa diyaar ah. Fadlan dib u soo deji bogga si aad u sii waddo."
   },
+  "68257bb646": {
+    "translation": "Waxaa lagugu martiqaaday kooxda <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Geli ciwaanka iimaylkaaga"
+  },
   "6a26f54883": {
     "translation": "Caawin"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Raac tillaabooyinkan si aad gacanta ugu soo dejiso waxa ku jira:"
   },
+  "70222abcfc": {
+    "translation": "Dejinta kooxda"
+  },
   "70a6facb9d": {
     "translation": "Todobaadkan"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Maamul cookies"
   },
+  "7697920637": {
+    "translation": "Fadlan dib u soo deji"
+  },
+  "764671e008": {
+    "translation": "Nagala hadal Discord"
+  },
   "777f9e90cf": {
     "translation": "Codsi aan sax ahayn"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Iska ilow"
   },
+  "7cfe6c43dc": {
+    "translation": "Ka bax kooxda…"
+  },
   "7daeced9ff": {
     "translation": "Daabac isbeddellada"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Magaca beddelo faylka"
   },
+  "8ad4303b83": {
+    "translation": "Maya mahadsanid"
+  },
   "8b1946f965": {
     "translation": "Si aad u sii waddo tafatirka fadlan ku koobi qolka faylashaada."
   },
+  "8c2d3d730c": {
+    "translation": "Hubi iimaylkaga koodka xaqiijinta"
+  },
   "8eb2c00e96": {
     "translation": "kula wadaagay"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Ku koobbi faylalkayga"
   },
+  "930390d222": {
+    "translation": "Xiriirinta martiqaadka oo la guuriyay"
+  },
+  "95aacd4d4a": {
+    "translation": "Ku gal Google"
+  },
+  "95d2109dc8": {
+    "translation": "Ku dhis tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Bishan"
   },
+  "985a4b720f": {
+    "translation": "Shuruudaha Isticmaalka"
+  },
+  "98c997a27e": {
+    "translation": "Kudar xiriirinta faylka"
+  },
   "9914a0ce04": {
     "translation": "Iftiin"
   },
+  "9b33f5c63c": {
+    "translation": "kood ma helin? <resend>dib u dir </resend>."
+  },
   "9bef626805": {
     "translation": "Tirtir faylka"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Asalkii hore"
   },
+  "aa916767cf": {
+    "translation": "Saxeex si aad u aqbasho martiqaadka"
+  },
   "ab0df9ba36": {
     "translation": "Xadka faylka waa la gaarey"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Isticmaalaha martida"
   },
+  "b357b524e7": {
+    "translation": "Ciwaanka iimaylka"
+  },
+  "b3d2db69fe": {
+    "translation": "URL faylka"
+  },
   "b6d4223e60": {
     "translation": "Soo gal"
   },
+  "b6f4a2ec63": {
+    "translation": "Mulkiilaha"
+  },
   "b758336699": {
     "translation": "Koobiga isku xirka"
   },
   "ba0318cb81": {
     "translation": "Saxiix si aad ula wadaagto"
   },
-  "bb792693e2": {
-    "translation": "Furi"
+  "bb93a7590f": {
+    "translation": "Aqbal oo ku biir kooxda"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Soo dejinaya faylka .tldr…} other {Soo dejinta {uploaded} ee {total} .tldr files…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Waxaa wadaaga {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Soo rar faylasha tldr"
-  },
   "c2276c9127": {
     "translation": "Wax badan ka baro wadaagga"
   },
+  "c28aed8348": {
+    "translation": "Oggolow <cookies>analytics</cookies> inay naga caawiyaan horumarinta tldraw."
+  },
   "c303bd1095": {
     "translation": "Aan awoodin in la daabaco faylka"
   },
   "c4b39a1cc3": {
     "translation": "Kukiyada muhiimka ah"
   },
+  "c6155aaecc": {
+    "translation": "Magaca kooxda"
+  },
   "c655b27b1e": {
     "translation": "i18n: Xarig dheer"
   },
   "c6a00f137b": {
     "translation": "martiqaad"
   },
+  "c74ea6dbff": {
+    "translation": "Muuji wax yar"
+  },
   "c87aacf567": {
     "translation": "Saxiix"
   },
+  "c9cc8cce24": {
+    "translation": "Badbaadin"
+  },
   "cceaefbc20": {
     "translation": "La wadaag faylkan"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Beddel dhinaca bar"
   },
+  "d638a3344b": {
+    "translation": "Kahor intaadan bilaabin, fadlan aqbal <tos>shuruudaha isticmaalka</tos> iyo <privacy>siyaasadda asturnaanta</privacy>."
+  },
   "d721757161": {
     "translation": "Dulucda"
   },
   "d876a9fe1a": {
     "translation": "Isku day Mar Kale"
   },
+  "d88ad2dc74": {
+    "translation": "Aqbal oo sii wad"
+  },
   "d9100f3e10": {
     "translation": "Tag halkan si aad u aragto waxa ku jira"
   },
+  "d9e35d0f55": {
+    "translation": "Waxaad gaadhay tirada ugu badan ee kooxaha Waxaad u baahan tahay inaad tirtirto kooxihii hore ka hor inta aanad abuurin kuwa cusub."
+  },
   "dbbebf3c03": {
     "translation": "martiqaad kaliya"
   },
+  "dcdaa754fe": {
+    "translation": "URL faylka tldraw aan sax ahayn"
+  },
   "dfdb78a4e4": {
     "translation": "Calaamadaha cilladaha abka"
   },
+  "e0c88179b3": {
+    "translation": "martiqaad xubnaha"
+  },
+  "e2198d6228": {
+    "translation": "Nuqul ka samee xidhiidhka martiqaadka"
+  },
   "e2ae80a510": {
     "translation": "Soo koobid sharci ah"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Shuruudaha adeegga"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "ama"
+  },
+  "ea0626ac5a": {
+    "translation": "Aagga khatarta ah"
   },
   "ea4788705e": {
     "translation": "Jooji"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Si aad wax badan u barato akhri <a> siyaasadayada kukiyada</a>"
   },
+  "ef53538ae4": {
+    "translation": "Xubnaha"
+  },
   "ef7de3f485": {
     "translation": "la doortay"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Dejinta"
   },
+  "f714e36843": {
+    "translation": "Ma hubtaa inaad doonayso inaad ka baxdo kooxdan?"
+  },
+  "fa2ead697d": {
+    "translation": "Siyaasadda Qarsoonnimada"
+  },
   "fb15c53f22": {
     "translation": "Daawade"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Xiriirinta la guuriyay"
   },
+  "ff7a814974": {
+    "translation": "Kudar xiriirinta faylka…"
+  },
   "ffcd73e997": {
     "translation": "Soo rar faylka…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/sv.json b/apps/dotcom/client/public/tla/locales/sv.json
index 91208169534f..640f24217faf 100644
--- a/apps/dotcom/client/public/tla/locales/sv.json
+++ b/apps/dotcom/client/public/tla/locales/sv.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Konto"
   },
+  "08d2d725a9": {
+    "translation": "Skapa ett gratis konto för att spara ditt arbete, samarbeta i realtid och mer."
+  },
   "0b27918290": {
     "translation": "Fil"
   },
   "0b9a4cde72": {
     "translation": "Arkivmenyn"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw är en gratis och omedelbar virtuell whiteboardtavla."
+  },
   "0d1f2bb523": {
     "translation": "Skicka feedback"
   },
   "110a4b01be": {
     "translation": "Publicera"
   },
+  "129b9e34ea": {
+    "translation": "Lämna gruppen"
+  },
+  "12a6766ba1": {
+    "translation": "Lossa filen"
+  },
   "12c8a9838c": {
     "translation": "Testa tldraw SDK:et"
   },
   "13ddd375ad": {
     "translation": "Exportera som"
   },
+  "146ffe2fd9": {
+    "translation": "Visa mer"
+  },
+  "14d65465b7": {
+    "translation": "Ta bort grupp"
+  },
   "181b90f889": {
     "translation": "Skapa fil"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Det här rummet närmar sig sin storleksgräns. Överväg att ta bort en del innehåll eller starta en ny fil."
   },
+  "2445e5e347": {
+    "translation": "Skapa grupp"
+  },
   "250ddea65c": {
     "translation": "Om tldraw"
   },
   "299cb00a7a": {
     "translation": "Uppladdningen misslyckades"
   },
+  "2c3ef76333": {
+    "translation": "Mina filer"
+  },
   "2deec2cb74": {
     "translation": "Det här rummet har nått sin storleksgräns och ändringarna kanske inte längre sparas. Ta bort en del innehåll eller skapa en ny fil."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Markering saknas"
   },
+  "32210b37e4": {
+    "translation": "Lägg till länk"
+  },
   "335defdafe": {
     "translation": "Försök att uppdatera sidan."
   },
   "344a7f427f": {
     "translation": "Redigeringsverktyg"
   },
+  "3bc7d6ea2f": {
+    "translation": "Fortsätt med e-post"
+  },
   "3bd1b98dbd": {
     "translation": "Det gick inte att publicera ändringarna."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Vänligen ladda om"
+  "47f493a590": {
+    "translation": "Fäst fil"
   },
-  "764671e008": {
-    "translation": "Chatta med oss ​​på Discord"
+  "49049467ff": {
+    "translation": "Klistra in tldraw-filens URL..."
   },
   "4908687e50": {
     "translation": "Är du säker på att du vill glömma den här filen?"
   },
+  "49ee308734": {
+    "translation": "Namn"
+  },
   "4d0d3ddec9": {
     "translation": "Den här webbplatsen använder cookies för att appen ska fungera och för att samla in analyser."
   },
   "4d1c8263ba": {
     "translation": "Ladda om"
   },
+  "4da5988a2e": {
+    "translation": "Radera grupp…"
+  },
+  "4e6fbf032b": {
+    "translation": "Är du säker på att du vill ta bort den här gruppen? Åtgärden kan inte ångras."
+  },
   "50db1b7e1e": {
     "translation": "Det gick inte att avpublicera filen."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Sekretesspolicy"
   },
+  "5a86b22fa0": {
+    "translation": "Dra filer hit, <create>skapa en fil</create> eller <invite>kopiera inbjudningslänken</invite> för att komma igång."
+  },
   "5a95a425f7": {
     "translation": "Dela"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Gammal webbläsare upptäckt. Uppdatera din webbläsare för att använda den här appen."
   },
+  "5c6fe42bc2": {
+    "translation": "Återkalla den här länken och skapa en ny."
+  },
   "5d26ae7550": {
     "translation": "Vi kunde inte ladda upp en del av innehållet du skapade innan du loggade in."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Äldre"
   },
+  "639bae9ac6": {
+    "translation": "du"
+  },
   "6609dd239e": {
     "translation": "Något gick fel"
   },
   "6637a98151": {
     "translation": "En ny version av tldraw är tillgänglig. Ladda om sidan för att fortsätta."
   },
+  "68257bb646": {
+    "translation": "Du har blivit inbjuden till gruppen <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Ange din e-postadress"
+  },
   "6a26f54883": {
     "translation": "Hjälp"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Följ dessa steg för att importera innehållet manuellt:"
   },
+  "70222abcfc": {
+    "translation": "Gruppinställningar"
+  },
   "70a6facb9d": {
     "translation": "Denna vecka"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Hantera cookies"
   },
+  "7697920637": {
+    "translation": "Vänligen ladda om"
+  },
+  "764671e008": {
+    "translation": "Chatta med oss ​​på Discord"
+  },
   "777f9e90cf": {
     "translation": "Ogiltig begäran."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Glöm"
   },
+  "7cfe6c43dc": {
+    "translation": "Lämna gruppen…"
+  },
   "7daeced9ff": {
     "translation": "Publicera ändringar"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Byt namn på filen"
   },
+  "8ad4303b83": {
+    "translation": "Nej tack"
+  },
   "8b1946f965": {
     "translation": "För att fortsätta redigera, kopiera rummet till dina filer."
   },
+  "8c2d3d730c": {
+    "translation": "Kontrollera din e-post för en verifieringskod."
+  },
   "8eb2c00e96": {
     "translation": "Delas med dig"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopiera till mina filer"
   },
+  "930390d222": {
+    "translation": "Kopierad inbjudningslänk"
+  },
+  "95aacd4d4a": {
+    "translation": "Logga in med Google"
+  },
+  "95d2109dc8": {
+    "translation": "Bygg med tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Denna månad"
   },
+  "985a4b720f": {
+    "translation": "Användarvillkor"
+  },
+  "98c997a27e": {
+    "translation": "Lägg till fillänk"
+  },
   "9914a0ce04": {
     "translation": "Ljus"
   },
+  "9b33f5c63c": {
+    "translation": "Fick du ingen kod? <resend>Skicka igen</resend>."
+  },
   "9bef626805": {
     "translation": "Ta bort fil"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Bakgrund"
   },
+  "aa916767cf": {
+    "translation": "Logga in för att acceptera inbjudan"
+  },
   "ab0df9ba36": {
     "translation": "Filgränsen har nåtts"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Gästanvändare"
   },
+  "b357b524e7": {
+    "translation": "E-postadress"
+  },
+  "b3d2db69fe": {
+    "translation": "Fil-URL"
+  },
   "b6d4223e60": {
     "translation": "Logga in"
   },
+  "b6f4a2ec63": {
+    "translation": "Ägare"
+  },
   "b758336699": {
     "translation": "Kopiera länk"
   },
   "ba0318cb81": {
     "translation": "Logga in för att dela"
   },
-  "bb792693e2": {
-    "translation": "Ta bort nål"
+  "bb93a7590f": {
+    "translation": "Godkänn och gå med i gruppen"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Laddar upp .tldr-fil...} other {Laddar upp {uploaded} av {total} .tldr-filer...}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Delas av {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Ladda upp .tldr-filer"
-  },
   "c2276c9127": {
     "translation": "Läs mer om delning."
   },
+  "c28aed8348": {
+    "translation": "Tillåt <cookies>analytics</cookies> för att hjälpa oss att förbättra tldraw."
+  },
   "c303bd1095": {
     "translation": "Det gick inte att publicera filen."
   },
   "c4b39a1cc3": {
     "translation": "Viktiga cookies"
   },
+  "c6155aaecc": {
+    "translation": "Gruppnamn"
+  },
   "c655b27b1e": {
     "translation": "i18n: Lång sträng"
   },
   "c6a00f137b": {
     "translation": "Bjud in"
   },
+  "c74ea6dbff": {
+    "translation": "Visa mindre"
+  },
   "c87aacf567": {
     "translation": "Logga ut"
   },
+  "c9cc8cce24": {
+    "translation": "Spara"
+  },
   "cceaefbc20": {
     "translation": "Dela den här filen"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Aktivera sidofältet"
   },
+  "d638a3344b": {
+    "translation": "Innan du börjar, vänligen acceptera våra <tos>användarvillkor</tos> och <privacy>sekretesspolicy</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Försök igen"
   },
+  "d88ad2dc74": {
+    "translation": "Acceptera och fortsätt"
+  },
   "d9100f3e10": {
     "translation": "Gå hit för att se innehållet"
   },
+  "d9e35d0f55": {
+    "translation": "Du har nått det maximala antalet grupper. Du måste ta bort gamla grupper innan du skapar nya."
+  },
   "dbbebf3c03": {
     "translation": "Endast inbjudan"
   },
+  "dcdaa754fe": {
+    "translation": "Ogiltig URL för tldraw-fil"
+  },
   "dfdb78a4e4": {
     "translation": "Appfelsökningsflaggor"
   },
+  "e0c88179b3": {
+    "translation": "Bjud in medlemmar"
+  },
+  "e2198d6228": {
+    "translation": "Kopiera inbjudningslänken"
+  },
   "e2ae80a510": {
     "translation": "Juridisk sammanfattning"
   },
+  "e3afed0047": {
+    "translation": "Administration"
+  },
   "e404559826": {
     "translation": "Användarvillkor"
   },
-  "e78e14c5f1": {
-    "translation": "Nåla fast"
+  "e81c4e4f2b": {
+    "translation": "eller"
+  },
+  "ea0626ac5a": {
+    "translation": "Riskzon"
   },
   "ea4788705e": {
     "translation": "Avbryt"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Läs vår <a>cookiepolicy</a> för att lära dig mer."
   },
+  "ef53538ae4": {
+    "translation": "Medlemmar"
+  },
   "ef7de3f485": {
     "translation": "vald"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Inställningar"
   },
+  "f714e36843": {
+    "translation": "Är du säker på att du vill lämna den här gruppen?"
+  },
+  "fa2ead697d": {
+    "translation": "Integritetspolicy"
+  },
   "fb15c53f22": {
     "translation": "Visningsverktyg"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Länk kopierad"
   },
+  "ff7a814974": {
+    "translation": "Lägg till fillänk…"
+  },
   "ffcd73e997": {
     "translation": "Importera fil…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ta.json b/apps/dotcom/client/public/tla/locales/ta.json
index ec99a15cb7b0..5a1c02b10632 100644
--- a/apps/dotcom/client/public/tla/locales/ta.json
+++ b/apps/dotcom/client/public/tla/locales/ta.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "கணக்கு"
   },
+  "08d2d725a9": {
+    "translation": "உங்கள் வேலையைச் சேமிக்க, நிகழ்நேரத்தில் ஒத்துழைக்க மற்றும் பலவற்றிற்கு இலவச கணக்கை உருவாக்கவும்."
+  },
   "0b27918290": {
     "translation": "கோப்பு"
   },
   "0b9a4cde72": {
     "translation": "கோப்பு மெனு"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw என்பது ஒரு இலவச மற்றும் உடனடி மெய்நிகர் ஒயிட்போர்டு ஆகும்."
+  },
   "0d1f2bb523": {
     "translation": "கருத்து அனுப்பு"
   },
   "110a4b01be": {
     "translation": "வெளியிடு"
   },
+  "129b9e34ea": {
+    "translation": "குழுவிலிருந்து வெளியேறு"
+  },
+  "12a6766ba1": {
+    "translation": "கோப்பை அகற்று"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK-வை முயற்சிக்கவும்."
   },
   "13ddd375ad": {
     "translation": "என ஏற்றுமதி செய்யவும்"
   },
+  "146ffe2fd9": {
+    "translation": "மேலும் காட்டு"
+  },
+  "14d65465b7": {
+    "translation": "குழுவை நீக்கு"
+  },
   "181b90f889": {
     "translation": "கோப்பை உருவாக்கவும்"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "இந்த அறை அதன் அளவு வரம்பை நெருங்குகிறது. சில உள்ளடக்கங்களை அகற்றுவது அல்லது புதிய கோப்பைத் தொடங்குவது பற்றி பரிசீலிக்கவும்."
   },
+  "2445e5e347": {
+    "translation": "குழுவை உருவாக்கு"
+  },
   "250ddea65c": {
     "translation": "tldraw பற்றி"
   },
   "299cb00a7a": {
     "translation": "பதிவேற்றம் தோல்வியடைந்தது"
   },
+  "2c3ef76333": {
+    "translation": "எனது கோப்புகள்"
+  },
   "2deec2cb74": {
     "translation": "இந்த அறை அதன் அளவு வரம்பை எட்டிவிட்டது, மேலும் மாற்றங்கள் இனி சேமிக்கப்படாமல் போகலாம். சில உள்ளடக்கங்களை அகற்றவும் அல்லது புதிய கோப்பைத் தொடங்கவும்."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: ஹைலைட் இல்லை"
   },
+  "32210b37e4": {
+    "translation": "இணைப்பைச் சேர்"
+  },
   "335defdafe": {
     "translation": "பக்கத்தைப் புதுப்பிக்க முயற்சிக்கவும்."
   },
   "344a7f427f": {
     "translation": "ஆசிரியர்"
   },
+  "3bc7d6ea2f": {
+    "translation": "மின்னஞ்சலுடன் தொடரவும்"
+  },
   "3bd1b98dbd": {
     "translation": "மாற்றங்களை வெளியிட முடியவில்லை."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "வரைதல்"
   },
-  "7697920637": {
-    "translation": "மீண்டும் ஏற்றவும்."
+  "47f493a590": {
+    "translation": "கோப்பை பின் செய்"
   },
-  "764671e008": {
-    "translation": "Discord-ல் எங்களுடன் அரட்டையடிக்கவும்"
+  "49049467ff": {
+    "translation": "tldraw கோப்பு URL ஐ ஒட்டவும்..."
   },
   "4908687e50": {
     "translation": "இந்தக் கோப்பை நிச்சயமாக மறக்க விரும்புகிறீர்களா?"
   },
+  "49ee308734": {
+    "translation": "பெயர்"
+  },
   "4d0d3ddec9": {
     "translation": "இந்த தளம் பயன்பாட்டைச் செயல்படுத்தவும் பகுப்பாய்வுகளைச் சேகரிக்கவும் குக்கீகளைப் பயன்படுத்துகிறது."
   },
   "4d1c8263ba": {
     "translation": "மீண்டும் ஏற்றவும்"
   },
+  "4da5988a2e": {
+    "translation": "குழுவை நீக்கு..."
+  },
+  "4e6fbf032b": {
+    "translation": "இந்தக் குழுவை நீக்க விரும்புகிறீர்களா? இந்தச் செயலைச் செயல்தவிர்க்க முடியாது."
+  },
   "50db1b7e1e": {
     "translation": "கோப்பை வெளியிட முடியவில்லை."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "தனியுரிமைக் கொள்கை"
   },
+  "5a86b22fa0": {
+    "translation": "தொடங்குவதற்கு கோப்புகளை இங்கே இழுக்கவும், <create> ஒரு கோப்பை உருவாக்கவும்</create>, அல்லது <invite> அழைப்பு இணைப்பை நகலெடுக்கவும்</invite>."
+  },
   "5a95a425f7": {
     "translation": "பகிரவும்"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "பழைய உலாவி கண்டறியப்பட்டது. இந்தப் பயன்பாட்டைப் பயன்படுத்த உங்கள் உலாவியைப் புதுப்பிக்கவும்."
   },
+  "5c6fe42bc2": {
+    "translation": "இந்த இணைப்பை ரத்துசெய்து புதிய ஒன்றை உருவாக்கவும்."
+  },
   "5d26ae7550": {
     "translation": "நீங்கள் உள்நுழைவதற்கு முன் நீங்கள் உருவாக்கிய சில உள்ளடக்கத்தைப் பதிவேற்றத் தவறிவிட்டோம்."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "பழையது"
   },
+  "639bae9ac6": {
+    "translation": "நீ"
+  },
   "6609dd239e": {
     "translation": "ஏதோ தவறாகிவிட்டது"
   },
   "6637a98151": {
     "translation": "tldraw இன் புதிய பதிப்பு கிடைக்கிறது. தொடர பக்கத்தை மீண்டும் ஏற்றவும்."
   },
+  "68257bb646": {
+    "translation": "நீங்கள் <br></br><groupName></groupName> குழுவிற்கு அழைக்கப்பட்டுள்ளீர்கள்"
+  },
+  "6832ac5936": {
+    "translation": "உங்கள் மின்னஞ்சல் முகவரியை உள்ளிடவும்"
+  },
   "6a26f54883": {
     "translation": "உதவி"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "உள்ளடக்கத்தை கைமுறையாக இறக்குமதி செய்ய, இந்தப் படிகளைப் பின்பற்றவும்:"
   },
+  "70222abcfc": {
+    "translation": "குழு அமைப்புகள்"
+  },
   "70a6facb9d": {
     "translation": "இந்த வாரம்"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "குக்கீகளை நிர்வகிக்கவும்"
   },
+  "7697920637": {
+    "translation": "மீண்டும் ஏற்றவும்."
+  },
+  "764671e008": {
+    "translation": "Discord-ல் எங்களுடன் அரட்டையடிக்கவும்"
+  },
   "777f9e90cf": {
     "translation": "தவறான கோரிக்கை."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "மறந்துவிடு"
   },
+  "7cfe6c43dc": {
+    "translation": "குழுவிலிருந்து வெளியேறு..."
+  },
   "7daeced9ff": {
     "translation": "மாற்றங்களை வெளியிடவும்"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "கோப்பை மறுபெயரிடவும்"
   },
+  "8ad4303b83": {
+    "translation": "இல்லை நன்றி"
+  },
   "8b1946f965": {
     "translation": "தொடர்ந்து திருத்த, அறையை உங்கள் கோப்புகளில் நகலெடுக்கவும்."
   },
+  "8c2d3d730c": {
+    "translation": "சரிபார்ப்புக் குறியீட்டிற்கு உங்கள் மின்னஞ்சலைப் பார்க்கவும்."
+  },
   "8eb2c00e96": {
     "translation": "உங்களுடன் பகிரப்பட்டது"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "எனது கோப்புகளுக்கு நகலெடுக்கவும்"
   },
+  "930390d222": {
+    "translation": "அழைப்பு இணைப்பு நகலெடுக்கப்பட்டது"
+  },
+  "95aacd4d4a": {
+    "translation": "Google மூலம் உள்நுழையவும்"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK உடன் உருவாக்கவும்"
+  },
   "96165d6df5": {
     "translation": "இந்த மாதம்"
   },
+  "985a4b720f": {
+    "translation": "பயன்பாட்டு விதிமுறைகள்"
+  },
+  "98c997a27e": {
+    "translation": "கோப்பு இணைப்பைச் சேர்க்கவும்"
+  },
   "9914a0ce04": {
     "translation": "ஒளி"
   },
+  "9b33f5c63c": {
+    "translation": "குறியீட்டைப் பெறவில்லையா? <resend>மீண்டும் அனுப்பு</resend>."
+  },
   "9bef626805": {
     "translation": "கோப்பை நீக்கு"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "பின்னணி"
   },
+  "aa916767cf": {
+    "translation": "அழைப்பை ஏற்க உள்நுழையவும்."
+  },
   "ab0df9ba36": {
     "translation": "கோப்பு வரம்பை அடைந்துவிட்டது"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "விருந்தினர் பயனர்"
   },
+  "b357b524e7": {
+    "translation": "மின்னஞ்சல் முகவரி"
+  },
+  "b3d2db69fe": {
+    "translation": "கோப்பு URL"
+  },
   "b6d4223e60": {
     "translation": "உள்நுழைக"
   },
+  "b6f4a2ec63": {
+    "translation": "உரிமையாளர்"
+  },
   "b758336699": {
     "translation": "இணைப்பை நகலெடுக்கவும்"
   },
   "ba0318cb81": {
     "translation": "பகிர உள்நுழையவும்"
   },
-  "bb792693e2": {
-    "translation": "அன்பின்"
+  "bb93a7590f": {
+    "translation": "ஏற்றுக்கொண்டு குழுவில் சேரவும்."
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr கோப்பைப் பதிவேற்றுகிறது…} other {{total} .tldr கோப்புகளில் {uploaded} பதிவேற்றப்படுகிறது…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "பகிர்ந்தவர் {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": ".tldr கோப்புகளைப் பதிவேற்றவும்"
-  },
   "c2276c9127": {
     "translation": "பகிர்வது பற்றி மேலும் அறிக."
   },
+  "c28aed8348": {
+    "translation": "tldraw-வை மேம்படுத்த எங்களுக்கு உதவ <cookies>analytics</cookies> ஐ அனுமதிக்கவும்."
+  },
   "c303bd1095": {
     "translation": "கோப்பை வெளியிட முடியவில்லை."
   },
   "c4b39a1cc3": {
     "translation": "அத்தியாவசிய குக்கீகள்"
   },
+  "c6155aaecc": {
+    "translation": "குழு பெயர்"
+  },
   "c655b27b1e": {
     "translation": "i18n: நீண்ட சரம்"
   },
   "c6a00f137b": {
     "translation": "அழைக்கவும்"
   },
+  "c74ea6dbff": {
+    "translation": "குறைவாகக் காட்டு"
+  },
   "c87aacf567": {
     "translation": "வெளியேறு"
   },
+  "c9cc8cce24": {
+    "translation": "சேமிக்கவும்"
+  },
   "cceaefbc20": {
     "translation": "இந்தக் கோப்பைப் பகிரவும்"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "பக்கப்பட்டியை நிலைமாற்று"
   },
+  "d638a3344b": {
+    "translation": "நீங்கள் தொடங்குவதற்கு முன், எங்கள் <tos>பயன்பாட்டு விதிமுறைகள்</tos> மற்றும் <privacy>தனியுரிமைக் கொள்கை</privacy> ஆகியவற்றை ஏற்றுக்கொள்ளுங்கள்."
+  },
   "d721757161": {
     "translation": "தீம்"
   },
   "d876a9fe1a": {
     "translation": "மீண்டும் முயற்சிக்கவும்"
   },
+  "d88ad2dc74": {
+    "translation": "ஏற்றுக்கொண்டு தொடரவும்"
+  },
   "d9100f3e10": {
     "translation": "உள்ளடக்கத்தைப் பார்க்க இங்கே செல்லவும்"
   },
+  "d9e35d0f55": {
+    "translation": "நீங்கள் அதிகபட்ச குழுக்களின் எண்ணிக்கையை அடைந்துவிட்டீர்கள். புதியவற்றை உருவாக்குவதற்கு முன்பு பழைய குழுக்களை நீக்க வேண்டும்."
+  },
   "dbbebf3c03": {
     "translation": "அழை மட்டும்"
   },
+  "dcdaa754fe": {
+    "translation": "தவறான tldraw கோப்பு URL"
+  },
   "dfdb78a4e4": {
     "translation": "பயன்பாட்டு பிழைத்திருத்தக் கொடிகள்"
   },
+  "e0c88179b3": {
+    "translation": "உறுப்பினர்களை அழைக்கவும்"
+  },
+  "e2198d6228": {
+    "translation": "அழைப்பு இணைப்பை நகலெடு"
+  },
   "e2ae80a510": {
     "translation": "சட்டச் சுருக்கம்"
   },
+  "e3afed0047": {
+    "translation": "நிர்வாகம்"
+  },
   "e404559826": {
     "translation": "சேவை விதிமுறைகள்"
   },
-  "e78e14c5f1": {
-    "translation": "பின்"
+  "e81c4e4f2b": {
+    "translation": "அல்லது"
+  },
+  "ea0626ac5a": {
+    "translation": "ஆபத்து மண்டலம்"
   },
   "ea4788705e": {
     "translation": "ரத்து செய்"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "மேலும் அறிய எங்கள் <a>குக்கீ கொள்கையைப்</a> படியுங்கள்."
   },
+  "ef53538ae4": {
+    "translation": "உறுப்பினர்கள்"
+  },
   "ef7de3f485": {
     "translation": "தேர்ந்தெடுக்கப்பட்டது"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "அமைப்புகள்"
   },
+  "f714e36843": {
+    "translation": "இந்தக் குழுவிலிருந்து வெளியேற விரும்புகிறீர்களா?"
+  },
+  "fa2ead697d": {
+    "translation": "தனியுரிமைக் கொள்கை"
+  },
   "fb15c53f22": {
     "translation": "பார்வையாளர்"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "நகலெடுக்கப்பட்ட இணைப்பு"
   },
+  "ff7a814974": {
+    "translation": "கோப்பு இணைப்பைச் சேர்…"
+  },
   "ffcd73e997": {
     "translation": "கோப்பை இறக்குமதி செய்…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/te.json b/apps/dotcom/client/public/tla/locales/te.json
index eebcaefc0229..0371594a6927 100644
--- a/apps/dotcom/client/public/tla/locales/te.json
+++ b/apps/dotcom/client/public/tla/locales/te.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "ఖాతా"
   },
+  "08d2d725a9": {
+    "translation": "మీ పనిని సేవ్ చేయడానికి, నిజ సమయంలో సహకరించడానికి మరియు మరిన్ని చేయడానికి ఉచిత ఖాతాను సృష్టించండి."
+  },
   "0b27918290": {
     "translation": "ఫైల్"
   },
   "0b9a4cde72": {
     "translation": "ఫైల్ మెను"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw అనేది ఉచిత మరియు తక్షణ వర్చువల్ వైట్‌బోర్డ్."
+  },
   "0d1f2bb523": {
     "translation": "అభిప్రాయాన్ని పంపండి"
   },
   "110a4b01be": {
     "translation": "ప్రచురించండి"
   },
+  "129b9e34ea": {
+    "translation": "సమూహం నుండి నిష్క్రమించండి"
+  },
+  "12a6766ba1": {
+    "translation": "ఫైల్‌ను అన్‌పిన్ చేయి"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK ని ప్రయత్నించండి"
   },
   "13ddd375ad": {
     "translation": "ఇలా ఎగుమతి చేయండి"
   },
+  "146ffe2fd9": {
+    "translation": "మరిన్ని చూపించు"
+  },
+  "14d65465b7": {
+    "translation": "సమూహాన్ని తొలగించు"
+  },
   "181b90f889": {
     "translation": "ఫైల్‌ని సృష్టించండి"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "ఈ గది దాని పరిమాణ పరిమితిని చేరుకుంటోంది. కొంత కంటెంట్‌ను తీసివేయడం లేదా కొత్త ఫైల్‌ను ప్రారంభించడం పరిగణించండి."
   },
+  "2445e5e347": {
+    "translation": "సమూహాన్ని సృష్టించండి"
+  },
   "250ddea65c": {
     "translation": "tldraw గురించి"
   },
   "299cb00a7a": {
     "translation": "అప్‌లోడ్ విఫలమైంది"
   },
+  "2c3ef76333": {
+    "translation": "నా ఫైళ్లు"
+  },
   "2deec2cb74": {
     "translation": "ఈ గది దాని పరిమాణ పరిమితిని చేరుకుంది మరియు మార్పులు ఇకపై సేవ్ కాకపోవచ్చు. కొంత కంటెంట్‌ను తీసివేయండి లేదా కొత్త ఫైల్‌ను ప్రారంభించండి."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: హైలైట్ లేదు"
   },
+  "32210b37e4": {
+    "translation": "లింక్‌ను జోడించండి"
+  },
   "335defdafe": {
     "translation": "దయచేసి పేజీని రిఫ్రెష్ చేయడానికి ప్రయత్నించండి."
   },
   "344a7f427f": {
     "translation": "ఎడిటర్"
   },
+  "3bc7d6ea2f": {
+    "translation": "ఇమెయిల్‌తో కొనసాగించండి"
+  },
   "3bd1b98dbd": {
     "translation": "మార్పులను ప్రచురించడం సాధ్యం కాలేదు."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "డ్రా"
   },
-  "7697920637": {
-    "translation": "దయచేసి మళ్లీ లోడ్ చేయండి"
+  "47f493a590": {
+    "translation": "ఫైల్‌ను పిన్ చేయండి"
   },
-  "764671e008": {
-    "translation": "డిస్కార్డ్‌లో మాతో చాట్ చేయండి"
+  "49049467ff": {
+    "translation": "tldraw ఫైల్ URL ని అతికించండి..."
   },
   "4908687e50": {
     "translation": "మీరు ఖచ్చితంగా ఈ ఫైల్‌ను మర్చిపోవాలనుకుంటున్నారా?"
   },
+  "49ee308734": {
+    "translation": "పేరు"
+  },
   "4d0d3ddec9": {
     "translation": "ఈ సైట్ యాప్ పని చేయడానికి మరియు విశ్లేషణలను సేకరించడానికి కుక్కీలను ఉపయోగిస్తుంది."
   },
   "4d1c8263ba": {
     "translation": "మళ్లీ లోడ్ చేయండి"
   },
+  "4da5988a2e": {
+    "translation": "సమూహాన్ని తొలగించు..."
+  },
+  "4e6fbf032b": {
+    "translation": "మీరు ఈ సమూహాన్ని తొలగించాలనుకుంటున్నారా? ఈ చర్యను రద్దు చేయలేరు."
+  },
   "50db1b7e1e": {
     "translation": "ఫైల్‌ని పబ్లిష్ చేయడం సాధ్యం కాలేదు."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "గోప్యతా విధానం"
   },
+  "5a86b22fa0": {
+    "translation": "ప్రారంభించడానికి ఫైల్‌లను ఇక్కడికి లాగండి, <create> ఫైల్‌ను సృష్టించండి</create> లేదా <invite> ఆహ్వాన లింక్‌ను కాపీ చేయండి</invite>."
+  },
   "5a95a425f7": {
     "translation": "షేర్ చేయండి"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "పాత బ్రౌజర్ గుర్తించబడింది. ఈ యాప్‌ను ఉపయోగించడానికి దయచేసి మీ బ్రౌజర్‌ను అప్‌డేట్ చేయండి."
   },
+  "5c6fe42bc2": {
+    "translation": "ఈ లింక్‌ను ఉపసంహరించుకుని, కొత్తదాన్ని సృష్టించండి."
+  },
   "5d26ae7550": {
     "translation": "మీరు సైన్ ఇన్ చేయడానికి ముందు మీరు సృష్టించిన కంటెంట్‌లో కొంత భాగాన్ని అప్‌లోడ్ చేయడంలో మేము విఫలమయ్యాము."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "పాతది"
   },
+  "639bae9ac6": {
+    "translation": "నువ్వు"
+  },
   "6609dd239e": {
     "translation": "ఏదో తప్పు జరిగింది"
   },
   "6637a98151": {
     "translation": "tldraw యొక్క కొత్త వెర్షన్ అందుబాటులో ఉంది. కొనసాగించడానికి దయచేసి పేజీని మళ్లీ లోడ్ చేయండి."
   },
+  "68257bb646": {
+    "translation": "మీరు <br></br><groupName></groupName> గుంపుకు ఆహ్వానించబడ్డారు"
+  },
+  "6832ac5936": {
+    "translation": "మీ ఇమెయిల్ చిరునామాను నమోదు చేయండి"
+  },
   "6a26f54883": {
     "translation": "సహాయం"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "కంటెంట్‌ను మాన్యువల్‌గా దిగుమతి చేసుకోవడానికి ఈ దశలను అనుసరించండి:"
   },
+  "70222abcfc": {
+    "translation": "సమూహ సెట్టింగ్‌లు"
+  },
   "70a6facb9d": {
     "translation": "ఈ వారం"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "కుక్కీలను నిర్వహించండి"
   },
+  "7697920637": {
+    "translation": "దయచేసి మళ్లీ లోడ్ చేయండి"
+  },
+  "764671e008": {
+    "translation": "డిస్కార్డ్‌లో మాతో చాట్ చేయండి"
+  },
   "777f9e90cf": {
     "translation": "చెల్లని అభ్యర్థన."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "మరచిపో"
   },
+  "7cfe6c43dc": {
+    "translation": "గ్రూప్ నుండి నిష్క్రమించండి..."
+  },
   "7daeced9ff": {
     "translation": "మార్పులను ప్రచురించండి"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "ఫైల్ పేరు మార్చండి"
   },
+  "8ad4303b83": {
+    "translation": "వద్దు ధన్యవాదాలు"
+  },
   "8b1946f965": {
     "translation": "సవరించడం కొనసాగించడానికి దయచేసి గదిని మీ ఫైల్‌లలోకి కాపీ చేయండి."
   },
+  "8c2d3d730c": {
+    "translation": "ధృవీకరణ కోడ్ కోసం మీ ఇమెయిల్‌ను తనిఖీ చేయండి."
+  },
   "8eb2c00e96": {
     "translation": "మీతో భాగస్వామ్యం చేయబడింది"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "నా ఫైల్‌లకు కాపీ చేయండి"
   },
+  "930390d222": {
+    "translation": "ఆహ్వాన లింక్ కాపీ చేయబడింది"
+  },
+  "95aacd4d4a": {
+    "translation": "Google తో సైన్ ఇన్ చేయండి"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK తో నిర్మించండి"
+  },
   "96165d6df5": {
     "translation": "ఈ నెల"
   },
+  "985a4b720f": {
+    "translation": "ఉపయోగ నిబంధనలు"
+  },
+  "98c997a27e": {
+    "translation": "ఫైల్ లింక్‌ను జోడించండి"
+  },
   "9914a0ce04": {
     "translation": "కాంతి"
   },
+  "9b33f5c63c": {
+    "translation": "కోడ్ రాలేదా? <resend> మళ్ళీ పంపు</resend>."
+  },
   "9bef626805": {
     "translation": "ఫైల్‌ని తొలగించండి"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "నేపథ్యం"
   },
+  "aa916767cf": {
+    "translation": "ఆహ్వానాన్ని అంగీకరించడానికి సైన్ ఇన్ చేయండి"
+  },
   "ab0df9ba36": {
     "translation": "ఫైల్ పరిమితిని చేరుకున్నారు"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "అతిథి వినియోగదారు"
   },
+  "b357b524e7": {
+    "translation": "ఇమెయిల్ చిరునామా"
+  },
+  "b3d2db69fe": {
+    "translation": "ఫైల్ URL"
+  },
   "b6d4223e60": {
     "translation": "సైన్ ఇన్ చేయండి"
   },
+  "b6f4a2ec63": {
+    "translation": "యజమాని"
+  },
   "b758336699": {
     "translation": "లింక్‌ని కాపీ చేయండి"
   },
   "ba0318cb81": {
     "translation": "షేర్ చేయడానికి సైన్ ఇన్ చేయండి"
   },
-  "bb792693e2": {
-    "translation": "అన్‌పిన్ చేయండి"
+  "bb93a7590f": {
+    "translation": "అంగీకరించి, సమూహంలో చేరండి"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr ఫైల్‌ను అప్‌లోడ్ చేస్తోంది…} other {{total} .tldr ఫైళ్ళలో {uploaded} అప్‌లోడ్ అవుతోంది…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} ద్వారా భాగస్వామ్యం చేయబడింది"
   },
-  "bcb62136a3": {
-    "translation": ".tldr ఫైల్‌లను అప్‌లోడ్ చేయండి"
-  },
   "c2276c9127": {
     "translation": "భాగస్వామ్యం చేయడం గురించి మరింత తెలుసుకోండి."
   },
+  "c28aed8348": {
+    "translation": "tldraw ను మెరుగుపరచడంలో మాకు సహాయపడటానికి <cookies>analytics</cookies> ని అనుమతించండి."
+  },
   "c303bd1095": {
     "translation": "ఫైల్‌ను ప్రచురించడం సాధ్యం కాలేదు."
   },
   "c4b39a1cc3": {
     "translation": "ముఖ్యమైన కుక్కీలు"
   },
+  "c6155aaecc": {
+    "translation": "గ్రూప్ పేరు"
+  },
   "c655b27b1e": {
     "translation": "i18n: లాంగ్ స్ట్రింగ్"
   },
   "c6a00f137b": {
     "translation": "ఆహ్వానించండి"
   },
+  "c74ea6dbff": {
+    "translation": "తక్కువ చూపించు"
+  },
   "c87aacf567": {
     "translation": "సైన్ అవుట్ చేయండి"
   },
+  "c9cc8cce24": {
+    "translation": "సేవ్ చేయండి"
+  },
   "cceaefbc20": {
     "translation": "ఈ ఫైల్‌ను భాగస్వామ్యం చేయండి"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "సైడ్‌బార్‌ని టోగుల్ చేయండి"
   },
+  "d638a3344b": {
+    "translation": "మీరు ప్రారంభించడానికి ముందు, దయచేసి మా <tos>ఉపయోగ నిబంధనలు</tos> మరియు <privacy>గోప్యతా విధానం</privacy>ను అంగీకరించండి."
+  },
   "d721757161": {
     "translation": "థీమ్"
   },
   "d876a9fe1a": {
     "translation": "మళ్లీ ప్రయత్నించండి"
   },
+  "d88ad2dc74": {
+    "translation": "అంగీకరించి కొనసాగించండి"
+  },
   "d9100f3e10": {
     "translation": "కంటెంట్‌ని చూడటానికి ఇక్కడకు వెళ్లండి"
   },
+  "d9e35d0f55": {
+    "translation": "మీరు గరిష్ట సంఖ్యలో సమూహాలను చేరుకున్నారు. కొత్త వాటిని సృష్టించే ముందు మీరు పాత సమూహాలను తొలగించాలి."
+  },
   "dbbebf3c03": {
     "translation": "ఆహ్వానం మాత్రమే"
   },
+  "dcdaa754fe": {
+    "translation": "చెల్లని tldraw ఫైల్ URL"
+  },
   "dfdb78a4e4": {
     "translation": "యాప్ డీబగ్ ఫ్లాగ్‌లు"
   },
+  "e0c88179b3": {
+    "translation": "సభ్యులను ఆహ్వానించండి"
+  },
+  "e2198d6228": {
+    "translation": "ఆహ్వాన లింక్‌ను కాపీ చేయి"
+  },
   "e2ae80a510": {
     "translation": "చట్టపరమైన సారాంశం"
   },
+  "e3afed0047": {
+    "translation": "అడ్మిన్"
+  },
   "e404559826": {
     "translation": "సేవా నిబంధనలు"
   },
-  "e78e14c5f1": {
-    "translation": "పిన్ చేయండి"
+  "e81c4e4f2b": {
+    "translation": "లేదా"
+  },
+  "ea0626ac5a": {
+    "translation": "ప్రమాద ప్రాంతం"
   },
   "ea4788705e": {
     "translation": "రద్దు చేయి"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "మరింత తెలుసుకోవడానికి మా <a>కుకీ పాలసీ</a> చదవండి."
   },
+  "ef53538ae4": {
+    "translation": "సభ్యులు"
+  },
   "ef7de3f485": {
     "translation": "ఎంపిక చేయబడింది"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "సెట్టింగులు"
   },
+  "f714e36843": {
+    "translation": "మీరు ఖచ్చితంగా ఈ గుంపు నుండి నిష్క్రమించాలనుకుంటున్నారా?"
+  },
+  "fa2ead697d": {
+    "translation": "గోప్యతా విధానం"
+  },
   "fb15c53f22": {
     "translation": "వీక్షకుడు"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "లింక్ కాపీ చేయబడింది"
   },
+  "ff7a814974": {
+    "translation": "ఫైల్ లింక్‌ను జోడించండి…"
+  },
   "ffcd73e997": {
     "translation": "ఫైల్‌ను దిగుమతి చేయి…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/th.json b/apps/dotcom/client/public/tla/locales/th.json
index 63ff99bed726..94af3f000573 100644
--- a/apps/dotcom/client/public/tla/locales/th.json
+++ b/apps/dotcom/client/public/tla/locales/th.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "บัญชี"
   },
+  "08d2d725a9": {
+    "translation": "สร้างบัญชีฟรีเพื่อบันทึกงานของคุณ ทำงานร่วมกันแบบเรียลไทม์ และอื่นๆ อีกมากมาย"
+  },
   "0b27918290": {
     "translation": "ไฟล์"
   },
   "0b9a4cde72": {
     "translation": "เมนูไฟล์"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw เป็นไวท์บอร์ดเสมือนจริงที่ใช้งานได้ฟรีและทันที"
+  },
   "0d1f2bb523": {
     "translation": "ส่งคำติชม"
   },
   "110a4b01be": {
     "translation": "เผยแพร่"
   },
+  "129b9e34ea": {
+    "translation": "ออกจากกลุ่ม"
+  },
+  "12a6766ba1": {
+    "translation": "ปลดหมุดไฟล์"
+  },
   "12c8a9838c": {
     "translation": "ลองใช้ tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "ส่งออกเป็น"
   },
+  "146ffe2fd9": {
+    "translation": "แสดงเพิ่มเติม"
+  },
+  "14d65465b7": {
+    "translation": "ลบกลุ่ม"
+  },
   "181b90f889": {
     "translation": "สร้างไฟล์"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "ห้องนี้ใกล้ถึงขีดจำกัดขนาดแล้ว โปรดพิจารณาลบเนื้อหาบางส่วนหรือสร้างไฟล์ใหม่"
   },
+  "2445e5e347": {
+    "translation": "สร้างกลุ่ม"
+  },
   "250ddea65c": {
     "translation": "เกี่ยวกับ tldraw"
   },
   "299cb00a7a": {
     "translation": "อัปโหลดล้มเหลว"
   },
+  "2c3ef76333": {
+    "translation": "ไฟล์ของฉัน"
+  },
   "2deec2cb74": {
     "translation": "ห้องนี้มีขนาดถึงขีดจำกัดแล้ว การเปลี่ยนแปลงอาจไม่สามารถบันทึกได้อีกต่อไป โปรดลบเนื้อหาบางส่วนหรือสร้างไฟล์ใหม่"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: ไฮไลท์หายไป"
   },
+  "32210b37e4": {
+    "translation": "เพิ่มลิงค์"
+  },
   "335defdafe": {
     "translation": "กรุณาลองรีเฟรชหน้าอีกครั้ง"
   },
   "344a7f427f": {
     "translation": "โปรแกรมแก้ไข"
   },
+  "3bc7d6ea2f": {
+    "translation": "ดำเนินการต่อด้วยอีเมล"
+  },
   "3bd1b98dbd": {
     "translation": "ไม่สามารถเผยแพร่การเปลี่ยนแปลงได้"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "กรุณาโหลดใหม่อีกครั้ง"
+  "47f493a590": {
+    "translation": "ปักหมุดไฟล์"
   },
-  "764671e008": {
-    "translation": "พูดคุยกับเราได้ที่ Discord"
+  "49049467ff": {
+    "translation": "วาง URL ไฟล์ tldraw..."
   },
   "4908687e50": {
     "translation": "คุณแน่ใจหรือไม่ว่าต้องการลืมไฟล์นี้"
   },
+  "49ee308734": {
+    "translation": "ชื่อ"
+  },
   "4d0d3ddec9": {
     "translation": "เว็บไซต์นี้ใช้คุกกี้เพื่อทำให้แอปทำงานและรวบรวมข้อมูลวิเคราะห์"
   },
   "4d1c8263ba": {
     "translation": "โหลดซ้ำ"
   },
+  "4da5988a2e": {
+    "translation": "ลบกลุ่ม…"
+  },
+  "4e6fbf032b": {
+    "translation": "คุณแน่ใจหรือไม่ว่าต้องการลบกลุ่มนี้? การดำเนินการนี้ไม่สามารถย้อนกลับได้"
+  },
   "50db1b7e1e": {
     "translation": "ไม่สามารถยกเลิกการเผยแพร่ไฟล์ได้"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "นโยบายความเป็นส่วนตัว"
   },
+  "5a86b22fa0": {
+    "translation": "ลากไฟล์มาที่นี่ <create>สร้างไฟล์</create> หรือ <invite>คัดลอกลิงก์เชิญ</invite> เพื่อเริ่มต้น"
+  },
   "5a95a425f7": {
     "translation": "แชร์"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "ตรวจพบเบราว์เซอร์รุ่นเก่า โปรดอัปเดตเบราว์เซอร์เพื่อใช้แอปนี้"
   },
+  "5c6fe42bc2": {
+    "translation": "เพิกถอนลิงค์นี้และสร้างใหม่"
+  },
   "5d26ae7550": {
     "translation": "เราไม่สามารถอัปโหลดเนื้อหาบางส่วนที่คุณสร้างขึ้นก่อนที่คุณจะลงชื่อเข้าใช้"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "เก่ากว่า"
   },
+  "639bae9ac6": {
+    "translation": "คุณ"
+  },
   "6609dd239e": {
     "translation": "มีบางอย่างผิดพลาด"
   },
   "6637a98151": {
     "translation": "เวอร์ชันใหม่ของ tldraw พร้อมให้บริการแล้ว โปรดโหลดหน้าใหม่อีกครั้งเพื่อดำเนินการต่อ"
   },
+  "68257bb646": {
+    "translation": "คุณได้รับเชิญให้เข้าร่วมกลุ่ม <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "กรอกที่อยู่อีเมลของคุณ"
+  },
   "6a26f54883": {
     "translation": "ช่วยเหลือ"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "ปฏิบัติตามขั้นตอนเหล่านี้เพื่อนำเข้าเนื้อหาด้วยตนเอง:"
   },
+  "70222abcfc": {
+    "translation": "การตั้งค่ากลุ่ม"
+  },
   "70a6facb9d": {
     "translation": "สัปดาห์นี้"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "จัดการคุกกี้"
   },
+  "7697920637": {
+    "translation": "กรุณาโหลดใหม่อีกครั้ง"
+  },
+  "764671e008": {
+    "translation": "พูดคุยกับเราได้ที่ Discord"
+  },
   "777f9e90cf": {
     "translation": "คำขอไม่ถูกต้อง"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "ลืม"
   },
+  "7cfe6c43dc": {
+    "translation": "ออกจากกลุ่ม…"
+  },
   "7daeced9ff": {
     "translation": "เผยแพร่การเปลี่ยนแปลง"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "เปลี่ยนชื่อไฟล์"
   },
+  "8ad4303b83": {
+    "translation": "ไม่เป็นไร"
+  },
   "8b1946f965": {
     "translation": "หากต้องการแก้ไขต่อ โปรดคัดลอกห้องไปยังไฟล์ของคุณ"
   },
+  "8c2d3d730c": {
+    "translation": "ตรวจสอบอีเมลของคุณเพื่อรับรหัสยืนยัน"
+  },
   "8eb2c00e96": {
     "translation": "แชร์กับคุณ"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "คัดลอกไปยังไฟล์ของฉัน"
   },
+  "930390d222": {
+    "translation": "คัดลอกลิงก์เชิญ"
+  },
+  "95aacd4d4a": {
+    "translation": "ลงชื่อเข้าใช้ด้วย Google"
+  },
+  "95d2109dc8": {
+    "translation": "สร้างด้วย tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "เดือนนี้"
   },
+  "985a4b720f": {
+    "translation": "เงื่อนไขการใช้งาน"
+  },
+  "98c997a27e": {
+    "translation": "เพิ่มลิงค์ไฟล์"
+  },
   "9914a0ce04": {
     "translation": "แสง"
   },
+  "9b33f5c63c": {
+    "translation": "ไม่ได้รับรหัส? <resend>ส่งอีกครั้ง</resend>"
+  },
   "9bef626805": {
     "translation": "ลบไฟล์"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "พื้นหลัง"
   },
+  "aa916767cf": {
+    "translation": "ลงชื่อเข้าใช้เพื่อยอมรับคำเชิญ"
+  },
   "ab0df9ba36": {
     "translation": "ถึงขีดจำกัดไฟล์แล้ว"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "ผู้ใช้ที่เป็นแขก"
   },
+  "b357b524e7": {
+    "translation": "ที่อยู่อีเมล"
+  },
+  "b3d2db69fe": {
+    "translation": "URL ของไฟล์"
+  },
   "b6d4223e60": {
     "translation": "ลงชื่อเข้าใช้"
   },
+  "b6f4a2ec63": {
+    "translation": "เจ้าของ"
+  },
   "b758336699": {
     "translation": "คัดลอกลิงก์"
   },
   "ba0318cb81": {
     "translation": "ลงชื่อเข้าใช้เพื่อแชร์"
   },
-  "bb792693e2": {
-    "translation": "ยกเลิกปักหมุด"
+  "bb93a7590f": {
+    "translation": "ยอมรับและเข้าร่วมกลุ่ม"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {กำลังอัปโหลดไฟล์ .tldr จำนวน {uploaded} จาก {total} ไฟล์…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "แชร์โดย {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "อัปโหลดไฟล์ .tldr"
-  },
   "c2276c9127": {
     "translation": "เรียนรู้เพิ่มเติมเกี่ยวกับการแชร์"
   },
+  "c28aed8348": {
+    "translation": "อนุญาตให้ <cookies>analytics</cookies> ช่วยเราปรับปรุง tldraw"
+  },
   "c303bd1095": {
     "translation": "ไม่สามารถเผยแพร่ไฟล์ได้"
   },
   "c4b39a1cc3": {
     "translation": "คุกกี้ที่จำเป็น"
   },
+  "c6155aaecc": {
+    "translation": "ชื่อกลุ่ม"
+  },
   "c655b27b1e": {
     "translation": "i18n: สตริงยาว"
   },
   "c6a00f137b": {
     "translation": "เชิญ"
   },
+  "c74ea6dbff": {
+    "translation": "แสดงน้อยลง"
+  },
   "c87aacf567": {
     "translation": "ออกจากระบบ"
   },
+  "c9cc8cce24": {
+    "translation": "บันทึก"
+  },
   "cceaefbc20": {
     "translation": "แชร์ไฟล์นี้"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "สลับแถบด้านข้าง"
   },
+  "d638a3344b": {
+    "translation": "ก่อนที่คุณจะเริ่มต้น โปรดยอมรับ<tos>ข้อกำหนดการใช้งาน</tos>และ<privacy>นโยบายความเป็นส่วนตัว</privacy>ของเรา"
+  },
   "d721757161": {
     "translation": "ธีม"
   },
   "d876a9fe1a": {
     "translation": "ลองอีกครั้ง"
   },
+  "d88ad2dc74": {
+    "translation": "ยอมรับและดำเนินการต่อ"
+  },
   "d9100f3e10": {
     "translation": "เข้าไปที่นี่เพื่อดูเนื้อหา"
   },
+  "d9e35d0f55": {
+    "translation": "คุณมีจำนวนกลุ่มถึงจำนวนสูงสุดแล้ว คุณต้องลบกลุ่มเก่าออกก่อนจึงจะสร้างกลุ่มใหม่ได้"
+  },
   "dbbebf3c03": {
     "translation": "เชิญเท่านั้น"
   },
+  "dcdaa754fe": {
+    "translation": "URL ไฟล์ tldraw ไม่ถูกต้อง"
+  },
   "dfdb78a4e4": {
     "translation": "ค่าสถานะการแก้ไขข้อบกพร่องของแอป"
   },
+  "e0c88179b3": {
+    "translation": "เชิญสมาชิก"
+  },
+  "e2198d6228": {
+    "translation": "คัดลอกลิงก์คำเชิญ"
+  },
   "e2ae80a510": {
     "translation": "สรุปข้อกฎหมาย"
   },
+  "e3afed0047": {
+    "translation": "ผู้ดูแลระบบ"
+  },
   "e404559826": {
     "translation": "เงื่อนไขการบริการ"
   },
-  "e78e14c5f1": {
-    "translation": "ปักหมุด"
+  "e81c4e4f2b": {
+    "translation": "หรือ"
+  },
+  "ea0626ac5a": {
+    "translation": "เขตอันตราย"
   },
   "ea4788705e": {
     "translation": "ยกเลิก"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "อ่าน<a>นโยบายคุกกี้</a>ของเราเพื่อเรียนรู้เพิ่มเติม"
   },
+  "ef53538ae4": {
+    "translation": "สมาชิก"
+  },
   "ef7de3f485": {
     "translation": "เลือกแล้ว"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "การตั้งค่า"
   },
+  "f714e36843": {
+    "translation": "คุณแน่ใจหรือไม่ว่าต้องการออกจากกลุ่มนี้?"
+  },
+  "fa2ead697d": {
+    "translation": "นโยบายความเป็นส่วนตัว"
+  },
   "fb15c53f22": {
     "translation": "ผู้ชม"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "ลิงก์ที่คัดลอก"
   },
+  "ff7a814974": {
+    "translation": "เพิ่มลิงค์ไฟล์…"
+  },
   "ffcd73e997": {
     "translation": "นำเข้าไฟล์…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/tl.json b/apps/dotcom/client/public/tla/locales/tl.json
index ebbed88dbda0..c441ca9b26d8 100644
--- a/apps/dotcom/client/public/tla/locales/tl.json
+++ b/apps/dotcom/client/public/tla/locales/tl.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Account"
   },
+  "08d2d725a9": {
+    "translation": "Gumawa ng libreng account para i-save ang iyong trabaho, makipagtulungan sa real-time, at higit pa."
+  },
   "0b27918290": {
     "translation": "file"
   },
   "0b9a4cde72": {
     "translation": "Menu ng file"
   },
+  "0beb3ca97b": {
+    "translation": "Ang tldraw ay isang libre at instant na virtual whiteboard."
+  },
   "0d1f2bb523": {
     "translation": "Magpadala ng feedback"
   },
   "110a4b01be": {
     "translation": "I-publish"
   },
+  "129b9e34ea": {
+    "translation": "Umalis sa grupo"
+  },
+  "12a6766ba1": {
+    "translation": "I-unpin ang file"
+  },
   "12c8a9838c": {
     "translation": "Subukan ang tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "I-export bilang"
   },
+  "146ffe2fd9": {
+    "translation": "Magpakita ng higit pa"
+  },
+  "14d65465b7": {
+    "translation": "Tanggalin ang pangkat"
+  },
   "181b90f889": {
     "translation": "Lumikha ng file"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Papalapit na ang kwartong ito sa limitasyon ng laki nito. Pag-isipang mag-alis ng ilang content o magsimula ng bagong file."
   },
+  "2445e5e347": {
+    "translation": "Lumikha ng pangkat"
+  },
   "250ddea65c": {
     "translation": "Tungkol sa tldraw"
   },
   "299cb00a7a": {
     "translation": "Nabigo ang pag-upload"
   },
+  "2c3ef76333": {
+    "translation": "Aking mga file"
+  },
   "2deec2cb74": {
     "translation": "Naabot na ng kwartong ito ang limitasyon sa laki nito at maaaring hindi na ma-save ang mga pagbabago. Mag-alis ng ilang content o magsimula ng bagong file."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Nawawala ang Highlight"
   },
+  "32210b37e4": {
+    "translation": "Magdagdag ng link"
+  },
   "335defdafe": {
     "translation": "Pakisubukang i-refresh ang page."
   },
   "344a7f427f": {
     "translation": "Editor"
   },
+  "3bc7d6ea2f": {
+    "translation": "Magpatuloy sa email"
+  },
   "3bd1b98dbd": {
     "translation": "Hindi ma-publish ang mga pagbabago."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Paki-reload"
+  "47f493a590": {
+    "translation": "Pin file"
   },
-  "764671e008": {
-    "translation": "Makipag-chat sa amin sa Discord"
+  "49049467ff": {
+    "translation": "I-paste ang URL ng tldraw file..."
   },
   "4908687e50": {
     "translation": "Sigurado ka bang gusto mong kalimutan ang file na ito?"
   },
+  "49ee308734": {
+    "translation": "Pangalan"
+  },
   "4d0d3ddec9": {
     "translation": "Gumagamit ang site na ito ng cookies para gumana ang app at para mangolekta ng analytics."
   },
   "4d1c8263ba": {
     "translation": "I-reload"
   },
+  "4da5988a2e": {
+    "translation": "Tanggalin ang pangkat…"
+  },
+  "4e6fbf032b": {
+    "translation": "Sigurado ka bang gusto mong tanggalin ang pangkat na ito? Ang pagkilos na ito ay hindi maaaring i-undo."
+  },
   "50db1b7e1e": {
     "translation": "Hindi ma-unpublish ang file."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Patakaran sa privacy"
   },
+  "5a86b22fa0": {
+    "translation": "I-drag ang mga file dito, <create>lumikha ng file</create>, o <invite>copy invite link</invite> para makapagsimula."
+  },
   "5a95a425f7": {
     "translation": "Ibahagi"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Nakita ang lumang browser. Mangyaring i-update ang iyong browser upang magamit ang app na ito."
   },
+  "5c6fe42bc2": {
+    "translation": "Bawiin ang link na ito at gumawa ng bago."
+  },
   "5d26ae7550": {
     "translation": "Nabigo kaming mag-upload ng ilan sa nilalamang ginawa mo bago ka mag-sign in."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Mas matanda"
   },
+  "639bae9ac6": {
+    "translation": "ikaw"
+  },
   "6609dd239e": {
     "translation": "Nagkaproblema"
   },
   "6637a98151": {
     "translation": "Available ang bagong bersyon ng tldraw. Paki-reload ang page para magpatuloy."
   },
+  "68257bb646": {
+    "translation": "Inimbitahan ka sa pangkat na <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Ilagay ang iyong email address"
+  },
   "6a26f54883": {
     "translation": "Tulong"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Sundin ang mga hakbang na ito upang manu-manong i-import ang nilalaman:"
   },
+  "70222abcfc": {
+    "translation": "Mga setting ng pangkat"
+  },
   "70a6facb9d": {
     "translation": "Ngayong linggo"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Pamahalaan ang cookies"
   },
+  "7697920637": {
+    "translation": "Paki-reload"
+  },
+  "764671e008": {
+    "translation": "Makipag-chat sa amin sa Discord"
+  },
   "777f9e90cf": {
     "translation": "Di-wastong kahilingan."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Kalimutan"
   },
+  "7cfe6c43dc": {
+    "translation": "Umalis sa grupo..."
+  },
   "7daeced9ff": {
     "translation": "I-publish ang mga pagbabago"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Palitan ang pangalan ng file"
   },
+  "8ad4303b83": {
+    "translation": "Hindi salamat"
+  },
   "8b1946f965": {
     "translation": "Para magpatuloy sa pag-edit, pakikopya ang kwarto sa iyong mga file."
   },
+  "8c2d3d730c": {
+    "translation": "Tingnan ang iyong email para sa isang verification code."
+  },
   "8eb2c00e96": {
     "translation": "Ibinahagi sa iyo"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Kopyahin sa aking mga file"
   },
+  "930390d222": {
+    "translation": "Kinopya ang link ng imbitasyon"
+  },
+  "95aacd4d4a": {
+    "translation": "Mag-sign in gamit ang Google"
+  },
+  "95d2109dc8": {
+    "translation": "Bumuo gamit ang tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Ngayong buwan"
   },
+  "985a4b720f": {
+    "translation": "Mga Tuntunin sa Paggamit"
+  },
+  "98c997a27e": {
+    "translation": "Magdagdag ng link ng file"
+  },
   "9914a0ce04": {
     "translation": "Liwanag"
   },
+  "9b33f5c63c": {
+    "translation": "Hindi nakatanggap ng code? <resend>Muling ipadala</resend>."
+  },
   "9bef626805": {
     "translation": "Tanggalin ang file"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Background"
   },
+  "aa916767cf": {
+    "translation": "Mag-sign in para tanggapin ang imbitasyon"
+  },
   "ab0df9ba36": {
     "translation": "Naabot na ang limitasyon ng file"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Guest user"
   },
+  "b357b524e7": {
+    "translation": "Email address"
+  },
+  "b3d2db69fe": {
+    "translation": "URL ng file"
+  },
   "b6d4223e60": {
     "translation": "Mag-sign in"
   },
+  "b6f4a2ec63": {
+    "translation": "May-ari"
+  },
   "b758336699": {
     "translation": "Kopyahin ang link"
   },
   "ba0318cb81": {
     "translation": "Mag-sign in upang ibahagi"
   },
-  "bb792693e2": {
-    "translation": "I-unpin"
+  "bb93a7590f": {
+    "translation": "Tanggapin at sumali sa grupo"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, zero {} one {Ina-upload ang .tldr file…} two {} few {} many {} other {Ina-upload ang {uploaded} ng {total} .tldr file…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Ibinahagi ni {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Mag-upload ng mga .tldr na file"
-  },
   "c2276c9127": {
     "translation": "Matuto pa tungkol sa pagbabahagi."
   },
+  "c28aed8348": {
+    "translation": "Payagan ang <cookies>analytics</cookies> na tulungan kaming pagbutihin ang tldraw."
+  },
   "c303bd1095": {
     "translation": "Hindi ma-publish ang file."
   },
   "c4b39a1cc3": {
     "translation": "Mahahalagang cookies"
   },
+  "c6155aaecc": {
+    "translation": "Pangalan ng grupo"
+  },
   "c655b27b1e": {
     "translation": "i18n: Mahabang String"
   },
   "c6a00f137b": {
     "translation": "Mag-imbita"
   },
+  "c74ea6dbff": {
+    "translation": "Magpakita ng mas kaunti"
+  },
   "c87aacf567": {
     "translation": "Mag-sign out"
   },
+  "c9cc8cce24": {
+    "translation": "I-save"
+  },
   "cceaefbc20": {
     "translation": "Ibahagi ang file na ito"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "I-toggle ang sidebar"
   },
+  "d638a3344b": {
+    "translation": "Bago ka magsimula, mangyaring tanggapin ang aming <tos>mga tuntunin ng paggamit</tos> at <privacy>patakaran sa privacy</privacy>."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Subukan Muli"
   },
+  "d88ad2dc74": {
+    "translation": "Tanggapin at magpatuloy"
+  },
   "d9100f3e10": {
     "translation": "Pumunta dito upang makita ang nilalaman"
   },
+  "d9e35d0f55": {
+    "translation": "Naabot mo na ang maximum na bilang ng mga pangkat. Kailangan mong tanggalin ang mga lumang grupo bago gumawa ng mga bago."
+  },
   "dbbebf3c03": {
     "translation": "Mag-imbita lang"
   },
+  "dcdaa754fe": {
+    "translation": "Di-wastong tldraw file URL"
+  },
   "dfdb78a4e4": {
     "translation": "Mga flag ng pag-debug ng app"
   },
+  "e0c88179b3": {
+    "translation": "Mag-imbita ng mga miyembro"
+  },
+  "e2198d6228": {
+    "translation": "Kopyahin ang link ng imbitasyon"
+  },
   "e2ae80a510": {
     "translation": "Legal na buod"
   },
+  "e3afed0047": {
+    "translation": "Admin"
+  },
   "e404559826": {
     "translation": "Mga tuntunin ng serbisyo"
   },
-  "e78e14c5f1": {
-    "translation": "Pin"
+  "e81c4e4f2b": {
+    "translation": "o"
+  },
+  "ea0626ac5a": {
+    "translation": "Danger zone"
   },
   "ea4788705e": {
     "translation": "Kanselahin"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Basahin ang aming <a>patakaran sa cookie</a> upang matuto nang higit pa."
   },
+  "ef53538ae4": {
+    "translation": "Mga miyembro"
+  },
   "ef7de3f485": {
     "translation": "pinili"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Mga setting"
   },
+  "f714e36843": {
+    "translation": "Sigurado ka bang gusto mong umalis sa grupong ito?"
+  },
+  "fa2ead697d": {
+    "translation": "Patakaran sa Privacy"
+  },
   "fb15c53f22": {
     "translation": "manonood"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Kinopya ang link"
   },
+  "ff7a814974": {
+    "translation": "Magdagdag ng link ng file…"
+  },
   "ffcd73e997": {
     "translation": "Mag-import ng file…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/tr.json b/apps/dotcom/client/public/tla/locales/tr.json
index 8c0af6a4473e..ba03d451bcbb 100644
--- a/apps/dotcom/client/public/tla/locales/tr.json
+++ b/apps/dotcom/client/public/tla/locales/tr.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Hesap"
   },
+  "08d2d725a9": {
+    "translation": "Çalışmalarınızı kaydetmek, gerçek zamanlı işbirliği yapmak ve daha fazlası için ücretsiz bir hesap oluşturun."
+  },
   "0b27918290": {
     "translation": "Dosya"
   },
   "0b9a4cde72": {
     "translation": "Dosya menüsü"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ücretsiz ve anında kullanılabilen sanal bir beyaz tahtadır."
+  },
   "0d1f2bb523": {
     "translation": "Geri bildirim gönder"
   },
   "110a4b01be": {
     "translation": "Yayınla"
   },
+  "129b9e34ea": {
+    "translation": "Gruptan ayrıl"
+  },
+  "12a6766ba1": {
+    "translation": "Dosyayı sabitle"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK'sını deneyin"
   },
   "13ddd375ad": {
     "translation": "Dışa aktarma formatı"
   },
+  "146ffe2fd9": {
+    "translation": "Daha fazlasını göster"
+  },
+  "14d65465b7": {
+    "translation": "Grubu sil"
+  },
   "181b90f889": {
     "translation": "Dosya oluştur"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Bu oda boyut sınırına yaklaşıyor. İçeriğin bir kısmını kaldırmayı veya yeni bir dosya başlatmayı düşünün."
   },
+  "2445e5e347": {
+    "translation": "Grup oluştur"
+  },
   "250ddea65c": {
     "translation": "tldraw hakkında"
   },
   "299cb00a7a": {
     "translation": "Yüklenemedi"
   },
+  "2c3ef76333": {
+    "translation": "Dosyalarım"
+  },
   "2deec2cb74": {
     "translation": "Bu oda boyut sınırına ulaştı ve değişiklikler artık kaydedilemeyebilir. İçeriğin bir kısmını kaldırın veya yeni bir dosya başlatın."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Vurgu Eksik"
   },
+  "32210b37e4": {
+    "translation": "Bağlantı ekle"
+  },
   "335defdafe": {
     "translation": "Lütfen sayfayı yenilemeyi deneyin."
   },
   "344a7f427f": {
     "translation": "Düzenleyici"
   },
+  "3bc7d6ea2f": {
+    "translation": "E-postayla devam et"
+  },
   "3bd1b98dbd": {
     "translation": "Değişiklikler yayınlanamıyor."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Lütfen yeniden yükleyin"
+  "47f493a590": {
+    "translation": "Pin dosyası"
   },
-  "764671e008": {
-    "translation": "Discord'da bizimle sohbet edin"
+  "49049467ff": {
+    "translation": "tldraw dosya URL'sini yapıştır..."
   },
   "4908687e50": {
     "translation": "Bu dosyayı unutmak istediğinizden emin misiniz?"
   },
+  "49ee308734": {
+    "translation": "İsim"
+  },
   "4d0d3ddec9": {
     "translation": "Bu site, uygulamanın çalışmasını sağlamak ve analiz toplamak için çerezler kullanır."
   },
   "4d1c8263ba": {
     "translation": "Tekrar yükle"
   },
+  "4da5988a2e": {
+    "translation": "Grubu sil…"
+  },
+  "4e6fbf032b": {
+    "translation": "Bu grubu silmek istediğinizden emin misiniz? Bu işlem geri alınamaz."
+  },
   "50db1b7e1e": {
     "translation": "Dosya yayından kaldırılamıyor."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Gizlilik Politikası"
   },
+  "5a86b22fa0": {
+    "translation": "Başlamak için dosyaları buraya sürükleyin, <create>bir dosya oluşturun</create> veya <invite>davet bağlantısını kopyalayın</invite>."
+  },
   "5a95a425f7": {
     "translation": "Paylaş"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Eski tarayıcı algılandı. Bu uygulamayı kullanmak için lütfen tarayıcınızı güncelleyin."
   },
+  "5c6fe42bc2": {
+    "translation": "Bu bağlantıyı iptal edin ve yeni bir bağlantı oluşturun."
+  },
   "5d26ae7550": {
     "translation": "Oturum açmadan önce oluşturduğunuz bazı içerikleri yükleyemedik."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Daha eski"
   },
+  "639bae9ac6": {
+    "translation": "Sen"
+  },
   "6609dd239e": {
     "translation": "Bir sorun oluştu"
   },
   "6637a98151": {
     "translation": "tldraw'ın yeni bir sürümü mevcut. Devam etmek için lütfen sayfayı yeniden yükleyin."
   },
+  "68257bb646": {
+    "translation": "<br></br><groupName></groupName> grubuna davet edildiniz"
+  },
+  "6832ac5936": {
+    "translation": "E-posta adresinizi girin"
+  },
   "6a26f54883": {
     "translation": "Yardım"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "İçeriği manuel olarak içe aktarmak için şu adımları izleyin:"
   },
+  "70222abcfc": {
+    "translation": "Grup ayarları"
+  },
   "70a6facb9d": {
     "translation": "Bu hafta"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Çerezleri yönet"
   },
+  "7697920637": {
+    "translation": "Lütfen yeniden yükleyin"
+  },
+  "764671e008": {
+    "translation": "Discord'da bizimle sohbet edin"
+  },
   "777f9e90cf": {
     "translation": "Geçersiz istek"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Unut"
   },
+  "7cfe6c43dc": {
+    "translation": "Gruptan ayrıl…"
+  },
   "7daeced9ff": {
     "translation": "Değişiklikleri yayınla"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Dosyayı yeniden adlandır"
   },
+  "8ad4303b83": {
+    "translation": "Hayır, teşekkürler"
+  },
   "8b1946f965": {
     "translation": "Düzenlemeye devam etmek için lütfen odayı dosyalarınıza kopyalayın."
   },
+  "8c2d3d730c": {
+    "translation": "Doğrulama kodu için e-postanızı kontrol edin."
+  },
   "8eb2c00e96": {
     "translation": "Sizinle paylaşıldı"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Dosyalarıma kopyala"
   },
+  "930390d222": {
+    "translation": "Davet bağlantısı kopyalandı"
+  },
+  "95aacd4d4a": {
+    "translation": "Google ile oturum açın"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK ile oluşturun"
+  },
   "96165d6df5": {
     "translation": "Bu ay"
   },
+  "985a4b720f": {
+    "translation": "Kullanım Şartları"
+  },
+  "98c997a27e": {
+    "translation": "Dosya bağlantısı ekle"
+  },
   "9914a0ce04": {
     "translation": "Açık"
   },
+  "9b33f5c63c": {
+    "translation": "Kod almadınız mı? <resend>Tekrar gönder</resend>."
+  },
   "9bef626805": {
     "translation": "Dosyayı sil"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Arka plan"
   },
+  "aa916767cf": {
+    "translation": "Daveti kabul etmek için oturum açın"
+  },
   "ab0df9ba36": {
     "translation": "Dosya sınırına ulaşıldı"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Misafir kullanıcı"
   },
+  "b357b524e7": {
+    "translation": "E-posta adresi"
+  },
+  "b3d2db69fe": {
+    "translation": "Dosya URL'si"
+  },
   "b6d4223e60": {
     "translation": "Oturum aç"
   },
+  "b6f4a2ec63": {
+    "translation": "Mal sahibi"
+  },
   "b758336699": {
     "translation": "Bağlantıyı kopyala"
   },
   "ba0318cb81": {
     "translation": "Paylaşmak için oturum açın"
   },
-  "bb792693e2": {
-    "translation": "SabitlemeyI kaldır"
+  "bb93a7590f": {
+    "translation": "Kabul et ve gruba katıl"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {.tldr dosyası yükleniyor…} other {{uploaded} / {total} .tldr dosyası yükleniyor…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "{ownerName} tarafından paylaşıldı"
   },
-  "bcb62136a3": {
-    "translation": ".tldr dosyalarını yükle"
-  },
   "c2276c9127": {
     "translation": "Paylaşım hakkında daha fazla bilgi edinin."
   },
+  "c28aed8348": {
+    "translation": "Tldraw'ı geliştirmemize yardımcı olması için <cookies>analytics</cookies>'e izin verin."
+  },
   "c303bd1095": {
     "translation": "Bu dosya yayınlanamıyor."
   },
   "c4b39a1cc3": {
     "translation": "Temel çerezler"
   },
+  "c6155aaecc": {
+    "translation": "Grup adı"
+  },
   "c655b27b1e": {
     "translation": "i18n: Uzun Dizi"
   },
   "c6a00f137b": {
     "translation": "Davet et"
   },
+  "c74ea6dbff": {
+    "translation": "Daha az göster"
+  },
   "c87aacf567": {
     "translation": "Oturumu kapat"
   },
+  "c9cc8cce24": {
+    "translation": "Kaydetmek"
+  },
   "cceaefbc20": {
     "translation": "Bu dosyayı paylaş"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Kenar çubuğunu aç/kapat"
   },
+  "d638a3344b": {
+    "translation": "Başlamadan önce lütfen <tos>kullanım koşullarımızı</tos> ve <privacy>gizlilik politikamızı</privacy> kabul edin."
+  },
   "d721757161": {
     "translation": "Tema"
   },
   "d876a9fe1a": {
     "translation": "Tekrar Dene"
   },
+  "d88ad2dc74": {
+    "translation": "Kabul et ve devam et"
+  },
   "d9100f3e10": {
     "translation": "İçeriği görmek için buraya gidin"
   },
+  "d9e35d0f55": {
+    "translation": "Maksimum grup sayısına ulaştınız. Yeni gruplar oluşturmadan önce eski grupları silmeniz gerekiyor."
+  },
   "dbbebf3c03": {
     "translation": "Yalnızca davetle"
   },
+  "dcdaa754fe": {
+    "translation": "Geçersiz tldraw dosya URL'si"
+  },
   "dfdb78a4e4": {
     "translation": "Uygulama hata ayıklama bayrakları"
   },
+  "e0c88179b3": {
+    "translation": "Üyeleri davet et"
+  },
+  "e2198d6228": {
+    "translation": "Davet bağlantısını kopyala"
+  },
   "e2ae80a510": {
     "translation": "Hukuki özet"
   },
+  "e3afed0047": {
+    "translation": "Yönetici"
+  },
   "e404559826": {
     "translation": "Hizmet Şartları"
   },
-  "e78e14c5f1": {
-    "translation": "Sabitle"
+  "e81c4e4f2b": {
+    "translation": "veya"
+  },
+  "ea0626ac5a": {
+    "translation": "Tehlikeli bölge"
   },
   "ea4788705e": {
     "translation": "İptal"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Daha fazla bilgi edinmek için <a>çerez politikamızı</a> okuyun."
   },
+  "ef53538ae4": {
+    "translation": "Üyeler"
+  },
   "ef7de3f485": {
     "translation": "seçilmiş"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Ayarlar"
   },
+  "f714e36843": {
+    "translation": "Bu gruptan ayrılmak istediğinize emin misiniz?"
+  },
+  "fa2ead697d": {
+    "translation": "Gizlilik Politikası"
+  },
   "fb15c53f22": {
     "translation": "Görüntüleyici"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Bağlantı kopyalandı"
   },
+  "ff7a814974": {
+    "translation": "Dosya bağlantısı ekle…"
+  },
   "ffcd73e997": {
     "translation": "Dosyayı içe aktar…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/uk.json b/apps/dotcom/client/public/tla/locales/uk.json
index 6aff3bf764a6..16e9e7666a22 100644
--- a/apps/dotcom/client/public/tla/locales/uk.json
+++ b/apps/dotcom/client/public/tla/locales/uk.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Обліковий запис"
   },
+  "08d2d725a9": {
+    "translation": "Створіть безкоштовний обліковий запис, щоб зберігати свою роботу, співпрацювати в режимі реального часу та багато іншого."
+  },
   "0b27918290": {
     "translation": "Файл"
   },
   "0b9a4cde72": {
     "translation": "Меню «Файл»"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw — це безкоштовна та миттєва віртуальна дошка."
+  },
   "0d1f2bb523": {
     "translation": "Надіслати відгук"
   },
   "110a4b01be": {
     "translation": "Опублікувати"
   },
+  "129b9e34ea": {
+    "translation": "Вийти з групи"
+  },
+  "12a6766ba1": {
+    "translation": "Відкріпити файл"
+  },
   "12c8a9838c": {
     "translation": "Спробуйте SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Експортувати як"
   },
+  "146ffe2fd9": {
+    "translation": "Показати більше"
+  },
+  "14d65465b7": {
+    "translation": "Видалити групу"
+  },
   "181b90f889": {
     "translation": "Створити файл"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Розмір цієї кімнати наближається до ліміту. Спробуйте видалити деякий вміст або створити новий файл."
   },
+  "2445e5e347": {
+    "translation": "Створити групу"
+  },
   "250ddea65c": {
     "translation": "Про tldraw"
   },
   "299cb00a7a": {
     "translation": "Помилка завантаження"
   },
+  "2c3ef76333": {
+    "translation": "Мої файли"
+  },
   "2deec2cb74": {
     "translation": "Ця кімната досягла ліміту розміру, і зміни можуть більше не зберігатися. Видаліть деякий вміст або створіть новий файл."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Виділення відсутнє"
   },
+  "32210b37e4": {
+    "translation": "Додати посилання"
+  },
   "335defdafe": {
     "translation": "Спробуйте оновити сторінку."
   },
   "344a7f427f": {
     "translation": "Редактор"
   },
+  "3bc7d6ea2f": {
+    "translation": "Продовжити з електронною поштою"
+  },
   "3bd1b98dbd": {
     "translation": "Не вдалося опублікувати зміни."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Будь ласка, перезавантажте"
+  "47f493a590": {
+    "translation": "Закріпити файл"
   },
-  "764671e008": {
-    "translation": "Спілкуйтеся з нами на Discord"
+  "49049467ff": {
+    "translation": "Вставити URL-адресу файлу tldraw..."
   },
   "4908687e50": {
     "translation": "Ви впевнені, що хочете забути цей файл?"
   },
+  "49ee308734": {
+    "translation": "Ім'я"
+  },
   "4d0d3ddec9": {
     "translation": "Цей сайт використовує файли cookie для забезпечення роботи додатку та збору аналітичних даних."
   },
   "4d1c8263ba": {
     "translation": "Перезавантажити"
   },
+  "4da5988a2e": {
+    "translation": "Видалити групу…"
+  },
+  "4e6fbf032b": {
+    "translation": "Ви впевнені, що хочете видалити цю групу? Цю дію не можна скасувати."
+  },
   "50db1b7e1e": {
     "translation": "Неможливо скасувати публікацію файлу."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Політика конфіденційності"
   },
+  "5a86b22fa0": {
+    "translation": "Перетягніть файли сюди, <create>створіть файл</create> або <invite>скопіюйте посилання для запрошення</invite>, щоб розпочати."
+  },
   "5a95a425f7": {
     "translation": "Поділіться"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Виявлено старий браузер. Будь ласка, оновіть свій браузер, щоб користуватися цією програмою."
   },
+  "5c6fe42bc2": {
+    "translation": "Скасуйте це посилання та створіть нове."
+  },
   "5d26ae7550": {
     "translation": "Нам не вдалося завантажити частину вмісту, який ви створили до входу."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Старший"
   },
+  "639bae9ac6": {
+    "translation": "ти"
+  },
   "6609dd239e": {
     "translation": "Щось пішло не так"
   },
   "6637a98151": {
     "translation": "Доступна нова версія tldraw. Перезавантажте сторінку, щоб продовжити."
   },
+  "68257bb646": {
+    "translation": "Вас запросили до групи <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Введіть свою адресу електронної пошти"
+  },
   "6a26f54883": {
     "translation": "Довідка"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Щоб імпортувати вміст вручну, виконайте такі дії:"
   },
+  "70222abcfc": {
+    "translation": "Налаштування групи"
+  },
   "70a6facb9d": {
     "translation": "Цього тижня"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Керувати файлами cookie"
   },
+  "7697920637": {
+    "translation": "Будь ласка, перезавантажте"
+  },
+  "764671e008": {
+    "translation": "Спілкуйтеся з нами на Discord"
+  },
   "777f9e90cf": {
     "translation": "Недійсний запит."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Забути"
   },
+  "7cfe6c43dc": {
+    "translation": "Вийти з групи…"
+  },
   "7daeced9ff": {
     "translation": "Опублікувати зміни"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Перейменувати файл"
   },
+  "8ad4303b83": {
+    "translation": "Ні, дякую."
+  },
   "8b1946f965": {
     "translation": "Щоб продовжити редагування, скопіюйте кімнату до своїх файлів."
   },
+  "8c2d3d730c": {
+    "translation": "Перевірте свою електронну пошту, щоб отримати код підтвердження."
+  },
   "8eb2c00e96": {
     "translation": "Поділився з вами"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Копіювати в мої файли"
   },
+  "930390d222": {
+    "translation": "Скопійоване посилання для запрошення"
+  },
+  "95aacd4d4a": {
+    "translation": "Увійти за допомогою Google"
+  },
+  "95d2109dc8": {
+    "translation": "Збірка за допомогою tldraw SDK"
+  },
   "96165d6df5": {
     "translation": "Цього місяця"
   },
+  "985a4b720f": {
+    "translation": "Умови використання"
+  },
+  "98c997a27e": {
+    "translation": "Додати посилання на файл"
+  },
   "9914a0ce04": {
     "translation": "Світла"
   },
+  "9b33f5c63c": {
+    "translation": "Не отримали код? <resend>Надіслати ще раз</resend>."
+  },
   "9bef626805": {
     "translation": "Видалити файл"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Фон"
   },
+  "aa916767cf": {
+    "translation": "Увійдіть, щоб прийняти запрошення"
+  },
   "ab0df9ba36": {
     "translation": "Досягнуто ліміту файлів"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Гість"
   },
+  "b357b524e7": {
+    "translation": "Адреса електронної пошти"
+  },
+  "b3d2db69fe": {
+    "translation": "URL-адреса файлу"
+  },
   "b6d4223e60": {
     "translation": "Увійти"
   },
+  "b6f4a2ec63": {
+    "translation": "Власник"
+  },
   "b758336699": {
     "translation": "Копіювати посилання"
   },
   "ba0318cb81": {
     "translation": "Увійдіть, щоб поділитися"
   },
-  "bb792693e2": {
-    "translation": "Відкріпити"
+  "bb93a7590f": {
+    "translation": "Прийняти та приєднатися до групи"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {Завантаження файлу .tldr…} few {} many {} other {Завантаження {uploaded} із {total} файлів .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Поділився {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Завантажте файли .tldr"
-  },
   "c2276c9127": {
     "translation": "Докладніше про те, як поділитися."
   },
+  "c28aed8348": {
+    "translation": "Дозволити використання <cookies>analytics</cookies> для покращення tldraw."
+  },
   "c303bd1095": {
     "translation": "Не вдалося опублікувати файл."
   },
   "c4b39a1cc3": {
     "translation": "Основні файли cookie"
   },
+  "c6155aaecc": {
+    "translation": "Назва групи"
+  },
   "c655b27b1e": {
     "translation": "i18n: Довгий рядок"
   },
   "c6a00f137b": {
     "translation": "Запросити"
   },
+  "c74ea6dbff": {
+    "translation": "Показати менше"
+  },
   "c87aacf567": {
     "translation": "Вийти"
   },
+  "c9cc8cce24": {
+    "translation": "Зберегти"
+  },
   "cceaefbc20": {
     "translation": "Поділіться цим файлом"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Перемкнути бічну панель"
   },
+  "d638a3344b": {
+    "translation": "Перш ніж почати, будь ласка, прийміть наші <tos>умови використання</tos> та <privacy>політику конфіденційності</privacy>."
+  },
   "d721757161": {
     "translation": "Тема"
   },
   "d876a9fe1a": {
     "translation": "Спробуйте ще раз"
   },
+  "d88ad2dc74": {
+    "translation": "Прийняти та продовжити"
+  },
   "d9100f3e10": {
     "translation": "Перейдіть сюди, щоб переглянути вміст"
   },
+  "d9e35d0f55": {
+    "translation": "Ви досягли максимальної кількості груп. Вам потрібно видалити старі групи, перш ніж створювати нові."
+  },
   "dbbebf3c03": {
     "translation": "Тільки запрошені"
   },
+  "dcdaa754fe": {
+    "translation": "Недійсна URL-адреса файлу tldraw"
+  },
   "dfdb78a4e4": {
     "translation": "Прапорці налагодження програми"
   },
+  "e0c88179b3": {
+    "translation": "Запросити учасників"
+  },
+  "e2198d6228": {
+    "translation": "Копіювати посилання-запрошення"
+  },
   "e2ae80a510": {
     "translation": "Юридичний виклад"
   },
+  "e3afed0047": {
+    "translation": "Адміністратор"
+  },
   "e404559826": {
     "translation": "Умови обслуговування"
   },
-  "e78e14c5f1": {
-    "translation": "Прикріпити"
+  "e81c4e4f2b": {
+    "translation": "або"
+  },
+  "ea0626ac5a": {
+    "translation": "НЕБЕЗПЕЧНА ЗОНА"
   },
   "ea4788705e": {
     "translation": "Скасувати"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Ознайомтеся з нашою <a>політикою щодо файлів cookie</a>, щоб дізнатися більше."
   },
+  "ef53538ae4": {
+    "translation": "Члени"
+  },
   "ef7de3f485": {
     "translation": "вибраний"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Налаштування"
   },
+  "f714e36843": {
+    "translation": "Ви впевнені, що хочете вийти з цієї групи?"
+  },
+  "fa2ead697d": {
+    "translation": "Політика конфіденційності"
+  },
   "fb15c53f22": {
     "translation": "Переглядач"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Скопійоване посилання"
   },
+  "ff7a814974": {
+    "translation": "Додати посилання на файл…"
+  },
   "ffcd73e997": {
     "translation": "Імпортувати файл…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/ur.json b/apps/dotcom/client/public/tla/locales/ur.json
index c2e6fe4adfe8..b28fffe89bb8 100644
--- a/apps/dotcom/client/public/tla/locales/ur.json
+++ b/apps/dotcom/client/public/tla/locales/ur.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "اکاؤنٹ"
   },
+  "08d2d725a9": {
+    "translation": "اپنے کام کو بچانے، حقیقی وقت میں تعاون کرنے اور مزید بہت کچھ کرنے کے لیے ایک مفت اکاؤنٹ بنائیں۔"
+  },
   "0b27918290": {
     "translation": "فائل"
   },
   "0b9a4cde72": {
     "translation": "فائل مینو"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw ایک مفت اور فوری ورچوئل وائٹ بورڈ ہے۔"
+  },
   "0d1f2bb523": {
     "translation": "رائے بھیجیں۔"
   },
   "110a4b01be": {
     "translation": "شائع کریں۔"
   },
+  "129b9e34ea": {
+    "translation": "گروپ چھوڑ دیں۔"
+  },
+  "12a6766ba1": {
+    "translation": "فائل کو ان پن کریں۔"
+  },
   "12c8a9838c": {
     "translation": "tldraw SDK آزمائیں۔"
   },
   "13ddd375ad": {
     "translation": "بطور برآمد کریں۔"
   },
+  "146ffe2fd9": {
+    "translation": "مزید دکھائیں"
+  },
+  "14d65465b7": {
+    "translation": "گروپ کو حذف کریں۔"
+  },
   "181b90f889": {
     "translation": "فائل بنائیں"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "یہ کمرہ اپنے سائز کی حد کو پہنچ رہا ہے۔ کچھ مواد کو ہٹانے یا نئی فائل شروع کرنے پر غور کریں۔"
   },
+  "2445e5e347": {
+    "translation": "گروپ بنائیں"
+  },
   "250ddea65c": {
     "translation": "tldraw کے بارے میں"
   },
   "299cb00a7a": {
     "translation": "اپ لوڈ ناکام ہو گیا۔"
   },
+  "2c3ef76333": {
+    "translation": "میری فائلیں۔"
+  },
   "2deec2cb74": {
     "translation": "یہ کمرہ اپنے سائز کی حد کو پہنچ گیا ہے اور تبدیلیاں شاید مزید محفوظ نہ ہوں۔ کچھ مواد ہٹائیں یا نئی فائل شروع کریں۔"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: ہائی لائٹ مسنگ"
   },
+  "32210b37e4": {
+    "translation": "لنک شامل کریں۔"
+  },
   "335defdafe": {
     "translation": "براہ کرم صفحہ کو ریفریش کرنے کی کوشش کریں۔"
   },
   "344a7f427f": {
     "translation": "ایڈیٹر"
   },
+  "3bc7d6ea2f": {
+    "translation": "ای میل کے ساتھ جاری رکھیں"
+  },
   "3bd1b98dbd": {
     "translation": "تبدیلیاں شائع کرنے سے قاصر۔"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "براہ کرم دوبارہ لوڈ کریں۔"
+  "47f493a590": {
+    "translation": "فائل کو پن کریں۔"
   },
-  "764671e008": {
-    "translation": "Discord پر ہمارے ساتھ چیٹ کریں۔"
+  "49049467ff": {
+    "translation": "tldraw فائل کا URL پیسٹ کریں..."
   },
   "4908687e50": {
     "translation": "کیا آپ واقعی اس فائل کو بھولنا چاہتے ہیں؟"
   },
+  "49ee308734": {
+    "translation": "نام"
+  },
   "4d0d3ddec9": {
     "translation": "یہ سائٹ ایپ کو کام کرنے اور تجزیات جمع کرنے کے لیے کوکیز کا استعمال کرتی ہے۔"
   },
   "4d1c8263ba": {
     "translation": "دوبارہ لوڈ کریں۔"
   },
+  "4da5988a2e": {
+    "translation": "گروپ کو حذف کریں…"
+  },
+  "4e6fbf032b": {
+    "translation": "کیا آپ واقعی اس گروپ کو حذف کرنا چاہتے ہیں؟ اس کارروائی کو کالعدم نہیں کیا جا سکتا۔"
+  },
   "50db1b7e1e": {
     "translation": "فائل کی اشاعت ختم کرنے سے قاصر۔"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "رازداری کی پالیسی"
   },
+  "5a86b22fa0": {
+    "translation": "شروع کرنے کے لیے فائلوں کو یہاں گھسیٹیں، <create>ایک فائل بنائیں</create>، یا <invite>کاپی کریں دعوت کا لنک</invite>۔"
+  },
   "5a95a425f7": {
     "translation": "شیئر کریں۔"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "پرانے براؤزر کا پتہ چلا۔ براہ کرم اس ایپ کو استعمال کرنے کے لیے اپنے براؤزر کو اپ ڈیٹ کریں۔"
   },
+  "5c6fe42bc2": {
+    "translation": "اس لنک کو منسوخ کریں اور ایک نیا بنائیں۔"
+  },
   "5d26ae7550": {
     "translation": "ہم آپ کے سائن ان کرنے سے پہلے آپ کے تخلیق کردہ کچھ مواد کو اپ لوڈ کرنے میں ناکام رہے۔"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "پرانا"
   },
+  "639bae9ac6": {
+    "translation": "آپ"
+  },
   "6609dd239e": {
     "translation": "کچھ غلط ہو گیا۔"
   },
   "6637a98151": {
     "translation": "tldraw کا ایک نیا ورژن دستیاب ہے۔ جاری رکھنے کے لیے براہ کرم صفحہ کو دوبارہ لوڈ کریں۔"
   },
+  "68257bb646": {
+    "translation": "آپ کو گروپ <br></br><groupName></groupName> میں مدعو کیا گیا ہے۔"
+  },
+  "6832ac5936": {
+    "translation": "اپنا ای میل ایڈریس درج کریں۔"
+  },
   "6a26f54883": {
     "translation": "مدد"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "مواد کو دستی طور پر درآمد کرنے کے لیے ان اقدامات پر عمل کریں:"
   },
+  "70222abcfc": {
+    "translation": "گروپ کی ترتیبات"
+  },
   "70a6facb9d": {
     "translation": "اس ہفتے"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "کوکیز کا نظم کریں۔"
   },
+  "7697920637": {
+    "translation": "براہ کرم دوبارہ لوڈ کریں۔"
+  },
+  "764671e008": {
+    "translation": "Discord پر ہمارے ساتھ چیٹ کریں۔"
+  },
   "777f9e90cf": {
     "translation": "غلط درخواست۔"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "بھول جاؤ"
   },
+  "7cfe6c43dc": {
+    "translation": "گروپ چھوڑیں…"
+  },
   "7daeced9ff": {
     "translation": "تبدیلیاں شائع کریں۔"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "فائل کا نام تبدیل کریں۔"
   },
+  "8ad4303b83": {
+    "translation": "نہیں شکریہ"
+  },
   "8b1946f965": {
     "translation": "ترمیم جاری رکھنے کے لیے براہ کرم کمرے کو اپنی فائلوں میں کاپی کریں۔"
   },
+  "8c2d3d730c": {
+    "translation": "تصدیقی کوڈ کے لیے اپنا ای میل چیک کریں۔"
+  },
   "8eb2c00e96": {
     "translation": "آپ کے ساتھ اشتراک کیا"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "میری فائلوں میں کاپی کریں۔"
   },
+  "930390d222": {
+    "translation": "دعوت کا لنک کاپی کر دیا گیا۔"
+  },
+  "95aacd4d4a": {
+    "translation": "گوگل کے ساتھ سائن ان کریں۔"
+  },
+  "95d2109dc8": {
+    "translation": "tldraw SDK کے ساتھ بنائیں"
+  },
   "96165d6df5": {
     "translation": "اس مہینے"
   },
+  "985a4b720f": {
+    "translation": "استعمال کی شرائط"
+  },
+  "98c997a27e": {
+    "translation": "فائل کا لنک شامل کریں۔"
+  },
   "9914a0ce04": {
     "translation": "روشنی"
   },
+  "9b33f5c63c": {
+    "translation": "کوڈ موصول نہیں ہوا؟ <resend>دوبارہ بھیجیں</resend>۔"
+  },
   "9bef626805": {
     "translation": "فائل کو حذف کریں۔"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "پس منظر"
   },
+  "aa916767cf": {
+    "translation": "دعوت قبول کرنے کے لیے سائن ان کریں۔"
+  },
   "ab0df9ba36": {
     "translation": "فائل کی حد تک پہنچ گئی۔"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "مہمان صارف"
   },
+  "b357b524e7": {
+    "translation": "ای میل ایڈریس"
+  },
+  "b3d2db69fe": {
+    "translation": "فائل URL"
+  },
   "b6d4223e60": {
     "translation": "سائن ان کریں۔"
   },
+  "b6f4a2ec63": {
+    "translation": "مالک"
+  },
   "b758336699": {
     "translation": "لنک کاپی کریں۔"
   },
   "ba0318cb81": {
     "translation": "اشتراک کرنے کے لیے سائن ان کریں۔"
   },
-  "bb792693e2": {
-    "translation": "پن کھول دیں۔"
+  "bb93a7590f": {
+    "translation": "قبول کریں اور گروپ میں شامل ہوں۔"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, one {tldr فائل اپ لوڈ ہو رہی ہے…} other {tldr {total} فائلوں میں سے {uploaded} اپ لوڈ ہو رہی ہے…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "اشتراک کردہ بذریعہ {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "tldr فائلیں اپ لوڈ کریں۔"
-  },
   "c2276c9127": {
     "translation": "اشتراک کے بارے میں مزید جانیں۔"
   },
+  "c28aed8348": {
+    "translation": "tldraw کو بہتر بنانے میں ہماری مدد کرنے کے لیے <cookies>analytics</cookies> کو اجازت دیں۔"
+  },
   "c303bd1095": {
     "translation": "فائل شائع کرنے سے قاصر۔"
   },
   "c4b39a1cc3": {
     "translation": "ضروری کوکیز"
   },
+  "c6155aaecc": {
+    "translation": "گروپ کا نام"
+  },
   "c655b27b1e": {
     "translation": "i18n: لمبی تار"
   },
   "c6a00f137b": {
     "translation": "دعوت دیں۔"
   },
+  "c74ea6dbff": {
+    "translation": "کم دکھائیں۔"
+  },
   "c87aacf567": {
     "translation": "سائن آؤٹ کریں۔"
   },
+  "c9cc8cce24": {
+    "translation": "محفوظ کریں۔"
+  },
   "cceaefbc20": {
     "translation": "اس فائل کو شیئر کریں۔"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "سائڈبار کو ٹوگل کریں۔"
   },
+  "d638a3344b": {
+    "translation": "شروع کرنے سے پہلے، براہ کرم ہماری <tos>استعمال کی شرائط</tos> اور <privacy>رازداری کی پالیسی</privacy> کو قبول کریں۔"
+  },
   "d721757161": {
     "translation": "تھیم"
   },
   "d876a9fe1a": {
     "translation": "دوبارہ کوشش کریں۔"
   },
+  "d88ad2dc74": {
+    "translation": "قبول کریں اور جاری رکھیں"
+  },
   "d9100f3e10": {
     "translation": "مواد دیکھنے کے لیے یہاں جائیں۔"
   },
+  "d9e35d0f55": {
+    "translation": "آپ گروپس کی زیادہ سے زیادہ تعداد تک پہنچ گئے ہیں۔ نئے بنانے سے پہلے آپ کو پرانے گروپس کو حذف کرنے کی ضرورت ہے۔"
+  },
   "dbbebf3c03": {
     "translation": "صرف دعوت دیں۔"
   },
+  "dcdaa754fe": {
+    "translation": "غلط tldraw فائل کا URL"
+  },
   "dfdb78a4e4": {
     "translation": "ایپ ڈیبگ جھنڈے"
   },
+  "e0c88179b3": {
+    "translation": "ممبران کو مدعو کریں۔"
+  },
+  "e2198d6228": {
+    "translation": "دعوت کا لنک کاپی کریں۔"
+  },
   "e2ae80a510": {
     "translation": "قانونی خلاصہ"
   },
+  "e3afed0047": {
+    "translation": "ایڈمن"
+  },
   "e404559826": {
     "translation": "سروس کی شرائط"
   },
-  "e78e14c5f1": {
-    "translation": "پن"
+  "e81c4e4f2b": {
+    "translation": "یا"
+  },
+  "ea0626ac5a": {
+    "translation": "خطرہ زون"
   },
   "ea4788705e": {
     "translation": "منسوخ کریں۔"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "مزید جاننے کے لیے ہماری <a>کوکی پالیسی</a> پڑھیں۔"
   },
+  "ef53538ae4": {
+    "translation": "ممبران"
+  },
   "ef7de3f485": {
     "translation": "منتخب"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "ترتیبات"
   },
+  "f714e36843": {
+    "translation": "کیا آپ واقعی اس گروپ کو چھوڑنا چاہتے ہیں؟"
+  },
+  "fa2ead697d": {
+    "translation": "رازداری کی پالیسی"
+  },
   "fb15c53f22": {
     "translation": "دیکھنے والا"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "کاپی شدہ لنک"
   },
+  "ff7a814974": {
+    "translation": "فائل کا لنک شامل کریں…"
+  },
   "ffcd73e997": {
     "translation": "فائل درآمد کریں…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/vi.json b/apps/dotcom/client/public/tla/locales/vi.json
index 20de7f575675..6b8beb3136bd 100644
--- a/apps/dotcom/client/public/tla/locales/vi.json
+++ b/apps/dotcom/client/public/tla/locales/vi.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "Tài khoản"
   },
+  "08d2d725a9": {
+    "translation": "Tạo một tài khoản miễn phí để lưu công việc, cộng tác theo thời gian thực và nhiều chức năng khác."
+  },
   "0b27918290": {
     "translation": "Tệp"
   },
   "0b9a4cde72": {
     "translation": "Menu tệp"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw là bảng trắng ảo miễn phí và tức thì."
+  },
   "0d1f2bb523": {
     "translation": "Gửi phản hồi"
   },
   "110a4b01be": {
     "translation": "Xuất bản"
   },
+  "129b9e34ea": {
+    "translation": "Rời khỏi nhóm"
+  },
+  "12a6766ba1": {
+    "translation": "Bỏ ghim tệp"
+  },
   "12c8a9838c": {
     "translation": "Hãy thử SDK tldraw"
   },
   "13ddd375ad": {
     "translation": "Xuất dưới dạng"
   },
+  "146ffe2fd9": {
+    "translation": "Hiển thị thêm"
+  },
+  "14d65465b7": {
+    "translation": "Xóa nhóm"
+  },
   "181b90f889": {
     "translation": "Tạo tệp"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "Phòng này sắp đạt đến giới hạn kích thước. Hãy cân nhắc xóa bớt nội dung hoặc tạo một tệp mới."
   },
+  "2445e5e347": {
+    "translation": "Tạo nhóm"
+  },
   "250ddea65c": {
     "translation": "Giới thiệu về tldraw"
   },
   "299cb00a7a": {
     "translation": "Tải lên thất bại"
   },
+  "2c3ef76333": {
+    "translation": "Các tập tin của tôi"
+  },
   "2deec2cb74": {
     "translation": "Phòng này đã đạt đến giới hạn kích thước và các thay đổi có thể không còn được lưu nữa. Hãy xóa bớt nội dung hoặc tạo một tệp mới."
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n: Thiếu đánh dấu"
   },
+  "32210b37e4": {
+    "translation": "Thêm liên kết"
+  },
   "335defdafe": {
     "translation": "Vui lòng thử tải lại trang."
   },
   "344a7f427f": {
     "translation": "Biên tập viên"
   },
+  "3bc7d6ea2f": {
+    "translation": "Tiếp tục với email"
+  },
   "3bd1b98dbd": {
     "translation": "Không thể xuất bản các thay đổi này."
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "Vui lòng tải lại"
+  "47f493a590": {
+    "translation": "Tệp ghim"
   },
-  "764671e008": {
-    "translation": "Trò chuyện với chúng tôi trên Discord"
+  "49049467ff": {
+    "translation": "Dán URL tệp tldraw..."
   },
   "4908687e50": {
     "translation": "Bạn có chắc chắn muốn quên tệp này không?"
   },
+  "49ee308734": {
+    "translation": "Tên"
+  },
   "4d0d3ddec9": {
     "translation": "Trang web này sử dụng cookie để ứng dụng hoạt động và thu thập số liệu phân tích."
   },
   "4d1c8263ba": {
     "translation": "Tải lại"
   },
+  "4da5988a2e": {
+    "translation": "Xóa nhóm…"
+  },
+  "4e6fbf032b": {
+    "translation": "Bạn có chắc chắn muốn xóa nhóm này không? Thao tác này không thể hoàn tác."
+  },
   "50db1b7e1e": {
     "translation": "Không thể hủy xuất bản tệp này."
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "Chính sách bảo mật"
   },
+  "5a86b22fa0": {
+    "translation": "Kéo tệp vào đây, <create>tạo tệp</create> hoặc <invite>sao chép liên kết mời</invite> để bắt đầu."
+  },
   "5a95a425f7": {
     "translation": "Chia sẻ"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "Đã phát hiện trình duyệt cũ. Vui lòng cập nhật trình duyệt của bạn để sử dụng ứng dụng này."
   },
+  "5c6fe42bc2": {
+    "translation": "Thu hồi liên kết này và tạo liên kết mới."
+  },
   "5d26ae7550": {
     "translation": "Chúng tôi không tải lên được một số nội dung bạn đã tạo trước khi bạn đăng nhập."
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "Cũ hơn"
   },
+  "639bae9ac6": {
+    "translation": "Bạn"
+  },
   "6609dd239e": {
     "translation": "Đã xảy ra lỗi"
   },
   "6637a98151": {
     "translation": "Phiên bản mới của tldraw đã có sẵn. Vui lòng tải lại trang để tiếp tục."
   },
+  "68257bb646": {
+    "translation": "Bạn đã được mời vào nhóm <br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "Nhập địa chỉ email của bạn"
+  },
   "6a26f54883": {
     "translation": "Trợ giúp"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "Làm theo các bước sau để nhập nội dung theo cách thủ công:"
   },
+  "70222abcfc": {
+    "translation": "Cài đặt nhóm"
+  },
   "70a6facb9d": {
     "translation": "Tuần này"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "Quản lý cookie"
   },
+  "7697920637": {
+    "translation": "Vui lòng tải lại"
+  },
+  "764671e008": {
+    "translation": "Trò chuyện với chúng tôi trên Discord"
+  },
   "777f9e90cf": {
     "translation": "Yêu cầu không hợp lệ."
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "Quên"
   },
+  "7cfe6c43dc": {
+    "translation": "Rời khỏi nhóm…"
+  },
   "7daeced9ff": {
     "translation": "Xuất bản các thay đổi"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "Đổi tên tập tin"
   },
+  "8ad4303b83": {
+    "translation": "Không, cảm ơn"
+  },
   "8b1946f965": {
     "translation": "Để tiếp tục chỉnh sửa, vui lòng sao chép phòng vào tệp của bạn."
   },
+  "8c2d3d730c": {
+    "translation": "Kiểm tra email của bạn để lấy mã xác minh."
+  },
   "8eb2c00e96": {
     "translation": "Chia sẻ với bạn"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "Sao chép vào tệp của tôi"
   },
+  "930390d222": {
+    "translation": "Đã sao chép liên kết mời"
+  },
+  "95aacd4d4a": {
+    "translation": "Đăng nhập bằng Google"
+  },
+  "95d2109dc8": {
+    "translation": "Xây dựng với SDK tldraw"
+  },
   "96165d6df5": {
     "translation": "Tháng này"
   },
+  "985a4b720f": {
+    "translation": "Điều khoản sử dụng"
+  },
+  "98c997a27e": {
+    "translation": "Thêm liên kết tệp"
+  },
   "9914a0ce04": {
     "translation": "Sáng"
   },
+  "9b33f5c63c": {
+    "translation": "Không nhận được mã? <resend>Gửi lại</resend>."
+  },
   "9bef626805": {
     "translation": "Xóa tệp"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "Cơ sở"
   },
+  "aa916767cf": {
+    "translation": "Đăng nhập để chấp nhận lời mời"
+  },
   "ab0df9ba36": {
     "translation": "Đã đạt đến giới hạn tập tin"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "Người dùng khách"
   },
+  "b357b524e7": {
+    "translation": "Địa chỉ email"
+  },
+  "b3d2db69fe": {
+    "translation": "URL tệp"
+  },
   "b6d4223e60": {
     "translation": "Đăng nhập"
   },
+  "b6f4a2ec63": {
+    "translation": "Người sở hữu"
+  },
   "b758336699": {
     "translation": "Sao chép liên kết"
   },
   "ba0318cb81": {
     "translation": "Đăng nhập để chia sẻ"
   },
-  "bb792693e2": {
-    "translation": "Bỏ ghim"
+  "bb93a7590f": {
+    "translation": "Chấp nhận và tham gia nhóm"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {Đang tải lên {uploaded} trong tổng số {total} tệp .tldr…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "Chia sẻ bởi {ownerName}"
   },
-  "bcb62136a3": {
-    "translation": "Tải lên các tệp .tldr."
-  },
   "c2276c9127": {
     "translation": "Tìm hiểu thêm về chia sẻ."
   },
+  "c28aed8348": {
+    "translation": "Cho phép <cookies>analytics</cookies> giúp chúng tôi cải thiện tldraw."
+  },
   "c303bd1095": {
     "translation": "Không thể xuất bản tệp này."
   },
   "c4b39a1cc3": {
     "translation": "Cookie thiết yếu"
   },
+  "c6155aaecc": {
+    "translation": "Tên nhóm"
+  },
   "c655b27b1e": {
     "translation": "i18n: Chuỗi dài"
   },
   "c6a00f137b": {
     "translation": "Mời"
   },
+  "c74ea6dbff": {
+    "translation": "Hiển thị ít hơn"
+  },
   "c87aacf567": {
     "translation": "Đăng xuất"
   },
+  "c9cc8cce24": {
+    "translation": "Cứu"
+  },
   "cceaefbc20": {
     "translation": "Chia sẻ tệp này"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "Chuyển đổi thanh bên"
   },
+  "d638a3344b": {
+    "translation": "Trước khi bắt đầu, vui lòng chấp nhận <tos>điều khoản sử dụng</tos> và <privacy>chính sách bảo mật</privacy> của chúng tôi."
+  },
   "d721757161": {
     "translation": "Chủ đề"
   },
   "d876a9fe1a": {
     "translation": "Thử lại"
   },
+  "d88ad2dc74": {
+    "translation": "Chấp nhận và tiếp tục"
+  },
   "d9100f3e10": {
     "translation": "Vào đây để xem nội dung"
   },
+  "d9e35d0f55": {
+    "translation": "Bạn đã đạt đến số lượng nhóm tối đa. Bạn cần xóa nhóm cũ trước khi tạo nhóm mới."
+  },
   "dbbebf3c03": {
     "translation": "Chỉ mời"
   },
+  "dcdaa754fe": {
+    "translation": "URL tệp tldraw không hợp lệ"
+  },
   "dfdb78a4e4": {
     "translation": "Cờ gỡ lỗi ứng dụng"
   },
+  "e0c88179b3": {
+    "translation": "Mời thành viên"
+  },
+  "e2198d6228": {
+    "translation": "Sao chép liên kết mời"
+  },
   "e2ae80a510": {
     "translation": "Tóm tắt pháp lý"
   },
+  "e3afed0047": {
+    "translation": "Quản trị viên"
+  },
   "e404559826": {
     "translation": "Điều khoản dịch vụ"
   },
-  "e78e14c5f1": {
-    "translation": "Ghim"
+  "e81c4e4f2b": {
+    "translation": "hoặc"
+  },
+  "ea0626ac5a": {
+    "translation": "Khu vực nguy hiểm"
   },
   "ea4788705e": {
     "translation": "Hủy"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "Đọc <a>chính sách cookie</a> của chúng tôi để tìm hiểu thêm."
   },
+  "ef53538ae4": {
+    "translation": "Thành viên"
+  },
   "ef7de3f485": {
     "translation": "đã chọn"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "Cài đặt"
   },
+  "f714e36843": {
+    "translation": "Bạn có chắc chắn muốn rời khỏi nhóm này không?"
+  },
+  "fa2ead697d": {
+    "translation": "Chính sách bảo mật"
+  },
   "fb15c53f22": {
     "translation": "Người xem"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "Đã sao chép liên kết"
   },
+  "ff7a814974": {
+    "translation": "Thêm liên kết tệp…"
+  },
   "ffcd73e997": {
     "translation": "Nhập tập tin…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/zh-cn.json b/apps/dotcom/client/public/tla/locales/zh-cn.json
index 981be29a3bd8..e2b6fcffa2d2 100644
--- a/apps/dotcom/client/public/tla/locales/zh-cn.json
+++ b/apps/dotcom/client/public/tla/locales/zh-cn.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "帐户"
   },
+  "08d2d725a9": {
+    "translation": "创建免费帐户，即可保存您的作品、实时协作等等。"
+  },
   "0b27918290": {
     "translation": "文件"
   },
   "0b9a4cde72": {
     "translation": "文件菜单"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw 是一款免费且即时可用的虚拟白板。"
+  },
   "0d1f2bb523": {
     "translation": "发送反馈"
   },
   "110a4b01be": {
     "translation": "发布"
   },
+  "129b9e34ea": {
+    "translation": "离开群组"
+  },
+  "12a6766ba1": {
+    "translation": "解压文件"
+  },
   "12c8a9838c": {
     "translation": "尝试 tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "导出为"
   },
+  "146ffe2fd9": {
+    "translation": "显示更多"
+  },
+  "14d65465b7": {
+    "translation": "删除组"
+  },
   "181b90f889": {
     "translation": "创建文件"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "此房间已接近其大小限制。请考虑删除一些内容或创建新文件。"
   },
+  "2445e5e347": {
+    "translation": "创建组"
+  },
   "250ddea65c": {
     "translation": "关于tldraw"
   },
   "299cb00a7a": {
     "translation": "上传失败"
   },
+  "2c3ef76333": {
+    "translation": "我的文件"
+  },
   "2deec2cb74": {
     "translation": "此房间已达到其大小限制，更改可能无法再保存。请删除部分内容或创建新文件。"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "国际化：高亮缺失部分"
   },
+  "32210b37e4": {
+    "translation": "添加链接"
+  },
   "335defdafe": {
     "translation": "请尝试刷新页面。"
   },
   "344a7f427f": {
     "translation": "编辑器"
   },
+  "3bc7d6ea2f": {
+    "translation": "继续通过电子邮件"
+  },
   "3bd1b98dbd": {
     "translation": "无法发布更改。"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "请重新加载"
+  "47f493a590": {
+    "translation": "针文件"
   },
-  "764671e008": {
-    "translation": "在 Discord 上与我们聊天"
+  "49049467ff": {
+    "translation": "粘贴tldraw文件URL..."
   },
   "4908687e50": {
     "translation": "确定要忘记该文件吗？"
   },
+  "49ee308734": {
+    "translation": "姓名"
+  },
   "4d0d3ddec9": {
     "translation": "本网站使用 cookies 来使应用程序运行并收集分析数据。"
   },
   "4d1c8263ba": {
     "translation": "重新加载"
   },
+  "4da5988a2e": {
+    "translation": "删除群组…"
+  },
+  "4e6fbf032b": {
+    "translation": "您确定要删除此群组吗？此操作无法撤销。"
+  },
   "50db1b7e1e": {
     "translation": "无法取消发布文件。"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "隐私政策"
   },
+  "5a86b22fa0": {
+    "translation": "将文件拖到这里，<create>创建文件</create>，或<invite>复制邀请链接</invite>即可开始。"
+  },
   "5a95a425f7": {
     "translation": "分享"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "检测到旧版浏览器。请更新您的浏览器以使用此应用。"
   },
+  "5c6fe42bc2": {
+    "translation": "撤销此链接并创建一个新链接。"
+  },
   "5d26ae7550": {
     "translation": "在您登录前创建的部分内容未能成功上传。"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "较旧"
   },
+  "639bae9ac6": {
+    "translation": "你"
+  },
   "6609dd239e": {
     "translation": "出了问题"
   },
   "6637a98151": {
     "translation": "tldraw 有新版本可用。请重新加载页面以继续。"
   },
+  "68257bb646": {
+    "translation": "您已被邀请加入群组<br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "请输入您的电子邮件地址"
+  },
   "6a26f54883": {
     "translation": "帮助"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "要手动导入内容，请参阅以下步骤："
   },
+  "70222abcfc": {
+    "translation": "群组设置"
+  },
   "70a6facb9d": {
     "translation": "本周"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "管理 Cookie"
   },
+  "7697920637": {
+    "translation": "请重新加载"
+  },
+  "764671e008": {
+    "translation": "在 Discord 上与我们聊天"
+  },
   "777f9e90cf": {
     "translation": "无效请求。"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "忘记"
   },
+  "7cfe6c43dc": {
+    "translation": "离开群组…"
+  },
   "7daeced9ff": {
     "translation": "发布更改"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "重命名文件"
   },
+  "8ad4303b83": {
+    "translation": "不，谢谢"
+  },
   "8b1946f965": {
     "translation": "要继续编辑，请将房间复制到您的文件中。"
   },
+  "8c2d3d730c": {
+    "translation": "请查看您的电子邮件，您会收到验证码。"
+  },
   "8eb2c00e96": {
     "translation": "与您分享"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "复制到我的文件"
   },
+  "930390d222": {
+    "translation": "复制的邀请链接"
+  },
+  "95aacd4d4a": {
+    "translation": "使用 Google 登录"
+  },
+  "95d2109dc8": {
+    "translation": "使用 tldraw SDK 构建"
+  },
   "96165d6df5": {
     "translation": "本月"
   },
+  "985a4b720f": {
+    "translation": "使用条款"
+  },
+  "98c997a27e": {
+    "translation": "添加文件链接"
+  },
   "9914a0ce04": {
     "translation": "浅色"
   },
+  "9b33f5c63c": {
+    "translation": "没有收到验证码？<resend>重新发送</resend>。"
+  },
   "9bef626805": {
     "translation": "删除文件"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "背景"
   },
+  "aa916767cf": {
+    "translation": "登录以接受邀请"
+  },
   "ab0df9ba36": {
     "translation": "已达到文件限制"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "来宾用户"
   },
+  "b357b524e7": {
+    "translation": "电子邮件"
+  },
+  "b3d2db69fe": {
+    "translation": "文件 URL"
+  },
   "b6d4223e60": {
     "translation": "登录"
   },
+  "b6f4a2ec63": {
+    "translation": "所有者"
+  },
   "b758336699": {
     "translation": "复制链接"
   },
   "ba0318cb81": {
     "translation": "登录以分享"
   },
-  "bb792693e2": {
-    "translation": "取消固定"
+  "bb93a7590f": {
+    "translation": "接受并加入群组"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {正在上传 {uploaded} 个 .tldr 文件（共 {total} 个）…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "由{ownerName}分享"
   },
-  "bcb62136a3": {
-    "translation": "上传.tldr文件"
-  },
   "c2276c9127": {
     "translation": "详细了解分享。"
   },
+  "c28aed8348": {
+    "translation": "允许使用 <cookies>analytics</cookies> 来帮助我们改进 tldraw。"
+  },
   "c303bd1095": {
     "translation": "无法发布文件。"
   },
   "c4b39a1cc3": {
     "translation": "必需 Cookie"
   },
+  "c6155aaecc": {
+    "translation": "组名"
+  },
   "c655b27b1e": {
     "translation": "i18n：长字符串"
   },
   "c6a00f137b": {
     "translation": "邀请"
   },
+  "c74ea6dbff": {
+    "translation": "显示更少"
+  },
   "c87aacf567": {
     "translation": "退出登录"
   },
+  "c9cc8cce24": {
+    "translation": "节省"
+  },
   "cceaefbc20": {
     "translation": "分享此文件"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "切换侧边栏"
   },
+  "d638a3344b": {
+    "translation": "开始之前，请接受我们的<tos>使用条款</tos>和<privacy>隐私政策</privacy>。"
+  },
   "d721757161": {
     "translation": "主题"
   },
   "d876a9fe1a": {
     "translation": "重试"
   },
+  "d88ad2dc74": {
+    "translation": "接受并继续"
+  },
   "d9100f3e10": {
     "translation": "在这里查看内容"
   },
+  "d9e35d0f55": {
+    "translation": "您已达到群组数量上限。创建新群组前，您需要先删除旧群组。"
+  },
   "dbbebf3c03": {
     "translation": "仅邀请"
   },
+  "dcdaa754fe": {
+    "translation": "无效的tldraw文件URL"
+  },
   "dfdb78a4e4": {
     "translation": "App调试标记"
   },
+  "e0c88179b3": {
+    "translation": "邀请成员"
+  },
+  "e2198d6228": {
+    "translation": "复制邀请链接"
+  },
   "e2ae80a510": {
     "translation": "法律摘要"
   },
+  "e3afed0047": {
+    "translation": "行政"
+  },
   "e404559826": {
     "translation": "服务条款"
   },
-  "e78e14c5f1": {
-    "translation": "固定"
+  "e81c4e4f2b": {
+    "translation": "或者"
+  },
+  "ea0626ac5a": {
+    "translation": "危险区域"
   },
   "ea4788705e": {
     "translation": "取消"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "请阅读我们的<a>cookie 政策</a>以了解更多信息。"
   },
+  "ef53538ae4": {
+    "translation": "成员"
+  },
   "ef7de3f485": {
     "translation": "已选择"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "设置"
   },
+  "f714e36843": {
+    "translation": "你确定要退出这个群组吗？"
+  },
+  "fa2ead697d": {
+    "translation": "隐私政策"
+  },
   "fb15c53f22": {
     "translation": "查看者"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "链接已复制"
   },
+  "ff7a814974": {
+    "translation": "添加文件链接…"
+  },
   "ffcd73e997": {
     "translation": "导入文件…"
   }
diff --git a/apps/dotcom/client/public/tla/locales/zh-tw.json b/apps/dotcom/client/public/tla/locales/zh-tw.json
index d49a5d04a43f..d32bf1259a88 100644
--- a/apps/dotcom/client/public/tla/locales/zh-tw.json
+++ b/apps/dotcom/client/public/tla/locales/zh-tw.json
@@ -23,24 +23,42 @@
   "08bd40c754": {
     "translation": "帳戶"
   },
+  "08d2d725a9": {
+    "translation": "建立免費帳戶，即可保存您的作品、即時協作等等。"
+  },
   "0b27918290": {
     "translation": "檔案"
   },
   "0b9a4cde72": {
     "translation": "檔案選單"
   },
+  "0beb3ca97b": {
+    "translation": "tldraw 是一款免費且即時可用的虛擬白板。"
+  },
   "0d1f2bb523": {
     "translation": "傳送回饋"
   },
   "110a4b01be": {
     "translation": "發布"
   },
+  "129b9e34ea": {
+    "translation": "離開群組"
+  },
+  "12a6766ba1": {
+    "translation": "解壓縮文件"
+  },
   "12c8a9838c": {
     "translation": "嘗試 tldraw SDK"
   },
   "13ddd375ad": {
     "translation": "匯出為"
   },
+  "146ffe2fd9": {
+    "translation": "顯示更多"
+  },
+  "14d65465b7": {
+    "translation": "刪除群組"
+  },
   "181b90f889": {
     "translation": "建立檔案"
   },
@@ -56,12 +74,18 @@
   "21bfb2dc2e": {
     "translation": "此房間已接近其大小限制。請考慮刪除一些內容或建立新檔案。"
   },
+  "2445e5e347": {
+    "translation": "建立群組"
+  },
   "250ddea65c": {
     "translation": "關於tldraw"
   },
   "299cb00a7a": {
     "translation": "上傳失敗"
   },
+  "2c3ef76333": {
+    "translation": "我的文件"
+  },
   "2deec2cb74": {
     "translation": "此房間已達到其大小限制，更改可能無法再儲存。請刪除部分內容或建立新檔案。"
   },
@@ -71,12 +95,18 @@
   "31418ce4ad": {
     "translation": "i18n：醒目顯示遺失"
   },
+  "32210b37e4": {
+    "translation": "添加連結"
+  },
   "335defdafe": {
     "translation": "請嘗試重新整理頁面。"
   },
   "344a7f427f": {
     "translation": "編輯器"
   },
+  "3bc7d6ea2f": {
+    "translation": "繼續透過電子郵件"
+  },
   "3bd1b98dbd": {
     "translation": "無法發布變更內容。"
   },
@@ -98,21 +128,30 @@
   "47839e47a5": {
     "translation": "tldraw"
   },
-  "7697920637": {
-    "translation": "請重新加載"
+  "47f493a590": {
+    "translation": "針文件"
   },
-  "764671e008": {
-    "translation": "在 Discord 上與我們聊天"
+  "49049467ff": {
+    "translation": "貼上tldraw文件URL..."
   },
   "4908687e50": {
     "translation": "您確定要遺忘此檔案嗎？"
   },
+  "49ee308734": {
+    "translation": "姓名"
+  },
   "4d0d3ddec9": {
     "translation": "本網站使用 cookies 來使應用程式運作並收集分析資料。"
   },
   "4d1c8263ba": {
     "translation": "重新載入"
   },
+  "4da5988a2e": {
+    "translation": "刪除群組…"
+  },
+  "4e6fbf032b": {
+    "translation": "您確定要刪除此群組嗎？此操作無法撤銷。"
+  },
   "50db1b7e1e": {
     "translation": "無法取消發布檔案。"
   },
@@ -137,6 +176,9 @@
   "56c34c6410": {
     "translation": "隱私權政策"
   },
+  "5a86b22fa0": {
+    "translation": "將檔案拖曳到這裡，<create>建立檔案</create>，或<invite>複製邀請連結</invite>即可開始。"
+  },
   "5a95a425f7": {
     "translation": "共享"
   },
@@ -149,6 +191,9 @@
   "5bec508475": {
     "translation": "偵測到舊版瀏覽器。請更新您的瀏覽器以使用此應用程式。"
   },
+  "5c6fe42bc2": {
+    "translation": "撤銷此連結並建立新連結。"
+  },
   "5d26ae7550": {
     "translation": "我們無法上傳您登入之前所建立的部分內容。"
   },
@@ -164,12 +209,21 @@
   "625fd29749": {
     "translation": "較舊的"
   },
+  "639bae9ac6": {
+    "translation": "你"
+  },
   "6609dd239e": {
     "translation": "出了點問題"
   },
   "6637a98151": {
     "translation": "tldraw 有新版本可用。請重新加載頁面以繼續。"
   },
+  "68257bb646": {
+    "translation": "您已被邀請加入群組<br></br><groupName></groupName>"
+  },
+  "6832ac5936": {
+    "translation": "請輸入您的電子郵件地址"
+  },
   "6a26f54883": {
     "translation": "幫助"
   },
@@ -179,6 +233,9 @@
   "6dfc62f621": {
     "translation": "按照以下步驟手動匯入內容："
   },
+  "70222abcfc": {
+    "translation": "群組設定"
+  },
   "70a6facb9d": {
     "translation": "本週"
   },
@@ -200,6 +257,12 @@
   "761e93ede9": {
     "translation": "管理cookies"
   },
+  "7697920637": {
+    "translation": "請重新加載"
+  },
+  "764671e008": {
+    "translation": "在 Discord 上與我們聊天"
+  },
   "777f9e90cf": {
     "translation": "無效的請求。"
   },
@@ -218,6 +281,9 @@
   "7cb5f8b4a5": {
     "translation": "遺忘"
   },
+  "7cfe6c43dc": {
+    "translation": "離開群組…"
+  },
   "7daeced9ff": {
     "translation": "發布變更內容"
   },
@@ -239,9 +305,15 @@
   "86c66437fd": {
     "translation": "重新命名文件"
   },
+  "8ad4303b83": {
+    "translation": "不，謝謝"
+  },
   "8b1946f965": {
     "translation": "若要繼續編輯，請將房間複製到您的文件中。"
   },
+  "8c2d3d730c": {
+    "translation": "請查看您的電子郵件，您會收到驗證碼。"
+  },
   "8eb2c00e96": {
     "translation": "已與您共享"
   },
@@ -257,12 +329,30 @@
   "91e49bb0eb": {
     "translation": "複製到我的檔案"
   },
+  "930390d222": {
+    "translation": "複製的邀請連結"
+  },
+  "95aacd4d4a": {
+    "translation": "使用 Google 登入"
+  },
+  "95d2109dc8": {
+    "translation": "使用 tldraw SDK 構建"
+  },
   "96165d6df5": {
     "translation": "本月"
   },
+  "985a4b720f": {
+    "translation": "使用條款"
+  },
+  "98c997a27e": {
+    "translation": "添加文件連結"
+  },
   "9914a0ce04": {
     "translation": "淺色"
   },
+  "9b33f5c63c": {
+    "translation": "沒有收到驗證碼？ <resend>重新傳送</resend>。"
+  },
   "9bef626805": {
     "translation": "刪除檔案"
   },
@@ -308,6 +398,9 @@
   "a9ded1e5ce": {
     "translation": "背景"
   },
+  "aa916767cf": {
+    "translation": "登入以接受邀請"
+  },
   "ab0df9ba36": {
     "translation": "已達到文件限制"
   },
@@ -318,17 +411,26 @@
   "b028909917": {
     "translation": "來賓用戶"
   },
+  "b357b524e7": {
+    "translation": "電子郵件"
+  },
+  "b3d2db69fe": {
+    "translation": "文件 URL"
+  },
   "b6d4223e60": {
     "translation": "登入"
   },
+  "b6f4a2ec63": {
+    "translation": "擁有者"
+  },
   "b758336699": {
     "translation": "複製連結"
   },
   "ba0318cb81": {
     "translation": "登入以分享"
   },
-  "bb792693e2": {
-    "translation": "取消置頂"
+  "bb93a7590f": {
+    "translation": "接受並加入群組"
   },
   "bbbcefd7ce": {
     "translation": "{total, plural, other {正在上傳 {uploaded} 個 .tldr 檔案（共 {total} 個）…}}"
@@ -336,27 +438,36 @@
   "bc88b0e89e": {
     "translation": "由 {ownerName} 共享"
   },
-  "bcb62136a3": {
-    "translation": "上傳 .tldr 檔"
-  },
   "c2276c9127": {
     "translation": "瞭解有關共享的更多資訊。"
   },
+  "c28aed8348": {
+    "translation": "允許使用 <cookies>analytics</cookies> 來幫助我們改進 tldraw。"
+  },
   "c303bd1095": {
     "translation": "無法發布此檔案。"
   },
   "c4b39a1cc3": {
     "translation": "必備 Cookie"
   },
+  "c6155aaecc": {
+    "translation": "組名"
+  },
   "c655b27b1e": {
     "translation": "i18n：長字串"
   },
   "c6a00f137b": {
     "translation": "邀請"
   },
+  "c74ea6dbff": {
+    "translation": "顯示更少"
+  },
   "c87aacf567": {
     "translation": "登出"
   },
+  "c9cc8cce24": {
+    "translation": "節省"
+  },
   "cceaefbc20": {
     "translation": "共享此檔案"
   },
@@ -372,29 +483,53 @@
   "d4bbf74f3e": {
     "translation": "切換側邊欄"
   },
+  "d638a3344b": {
+    "translation": "在開始之前，請接受我們的<tos>使用條款</tos>和<privacy>隱私權政策</privacy>。"
+  },
   "d721757161": {
     "translation": "主題"
   },
   "d876a9fe1a": {
     "translation": "重試"
   },
+  "d88ad2dc74": {
+    "translation": "接受並繼續"
+  },
   "d9100f3e10": {
     "translation": "前往此處查看內容"
   },
+  "d9e35d0f55": {
+    "translation": "您已達到群組數量上限。建立新群組前，您需要先刪除舊群組。"
+  },
   "dbbebf3c03": {
     "translation": "限受邀者"
   },
+  "dcdaa754fe": {
+    "translation": "無效的tldraw檔案URL"
+  },
   "dfdb78a4e4": {
     "translation": "應用程式的偵錯旗標"
   },
+  "e0c88179b3": {
+    "translation": "邀請成員"
+  },
+  "e2198d6228": {
+    "translation": "複製邀請連結"
+  },
   "e2ae80a510": {
     "translation": "法律摘要"
   },
+  "e3afed0047": {
+    "translation": "行政"
+  },
   "e404559826": {
     "translation": "服務條款"
   },
-  "e78e14c5f1": {
-    "translation": "置頂"
+  "e81c4e4f2b": {
+    "translation": "或者"
+  },
+  "ea0626ac5a": {
+    "translation": "危險區域"
   },
   "ea4788705e": {
     "translation": "取消"
@@ -417,6 +552,9 @@
   "ede55d955f": {
     "translation": "請閱讀我們的<a>cookie 政策</a>以了解更多資訊。"
   },
+  "ef53538ae4": {
+    "translation": "成員"
+  },
   "ef7de3f485": {
     "translation": "已選擇"
   },
@@ -438,6 +576,12 @@
   "f4f70727dc": {
     "translation": "設定"
   },
+  "f714e36843": {
+    "translation": "你確定要退出這個群組嗎？"
+  },
+  "fa2ead697d": {
+    "translation": "隱私權政策"
+  },
   "fb15c53f22": {
     "translation": "閱覽者"
   },
@@ -447,6 +591,9 @@
   "fed5ec05eb": {
     "translation": "已複製連結"
   },
+  "ff7a814974": {
+    "translation": "新增文件連結…"
+  },
   "ffcd73e997": {
     "translation": "導入文件…"
   }
diff --git a/apps/dotcom/client/public/tos.html b/apps/dotcom/client/public/tos.html
new file mode 100644
index 000000000000..55bbf44728a9
--- /dev/null
+++ b/apps/dotcom/client/public/tos.html
@@ -0,0 +1,708 @@
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><title>Terms of Service</title><style>
+  /* cspell:disable-file */
+  /* webkit printing magic: print all background colors */
+  html {
+    -webkit-print-color-adjust: exact;
+  }
+  * {
+    box-sizing: border-box;
+    -webkit-print-color-adjust: exact;
+  }
+  
+  html,
+  body {
+    margin: 0;
+    padding: 0;
+  }
+  @media only screen {
+    body {
+      margin: 2em auto;
+      max-width: 70ch;
+      padding: 0 2em;
+      color: rgb(55, 53, 47);
+    }
+  }
+  
+  body {
+    line-height: 1.5;
+    white-space: pre-wrap;
+  }
+  
+  a,
+  a.visited {
+    color: inherit;
+    text-decoration: underline;
+  }
+  
+  .pdf-relative-link-path {
+    font-size: 80%;
+    color: #444;
+  }
+  
+  h1,
+  h2,
+  h3 {
+    letter-spacing: -0.01em;
+    line-height: 1.2;
+    font-weight: 600;
+    margin-bottom: 0;
+  }
+  
+  .page-title {
+    font-size: 2.5rem;
+    font-weight: 700;
+    margin-top: 0;
+    margin-bottom: 0.75em;
+  }
+  
+  h1 {
+    font-size: 1.875rem;
+    margin-top: 1.875rem;
+  }
+  
+  h2 {
+    font-size: 1.5rem;
+    margin-top: 1.5rem;
+  }
+  
+  h3 {
+    font-size: 1.25rem;
+    margin-top: 1.25rem;
+  }
+  
+  .source {
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    padding: 1.5em;
+    word-break: break-all;
+  }
+  
+  .callout {
+    border-radius: 10px;
+    padding: 1rem;
+  }
+  
+  figure {
+    margin: 1.25em 0;
+    page-break-inside: avoid;
+  }
+  
+  figcaption {
+    opacity: 0.5;
+    font-size: 85%;
+    margin-top: 0.5em;
+  }
+  
+  mark {
+    background-color: transparent;
+  }
+  
+  .indented {
+    padding-left: 1.5em;
+  }
+  
+  hr {
+    background: transparent;
+    display: block;
+    width: 100%;
+    height: 1px;
+    visibility: visible;
+    border: none;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.09);
+  }
+  
+  img {
+    max-width: 100%;
+  }
+  
+  @media only print {
+    img {
+      max-height: 100vh;
+      object-fit: contain;
+    }
+  }
+  
+  @page {
+    margin: 1in;
+  }
+  
+  .collection-content {
+    font-size: 0.875rem;
+  }
+  
+  .collection-content td {
+    white-space: pre-wrap;
+    word-break: break-word;
+  }
+  
+  .column-list {
+    display: flex;
+    justify-content: space-between;
+  }
+  
+  .column {
+    padding: 0 1em;
+  }
+  
+  .column:first-child {
+    padding-left: 0;
+  }
+  
+  .column:last-child {
+    padding-right: 0;
+  }
+  
+  .table_of_contents-item {
+    display: block;
+    font-size: 0.875rem;
+    line-height: 1.3;
+    padding: 0.125rem;
+  }
+  
+  .table_of_contents-indent-1 {
+    margin-left: 1.5rem;
+  }
+  
+  .table_of_contents-indent-2 {
+    margin-left: 3rem;
+  }
+  
+  .table_of_contents-indent-3 {
+    margin-left: 4.5rem;
+  }
+  
+  .table_of_contents-link {
+    text-decoration: none;
+    opacity: 0.7;
+    border-bottom: 1px solid rgba(55, 53, 47, 0.18);
+  }
+  
+  table,
+  th,
+  td {
+    border: 1px solid rgba(55, 53, 47, 0.09);
+    border-collapse: collapse;
+  }
+  
+  table {
+    border-left: none;
+    border-right: none;
+  }
+  
+  th,
+  td {
+    font-weight: normal;
+    padding: 0.25em 0.5em;
+    line-height: 1.5;
+    min-height: 1.5em;
+    text-align: left;
+  }
+  
+  th {
+    color: rgba(55, 53, 47, 0.6);
+  }
+  
+  ol,
+  ul {
+    margin: 0;
+    margin-block-start: 0.6em;
+    margin-block-end: 0.6em;
+  }
+  
+  li > ol:first-child,
+  li > ul:first-child {
+    margin-block-start: 0.6em;
+  }
+  
+  ul > li {
+    list-style: disc;
+  }
+  
+  ul.to-do-list {
+    padding-inline-start: 0;
+  }
+  
+  ul.to-do-list > li {
+    list-style: none;
+  }
+  
+  .to-do-children-checked {
+    text-decoration: line-through;
+    opacity: 0.375;
+  }
+  
+  ul.toggle > li {
+    list-style: none;
+  }
+  
+  ul {
+    padding-inline-start: 1.7em;
+  }
+  
+  ul > li {
+    padding-left: 0.1em;
+  }
+  
+  ol {
+    padding-inline-start: 1.6em;
+  }
+  
+  ol > li {
+    padding-left: 0.2em;
+  }
+  
+  .mono ol {
+    padding-inline-start: 2em;
+  }
+  
+  .mono ol > li {
+    text-indent: -0.4em;
+  }
+  
+  .toggle {
+    padding-inline-start: 0em;
+    list-style-type: none;
+  }
+  
+  /* Indent toggle children */
+  .toggle > li > details {
+    padding-left: 1.7em;
+  }
+  
+  .toggle > li > details > summary {
+    margin-left: -1.1em;
+  }
+  
+  .selected-value {
+    display: inline-block;
+    padding: 0 0.5em;
+    background: rgba(206, 205, 202, 0.5);
+    border-radius: 3px;
+    margin-right: 0.5em;
+    margin-top: 0.3em;
+    margin-bottom: 0.3em;
+    white-space: nowrap;
+  }
+  
+  .collection-title {
+    display: inline-block;
+    margin-right: 1em;
+  }
+  
+  .page-description {
+    margin-bottom: 2em;
+  }
+  
+  .simple-table {
+    margin-top: 1em;
+    font-size: 0.875rem;
+    empty-cells: show;
+  }
+  .simple-table td {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table th {
+    height: 29px;
+    min-width: 120px;
+  }
+  
+  .simple-table-header-color {
+    background: rgb(247, 246, 243);
+    color: black;
+  }
+  .simple-table-header {
+    font-weight: 500;
+  }
+  
+  time {
+    opacity: 0.5;
+  }
+  
+  .icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    max-width: 1.2em;
+    max-height: 1.2em;
+    text-decoration: none;
+    vertical-align: text-bottom;
+    margin-right: 0.5em;
+  }
+  
+  img.icon {
+    border-radius: 3px;
+  }
+  
+  .callout img.notion-static-icon {
+    width: 1em;
+    height: 1em;
+  }
+  
+  .callout p {
+    margin: 0;
+  }
+  
+  .callout h1,
+  .callout h2,
+  .callout h3 {
+    margin: 0 0 0.6rem;
+  }
+  
+  .user-icon {
+    width: 1.5em;
+    height: 1.5em;
+    border-radius: 100%;
+    margin-right: 0.5rem;
+  }
+  
+  .user-icon-inner {
+    font-size: 0.8em;
+  }
+  
+  .text-icon {
+    border: 1px solid #000;
+    text-align: center;
+  }
+  
+  .page-cover-image {
+    display: block;
+    object-fit: cover;
+    width: 100%;
+    max-height: 30vh;
+  }
+  
+  .page-header-icon {
+    font-size: 3rem;
+    margin-bottom: 1rem;
+  }
+  
+  .page-header-icon-with-cover {
+    margin-top: -0.72em;
+    margin-left: 0.07em;
+  }
+  
+  .page-header-icon img {
+    border-radius: 3px;
+  }
+  
+  .link-to-page {
+    margin: 1em 0;
+    padding: 0;
+    border: none;
+    font-weight: 500;
+  }
+  
+  p > .user {
+    opacity: 0.5;
+  }
+  
+  td > .user,
+  td > time {
+    white-space: nowrap;
+  }
+  
+  input[type="checkbox"] {
+    transform: scale(1.5);
+    margin-right: 0.6em;
+    vertical-align: middle;
+  }
+  
+  p {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+  }
+  
+  .image {
+    border: none;
+    margin: 1.5em 0;
+    padding: 0;
+    border-radius: 0;
+    text-align: center;
+  }
+  
+  .code,
+  code {
+    background: rgba(135, 131, 120, 0.15);
+    border-radius: 3px;
+    padding: 0.2em 0.4em;
+    border-radius: 3px;
+    font-size: 85%;
+    tab-size: 2;
+  }
+  
+  code {
+    color: #eb5757;
+  }
+  
+  .code {
+    padding: 1.5em 1em;
+  }
+  
+  .code-wrap {
+    white-space: pre-wrap;
+    word-break: break-all;
+  }
+  
+  .code > code {
+    background: none;
+    padding: 0;
+    font-size: 100%;
+    color: inherit;
+  }
+  
+  blockquote {
+    font-size: 1em;
+    margin: 1em 0;
+    padding-left: 1em;
+    border-left: 3px solid rgb(55, 53, 47);
+  }
+  
+  blockquote.quote-large {
+    font-size: 1.25em;
+  }
+  
+  .bookmark {
+    text-decoration: none;
+    max-height: 8em;
+    padding: 0;
+    display: flex;
+    width: 100%;
+    align-items: stretch;
+  }
+  
+  .bookmark-title {
+    font-size: 0.85em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    height: 1.75em;
+    white-space: nowrap;
+  }
+  
+  .bookmark-text {
+    display: flex;
+    flex-direction: column;
+  }
+  
+  .bookmark-info {
+    flex: 4 1 180px;
+    padding: 12px 14px 14px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+  
+  .bookmark-image {
+    width: 33%;
+    flex: 1 1 180px;
+    display: block;
+    position: relative;
+    object-fit: cover;
+    border-radius: 1px;
+  }
+  
+  .bookmark-description {
+    color: rgba(55, 53, 47, 0.6);
+    font-size: 0.75em;
+    overflow: hidden;
+    max-height: 4.5em;
+    word-break: break-word;
+  }
+  
+  .bookmark-href {
+    font-size: 0.75em;
+    margin-top: 0.25em;
+  }
+  
+  .sans { font-family: ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol"; }
+  .code { font-family: "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace; }
+  .serif { font-family: Lyon-Text, Georgia, ui-serif, serif; }
+  .mono { font-family: iawriter-mono, Nitti, Menlo, Courier, monospace; }
+  .pdf .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK JP'; }
+  .pdf:lang(zh-CN) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK SC'; }
+  .pdf:lang(zh-TW) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK TC'; }
+  .pdf:lang(ko-KR) .sans { font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI Variable Display", "Segoe UI", Helvetica, "Apple Color Emoji", Arial, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol", 'Twemoji', 'Noto Color Emoji', 'Noto Sans CJK KR'; }
+  .pdf .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .code { font-family: Source Code Pro, "SFMono-Regular", Menlo, Consolas, "PT Mono", "Liberation Mono", Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .pdf .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK JP'; }
+  .pdf:lang(zh-CN) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK SC'; }
+  .pdf:lang(zh-TW) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK TC'; }
+  .pdf:lang(ko-KR) .serif { font-family: PT Serif, Lyon-Text, Georgia, ui-serif, serif, 'Twemoji', 'Noto Color Emoji', 'Noto Serif CJK KR'; }
+  .pdf .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK JP'; }
+  .pdf:lang(zh-CN) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK SC'; }
+  .pdf:lang(zh-TW) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK TC'; }
+  .pdf:lang(ko-KR) .mono { font-family: PT Mono, iawriter-mono, Nitti, Menlo, Courier, monospace, 'Twemoji', 'Noto Color Emoji', 'Noto Sans Mono CJK KR'; }
+  .highlight-default {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .highlight-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .highlight-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .highlight-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .highlight-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .highlight-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .highlight-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .highlight-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .highlight-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .highlight-default_background {
+    color: rgba(44, 44, 43, 1);
+  }
+  .highlight-gray_background {
+    background: rgba(42, 28, 0, 0.07);
+  }
+  .highlight-brown_background {
+    background: rgba(139, 46, 0, 0.086);
+  }
+  .highlight-orange_background {
+    background: rgba(224, 101, 1, 0.129);
+  }
+  .highlight-yellow_background {
+    background: rgba(211, 168, 0, 0.137);
+  }
+  .highlight-teal_background {
+    background: rgba(0, 100, 45, 0.09);
+  }
+  .highlight-blue_background {
+    background: rgba(0, 124, 215, 0.094);
+  }
+  .highlight-purple_background {
+    background: rgba(102, 0, 178, 0.078);
+  }
+  .highlight-pink_background {
+    background: rgba(197, 0, 93, 0.086);
+  }
+  .highlight-red_background {
+    background: rgba(223, 22, 0, 0.094);
+  }
+  .block-color-default {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray {
+    color: rgba(134, 131, 126, 1);
+    fill: rgba(134, 131, 126, 1);
+  }
+  .block-color-brown {
+    color: rgba(159, 118, 90, 1);
+    fill: rgba(159, 118, 90, 1);
+  }
+  .block-color-orange {
+    color: rgba(210, 123, 45, 1);
+    fill: rgba(210, 123, 45, 1);
+  }
+  .block-color-yellow {
+    color: rgba(203, 148, 52, 1);
+    fill: rgba(203, 148, 52, 1);
+  }
+  .block-color-teal {
+    color: rgba(80, 148, 110, 1);
+    fill: rgba(80, 148, 110, 1);
+  }
+  .block-color-blue {
+    color: rgba(56, 125, 201, 1);
+    fill: rgba(56, 125, 201, 1);
+  }
+  .block-color-purple {
+    color: rgba(154, 107, 180, 1);
+    fill: rgba(154, 107, 180, 1);
+  }
+  .block-color-pink {
+    color: rgba(193, 76, 138, 1);
+    fill: rgba(193, 76, 138, 1);
+  }
+  .block-color-red {
+    color: rgba(207, 81, 72, 1);
+    fill: rgba(207, 81, 72, 1);
+  }
+  .block-color-default_background {
+    color: inherit;
+    fill: inherit;
+  }
+  .block-color-gray_background {
+    background: rgba(240, 239, 237, 1);
+  }
+  .block-color-brown_background {
+    background: rgba(245, 237, 233, 1);
+  }
+  .block-color-orange_background {
+    background: rgba(251, 235, 222, 1);
+  }
+  .block-color-yellow_background {
+    background: rgba(249, 243, 220, 1);
+  }
+  .block-color-teal_background {
+    background: rgba(232, 241, 236, 1);
+  }
+  .block-color-blue_background {
+    background: rgba(229, 242, 252, 1);
+  }
+  .block-color-purple_background {
+    background: rgba(243, 235, 249, 1);
+  }
+  .block-color-pink_background {
+    background: rgba(250, 233, 241, 1);
+  }
+  .block-color-red_background {
+    background: rgba(252, 233, 231, 1);
+  }
+  .select-value-color-default { background-color: rgba(42, 28, 0, 0.07); }
+  .select-value-color-gray { background-color: rgba(28, 19, 1, 0.11); }
+  .select-value-color-brown { background-color: rgba(127, 51, 0, 0.156); }
+  .select-value-color-orange { background-color: rgba(196, 88, 0, 0.203); }
+  .select-value-color-yellow { background-color: rgba(209, 156, 0, 0.282); }
+  .select-value-color-green { background-color: rgba(0, 96, 38, 0.156); }
+  .select-value-color-blue { background-color: rgba(0, 118, 217, 0.203); }
+  .select-value-color-purple { background-color: rgba(92, 0, 163, 0.141); }
+  .select-value-color-pink { background-color: rgba(183, 0, 78, 0.152); }
+  .select-value-color-red { background-color: rgba(206, 24, 0, 0.164); }
+  
+  .checkbox {
+    display: inline-flex;
+    vertical-align: text-bottom;
+    width: 16;
+    height: 16;
+    background-size: 16px;
+    margin-left: 2px;
+    margin-right: 5px;
+  }
+  
+  .checkbox-on {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%2358A9D7%22%2F%3E%0A%3Cpath%20d%3D%22M6.71429%2012.2852L14%204.9995L12.7143%203.71436L6.71429%209.71378L3.28571%206.2831L2%207.57092L6.71429%2012.2852Z%22%20fill%3D%22white%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+  
+  .checkbox-off {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Crect%20x%3D%220.75%22%20y%3D%220.75%22%20width%3D%2214.5%22%20height%3D%2214.5%22%20fill%3D%22white%22%20stroke%3D%22%2336352F%22%20stroke-width%3D%221.5%22%2F%3E%0A%3C%2Fsvg%3E");
+  }
+    
+  </style></head><body><article id="1583e4c3-24c0-800f-95a2-f4d7d71c73ed" class="page sans"><header><div class="page-header-icon undefined"><span class="icon">📄</span></div><h1 class="page-title">Terms of Service</h1><p class="page-description"></p></header><div class="page-body"><p id="1843e4c3-24c0-80ad-9f46-dedf24415a53" class=""><strong>Effective Date: January 20th, 2025</strong></p><p id="1843e4c3-24c0-8059-a201-f9a85a5bd456" class=""><strong>Last Updated Date: January 20th, 2025</strong></p><p id="1843e4c3-24c0-80bf-a4cd-f9b2c75ea40d" class="">Please read this Terms of Service Agreement (“<strong>agreement</strong>”) carefully.  The website (“<strong>Website</strong>”) of tldraw, Inc. (“<strong>tldraw</strong>”), THE WEB APPLICATION (“<strong>APPLICATION</strong>”) and the information on THE WEBSITE AND APPLICATION are controlled by tldraw.  These Terms of Service govern (i) the use of the Website and APPLICATION AND apply to all users using the Website OR APPLICATION in any way AND (II) the services, SOFTWARE, and resources available or enabled via the Website OR APPLICATION (each, a “<strong>Service</strong>” and collectively, the “<strong>Services</strong>”). THE SERVICES, AND THIS AGREEMENT, ALSO INCLUDE ANY USE OF BOARDS (AS DEFINED BELOW) LINKED TO YOUR ACCOUNT ON THE TLDRAW WEBSITE AND/OR APPLICATION.</p><p id="1843e4c3-24c0-807d-b0d4-c54a775205b5" class="">By clicking the “Accept” button, completing the registration process, using any of the Services, and/or browsing the Website, you represent that (1) you have read, understand, and agree to be bound by the Terms of Service, (2) you are of legal age to form a binding contract with tldraw, and (3) you have the authority to enter into this Agreement personally or on behalf of the entity you have named as the user, and to bind that entity to this Agreement. The term “<strong>you</strong>” refers to the individual or legal entity, as applicable, identified as the user when you registered for an Account with tldraw through the Services. <strong>If you do not agree to be bound by this Agreement, you may not access or use the Services.</strong></p><p id="1843e4c3-24c0-802c-9de5-ddc5e3bb837f" class=""><strong>SECTION 13 CONTAINS PROVISIONS THAT GOVERN HOW TO RESOLVE DISPUTES BETWEEN YOU AND TLDRAW.  AMONG OTHER THINGS, SECTION 13 INCLUDES AN AGREEMENT TO ARBITRATE WHICH REQUIRES, WITH LIMITED EXCEPTIONS, THAT ALL DISPUTES BETWEEN YOU AND US SHALL BE RESOLVED BY BINDING AND FINAL ARBITRATION.  SECTION 13 ALSO CONTAINS A CLASS ACTION AND JURY TRIAL WAIVER.  PLEASE READ SECTION 13 CAREFULLY. UNLESS YOU OPT OUT OF THE ARBITRATION AGREEMENT (AS DEFINED IN SECTION 13) WITHIN THIRTY (30) DAYS IN ACCORDANCE WITH SECTION 13.10: (1) YOU WILL ONLY BE PERMITTED TO PURSUE DISPUTES OR CLAIMS AND SEEK RELIEF AGAINST US ON AN INDIVIDUAL BASIS, NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY CLASS OR REPRESENTATIVE ACTION OR PROCEEDING, AND YOU WAIVE YOUR RIGHT TO PARTICIPATE IN A CLASS ACTION LAWSUIT OR CLASS-WIDE ARBITRATION; AND (2) YOU ARE WAIVING YOUR RIGHT TO PURSUE DISPUTES OR CLAIMS AND SEEK RELIEF IN A COURT OF LAW AND TO HAVE A JURY TRIAL.</strong></p><p id="1843e4c3-24c0-8041-bcb0-cc348ddf1721" class="">The Agreement IS subject to change by Tldraw in its sole discretion at any time AS SET FORTH IN SECTION 14.6.</p><h3 id="1843e4c3-24c0-80fe-96f4-e37dd04d17c8" class=""><strong>1 Services; License Grant</strong></h3><p id="1843e4c3-24c0-80f9-a0d2-fc91bb69323c" class=""><strong>1.1 Overview</strong>. The Services are intended to be an online collaborative whiteboard that allows users to create and share canvas-based experiences in the following ways: (i) users can use predefined assets and objects to create canvas-based experiences (each, a “<strong>Board</strong>”) and save and/or delete such Boards to their Accounts, (b) users can share and unshare Boards with other Registered Users or unregistered users.</p><p id="1843e4c3-24c0-8017-afb0-ed45c06bfc84" class=""><strong>1.2 License.</strong> Subject to the terms and conditions of this Agreement, during the Subscription Term (as defined below), tldraw hereby grants you a non-exclusive, worldwide, royalty-free, non-transferable, non-sub-licensable right for you to access and use the Services on a remote basis, including any software programs and associated interfaces and related technology that tldraw makes available pursuant to this Agreement, in accordance with the standard end-user technical documentation, specifications, materials and other information tldraw may make available electronically (the “<strong>Documentation</strong>”).</p><p id="1843e4c3-24c0-8006-875c-ffc887106349" class=""><strong>1.3 License Restrictions.</strong> You agree that you will not, and will not permit any other party to, directly or indirectly: (a) access or use the Services or use the Documentation except as expressly permitted herein; (b) modify, adapt, alter or translate the Services or Documentation, except as expressly allowed herein; (c) sublicense, lease, rent, loan, distribute, or otherwise transfer the Services or Documentation to any third party; (d) reverse engineer, decompile, disassemble, or otherwise derive or determine or attempt to derive or determine the source code (or the underlying ideas, algorithms, structure or organization) of the Services; (e) use or copy the Services or Documentation except as expressly allowed under this Agreement; or (f) disclose or transmit any data contained in the Services to any individual, except as expressly allowed herein. You acknowledge and agree that the Services and Documentation will not be used, and are not licensed for use, in connection with any of your time-critical or mission-critical functions.</p><p id="1843e4c3-24c0-80ed-92fb-e6ba3a618f06" class=""><strong>1.4 Supplemental Terms</strong>. Your use of the Services is also subject to any additional terms, conditions and policies that we separately post on the Website and/or the Application (“<strong>Supplemental Terms</strong>”), which are subject to, and incorporated by reference into, this Agreement.To the extent there is any conflict between this Agreement and any Supplemental Terms, such Supplemental Terms will control with respect to the subject matter of such conflict.</p><p id="1843e4c3-24c0-8065-a898-f5c03dbd5f91" class="">
+  </p><h3 id="1843e4c3-24c0-807a-a464-e92a3f7dfcee" class=""><strong>2 Your Account</strong></h3><p id="1843e4c3-24c0-808c-8d7e-fea882103545" class=""><strong>2.1 Registering Your Account</strong>. In order to access the Services, you will be required to become a Registered User. For purposes of this Agreement, a “<strong>Registered User</strong>” is a user who has registered an account on the Website (“<strong>Account</strong>”).</p><p id="1843e4c3-24c0-8094-88fb-cc0313ffd68e" class=""><strong>2.2 Registration Data</strong>. In registering an account on the Website, you agree to (a) provide true, accurate, current and complete information about yourself as prompted by the registration form (the “<strong>Registration Data</strong>”); and (b) maintain and promptly update the Registration Data to keep it true, accurate, current and complete.</p><p id="1843e4c3-24c0-80e9-a82c-fcc1ebd56e21" class=""><strong>2.3 Your Account</strong>. Notwithstanding anything to the contrary herein, you acknowledge and agree that you shall have no ownership or other property interest in your Account, and you further acknowledge and agree that all rights in and to your Account are and shall forever be owned by and inure to the benefit of tldraw. Furthermore, you are responsible for all activities that occur under your Account. You agree that you shall monitor your Account to restrict use by minors, and you will accept full responsibility for any unauthorized use of the Website and Services by minors. However, if you conclude that the Website and/or Services are appropriate for a minor for whom you are responsible, you may exercise your judgment to allow such minor to use the Website and/or Services under your close supervision; provided that you will remain responsible for any such use by such minor. You may not share your Account or password with anyone, and you agree to (y) notify tldraw immediately of any unauthorized use of your password or any other breach of security; and (z) exit from your Account at the end of each session. If you provide any information that is untrue, inaccurate, not current or incomplete, or tldraw has reasonable grounds to suspect that any information you provide is untrue, inaccurate, not current or incomplete, tldraw has the right to suspend or terminate your Account and refuse any and all current or future use of the Website or Services (or any portion thereof). You agree not to create an Account using a false identity or information, or on behalf of someone other than yourself. You agree that you shall not have more than one Account at any given time. tldraw reserves the right to remove or reclaim any usernames at any time and for any reason, including claims by a third party that a username violates the third party’s rights. You agree not to create an Account or use any Services if you have been previously removed by tldraw, or if you have been previously banned from any of the Services.</p><h3 id="1843e4c3-24c0-807a-86b7-c81d15db9f97" class=""><strong>3 Proprietary Rights</strong></h3><p id="1843e4c3-24c0-8067-8883-fcdd0be1f444" class=""><strong>3.1 Ownership by tldraw.</strong> The Services and Documentation are licensed and not sold to you, and no title or ownership to such Services, Documentation, or the intellectual property rights embodied therein passes as a result of this Agreement or any act pursuant to this Agreement. The Services and Documentation, and all intellectual property rights therein are the exclusive property of tldraw and its suppliers, and all rights in and to the Services and Documentation not expressly granted to you in this Agreement are reserved by tldraw. tldraw and its suppliers own all rights, title, and interest to the Services and Documentation. Nothing in this Agreement will be deemed to grant, by implication, estoppel or otherwise, a license under any existing or future patents of tldraw, except to the extent necessary for you to use the Services and Documentation as expressly permitted under this Agreement. You will not remove, alter or obscure any copyright, trademark, service mark or other proprietary rights notices incorporated in or accompanying the Services or the Documentation.</p><div id="1843e4c3-24c0-80c9-ae2e-c4638b1ed0d5" class="column-list"><div id="1843e4c3-24c0-8094-bba6-d6442c893b59" style="width:93.75%" class="column"><p id="1843e4c3-24c0-8065-bf47-c98c63fe7a71" class=""><strong>3.2 Trademarks. </strong>The tldraw logo and all related graphics, logos, service marks and trade names used on or in connection with any of the Services are the trademarks of tldraw or its suppliers and may not be used without permission in connection with your, or any third-party, products or services.</p></div><div id="1843e4c3-24c0-80c7-b493-d12736638ad5" style="width:6.25%" class="column"><figure id="1843e4c3-24c0-807d-a1ad-f4cd6c5988ef" class="image"><a href="/tldraw-white-on-black.svg"><img style="width:41.375px" src="/tldraw-white-on-black.svg"/></a></figure></div></div><p id="1843e4c3-24c0-807a-bfd7-cfcd800f147e" class=""><strong>3.3 Feedback.</strong> You hereby grant to tldraw a royalty-free, worldwide, transferable, sublicensable, irrevocable, perpetual license to use or incorporate into the Services or any other products or services of tldraw, any suggestions, enhancement requests, recommendations or other feedback provided by you, relating to the Services. tldraw will not identify you as the source of any such feedback.</p><h3 id="1843e4c3-24c0-8032-8db5-dc4af5c243da" class=""><strong>4 Your Data and Responsibilities</strong></h3><p id="1843e4c3-24c0-801e-90d2-f624850369be" class=""><strong>4.1 Your Data.</strong> “<strong>Your Data</strong>” consists of data, models, content, materials, text and other information made available to us by you through the use of the Services under this Agreement, including any Boards. You instruct us to use and disclose Your Data as necessary to (a) provide the Services consistent with this Agreement, including detecting, preventing, and investigating security incidents, fraud, spam, or unlawful use of the Services, and (b) respond to any technical problems or your queries and ensure the proper working of the Services. You acknowledge that the Internet and telecommunications providers’ networks are inherently insecure. Accordingly, you agree tldraw is not liable for any changes to, interception of, or loss of Your Data while in transit via the Internet or a telecommunications provider’s network.</p><p id="1843e4c3-24c0-80fb-bcec-dd51aff2fdc8" class=""><strong>4.2 License; Ownership</strong>. You are solely responsible for the accuracy, quality and legality of Your Data. You will obtain all third party licenses, consents and permissions needed for tldraw to use Your Data to provide the Services. Without limiting the foregoing, you will be solely responsible for obtaining from third parties all necessary rights for tldraw to use Your Data submitted by or on behalf of you for the purposes set forth in this Agreement. You grant tldraw a non-exclusive, worldwide, royalty-free and fully paid license (a) during the Term, to use Your Data as necessary for purposes of providing and improving the Services, and (b) during and after the Term, to use Your Data in an aggregated and anonymized form to: (i) improve the Services and tldraw’s related products and services; (ii) create analytics and benchmarks; and (iii) generate and disclose statistics regarding use of the Services, provided, however, that no individually identifiable statistics will be disclosed to third parties without your consent. Your Data, and all worldwide intellectual property rights in it, is your exclusive property. All rights in and to Your Data not expressly granted to tldraw in this Agreement are reserved by you.</p><p id="1843e4c3-24c0-80ec-82f2-cea245db83e2" class=""><strong>4.3 Your Warranty</strong>. You represent and warrant that: (i) any Board you share or publish by using the Services is truthful, accurate, not misleading, and offered in good faith; (ii) you own the Board you post on or through the Services or otherwise have the right to grant the license set forth in this Agreement; (iii) the publication of your Boards on the Services will not require tldraw to obtain any further licenses from or pay any royalties, fees, compensation or other amounts or provide any attribution to any third parties; and (iv) the publication of your Boards on the Services does not result in a breach of contract between you and any third party. You further represent and warrant that any of Your Data will not (a) infringe any copyright, trademark, or patent; (b) misappropriate any trade secret; (c) be deceptive, defamatory, obscene, pornographic or unlawful; (d) contain any viruses, worms or other malicious computer programming codes intended to damage tldraw’s system or data; and (e) otherwise violate the rights, including privacy or publicity rights, of a third party. tldraw is not obligated to back up any of Your Data; you are solely responsible for creating backup copies of any of Your Data at your sole cost and expense. You agree that any use of the Services contrary to or in violation of your representations and warranties in this Section 3 constitutes unauthorized and improper use of the Services.</p><p id="1843e4c3-24c0-8006-b106-e6db06469f08" class=""><strong>4.4 Your Responsibility for Data and Security</strong>. You will have access to Your Data and will be responsible for all changes to and/or deletions of Your Data and the security of all passwords and other access protocols required in order to access the Services. You will have the ability to export Your Data out of the Services and are encouraged to make its own back-ups of Your Data. You will have the sole responsibility for the accuracy, quality, integrity, legality, reliability, and appropriateness of all of Your Data.</p><h3 id="1843e4c3-24c0-80b3-8ea6-c487cfca2c99" class=""><strong>5 Confidentiality</strong></h3><p id="1843e4c3-24c0-8053-b786-eb357aaa144a" class=""><strong>5.1 Confidential Information</strong>. Subject to Section 5.3, all information disclosed by tldraw to you during the Term of this Agreement, whether oral, written, graphic or electronic, shall be deemed “<strong>Confidential Information</strong>”. The Services, Documentation, and all enhancements and improvements thereto shall be Confidential Information of tldraw. All data, other than Your Data, provided by tldraw to you in connection with the Services shall be tldraw’s Confidential Information.</p><p id="1843e4c3-24c0-8083-97ad-fd599cd67746" class=""><strong>5.2 Protection of Confidential Information</strong>. You will not use any Confidential Information of tldraw for any purpose not permitted by this Agreement, and will disclose the Confidential Information of tldraw only to your employees or contractors who have a need to know such Confidential Information for purposes of this Agreement and are under a duty of confidentiality no less restrictive than your duties hereunder. You will protect tldraw’s Confidential Information from unauthorized use, access, or disclosure in the same manner as you protect your own confidential or proprietary information of a similar nature but with no less than reasonable care.</p><p id="1843e4c3-24c0-807e-9c7d-def70d8b5593" class=""><strong>5.3 Exceptions</strong>. Your obligations under Section 5.2 with respect to Confidential Information of tldraw will not apply to any information that: (a) was already known to you at the time of disclosure by tldraw free of any obligation of confidentiality; (b) is disclosed to you free of any obligation of confidentiality by a third party who had the right to make such disclosure; (c) is, or through no fault of you has become, generally available to the public; or (d) is independently developed by you without access to, or use of, tldraw’s Confidential Information. In addition, you will be allowed to disclose Confidential Information of tldraw to the extent that such disclosure is (i) approved in writing by tldraw, (ii) necessary for you to enforce its rights under this Agreement in connection with a legal proceeding; or (iii) required by law or by the order or a court of similar judicial or administrative body, provided that you notify tldraw of such required disclosure promptly and in writing and cooperates with tldraw, at tldraw’s reasonable request and expense, in any lawful action to contest or limit the scope of such required disclosure.</p><h3 id="1843e4c3-24c0-8088-9c5b-ccdd8137b1c2" class=""><strong>6 Third-Party Links</strong></h3><p id="1843e4c3-24c0-8021-aeff-f127f73df0ea" class="">The Services may contain links to third-party services such as third-party websites, applications, or ads (“<strong>Third-Party Links</strong>”).  When you click on such a link, we will not warn you that you have left the Services.  tldraw does not control and is not responsible for Third-Party Links or any content, products or services accessible through such links. tldraw provides these Third-Party Links only as a convenience and does not review, approve, monitor, endorse, warrant, or make any representations with respect to them, or any content, products or services accessible through such links.  Your use of all Third-Party Links is at your own risk.</p><h3 id="1843e4c3-24c0-80e3-bbc5-cdac6fdab0b0" class=""><strong>7 Fees and Purchase Terms</strong></h3><p id="1843e4c3-24c0-8077-98fa-c31a8d1a4471" class="">tldraw does not currently charge a fee for the Services. However, it reserves the right to charge such fees in the future.</p><h3 id="1843e4c3-24c0-802c-ab6c-cf913e13fe38" class=""><strong>8 Indemnification</strong></h3><p id="1843e4c3-24c0-8026-a239-e96505f8092a" class="">You shall indemnify and hold tldraw, its parents, subsidiaries, affiliates, officers, employees, agents, partners, suppliers, and licensors (each, a <strong>“tldraw Party”</strong> and collectively, the <strong>“tldraw Parties”</strong>) harmless from any losses, costs, liabilities and expenses (including reasonable attorneys’ fees) relating to or arising out of any and all of the following: (i) Your Data; (ii) your use of, or inability to use, the Services; (iii) your violation of this Agreement; (iv) your violation of any rights of another party, including any user; or (v) your violation of any applicable laws, rules or regulations. tldraw reserves the right, at its own cost, to assume the exclusive defense and control of any matter otherwise subject to indemnification by you, in which event you will fully cooperate with tldraw in asserting any available defenses. This provision does not require you to indemnify any of the tldraw Parties for any unconscionable commercial practice by such party or for such party’s fraud, deception, false promise, misrepresentation or concealment, or suppression or omission of any material fact in connection with the Services provided hereunder. You agree that the provisions in this section will survive any termination of your Account, this Agreement and/or your access to the Services.</p><p id="1843e4c3-24c0-80aa-9e2c-d34b64358740" class=""><strong>9 Disclaimer of Warranties.</strong></p><p id="1843e4c3-24c0-8033-ac4e-dd7baff95216" class=""><strong>9.1 As Is.</strong> YOU EXPRESSLY UNDERSTAND AND AGREE THAT TO THE EXTENT PERMITTED BY APPLICABLE LAW, YOUR USE OF THE SERVICES IS AT YOUR SOLE RISK, AND THE SERVICES ARE PROVIDED ON AN “AS IS” AND “AS AVAILABLE” BASIS, WITH ALL FAULTS. TO THE FULLEST EXTENT PERMITTED UNDER APPLICABLE LAW, TLDRAW EXPRESSLY DISCLAIMS ALL WARRANTIES, REPRESENTATIONS, AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING THE IMPLIED WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT, ARISING FROM USE OF THE SERVICES.</p><p id="1843e4c3-24c0-806e-bd18-f1e127a2fd08" class=""><strong>9.1.1 </strong>TLDRAW MAKES NO WARRANTY, REPRESENTATION OR CONDITION THAT: (1) THE SERVICES WILL MEET YOUR REQUIREMENTS; (2) YOUR USE OF THE SERVICES WILL BE UNINTERRUPTED, TIMELY, SECURE OR ERROR-FREE; OR (3) THE RESULTS THAT MAY BE OBTAINED FROM USE OF THE SERVICES WILL BE ACCURATE OR RELIABLE.</p><p id="1843e4c3-24c0-8055-ad85-fcd798032819" class=""><strong>9.1.2</strong> ANY CONTENT DOWNLOADED FROM OR OTHERWISE ACCESSED THROUGH THE SERVICES IS ACCESSED AT YOUR OWN RISK, AND YOU SHALL BE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR PROPERTY, INCLUDING YOUR COMPUTER SYSTEM AND ANY DEVICE YOU USE TO ACCESS THE SERVICES, OR ANY OTHER LOSS THAT RESULTS FROM ACCESSING SUCH CONTENT.</p><p id="1843e4c3-24c0-809d-97e5-cf48d2fbddac" class=""><strong>9.1.3</strong> THE SERVICES MAY BE SUBJECT TO DELAYS, CANCELLATIONS AND OTHER DISRUPTIONS. TLDRAW MAKES NO WARRANTY, REPRESENTATION OR CONDITION WITH RESPECT TO SERVICES, INCLUDING THE QUALITY, EFFECTIVENESS, REPUTATION AND OTHER CHARACTERISTICS OF SERVICES.</p><p id="1843e4c3-24c0-80fd-89f6-d2e3f36959d2" class=""><strong>9.1.4</strong> NO ADVICE OR INFORMATION, WHETHER ORAL OR WRITTEN, OBTAINED FROM TLDRAW OR THROUGH THE SERVICES WILL CREATE ANY WARRANTY NOT EXPRESSLY MADE HEREIN.</p><p id="1843e4c3-24c0-8024-b18a-e5fb5dceb0c7" class=""><strong>9.1.5</strong> From time to time, Tldraw may offer new “beta” features or tools with which its users may experiment. Such features or tools are offered solely for experimental purposes and without any warranty of any kind, and may be modified or discontinued at Tldraw’s sole discretion. The provisions of this section apply with full force to such features or tools.</p><p id="1843e4c3-24c0-80e1-bf8a-eac9888329a5" class=""><strong>9.2 No Liability for Conduct of Third Parties.</strong> YOU ACKNOWLEDGE AND AGREE THAT TLDRAW IS NOT LIABLE, AND YOU AGREE NOT TO SEEK TO HOLD TLDRAW LIABLE, FOR THE CONDUCT OF THIRD PARTIES, INCLUDING OTHER USERS OF THE SERVICES AND OPERATORS OF EXTERNAL SITES, AND THAT THE RISK OF INJURY FROM SUCH THIRD PARTIES RESTS ENTIRELY WITH YOU.</p><h3 id="1843e4c3-24c0-80a6-8e74-ca98ab7374a4" class=""><strong>10 Limitation of Liability</strong></h3><p id="1843e4c3-24c0-801f-a19c-e537a0511051" class=""><strong>10.1 </strong>TO THE FULLEST EXTENT PROVIDED BY LAW, IN NO EVENT WILL TLDRAW BE LIABLE TO YOU OR ANY OTHER PARTY FOR ANY SPECIAL, PUNITIVE, INDIRECT, INCIDENTAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATED TO THIS AGREEMENT, OR ANY SERVICES OR SUPPORT SERVICES PROVIDED HEREIN, UNDER ANY LEGAL THEORY, INCLUDING LOSS OF DATA, LOSS OF THE USE OR PERFORMANCE OF ANY PRODUCTS OR SERVICES, LOSS OF REVENUES, LOSS OF PROFITS, OR BUSINESS INTERRUPTION, EVEN IF TLDRAW KNOWS OF OR SHOULD HAVE KNOWN OF THE POSSIBILITY OF SUCH DAMAGES. TO THE FULLEST EXTENT PROVIDED BY LAW, IN NO EVENT WILL TLDRAW PARTIES BE LIABLE TO YOU FOR MORE THAN THE GREATER OF: (I) $100; OR (II) IF APPLICABLE, THE STATUTORY REMEDY OR PENALTY IMPOSED BY THE STATUTE UNDER WHICH SUCH CLAIM ARISES. THE FOREGOING CAP ON LIABILITY DOES NOT APPLY TO LIABILITY OF A TLDRAW PARTY FOR (A) DEATH OR PERSONAL INJURY CAUSED BY A TLDRAW PARTY’S NEGLIGENCE; OR (B) ANY INJURY CAUSED BY A TLDRAW PARTY’S FRAUD OR FRAUDULENT MISREPRESENTATION.</p><p id="1843e4c3-24c0-8030-8fa9-fe5a0e821ab4" class=""><strong>10.2 </strong>EXCEPT FOR TLDRAW’S OBLIGATIONS TO PROTECT YOUR PERSONAL INFORMATION AS SET FORTH IN TLDRAW’S PRIVACY POLICY, TLDRAW ASSUMES NO RESPONSIBILITY FOR THE TIMELINESS, DELETION, MIS-DELIVERY OR FAILURE TO STORE ANY DATA (INCLUDING YOUR DATA), USER COMMUNICATIONS OR PERSONALIZATION SETTINGS.</p><p id="1843e4c3-24c0-808f-b723-edc772d272a8" class=""><strong>10.3 </strong>THE LIMITATIONS OF DAMAGES SET FORTH ABOVE ARE FUNDAMENTAL ELEMENTS OF THE BASIS OF THE BARGAIN BETWEEN TLDRAW AND YOU.</p><h3 id="1843e4c3-24c0-80a7-8e52-df55f6766868" class=""><strong>11 Procedure for Making Claims of Copyright Infringement</strong></h3><p id="1843e4c3-24c0-80e7-a2d0-cb86ec55b30c" class="">It is tldraw’s policy to terminate membership privileges of any Registered User who repeatedly infringes copyright upon prompt notification to tldraw by the copyright owner or the copyright owner’s legal agent.  Without limiting the foregoing, if you believe that your work has been copied and posted on the Services in a way that constitutes copyright infringement, please provide our Copyright Agent with the following information: (a) an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright interest; (b) a description of the copyrighted work that you claim has been infringed; (c) a description of the location on the Services of the material that you claim is infringing; (d) your address, telephone number and e-mail address; (e) a written statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent or the law; and (f) a statement by you, made under penalty of perjury, that the above information in your notice is accurate and that you are the copyright owner or authorized to act on the copyright owner’s behalf.  Contact information for tldraw’s Copyright Agent for notice of claims of copyright infringement is as follows: Stephen Ruiz, CEO, tldraw GB Ltd., Floor 3, The Arts Building, Morris Pl, Finsbury Park, London N4 3JG.</p><h3 id="1843e4c3-24c0-805f-b06b-ec428059fb80" class=""><strong>12 Term and Termination</strong></h3><p id="1843e4c3-24c0-809a-a078-cb21795cafd7" class=""><strong>12.1 </strong>This Agreement will begin on the date that you accept it (in accordance with the preamble) (the “<strong>Effective Date</strong>”) and continue until terminated in accordance with the terms herein (the “<strong>Term</strong>”).</p><p id="1843e4c3-24c0-805d-8e39-cad401a4abcb" class=""><strong>12.2 Termination of Agreement. </strong>If you have materially breached any provision of this Agreement, or if Company is required to do so by law (e.g., where the provision of the Services is, or becomes, unlawful), tldraw has the right to, immediately and without notice, suspend or terminate any Service provided to you. tldraw reserves the right to terminate this Agreement or your access to the Services at any time without cause upon notice to you. If you want to terminate this Agreement, you may do so by (i) notifying tldraw at any time and (ii) closing your Account for the Services. Your notice should be sent, in writing, to tldraw’s address set forth below.</p><p id="1843e4c3-24c0-80ce-8767-c3664c02a88f" class=""><strong>12.3 Effect of Termination. </strong>Termination of any Service includes removal of access to such Service and barring of further use of the Services and the termination of any applicable licenses or rights. Termination of the Agreement or all Services also includes deletion of your password and all related information associated with or inside your Account (or any part thereof). Upon termination of any Service, your right to use such Services will automatically terminate immediately. tldraw will not have any liability whatsoever to you for any suspension or termination. Notwithstanding the foregoing, if tldraw terminates this Agreement for any reason other than your breach, tldraw will refund any prepaid fees for the remainder of the terminated portion of the Subscription Term.</p><p id="1843e4c3-24c0-8066-b544-f1d4e0b03f7a" class=""><strong>12.4 </strong>Sections 1.3, 1.3, 3, 7.3, 7.4, 9-14 will survive the termination of this Agreement.</p><h3 id="1843e4c3-24c0-8031-ba1d-f4590e5ba270" class=""><strong>13 Arbitration Agreement</strong></h3><p id="1843e4c3-24c0-8054-954d-f23b603cac80" class=""><strong>Please read this section (the “Arbitration Agreement”) carefully. It is part of your contract with tldraw and affects your rights. It contains procedures for MANDATORY BINDING ARBITRATION AND A CLASS ACTION WAIVER.</strong></p><p id="1843e4c3-24c0-8008-a241-e9deb5ebf7e7" class=""><strong>13.1 Applicability of Arbitration Agreement. </strong>Subject to the terms of this Arbitration Agreement, you and tldraw agree that any dispute, claim, disagreements arising out of or relating in any way to your access to or use of the Services, any communications you receive, any products sold or distributed through the Services or this Agreement and prior versions of this Agreement, including claims and disputes that arose between you and us before the effective date of this Agreement (each, a <strong>“Dispute”</strong>) will be resolved by binding arbitration, rather than in court, except that: (i) you and tldraw may assert claims or seek relief in small claims court if such claims qualify and remain in small claims court; and (ii) you or tldraw may seek equitable relief in court for infringement or other misuse of intellectual property rights (such as trademarks, trade dress, domain names, trade secrets, copyrights, and patents). For purposes of this Arbitration Agreement, “Dispute” will also include disputes that arose or involve facts occurring before the existence of this or any prior versions of this Agreement as well as claims that may arise after the termination of this Agreement.</p><p id="1843e4c3-24c0-80ef-985f-d79f710edb8c" class=""><strong>13.2 Informal Dispute Resolution. </strong>There might be instances when a Dispute arises between you and tldraw. If that occurs, tldraw is committed to working with you to reach a reasonable resolution. You and tldraw agree that good faith informal efforts to resolve Disputes can result in a prompt, low‐cost and mutually beneficial outcome (<strong>“Informal Dispute Resolution”</strong>). You and tldraw therefore agree that before either party commences arbitration against the other (or initiates an action in small claims court if a party so elects), we will personally meet and confer telephonically or via videoconference, in a good faith effort to resolve informally any Dispute covered by this Arbitration Agreement (<strong>“Informal Dispute Resolution Conference”</strong>). If you are represented by counsel, your counsel may participate in the conference, but you will also participate in the conference.</p><p id="1843e4c3-24c0-8091-a7e1-eefbf77e66de" class="">The party initiating a Dispute must give notice to the other party in writing of its intent to initiate an Informal Dispute Resolution Conference (<strong>“Notice”</strong>), which shall occur within forty-five (45) days after the other party receives such Notice, unless an extension is mutually agreed upon by the parties.  Notice to tldraw that you intend to initiate an Informal Dispute Resolution Conference should be sent by email to legal@tldraw.com or regular mail to our offices located at 548 Market Street - Suite 85507, San Francisco, CA 94104.  The Notice must include: (1) your name, telephone number, mailing address, e‐mail address associated with your Account (if you have one); (2) the name, telephone number, mailing address and e‐mail address of your counsel, if any; and (3) a description of your Dispute.</p><p id="1843e4c3-24c0-80c1-bb1b-e075bfb9e94d" class="">The Informal Dispute Resolution Conference shall be individualized such that a separate conference must be held each time either party initiates a Dispute, even if the same law firm or group of law firms represents multiple users in similar cases, unless all parties agree; multiple individuals initiating a Dispute cannot participate in the same Informal Dispute Resolution Conference unless all parties agree.  In the time between a party receiving the Notice and the Informal Dispute Resolution Conference, nothing in this Arbitration Agreement shall prohibit the parties from engaging in informal communications to resolve the initiating party’s Dispute.  Engaging in the Informal Dispute Resolution Conference is a condition precedent and requirement that must be fulfilled before commencing arbitration.  The statute of limitations and any filing fee deadlines shall be tolled while the parties engage in the Informal Dispute Resolution Conference process required by this section.</p><p id="1843e4c3-24c0-8036-8352-d67331c63009" class=""><strong>13.3 Waiver of Jury Trial. </strong>YOU AND TLDRAW HEREBY WAIVE ANY CONSTITUTIONAL AND STATUTORY RIGHTS TO SUE IN COURT AND HAVE A TRIAL IN FRONT OF A JUDGE OR A JURY. You and tldraw are instead electing that all Disputes shall be resolved by arbitration under this Arbitration Agreement, except as specified in Section 1. There is no judge or jury in arbitration, and court review of an arbitration award is subject to very limited review.</p><p id="1843e4c3-24c0-8034-b4a2-f54f5feea13a" class=""><strong>13.4 Waiver of Class and Other Non-Individualized Relief.</strong> YOU AND TLDRAW AGREE THAT, EXCEPT AS SPECIFIED IN SECTION 9, EACH OF US MAY BRING CLAIMS AGAINST THE OTHER ONLY ON AN INDIVIDUAL BASIS AND NOT ON A CLASS, REPRESENTATIVE, OR COLLECTIVE BASIS, AND THE PARTIES HEREBY WAIVE ALL RIGHTS TO HAVE ANY DISPUTE BE BROUGHT, HEARD, ADMINISTERED, RESOLVED, OR ARBITRATED ON A CLASS, COLLECTIVE, REPRESENTATIVE, OR MASS ACTION BASIS. ONLY INDIVIDUAL RELIEF IS AVAILABLE, AND DISPUTES OF MORE THAN ONE CUSTOMER OR USER CANNOT BE ARBITRATED OR CONSOLIDATED WITH THOSE OF ANY OTHER CUSTOMER OR USER. Subject to this Arbitration Agreement, the arbitrator may award declaratory or injunctive relief only in favor of the individual party seeking relief and only to the extent necessary to provide relief warranted by the party’s individual claim. Nothing in this paragraph is intended to, nor shall it, affect the terms and conditions under Section 13.9. Notwithstanding anything to the contrary in this Arbitration Agreement, if a court decides by means of a final decision, not subject to any further appeal or recourse, that the limitations of this section are invalid or unenforceable as to a particular claim or request for relief (such as a request for public injunctive relief), you and tldraw agree that that particular claim or request for relief (and only that particular claim or request for relief) shall be severed from the arbitration and may be litigated in the state or federal courts located in the State of California. All other Disputes shall be arbitrated or litigated in small claims court. This section does not prevent you or tldraw from participating in a class-wide settlement of claims.</p><p id="1843e4c3-24c0-8038-81f7-e24af2bc9769" class=""><strong>13.5 Rules and Forum.</strong> This Agreement evidences a transaction involving interstate commerce; and notwithstanding any other provision herein with respect to the applicable substantive law, the Federal Arbitration Act, 9 U.S.C. § 1 <em>et seq.</em>, will govern the interpretation and enforcement of this Arbitration Agreement and any arbitration proceedings. If the Informal Dispute Resolution process described above does not resolve satisfactorily within sixty (60) days after receipt of your Notice, you and tldraw agree that either party shall have the right to finally resolve the Dispute through binding arbitration. The arbitration will be administered by the American Arbitration Association (<strong>“AAA”</strong>), in accordance with the Consumer Arbitration Rules (the <strong>“AAA Rules”</strong>) then in effect, except as modified by this section of this Arbitration Agreement. The AAA Rules are currently available at:</p><p id="1843e4c3-24c0-8090-b19b-e4168e98c1f2" class=""><a href="https://www.adr.org/sites/default/files/Consumer%20Rules.pdf">https://www.adr.org/sites/default/files/Consumer%20Rules.pdf</a>.</p><p id="1843e4c3-24c0-80ca-8c2e-ea0b8372b227" class="">A party who wishes to initiate arbitration must provide the other party with a request for arbitration (the <strong>“Request”</strong>).  The Request must include: (1) the name, telephone number, mailing address, e‐mail address of the party seeking arbitration and the account username (if applicable) as well as the email address associated with any applicable Account; (2) a statement of the legal claims being asserted and the factual bases of those claims; (3) a description of the remedy sought and an accurate, good‐faith calculation of the amount in controversy in United States dollars; (4) a statement certifying completion of the Informal Dispute Resolution process as described above; and (5) evidence that the requesting party has paid any necessary filing fees in connection with such arbitration.</p><p id="1843e4c3-24c0-80f6-a4ae-d0b502cca009" class="">If the party requesting arbitration is represented by counsel, the Request shall also include counsel’s name, telephone number, mailing address, and email address.  Such counsel must also sign the Request.  By signing the Request, counsel certifies to the best of counsel’s knowledge, information, and belief, formed after an inquiry reasonable under the circumstances, that: (1) the Request is not being presented for any improper purpose, such as to harass, cause unnecessary delay, or needlessly increase the cost of dispute resolution; (2) the claims, defenses and other legal contentions are warranted by existing law or by a nonfrivolous argument for extending, modifying, or reversing existing law or for establishing new law; and (3) the factual and damages contentions have evidentiary support or, if specifically so identified, will likely have evidentiary support after a reasonable opportunity for further investigation or discovery.</p><p id="1843e4c3-24c0-80b5-b3ce-e9003ef4707e" class="">Unless you and tldraw otherwise agree, or the Batch Arbitration process discussed in Section 13.9 is triggered, the arbitration will be conducted in the county where you reside.  Subject to the AAA Rules, the arbitrator may direct a limited and reasonable exchange of information between the parties, consistent with the expedited nature of the arbitration.  If the AAA is not available to arbitrate, the parties will select an alternative arbitral forum.  Your responsibility to pay any AAA fees and costs will be solely set forth in the applicable AAA Rules.</p><p id="1843e4c3-24c0-8060-8b6d-d972becc6131" class="">You and tldraw agree that all materials and documents exchanged during the arbitration proceedings shall be kept confidential and shall not be shared with anyone except the parties’ attorneys, accountants, or business advisors, and shall be subject to the condition that they agree to keep all materials and documents exchanged during the arbitration proceedings confidential.</p><p id="1843e4c3-24c0-80fb-89ea-f722299e4e9e" class=""><strong>13.6 Arbitrator. </strong>The arbitrator will be either a retired judge or an attorney licensed to practice law in the State of California and will be selected by the parties from the AAA’s roster of consumer dispute arbitrators. If the parties are unable to agree upon an arbitrator within thirty-five (35) days of delivery of the Request, then the AAA will appoint the arbitrator in accordance with the AAA Rules, provided that if the Batch Arbitration process under Section 13.9 is triggered, the AAA will appoint the arbitrator for each batch.</p><p id="1843e4c3-24c0-8009-8ec9-c2019e05d608" class=""><strong>13.7 Authority of Arbitrator. </strong>The arbitrator shall have exclusive authority to resolve any Dispute, including, without limitation, disputes arising out of or related to the interpretation or application of the Arbitration Agreement, including the enforceability, revocability, scope, or validity of the Arbitration Agreement or any portion of the Arbitration Agreement, except for the following: (1) all Disputes arising out of or relating to Section 4, including any claim that all or part of Section 13.4 is unenforceable, illegal, void or voidable, or that such Section 13.4 has been breached, shall be decided by a court of competent jurisdiction and not by an arbitrator; (2) except as expressly contemplated in Section 13.9, all Disputes about the payment of arbitration fees shall be decided only by a court of competent jurisdiction and not by an arbitrator; (3) all Disputes about whether either party has satisfied any condition precedent to arbitration shall be decided only by a court of competent jurisdiction and not by an arbitrator; and (4) all Disputes about which version of the Arbitration Agreement applies shall be decided only by a court of competent jurisdiction and not by an arbitrator. The arbitration proceeding will not be consolidated with any other matters or joined with any other cases or parties, except as expressly provided in Section 13.9. The arbitrator shall have the authority to grant motions dispositive of all or part of any Dispute. The arbitrator shall issue a written award and statement of decision describing the essential findings and conclusions on which the award is based, including the calculation of any damages awarded. The award of the arbitrator is final and binding upon you and us. Judgment on the arbitration award may be entered in any court having jurisdiction.</p><p id="1843e4c3-24c0-80da-9280-ea9202e0b1ac" class=""><strong>13.8 Attorneys’ Fees and Costs. </strong>The parties shall bear their own attorneys’ fees and costs in arbitration unless the arbitrator finds that either the substance of the Dispute or the relief sought in the Request was frivolous or was brought for an improper purpose (as measured by the standards set forth in Federal Rule of Civil Procedure 11(b)). If you or tldraw need to invoke the authority of a court of competent jurisdiction to compel arbitration, then the party that obtains an order compelling arbitration in such action shall have the right to collect from the other party its reasonable costs, necessary disbursements, and reasonable attorneys’ fees incurred in securing an order compelling arbitration. The prevailing party in any court action relating to whether either party has satisfied any condition precedent to arbitration, including the Informal Dispute Resolution process, is entitled to recover their reasonable costs, necessary disbursements, and reasonable attorneys’ fees and costs.</p><p id="1843e4c3-24c0-80c7-8150-d5cdfcd58e74" class=""><strong>13.9 Batch Arbitration. </strong>To increase the efficiency of administration and resolution of arbitrations, you and agree that tldraw in the event that there are one-hundred (100) or more individual Requests of a substantially similar nature filed against tldraw by or with the assistance of the same law firm, group of law firms, or organizations, within a thirty (30) day period (or as soon as possible thereafter), the AAA shall (1) administer the arbitration demands in batches of 100 Requests per batch (plus, to the extent there are less than 100 Requests left over after the batching described above, a final batch consisting of the remaining Requests); (2) appoint one arbitrator for each batch; and (3) provide for the resolution of each batch as a single consolidated arbitration with one set of filing and administrative fees due per side per batch, one procedural calendar, one hearing (if any) in a place to be determined by the arbitrator, and one final award (<strong>“Batch Arbitration”</strong>).</p><p id="1843e4c3-24c0-80b1-88c5-eab53e406d37" class="">All parties agree that Requests are of a “substantially similar nature” if they arise out of or relate to the same event or factual scenario and raise the same or similar legal issues and seek the same or similar relief.  To the extent the parties disagree on the application of the Batch Arbitration process, the disagreeing party shall advise the AAA, and the AAA shall appoint a sole standing arbitrator to determine the applicability of the Batch Arbitration process (<strong>“Administrative Arbitrator”</strong>).  In an effort to expedite resolution of any such dispute by the Administrative Arbitrator, the parties agree the Administrative Arbitrator may set forth such procedures as are necessary to resolve any disputes promptly.  The Administrative Arbitrator’s fees shall be paid by tldraw.</p><p id="1843e4c3-24c0-8009-a33f-e31680af7b28" class="">You and tldraw agree to cooperate in good faith with the AAA to implement the Batch Arbitration process including the payment of single filing and administrative fees for batches of Requests, as well as any steps to minimize the time and costs of arbitration, which may include: (1) the appointment of a discovery special master to assist the arbitrator in the resolution of discovery disputes; and (2) the adoption of an expedited calendar of the arbitration proceedings.</p><p id="1843e4c3-24c0-801a-b0b8-c31a40f2de0e" class="">This Batch Arbitration provision shall in no way be interpreted as authorizing a class, collective and/or mass arbitration or action of any kind, or arbitration involving joint or consolidated claims under any circumstances, except as expressly set forth in this provision.</p><p id="1843e4c3-24c0-8077-a90b-fa415d5179d3" class=""><strong>13.10 30-Day Right to Opt Out. </strong>You have the right to opt out of the provisions of this Arbitration Agreement by sending written notice of your decision to opt out to: 548 Market Street - Suite 85507, San Francisco, CA 94104, within thirty (30) days after first becoming subject to this Arbitration Agreement. Your notice must include your name and address, the email address associated with your Account (if you have one), and an unequivocal statement that you want to opt out of this Arbitration Agreement. If you opt out of this Arbitration Agreement, all other parts of this Agreement will continue to apply to you. Opting out of this Arbitration Agreement has no effect on any other arbitration agreements that you may currently have, or may enter in the future, with us.</p><p id="1843e4c3-24c0-803b-9364-ee3778fc39a0" class=""><strong>13.11 Invalidity, Expiration. </strong>Except as provided in Section 4, if any part or parts of this Arbitration Agreement are found under the law to be invalid or unenforceable, then such specific part or parts shall be of no force and effect and shall be severed and the remainder of the Arbitration Agreement shall continue in full force and effect. You further agree that any Dispute that you have with tldraw as detailed in this Arbitration Agreement must be initiated via arbitration within the applicable statute of limitation for that claim or controversy, or it will be forever time barred. Likewise, you agree that all applicable statutes of limitation will apply to such arbitration in the same manner as those statutes of limitation would apply in the applicable court of competent jurisdiction.</p><p id="1843e4c3-24c0-8088-8ef5-e7b321b43ab0" class=""><strong>13.12 Modification</strong>. Notwithstanding any provision in this Agreement to the contrary, we agree that if tldraw makes any future material change to this Arbitration Agreement, we will notify you. Unless you reject the change within thirty (30) days of such change become effective by writing to tldraw at 548 Market Street - Suite 85507, San Francisco, CA 94104, your continued use of the Services, including the acceptance of products and services offered on the Services following the posting of changes to this Arbitration Agreement constitutes your acceptance of any such changes. Changes to this Arbitration Agreement do not provide you with a new opportunity to opt out of the Arbitration Agreement if you have previously agreed to a version of this Agreement and did not validly opt out of arbitration. If you reject any change or update to this Arbitration Agreement, and you were bound by an existing agreement to arbitrate Disputes arising out of or relating in any way to your access to or use of the Services, any communications you receive, any products sold or distributed through the Services or this Agreement, the provisions of this Arbitration Agreement as of the date you first accepted this Agreement (or accepted any subsequent changes to this Agreement) remain in full force and effect. tldraw will continue to honor any valid opt outs of the Arbitration Agreement that you made to a prior version of this Agreement.</p><h3 id="1843e4c3-24c0-802b-9964-fafe0e47db12" class=""><strong>14 General Provisions</strong></h3><p id="1843e4c3-24c0-80e8-a3dc-e92fd1255dce" class=""><strong>14.1 Electronic Communications.</strong> The communications between you and tldraw may take place via electronic means, whether you visit any of the Services or send tldraw e-mails, or whether tldraw posts notices on the Website or other Services or communicates with you via e-mail. For contractual purposes, you (a) consent to receive communications from tldraw in an electronic form; and (b) agree that all terms and conditions, agreements, notices, disclosures, and other communications that tldraw provides to you electronically satisfy any legal requirement that such communications would satisfy if it were to be in writing. The foregoing does not affect your statutory rights, including the Electronic Signatures in Global and National Commerce Act at 15 U.S.C. §7001 et seq. (“<strong>E-Sign</strong>”).</p><p id="1843e4c3-24c0-8002-ab73-c128f0c1f280" class=""><strong>14.2 Assignment. </strong>The Agreement, and your rights and obligations hereunder, may not be assigned, subcontracted, delegated or otherwise transferred by you without tldraw’s prior written consent. tldraw may, without your consent, freely assign and transfer this Agreement, including any of its rights, obligations, or licenses granted under this Agreement. Any attempted assignment, subcontract, delegation, or transfer in violation of the foregoing will be null and void.</p><p id="1843e4c3-24c0-80fa-80db-cd6162d42c6a" class=""><strong>14.3 Force Majeure. </strong>tldraw shall not be liable for any delay or failure to perform resulting from causes outside its reasonable control, including, but not limited to, acts of God, war, terrorism, riots, embargos, acts of civil or military authorities, fire, floods, accidents, pandemics, strikes or shortages of transportation facilities, fuel, energy, labor or materials.</p><p id="1843e4c3-24c0-8043-8514-dd5f3a4a7805" class=""><strong>14.4 Questions, Complaints, Claims.</strong> If you have any questions, complaints or claims with respect to the Services, please contact us at: tldraw, Inc., 548 Market Street - Suite 85507, San Francisco, CA 94104. We will do our best to address your concerns. If you feel that your concerns have been addressed incompletely, we invite you to let us know for further investigation.</p><p id="1843e4c3-24c0-8087-b348-c98b5f89962a" class=""><strong>14.5 Consumer Complaints.</strong> In accordance with California Civil Code §1789.3, you may report complaints to the Complaint Assistance Unit of the Division of Consumer Service of the California Department of Consumer Affairs by contacting them in writing at 1625 North Market Blvd., Suite N 112, Sacramento, CA 95834, or by telephone at (800) 952-5210.</p><p id="1843e4c3-24c0-8065-8872-d1169a21d4a5" class=""><strong>14.6 Agreement Updates. </strong>When changes are made, tldraw will make a new copy of this Terms of Use and/or Supplemental Terms, as applicable, available on the Services, and we will also update the “Last Updated” date at the top of this Agreement. If we make any material changes and you have registered an Account with us, we will also send an email with an updated copy of this Agreement to you at the email address associated with your Account. Unless otherwise stated in such update, any changes to this Agreement will be effective immediately for users without an Account and thirty (30) days after posting for users with an Account. tldraw may require you to provide consent to the updated Agreement in a specified manner before further use of the Services is permitted. IF YOU DO NOT AGREE TO ANY CHANGE(S) AFTER RECEIVING A NOTICE OF SUCH CHANGE(S), YOU SHALL STOP USING THE SERVICES.</p><p id="1843e4c3-24c0-80d4-b400-e0b602cb3bb0" class=""><strong>14.7 Governing Law.</strong> ThIS AGREEMENT and any action related thereto will be governed and interpreted by and under the laws of the State of CALIFORNIA, consistent with the Federal Arbitration Act, without giving effect to any principles that provide for the application of the law of another jurisdiction. The United Nations Convention on Contracts for the International Sale of Goods does not apply to the AGREEMENT.</p><p id="1843e4c3-24c0-8002-b43d-cab31b7c68d7" class=""><strong>14.8 Notice. </strong>Where tldraw requires that you provide an email address, you are responsible for providing tldraw with a valid and current email address. In the event that the email address you provide to tldraw is not valid, or for any reason is not capable of delivering to you any notices required by this Agreement, tldraw’s dispatch of the email containing such notice will nonetheless constitute effective notice. You may give notice to tldraw at the following address: tldraw, Inc., 548 Market Street - Suite 85507, San Francisco, CA 94104. Such notice shall be deemed given when received by tldraw by letter delivered by nationally recognized overnight delivery service or first class postage prepaid mail at the above address.</p><p id="1843e4c3-24c0-8020-a0ef-fdb476293919" class=""><strong>14.9 Waiver. </strong>Any waiver or failure to enforce any provision of this Agreement on one occasion will not be deemed a waiver of any other provision or of such provision on any other occasion.</p><p id="1843e4c3-24c0-807f-b303-c1bf3ca1ca68" class=""><strong>14.10 Severability. </strong>If any portion of this Agreement is held invalid or unenforceable, that portion must be construed in a manner to reflect, as nearly as possible, the original intention of the parties, and the remaining portions must remain in full force and effect.</p><p id="1843e4c3-24c0-80b9-b29e-dacd1fd8fc56" class=""><strong>14.11 Export Control.</strong> You may not use, export, import, or transfer the Services except as authorized by U.S. law, the laws of the jurisdiction in which you obtained the Service, and any other applicable laws. In particular, but without limitation, the Services may not be exported or re-exported (i) into any United States embargoed countries, or (ii) to anyone on the U.S. Treasury Department’s list of Specially Designated Nationals or the U.S. Department of Commerce’s Denied Person’s List or Entity List. By using the Service, you represent and warrant that (A) you are not located in a country that is subject to a U.S. Government embargo, or that has been designated by the U.S. Government as a “terrorist supporting” country and (B) you are not listed on any U.S. Government list of prohibited or restricted parties. You also will not use the Services for any purpose prohibited by U.S. law, including the development, design, manufacture or production of missiles, nuclear, chemical or biological weapons. You acknowledge and agree that products, services or technology provided by tldraw are subject to the export control laws and regulations of the United States. You shall comply with these laws and regulations and shall not, without prior U.S. government authorization, export, re-export, or transfer tldraw products, services or technology, either directly or indirectly, to any country in violation of such laws and regulations.</p><p id="1843e4c3-24c0-80d1-8443-d3fd3f158dc6" class=""><strong>14.12 Entire Agreement.</strong> The Agreement is the final, complete and exclusive agreement of the parties with respect to the subject matter hereof and supersedes and merges all prior discussions between the parties with respect to such subject matter.</p></div></article><span class="sans" style="font-size:14px;padding-top:2em"></span></body></html>
\ No newline at end of file
diff --git a/apps/dotcom/client/src/__snapshots__/routes.test.tsx.snap b/apps/dotcom/client/src/__snapshots__/routes.test.tsx.snap
index a3ef07bc82b2..690622b7d779 100644
--- a/apps/dotcom/client/src/__snapshots__/routes.test.tsx.snap
+++ b/apps/dotcom/client/src/__snapshots__/routes.test.tsx.snap
@@ -26,6 +26,18 @@ exports[`the_routes 1`] = `
     "reactRouterPattern": "/f/:fileSlug/history/:timestamp",
     "vercelRouterPattern": "^/f/[^/]*/history/[^/]*/?$",
   },
+  {
+    "reactRouterPattern": "/f/:fileSlug/pierre-history",
+    "vercelRouterPattern": "^/f/[^/]*/pierre-history/?$",
+  },
+  {
+    "reactRouterPattern": "/f/:fileSlug/pierre-history/:commitHash",
+    "vercelRouterPattern": "^/f/[^/]*/pierre-history/[^/]*/?$",
+  },
+  {
+    "reactRouterPattern": "/invite/:token",
+    "vercelRouterPattern": "^/invite/[^/]*/?$",
+  },
   {
     "reactRouterPattern": "/lf",
     "vercelRouterPattern": "^/lf/?$",
diff --git a/apps/dotcom/client/src/assets/0_merged_tla.svg b/apps/dotcom/client/src/assets/0_merged_tla.svg
index d483e69c032c..02210bc61ff8 100644
--- a/apps/dotcom/client/src/assets/0_merged_tla.svg
+++ b/apps/dotcom/client/src/assets/0_merged_tla.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none"><style><![CDATA[svg>[id]{display:none}svg>[id]:target{display:inline}]]></style><path id="icon-bookmark" fill="#000" d="M11.6 2.01a.5.5 0 0 1 .4.49v11a.5.5 0 0 1-.765.424L7.5 11.59l-3.735 2.334A.5.5 0 0 1 3 13.5v-11l.01-.1A.5.5 0 0 1 3.5 2h8zM4 12.598l2.97-1.857a1 1 0 0 1 1.06 0L11 12.598V3H4z"/><path id="icon-check" fill="#000" fill-rule="evenodd" d="M11.672 3.727c.289.189.37.576.181.865l-4.25 6.5a.625.625 0 0 1-.943.12l-2.75-2.5a.625.625 0 0 1 .84-.925l2.208 2.007 3.849-5.886a.625.625 0 0 1 .865-.181" clip-rule="evenodd"/><path id="icon-chevron-down-strong" fill="#000" stroke="#000" stroke-width=".25" d="M3.25 5.198a.625.625 0 0 0 .028.883l4 3.75c.24.225.614.225.855 0l-.086-.091.086.091 4-3.75a.625.625 0 0 0-.855-.912l-3.573 3.35-3.572-3.35a.625.625 0 0 0-.884.029Z"/><path id="icon-chevron-down" fill="#000" fill-rule="evenodd" d="M3.34 5.283a.5.5 0 0 1 .707-.023l3.658 3.43 3.658-3.43a.5.5 0 0 1 .684.73l-4 3.75a.5.5 0 0 1-.684 0l-4-3.75a.5.5 0 0 1-.023-.707" clip-rule="evenodd"/><path id="icon-chevron-right-strong" fill="#000" stroke="#000" stroke-width=".25" d="M5.403 11.956a.625.625 0 0 0 .883-.028l3.75-4a.625.625 0 0 0 0-.855l-.091.085.091-.085-3.75-4a.625.625 0 0 0-.912.855L8.724 7.5l-3.35 3.573a.625.625 0 0 0 .029.883Z"/><path id="icon-chevron-right" fill="#000" fill-rule="evenodd" d="M5.488 11.865a.5.5 0 0 1-.023-.707L8.895 7.5l-3.43-3.658a.5.5 0 0 1 .73-.684l3.75 4a.5.5 0 0 1 0 .684l-3.75 4a.5.5 0 0 1-.707.023" clip-rule="evenodd"/><path id="icon-chevron-up-strong" fill="#000" stroke="#000" stroke-width=".25" d="M12.161 9.802a.625.625 0 0 0-.028-.883l-4-3.75a.625.625 0 0 0-.855 0l.085.091-.085-.091-4 3.75a.625.625 0 0 0 .855.912l3.572-3.35 3.573 3.35a.625.625 0 0 0 .883-.029Z"/><path id="icon-chevron-up" fill="#000" fill-rule="evenodd" d="M12.07 9.717a.5.5 0 0 1-.707.023L7.705 6.31 4.047 9.74a.5.5 0 0 1-.684-.73l4-3.75a.5.5 0 0 1 .684 0l4 3.75a.5.5 0 0 1 .023.707" clip-rule="evenodd"/><path id="icon-close-strong" fill="#000" d="M13.236 3.03 8.766 7.5l4.47 4.47a.75.75 0 0 1-1.061 1.06l-4.47-4.47-4.47 4.47a.75.75 0 0 1-1.06-1.06l4.47-4.47-4.47-4.47a.75.75 0 1 1 1.06-1.06l4.47 4.47 4.47-4.47a.75.75 0 0 1 1.06 1.06"/><path id="icon-close" fill="#000" fill-rule="evenodd" d="M13.059 2.854a.5.5 0 0 0-.707-.708L7.704 6.793 3.06 2.146a.5.5 0 1 0-.707.708L6.998 7.5l-4.646 4.646a.5.5 0 0 0 .707.708l4.646-4.647 4.647 4.647a.5.5 0 0 0 .707-.708L8.412 7.5z" clip-rule="evenodd"/><path id="icon-comment" fill="#2E2E2E" d="M13 3.5a1.5 1.5 0 0 0-1.423-1.498L11.5 2H4c-.431 0-.953.18-1.366.487C2.217 2.797 2 3.166 2 3.5v5c0 .334.217.703.634 1.013C3.047 9.82 3.57 10 4 10h4l.05.002a.5.5 0 0 1 .304.144l2.146 2.147V10.5a.5.5 0 0 1 .5-.5c.731 0 1.23-.199 1.539-.464.303-.262.461-.62.461-1.036zm1 5c0 .689-.271 1.33-.808 1.793-.43.371-1.006.605-1.692.68V13.5a.5.5 0 0 1-.854.354L7.794 11H4c-.674 0-1.401-.267-1.962-.685C1.48 9.902 1 9.27 1 8.5v-5c0-.77.481-1.402 1.038-1.815C2.598 1.267 3.326 1 4 1h7.5l.128.003A2.5 2.5 0 0 1 14 3.5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-copy-strong"><g fill="#000" fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path d="M2.705 11a1.5 1.5 0 0 1-1.5-1.5v-7a1.5 1.5 0 0 1 1.5-1.5h7a1.5 1.5 0 0 1 1.5 1.5V4h1.5a1.5 1.5 0 0 1 1.5 1.5v7a1.5 1.5 0 0 1-1.5 1.5h-7a1.5 1.5 0 0 1-1.5-1.5v-7a1.5 1.5 0 0 1 1.5-1.5h4.5V2.5a.5.5 0 0 0-.5-.5h-7a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .5.5h1.5v1zm3-6a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .5.5h7a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.5-.5z"/><path d="M2.705 11a1.5 1.5 0 0 1-1.5-1.5v-7a1.5 1.5 0 0 1 1.5-1.5h7a1.5 1.5 0 0 1 1.5 1.5V4h1.5a1.5 1.5 0 0 1 1.5 1.5v7a1.5 1.5 0 0 1-1.5 1.5h-7a1.5 1.5 0 0 1-1.5-1.5V11zm1.25.25h-1.25A1.75 1.75 0 0 1 .955 9.5v-7c0-.966.784-1.75 1.75-1.75h7c.967 0 1.75.784 1.75 1.75v1.25h1.25c.967 0 1.75.783 1.75 1.75v7a1.75 1.75 0 0 1-1.75 1.75h-7a1.75 1.75 0 0 1-1.75-1.75zm.25-1.25V5.5a1.5 1.5 0 0 1 1.5-1.5h4.5V2.5a.5.5 0 0 0-.5-.5h-7a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .5.5zm-.25-.25h-1.25a.25.25 0 0 1-.25-.25v-7a.25.25 0 0 1 .25-.25h7a.25.25 0 0 1 .25.25v1.25h-4.25a1.75 1.75 0 0 0-1.75 1.75zm1.75-4.5a.25.25 0 0 0-.25.25v7c0 .138.112.25.25.25h7a.25.25 0 0 0 .25-.25v-7a.25.25 0 0 0-.25-.25zm-.5.25a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5z"/></g><defs><clipPath id="a"><path fill="#fff" d="M.205 0h15v15h-15z"/></clipPath></defs></g><path id="icon-copy" fill="#000" fill-rule="evenodd" d="M1.205 9.5a1.5 1.5 0 0 0 1.5 1.5h1.5v-1h-1.5a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5V4h-4.5a1.5 1.5 0 0 0-1.5 1.5v7a1.5 1.5 0 0 0 1.5 1.5h7a1.5 1.5 0 0 0 1.5-1.5v-7a1.5 1.5 0 0 0-1.5-1.5h-1.5V2.5a1.5 1.5 0 0 0-1.5-1.5h-7a1.5 1.5 0 0 0-1.5 1.5zm4-4a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5z" clip-rule="evenodd"/><path id="icon-doc-strong" fill="#000" fill-rule="evenodd" d="M3.705 2.25a.25.25 0 0 0-.25.25v10c0 .138.112.25.25.25h8a.25.25 0 0 0 .25-.25V6.25h-3.25a.75.75 0 0 1-.75-.75V2.25zm5.75 1.06 1.44 1.44h-1.44zm-7.5-.81c0-.966.784-1.75 1.75-1.75h5a.75.75 0 0 1 .53.22l4 4c.141.14.22.331.22.53v7a1.75 1.75 0 0 1-1.75 1.75h-8a1.75 1.75 0 0 1-1.75-1.75z" clip-rule="evenodd"/><path id="icon-doc" fill="#000" fill-rule="evenodd" d="M3.705 2a.5.5 0 0 0-.5.5v10a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V6h-3.5a.5.5 0 0 1-.5-.5V2zm5.5.707L11.498 5H9.205zm-7-.207a1.5 1.5 0 0 1 1.5-1.5h5a.5.5 0 0 1 .354.146l4 4a.5.5 0 0 1 .146.354v7a1.5 1.5 0 0 1-1.5 1.5h-8a1.5 1.5 0 0 1-1.5-1.5z" clip-rule="evenodd"/><path id="icon-dots-horizontal-strong" fill="#000" stroke="#000" stroke-width=".25" d="M10.915 8.298c.22.217.488.327.795.327q.308 0 .566-.153.251-.151.403-.404a1.1 1.1 0 0 0 .159-.57q-.001-.464-.333-.791a1.1 1.1 0 0 0-.795-.332 1.1 1.1 0 0 0-.795.332c-.22.217-.332.483-.332.79q0 .468.332.8Zm-4.005 0c.22.217.488.327.795.327q.308 0 .565-.153.252-.151.404-.404a1.1 1.1 0 0 0 .158-.57q0-.464-.333-.791a1.1 1.1 0 0 0-.794-.332 1.1 1.1 0 0 0-.795.332c-.22.217-.333.483-.333.79q0 .468.333.8Zm-4.005 0c.22.217.488.327.795.327q.309 0 .565-.153.252-.151.404-.404a1.1 1.1 0 0 0 .158-.57q-.001-.464-.332-.791a1.1 1.1 0 0 0-.795-.332 1.1 1.1 0 0 0-.795.332c-.22.217-.333.483-.333.79q0 .468.333.8Z"/><path id="icon-dots-horizontal" fill="#000" d="M11.71 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q.001-.41.296-.701a.96.96 0 0 1 .707-.296q.411 0 .707.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.136.225-.362.36a.96.96 0 0 1-.501.136m-4.005 0a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701a.97.97 0 0 1 .707-.296q.412 0 .706.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.135.225-.361.36a.96.96 0 0 1-.501.136M3.7 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701A.97.97 0 0 1 3.7 6.5q.411 0 .707.296a.95.95 0 0 1 .295.701.96.96 0 0 1-.14.507q-.135.225-.361.36A.96.96 0 0 1 3.7 8.5"/><path id="icon-dots-vertical-strong" fill="#000" stroke="#000" stroke-width=".25" d="M6.907 10.71q-.326.333-.327.795 0 .309.153.566.151.252.404.403.261.159.57.159.464 0 .791-.333.331-.332.332-.795a1.1 1.1 0 0 0-.332-.795 1.07 1.07 0 0 0-.79-.332q-.468 0-.8.332Zm0-4.005c-.217.22-.327.488-.327.795q0 .309.153.566.151.251.404.403.261.159.57.159.464-.002.791-.333.331-.332.332-.795a1.1 1.1 0 0 0-.332-.795 1.07 1.07 0 0 0-.79-.333q-.468 0-.8.333Zm0-4.005c-.217.22-.327.488-.327.795q0 .309.153.565.151.252.404.404.261.159.57.158.464-.001.791-.332.331-.331.332-.795a1.1 1.1 0 0 0-.332-.795 1.07 1.07 0 0 0-.79-.333q-.468 0-.8.333Z"/><path id="icon-dots-vertical" fill="#2E2E2E" d="M6.5 11.505q0-.411.29-.707a.97.97 0 0 1 .712-.295q.411 0 .702.295a.97.97 0 0 1 .296.707q0 .411-.296.707a.95.95 0 0 1-.702.296.96.96 0 0 1-.506-.14q-.225-.135-.36-.362a.96.96 0 0 1-.136-.5m0-4.006q0-.411.29-.707a.97.97 0 0 1 .712-.295q.411 0 .702.295A.97.97 0 0 1 8.5 7.5q0 .411-.296.707a.95.95 0 0 1-.702.296.96.96 0 0 1-.506-.14q-.225-.136-.36-.362a.96.96 0 0 1-.136-.5m0-4.006q0-.411.29-.707a.97.97 0 0 1 .712-.296q.411 0 .702.296a.97.97 0 0 1 .296.707q0 .411-.296.707a.95.95 0 0 1-.702.295.96.96 0 0 1-.506-.14q-.225-.135-.36-.36a.96.96 0 0 1-.136-.502" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-draw" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M0 1.95A1.95 1.95 0 0 1 1.95 0h11.1A1.95 1.95 0 0 1 15 1.95v11.1A1.95 1.95 0 0 1 13.05 15H1.95A1.95 1.95 0 0 1 0 13.05zM8.85 4.5a1.35 1.35 0 1 1-2.7 0 1.35 1.35 0 0 1 2.7 0m-1.793 7.65c.635.002 1.246-.88 1.475-1.372.281-.606.457-1.696.175-2.342-.198-.452-.652-.786-1.251-.786-.721 0-1.306.586-1.306 1.31 0 .2.046.387.127.553.075.154.174.314.274.476.315.508.637 1.03.244 1.398-.318.3-.218.761.262.763" clip-rule="evenodd"/></g><g id="icon-edit-strong" fill="#000" fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path d="M11.646.646a.5.5 0 0 1 .707 0l2 2a.5.5 0 0 1 0 .708l-3.942 3.942a1 1 0 0 1-.26.188L6.224 9.447a.5.5 0 0 1-.671-.67l1.964-3.928a1 1 0 0 1 .187-.26zM12 1.707l-3.59 3.59-1.037 2.076.254.254L9.704 6.59 13.293 3z"/><path d="M12.53.47a.75.75 0 0 0-1.06 0zm0 0 2 2a.75.75 0 0 1 0 1.06l-3.942 3.943a1.3 1.3 0 0 1-.325.234L6.335 9.671A.75.75 0 0 1 5.33 8.665l1.964-3.928q.091-.181.234-.325L11.47.47M6.224 9.447l3.927-1.963a1 1 0 0 0 .26-.188l3.943-3.942a.5.5 0 0 0 0-.708l-2-2a.5.5 0 0 0-.708 0L7.704 4.59a1 1 0 0 0-.187.26L5.553 8.776a.5.5 0 0 0 .67.671m2.392-4.003-.939 1.879 1.879-.94L12.939 3 12 2.06zm-.205-.148L7.373 7.373l.254.254L9.704 6.59 13.293 3 12 1.707z"/><path d="M7.5 1.5h-5a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2-2v-5H12v5a.5.5 0 0 1-.5.5h-9a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h5z"/></g><g id="icon-edit"><path fill="#2E2E2E" d="M8.054 2.5H2.52v10h9.98V6.965H14V12.5l-.002.077A1.5 1.5 0 0 1 12.5 14H2.52l-.077-.002a1.5 1.5 0 0 1-1.42-1.42L1.02 12.5v-10a1.5 1.5 0 0 1 1.423-1.498L2.521 1h5.533z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" fill-rule="evenodd" d="M12.455.25c.2 0 .391.08.532.222l1.636 1.65a.75.75 0 0 1 0 1.056l-3.872 3.904a1 1 0 0 1-.227.17l-.086.043-2.82 1.218a.75.75 0 0 1-.987-.982l1.208-2.843.042-.085a1 1 0 0 1 .169-.228L11.922.472l.055-.05a.75.75 0 0 1 .477-.172M9.182 5.363l-.437 1.03 1.01-.437 3.28-3.307-.58-.584z" clip-rule="evenodd" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><path id="icon-export" fill="#2E2E2E" d="M5 4.5a.5.5 0 0 1 0 1H3.5c-.423 0-.648.105-.771.229-.124.123-.229.348-.229.771v5.52c0 .423.105.649.229.772.123.123.348.229.771.229h8l.15-.005c.327-.022.514-.116.621-.224.124-.123.229-.349.229-.771V6.5c0-.423-.105-.648-.229-.771-.123-.124-.348-.229-.771-.229H10a.5.5 0 0 1 0-1h1.5c.577 0 1.102.145 1.479.521.376.377.521.902.521 1.479v5.52c0 .578-.145 1.102-.521 1.479-.33.33-.773.482-1.265.515l-.214.007h-8c-.577 0-1.102-.145-1.479-.522-.376-.377-.521-.902-.521-1.479V6.5c0-.577.145-1.102.521-1.479.377-.376.902-.521 1.479-.521zM7.5.02a.5.5 0 0 1 .336.13l.037.038 2 2.25a.5.5 0 0 1-.747.665L8 1.835V8.75a.5.5 0 0 1-1 0V1.835L5.873 3.103a.5.5 0 0 1-.747-.666l2-2.25.037-.037A.5.5 0 0 1 7.5.02" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-external"><path fill="#000" fill-rule="evenodd" d="M3 3.008a1 1 0 0 0-1 1V12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V8.5a.5.5 0 0 0-1 0V12H3V4.008h3.5a.5.5 0 0 0 0-1z" clip-rule="evenodd"/><path fill="#000" fill-rule="evenodd" d="M13 2.5v3a.5.5 0 0 1-1 0V3.707L6.854 8.854a.5.5 0 0 1-.708-.708L11.293 3H9.5a.5.5 0 0 1 0-1h3a.5.5 0 0 1 .5.497" clip-rule="evenodd"/></g><g id="icon-group-strong" fill="#000" stroke="#000" stroke-width=".25" clip-path="url(#a)"><path d="M9.037 6.034a3.23 3.23 0 0 0-1.48-2.073 1.975 1.975 0 1 1 1.48 2.073ZM9.525.895a3.226 3.226 0 0 0-3.17 2.634A3.225 3.225 0 1 0 9.056 7.31q.23.033.468.034a3.225 3.225 0 0 0 0-6.45ZM3.91 6.72a1.975 1.975 0 1 1 3.95 0 1.975 1.975 0 0 1-3.95 0Z"/><path stroke-linecap="round" d="M8.609 7.436q.44-.09.916-.091c2.31 0 4.055 1.65 4.055 3.535a.625.625 0 1 0 1.25 0c0-2.71-2.447-4.785-5.305-4.785q-.6.001-1.164.115a.625.625 0 1 0 .248 1.226ZM1.83 13.48c0-1.886 1.745-3.535 4.055-3.535s4.055 1.65 4.055 3.535a.625.625 0 1 0 1.25 0c0-2.71-2.447-4.785-5.305-4.785S.58 10.77.58 13.48a.625.625 0 1 0 1.25 0Z"/></g><g id="icon-group" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M7.427 4.03A2.1 2.1 0 1 1 8.93 6.135 3.1 3.1 0 0 0 7.427 4.03m-.97-.357a3.1 3.1 0 1 1 2.496 3.494 3.1 3.1 0 1 1-2.496-3.494M3.785 6.72a2.1 2.1 0 1 1 4.2 0 2.1 2.1 0 0 1-4.2 0" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" d="M14.205 10.88c0-2.298-2.095-4.16-4.68-4.16q-.537.001-1.04.103m2.08 6.657c0-2.298-2.095-4.16-4.68-4.16s-4.68 1.862-4.68 4.16"/></g><g id="icon-help-circle" clip-path="url(#a)"><path fill="#000" d="M7.499.877a6.623 6.623 0 1 1 0 13.246A6.623 6.623 0 0 1 7.5.877m0 .95a5.674 5.674 0 1 0 0 11.347 5.674 5.674 0 0 0 0-11.347m0 7.923a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5m0-5.924c1.435 0 2.55 1.103 2.55 2.424 0 1.104-.73 1.64-1.265 1.965-.3.182-.48.272-.635.392a.5.5 0 0 0-.1.097.55.55 0 0 1-1.099-.003c0-.468.282-.773.525-.962.22-.172.54-.341.74-.463.465-.283.735-.535.735-1.026 0-.677-.585-1.324-1.45-1.325s-1.45.648-1.45 1.325a.55.55 0 0 1-1.1 0c0-1.322 1.115-2.424 2.55-2.424"/></g><path id="icon-home-strong" fill="#000" stroke="#000" stroke-width=".25" d="m14.963 7.748-6.75-6.64a.725.725 0 0 0-1.016 0l-6.75 6.64a.725.725 0 1 0 1.016 1.034l.617-.607v5.3c0 .345.28.625.625.625h10c.345 0 .625-.28.625-.625v-5.3l.617.607a.725.725 0 0 0 1.017-1.034ZM3.33 6.946l4.375-4.304 4.375 4.304v5.904h-1.75V9.475a.625.625 0 0 0-.625-.625h-3a.625.625 0 0 0-.625.625v3.375H3.33zM9.08 10.1v2.75H7.33V10.1z"/><g id="icon-home" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M7.284 1.197a.6.6 0 0 1 .842 0l6.75 6.64a.6.6 0 0 1-.842.856l-.829-.816v5.598a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5V7.877l-.83.816a.6.6 0 1 1-.84-.856zm.421 1.27 4.5 4.426v6.082h-2v-3.5a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0-.5.5v3.5h-3V6.893zm-.5 10.508h2v-3h-2z" clip-rule="evenodd"/></g><path id="icon-import" fill="#000" fill-rule="evenodd" d="M3 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V8.5a.5.5 0 0 0-1 0V12H3V3h3.5a.5.5 0 0 0 0-1zm3 6.5v-3a.5.5 0 0 1 1 0v1.793l5.146-5.147a.5.5 0 0 1 .708.708L7.707 8H9.5a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.497" clip-rule="evenodd"/><g id="icon-info" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M7.5.877a6.623 6.623 0 1 0 0 13.246A6.623 6.623 0 0 0 7.5.877M1.827 7.5a5.673 5.673 0 1 1 11.346 0 5.673 5.673 0 0 1-11.346 0m6.423-3a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0M6 6h1.5a.5.5 0 0 1 .5.5V10h1v1H6v-1h1V7H6z" clip-rule="evenodd"/></g><path id="icon-link-strong" fill="#000" fill-rule="evenodd" d="M8.858 3.212c.597-.405 1.342-.408 1.889-.049.117.077.25.204.67.625.421.42.548.553.625.67.36.547.357 1.293-.049 1.89-.088.13-.229.275-.664.71l-.619.62a.75.75 0 1 0 1.061 1.06l.619-.619.056-.056c.356-.356.61-.609.788-.872.73-1.074.77-2.477.062-3.556-.173-.263-.422-.512-.76-.85l-.058-.058-.057-.057c-.338-.339-.587-.587-.85-.76-1.08-.709-2.483-.668-3.556.061-.264.18-.516.432-.873.789l-.056.056-.618.618a.75.75 0 0 0 1.06 1.061l.62-.619c.434-.435.58-.576.71-.664M4.7 7.324a.75.75 0 1 0-1.06-1.061l-.62.619-.055.056c-.357.356-.61.609-.789.872-.729 1.073-.77 2.477-.062 3.555.173.264.422.513.76.85l.058.058.058.058c.338.338.586.587.85.76 1.079.709 2.482.667 3.556-.062.263-.179.516-.432.872-.788l.056-.056.619-.619a.75.75 0 0 0-1.061-1.06l-.619.618c-.435.435-.58.576-.71.664-.597.406-1.343.409-1.89.05-.117-.078-.25-.205-.67-.625s-.548-.554-.625-.671c-.359-.547-.356-1.292.05-1.89.087-.129.228-.275.663-.71zm5.304-1.062a.75.75 0 1 0-1.061-1.06L5.407 8.737a.75.75 0 0 0 1.061 1.061z" clip-rule="evenodd"/><path id="icon-link" fill="#000" fill-rule="evenodd" d="M8.717 3.005c.676-.46 1.532-.468 2.167-.051.144.095.298.245.71.657s.563.566.657.71c.418.636.409 1.49-.051 2.167-.105.154-.267.32-.694.747l-.619.619a.5.5 0 0 0 .707.707l.619-.619.043-.043c.37-.37.606-.606.771-.849.675-.994.71-2.288.06-3.278-.159-.241-.39-.472-.741-.824l-.045-.044-.044-.045c-.352-.351-.583-.582-.824-.74-.99-.651-2.284-.616-3.278.059-.243.165-.48.402-.849.771l-.043.043-.619.619a.5.5 0 1 0 .708.707L7.97 3.7c.427-.427.593-.589.747-.694m-4.194 4.14a.5.5 0 0 0-.707-.707l-.619.62-.043.042c-.37.37-.606.606-.77.85-.676.993-.711 2.287-.06 3.277.158.241.389.472.74.824l.045.044.045.045c.35.351.582.582.823.741.99.65 2.284.615 3.278-.06.243-.165.48-.402.85-.771l.042-.043.619-.619a.5.5 0 1 0-.707-.707l-.619.619c-.427.427-.593.59-.747.694-.676.46-1.531.468-2.167.051-.144-.095-.298-.245-.71-.657s-.562-.566-.657-.71c-.417-.635-.408-1.49.051-2.167.105-.154.267-.32.694-.747zm5.304-1.06a.5.5 0 1 0-.707-.708L5.584 8.914a.5.5 0 1 0 .707.707z" clip-rule="evenodd"/><path id="icon-manual" fill="#2E2E2E" fill-rule="evenodd" d="M9.261 1.497c1.072-.266 2.248-.247 2.73-.225a.74.74 0 0 1 .704.743v.245h1.055a.75.75 0 0 1 .75.75v9.503a.75.75 0 0 1-.75.75H1.25a.75.75 0 0 1-.75-.75V3.01a.75.75 0 0 1 .75-.75h1.055v-.245l.003-.072a.74.74 0 0 1 .702-.671l.211-.008c.562-.015 1.58 0 2.518.232.535.133 1.088.347 1.516.705q.132.11.245.238.113-.128.246-.238c.427-.358.98-.572 1.515-.705m3.433 9.479-.004.08a.76.76 0 0 1-.786.675c-.486-.02-1.533-.025-2.441.208a3.3 3.3 0 0 0-.833.324h4.87V3.26h-.805zM1.5 3.26v9.003h4.87a3.3 3.3 0 0 0-.833-.324c-.795-.204-1.696-.225-2.235-.214l-.207.006a.76.76 0 0 1-.786-.675l-.004-.08V3.26zm1.805-.997v8.462c.584-.011 1.574.013 2.48.246.419.107.847.265 1.215.505V3.778a1 1 0 0 0-.386-.81c-.263-.22-.651-.386-1.116-.501-.785-.195-1.664-.215-2.193-.204m8.39 0c-.53-.01-1.408.009-2.193.204-.464.115-.852.281-1.115.501a1 1 0 0 0-.38.682L8 3.778v7.698c.368-.24.796-.398 1.214-.505.907-.233 1.896-.257 2.48-.246z" clip-rule="evenodd" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path id="icon-more" fill="#000" d="M11.505 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701a.96.96 0 0 1 .707-.296q.411 0 .707.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.136.225-.362.36a.96.96 0 0 1-.501.136M7.5 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701A.97.97 0 0 1 7.5 6.5q.412 0 .706.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.135.225-.361.36A.96.96 0 0 1 7.5 8.5m-4.005 0a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701a.97.97 0 0 1 .707-.296q.412 0 .706.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.135.225-.361.36a.96.96 0 0 1-.501.136"/><path id="icon-pin-strong" fill="#000" fill-rule="evenodd" d="M9.836 1.97a.75.75 0 0 0-1.06 1.06l.449.45L4.78 6.813l-.954-.954a.75.75 0 0 0-1.06 1.06l1.413 1.415.884.884L1.97 12.31a.75.75 0 0 0 1.06 1.06l3.094-3.093.884.884 1.414 1.414a.75.75 0 1 0 1.06-1.06l-.954-.955 3.334-4.444.45.449a.75.75 0 0 0 1.06-1.06l-1.06-1.061-1.415-1.415zM5.852 7.884l4.444-3.333.495.494L7.457 9.49z" clip-rule="evenodd"/><path id="icon-pin" fill="#2E2E2E" d="M8.952 2.146a.5.5 0 0 1 .707 0l3.536 3.536a.5.5 0 0 1-.707.707l-.653-.653-3.637 4.849 1.108 1.107a.5.5 0 1 1-.707.707L6.124 9.925l-3.27 3.27a.5.5 0 1 1-.708-.707l3.27-3.27-2.474-2.475a.5.5 0 1 1 .707-.707l1.107 1.107 4.849-3.637-.653-.653a.5.5 0 0 1 0-.707M5.471 7.857l2.013 2.014 3.637-4.85-.802-.8z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path id="icon-plus-strong" fill="#000" stroke="#000" stroke-width=".25" d="M8.33 2.75a.625.625 0 0 0-1.25 0v4.125H2.955a.625.625 0 1 0 0 1.25H7.08v4.125a.625.625 0 0 0 1.25 0V8.125h4.125a.625.625 0 0 0 0-1.25H8.33z"/><path id="icon-plus" fill="#000" fill-rule="evenodd" d="M8.205 2.75a.5.5 0 0 0-1 0V7h-4.25a.5.5 0 0 0 0 1h4.25v4.25a.5.5 0 0 0 1 0V8h4.25a.5.5 0 0 0 0-1h-4.25z" clip-rule="evenodd"/><path id="icon-qr" fill="#000" fill-rule="evenodd" d="M3.005 1h-.05c-.229 0-.426 0-.6.041A1.5 1.5 0 0 0 1.247 2.15c-.042.174-.042.371-.042.6v2.5c0 .229 0 .426.042.6a1.5 1.5 0 0 0 1.108 1.11c.174.041.371.041.6.041h2.5c.229 0 .426 0 .6-.041a1.5 1.5 0 0 0 1.109-1.11c.042-.174.041-.371.041-.6v-2.5c0-.229 0-.426-.041-.6a1.5 1.5 0 0 0-1.109-1.11C5.881 1 5.684 1 5.455 1zm-.417 1.014c.043-.01.11-.014.417-.014h2.4c.308 0 .374.003.417.014a.5.5 0 0 1 .37.37c.01.042.013.108.013.416v2.4c0 .308-.003.374-.014.417a.5.5 0 0 1-.37.37c-.042.01-.108.013-.416.013h-2.4c-.308 0-.374-.003-.417-.014a.5.5 0 0 1-.369-.37c-.01-.042-.014-.108-.014-.416V2.8c0-.308.004-.374.014-.417a.5.5 0 0 1 .37-.37M10.005 1h-.05c-.229 0-.426 0-.6.041A1.5 1.5 0 0 0 8.247 2.15c-.042.174-.042.371-.042.6v2.5c0 .229 0 .426.042.6a1.5 1.5 0 0 0 1.108 1.11c.174.041.371.041.6.041h2.5c.229 0 .426 0 .6-.041a1.5 1.5 0 0 0 1.109-1.109c.042-.174.041-.371.041-.6v-2.5c0-.229 0-.426-.041-.6a1.5 1.5 0 0 0-1.109-1.109C12.881 1 12.684 1 12.455 1zm-.417 1.014c.043-.01.11-.014.417-.014h2.4c.308 0 .374.003.417.014a.5.5 0 0 1 .37.37c.01.042.013.108.013.416v2.4c0 .308-.003.374-.014.417a.5.5 0 0 1-.37.37c-.042.01-.108.013-.416.013h-2.4c-.308 0-.374-.003-.417-.014a.5.5 0 0 1-.369-.37c-.01-.042-.014-.108-.014-.416V2.8c0-.308.004-.374.014-.417a.5.5 0 0 1 .37-.37M2.955 8h2.5c.229 0 .426 0 .6.041A1.5 1.5 0 0 1 7.164 9.15c.042.174.041.371.041.6v2.5c0 .229 0 .426-.041.6a1.5 1.5 0 0 1-1.109 1.109c-.174.041-.371.041-.6.041h-2.5c-.229 0-.426 0-.6-.041a1.5 1.5 0 0 1-1.108-1.109c-.042-.174-.042-.371-.042-.6v-2.5c0-.229 0-.426.042-.6a1.5 1.5 0 0 1 1.108-1.11c.174-.04.371-.04.6-.04m.05 1c-.308 0-.374.003-.417.014a.5.5 0 0 0-.369.37c-.01.042-.014.108-.014.416v2.4c0 .308.004.374.014.417a.5.5 0 0 0 .37.37c.042.01.108.013.416.013h2.4c.308 0 .374-.004.417-.014a.5.5 0 0 0 .37-.37c.01-.042.013-.108.013-.416V9.8c0-.308-.003-.374-.014-.417a.5.5 0 0 0-.37-.37C5.78 9.004 5.714 9 5.406 9zm7-1h-.05c-.229 0-.426 0-.6.041A1.5 1.5 0 0 0 8.247 9.15c-.042.174-.042.371-.042.6v2.5c0 .229 0 .426.042.6a1.5 1.5 0 0 0 1.108 1.109c.174.041.371.041.6.041h2.5c.229 0 .426 0 .6-.041a1.5 1.5 0 0 0 1.109-1.109c.042-.174.041-.371.041-.6v-2.5c0-.229 0-.426-.041-.6a1.5 1.5 0 0 0-1.109-1.109C12.881 8 12.684 8 12.455 8zm-.417 1.014c.043-.01.11-.014.417-.014h2.4c.308 0 .374.003.417.014a.5.5 0 0 1 .37.37c.01.042.013.108.013.416v2.4c0 .308-.003.374-.014.417a.5.5 0 0 1-.37.37c-.042.01-.108.013-.416.013h-2.4c-.308 0-.374-.004-.417-.014a.5.5 0 0 1-.369-.37c-.01-.042-.014-.108-.014-.416V9.8c0-.308.004-.374.014-.417a.5.5 0 0 1 .37-.37" clip-rule="evenodd"/><path id="icon-question-circle" fill="#000" fill-rule="evenodd" d="M1.082 7.5a6.623 6.623 0 1 1 13.246 0 6.623 6.623 0 0 1-13.246 0m6.623-5.673a5.673 5.673 0 1 0 0 11.346 5.673 5.673 0 0 0 0-11.346m.75 8.673a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m-2.2-4.25c0-.678.585-1.325 1.45-1.325s1.45.647 1.45 1.325c0 .491-.27.742-.736 1.025l-.176.104c-.183.106-.4.232-.564.36-.242.188-.524.493-.524.961a.55.55 0 0 0 1.1.004.4.4 0 0 1 .1-.098c.102-.079.215-.144.366-.232q.116-.067.27-.159c.534-.325 1.264-.861 1.264-1.965 0-1.322-1.115-2.425-2.55-2.425s-2.55 1.103-2.55 2.425a.55.55 0 1 0 1.1 0" clip-rule="evenodd"/><path id="icon-question" fill="#000" d="M7.501 10.336a.621.621 0 1 1-.002 1.242.621.621 0 0 1 .002-1.242M7.5 3.502c1.153 0 2.428.907 2.429 2.275 0 1.127-.656 1.693-1.12 2.104-.466.413-.734.67-.734 1.233a.575.575 0 0 1-1.15 0c0-1.122.66-1.684 1.12-2.093.464-.41.734-.671.734-1.244 0-.585-.602-1.124-1.279-1.124s-1.278.54-1.278 1.124a.575.575 0 0 1-1.15 0c0-1.368 1.275-2.274 2.428-2.275"/><g id="icon-refresh"><path fill="#2E2E2E" d="M7.5 1.5a.47.47 0 0 1 .5-.48 6.5 6.5 0 0 1 1.977 12.49.47.47 0 0 1-.623-.303.537.537 0 0 1 .313-.65A5.501 5.501 0 0 0 8 2.021a.537.537 0 0 1-.499-.523M7.5 13.5a.47.47 0 0 1-.499.48A6.5 6.5 0 0 1 5.023 1.49a.47.47 0 0 1 .623.303.537.537 0 0 1-.313.65A5.501 5.501 0 0 0 7 12.979a.537.537 0 0 1 .499.523" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M2.75 2a.5.5 0 0 1 0-1H5.5a.5.5 0 0 1 .5.5V4a.5.5 0 1 1-1 0V2zm9.5 11a.5.5 0 1 1 0 1H9.5a.5.5 0 0 1-.5-.5V11a.5.5 0 0 1 1 0v2z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><path id="icon-share" fill="#000" fill-rule="evenodd" d="M5 7.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m.713 1.164a2.5 2.5 0 1 1 0-2.328l3.391-2.12A2.5 2.5 0 1 1 14 3.5a2.5 2.5 0 0 1-4.484 1.52l-3.53 2.207a2.5 2.5 0 0 1 0 .546l3.53 2.206a2.5 2.5 0 1 1-.411.804zM11.5 5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3m1.5 6.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0" clip-rule="evenodd"/><g id="icon-shared"><path fill="#2E2E2E" d="M9.222 1.585a2.959 2.959 0 1 1-.519 5.872A2.959 2.959 0 1 1 6.297 4.09a2.96 2.96 0 0 1 2.925-2.505m-3.443 3.46a1.96 1.96 0 1 0 0 3.918 1.96 1.96 0 0 0 0-3.919m3.443-2.46a1.96 1.96 0 0 0-1.957 1.86 2.96 2.96 0 0 1 1.416 1.982q.258.075.54.076a1.959 1.959 0 1 0 0-3.918" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M13.148 10.937c0-1.843-1.701-3.434-3.926-3.434q-.459 0-.886.088l-.05.007a.5.5 0 0 1-.147-.987l.264-.047q.4-.06.819-.061c2.663 0 4.926 1.932 4.926 4.434a.5.5 0 0 1-1 0m-3.443 2.459c0-1.843-1.7-3.434-3.926-3.434s-3.926 1.591-3.926 3.434a.5.5 0 1 1-1 0c0-2.502 2.263-4.434 4.926-4.434s4.926 1.931 4.926 4.434a.5.5 0 0 1-1 0" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><g id="icon-sidebar-strong"><rect width="11.5" height="11.5" x="1.75" y="1.75" stroke="#000" stroke-width="1.5" rx="1.25"/><path fill="#000" d="M5 1h1.5v13H5z"/></g><g id="icon-sidebar"><path fill="#2E2E2E" d="M12.143 12.607V14H2.857v-1.393zm.464-.464V2.857a.464.464 0 0 0-.464-.464H2.857a.464.464 0 0 0-.464.464v9.286c0 .256.208.464.464.464V14l-.095-.002a1.857 1.857 0 0 1-1.76-1.76L1 12.143V2.857c0-.994.78-1.805 1.762-1.855L2.857 1h9.286l.095.002c.982.05 1.762.861 1.762 1.855v9.286l-.002.095a1.857 1.857 0 0 1-1.76 1.76l-.095.002v-1.393a.464.464 0 0 0 .464-.464" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M5 1h1.5v13H5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><path id="icon-sign-in" fill="#2E2E2E" d="M6.792 4.694a.5.5 0 0 1 .665-.084l.04.031 2.321 2 .04.038a.5.5 0 0 1-.04.72l-2.321 2a.5.5 0 0 1-.653-.758l1.302-1.12H1a.5.5 0 1 1 0-1h7.146L6.844 5.398l-.037-.035a.5.5 0 0 1-.016-.67m5.5 9.807h-6.29a.5.5 0 0 1 0-1h6.29c.488 0 .763-.125.922-.29.162-.168.287-.464.287-.982V2.776h1v9.452c0 .663-.16 1.253-.567 1.676-.411.426-.99.596-1.642.596m0-12.996h-6.29a.5.5 0 0 1 0-1h6.29l.122.002c.601.02 1.134.195 1.52.594.407.423.567 1.013.567 1.676h-1c0-.518-.125-.814-.287-.982-.139-.144-.367-.258-.749-.284z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-spinner" stroke="#000" stroke-width="2" clip-path="url(#a)"><circle cx="7.705" cy="7.5" r="6" opacity=".2"/><path stroke-linecap="round" d="M13.705 7.5a6 6 0 1 0-6 6"/></g><g id="icon-star-fill" clip-path="url(#a)"><path fill="#000" d="M7.428.666a.3.3 0 0 1 .554 0L9.618 4.6a.3.3 0 0 0 .254.184l4.247.34a.3.3 0 0 1 .171.528l-3.236 2.772a.3.3 0 0 0-.097.297l.99 4.145a.3.3 0 0 1-.45.326L7.862 10.97a.3.3 0 0 0-.312 0l-3.637 2.222a.3.3 0 0 1-.448-.326l.989-4.145a.3.3 0 0 0-.097-.297L1.12 5.652a.3.3 0 0 1 .171-.527l4.248-.34a.3.3 0 0 0 .253-.185z"/></g><path id="icon-star-strong-fill" fill="#000" stroke="#000" stroke-width=".25" d="M8.097.618a.425.425 0 0 0-.784 0L5.676 4.552a.18.18 0 0 1-.147.108L1.28 5c-.377.03-.53.5-.242.747l3.236 2.772c.05.042.071.11.056.173l-.989 4.145a.425.425 0 0 0 .635.461l3.637-2.22a.18.18 0 0 1 .182 0l3.637 2.22a.425.425 0 0 0 .635-.461l-.989-4.145a.18.18 0 0 1 .056-.173l3.236-2.772A.425.425 0 0 0 14.13 5l-4.248-.34a.18.18 0 0 1-.147-.108z"/><path id="icon-star-strong" fill="#000" fill-rule="evenodd" d="M6.926.897c.359-.863 1.58-.863 1.939 0l1.53 3.68 3.974.319c.931.075 1.309 1.236.6 1.844L11.94 9.333l.925 3.878c.217.908-.772 1.626-1.569 1.14l-3.402-2.078-3.401 2.078c-.797.486-1.786-.232-1.57-1.14l.926-3.878L.822 6.74c-.709-.608-.331-1.77.6-1.844l3.973-.319zm.97 1.575L6.674 5.407a1.05 1.05 0 0 1-.886.644l-3.17.254 2.415 2.068c.3.256.43.658.339 1.041l-.738 3.093 2.713-1.658a1.05 1.05 0 0 1 1.095 0l2.713 1.658-.738-3.093a1.05 1.05 0 0 1 .339-1.041l2.414-2.068-3.169-.254a1.05 1.05 0 0 1-.886-.644z" clip-rule="evenodd"/><path id="icon-star" fill="#000" fill-rule="evenodd" d="m7.184 1.893-.02.05-1.372 3.298a.3.3 0 0 1-.253.184l-3.561.286-.055.004-.331.027-.3.024a.3.3 0 0 0-.172.527l.23.196.252.216.041.036 2.713 2.324a.3.3 0 0 1 .097.297l-.83 3.475-.012.053-.077.324-.07.293a.3.3 0 0 0 .448.326l.258-.158.284-.173.046-.028 3.049-1.862a.3.3 0 0 1 .312 0l3.049 1.862.046.028.284.173.258.158a.3.3 0 0 0 .448-.326l-.07-.293-.077-.324-.013-.053-.829-3.475a.3.3 0 0 1 .097-.297l2.713-2.324.041-.036.253-.216.23-.196a.3.3 0 0 0-.172-.527l-.3-.024-.332-.027-.055-.004-3.56-.286a.3.3 0 0 1-.254-.184L8.247 1.943l-.021-.05-.128-.307-.116-.279a.3.3 0 0 0-.554 0l-.116.279zm.521 1.352-.99 2.38a1.3 1.3 0 0 1-1.096.797l-2.57.206 1.958 1.677a1.3 1.3 0 0 1 .418 1.29l-.598 2.507 2.2-1.344a1.3 1.3 0 0 1 1.356 0l2.2 1.344-.598-2.508a1.3 1.3 0 0 1 .418-1.289l1.958-1.677-2.57-.206a1.3 1.3 0 0 1-1.096-.796z" clip-rule="evenodd"/><g id="icon-tick"><path fill="#2E2E2E" d="M12 12v1.5H3V12zm0-9H3v10.5l-.077-.002a1.5 1.5 0 0 1-1.421-1.42L1.5 12V3a1.5 1.5 0 0 1 1.423-1.498L3 1.5h9A1.5 1.5 0 0 1 13.5 3v9l-.002.077A1.5 1.5 0 0 1 12 13.5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M3.833 6.89a.75.75 0 0 1 .999.114l.048.06 2.307 3.23.042.065a.75.75 0 0 1-1.215.868l-.048-.06L3.66 7.935l-.042-.065a.75.75 0 0 1 .216-.981" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M11.137 3.638a.75.75 0 0 0-.992.163l-.045.062-4.154 6.462a.75.75 0 0 0 1.262.811l4.154-6.461.038-.067a.75.75 0 0 0-.264-.97" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><g id="icon-tldraw" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M.205 1.95A1.95 1.95 0 0 1 2.155 0h11.1a1.95 1.95 0 0 1 1.95 1.95v11.1a1.95 1.95 0 0 1-1.95 1.95h-11.1a1.95 1.95 0 0 1-1.95-1.95zm8.85 2.55a1.35 1.35 0 1 1-2.7 0 1.35 1.35 0 0 1 2.7 0m-1.793 7.65c.635.002 1.246-.88 1.475-1.372.281-.606.457-1.696.175-2.342-.198-.452-.652-.786-1.25-.786-.722 0-1.307.586-1.307 1.31 0 .2.046.387.127.553.075.154.174.314.274.476.315.508.637 1.03.244 1.398-.318.3-.218.761.262.763" clip-rule="evenodd"/></g><path id="icon-untick" fill="#2E2E2E" d="M12 12v1.5H3V12zm0-9H3v10.5l-.077-.002a1.5 1.5 0 0 1-1.421-1.42L1.5 12V3a1.5 1.5 0 0 1 1.423-1.498L3 1.5h9A1.5 1.5 0 0 1 13.5 3v9l-.002.077A1.5 1.5 0 0 1 12 13.5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path id="icon-update" fill="#000" fill-rule="evenodd" d="M2.108 7.297c0 3.044 2.207 5.118 4.686 5.547a.521.521 0 1 1-.178 1.027c-2.911-.504-5.55-2.958-5.55-6.574 0-1.537.699-2.744 1.515-3.663.585-.658 1.254-1.193 1.793-1.602H2.737a.5.5 0 0 1 0-1h3a.5.5 0 0 1 .5.5v3a.5.5 0 0 1-1 0V2.687h-.001c-.572.432-1.27.958-1.875 1.64-.715.803-1.253 1.775-1.253 2.97m11.108.406c0-3.012-2.16-5.073-4.607-5.533A.521.521 0 0 1 8.8 1.146c2.874.54 5.457 2.98 5.457 6.557 0 1.537-.699 2.745-1.515 3.663-.585.658-1.254 1.193-1.792 1.602h1.636a.5.5 0 1 1 0 1h-3a.5.5 0 0 1-.5-.5v-3a.5.5 0 0 1 1 0v1.846l.002-.002c.571-.43 1.27-.957 1.875-1.638.714-.804 1.252-1.775 1.252-2.97" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" fill="none"><style><![CDATA[svg>[id]{display:none}svg>[id]:target{display:inline}]]></style><path id="icon-bookmark" fill="#000" d="M11.6 2.01a.5.5 0 0 1 .4.49v11a.5.5 0 0 1-.765.424L7.5 11.59l-3.735 2.334A.5.5 0 0 1 3 13.5v-11l.01-.1A.5.5 0 0 1 3.5 2h8zM4 12.598l2.97-1.857a1 1 0 0 1 1.06 0L11 12.598V3H4z"/><path id="icon-check" fill="#000" fill-rule="evenodd" d="M11.672 3.727c.289.189.37.576.181.865l-4.25 6.5a.625.625 0 0 1-.943.12l-2.75-2.5a.625.625 0 0 1 .84-.925l2.208 2.007 3.849-5.886a.625.625 0 0 1 .865-.181" clip-rule="evenodd"/><path id="icon-chevron-down-strong" fill="#000" stroke="#000" stroke-width=".25" d="M3.25 5.198a.625.625 0 0 0 .028.883l4 3.75c.24.225.614.225.855 0l-.086-.091.086.091 4-3.75a.625.625 0 0 0-.855-.912l-3.573 3.35-3.572-3.35a.625.625 0 0 0-.884.029Z"/><path id="icon-chevron-down" fill="#000" fill-rule="evenodd" d="M3.34 5.283a.5.5 0 0 1 .707-.023l3.658 3.43 3.658-3.43a.5.5 0 0 1 .684.73l-4 3.75a.5.5 0 0 1-.684 0l-4-3.75a.5.5 0 0 1-.023-.707" clip-rule="evenodd"/><path id="icon-chevron-right-strong" fill="#000" stroke="#000" stroke-width=".25" d="M5.403 11.956a.625.625 0 0 0 .883-.028l3.75-4a.625.625 0 0 0 0-.855l-.091.085.091-.085-3.75-4a.625.625 0 0 0-.912.855L8.724 7.5l-3.35 3.573a.625.625 0 0 0 .029.883Z"/><path id="icon-chevron-right" fill="#000" fill-rule="evenodd" d="M5.488 11.865a.5.5 0 0 1-.023-.707L8.895 7.5l-3.43-3.658a.5.5 0 0 1 .73-.684l3.75 4a.5.5 0 0 1 0 .684l-3.75 4a.5.5 0 0 1-.707.023" clip-rule="evenodd"/><path id="icon-chevron-up-strong" fill="#000" stroke="#000" stroke-width=".25" d="M12.161 9.802a.625.625 0 0 0-.028-.883l-4-3.75a.625.625 0 0 0-.855 0l.085.091-.085-.091-4 3.75a.625.625 0 0 0 .855.912l3.572-3.35 3.573 3.35a.625.625 0 0 0 .883-.029Z"/><path id="icon-chevron-up" fill="#000" fill-rule="evenodd" d="M12.07 9.717a.5.5 0 0 1-.707.023L7.705 6.31 4.047 9.74a.5.5 0 0 1-.684-.73l4-3.75a.5.5 0 0 1 .684 0l4 3.75a.5.5 0 0 1 .023.707" clip-rule="evenodd"/><path id="icon-close-strong" fill="#000" d="M13.236 3.03 8.766 7.5l4.47 4.47a.75.75 0 0 1-1.061 1.06l-4.47-4.47-4.47 4.47a.75.75 0 0 1-1.06-1.06l4.47-4.47-4.47-4.47a.75.75 0 1 1 1.06-1.06l4.47 4.47 4.47-4.47a.75.75 0 0 1 1.06 1.06"/><path id="icon-close" fill="#000" fill-rule="evenodd" d="M13.059 2.854a.5.5 0 0 0-.707-.708L7.704 6.793 3.06 2.146a.5.5 0 1 0-.707.708L6.998 7.5l-4.646 4.646a.5.5 0 0 0 .707.708l4.646-4.647 4.647 4.647a.5.5 0 0 0 .707-.708L8.412 7.5z" clip-rule="evenodd"/><path id="icon-comment" fill="#2E2E2E" d="M13 3.5a1.5 1.5 0 0 0-1.423-1.498L11.5 2H4c-.431 0-.953.18-1.366.487C2.217 2.797 2 3.166 2 3.5v5c0 .334.217.703.634 1.013C3.047 9.82 3.57 10 4 10h4l.05.002a.5.5 0 0 1 .304.144l2.146 2.147V10.5a.5.5 0 0 1 .5-.5c.731 0 1.23-.199 1.539-.464.303-.262.461-.62.461-1.036zm1 5c0 .689-.271 1.33-.808 1.793-.43.371-1.006.605-1.692.68V13.5a.5.5 0 0 1-.854.354L7.794 11H4c-.674 0-1.401-.267-1.962-.685C1.48 9.902 1 9.27 1 8.5v-5c0-.77.481-1.402 1.038-1.815C2.598 1.267 3.326 1 4 1h7.5l.128.003A2.5 2.5 0 0 1 14 3.5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-copy-strong"><g fill="#000" fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path d="M2.705 11a1.5 1.5 0 0 1-1.5-1.5v-7a1.5 1.5 0 0 1 1.5-1.5h7a1.5 1.5 0 0 1 1.5 1.5V4h1.5a1.5 1.5 0 0 1 1.5 1.5v7a1.5 1.5 0 0 1-1.5 1.5h-7a1.5 1.5 0 0 1-1.5-1.5v-7a1.5 1.5 0 0 1 1.5-1.5h4.5V2.5a.5.5 0 0 0-.5-.5h-7a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .5.5h1.5v1zm3-6a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .5.5h7a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.5-.5z"/><path d="M2.705 11a1.5 1.5 0 0 1-1.5-1.5v-7a1.5 1.5 0 0 1 1.5-1.5h7a1.5 1.5 0 0 1 1.5 1.5V4h1.5a1.5 1.5 0 0 1 1.5 1.5v7a1.5 1.5 0 0 1-1.5 1.5h-7a1.5 1.5 0 0 1-1.5-1.5V11zm1.25.25h-1.25A1.75 1.75 0 0 1 .955 9.5v-7c0-.966.784-1.75 1.75-1.75h7c.967 0 1.75.784 1.75 1.75v1.25h1.25c.967 0 1.75.783 1.75 1.75v7a1.75 1.75 0 0 1-1.75 1.75h-7a1.75 1.75 0 0 1-1.75-1.75zm.25-1.25V5.5a1.5 1.5 0 0 1 1.5-1.5h4.5V2.5a.5.5 0 0 0-.5-.5h-7a.5.5 0 0 0-.5.5v7a.5.5 0 0 0 .5.5zm-.25-.25h-1.25a.25.25 0 0 1-.25-.25v-7a.25.25 0 0 1 .25-.25h7a.25.25 0 0 1 .25.25v1.25h-4.25a1.75 1.75 0 0 0-1.75 1.75zm1.75-4.5a.25.25 0 0 0-.25.25v7c0 .138.112.25.25.25h7a.25.25 0 0 0 .25-.25v-7a.25.25 0 0 0-.25-.25zm-.5.25a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5z"/></g><defs><clipPath id="a"><path fill="#fff" d="M.205 0h15v15h-15z"/></clipPath></defs></g><path id="icon-copy" fill="#000" fill-rule="evenodd" d="M1.205 9.5a1.5 1.5 0 0 0 1.5 1.5h1.5v-1h-1.5a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5V4h-4.5a1.5 1.5 0 0 0-1.5 1.5v7a1.5 1.5 0 0 0 1.5 1.5h7a1.5 1.5 0 0 0 1.5-1.5v-7a1.5 1.5 0 0 0-1.5-1.5h-1.5V2.5a1.5 1.5 0 0 0-1.5-1.5h-7a1.5 1.5 0 0 0-1.5 1.5zm4-4a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-7a.5.5 0 0 1-.5-.5z" clip-rule="evenodd"/><path id="icon-doc-strong" fill="#000" fill-rule="evenodd" d="M3.705 2.25a.25.25 0 0 0-.25.25v10c0 .138.112.25.25.25h8a.25.25 0 0 0 .25-.25V6.25h-3.25a.75.75 0 0 1-.75-.75V2.25zm5.75 1.06 1.44 1.44h-1.44zm-7.5-.81c0-.966.784-1.75 1.75-1.75h5a.75.75 0 0 1 .53.22l4 4c.141.14.22.331.22.53v7a1.75 1.75 0 0 1-1.75 1.75h-8a1.75 1.75 0 0 1-1.75-1.75z" clip-rule="evenodd"/><path id="icon-doc" fill="#000" fill-rule="evenodd" d="M3.705 2a.5.5 0 0 0-.5.5v10a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V6h-3.5a.5.5 0 0 1-.5-.5V2zm5.5.707L11.498 5H9.205zm-7-.207a1.5 1.5 0 0 1 1.5-1.5h5a.5.5 0 0 1 .354.146l4 4a.5.5 0 0 1 .146.354v7a1.5 1.5 0 0 1-1.5 1.5h-8a1.5 1.5 0 0 1-1.5-1.5z" clip-rule="evenodd"/><path id="icon-dots-horizontal-strong" fill="#000" stroke="#000" stroke-width=".25" d="M10.915 8.298c.22.217.488.327.795.327q.308 0 .566-.153.251-.151.403-.404a1.1 1.1 0 0 0 .159-.57q-.001-.464-.333-.791a1.1 1.1 0 0 0-.795-.332 1.1 1.1 0 0 0-.795.332c-.22.217-.332.483-.332.79q0 .468.332.8Zm-4.005 0c.22.217.488.327.795.327q.308 0 .565-.153.252-.151.404-.404a1.1 1.1 0 0 0 .158-.57q0-.464-.333-.791a1.1 1.1 0 0 0-.794-.332 1.1 1.1 0 0 0-.795.332c-.22.217-.333.483-.333.79q0 .468.333.8Zm-4.005 0c.22.217.488.327.795.327q.309 0 .565-.153.252-.151.404-.404a1.1 1.1 0 0 0 .158-.57q-.001-.464-.332-.791a1.1 1.1 0 0 0-.795-.332 1.1 1.1 0 0 0-.795.332c-.22.217-.333.483-.333.79q0 .468.333.8Z"/><path id="icon-dots-horizontal" fill="#000" d="M11.71 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q.001-.41.296-.701a.96.96 0 0 1 .707-.296q.411 0 .707.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.136.225-.362.36a.96.96 0 0 1-.501.136m-4.005 0a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701a.97.97 0 0 1 .707-.296q.412 0 .706.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.135.225-.361.36a.96.96 0 0 1-.501.136M3.7 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701A.97.97 0 0 1 3.7 6.5q.411 0 .707.296a.95.95 0 0 1 .295.701.96.96 0 0 1-.14.507q-.135.225-.361.36A.96.96 0 0 1 3.7 8.5"/><path id="icon-dots-vertical-strong" fill="#000" stroke="#000" stroke-width=".25" d="M6.907 10.71q-.326.333-.327.795 0 .309.153.566.151.252.404.403.261.159.57.159.464 0 .791-.333.331-.332.332-.795a1.1 1.1 0 0 0-.332-.795 1.07 1.07 0 0 0-.79-.332q-.468 0-.8.332Zm0-4.005c-.217.22-.327.488-.327.795q0 .309.153.566.151.251.404.403.261.159.57.159.464-.002.791-.333.331-.332.332-.795a1.1 1.1 0 0 0-.332-.795 1.07 1.07 0 0 0-.79-.333q-.468 0-.8.333Zm0-4.005c-.217.22-.327.488-.327.795q0 .309.153.565.151.252.404.404.261.159.57.158.464-.001.791-.332.331-.331.332-.795a1.1 1.1 0 0 0-.332-.795 1.07 1.07 0 0 0-.79-.333q-.468 0-.8.333Z"/><path id="icon-dots-vertical" fill="#2E2E2E" d="M6.5 11.505q0-.411.29-.707a.97.97 0 0 1 .712-.295q.411 0 .702.295a.97.97 0 0 1 .296.707q0 .411-.296.707a.95.95 0 0 1-.702.296.96.96 0 0 1-.506-.14q-.225-.135-.36-.362a.96.96 0 0 1-.136-.5m0-4.006q0-.411.29-.707a.97.97 0 0 1 .712-.295q.411 0 .702.295A.97.97 0 0 1 8.5 7.5q0 .411-.296.707a.95.95 0 0 1-.702.296.96.96 0 0 1-.506-.14q-.225-.136-.36-.362a.96.96 0 0 1-.136-.5m0-4.006q0-.411.29-.707a.97.97 0 0 1 .712-.296q.411 0 .702.296a.97.97 0 0 1 .296.707q0 .411-.296.707a.95.95 0 0 1-.702.295.96.96 0 0 1-.506-.14q-.225-.135-.36-.36a.96.96 0 0 1-.136-.502" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-draw" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M0 1.95A1.95 1.95 0 0 1 1.95 0h11.1A1.95 1.95 0 0 1 15 1.95v11.1A1.95 1.95 0 0 1 13.05 15H1.95A1.95 1.95 0 0 1 0 13.05zM8.85 4.5a1.35 1.35 0 1 1-2.7 0 1.35 1.35 0 0 1 2.7 0m-1.793 7.65c.635.002 1.246-.88 1.475-1.372.281-.606.457-1.696.175-2.342-.198-.452-.652-.786-1.251-.786-.721 0-1.306.586-1.306 1.31 0 .2.046.387.127.553.075.154.174.314.274.476.315.508.637 1.03.244 1.398-.318.3-.218.761.262.763" clip-rule="evenodd"/></g><g id="icon-edit-strong" fill="#000" fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path d="M11.646.646a.5.5 0 0 1 .707 0l2 2a.5.5 0 0 1 0 .708l-3.942 3.942a1 1 0 0 1-.26.188L6.224 9.447a.5.5 0 0 1-.671-.67l1.964-3.928a1 1 0 0 1 .187-.26zM12 1.707l-3.59 3.59-1.037 2.076.254.254L9.704 6.59 13.293 3z"/><path d="M12.53.47a.75.75 0 0 0-1.06 0zm0 0 2 2a.75.75 0 0 1 0 1.06l-3.942 3.943a1.3 1.3 0 0 1-.325.234L6.335 9.671A.75.75 0 0 1 5.33 8.665l1.964-3.928q.091-.181.234-.325L11.47.47M6.224 9.447l3.927-1.963a1 1 0 0 0 .26-.188l3.943-3.942a.5.5 0 0 0 0-.708l-2-2a.5.5 0 0 0-.708 0L7.704 4.59a1 1 0 0 0-.187.26L5.553 8.776a.5.5 0 0 0 .67.671m2.392-4.003-.939 1.879 1.879-.94L12.939 3 12 2.06zm-.205-.148L7.373 7.373l.254.254L9.704 6.59 13.293 3 12 1.707z"/><path d="M7.5 1.5h-5a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2-2v-5H12v5a.5.5 0 0 1-.5.5h-9a.5.5 0 0 1-.5-.5v-9a.5.5 0 0 1 .5-.5h5z"/></g><g id="icon-edit"><path fill="#2E2E2E" d="M8.054 2.5H2.52v10h9.98V6.965H14V12.5l-.002.077A1.5 1.5 0 0 1 12.5 14H2.52l-.077-.002a1.5 1.5 0 0 1-1.42-1.42L1.02 12.5v-10a1.5 1.5 0 0 1 1.423-1.498L2.521 1h5.533z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" fill-rule="evenodd" d="M12.455.25c.2 0 .391.08.532.222l1.636 1.65a.75.75 0 0 1 0 1.056l-3.872 3.904a1 1 0 0 1-.227.17l-.086.043-2.82 1.218a.75.75 0 0 1-.987-.982l1.208-2.843.042-.085a1 1 0 0 1 .169-.228L11.922.472l.055-.05a.75.75 0 0 1 .477-.172M9.182 5.363l-.437 1.03 1.01-.437 3.28-3.307-.58-.584z" clip-rule="evenodd" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><path id="icon-export" fill="#2E2E2E" d="M5 4.5a.5.5 0 0 1 0 1H3.5c-.423 0-.648.105-.771.229-.124.123-.229.348-.229.771v5.52c0 .423.105.649.229.772.123.123.348.229.771.229h8l.15-.005c.327-.022.514-.116.621-.224.124-.123.229-.349.229-.771V6.5c0-.423-.105-.648-.229-.771-.123-.124-.348-.229-.771-.229H10a.5.5 0 0 1 0-1h1.5c.577 0 1.102.145 1.479.521.376.377.521.902.521 1.479v5.52c0 .578-.145 1.102-.521 1.479-.33.33-.773.482-1.265.515l-.214.007h-8c-.577 0-1.102-.145-1.479-.522-.376-.377-.521-.902-.521-1.479V6.5c0-.577.145-1.102.521-1.479.377-.376.902-.521 1.479-.521zM7.5.02a.5.5 0 0 1 .336.13l.037.038 2 2.25a.5.5 0 0 1-.747.665L8 1.835V8.75a.5.5 0 0 1-1 0V1.835L5.873 3.103a.5.5 0 0 1-.747-.666l2-2.25.037-.037A.5.5 0 0 1 7.5.02" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-external"><path fill="#000" fill-rule="evenodd" d="M3 3.008a1 1 0 0 0-1 1V12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V8.5a.5.5 0 0 0-1 0V12H3V4.008h3.5a.5.5 0 0 0 0-1z" clip-rule="evenodd"/><path fill="#000" fill-rule="evenodd" d="M13 2.5v3a.5.5 0 0 1-1 0V3.707L6.854 8.854a.5.5 0 0 1-.708-.708L11.293 3H9.5a.5.5 0 0 1 0-1h3a.5.5 0 0 1 .5.497" clip-rule="evenodd"/></g><path id="icon-folder-new" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7.5 7.07v3.606M5.625 8.873h3.75m3.125 4.902a1.2 1.2 0 0 0 .884-.398c.234-.254.366-.6.366-.96V5.634c0-.36-.132-.705-.366-.96a1.2 1.2 0 0 0-.884-.397H7.563a1.17 1.17 0 0 1-.6-.16 1.3 1.3 0 0 1-.457-.45L6 2.85a1.3 1.3 0 0 0-.45-.448 1.2 1.2 0 0 0-.594-.163H2.5a1.2 1.2 0 0 0-.884.398 1.42 1.42 0 0 0-.366.96v8.82c0 .36.132.705.366.96.235.254.552.397.884.397z"/><path id="icon-folder-open" stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="m3.749 9.31.938-1.687c.101-.188.256-.347.448-.46.192-.112.412-.174.639-.18h6.725m0 0c.191 0 .38.04.551.119s.322.191.439.332c.117.14.198.304.236.478.039.174.034.353-.014.526l-1.1 3.489c-.069.25-.227.473-.447.631a1.3 1.3 0 0 1-.771.241H2.499a1.3 1.3 0 0 1-.884-.34 1.12 1.12 0 0 1-.366-.823v-7.56c0-.309.132-.605.366-.823.235-.218.553-.34.884-.34h2.438c.209-.002.415.045.6.136.184.092.34.225.456.387l.506.698c.114.16.269.293.451.384s.386.14.593.14h3.706c.332 0 .65.122.884.34s.366.514.366.822z"/><path id="icon-folder" stroke="#000" stroke-linecap="round" stroke-linejoin="round" d="M12.5 12.638c.332 0 .65-.12.884-.336s.366-.508.366-.813V5.744c0-.304-.132-.597-.366-.812a1.3 1.3 0 0 0-.884-.336H7.563a1.34 1.34 0 0 1-.6-.135 1.2 1.2 0 0 1-.457-.383L6 3.39a1.2 1.2 0 0 0-.45-.38 1.34 1.34 0 0 0-.594-.137H2.5c-.332 0-.65.121-.884.337a1.1 1.1 0 0 0-.366.812v7.468c0 .305.132.597.366.813.235.215.552.336.884.336z"/><g id="icon-group-strong" fill="#000" stroke="#000" stroke-width=".25" clip-path="url(#a)"><path d="M9.037 6.034a3.23 3.23 0 0 0-1.48-2.073 1.975 1.975 0 1 1 1.48 2.073ZM9.525.895a3.226 3.226 0 0 0-3.17 2.634A3.225 3.225 0 1 0 9.056 7.31q.23.033.468.034a3.225 3.225 0 0 0 0-6.45ZM3.91 6.72a1.975 1.975 0 1 1 3.95 0 1.975 1.975 0 0 1-3.95 0Z"/><path stroke-linecap="round" d="M8.609 7.436q.44-.09.916-.091c2.31 0 4.055 1.65 4.055 3.535a.625.625 0 1 0 1.25 0c0-2.71-2.447-4.785-5.305-4.785q-.6.001-1.164.115a.625.625 0 1 0 .248 1.226ZM1.83 13.48c0-1.886 1.745-3.535 4.055-3.535s4.055 1.65 4.055 3.535a.625.625 0 1 0 1.25 0c0-2.71-2.447-4.785-5.305-4.785S.58 10.77.58 13.48a.625.625 0 1 0 1.25 0Z"/></g><g id="icon-group" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M7.427 4.03A2.1 2.1 0 1 1 8.93 6.135 3.1 3.1 0 0 0 7.427 4.03m-.97-.357a3.1 3.1 0 1 1 2.496 3.494 3.1 3.1 0 1 1-2.496-3.494M3.785 6.72a2.1 2.1 0 1 1 4.2 0 2.1 2.1 0 0 1-4.2 0" clip-rule="evenodd"/><path stroke="#000" stroke-linecap="round" d="M14.205 10.88c0-2.298-2.095-4.16-4.68-4.16q-.537.001-1.04.103m2.08 6.657c0-2.298-2.095-4.16-4.68-4.16s-4.68 1.862-4.68 4.16"/></g><g id="icon-help-circle" clip-path="url(#a)"><path fill="#000" d="M7.499.877a6.623 6.623 0 1 1 0 13.246A6.623 6.623 0 0 1 7.5.877m0 .95a5.674 5.674 0 1 0 0 11.347 5.674 5.674 0 0 0 0-11.347m0 7.923a.75.75 0 1 1 0 1.5.75.75 0 0 1 0-1.5m0-5.924c1.435 0 2.55 1.103 2.55 2.424 0 1.104-.73 1.64-1.265 1.965-.3.182-.48.272-.635.392a.5.5 0 0 0-.1.097.55.55 0 0 1-1.099-.003c0-.468.282-.773.525-.962.22-.172.54-.341.74-.463.465-.283.735-.535.735-1.026 0-.677-.585-1.324-1.45-1.325s-1.45.648-1.45 1.325a.55.55 0 0 1-1.1 0c0-1.322 1.115-2.424 2.55-2.424"/></g><path id="icon-home-strong" fill="#000" stroke="#000" stroke-width=".25" d="m14.963 7.748-6.75-6.64a.725.725 0 0 0-1.016 0l-6.75 6.64a.725.725 0 1 0 1.016 1.034l.617-.607v5.3c0 .345.28.625.625.625h10c.345 0 .625-.28.625-.625v-5.3l.617.607a.725.725 0 0 0 1.017-1.034ZM3.33 6.946l4.375-4.304 4.375 4.304v5.904h-1.75V9.475a.625.625 0 0 0-.625-.625h-3a.625.625 0 0 0-.625.625v3.375H3.33zM9.08 10.1v2.75H7.33V10.1z"/><g id="icon-home" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M7.284 1.197a.6.6 0 0 1 .842 0l6.75 6.64a.6.6 0 0 1-.842.856l-.829-.816v5.598a.5.5 0 0 1-.5.5h-10a.5.5 0 0 1-.5-.5V7.877l-.83.816a.6.6 0 1 1-.84-.856zm.421 1.27 4.5 4.426v6.082h-2v-3.5a.5.5 0 0 0-.5-.5h-3a.5.5 0 0 0-.5.5v3.5h-3V6.893zm-.5 10.508h2v-3h-2z" clip-rule="evenodd"/></g><path id="icon-import" fill="#000" fill-rule="evenodd" d="M3 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V8.5a.5.5 0 0 0-1 0V12H3V3h3.5a.5.5 0 0 0 0-1zm3 6.5v-3a.5.5 0 0 1 1 0v1.793l5.146-5.147a.5.5 0 0 1 .708.708L7.707 8H9.5a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.497" clip-rule="evenodd"/><g id="icon-info" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M7.5.877a6.623 6.623 0 1 0 0 13.246A6.623 6.623 0 0 0 7.5.877M1.827 7.5a5.673 5.673 0 1 1 11.346 0 5.673 5.673 0 0 1-11.346 0m6.423-3a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0M6 6h1.5a.5.5 0 0 1 .5.5V10h1v1H6v-1h1V7H6z" clip-rule="evenodd"/></g><path id="icon-link-strong" fill="#000" fill-rule="evenodd" d="M8.858 3.212c.597-.405 1.342-.408 1.889-.049.117.077.25.204.67.625.421.42.548.553.625.67.36.547.357 1.293-.049 1.89-.088.13-.229.275-.664.71l-.619.62a.75.75 0 1 0 1.061 1.06l.619-.619.056-.056c.356-.356.61-.609.788-.872.73-1.074.77-2.477.062-3.556-.173-.263-.422-.512-.76-.85l-.058-.058-.057-.057c-.338-.339-.587-.587-.85-.76-1.08-.709-2.483-.668-3.556.061-.264.18-.516.432-.873.789l-.056.056-.618.618a.75.75 0 0 0 1.06 1.061l.62-.619c.434-.435.58-.576.71-.664M4.7 7.324a.75.75 0 1 0-1.06-1.061l-.62.619-.055.056c-.357.356-.61.609-.789.872-.729 1.073-.77 2.477-.062 3.555.173.264.422.513.76.85l.058.058.058.058c.338.338.586.587.85.76 1.079.709 2.482.667 3.556-.062.263-.179.516-.432.872-.788l.056-.056.619-.619a.75.75 0 0 0-1.061-1.06l-.619.618c-.435.435-.58.576-.71.664-.597.406-1.343.409-1.89.05-.117-.078-.25-.205-.67-.625s-.548-.554-.625-.671c-.359-.547-.356-1.292.05-1.89.087-.129.228-.275.663-.71zm5.304-1.062a.75.75 0 1 0-1.061-1.06L5.407 8.737a.75.75 0 0 0 1.061 1.061z" clip-rule="evenodd"/><path id="icon-link" fill="#000" fill-rule="evenodd" d="M8.717 3.005c.676-.46 1.532-.468 2.167-.051.144.095.298.245.71.657s.563.566.657.71c.418.636.409 1.49-.051 2.167-.105.154-.267.32-.694.747l-.619.619a.5.5 0 0 0 .707.707l.619-.619.043-.043c.37-.37.606-.606.771-.849.675-.994.71-2.288.06-3.278-.159-.241-.39-.472-.741-.824l-.045-.044-.044-.045c-.352-.351-.583-.582-.824-.74-.99-.651-2.284-.616-3.278.059-.243.165-.48.402-.849.771l-.043.043-.619.619a.5.5 0 1 0 .708.707L7.97 3.7c.427-.427.593-.589.747-.694m-4.194 4.14a.5.5 0 0 0-.707-.707l-.619.62-.043.042c-.37.37-.606.606-.77.85-.676.993-.711 2.287-.06 3.277.158.241.389.472.74.824l.045.044.045.045c.35.351.582.582.823.741.99.65 2.284.615 3.278-.06.243-.165.48-.402.85-.771l.042-.043.619-.619a.5.5 0 1 0-.707-.707l-.619.619c-.427.427-.593.59-.747.694-.676.46-1.531.468-2.167.051-.144-.095-.298-.245-.71-.657s-.562-.566-.657-.71c-.417-.635-.408-1.49.051-2.167.105-.154.267-.32.694-.747zm5.304-1.06a.5.5 0 1 0-.707-.708L5.584 8.914a.5.5 0 1 0 .707.707z" clip-rule="evenodd"/><path id="icon-manual" fill="#2E2E2E" fill-rule="evenodd" d="M9.261 1.497c1.072-.266 2.248-.247 2.73-.225a.74.74 0 0 1 .704.743v.245h1.055a.75.75 0 0 1 .75.75v9.503a.75.75 0 0 1-.75.75H1.25a.75.75 0 0 1-.75-.75V3.01a.75.75 0 0 1 .75-.75h1.055v-.245l.003-.072a.74.74 0 0 1 .702-.671l.211-.008c.562-.015 1.58 0 2.518.232.535.133 1.088.347 1.516.705q.132.11.245.238.113-.128.246-.238c.427-.358.98-.572 1.515-.705m3.433 9.479-.004.08a.76.76 0 0 1-.786.675c-.486-.02-1.533-.025-2.441.208a3.3 3.3 0 0 0-.833.324h4.87V3.26h-.805zM1.5 3.26v9.003h4.87a3.3 3.3 0 0 0-.833-.324c-.795-.204-1.696-.225-2.235-.214l-.207.006a.76.76 0 0 1-.786-.675l-.004-.08V3.26zm1.805-.997v8.462c.584-.011 1.574.013 2.48.246.419.107.847.265 1.215.505V3.778a1 1 0 0 0-.386-.81c-.263-.22-.651-.386-1.116-.501-.785-.195-1.664-.215-2.193-.204m8.39 0c-.53-.01-1.408.009-2.193.204-.464.115-.852.281-1.115.501a1 1 0 0 0-.38.682L8 3.778v7.698c.368-.24.796-.398 1.214-.505.907-.233 1.896-.257 2.48-.246z" clip-rule="evenodd" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path id="icon-more" fill="#000" d="M11.505 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701a.96.96 0 0 1 .707-.296q.411 0 .707.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.136.225-.362.36a.96.96 0 0 1-.501.136M7.5 8.5a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701A.97.97 0 0 1 7.5 6.5q.412 0 .706.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.135.225-.361.36A.96.96 0 0 1 7.5 8.5m-4.005 0a.97.97 0 0 1-.707-.29.97.97 0 0 1-.296-.713q0-.41.296-.701a.97.97 0 0 1 .707-.296q.412 0 .706.296a.95.95 0 0 1 .296.701.96.96 0 0 1-.14.507q-.135.225-.361.36a.96.96 0 0 1-.501.136"/><path id="icon-pin-strong" fill="#000" fill-rule="evenodd" d="M9.836 1.97a.75.75 0 0 0-1.06 1.06l.449.45L4.78 6.813l-.954-.954a.75.75 0 0 0-1.06 1.06l1.413 1.415.884.884L1.97 12.31a.75.75 0 0 0 1.06 1.06l3.094-3.093.884.884 1.414 1.414a.75.75 0 1 0 1.06-1.06l-.954-.955 3.334-4.444.45.449a.75.75 0 0 0 1.06-1.06l-1.06-1.061-1.415-1.415zM5.852 7.884l4.444-3.333.495.494L7.457 9.49z" clip-rule="evenodd"/><path id="icon-pin" fill="#2E2E2E" d="M8.952 2.146a.5.5 0 0 1 .707 0l3.536 3.536a.5.5 0 0 1-.707.707l-.653-.653-3.637 4.849 1.108 1.107a.5.5 0 1 1-.707.707L6.124 9.925l-3.27 3.27a.5.5 0 1 1-.708-.707l3.27-3.27-2.474-2.475a.5.5 0 1 1 .707-.707l1.107 1.107 4.849-3.637-.653-.653a.5.5 0 0 1 0-.707M5.471 7.857l2.013 2.014 3.637-4.85-.802-.8z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path id="icon-plus-strong" fill="#000" stroke="#000" stroke-width=".25" d="M8.33 2.75a.625.625 0 0 0-1.25 0v4.125H2.955a.625.625 0 1 0 0 1.25H7.08v4.125a.625.625 0 0 0 1.25 0V8.125h4.125a.625.625 0 0 0 0-1.25H8.33z"/><path id="icon-plus" fill="#000" fill-rule="evenodd" d="M8.205 2.75a.5.5 0 0 0-1 0V7h-4.25a.5.5 0 0 0 0 1h4.25v4.25a.5.5 0 0 0 1 0V8h4.25a.5.5 0 0 0 0-1h-4.25z" clip-rule="evenodd"/><path id="icon-qr" fill="#000" fill-rule="evenodd" d="M3.005 1h-.05c-.229 0-.426 0-.6.041A1.5 1.5 0 0 0 1.247 2.15c-.042.174-.042.371-.042.6v2.5c0 .229 0 .426.042.6a1.5 1.5 0 0 0 1.108 1.11c.174.041.371.041.6.041h2.5c.229 0 .426 0 .6-.041a1.5 1.5 0 0 0 1.109-1.11c.042-.174.041-.371.041-.6v-2.5c0-.229 0-.426-.041-.6a1.5 1.5 0 0 0-1.109-1.11C5.881 1 5.684 1 5.455 1zm-.417 1.014c.043-.01.11-.014.417-.014h2.4c.308 0 .374.003.417.014a.5.5 0 0 1 .37.37c.01.042.013.108.013.416v2.4c0 .308-.003.374-.014.417a.5.5 0 0 1-.37.37c-.042.01-.108.013-.416.013h-2.4c-.308 0-.374-.003-.417-.014a.5.5 0 0 1-.369-.37c-.01-.042-.014-.108-.014-.416V2.8c0-.308.004-.374.014-.417a.5.5 0 0 1 .37-.37M10.005 1h-.05c-.229 0-.426 0-.6.041A1.5 1.5 0 0 0 8.247 2.15c-.042.174-.042.371-.042.6v2.5c0 .229 0 .426.042.6a1.5 1.5 0 0 0 1.108 1.11c.174.041.371.041.6.041h2.5c.229 0 .426 0 .6-.041a1.5 1.5 0 0 0 1.109-1.109c.042-.174.041-.371.041-.6v-2.5c0-.229 0-.426-.041-.6a1.5 1.5 0 0 0-1.109-1.109C12.881 1 12.684 1 12.455 1zm-.417 1.014c.043-.01.11-.014.417-.014h2.4c.308 0 .374.003.417.014a.5.5 0 0 1 .37.37c.01.042.013.108.013.416v2.4c0 .308-.003.374-.014.417a.5.5 0 0 1-.37.37c-.042.01-.108.013-.416.013h-2.4c-.308 0-.374-.003-.417-.014a.5.5 0 0 1-.369-.37c-.01-.042-.014-.108-.014-.416V2.8c0-.308.004-.374.014-.417a.5.5 0 0 1 .37-.37M2.955 8h2.5c.229 0 .426 0 .6.041A1.5 1.5 0 0 1 7.164 9.15c.042.174.041.371.041.6v2.5c0 .229 0 .426-.041.6a1.5 1.5 0 0 1-1.109 1.109c-.174.041-.371.041-.6.041h-2.5c-.229 0-.426 0-.6-.041a1.5 1.5 0 0 1-1.108-1.109c-.042-.174-.042-.371-.042-.6v-2.5c0-.229 0-.426.042-.6a1.5 1.5 0 0 1 1.108-1.11c.174-.04.371-.04.6-.04m.05 1c-.308 0-.374.003-.417.014a.5.5 0 0 0-.369.37c-.01.042-.014.108-.014.416v2.4c0 .308.004.374.014.417a.5.5 0 0 0 .37.37c.042.01.108.013.416.013h2.4c.308 0 .374-.004.417-.014a.5.5 0 0 0 .37-.37c.01-.042.013-.108.013-.416V9.8c0-.308-.003-.374-.014-.417a.5.5 0 0 0-.37-.37C5.78 9.004 5.714 9 5.406 9zm7-1h-.05c-.229 0-.426 0-.6.041A1.5 1.5 0 0 0 8.247 9.15c-.042.174-.042.371-.042.6v2.5c0 .229 0 .426.042.6a1.5 1.5 0 0 0 1.108 1.109c.174.041.371.041.6.041h2.5c.229 0 .426 0 .6-.041a1.5 1.5 0 0 0 1.109-1.109c.042-.174.041-.371.041-.6v-2.5c0-.229 0-.426-.041-.6a1.5 1.5 0 0 0-1.109-1.109C12.881 8 12.684 8 12.455 8zm-.417 1.014c.043-.01.11-.014.417-.014h2.4c.308 0 .374.003.417.014a.5.5 0 0 1 .37.37c.01.042.013.108.013.416v2.4c0 .308-.003.374-.014.417a.5.5 0 0 1-.37.37c-.042.01-.108.013-.416.013h-2.4c-.308 0-.374-.004-.417-.014a.5.5 0 0 1-.369-.37c-.01-.042-.014-.108-.014-.416V9.8c0-.308.004-.374.014-.417a.5.5 0 0 1 .37-.37" clip-rule="evenodd"/><path id="icon-question-circle" fill="#000" fill-rule="evenodd" d="M1.082 7.5a6.623 6.623 0 1 1 13.246 0 6.623 6.623 0 0 1-13.246 0m6.623-5.673a5.673 5.673 0 1 0 0 11.346 5.673 5.673 0 0 0 0-11.346m.75 8.673a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m-2.2-4.25c0-.678.585-1.325 1.45-1.325s1.45.647 1.45 1.325c0 .491-.27.742-.736 1.025l-.176.104c-.183.106-.4.232-.564.36-.242.188-.524.493-.524.961a.55.55 0 0 0 1.1.004.4.4 0 0 1 .1-.098c.102-.079.215-.144.366-.232q.116-.067.27-.159c.534-.325 1.264-.861 1.264-1.965 0-1.322-1.115-2.425-2.55-2.425s-2.55 1.103-2.55 2.425a.55.55 0 1 0 1.1 0" clip-rule="evenodd"/><path id="icon-question" fill="#000" d="M7.501 10.336a.621.621 0 1 1-.002 1.242.621.621 0 0 1 .002-1.242M7.5 3.502c1.153 0 2.428.907 2.429 2.275 0 1.127-.656 1.693-1.12 2.104-.466.413-.734.67-.734 1.233a.575.575 0 0 1-1.15 0c0-1.122.66-1.684 1.12-2.093.464-.41.734-.671.734-1.244 0-.585-.602-1.124-1.279-1.124s-1.278.54-1.278 1.124a.575.575 0 0 1-1.15 0c0-1.368 1.275-2.274 2.428-2.275"/><g id="icon-refresh"><path fill="#2E2E2E" d="M7.5 1.5a.47.47 0 0 1 .5-.48 6.5 6.5 0 0 1 1.977 12.49.47.47 0 0 1-.623-.303.537.537 0 0 1 .313-.65A5.501 5.501 0 0 0 8 2.021a.537.537 0 0 1-.499-.523M7.5 13.5a.47.47 0 0 1-.499.48A6.5 6.5 0 0 1 5.023 1.49a.47.47 0 0 1 .623.303.537.537 0 0 1-.313.65A5.501 5.501 0 0 0 7 12.979a.537.537 0 0 1 .499.523" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M2.75 2a.5.5 0 0 1 0-1H5.5a.5.5 0 0 1 .5.5V4a.5.5 0 1 1-1 0V2zm9.5 11a.5.5 0 1 1 0 1H9.5a.5.5 0 0 1-.5-.5V11a.5.5 0 0 1 1 0v2z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><path id="icon-share" fill="#000" fill-rule="evenodd" d="M5 7.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m.713 1.164a2.5 2.5 0 1 1 0-2.328l3.391-2.12A2.5 2.5 0 1 1 14 3.5a2.5 2.5 0 0 1-4.484 1.52l-3.53 2.207a2.5 2.5 0 0 1 0 .546l3.53 2.206a2.5 2.5 0 1 1-.411.804zM11.5 5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3m1.5 6.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0" clip-rule="evenodd"/><g id="icon-shared"><path fill="#2E2E2E" d="M9.222 1.585a2.959 2.959 0 1 1-.519 5.872A2.959 2.959 0 1 1 6.297 4.09a2.96 2.96 0 0 1 2.925-2.505m-3.443 3.46a1.96 1.96 0 1 0 0 3.918 1.96 1.96 0 0 0 0-3.919m3.443-2.46a1.96 1.96 0 0 0-1.957 1.86 2.96 2.96 0 0 1 1.416 1.982q.258.075.54.076a1.959 1.959 0 1 0 0-3.918" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M13.148 10.937c0-1.843-1.701-3.434-3.926-3.434q-.459 0-.886.088l-.05.007a.5.5 0 0 1-.147-.987l.264-.047q.4-.06.819-.061c2.663 0 4.926 1.932 4.926 4.434a.5.5 0 0 1-1 0m-3.443 2.459c0-1.843-1.7-3.434-3.926-3.434s-3.926 1.591-3.926 3.434a.5.5 0 1 1-1 0c0-2.502 2.263-4.434 4.926-4.434s4.926 1.931 4.926 4.434a.5.5 0 0 1-1 0" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><g id="icon-sidebar-strong"><rect width="11.5" height="11.5" x="1.75" y="1.75" stroke="#000" stroke-width="1.5" rx="1.25"/><path fill="#000" d="M5 1h1.5v13H5z"/></g><g id="icon-sidebar"><path fill="#2E2E2E" d="M12.143 12.607V14H2.857v-1.393zm.464-.464V2.857a.464.464 0 0 0-.464-.464H2.857a.464.464 0 0 0-.464.464v9.286c0 .256.208.464.464.464V14l-.095-.002a1.857 1.857 0 0 1-1.76-1.76L1 12.143V2.857c0-.994.78-1.805 1.762-1.855L2.857 1h9.286l.095.002c.982.05 1.762.861 1.762 1.855v9.286l-.002.095a1.857 1.857 0 0 1-1.76 1.76l-.095.002v-1.393a.464.464 0 0 0 .464-.464" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M5 1h1.5v13H5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><path id="icon-sign-in" fill="#2E2E2E" d="M6.792 4.694a.5.5 0 0 1 .665-.084l.04.031 2.321 2 .04.038a.5.5 0 0 1-.04.72l-2.321 2a.5.5 0 0 1-.653-.758l1.302-1.12H1a.5.5 0 1 1 0-1h7.146L6.844 5.398l-.037-.035a.5.5 0 0 1-.016-.67m5.5 9.807h-6.29a.5.5 0 0 1 0-1h6.29c.488 0 .763-.125.922-.29.162-.168.287-.464.287-.982V2.776h1v9.452c0 .663-.16 1.253-.567 1.676-.411.426-.99.596-1.642.596m0-12.996h-6.29a.5.5 0 0 1 0-1h6.29l.122.002c.601.02 1.134.195 1.52.594.407.423.567 1.013.567 1.676h-1c0-.518-.125-.814-.287-.982-.139-.144-.367-.258-.749-.284z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><g id="icon-spinner" stroke="#000" stroke-width="2" clip-path="url(#a)"><circle cx="7.705" cy="7.5" r="6" opacity=".2"/><path stroke-linecap="round" d="M13.705 7.5a6 6 0 1 0-6 6"/></g><g id="icon-star-fill" clip-path="url(#a)"><path fill="#000" d="M7.428.666a.3.3 0 0 1 .554 0L9.618 4.6a.3.3 0 0 0 .254.184l4.247.34a.3.3 0 0 1 .171.528l-3.236 2.772a.3.3 0 0 0-.097.297l.99 4.145a.3.3 0 0 1-.45.326L7.862 10.97a.3.3 0 0 0-.312 0l-3.637 2.222a.3.3 0 0 1-.448-.326l.989-4.145a.3.3 0 0 0-.097-.297L1.12 5.652a.3.3 0 0 1 .171-.527l4.248-.34a.3.3 0 0 0 .253-.185z"/></g><path id="icon-star-strong-fill" fill="#000" stroke="#000" stroke-width=".25" d="M8.097.618a.425.425 0 0 0-.784 0L5.676 4.552a.18.18 0 0 1-.147.108L1.28 5c-.377.03-.53.5-.242.747l3.236 2.772c.05.042.071.11.056.173l-.989 4.145a.425.425 0 0 0 .635.461l3.637-2.22a.18.18 0 0 1 .182 0l3.637 2.22a.425.425 0 0 0 .635-.461l-.989-4.145a.18.18 0 0 1 .056-.173l3.236-2.772A.425.425 0 0 0 14.13 5l-4.248-.34a.18.18 0 0 1-.147-.108z"/><path id="icon-star-strong" fill="#000" fill-rule="evenodd" d="M6.926.897c.359-.863 1.58-.863 1.939 0l1.53 3.68 3.974.319c.931.075 1.309 1.236.6 1.844L11.94 9.333l.925 3.878c.217.908-.772 1.626-1.569 1.14l-3.402-2.078-3.401 2.078c-.797.486-1.786-.232-1.57-1.14l.926-3.878L.822 6.74c-.709-.608-.331-1.77.6-1.844l3.973-.319zm.97 1.575L6.674 5.407a1.05 1.05 0 0 1-.886.644l-3.17.254 2.415 2.068c.3.256.43.658.339 1.041l-.738 3.093 2.713-1.658a1.05 1.05 0 0 1 1.095 0l2.713 1.658-.738-3.093a1.05 1.05 0 0 1 .339-1.041l2.414-2.068-3.169-.254a1.05 1.05 0 0 1-.886-.644z" clip-rule="evenodd"/><path id="icon-star" fill="#000" fill-rule="evenodd" d="m7.184 1.893-.02.05-1.372 3.298a.3.3 0 0 1-.253.184l-3.561.286-.055.004-.331.027-.3.024a.3.3 0 0 0-.172.527l.23.196.252.216.041.036 2.713 2.324a.3.3 0 0 1 .097.297l-.83 3.475-.012.053-.077.324-.07.293a.3.3 0 0 0 .448.326l.258-.158.284-.173.046-.028 3.049-1.862a.3.3 0 0 1 .312 0l3.049 1.862.046.028.284.173.258.158a.3.3 0 0 0 .448-.326l-.07-.293-.077-.324-.013-.053-.829-3.475a.3.3 0 0 1 .097-.297l2.713-2.324.041-.036.253-.216.23-.196a.3.3 0 0 0-.172-.527l-.3-.024-.332-.027-.055-.004-3.56-.286a.3.3 0 0 1-.254-.184L8.247 1.943l-.021-.05-.128-.307-.116-.279a.3.3 0 0 0-.554 0l-.116.279zm.521 1.352-.99 2.38a1.3 1.3 0 0 1-1.096.797l-2.57.206 1.958 1.677a1.3 1.3 0 0 1 .418 1.29l-.598 2.507 2.2-1.344a1.3 1.3 0 0 1 1.356 0l2.2 1.344-.598-2.508a1.3 1.3 0 0 1 .418-1.289l1.958-1.677-2.57-.206a1.3 1.3 0 0 1-1.096-.796z" clip-rule="evenodd"/><g id="icon-tick"><path fill="#2E2E2E" d="M12 12v1.5H3V12zm0-9H3v10.5l-.077-.002a1.5 1.5 0 0 1-1.421-1.42L1.5 12V3a1.5 1.5 0 0 1 1.423-1.498L3 1.5h9A1.5 1.5 0 0 1 13.5 3v9l-.002.077A1.5 1.5 0 0 1 12 13.5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M3.833 6.89a.75.75 0 0 1 .999.114l.048.06 2.307 3.23.042.065a.75.75 0 0 1-1.215.868l-.048-.06L3.66 7.935l-.042-.065a.75.75 0 0 1 .216-.981" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path fill="#2E2E2E" d="M11.137 3.638a.75.75 0 0 0-.992.163l-.045.062-4.154 6.462a.75.75 0 0 0 1.262.811l4.154-6.461.038-.067a.75.75 0 0 0-.264-.97" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/></g><g id="icon-tldraw" clip-path="url(#a)"><path fill="#000" fill-rule="evenodd" d="M.205 1.95A1.95 1.95 0 0 1 2.155 0h11.1a1.95 1.95 0 0 1 1.95 1.95v11.1a1.95 1.95 0 0 1-1.95 1.95h-11.1a1.95 1.95 0 0 1-1.95-1.95zm8.85 2.55a1.35 1.35 0 1 1-2.7 0 1.35 1.35 0 0 1 2.7 0m-1.793 7.65c.635.002 1.246-.88 1.475-1.372.281-.606.457-1.696.175-2.342-.198-.452-.652-.786-1.25-.786-.722 0-1.307.586-1.307 1.31 0 .2.046.387.127.553.075.154.174.314.274.476.315.508.637 1.03.244 1.398-.318.3-.218.761.262.763" clip-rule="evenodd"/></g><path id="icon-untick" fill="#2E2E2E" d="M12 12v1.5H3V12zm0-9H3v10.5l-.077-.002a1.5 1.5 0 0 1-1.421-1.42L1.5 12V3a1.5 1.5 0 0 1 1.423-1.498L3 1.5h9A1.5 1.5 0 0 1 13.5 3v9l-.002.077A1.5 1.5 0 0 1 12 13.5z" style="fill:#2e2e2e;fill:color(display-p3 .1804 .1804 .1804);fill-opacity:1"/><path id="icon-update" fill="#000" fill-rule="evenodd" d="M2.108 7.297c0 3.044 2.207 5.118 4.686 5.547a.521.521 0 1 1-.178 1.027c-2.911-.504-5.55-2.958-5.55-6.574 0-1.537.699-2.744 1.515-3.663.585-.658 1.254-1.193 1.793-1.602H2.737a.5.5 0 0 1 0-1h3a.5.5 0 0 1 .5.5v3a.5.5 0 0 1-1 0V2.687h-.001c-.572.432-1.27.958-1.875 1.64-.715.803-1.253 1.775-1.253 2.97m11.108.406c0-3.012-2.16-5.073-4.607-5.533A.521.521 0 0 1 8.8 1.146c2.874.54 5.457 2.98 5.457 6.557 0 1.537-.699 2.745-1.515 3.663-.585.658-1.254 1.193-1.792 1.602h1.636a.5.5 0 1 1 0 1h-3a.5.5 0 0 1-.5-.5v-3a.5.5 0 0 1 1 0v1.846l.002-.002c.571-.43 1.27-.957 1.875-1.638.714-.804 1.252-1.775 1.252-2.97" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/apps/dotcom/client/src/components/BoardHistoryLog/BoardHistoryLog.tsx b/apps/dotcom/client/src/components/BoardHistoryLog/BoardHistoryLog.tsx
index 281b1b1d2b3a..a53fb80df2fc 100644
--- a/apps/dotcom/client/src/components/BoardHistoryLog/BoardHistoryLog.tsx
+++ b/apps/dotcom/client/src/components/BoardHistoryLog/BoardHistoryLog.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom'
 // todo: remove tailwind
 
 interface BoardHistoryLogProps {
-	data: string[]
+	data: { timestamp: string; href?: string }[]
 	hasMore?: boolean
 	onLoadMore?(): void
 	isLoading?: boolean
@@ -18,16 +18,16 @@ function getMonthYear(timestamp: string): string {
 }
 
 function groupTimestampsByMonth(
-	timestamps: string[]
-): Array<{ month: string; timestamps: string[] }> {
-	const groups: { [key: string]: string[] } = {}
+	timestamps: { timestamp: string; href?: string }[]
+): Array<{ month: string; timestamps: { timestamp: string; href?: string }[] }> {
+	const groups: { [key: string]: { timestamp: string; href?: string }[] } = {}
 
-	timestamps.forEach((timestamp) => {
+	timestamps.forEach(({ timestamp, href }) => {
 		const monthKey = getMonthYear(timestamp)
 		if (!groups[monthKey]) {
 			groups[monthKey] = []
 		}
-		groups[monthKey].push(timestamp)
+		groups[monthKey].push({ timestamp, href })
 	})
 
 	return Object.entries(groups).map(([month, timestamps]) => ({
@@ -56,11 +56,10 @@ export function BoardHistoryLog({ data, hasMore, onLoadMore, isLoading }: BoardH
 					<div key={groupIndex} className="board-history__month-group">
 						<h3 className="board-history__month-header">{group.month}</h3>
 						<ol className="board-history__list">
-							{group.timestamps.map((v, i) => {
-								const timeStamp = v.split('/').pop()
+							{group.timestamps.map(({ timestamp, href }, i) => {
 								return (
 									<li key={i}>
-										<Link to={`./${timeStamp}`}>{formatDate(timeStamp!)}</Link>
+										<Link to={href || `./${timestamp}`}>{formatDate(timestamp)}</Link>
 									</li>
 								)
 							})}
diff --git a/apps/dotcom/client/src/components/ErrorPage/ErrorPage.tsx b/apps/dotcom/client/src/components/ErrorPage/ErrorPage.tsx
index 6c137830197d..540258554a3a 100644
--- a/apps/dotcom/client/src/components/ErrorPage/ErrorPage.tsx
+++ b/apps/dotcom/client/src/components/ErrorPage/ErrorPage.tsx
@@ -7,7 +7,7 @@ const GoBackLink = () => {
 	const inIframe = isInIframe()
 	return (
 		<Link to={'/'} target={inIframe ? '_blank' : '_self'}>
-			{inIframe ? <F defaultMessage="Open tldraw." /> : <F defaultMessage="Back to tldraw." />}
+			{inIframe ? <F defaultMessage="Open tldraw" /> : <F defaultMessage="Back to tldraw" />}
 		</Link>
 	)
 }
diff --git a/apps/dotcom/client/src/components/Links.tsx b/apps/dotcom/client/src/components/Links.tsx
index 547b20543c5b..51ac78549d5b 100644
--- a/apps/dotcom/client/src/components/Links.tsx
+++ b/apps/dotcom/client/src/components/Links.tsx
@@ -35,7 +35,8 @@ export function LegacyLinks() {
 					readonlyOk
 					onSelect={() => {
 						openAndTrack(
-							'https://tldraw.dev/?utm_source=dotcom&utm_medium=organic&utm_campaign=learn-more'
+							'https://tldraw.dev/?utm_source=dotcom&utm_medium=organic&utm_campaign=learn-more',
+							true
 						)
 					}}
 				/>
diff --git a/apps/dotcom/client/src/fairy/Fairies.tsx b/apps/dotcom/client/src/fairy/Fairies.tsx
index ef538e9aafc8..c07de24e16a8 100644
--- a/apps/dotcom/client/src/fairy/Fairies.tsx
+++ b/apps/dotcom/client/src/fairy/Fairies.tsx
@@ -1,11 +1,22 @@
-import { TldrawFairyAgent } from '@tldraw/fairy-shared'
-import { useMemo } from 'react'
+import { useEditor, useValue } from 'tldraw'
 import Fairy from './Fairy'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
 
-export function Fairies({ agents }: { agents: TldrawFairyAgent[] }) {
-	const activeAgents = useMemo(
-		() => agents.filter((agent) => agent.$fairy.get() !== undefined),
-		[agents]
+export function Fairies({ agents }: { agents: FairyAgent[] }) {
+	const editor = useEditor()
+	const currentPageId = useValue('current page id', () => editor.getCurrentPageId(), [editor])
+
+	// Reactively filter fairies based on current page and each fairy's currentPageId
+	const activeAgents = useValue(
+		'active fairies on page',
+		() => {
+			return agents.filter((agent) => {
+				const entity = agent.$fairyEntity.get()
+				// Only show fairies that exist and are on the current page
+				return entity !== undefined && entity.currentPageId === currentPageId
+			})
+		},
+		[agents, currentPageId]
 	)
 
 	return (
diff --git a/apps/dotcom/client/src/fairy/Fairy.tsx b/apps/dotcom/client/src/fairy/Fairy.tsx
index f57815f54b4e..5434fdbf35ad 100644
--- a/apps/dotcom/client/src/fairy/Fairy.tsx
+++ b/apps/dotcom/client/src/fairy/Fairy.tsx
@@ -1,32 +1,33 @@
-import { TldrawFairyAgent } from '@tldraw/fairy-shared'
-import { useEffect, useRef } from 'react'
-import { Box, useEditor, useValue } from 'tldraw'
+import { FairyEntity } from '@tldraw/fairy-shared'
+import { ContextMenu as _ContextMenu } from 'radix-ui'
+import React, { useEffect, useRef } from 'react'
+import { Atom, Box, useEditor, useValue } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { $fairyAgentsAtom } from './fairy-agent/agent/fairyAgentsAtom'
 import { FairySpriteComponent } from './fairy-sprite/FairySprite'
+import { FairyContextMenuContent } from './FairyContextMenuContent'
+import { FairyThrowTool } from './FairyThrowTool'
 
-const FAIRY_SIZE = 200
-const FAIRY_CLICKABLE_SIZE_DEFAULT = 100
-const FAIRY_CLICKABLE_SIZE_SELECTED = 200
+export const FAIRY_SIZE = 60
+const FAIRY_CLICKABLE_SIZE_DEFAULT = 50
+const FAIRY_CLICKABLE_SIZE_SELECTED = 60
 
 // We use the agent directly here because we need to access the isGenerating method
 // which is not exposed on the fairy atom
-export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
+export default function Fairy({ agent }: { agent: FairyAgent }) {
 	const editor = useEditor()
-	const containerRef = useRef<HTMLDivElement>(null)
 	const fairyRef = useRef<HTMLDivElement>(null)
-	const fairy = agent.$fairy
+	const fairy = agent.$fairyEntity
+	const fairyConfig = agent.$fairyConfig
 
-	// Track viewport screen bounds to position fairy correctly
-	const screenPosition = useValue(
-		'fairy screen position',
+	const position = useValue(
+		'fairy position',
 		() => {
 			const entity = fairy.get()
 			if (!entity) return { x: 0, y: 0 }
-			// Convert page coordinates to screen coordinates
-			const screenPos = editor.pageToScreen(entity.position)
-			const screenBounds = editor.getViewportScreenBounds()
 			return {
-				x: screenPos.x - screenBounds.x,
-				y: screenPos.y - screenBounds.y,
+				x: entity.position.x,
+				y: entity.position.y,
 			}
 		},
 		[editor, fairy]
@@ -34,24 +35,18 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 
 	const flipX = useValue('fairy flipX', () => fairy.get()?.flipX ?? false, [fairy])
 	const isSelected = useValue('fairy isSelected', () => fairy.get()?.isSelected ?? false, [fairy])
-	const pose = useValue('fairy pose', () => fairy.get()?.pose ?? 'idle', [fairy])
-	const isThrowToolActive = useValue(
-		'is throw tool active',
-		() => editor.getCurrentTool().id === 'fairy-throw',
-		[editor]
-	)
+	const isInSelectTool = useValue('is in select tool', () => editor.isIn('select.idle'), [editor])
+	const isInThrowTool = useValue('is in throw tool', () => editor.isIn('select.fairy-throw'), [
+		editor,
+	])
+	const isGenerating = useValue('is generating', () => agent.isGenerating(), [agent])
+	const isFairyGrabbable = isInSelectTool
 
 	// Listen to brush selection events and update fairy selection
 	const brush = useValue('editor brush', () => editor.getInstanceState().brush, [editor])
 	const wasInitiallySelectedRef = useRef(false)
 	const isBrushingRef = useRef(false)
 
-	// Listen for "select all" events
-	const selectedShapeIds = useValue('selected shape ids', () => editor.getSelectedShapeIds(), [
-		editor,
-	])
-	const prevSelectedCountRef = useRef(0)
-
 	// Track when brushing starts
 	useEffect(() => {
 		if (brush && !isBrushingRef.current) {
@@ -64,43 +59,6 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 		}
 	}, [brush, fairy])
 
-	// Detect "select all" or "select none" events
-	useEffect(() => {
-		// Don't process during brushing (handled by brush logic)
-		if (brush) return
-
-		const currentSelectedCount = selectedShapeIds.length
-
-		// Get all unlocked shapes on the current page
-		const currentPageId = editor.getCurrentPageId()
-		const allUnlockedShapeIds = editor.getSortedChildIdsForParent(currentPageId).filter((id) => {
-			const shape = editor.getShape(id)
-			return shape && !editor.isShapeOrAncestorLocked(shape)
-		})
-
-		// Detect "select all" - if all shapes are now selected and previously weren't
-		const allShapesSelected = currentSelectedCount === allUnlockedShapeIds.length
-		const wasSelectAllTriggered =
-			allShapesSelected &&
-			currentSelectedCount > 0 &&
-			prevSelectedCountRef.current < currentSelectedCount
-
-		if (wasSelectAllTriggered && !fairy.get()?.isSelected) {
-			// Select the fairy too
-			fairy.update((f) => (f ? { ...f, isSelected: true } : f))
-		}
-
-		// Detect "select none" - if no shapes are selected and previously some were
-		const wasSelectNoneTriggered = currentSelectedCount === 0 && prevSelectedCountRef.current > 0
-
-		if (wasSelectNoneTriggered && fairy.get()?.isSelected) {
-			// Deselect the fairy too
-			fairy.update((f) => (f ? { ...f, isSelected: false } : f))
-		}
-
-		prevSelectedCountRef.current = currentSelectedCount
-	}, [selectedShapeIds, brush, fairy, editor])
-
 	useEffect(() => {
 		// Only process when brush is active (not null)
 		if (!brush) return
@@ -108,12 +66,13 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 		if (!fairyEntity) return
 
 		const fairyPosition = fairyEntity.position
-		// Create a bounding box for the fairy (200px x 200px centered on position)
+		const scaledFairySize = FAIRY_SIZE / editor.getZoomLevel()
+		// Create a bounding box for the fairy
 		const fairyBounds = new Box(
-			fairyPosition.x - FAIRY_SIZE / 2,
-			fairyPosition.y - FAIRY_SIZE / 2,
-			FAIRY_SIZE,
-			FAIRY_SIZE
+			fairyPosition.x - scaledFairySize * 0.75,
+			fairyPosition.y - scaledFairySize * 0.25,
+			scaledFairySize,
+			scaledFairySize
 		)
 		const brushBox = Box.From(brush)
 
@@ -141,9 +100,10 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 
 	useEffect(() => {
 		// Deselect fairy when clicking outside
-		const handleClickOutside = (e: any) => {
+		const handleClickOutside = (e: PointerEvent) => {
 			if (
 				fairyRef.current &&
+				e.target instanceof HTMLElement &&
 				!fairyRef.current.contains(e.target) &&
 				!e.target.closest('.tla-fairy-hud')
 			) {
@@ -152,34 +112,81 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 		}
 
 		if (isSelected) {
-			document.addEventListener('mousedown', handleClickOutside)
+			document.addEventListener('pointerdown', handleClickOutside)
 		}
 
 		return () => {
-			document.removeEventListener('mousedown', handleClickOutside)
+			document.removeEventListener('pointerdown', handleClickOutside)
 		}
 	}, [isSelected, fairy])
 
 	// Fairy dragging
 	// Handle fairy pointer down, we don't enter fairy throw tool until the user actually moves their mouse
-	const handleFairyPointerDown = (e: any) => {
+	const handleFairyPointerDown = (e: React.PointerEvent<HTMLDivElement>) => {
 		// Don't activate tool immediately - wait for drag to start
+		// Skip dragging behavior on right-click (context menu will handle it)
+		if (e.button === 2) return
 		if (!editor.isIn('select.idle')) return
-		if (editor.getCurrentTool().id === 'fairy-throw') return
+		if (editor.isIn('select.fairy-throw')) return
+
+		// Determine which fairies to drag before updating selection
+		const fairyAgents = $fairyAgentsAtom.get(editor)
+		const clickedFairyEntity = fairy.get()
+		const wasClickedFairySelected = clickedFairyEntity?.isSelected ?? false
+
+		// Only drag multiple fairies if the clicked fairy was already selected
+		// and there are other selected fairies
+		let fairiesToDrag: Atom<FairyEntity>[]
+		if (wasClickedFairySelected) {
+			// Collect all currently selected fairies
+			const selectedFairies: Atom<FairyEntity>[] = []
+			fairyAgents.forEach((a) => {
+				const entity = a.$fairyEntity.get()
+				if (entity?.isSelected) {
+					selectedFairies.push(a.$fairyEntity)
+				}
+			})
+			fairiesToDrag = selectedFairies
+		} else {
+			// Only drag the clicked fairy
+			fairiesToDrag = [fairy]
+		}
 
-		// right now we don't have a way for the fairy to break out of a user's grasp,
-		// but currently the UI is structured such that you cant be dragging the fairy
-		// when you press generate, so this is enough for now
-		if (agent.isGenerating()) return
+		// Update selection state
+		// If dragging multiple fairies, keep them all selected
+		// Otherwise, update selection as normal
+		const isDraggingMultiple = fairiesToDrag.length > 1
+		const fairiesToDragIds = new Set(
+			fairiesToDrag
+				.map((f) => {
+					// We need to get the agent ID for each fairy to match
+					const agentForFairy = fairyAgents.find((a) => a.$fairyEntity === f)
+					return agentForFairy?.id
+				})
+				.filter((id): id is string => id !== undefined)
+		)
+
+		fairyAgents.forEach((a) => {
+			if (isDraggingMultiple && fairiesToDragIds.has(a.id)) {
+				// Keep all fairies that will be dragged selected
+				a.$fairyEntity.update((f) => (f ? { ...f, isSelected: true } : f))
+			} else if (a.id === agent.id) {
+				a.$fairyEntity.update((f) => (f ? { ...f, isSelected: true } : f))
+			} else if (!e.shiftKey && !e.ctrlKey && !e.metaKey) {
+				a.$fairyEntity.update((f) => (f ? { ...f, isSelected: false } : f))
+			}
+		})
 
-		fairy.update((f) => (f ? { ...f, isSelected: true } : f))
-		editor.setCursor({ type: 'grabbing', rotation: 20 })
 		editor.setSelectedShapes([])
 
+		editor.setCursor({ type: 'grabbing', rotation: 0 })
+		e.preventDefault()
+		e.stopPropagation()
+
 		const startX = e.clientX
 		const startY = e.clientY
 
-		const handlePointerMove = (moveEvent: any) => {
+		const handlePointerMove = (moveEvent: PointerEvent) => {
 			const deltaX = moveEvent.clientX - startX
 			const deltaY = moveEvent.clientY - startY
 
@@ -189,12 +196,12 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 				document.removeEventListener('pointermove', handlePointerMove)
 				document.removeEventListener('pointerup', handlePointerUp)
 
-				// Activate the tool
-				const tool = editor.getStateDescendant('fairy-throw')
-				if (tool && 'setFairy' in tool) {
-					;(tool as any).setFairy(fairy)
+				// Activate the tool with all fairies that were selected at pointer down
+				const tool = editor.getStateDescendant('select.fairy-throw')
+				if (tool && 'setFairies' in tool) {
+					;(tool as FairyThrowTool).setFairies(fairiesToDrag)
 				}
-				editor.setCurrentTool('fairy-throw')
+				editor.setCurrentTool('select.fairy-throw')
 			}
 		}
 
@@ -202,84 +209,60 @@ export default function Fairy({ agent }: { agent: TldrawFairyAgent }) {
 			// Clean up listeners if pointer released without dragging
 			document.removeEventListener('pointermove', handlePointerMove)
 			document.removeEventListener('pointerup', handlePointerUp)
+			editor.setCursor({ type: 'default', rotation: 0 })
 		}
 
 		document.addEventListener('pointermove', handlePointerMove)
 		document.addEventListener('pointerup', handlePointerUp)
 	}
 
-	const handleFairyPointerUp = () => {
-		editor.setCursor({ type: 'grab', rotation: 0 })
-	}
+	const fairyOutfit = useValue('fairy outfit', () => fairyConfig.get()?.outfit, [fairyConfig])
 
 	// Early return if fairy doesn't exist (after all hooks)
 	const fairyEntity = fairy.get()
-	if (!fairyEntity) return null
 
 	return (
-		<div
-			ref={containerRef}
-			style={{
-				position: 'fixed',
-				top: 0,
-				left: 0,
-				width: '100vw',
-				height: '100vh',
-				pointerEvents: 'none',
-				overflow: 'hidden',
-			}}
-		>
-			{/* Fairy */}
-			<div
-				ref={fairyRef}
-				style={{
-					position: 'absolute',
-					left: screenPosition.x,
-					top: screenPosition.y,
-					width: `${FAIRY_SIZE}px`,
-					height: `${FAIRY_SIZE}px`,
-					transform: `translate(-50%, -50%) scale(min(max(var(--tl-zoom), 0.2), 0.7))${flipX ? ' scaleX(-1)' : ''}`,
-					// transition:
-					// 'left 0.8s cubic-bezier(0.34, 1.56, 0.64, 1), top 0.8s cubic-bezier(0.34, 1.56, 0.64, 1)',
-				}}
-				className={isSelected ? 'fairy-selected' : ''}
-			>
-				{/* Fairy clickable zone */}
+		<_ContextMenu.Root dir="ltr">
+			<_ContextMenu.Trigger asChild>
 				<div
-					onPointerDown={handleFairyPointerDown}
-					onPointerUp={handleFairyPointerUp}
-					onMouseEnter={() => {
-						if (!isThrowToolActive) {
-							if (!editor.isIn('select.idle')) return
-							editor.setCursor({ type: 'grab', rotation: 0 })
-						}
-					}}
-					onMouseLeave={() => {
-						if (!isThrowToolActive) {
-							editor.setCursor({ type: 'default', rotation: 0 })
-						}
-					}}
+					ref={fairyRef}
 					style={{
 						position: 'absolute',
-						top: '50%',
-						left: '50%',
-						transform: 'translate(-50%, -50%)',
-						width: `${isSelected ? FAIRY_CLICKABLE_SIZE_SELECTED : FAIRY_CLICKABLE_SIZE_DEFAULT}px`,
-						height: `${isSelected ? FAIRY_CLICKABLE_SIZE_SELECTED : FAIRY_CLICKABLE_SIZE_DEFAULT}px`,
-						pointerEvents: isThrowToolActive ? 'none' : 'auto',
+						left: position.x,
+						top: position.y,
+						width: `${FAIRY_SIZE}px`,
+						height: `${FAIRY_SIZE}px`,
+						transform: `translate(-75%, -25%) scale(var(--tl-scale)) ${flipX ? ' scaleX(-1)' : ''}`,
+						transformOrigin: '75% 25%',
+						transition:
+							isGenerating && !isInThrowTool
+								? 'left 0.1s ease-in-out, top 0.1s ease-in-out'
+								: 'none',
 					}}
-				/>
-				<div>
+					className={isSelected ? 'fairy-selected' : ''}
+				>
+					{/* Fairy clickable zone */}
+					<div
+						onPointerDown={handleFairyPointerDown}
+						style={{
+							position: 'absolute',
+							width: `${isSelected ? FAIRY_CLICKABLE_SIZE_SELECTED : FAIRY_CLICKABLE_SIZE_DEFAULT}px`,
+							height: `${isSelected ? FAIRY_CLICKABLE_SIZE_SELECTED : FAIRY_CLICKABLE_SIZE_DEFAULT}px`,
+							pointerEvents: isFairyGrabbable ? 'all' : 'none',
+							cursor: isFairyGrabbable ? 'grab' : 'default',
+						}}
+					/>
 					<FairySpriteComponent
-						pose={pose}
-						outfit={{
-							body: 'plain',
-							hat: 'pointy',
-							wings: 'plain',
+						entity={fairyEntity}
+						outfit={fairyOutfit}
+						animated={true}
+						onGestureEnd={() => {
+							fairy.update((f) => (f ? { ...f, gesture: null } : f))
 						}}
 					/>
 				</div>
-			</div>
-		</div>
+			</_ContextMenu.Trigger>
+			<FairyContextMenuContent agent={agent} />
+		</_ContextMenu.Root>
 	)
 }
diff --git a/apps/dotcom/client/src/fairy/FairyApp.tsx b/apps/dotcom/client/src/fairy/FairyApp.tsx
index d927272f84ef..ba25e3285807 100644
--- a/apps/dotcom/client/src/fairy/FairyApp.tsx
+++ b/apps/dotcom/client/src/fairy/FairyApp.tsx
@@ -1,26 +1,224 @@
-import { useCallback, useEffect } from 'react'
-import { useEditor } from 'tldraw'
+import {
+	PersistedFairyAgentState,
+	PersistedFairyConfigs,
+	PersistedFairyState,
+} from '@tldraw/fairy-shared'
+import { useCallback, useEffect, useRef } from 'react'
+import { react, throttle, useEditor, useToasts, useValue } from 'tldraw'
+import { useApp } from '../tla/hooks/useAppState'
 import { useTldrawUser } from '../tla/hooks/useUser'
-import { TldrawFairyAgent } from './fairy-agent/agent/TldrawFairyAgent'
-import { useTldrawFairyAgent } from './fairy-agent/agent/useTldrawFairyAgent'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { $fairyProjects } from './FairyProjects'
+import { FairyTaskDragTool } from './FairyTaskDragTool'
+import { $fairyTasks, $showCanvasFairyTasks } from './FairyTaskList'
+import { FairyThrowTool } from './FairyThrowTool'
 
-export function FairyApp({ setAgents }: { setAgents(agents: TldrawFairyAgent[]): void }) {
-	const FAIRY_ID = 'Huppy'
+export function FairyApp({
+	setAgents,
+	fileId,
+}: {
+	setAgents(agents: FairyAgent[]): void
+	fileId: string
+}) {
 	const editor = useEditor()
 	const user = useTldrawUser()
+	const app = useApp()
+	const toasts = useToasts()
+	const fairyConfigs = useValue(
+		'fairyConfigs',
+		() => JSON.parse(app?.getUser().fairies || '{}') as PersistedFairyConfigs,
+		[app]
+	)
 
 	const getToken = useCallback(async () => {
 		if (!user) return undefined
 		return await user.getToken()
 	}, [user])
 
-	const agent = useTldrawFairyAgent(editor, FAIRY_ID, getToken)
+	const handleError = useCallback(
+		(e: any) => {
+			const message = typeof e === 'string' ? e : e instanceof Error && e.message
+			toasts.addToast({
+				title: 'Error',
+				description: message || 'An error occurred',
+				severity: 'error',
+			})
+			console.error(e)
+		},
+		[toasts]
+	)
 
+	// Track whether we're currently loading state to prevent premature saves
+	const isLoadingStateRef = useRef(false)
+	// Keep a ref to agents so effects can access them
+	const agentsRef = useRef<FairyAgent[]>([])
+	// Track which agents have been loaded to avoid reloading existing agents
+	const loadedAgentIdsRef = useRef<Set<string>>(new Set())
+	const fairyTaskListLoadedRef = useRef(false)
+	const showCanvasTodosLoadedRef = useRef(false)
+	const projectsLoadedRef = useRef(false)
+
+	// Create agents dynamically from configs
 	useEffect(() => {
-		if (!editor || !agent) return
-		setAgents([agent])
-		;(window as any).agent = agent
-	}, [agent, editor, setAgents])
+		if (!editor) return
+
+		// Register the FairyThrowTool
+		const selectTool = editor.root.children!.select
+		editor.removeTool(FairyThrowTool, selectTool)
+		editor.setTool(FairyThrowTool, selectTool)
+
+		// Register the TodoDragTool
+		editor.removeTool(FairyTaskDragTool, selectTool)
+		editor.setTool(FairyTaskDragTool, selectTool)
+
+		const configIds = Object.keys(fairyConfigs)
+		const existingAgents = agentsRef.current
+		const existingIds = new Set(existingAgents.map((a) => a.id))
+
+		// Find agents to create (new configs that don't have agents yet)
+		const idsToCreate = configIds.filter((id) => !existingIds.has(id))
+
+		// Find agents to dispose (agents that no longer have configs)
+		const configIdsSet = new Set(configIds)
+		const agentsToDispose = existingAgents.filter((agent) => !configIdsSet.has(agent.id))
+
+		// Dispose removed agents and clean up tracking
+		agentsToDispose.forEach((agent) => {
+			agent.dispose()
+			loadedAgentIdsRef.current.delete(agent.id)
+		})
+
+		// Create new agents
+		const newAgents = idsToCreate.map((id) => {
+			return new FairyAgent({
+				id,
+				app,
+				editor,
+				onError: handleError,
+				getToken,
+			})
+		})
+
+		// Keep existing agents that are still in config, add new ones
+		const updatedAgents = [
+			...existingAgents.filter((agent) => configIdsSet.has(agent.id)),
+			...newAgents,
+		]
+
+		agentsRef.current = updatedAgents
+		setAgents(updatedAgents)
+	}, [fairyConfigs, editor, getToken, handleError, setAgents, app])
+
+	// Cleanup: dispose all agents only when component unmounts
+	useEffect(() => {
+		return () => {
+			agentsRef.current.forEach((agent) => agent.dispose())
+		}
+	}, [])
+
+	// Load fairy state from backend when agents are created
+	useEffect(() => {
+		if (!app || agentsRef.current.length === 0 || !$fairyTasks || !$showCanvasFairyTasks || !fileId)
+			return
+
+		const fileState = app.getFileState(fileId)
+		if (fileState?.fairyState) {
+			try {
+				const fairyState: PersistedFairyState = JSON.parse(fileState.fairyState)
+
+				// Mark that we're loading to prevent save watchers from firing
+				isLoadingStateRef.current = true
+
+				// Only restore state for agents that haven't been loaded yet
+				agentsRef.current.forEach((agent) => {
+					// Skip if already loaded
+					if (loadedAgentIdsRef.current.has(agent.id)) return
+
+					const persistedAgent = fairyState.agents[agent.id]
+					if (persistedAgent) {
+						agent.loadState(persistedAgent)
+						loadedAgentIdsRef.current.add(agent.id)
+					}
+				})
+
+				// Load shared todo list only once
+				if (fairyState.fairyTaskList && !fairyTaskListLoadedRef.current) {
+					$fairyTasks.set(fairyState.fairyTaskList)
+					fairyTaskListLoadedRef.current = true
+				}
+
+				// Load show canvas todos only once
+				if (fairyState.showCanvasTodos && !showCanvasTodosLoadedRef.current) {
+					$showCanvasFairyTasks.set(fairyState.showCanvasTodos)
+					showCanvasTodosLoadedRef.current = true
+				}
+
+				// Load projects only once
+				if (fairyState.projects && !projectsLoadedRef.current) {
+					$fairyProjects.set(fairyState.projects)
+					projectsLoadedRef.current = true
+				}
+
+				// Allow a tick for state to settle before allowing saves
+				setTimeout(() => {
+					isLoadingStateRef.current = false
+				}, 100)
+			} catch (e) {
+				console.error('Failed to load fairy state:', e)
+				isLoadingStateRef.current = false
+			}
+		}
+	}, [app, fairyConfigs, fileId])
+
+	// Todo: Use FileStateUpdater for this
+	// Save fairy state to backend periodically
+	useEffect(() => {
+		if (!app || agentsRef.current.length === 0 || !fileId) return
+
+		const updateFairyState = throttle(() => {
+			// Don't save if we're currently loading state
+			if (isLoadingStateRef.current) return
+
+			const fairyState: PersistedFairyState = {
+				agents: agentsRef.current.reduce(
+					(acc, agent) => {
+						acc[agent.id] = agent.serializeState()
+						return acc
+					},
+					{} as Record<string, PersistedFairyAgentState>
+				),
+				fairyTaskList: $fairyTasks.get(),
+				showCanvasTodos: $showCanvasFairyTasks.get(),
+				projects: $fairyProjects.get(),
+			}
+			app.onFairyStateUpdate(fileId, fairyState)
+		}, 2000) // Save maximum every 2 seconds
+
+		// Watch for changes in fairy atoms
+		const fairyCleanupFns: (() => void)[] = []
+		agentsRef.current.forEach((agent) => {
+			const cleanup = react(`${agent.id} state`, () => {
+				agent.$fairyEntity.get()
+				agent.$chatHistory.get()
+				agent.$personalTodoList.get()
+				updateFairyState()
+			})
+			fairyCleanupFns.push(cleanup)
+		})
+
+		const cleanupSharedFairyState = react('shared fairy atom state', () => {
+			$fairyTasks.get()
+			$showCanvasFairyTasks.get()
+			$fairyProjects.get()
+			updateFairyState()
+		})
+
+		return () => {
+			updateFairyState.flush()
+			cleanupSharedFairyState()
+			fairyCleanupFns.forEach((cleanup) => cleanup())
+		}
+	}, [app, fairyConfigs, fileId])
 
 	return null
 }
diff --git a/apps/dotcom/client/src/fairy/FairyConfigDialog.tsx b/apps/dotcom/client/src/fairy/FairyConfigDialog.tsx
new file mode 100644
index 000000000000..e34623ad775f
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyConfigDialog.tsx
@@ -0,0 +1,117 @@
+import { FAIRY_VARIANTS, FairyVariantType } from '@tldraw/fairy-shared'
+import {
+	TldrawUiButton,
+	TldrawUiButtonLabel,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogFooter,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+	TldrawUiInput,
+	useValue,
+} from 'tldraw'
+import { F, useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { fairyMessages } from './fairy-messages'
+
+export function FairyConfigDialog({ agent, onClose }: { agent: FairyAgent; onClose(): void }) {
+	const config = useValue(agent.$fairyConfig)
+
+	const fairyNamePlaceholder = useMsg(fairyMessages.fairyNamePlaceholder)
+	const fairyPersonalityPlaceholder = useMsg(fairyMessages.fairyPersonalityPlaceholder)
+
+	// Get translated hat names
+	const hatTop = useMsg(fairyMessages.hatTop)
+	const hatPointy = useMsg(fairyMessages.hatPointy)
+	const hatBald = useMsg(fairyMessages.hatBald)
+	const hatAntenna = useMsg(fairyMessages.hatAntenna)
+	const hatSpiky = useMsg(fairyMessages.hatSpiky)
+	const hatHair = useMsg(fairyMessages.hatHair)
+	const hatEars = useMsg(fairyMessages.hatEars)
+	const hatPropellor = useMsg(fairyMessages.hatPropeller)
+
+	// Map hat type to translated name
+	const getHatName = (hat: string): string => {
+		switch (hat) {
+			case 'top':
+				return hatTop
+			case 'pointy':
+				return hatPointy
+			case 'bald':
+				return hatBald
+			case 'antenna':
+				return hatAntenna
+			case 'spiky':
+				return hatSpiky
+			case 'hair':
+				return hatHair
+			case 'ears':
+				return hatEars
+			case 'propellor':
+				return hatPropellor
+			default:
+				return hat.charAt(0).toUpperCase() + hat.slice(1)
+		}
+	}
+
+	return (
+		<>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<F defaultMessage="Fairy customization" />
+				</TldrawUiDialogTitle>
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody style={{ maxWidth: 400 }}>
+				<div
+					className="fairy-config-dialog"
+					style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}
+				>
+					<label htmlFor="name">
+						<F defaultMessage="Name" />
+					</label>
+					<TldrawUiInput
+						className="fairy-config-input"
+						value={config.name}
+						onValueChange={(value) => agent.updateFairyConfig({ name: value })}
+						placeholder={fairyNamePlaceholder}
+					/>
+					<label htmlFor="name">
+						<F defaultMessage="Personality" />
+					</label>
+					<TldrawUiInput
+						className="fairy-config-input"
+						value={config.personality}
+						onValueChange={(value) => agent.updateFairyConfig({ personality: value })}
+						placeholder={fairyPersonalityPlaceholder}
+					/>
+					<label htmlFor="hat">
+						<F defaultMessage="Hat" />
+					</label>
+					<select
+						id="hat"
+						value={config.outfit.hat}
+						onChange={(e) => {
+							agent.updateFairyConfig({
+								outfit: { ...config.outfit, hat: e.target.value as FairyVariantType<'hat'> },
+							})
+						}}
+					>
+						{Object.keys(FAIRY_VARIANTS.hat).map((hat) => (
+							<option key={hat} value={hat}>
+								{getHatName(hat)}
+							</option>
+						))}
+					</select>
+				</div>
+			</TldrawUiDialogBody>
+			<TldrawUiDialogFooter className="tlui-dialog__footer__actions">
+				<TldrawUiButton type="normal" onClick={onClose}>
+					<TldrawUiButtonLabel>
+						<F defaultMessage="Close" />
+					</TldrawUiButtonLabel>
+				</TldrawUiButton>
+			</TldrawUiDialogFooter>
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyContextMenuContent.tsx b/apps/dotcom/client/src/fairy/FairyContextMenuContent.tsx
new file mode 100644
index 000000000000..35339a2d858b
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyContextMenuContent.tsx
@@ -0,0 +1,21 @@
+import { ContextMenu as _ContextMenu } from 'radix-ui'
+import { useContainer } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { FairyMenuContent } from './FairyMenuContent'
+
+export function FairyContextMenuContent({ agent }: { agent: FairyAgent }) {
+	const container = useContainer()
+
+	return (
+		<_ContextMenu.Portal container={container}>
+			<_ContextMenu.Content
+				className="tlui-menu fairy-sidebar-dropdown"
+				collisionPadding={4}
+				onPointerDown={(e) => e.stopPropagation()}
+				style={{ zIndex: 'var(--tl-layer-canvas-in-front)' }}
+			>
+				<FairyMenuContent agent={agent} menuType="context-menu" />
+			</_ContextMenu.Content>
+		</_ContextMenu.Portal>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyDebugDialog.tsx b/apps/dotcom/client/src/fairy/FairyDebugDialog.tsx
new file mode 100644
index 000000000000..82e447d29384
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyDebugDialog.tsx
@@ -0,0 +1,657 @@
+import {
+	AGENT_MODEL_DEFINITIONS,
+	AgentModelName,
+	ChatHistoryItem,
+	DEFAULT_MODEL_NAME,
+	PROMPT_PART_DEFINITIONS,
+} from '@tldraw/fairy-shared'
+import { ReactNode, useState } from 'react'
+import {
+	TldrawUiButton,
+	TldrawUiButtonIcon,
+	TldrawUiButtonLabel,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogFooter,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+	TldrawUiDropdownMenuContent,
+	TldrawUiDropdownMenuItem,
+	TldrawUiDropdownMenuRoot,
+	TldrawUiDropdownMenuTrigger,
+	useValue,
+} from 'tldraw'
+import { F } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { $fairyDebugFlags } from './FairyDebugFlags'
+import { $fairyModelSelection } from './FairyModelSelection'
+import { $fairyProjects, addAgentToDummyProject } from './FairyProjects'
+import { $fairyTasks } from './FairyTaskList'
+
+// # Home Debug Inspector Types and Labels
+type HomeDebugInspectorType = 'projects' | 'fairyTaskList'
+const HOME_DEBUG_INSPECTOR_TYPES: HomeDebugInspectorType[] = ['projects', 'fairyTaskList']
+
+// # Fairy Debug Inspector Types and Labels
+type FairyDebugInspectorType =
+	| 'config'
+	| 'actions'
+	| 'fairyEntity'
+	| 'activeRequest'
+	| 'scheduledRequest'
+	| 'chatOrigin'
+	| 'personalTodoList'
+	| 'userActionHistory'
+	| 'currentProjectId'
+	| 'cumulativeUsage'
+	| 'mode'
+
+const FAIRY_DEBUG_INSPECTOR_TYPES: FairyDebugInspectorType[] = [
+	'config',
+	'actions',
+	'fairyEntity',
+	'activeRequest',
+	'scheduledRequest',
+	'chatOrigin',
+	'personalTodoList',
+	'userActionHistory',
+	'currentProjectId',
+	'cumulativeUsage',
+	'mode',
+]
+
+// # Main dialog component
+export function FairyDebugDialog({ agents, onClose }: { agents: FairyAgent[]; onClose(): void }) {
+	const [selectedTabId, setSelectedTabId] = useState<string>('home')
+	const [fairyDebugInspectorType, setFairyDebugInspectorType] =
+		useState<FairyDebugInspectorType>('config')
+	const [homeDebugInspectorType, setHomeDebugInspectorType] =
+		useState<HomeDebugInspectorType>('projects')
+
+	const isHomeTab = selectedTabId === 'home'
+	const selectedAgent = isHomeTab
+		? null
+		: agents.find((agent) => agent.id === selectedTabId) || agents[0]
+
+	return (
+		<div className="fairy-debug-dialog-wrapper">
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>Fairy Debug View</TldrawUiDialogTitle>
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+
+			{/* Tabs: click to choose between home debug view and debug view for specific agents */}
+			<div className="fairy-debug-tabs">
+				<TldrawUiButton
+					type="low"
+					isActive={selectedTabId === 'home'}
+					title="Home"
+					onClick={() => setSelectedTabId('home')}
+				>
+					Home
+				</TldrawUiButton>
+				{agents.map((agent) => {
+					const config = agent.$fairyConfig.get()
+					return (
+						<TldrawUiButton
+							key={agent.id}
+							type="low"
+							isActive={selectedTabId === agent.id}
+							title={config.name || agent.id}
+							onClick={() => setSelectedTabId(agent.id)}
+						>
+							{config.name || agent.id}
+						</TldrawUiButton>
+					)
+				})}
+			</div>
+
+			{/* Fairy Debug Options: always visible when viewing an agent */}
+			{!isHomeTab && selectedAgent && <FairyDebugOptions agent={selectedAgent} />}
+
+			{/* Home debug options: always visible when viewing the home tab */}
+			{isHomeTab && <HomeDebugOptions />}
+
+			{/* View Dropdown: choose between different inspectable views for the given tab */}
+			<div className="fairy-debug-view-dropdown">
+				<label className="fairy-debug-view-label">View:</label>
+				<TldrawUiDropdownMenuRoot id="debug-view-select">
+					<TldrawUiDropdownMenuTrigger>
+						<TldrawUiButton type="low" className="fairy-debug-view-button">
+							<TldrawUiButtonLabel>
+								{isHomeTab ? (
+									<DebugInspectorLabel type={homeDebugInspectorType} isHomeTab />
+								) : (
+									<DebugInspectorLabel type={fairyDebugInspectorType} isHomeTab={false} />
+								)}
+							</TldrawUiButtonLabel>
+							<TldrawUiButtonIcon icon="chevron-down" small />
+						</TldrawUiButton>
+					</TldrawUiDropdownMenuTrigger>
+					<TldrawUiDropdownMenuContent side="top" className="fairy-debug-dropdown">
+						{isHomeTab
+							? HOME_DEBUG_INSPECTOR_TYPES.map((type) => (
+									<DropdownMenuItem
+										key={type}
+										label={<DebugInspectorLabel type={type} isHomeTab />}
+										onClick={() => setHomeDebugInspectorType(type)}
+									/>
+								))
+							: FAIRY_DEBUG_INSPECTOR_TYPES.map((type) => (
+									<DropdownMenuItem
+										key={type}
+										label={<DebugInspectorLabel type={type} isHomeTab={false} />}
+										onClick={() => setFairyDebugInspectorType(type)}
+									/>
+								))}
+					</TldrawUiDropdownMenuContent>
+				</TldrawUiDropdownMenuRoot>
+			</div>
+
+			{/* Body: displays the selected view */}
+			<TldrawUiDialogBody className="fairy-debug-dialog-body">
+				{isHomeTab ? (
+					<HomeDebugView homeDebugInspectorType={homeDebugInspectorType} />
+				) : (
+					selectedAgent && (
+						<FairyDebugView agent={selectedAgent} inspectorType={fairyDebugInspectorType} />
+					)
+				)}
+			</TldrawUiDialogBody>
+			<TldrawUiDialogFooter className="tlui-dialog__footer__actions">
+				<TldrawUiButton type="normal" onClick={onClose}>
+					<TldrawUiButtonLabel>Close</TldrawUiButtonLabel>
+				</TldrawUiButton>
+			</TldrawUiDialogFooter>
+		</div>
+	)
+}
+
+// Helper component for debug inspector labels
+function DebugInspectorLabel({
+	type,
+	isHomeTab,
+}: {
+	type: HomeDebugInspectorType | FairyDebugInspectorType
+	isHomeTab: boolean
+}) {
+	if (isHomeTab) {
+		const homeType = type as HomeDebugInspectorType
+		if (homeType === 'projects') return 'Projects'
+		if (homeType === 'fairyTaskList') return 'Task List'
+	} else {
+		const fairyType = type as FairyDebugInspectorType
+		if (fairyType === 'config') return 'Config'
+		if (fairyType === 'actions') return 'Actions'
+		if (fairyType === 'fairyEntity') return 'Fairy Entity'
+		if (fairyType === 'activeRequest') return 'Active Request'
+		if (fairyType === 'scheduledRequest') return 'Scheduled Request'
+		if (fairyType === 'chatOrigin') return 'Chat Origin'
+		if (fairyType === 'personalTodoList') return 'Personal Todo List'
+		if (fairyType === 'userActionHistory') return 'User Action History'
+		if (fairyType === 'currentProjectId') return 'Current Project ID'
+		if (fairyType === 'cumulativeUsage') return 'Cumulative Usage'
+		if (fairyType === 'mode') return 'Mode'
+	}
+	return null
+}
+
+// # Home Debug View
+
+function HomeDebugView({
+	homeDebugInspectorType,
+}: {
+	homeDebugInspectorType: HomeDebugInspectorType
+}) {
+	return (
+		<div className="fairy-debug-view-container">
+			{homeDebugInspectorType === 'projects' && <ProjectsInspector />}
+			{homeDebugInspectorType === 'fairyTaskList' && <FairyTaskInspector />}
+		</div>
+	)
+}
+
+// ## Home debug view inspector components
+
+function ProjectsInspector() {
+	const projects = useValue($fairyProjects)
+	const fairyTasks = useValue($fairyTasks)
+
+	return (
+		<div className="fairy-debug-projects-container">
+			<div className="fairy-debug-projects-header">Projects ({projects.length}):</div>
+			{projects.length === 0 ? (
+				<div className="fairy-debug-projects-empty">No projects yet</div>
+			) : (
+				projects.map((project, index) => {
+					const projectTodos = fairyTasks.filter((todo) => todo.projectId === project.id)
+					return (
+						<div key={project.id} className="fairy-debug-project-card">
+							<div className="fairy-debug-project-name">{project.title}</div>
+							<div className="fairy-debug-project-details">
+								<KeyValuePair label="id" value={project.id} />
+								<KeyValuePair label="description" value={project.description} />
+								<KeyValuePair label="plan" value={project.plan} />
+								<KeyValuePair
+									label="orchestrator"
+									value={
+										project.members.find(
+											(member) =>
+												member.role === 'orchestrator' || member.role === 'duo-orchestrator'
+										)?.id
+									}
+								/>
+								<KeyValuePair label="members" value={project.members} />
+							</div>
+							<div className="fairy-debug-project-todos-section">
+								<div className="fairy-debug-project-todos-header">
+									Associated Todos ({projectTodos.length}):
+								</div>
+								{projectTodos.length === 0 ? (
+									<div className="fairy-debug-project-todos-empty">
+										No todos associated with this project
+									</div>
+								) : (
+									<div className="fairy-debug-project-todos-list">
+										{projectTodos.map((todo) => (
+											<div key={todo.id} className="fairy-debug-project-todo-item">
+												<pre className="fairy-debug-pre">{formatValue(todo)}</pre>
+											</div>
+										))}
+									</div>
+								)}
+							</div>
+							{index < projects.length - 1 && <hr className="fairy-debug-project-separator" />}
+						</div>
+					)
+				})
+			)}
+		</div>
+	)
+}
+
+function FairyTaskInspector() {
+	const fairyTasks = useValue($fairyTasks)
+
+	return (
+		<div className="fairy-debug-shared-todos-container">
+			<div className="fairy-debug-shared-todos-header">Shared Todo List ({fairyTasks.length}):</div>
+			{fairyTasks.length === 0 ? (
+				<div className="fairy-debug-shared-todos-empty">No shared todos yet</div>
+			) : (
+				fairyTasks.map((todo, index) => (
+					<div key={todo.id} className="fairy-debug-shared-todo-item">
+						{/* <JsonDisplay value={todo} /> */}
+						{Object.entries(todo).map(([key, value]) => (
+							<KeyValuePair key={key} label={key} value={value} />
+						))}
+						{index < fairyTasks.length - 1 && <hr className="fairy-debug-shared-todo-separator" />}
+					</div>
+				))
+			)}
+		</div>
+	)
+}
+
+function HomeDebugOptions() {
+	const debugFlags = useValue($fairyDebugFlags)
+	const selectedModel = useValue($fairyModelSelection)
+	const currentModel = selectedModel ?? DEFAULT_MODEL_NAME
+
+	return (
+		<div className="home-debug-options-container">
+			<div className="fairy-debug-flags-container">
+				<p>Debug Flags</p>
+				<div className="fairy-debug-flags-checkboxes">
+					<label className="fairy-debug-flags-checkbox">
+						<input
+							type="checkbox"
+							checked={debugFlags.showTaskBounds}
+							onChange={(e) => {
+								$fairyDebugFlags.set({
+									...debugFlags,
+									showTaskBounds: e.target.checked,
+								})
+							}}
+						/>
+						<span>Show Task Bounds</span>
+					</label>
+				</div>
+			</div>
+			<div className="fairy-debug-model-selection-container">
+				<label className="fairy-debug-view-label">
+					<F defaultMessage="Model:" />
+				</label>
+				<TldrawUiDropdownMenuRoot id="model-select">
+					<TldrawUiDropdownMenuTrigger>
+						<TldrawUiButton type="low" className="fairy-debug-view-button">
+							<TldrawUiButtonLabel>{currentModel}</TldrawUiButtonLabel>
+							<TldrawUiButtonIcon icon="chevron-down" small />
+						</TldrawUiButton>
+					</TldrawUiDropdownMenuTrigger>
+					<TldrawUiDropdownMenuContent side="top" className="fairy-debug-dropdown">
+						{Object.entries(AGENT_MODEL_DEFINITIONS).map(([modelName, modelDefinition]) => (
+							<DropdownMenuItem
+								key={modelName}
+								label={modelDefinition.name}
+								onClick={() => {
+									$fairyModelSelection.set(modelName as AgentModelName)
+								}}
+							/>
+						))}
+					</TldrawUiDropdownMenuContent>
+				</TldrawUiDropdownMenuRoot>
+			</div>
+			<TldrawUiButton type="low" onClick={logPartDefinitionsByPriority}>
+				<TldrawUiButtonLabel>Log Part Definitions by Priority</TldrawUiButtonLabel>
+			</TldrawUiButton>
+		</div>
+	)
+}
+
+function FairyDebugOptions({ agent }: { agent: FairyAgent }) {
+	const debugFlags = useValue(agent.$debugFlags)
+
+	return (
+		<div className="fairy-debug-options-container">
+			<div className="fairy-debug-flags-container">
+				<p>Debug Flags</p>
+				<div className="fairy-debug-flags-checkboxes">
+					<label className="fairy-debug-flags-checkbox">
+						<input
+							type="checkbox"
+							checked={debugFlags.logSystemPrompt}
+							onChange={(e) => {
+								agent.$debugFlags.set({
+									...debugFlags,
+									logSystemPrompt: e.target.checked,
+								})
+							}}
+						/>
+						<span>Log System Prompt</span>
+					</label>
+					<label className="fairy-debug-flags-checkbox">
+						<input
+							type="checkbox"
+							checked={debugFlags.logMessages}
+							onChange={(e) => {
+								agent.$debugFlags.set({
+									...debugFlags,
+									logMessages: e.target.checked,
+								})
+							}}
+						/>
+						<span>Log Messages</span>
+					</label>
+					<label className="fairy-debug-flags-checkbox">
+						<input
+							type="checkbox"
+							checked={debugFlags.logResponseTime}
+							onChange={(e) => {
+								agent.$debugFlags.set({
+									...debugFlags,
+									logResponseTime: e.target.checked,
+								})
+							}}
+						/>
+						<span>
+							<F defaultMessage="Log response time (solo mode only)" />
+						</span>
+					</label>
+				</div>
+			</div>
+
+			<div className="fairy-debug-options-buttons">
+				<TldrawUiButton type="low" onClick={() => addAgentToDummyProject(agent.id)}>
+					<TldrawUiButtonLabel>Add to dummy project</TldrawUiButtonLabel>
+				</TldrawUiButton>
+				<TldrawUiButton type="low" onClick={() => ((window as any).agent = agent)}>
+					<TldrawUiButtonLabel>Set window.agent</TldrawUiButtonLabel>
+				</TldrawUiButton>
+			</div>
+		</div>
+	)
+}
+
+// # Fairy Debug View
+
+function FairyDebugView({
+	agent,
+	inspectorType,
+}: {
+	agent: FairyAgent
+	inspectorType: FairyDebugInspectorType
+}) {
+	// Call all hooks unconditionally to satisfy React's rules of hooks
+	const fairyEntity = useValue(agent.$fairyEntity)
+	const activeRequest = useValue(agent.$activeRequest)
+	const scheduledRequest = useValue(agent.$scheduledRequest)
+	const chatOrigin = useValue(agent.$chatOrigin)
+	const personalTodoList = useValue(agent.$personalTodoList)
+	const userActionHistory = useValue(agent.$userActionHistory)
+	const currentProjectId = agent.getProject()?.id
+	const cumulativeUsage = agent.cumulativeUsage
+	const mode = agent.getMode()
+
+	if (inspectorType === 'config') {
+		return (
+			<div className="fairy-debug-view-container">
+				<ConfigInspector agent={agent} />
+			</div>
+		)
+	}
+	if (inspectorType === 'actions') {
+		return (
+			<div className="fairy-debug-view-container">
+				<ActionsInspector agent={agent} />
+			</div>
+		)
+	}
+
+	// For all other inspector types, use JsonDisplay
+	const valueMap: Record<Exclude<FairyDebugInspectorType, 'config' | 'actions'>, unknown> = {
+		fairyEntity,
+		activeRequest,
+		scheduledRequest,
+		chatOrigin,
+		personalTodoList,
+		userActionHistory,
+		currentProjectId,
+		cumulativeUsage,
+		mode,
+	}
+
+	const value = valueMap[inspectorType as Exclude<FairyDebugInspectorType, 'config' | 'actions'>]
+	return (
+		<div className="fairy-debug-view-container">
+			<JsonDisplay value={value} />
+		</div>
+	)
+}
+
+// ## Fairy debug view inspector components
+
+function ConfigInspector({ agent }: { agent: FairyAgent }) {
+	const config = useValue(agent.$fairyConfig)
+
+	return (
+		<div className="fairy-debug-config-container">
+			<KeyValuePair label="id" value={agent.id} />
+			{Object.entries(config).map(([key, value]) => (
+				<KeyValuePair key={key} label={key} value={value} />
+			))}
+		</div>
+	)
+}
+
+function ActionsInspector({ agent }: { agent: FairyAgent }) {
+	const chatHistory = useValue(agent.$chatHistory)
+
+	// Filter to only completed actions, and include all prompts and continuations
+	const items: ChatHistoryItem[] = chatHistory.filter((item) => {
+		if (item.type === 'action') {
+			return item.action.complete === true
+		}
+		return true // Include all prompts and continuations
+	})
+
+	return (
+		<div className="fairy-debug-container">
+			<div className="fairy-debug-header">Chat History ({items.length})</div>
+			{items.length === 0 ? (
+				<div className="fairy-debug-empty">No chat history items yet</div>
+			) : (
+				items.map((item, index) => {
+					const isLast = index === items.length - 1
+					if (item.type === 'prompt') {
+						return <PromptItem key={`prompt-${index}`} item={item} isLast={isLast} />
+					}
+					if (item.type === 'action') {
+						return <ActionItem key={`action-${index}`} item={item} isLast={isLast} />
+					}
+					if (item.type === 'continuation') {
+						return <ContinuationItem key={`continuation-${index}`} item={item} isLast={isLast} />
+					}
+					return null
+				})
+			)}
+		</div>
+	)
+
+	function PromptItem({
+		item,
+		isLast,
+	}: {
+		item: Extract<ChatHistoryItem, { type: 'prompt' }>
+		isLast: boolean
+	}) {
+		return (
+			<>
+				<div className="fairy-debug-item">
+					<KeyValuePair label="type" value={item.type} />
+					<KeyValuePair label="message" value={item.message} />
+				</div>
+				{!isLast && <hr />}
+			</>
+		)
+	}
+
+	function ActionItem({
+		item,
+		isLast,
+	}: {
+		item: Extract<ChatHistoryItem, { type: 'action' }>
+		isLast: boolean
+	}) {
+		return (
+			<>
+				<div className="fairy-debug-item">
+					<KeyValuePair label="action" value={item.action} />
+				</div>
+				{!isLast && <hr />}
+			</>
+		)
+	}
+
+	function ContinuationItem({
+		item,
+		isLast,
+	}: {
+		item: Extract<ChatHistoryItem, { type: 'continuation' }>
+		isLast: boolean
+	}) {
+		return (
+			<>
+				<div className="fairy-debug-item">
+					<KeyValuePair label="type" value={item.type} />
+					<KeyValuePair label="data" value={item.data} />
+				</div>
+				{!isLast && <hr />}
+			</>
+		)
+	}
+}
+
+// # Utility functions
+
+/**
+ * Logs all prompt part definitions ranked by priority.
+ */
+function logPartDefinitionsByPriority() {
+	// Sort by priority (undefined priorities go to the top, then lower priority first)
+	const sorted = [...PROMPT_PART_DEFINITIONS].sort((a, b) => {
+		const aHasPriority = a.priority !== undefined
+		const bHasPriority = b.priority !== undefined
+
+		// If one has priority and the other doesn't, undefined goes first
+		if (aHasPriority && !bHasPriority) return 1
+		if (!aHasPriority && bHasPriority) return -1
+
+		// If both have priority, sort by priority value
+		if (aHasPriority && bHasPriority) {
+			return a.priority! - b.priority!
+		}
+
+		// If neither has priority, maintain original order
+		return 0
+	})
+
+	/* eslint-disable no-console */
+	console.group('Prompt Part Definitions (ranked by priority)')
+	sorted.forEach((def, index) => {
+		const priority = def.priority !== undefined ? def.priority : 'N/A'
+		console.log(`${index + 1}. ${def.type}: ${priority}`)
+	})
+	console.groupEnd()
+	/* eslint-enable no-console */
+}
+
+/**
+ * Format a value as a string for display in the debug view.
+ */
+function formatValue(value: unknown): string {
+	if (value === null) return 'null'
+	if (value === undefined) return 'undefined'
+	if (typeof value === 'object') {
+		return JSON.stringify(value, null, 2)
+	}
+	return String(value)
+}
+
+/**
+ * Formats a key-value pair nicely for display in the debug view.
+ */
+function KeyValuePair({ label, value }: { label: string; value: unknown }) {
+	return (
+		<div className="fairy-debug-key-value">
+			<span className="fairy-debug-label">{label}:</span>
+			<pre className="fairy-debug-pre">{formatValue(value)}</pre>
+		</div>
+	)
+}
+
+/**
+ * Displays any json value nicely for display in the debug view.
+ * Less nicely than KeyValuePair, but works on whatever.
+ */
+function JsonDisplay({ value }: { value: unknown }) {
+	return (
+		<div className="fairy-debug-json-display">
+			<pre className="fairy-debug-pre">{formatValue(value)}</pre>
+		</div>
+	)
+}
+
+/**
+ *
+ * Dropdown menu item wrapper with an onclick
+ */
+function DropdownMenuItem({ label, onClick }: { label: string | ReactNode; onClick(): void }) {
+	return (
+		<TldrawUiDropdownMenuItem>
+			<TldrawUiButton type="menu" onClick={onClick}>
+				<TldrawUiButtonLabel>{label}</TldrawUiButtonLabel>
+			</TldrawUiButton>
+		</TldrawUiDropdownMenuItem>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyDebugFlags.ts b/apps/dotcom/client/src/fairy/FairyDebugFlags.ts
new file mode 100644
index 000000000000..ee8852e1333c
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyDebugFlags.ts
@@ -0,0 +1,5 @@
+import { atom } from 'tldraw'
+
+export const $fairyDebugFlags = atom<{ showTaskBounds: boolean }>('fairyDebugFlags', {
+	showTaskBounds: false,
+})
diff --git a/apps/dotcom/client/src/fairy/FairyDropdownContent.tsx b/apps/dotcom/client/src/fairy/FairyDropdownContent.tsx
new file mode 100644
index 000000000000..960a0ac3bcb7
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyDropdownContent.tsx
@@ -0,0 +1,35 @@
+import { DropdownMenu as _DropdownMenu } from 'radix-ui'
+import { useContainer } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { FairyMenuContent } from './FairyMenuContent'
+
+export function FairyDropdownContent({
+	agent,
+	alignOffset,
+	sideOffset,
+	side = 'top',
+}: {
+	agent: FairyAgent
+	alignOffset: number
+	sideOffset: number
+	side?: 'top' | 'bottom' | 'left' | 'right'
+}) {
+	const container = useContainer()
+
+	return (
+		<_DropdownMenu.Portal container={container}>
+			<_DropdownMenu.Content
+				side={side}
+				align="start"
+				className="tlui-menu fairy-sidebar-dropdown"
+				collisionPadding={4}
+				alignOffset={alignOffset}
+				sideOffset={sideOffset}
+				onClick={(e) => e.stopPropagation()}
+				style={{ zIndex: 'var(--tl-layer-canvas-in-front)' }}
+			>
+				<FairyMenuContent agent={agent} menuType="menu" />
+			</_DropdownMenu.Content>
+		</_DropdownMenu.Portal>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyGroupChat.tsx b/apps/dotcom/client/src/fairy/FairyGroupChat.tsx
new file mode 100644
index 000000000000..41f091e86d60
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyGroupChat.tsx
@@ -0,0 +1,261 @@
+import { FairyProject } from '@tldraw/fairy-shared'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { TldrawUiToolbar, TldrawUiToolbarButton, uniqueId, useValue } from 'tldraw'
+import { F, useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { fairyMessages } from './fairy-messages'
+import { FairySpriteComponent } from './fairy-sprite/FairySprite'
+import { $fairyProjects, addProject, getProjectByAgentId } from './FairyProjects'
+
+export function FairyGroupChat({
+	agents,
+	onStartProject,
+}: {
+	agents: FairyAgent[]
+	onStartProject(orchestratorAgent: FairyAgent): void
+}) {
+	const [leaderAgentId, setLeaderAgentId] = useState<string | null>(null)
+	const [instruction, setInstruction] = useState('')
+	const instructionTextareaRef = useRef<HTMLTextAreaElement>(null)
+
+	const leaderAgent = useValue(
+		'leader-agent',
+		() => (leaderAgentId ? (agents.find((agent) => agent.id === leaderAgentId) ?? null) : null),
+		[agents, leaderAgentId]
+	)
+
+	const leaderConfig = useValue('leader-config', () => leaderAgent?.$fairyConfig.get() ?? null, [
+		leaderAgent,
+	])
+
+	// TODO clean up logic for how we split out "available" agents, "project" agents, etc
+
+	const followerAgents = useValue(
+		'follower-agents',
+		() =>
+			leaderAgentId
+				? agents.filter(
+						(agent) => agent.id !== leaderAgentId && getProjectByAgentId(agent.id) === undefined
+					)
+				: [],
+		[agents, leaderAgentId]
+	)
+
+	const areAnyProjectAgentsGenerating = useValue(
+		'areAnyProjectAgentsGenerating',
+		() => followerAgents.some((agent) => agent.isGenerating()) || leaderAgent?.isGenerating(),
+		[followerAgents, leaderAgent]
+	)
+
+	useEffect(() => {
+		if (instructionTextareaRef.current) {
+			instructionTextareaRef.current.spellcheck = false
+		}
+	}, [])
+
+	const handleSetLeader = (agent: FairyAgent) => {
+		setLeaderAgentId(agent.id)
+	}
+
+	const getGroupChatPrompt = useCallback(
+		(instruction: string, followerAgents: FairyAgent[], isDuo: boolean) => {
+			if (isDuo) {
+				const partnerName = followerAgents[0]?.$fairyConfig.get()?.name ?? 'your partner'
+				const partnerId = followerAgents[0]?.id ?? ''
+				return `You are collaborating with your partner on a duo project. You are the leader of the duo.You have been instructed to do this project:
+${instruction}. 
+A project has automatically been created, but you need to start it yourself. You have been placed into duo orchestrator mode. You are working together with your partner to complete this project. Your partner is:
+- name: ${partnerName} (id: ${partnerId})
+You are to complete the project together. You can assign tasks to your partner or work on tasks yourself. As you are the leader of the duo, your priority is to assign tasks for your partner to complete, but you may do tasks yourself as well, if it makes sense to work in parallel. Make sure to give the approximate locations of the work to be done, if relevant, in order to make sure you both don't get confused if there are multiple tasks to be done.`
+			} else {
+				const followerNames = followerAgents
+					.map((agent) => `- name: ${agent.$fairyConfig.get()?.name} (id: ${agent.id})`)
+					.join('\n')
+				return `You are the leader of a group of fairies who have been instructed to do this project:
+${instruction}. 
+A project has automatically been created, but you need to start it yourself. You have been placed into orchestrator mode. You are in charge of making sure the other fairies follow your instructions and complete the project together. Your teammates are:
+${followerNames}
+You are to complete the project together.
+Make sure to give the approximate locations of the work to be done, if relevant, in order to make sure fairies dont get confused if there are multiple tasks to be done.`
+			}
+		},
+		[]
+	)
+
+	const handleInstructGroupChat = useCallback(
+		async (value: string) => {
+			if (!leaderAgent || !value.trim()) {
+				return
+			}
+
+			// Check if this is a duo project (exactly 2 fairies: 1 leader + 1 follower)
+			const isDuo = followerAgents.length === 1
+
+			const newProjectId = uniqueId(5)
+			const newProject: FairyProject = {
+				id: newProjectId,
+				title: '',
+				description: '',
+				color: 'grey',
+				members: [
+					{
+						id: leaderAgent.id,
+						role: isDuo ? ('duo-orchestrator' as const) : ('orchestrator' as const),
+					},
+					...followerAgents.map((agent) => ({ id: agent.id, role: 'drone' as const })),
+				],
+				plan: '',
+			}
+
+			addProject(newProject)
+
+			// Set leader as orchestrator or duo-orchestrator
+			leaderAgent.interrupt({
+				mode: isDuo ? 'duo-orchestrating-active' : 'orchestrating-active',
+				input: null,
+			})
+
+			// Set followers as drones
+			followerAgents.forEach((agent) => {
+				agent.interrupt({ mode: 'standing-by', input: null })
+			})
+
+			// Send the prompt to the leader
+			const prompt = getGroupChatPrompt(value, followerAgents, isDuo)
+			leaderAgent.prompt({
+				source: 'self',
+				message: prompt,
+			})
+
+			// Select the orchestrator and switch to their chat panel
+			onStartProject(leaderAgent)
+
+			// Clear the input
+			setInstruction('')
+		},
+		[getGroupChatPrompt, leaderAgent, followerAgents, onStartProject]
+	)
+
+	const shouldCancel = areAnyProjectAgentsGenerating && instruction === ''
+
+	const handleButtonClick = () => {
+		handleInstructGroupChat(instruction)
+	}
+
+	const leaderFairySelectionLabel = useMsg(fairyMessages.leaderFairySelection)
+	const instructGroupPlaceholder = useMsg(fairyMessages.instructGroupPlaceholder)
+	const selectLeaderFirstPlaceholder = useMsg(fairyMessages.selectLeaderFirstPlaceholder)
+	const stopTitle = useMsg(fairyMessages.stopTitle)
+	const sendTitle = useMsg(fairyMessages.sendTitle)
+
+	if (agents.length === 0)
+		return (
+			<div>
+				<p>
+					<F defaultMessage="No fairies selected" />
+				</p>
+			</div>
+		)
+
+	return (
+		<div className="fairy-group-chat">
+			<div className="fairy-group-chat-leader-toggle-container">
+				<p>
+					<F defaultMessage="Leader fairy will be given orchestration power" />
+				</p>
+				<TldrawUiToolbar orientation="horizontal" label={leaderFairySelectionLabel}>
+					{agents.map((agent) => (
+						<FairyLeaderToggle
+							key={agent.id}
+							agent={agent}
+							agentIsSetAsLeader={leaderAgentId === agent.id}
+							onClick={() => handleSetLeader(agent)}
+						/>
+					))}
+				</TldrawUiToolbar>
+				<div className="fairy-group-chat-leader-info">
+					{leaderConfig ? (
+						<>
+							<p>
+								<F defaultMessage="Name" />: {leaderConfig.name}
+							</p>
+							<p>
+								<F defaultMessage="Personality" />: {leaderConfig.personality}
+							</p>
+						</>
+					) : (
+						<p>
+							<F defaultMessage="No leader selected" />
+						</p>
+					)}
+				</div>
+			</div>
+			<div className="fairy-group-chat-input">
+				<div className="fairy-group-chat-input__wrapper">
+					<textarea
+						ref={instructionTextareaRef}
+						placeholder={leaderAgent ? instructGroupPlaceholder : selectLeaderFirstPlaceholder}
+						value={instruction}
+						onChange={(e) => setInstruction(e.target.value)}
+						onKeyDown={(e) => {
+							if (e.key === 'Enter' && !e.shiftKey) {
+								e.preventDefault()
+								handleInstructGroupChat(instruction)
+							}
+						}}
+						autoFocus
+						disabled={!leaderAgent}
+						className="fairy-group-chat-input__field"
+						style={{ cursor: leaderAgent ? 'text' : 'not-allowed' }}
+					/>
+				</div>
+				<button
+					onClick={handleButtonClick}
+					disabled={!leaderAgent || (instruction === '' && !areAnyProjectAgentsGenerating)}
+					className="fairy-group-chat-input__submit"
+					title={shouldCancel ? stopTitle : sendTitle}
+				>
+					{shouldCancel ? '⏹' : '📣'}
+				</button>
+			</div>
+		</div>
+	)
+}
+
+function FairyLeaderToggle({
+	agent,
+	agentIsSetAsLeader,
+	onClick,
+}: {
+	agent: FairyAgent
+	agentIsSetAsLeader: boolean
+	onClick(): void
+}) {
+	const fairyOutfit = useValue('fairy outfit', () => agent.$fairyConfig.get()?.outfit, [agent])
+	const fairyEntity = useValue('fairy entity', () => agent.$fairyEntity.get(), [agent])
+	const selectLeaderLabel = useMsg(fairyMessages.selectLeader)
+	const deselectLeaderLabel = useMsg(fairyMessages.deselectLeader)
+
+	const fairyHasProject = useValue(
+		'fairy has project',
+		() => getProjectByAgentId(agent.id) !== undefined,
+		[$fairyProjects]
+	)
+
+	return (
+		<TldrawUiToolbarButton
+			onClick={onClick}
+			type="icon"
+			isActive={agentIsSetAsLeader}
+			aria-label={agentIsSetAsLeader ? deselectLeaderLabel : selectLeaderLabel}
+			disabled={fairyHasProject}
+		>
+			<FairySpriteComponent
+				entity={fairyEntity}
+				outfit={fairyOutfit}
+				animated={false}
+				tint={fairyHasProject ? 'gray' : undefined}
+			/>
+		</TldrawUiToolbarButton>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyHUD.tsx b/apps/dotcom/client/src/fairy/FairyHUD.tsx
index dd52f4c87b6b..b4d7e909c23c 100644
--- a/apps/dotcom/client/src/fairy/FairyHUD.tsx
+++ b/apps/dotcom/client/src/fairy/FairyHUD.tsx
@@ -1,168 +1,394 @@
-import { useCallback, useState } from 'react'
 import {
-	Box,
-	TldrawUiToolbar,
-	TldrawUiToolbarToggleGroup,
-	TldrawUiToolbarToggleItem,
+	FAIRY_VARIANTS,
+	FairyConfig,
+	FairyTask,
+	FairyVariantType,
+	SmallSpinner,
+} from '@tldraw/fairy-shared'
+import { DropdownMenu as _DropdownMenu } from 'radix-ui'
+import { MouseEvent, useCallback, useState } from 'react'
+import {
+	TldrawUiButton,
+	TldrawUiButtonIcon,
+	TldrawUiIcon,
+	uniqueId,
 	useEditor,
+	useQuickReactor,
 	useValue,
 } from 'tldraw'
+import { MAX_FAIRY_COUNT } from '../tla/components/TlaEditor/TlaEditor'
+import { useApp } from '../tla/hooks/useAppState'
 import '../tla/styles/fairy.css'
-import { defineMessages, useMsg } from '../tla/utils/i18n'
-import { TldrawFairyAgent } from './fairy-agent/agent/TldrawFairyAgent'
+import { F, useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
 import { FairyChatHistory } from './fairy-agent/chat/FairyChatHistory'
 import { FairyBasicInput } from './fairy-agent/input/FairyBasicInput'
-import { FairySpriteComponent } from './fairy-sprite/FairySprite'
-
-const fairyMessages = defineMessages({
-	toolbar: { defaultMessage: 'Fairies' },
-	deselect: { defaultMessage: 'Deselect Fairy' },
-	select: { defaultMessage: 'Select Fairy' },
-})
-
-function FairyButton({
-	agent,
-	onClick,
-	selectMessage,
-	deselectMessage,
-}: {
-	agent: TldrawFairyAgent
-	onClick(): void
-	selectMessage: string
-	deselectMessage: string
-}) {
-	// Use useValue to make the component reactive
-	const fairyIsSelected = useValue(
-		'fairy-button-selected',
-		() => agent.$fairy.get()?.isSelected ?? false,
-		[agent]
-	)
+import { fairyMessages } from './fairy-messages'
+import { FairyDropdownContent } from './FairyDropdownContent'
+import { FairyGroupChat } from './FairyGroupChat'
+import { FairyListSidebar } from './FairyListSidebar'
+import { $fairyTasks } from './FairyTaskList'
+import { FairyTaskListDropdownContent } from './FairyTaskListDropdownContent'
+import { FairyTaskListInline } from './FairyTaskListInline'
+import { getRandomFairyName } from './getRandomFairyName'
+
+function NewFairyButton({ agents }: { agents: FairyAgent[] }) {
+	const app = useApp()
+	const handleClick = useCallback(() => {
+		if (!app) return
+		const randomOutfit = {
+			body: Object.keys(FAIRY_VARIANTS.body)[
+				Math.floor(Math.random() * Object.keys(FAIRY_VARIANTS.body).length)
+			] as FairyVariantType<'body'>,
+			hat: Object.keys(FAIRY_VARIANTS.hat)[
+				Math.floor(Math.random() * Object.keys(FAIRY_VARIANTS.hat).length)
+			] as FairyVariantType<'hat'>,
+			wings: Object.keys(FAIRY_VARIANTS.wings)[
+				Math.floor(Math.random() * Object.keys(FAIRY_VARIANTS.wings).length)
+			] as FairyVariantType<'wings'>,
+		}
+
+		// Create a unique ID for the new fairy
+		const id = uniqueId()
+
+		// Create the config for the new fairy
+		const config: FairyConfig = {
+			name: getRandomFairyName(),
+			outfit: randomOutfit,
+			personality: 'Friendly and helpful',
+		}
+
+		// Add the config, which will trigger agent creation in FairyApp
+		app.z.mutate.user.updateFairyConfig({ id, properties: config })
+	}, [app])
+
+	const newFairyLabel = useMsg(fairyMessages.newFairy)
 
 	return (
-		<TldrawUiToolbarToggleGroup type="single" value={fairyIsSelected ? 'on' : 'off'} asChild>
-			<TldrawUiToolbarToggleItem
-				className="fairy-toggle-button"
-				onClick={onClick}
-				type="icon"
-				data-state={fairyIsSelected ? 'on' : 'off'}
-				data-isactive={fairyIsSelected}
-				aria-label={fairyIsSelected ? deselectMessage : selectMessage}
-				value="on"
-			>
-				<FairySpriteComponent
-					pose="idle"
-					outfit={{
-						body: 'plain',
-						hat: 'pointy',
-						wings: 'plain',
-					}}
-				/>
-			</TldrawUiToolbarToggleItem>
-		</TldrawUiToolbarToggleGroup>
+		<TldrawUiButton
+			type="icon"
+			className="fairy-toolbar-sidebar-button"
+			onClick={handleClick}
+			disabled={agents.length >= MAX_FAIRY_COUNT}
+		>
+			<TldrawUiIcon icon="plus" label={newFairyLabel} />
+		</TldrawUiButton>
 	)
 }
 
-type PanelState = 'closed' | 'open'
+type PanelState = 'task-list' | 'fairy' | 'closed'
+
+interface FairyHUDHeaderProps {
+	panelState: 'fairy' | 'task-list'
+	menuPopoverOpen: boolean
+	onMenuPopoverOpenChange(open: boolean): void
+	onToggleFairyTasks(): void
+	agents: FairyAgent[]
+	shownFairy: FairyAgent | null
+	selectedFairies: FairyAgent[]
+	hasUnreadTasks: boolean
+	switchToFairyChatLabel: string
+	switchToTaskListLabel: string
+}
+
+function FairyHUDHeader({
+	panelState,
+	menuPopoverOpen,
+	onMenuPopoverOpenChange,
+	onToggleFairyTasks,
+	agents,
+	shownFairy,
+	selectedFairies,
+	hasUnreadTasks,
+	switchToFairyChatLabel,
+	switchToTaskListLabel,
+}: FairyHUDHeaderProps) {
+	const fairyConfig = useValue('fairy config', () => shownFairy?.$fairyConfig.get(), [shownFairy])
+	const isGenerating = useValue('is generating', () => shownFairy?.isGenerating(), [shownFairy])
+
+	// Determine center content based on panel state
+	const centerContent =
+		panelState === 'task-list' ? (
+			<div className="fairy-id-display">
+				<F defaultMessage="Todo list" />
+			</div>
+		) : selectedFairies.length > 1 ? (
+			<div className="fairy-id-display">
+				<F defaultMessage="Create project" />
+			</div>
+		) : shownFairy && fairyConfig ? (
+			<div className="fairy-id-display">
+				{fairyConfig.name}
+				<div
+					className="fairy-spinner-container"
+					style={{
+						visibility: isGenerating ? 'visible' : 'hidden',
+					}}
+				>
+					<SmallSpinner />
+				</div>
+			</div>
+		) : (
+			<div style={{ flex: 1 }}></div>
+		)
+
+	// Determine menu content based on panel state
+	const dropdownContent =
+		panelState === 'task-list' ? (
+			<FairyTaskListDropdownContent agents={agents} alignOffset={4} sideOffset={4} side="bottom" />
+		) : shownFairy && selectedFairies.length <= 1 ? (
+			<FairyDropdownContent agent={shownFairy} alignOffset={4} sideOffset={4} side="bottom" />
+		) : (
+			<FairyTaskListDropdownContent agents={agents} alignOffset={4} sideOffset={4} side="bottom" />
+		)
+
+	return (
+		<div className="fairy-toolbar-header">
+			<_DropdownMenu.Root dir="ltr" open={menuPopoverOpen} onOpenChange={onMenuPopoverOpenChange}>
+				<_DropdownMenu.Trigger asChild dir="ltr">
+					<TldrawUiButton type="icon" className="fairy-toolbar-button">
+						<TldrawUiButtonIcon icon="menu" />
+					</TldrawUiButton>
+				</_DropdownMenu.Trigger>
+				{dropdownContent}
+			</_DropdownMenu.Root>
+
+			{centerContent}
+
+			<div style={{ position: 'relative' }}>
+				<TldrawUiButton type="icon" className="fairy-toolbar-button" onClick={onToggleFairyTasks}>
+					<TldrawUiIcon
+						icon={panelState === 'task-list' ? 'toggle-on' : 'toggle-off'}
+						label={panelState === 'task-list' ? switchToFairyChatLabel : switchToTaskListLabel}
+					/>
+					{hasUnreadTasks && <div className="fairy-todo-unread-indicator" />}
+				</TldrawUiButton>
+			</div>
+		</div>
+	)
+}
 
-export function FairyHUD({ agents }: { agents: TldrawFairyAgent[] }) {
+export function FairyHUD({ agents }: { agents: FairyAgent[] }) {
 	const editor = useEditor()
+	const [headerMenuPopoverOpen, setHeaderMenuPopoverOpen] = useState(false)
+	const [fairyMenuPopoverOpen, setFairyMenuPopoverOpen] = useState(false)
+	const [todoMenuPopoverOpen, setTodoMenuPopoverOpen] = useState(false)
 	const isDebugMode = useValue('debug', () => editor.getInstanceState().isDebugMode, [editor])
+
 	const [panelState, setPanelState] = useState<PanelState>('closed')
+	const [shownFairy, setShownFairy] = useState<FairyAgent | null>(null)
 
 	const toolbarMessage = useMsg(fairyMessages.toolbar)
-	const deselectMessage = useMsg(fairyMessages.deselect)
-	const selectMessage = useMsg(fairyMessages.select)
-
-	// At this stage, there is only one fairy
-	const onlyFairy = useValue('only-fairy', () => agents[0], [agents])
-
-	const handleToggle = useCallback(() => {
-		if (panelState === 'closed') {
-			// Open the panel
-			setPanelState('open')
-		} else {
-			// Zoom camera to fairy position
-			const fairyPosition = onlyFairy.$fairy.get().position
-			editor.zoomToBounds(Box.FromCenter(fairyPosition, { x: 100, y: 100 }), {
-				animation: { duration: 220 },
-				targetZoom: 1,
+	const deselectMessage = useMsg(fairyMessages.deselectFairy)
+	const selectMessage = useMsg(fairyMessages.selectFairy)
+	const switchToFairyChatLabel = useMsg(fairyMessages.switchToFairyChat)
+	const switchToTaskListLabel = useMsg(fairyMessages.switchToTaskList)
+
+	// Create a reactive value that tracks which fairies are selected
+	const selectedFairies = useValue(
+		'selected-fairies',
+		() => agents.filter((agent) => agent.$fairyEntity.get()?.isSelected ?? false),
+		[agents]
+	)
+
+	// Update the chosen fairy when the selected fairies change
+	useQuickReactor(
+		'update-chosen-fairy',
+		() => {
+			const currentSelectedFairies = agents.filter(
+				(agent) => agent.$fairyEntity.get()?.isSelected ?? false
+			)
+			if (currentSelectedFairies.length === 1) {
+				setShownFairy(currentSelectedFairies[0])
+			}
+		},
+		[agents]
+	)
+
+	const selectFairy = useCallback(
+		(selectedAgent: FairyAgent) => {
+			// Select the specified fairy
+			selectedAgent.$fairyEntity.update((f) => (f ? { ...f, isSelected: true } : f))
+
+			// Deselect all other fairies
+			agents.forEach((agent) => {
+				if (agent.id === selectedAgent.id) return
+				agent.$fairyEntity.update((f) => (f ? { ...f, isSelected: false } : f))
 			})
-		}
-	}, [panelState, editor, onlyFairy])
+		},
+		[agents]
+	)
 
-	const handleNewChat = useCallback(() => {
-		onlyFairy.cancel()
-		onlyFairy.reset()
-	}, [onlyFairy])
+	const handleClickFairy = useCallback(
+		(clickedAgent: FairyAgent, event: MouseEvent) => {
+			const isMultiSelect = event.shiftKey || event.metaKey || event.ctrlKey
+			const isSelected = clickedAgent.$fairyEntity.get().isSelected
+			const isChosen = clickedAgent.id === shownFairy?.id
 
-	const togglePanel = useCallback((e?: any) => {
-		if (e) {
-			e.preventDefault()
-			e.stopPropagation()
-		}
-		// Toggle between closed and open
-		setPanelState((current) => (current === 'open' ? 'closed' : 'open'))
+			if (isMultiSelect) {
+				// Toggle selection without deselecting others
+				clickedAgent.$fairyEntity.update((f) => (f ? { ...f, isSelected: !isSelected } : f))
+				// Keep panel open if there are selected fairies
+				if (!isSelected || selectedFairies.length > 1) {
+					setPanelState('fairy')
+				}
+			} else {
+				// Single select mode
+				if (selectedFairies.length > 1 && panelState !== 'fairy') {
+					// Multiple fairies already selected, panel not open - keep them all selected and show group chat
+					setShownFairy(clickedAgent)
+					setPanelState('fairy')
+				} else if (selectedFairies.length > 1 && panelState === 'fairy') {
+					// Multiple fairies selected, panel already open in group chat - switch to single fairy mode
+					selectFairy(clickedAgent)
+					setPanelState('fairy')
+				} else {
+					// Normal single select behavior - deselect all others
+					selectFairy(clickedAgent)
+					// If the clicked fairy is already chosen and selected, toggle the panel. Otherwise, keep the panel open.
+					setPanelState((v) =>
+						isChosen && isSelected && v === 'fairy' && selectedFairies.length <= 1
+							? 'closed'
+							: 'fairy'
+					)
+				}
+			}
+		},
+		[selectFairy, shownFairy, selectedFairies, panelState]
+	)
+
+	const handleDoubleClickFairy = useCallback(
+		(clickedAgent: FairyAgent) => {
+			clickedAgent.zoomTo()
+			selectFairy(clickedAgent)
+			setPanelState('fairy')
+		},
+		[selectFairy]
+	)
+
+	const handleTogglePanel = useCallback(() => {
+		setPanelState((v) => {
+			if (v === 'task-list') return 'closed'
+			if (v === 'fairy') return 'closed'
+			return 'fairy' // closed -> fairy
+		})
+	}, [])
+
+	const [taskListLastChecked, setTaskListLastChecked] = useState<FairyTask[]>([])
+
+	const handleToggleHeaderMode = useCallback(() => {
+		setPanelState((v) => (v === 'task-list' ? 'fairy' : 'task-list'))
+		setTaskListLastChecked($fairyTasks.get())
 	}, [])
 
-	if (!agents || agents.length === 0) return null
+	const handleContextMenu = (e: MouseEvent<HTMLDivElement>) => {
+		e.stopPropagation()
+	}
+
+	// Keep todoLastChecked in sync when the panel is open
+	useQuickReactor(
+		'update-task-list-last-checked',
+		() => {
+			if (panelState === 'task-list') {
+				setTaskListLastChecked($fairyTasks.get())
+			}
+		},
+		[panelState]
+	)
+
+	const hasUnreadTasks = useValue(
+		'has-unread-tasks',
+		() => {
+			const currentList = $fairyTasks.get()
+			if (currentList.length !== taskListLastChecked.length) return true
+			return JSON.stringify(currentList) !== JSON.stringify(taskListLastChecked)
+		},
+		[taskListLastChecked]
+	)
 
 	return (
-		<div
-			className={`tla-fairy-hud ${panelState === 'open' ? 'tla-fairy-hud--open' : ''}`}
-			style={{
-				position: 'fixed',
-				bottom: isDebugMode ? '112px' : '72px',
-				right: '6px',
-				display: 'flex',
-				flexDirection: 'row',
-				alignItems: 'flex-end',
-				gap: '0px',
-				pointerEvents: 'auto',
-				zIndex: '99999999',
-			}}
-		>
-			{/* Panel with two states: closed (hidden) or open (showing full panel) */}
-			{panelState === 'open' && (
-				<div
-					className="fairy-chat-panel"
-					data-panel-state={panelState}
-					onWheelCapture={(e) => e.stopPropagation()}
-				>
-					<div className="fairy-toolbar-header">
-						<button className="fairy-toolbar-button" onClick={handleNewChat}>
-							+
-						</button>
-						<div className="fairy-id-display">{onlyFairy.id}</div>
+		<>
+			<div
+				className={`tla-fairy-hud ${panelState !== 'closed' ? 'tla-fairy-hud--open' : ''}`}
+				style={{
+					bottom: isDebugMode ? '112px' : '72px',
+				}}
+				onContextMenu={handleContextMenu}
+			>
+				<div className="tla-fairy-hud-content">
+					{panelState !== 'closed' && (
+						<div
+							className="fairy-chat-panel"
+							data-panel-state="open"
+							onWheelCapture={(e) => e.stopPropagation()}
+						>
+							<FairyHUDHeader
+								panelState={panelState}
+								menuPopoverOpen={
+									panelState === 'task-list'
+										? todoMenuPopoverOpen
+										: selectedFairies.length > 1
+											? headerMenuPopoverOpen
+											: fairyMenuPopoverOpen
+								}
+								onMenuPopoverOpenChange={
+									panelState === 'task-list'
+										? setTodoMenuPopoverOpen
+										: selectedFairies.length > 1
+											? setHeaderMenuPopoverOpen
+											: setFairyMenuPopoverOpen
+								}
+								onToggleFairyTasks={handleToggleHeaderMode}
+								agents={agents}
+								shownFairy={shownFairy}
+								selectedFairies={selectedFairies}
+								hasUnreadTasks={hasUnreadTasks}
+								switchToFairyChatLabel={switchToFairyChatLabel}
+								switchToTaskListLabel={switchToTaskListLabel}
+							/>
+							{panelState === 'fairy' && selectedFairies.length === 0 && !shownFairy && (
+								<div className="fairy-chat-empty-message">
+									<F defaultMessage="Select a fairy on the right to chat with" />
+								</div>
+							)}
+							{panelState === 'fairy' &&
+								selectedFairies.length <= 1 &&
+								shownFairy && ( // if there's a single shown fairy, still show the chat history and input even if the user deselects it
+									<>
+										<FairyChatHistory agent={shownFairy} />
+										<FairyBasicInput agent={shownFairy} onCancel={() => setPanelState('closed')} />
+									</>
+								)}
+
+							{panelState === 'fairy' && selectedFairies.length > 1 && (
+								<FairyGroupChat
+									agents={selectedFairies}
+									onStartProject={(orchestratorAgent) => {
+										selectFairy(orchestratorAgent)
+										setPanelState('fairy')
+									}}
+								/>
+							)}
+
+							{panelState === 'task-list' && <FairyTaskListInline agents={agents} />}
+						</div>
+					)}
+
+					<div className="fairy-buttons-container">
+						<FairyListSidebar
+							agents={agents}
+							panelState={panelState}
+							toolbarMessage={toolbarMessage}
+							selectMessage={selectMessage}
+							deselectMessage={deselectMessage}
+							onClickFairy={handleClickFairy}
+							onDoubleClickFairy={handleDoubleClickFairy}
+							onTogglePanel={handleTogglePanel}
+							newFairyButton={<NewFairyButton agents={agents} />}
+						/>
 					</div>
-					<FairyChatHistory agent={onlyFairy} />
-					<FairyBasicInput agent={onlyFairy} />
-				</div>
-			)}
-
-			<div className="fairy-buttons-container">
-				<div className="fairy-toolbar-stack-header">
-					<button
-						className="fairy-toolbar-button"
-						id="fairy-toolbar-minimize-button"
-						onClick={togglePanel}
-					>
-						{panelState === 'open' ? '››' : '‹‹'}
-					</button>
 				</div>
-				<TldrawUiToolbar label={toolbarMessage}>
-					{agents.map((agent) => {
-						return (
-							<FairyButton
-								key={agent.id}
-								agent={agent}
-								onClick={() => handleToggle()}
-								selectMessage={selectMessage}
-								deselectMessage={deselectMessage}
-							/>
-						)
-					})}
-				</TldrawUiToolbar>
 			</div>
-		</div>
+		</>
 	)
 }
diff --git a/apps/dotcom/client/src/fairy/FairyIsApplyingAction.ts b/apps/dotcom/client/src/fairy/FairyIsApplyingAction.ts
new file mode 100644
index 000000000000..2637a5788ea1
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyIsApplyingAction.ts
@@ -0,0 +1,3 @@
+import { atom } from 'tldraw'
+
+export const $fairyIsApplyingAction = atom<boolean>('globalIsActing', false)
diff --git a/apps/dotcom/client/src/fairy/FairyListSidebar.tsx b/apps/dotcom/client/src/fairy/FairyListSidebar.tsx
new file mode 100644
index 000000000000..ca75e403b0cd
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyListSidebar.tsx
@@ -0,0 +1,65 @@
+import { ContextMenu as _ContextMenu } from 'radix-ui'
+import { MouseEvent, ReactNode } from 'react'
+import { TldrawUiButton, TldrawUiButtonIcon, TldrawUiToolbar } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { FairySidebarButton } from './FairySidebarButton'
+import { FairyTaskListContextMenuContent } from './FairyTaskListContextMenuContent'
+
+interface FairyListSidebarProps {
+	agents: FairyAgent[]
+	panelState: 'task-list' | 'fairy' | 'closed'
+	toolbarMessage: string
+	selectMessage: string
+	deselectMessage: string
+	onClickFairy(agent: FairyAgent, event: MouseEvent): void
+	onDoubleClickFairy(agent: FairyAgent): void
+	onTogglePanel(): void
+	newFairyButton: ReactNode
+}
+
+export function FairyListSidebar({
+	agents,
+	panelState,
+	toolbarMessage,
+	selectMessage,
+	deselectMessage,
+	onClickFairy,
+	onDoubleClickFairy,
+	onTogglePanel,
+	newFairyButton,
+}: FairyListSidebarProps) {
+	return (
+		<div className="fairy-buttons-container">
+			<div className="fairy-toolbar-header">
+				<_ContextMenu.Root dir="ltr">
+					<_ContextMenu.Trigger asChild>
+						<TldrawUiButton type="icon" className="fairy-toolbar-button" onClick={onTogglePanel}>
+							<TldrawUiButtonIcon
+								icon={panelState !== 'closed' ? 'chevron-right' : 'chevron-left'}
+							/>
+						</TldrawUiButton>
+					</_ContextMenu.Trigger>
+					<FairyTaskListContextMenuContent agents={agents} />
+				</_ContextMenu.Root>
+			</div>
+			<div className="fairy-list-scrollable">
+				<TldrawUiToolbar label={toolbarMessage} orientation="vertical">
+					{agents.map((agent) => {
+						return (
+							<FairySidebarButton
+								key={agent.id}
+								agent={agent}
+								onClick={(e) => onClickFairy(agent, e)}
+								onDoubleClick={() => onDoubleClickFairy(agent)}
+								selectMessage={selectMessage}
+								deselectMessage={deselectMessage}
+							/>
+						)
+					})}
+				</TldrawUiToolbar>
+			</div>
+			{/* New Fairy Button - always at the bottom */}
+			<div style={{ marginTop: '4px' }}>{newFairyButton}</div>
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyMenuContent.tsx b/apps/dotcom/client/src/fairy/FairyMenuContent.tsx
new file mode 100644
index 000000000000..81760ff2606e
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyMenuContent.tsx
@@ -0,0 +1,90 @@
+import { useCallback } from 'react'
+import {
+	TldrawUiMenuContextProvider,
+	TldrawUiMenuGroup,
+	TldrawUiMenuItem,
+	useDefaultHelpers,
+	useEditor,
+	useValue,
+} from 'tldraw'
+import { useMsg } from '../tla/utils/i18n'
+import { FairyAgent, getFollowingFairyId } from './fairy-agent/agent/FairyAgent'
+import { fairyMessages } from './fairy-messages'
+import { FairyConfigDialog } from './FairyConfigDialog'
+
+export function FairyMenuContent({
+	agent,
+	menuType = 'menu',
+}: {
+	agent: FairyAgent
+	menuType?: 'menu' | 'context-menu'
+}) {
+	const editor = useEditor()
+	const { addDialog } = useDefaultHelpers()
+	const configureFairy = useCallback(
+		(agent: FairyAgent) => {
+			addDialog({
+				component: ({ onClose }) => <FairyConfigDialog agent={agent} onClose={onClose} />,
+			})
+		},
+		[addDialog]
+	)
+
+	const deleteFairy = useCallback(() => {
+		agent.dispose()
+		agent.deleteFairyConfig()
+	}, [agent])
+
+	const isFollowing = useValue(
+		'is following fairy',
+		() => {
+			return getFollowingFairyId(editor) === agent.id
+		},
+		[editor, agent]
+	)
+
+	const toggleFollow = useCallback(() => {
+		if (isFollowing) {
+			agent.stopFollowing()
+		} else {
+			agent.startFollowing()
+		}
+	}, [agent, isFollowing])
+
+	const goToFairyLabel = useMsg(fairyMessages.goToFairy)
+	const summonFairyLabel = useMsg(fairyMessages.summonFairy)
+	const followFairyLabel = useMsg(fairyMessages.followFairy)
+	const unfollowFairyLabel = useMsg(fairyMessages.unfollowFairy)
+	const resetChatLabel = useMsg(fairyMessages.resetChat)
+	const customizeFairyLabel = useMsg(fairyMessages.customizeFairy)
+	const deleteFairyLabel = useMsg(fairyMessages.deleteFairy)
+
+	return (
+		<TldrawUiMenuContextProvider type={menuType} sourceId="fairy-panel">
+			<TldrawUiMenuGroup id="fairy-movement-menu">
+				<TldrawUiMenuItem id="go-to-fairy" onSelect={() => agent.zoomTo()} label={goToFairyLabel} />
+				<TldrawUiMenuItem
+					id="summon-fairy"
+					onSelect={() => agent.summon()}
+					label={summonFairyLabel}
+				/>
+				<TldrawUiMenuItem
+					id="follow-fairy"
+					onSelect={toggleFollow}
+					label={isFollowing ? unfollowFairyLabel : followFairyLabel}
+				/>
+			</TldrawUiMenuGroup>
+			<TldrawUiMenuGroup id="fairy-chat-menu">
+				<TldrawUiMenuItem id="new-chat" onSelect={() => agent.reset()} label={resetChatLabel} />
+			</TldrawUiMenuGroup>
+			<TldrawUiMenuGroup id="fairy-config-menu">
+				<TldrawUiMenuItem
+					id="configure-fairy"
+					onSelect={() => configureFairy(agent)}
+					label={customizeFairyLabel}
+				/>
+				<TldrawUiMenuItem id="delete-fairy" onSelect={deleteFairy} label={deleteFairyLabel} />
+			</TldrawUiMenuGroup>
+		</TldrawUiMenuContextProvider>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyModelSelection.ts b/apps/dotcom/client/src/fairy/FairyModelSelection.ts
new file mode 100644
index 000000000000..ab6bf79ef2cd
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyModelSelection.ts
@@ -0,0 +1,4 @@
+import { AgentModelName, DEFAULT_MODEL_NAME } from '@tldraw/fairy-shared'
+import { atom } from 'tldraw'
+
+export const $fairyModelSelection = atom<AgentModelName>('fairyModelSelection', DEFAULT_MODEL_NAME)
diff --git a/apps/dotcom/client/src/fairy/FairyProjects.ts b/apps/dotcom/client/src/fairy/FairyProjects.ts
new file mode 100644
index 000000000000..962c424118e7
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyProjects.ts
@@ -0,0 +1,72 @@
+import { FairyProject, FairyProjectRole } from '@tldraw/fairy-shared'
+import { atom } from 'tldraw'
+
+export const $fairyProjects = atom<FairyProject[]>('fairyProjects', [])
+
+export function addProject(project: FairyProject) {
+	$fairyProjects.update((projects) => {
+		// Check if project already exists
+		if (projects.find((p) => p.id === project.id)) {
+			return projects
+		}
+		return [...projects, project]
+	})
+}
+
+export function getProjectById(id: string): FairyProject | undefined {
+	return $fairyProjects.get().find((p) => p.id === id)
+}
+
+export function getProjectByAgentId(agentId: string): FairyProject | undefined {
+	return $fairyProjects.get().find((p) => p.members.some((m) => m.id === agentId))
+}
+
+export function getRoleByAgentId(agentId: string): FairyProjectRole | undefined {
+	const project = getProjectByAgentId(agentId)
+	if (!project) return undefined
+	return project.members.find((m) => m.id === agentId)?.role
+}
+
+export function updateProject(projectId: string, updates: Partial<FairyProject>) {
+	$fairyProjects.update((projects) =>
+		projects.map((p) => (p.id === projectId ? { ...p, ...updates } : p))
+	)
+}
+
+export function deleteProject(projectId: string) {
+	$fairyProjects.update((projects) => projects.filter((p) => p.id !== projectId))
+}
+
+export function clearProjects() {
+	$fairyProjects.set([])
+}
+
+// for debug purposes
+export function addAgentToDummyProject(agentId: string) {
+	$fairyProjects.update((projects) => {
+		const dummyProject = projects.find((p) => p.id === 'dummy')
+
+		if (!dummyProject) {
+			// Create a new dummy project with the agent as orchestrator
+			const newProject: FairyProject = {
+				id: 'dummy',
+				title: 'Dummy Project',
+				description: 'A dummy project for testing',
+				color: 'violet',
+				members: [{ id: agentId, role: 'orchestrator' }],
+				plan: 'idk!!',
+			}
+			return [...projects, newProject]
+		} else {
+			// Check if agent is already a member
+			const isAlreadyMember = dummyProject.members.some((m) => m.id === agentId)
+			if (isAlreadyMember) {
+				return projects
+			}
+			// Add agent as a drone
+			return projects.map((p) =>
+				p.id === 'dummy' ? { ...p, members: [...p.members, { id: agentId, role: 'drone' }] } : p
+			)
+		}
+	})
+}
diff --git a/apps/dotcom/client/src/fairy/FairySidebarButton.tsx b/apps/dotcom/client/src/fairy/FairySidebarButton.tsx
new file mode 100644
index 000000000000..6dd070736969
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairySidebarButton.tsx
@@ -0,0 +1,71 @@
+import { ContextMenu as _ContextMenu } from 'radix-ui'
+import { MouseEvent } from 'react'
+import { TldrawUiToolbarToggleGroup, TldrawUiToolbarToggleItem, useValue } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { FairySpriteComponent } from './fairy-sprite/FairySprite'
+import { FairyContextMenuContent } from './FairyContextMenuContent'
+import { getProjectColor } from './getProjectColor'
+
+export function FairySidebarButton({
+	agent,
+	onClick,
+	onDoubleClick,
+	selectMessage,
+	deselectMessage,
+}: {
+	agent: FairyAgent
+	onClick(e: MouseEvent): void
+	onDoubleClick(): void
+	selectMessage: string
+	deselectMessage: string
+}) {
+	const fairyIsSelected = useValue(
+		'fairy-button-selected',
+		() => agent.$fairyEntity.get()?.isSelected ?? false,
+		[agent]
+	)
+
+	const fairyOutfit = useValue('fairy outfit', () => agent.$fairyConfig.get()?.outfit, [agent])
+	const fairyEntity = useValue('fairy entity', () => agent.$fairyEntity.get(), [agent])
+	const project = useValue('current-project', () => agent.getProject(), [agent])
+
+	const isOrchestrator = useValue(
+		'is-orchestrator',
+		() => agent.getRole() === 'orchestrator' || agent.getRole() === 'duo-orchestrator',
+		[agent]
+	)
+	const projectColor = project ? getProjectColor(agent.editor, project.color) : undefined
+
+	if (!fairyEntity || !fairyOutfit) return null
+
+	return (
+		<_ContextMenu.Root dir="ltr">
+			<_ContextMenu.Trigger asChild>
+				<TldrawUiToolbarToggleGroup type="single" value={fairyIsSelected ? 'on' : 'off'} asChild>
+					<TldrawUiToolbarToggleItem
+						className="fairy-toggle-button"
+						onClick={onClick}
+						onDoubleClick={onDoubleClick}
+						type="icon"
+						data-state={fairyIsSelected ? 'on' : 'off'}
+						data-isactive={fairyIsSelected}
+						aria-label={fairyIsSelected ? deselectMessage : selectMessage}
+						value="on"
+					>
+						<FairySpriteComponent entity={fairyEntity} outfit={fairyOutfit} animated={true} />
+						{projectColor && (
+							<div
+								className={`fairy-button-project-indicator ${isOrchestrator ? 'fairy-button-project-indicator--orchestrator' : ''}`}
+								style={{
+									backgroundColor: isOrchestrator ? 'transparent' : projectColor,
+									borderColor: projectColor,
+								}}
+							/>
+						)}
+					</TldrawUiToolbarToggleItem>
+				</TldrawUiToolbarToggleGroup>
+			</_ContextMenu.Trigger>
+			<FairyContextMenuContent agent={agent} />
+		</_ContextMenu.Root>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskDragTool.tsx b/apps/dotcom/client/src/fairy/FairyTaskDragTool.tsx
new file mode 100644
index 000000000000..5e86bf5eca19
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskDragTool.tsx
@@ -0,0 +1,90 @@
+import { StateNode, TLKeyboardEventInfo } from 'tldraw'
+import { $fairyTasks } from './FairyTaskList'
+
+export class FairyTaskDragTool extends StateNode {
+	static override id = 'task-drag'
+	static override children() {
+		return [PointingState, DraggingState]
+	}
+	static override initial = 'pointing'
+
+	static override isLockable = false
+
+	todoId: string | null = null
+
+	override onExit() {
+		this.editor.setCursor({ type: 'default', rotation: 0 })
+	}
+
+	setTodoId(todoId: string) {
+		this.todoId = todoId
+	}
+}
+
+class PointingState extends StateNode {
+	static override id = 'pointing'
+
+	override onPointerDown() {
+		// User clicked on canvas - transition to dragging
+		this.parent.transition('dragging')
+	}
+
+	override onPointerMove() {
+		// User started moving while pointing - transition to dragging
+		this.parent.transition('dragging')
+	}
+
+	override onPointerUp() {
+		// User released without interacting - cancel the tool
+		this.editor.setCurrentTool('select.idle')
+	}
+
+	override onKeyDown(info: TLKeyboardEventInfo): void {
+		if (info.key === 'Escape') {
+			this.editor.setCurrentTool('select.idle')
+		}
+	}
+}
+
+class DraggingState extends StateNode {
+	static override id = 'dragging'
+
+	override onEnter() {
+		// Update cursor to show dragging
+		this.editor.setCursor({ type: 'grab', rotation: 0 })
+	}
+
+	override onPointerMove() {
+		const tool = this.parent as FairyTaskDragTool
+		if (tool.todoId === null) return
+
+		// Get current pointer position and convert to page space
+		const screenPoint = this.editor.inputs.currentScreenPoint
+		const { screenBounds } = this.editor.getInstanceState()
+		const pagePoint = this.editor.screenToPage({
+			x: screenPoint.x + screenBounds.x,
+			y: screenPoint.y + screenBounds.y,
+		})
+
+		// Get current page ID to associate the todo with the page
+		const currentPageId = this.editor.getCurrentPageId()
+
+		// Update todo coordinates and page ID continuously during drag
+		$fairyTasks.update((todos) =>
+			todos.map((t) =>
+				t.id === tool.todoId ? { ...t, x: pagePoint.x, y: pagePoint.y, pageId: currentPageId } : t
+			)
+		)
+	}
+
+	override onPointerUp() {
+		// Return to select tool (coordinates already updated in onPointerMove)
+		this.editor.setCurrentTool('select.idle')
+	}
+
+	override onKeyDown(info: TLKeyboardEventInfo): void {
+		if (info.key === 'Escape') {
+			this.editor.setCurrentTool('select.idle')
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskList.ts b/apps/dotcom/client/src/fairy/FairyTaskList.ts
new file mode 100644
index 000000000000..33ad933c9ad9
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskList.ts
@@ -0,0 +1,69 @@
+import { FairyTask, FairyTaskStatus } from '@tldraw/fairy-shared'
+import { Editor, atom } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { clearProjects } from './FairyProjects'
+import { notifyTaskCompleted } from './FairyWaitNotifications'
+
+export const $fairyTasks = atom<FairyTask[]>('fairyTasks', [])
+export const $showCanvasFairyTasks = atom<boolean>('showCanvasFairyTasks', false)
+
+export function createFairyTask(newPartialTask: Partial<FairyTask> & { id: string }) {
+	$fairyTasks.update((tasks) => {
+		const task: FairyTask = {
+			title: newPartialTask.title || '',
+			text: '',
+			projectId: null,
+			assignedTo: null,
+			status: 'todo' as const,
+			pageId: undefined,
+			...newPartialTask,
+		}
+		return [...tasks, task]
+	})
+}
+
+export function deleteFairyTask(id: string) {
+	$fairyTasks.update((todos) => todos.filter((t) => t.id !== id))
+}
+
+export function setFairyTaskStatus(id: string, status: FairyTaskStatus) {
+	$fairyTasks.update((todos) => todos.map((t) => (t.id === id ? { ...t, status } : t)))
+}
+
+export function setFairyTaskStatusAndNotifyCompletion(
+	id: string,
+	status: FairyTaskStatus,
+	editor: Editor
+) {
+	setFairyTaskStatus(id, status)
+	// Notify waiting agents if task is done
+	if (status === 'done' && editor) {
+		const task = getFairyTaskById(id)
+		if (task) {
+			notifyTaskCompleted(task, editor)
+		}
+	}
+}
+
+export function getFairyTaskById(id: string): FairyTask | undefined {
+	return $fairyTasks.get().find((t) => t.id === id)
+}
+
+export function clearFairyTasks() {
+	$fairyTasks.set([])
+
+	// Clear all projects
+	clearProjects()
+}
+
+export function getFairyTasksByProjectId(projectId: string): FairyTask[] {
+	return $fairyTasks.get().filter((t) => t.projectId === projectId)
+}
+
+export function assignFairyToTask(taskId: string, fairyId: string, agents: FairyAgent[]) {
+	const agent = agents.find((a) => a.id === fairyId)
+	if (fairyId !== '' && !agent) return
+	$fairyTasks.update((todos) =>
+		todos.map((t) => (t.id === taskId ? { ...t, assignedTo: fairyId || null } : t))
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskListContextMenuContent.tsx b/apps/dotcom/client/src/fairy/FairyTaskListContextMenuContent.tsx
new file mode 100644
index 000000000000..78272e25831d
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskListContextMenuContent.tsx
@@ -0,0 +1,21 @@
+import { ContextMenu as _ContextMenu } from 'radix-ui'
+import { useContainer } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { FairyTaskListMenuContent } from './FairyTaskListMenuContent'
+
+export function FairyTaskListContextMenuContent({ agents }: { agents: FairyAgent[] }) {
+	const container = useContainer()
+
+	return (
+		<_ContextMenu.Portal container={container}>
+			<_ContextMenu.Content
+				className="tlui-menu fairy-sidebar-dropdown"
+				collisionPadding={4}
+				onClick={(e) => e.stopPropagation()}
+				style={{ zIndex: 'var(--tl-layer-canvas-in-front)' }}
+			>
+				<FairyTaskListMenuContent agents={agents} menuType="context-menu" />
+			</_ContextMenu.Content>
+		</_ContextMenu.Portal>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskListDropdownContent.tsx b/apps/dotcom/client/src/fairy/FairyTaskListDropdownContent.tsx
new file mode 100644
index 000000000000..6a51e6970ca9
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskListDropdownContent.tsx
@@ -0,0 +1,35 @@
+import { DropdownMenu as _DropdownMenu } from 'radix-ui'
+import { useContainer } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { FairyTaskListMenuContent } from './FairyTaskListMenuContent'
+
+export function FairyTaskListDropdownContent({
+	agents,
+	alignOffset,
+	sideOffset,
+	side = 'top',
+}: {
+	agents: FairyAgent[]
+	alignOffset: number
+	sideOffset: number
+	side?: 'top' | 'bottom' | 'left' | 'right'
+}) {
+	const container = useContainer()
+
+	return (
+		<_DropdownMenu.Portal container={container}>
+			<_DropdownMenu.Content
+				side={side}
+				align="start"
+				className="tlui-menu fairy-sidebar-dropdown"
+				collisionPadding={4}
+				alignOffset={alignOffset}
+				sideOffset={sideOffset}
+				onClick={(e) => e.stopPropagation()}
+				style={{ zIndex: 'var(--tl-layer-canvas-in-front)' }}
+			>
+				<FairyTaskListMenuContent agents={agents} menuType="menu" />
+			</_DropdownMenu.Content>
+		</_DropdownMenu.Portal>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskListInline.tsx b/apps/dotcom/client/src/fairy/FairyTaskListInline.tsx
new file mode 100644
index 000000000000..41dd43cc8506
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskListInline.tsx
@@ -0,0 +1,228 @@
+import React, { useCallback, useState } from 'react'
+import { uniqueId, useEditor, useValue } from 'tldraw'
+import '../tla/styles/fairy.css'
+import { F, useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { fairyMessages } from './fairy-messages'
+import { getProjectById } from './FairyProjects'
+import { FairyTaskDragTool } from './FairyTaskDragTool'
+import {
+	$fairyTasks,
+	$showCanvasFairyTasks,
+	assignFairyToTask,
+	createFairyTask,
+	deleteFairyTask,
+} from './FairyTaskList'
+import { getProjectColor } from './getProjectColor'
+
+export function FairyTaskListInline({ agents }: { agents: FairyAgent[] }) {
+	const editor = useEditor()
+	const tasks = useValue('fairy-tasks-list', () => $fairyTasks.get(), [$fairyTasks])
+	const [newTaskText, setNewTaskText] = useState('')
+	const addTaskPlaceholder = useMsg(fairyMessages.addTaskPlaceholder)
+	const dragToCanvas = useMsg(fairyMessages.dragToCanvas)
+	const clickToRemoveOrDrag = useMsg(fairyMessages.clickToRemoveOrDrag)
+	const deleteTask = useMsg(fairyMessages.deleteTask)
+
+	const getStatusIcon = (status: string) => {
+		switch (status) {
+			case 'todo':
+				return '○'
+			case 'in-progress':
+				return '➤'
+			case 'done':
+				return '●'
+			default:
+				return '○'
+		}
+	}
+
+	const handleAddTask = useCallback(
+		(e: React.FormEvent<HTMLFormElement>) => {
+			e.preventDefault()
+			if (!newTaskText.trim()) return
+
+			const currentPageId = editor.getCurrentPageId()
+			const taskId = `task-${uniqueId(6)}`
+			createFairyTask({ id: taskId, text: newTaskText.trim(), pageId: currentPageId })
+			setNewTaskText('')
+		},
+		[newTaskText, editor]
+	)
+
+	const handleDragStart = useCallback(
+		(e: React.PointerEvent, taskId: string) => {
+			const task = tasks.find((t) => t.id === taskId)
+			if (!task) return
+
+			// If task has coordinates and this is just a click (no movement), remove them
+			if (task.x != null && task.y != null) {
+				// Check if this will be a drag by tracking movement
+				const startX = e.clientX
+				const startY = e.clientY
+				let hasMoved = false
+
+				const handlePointerMove = (moveEvent: PointerEvent) => {
+					const deltaX = moveEvent.clientX - startX
+					const deltaY = moveEvent.clientY - startY
+
+					// If moved more than 1 pixel, treat as drag
+					if (Math.abs(deltaX) > 1 || Math.abs(deltaY) > 1) {
+						hasMoved = true
+						document.removeEventListener('pointermove', handlePointerMove)
+						document.removeEventListener('pointerup', handlePointerUp)
+
+						// Show todo items in canvas
+						$showCanvasFairyTasks.set(true)
+
+						// Activate drag tool for repositioning
+						const tool = editor.getStateDescendant('select.task-drag')
+						if (tool && 'setTodoId' in tool) {
+							;(tool as FairyTaskDragTool).setTodoId(taskId)
+							editor.setCurrentTool('select.task-drag')
+						}
+					}
+				}
+
+				const handlePointerUp = () => {
+					document.removeEventListener('pointermove', handlePointerMove)
+					document.removeEventListener('pointerup', handlePointerUp)
+
+					// If didn't move, remove coordinates and pageId (simple click)
+					if (!hasMoved) {
+						$fairyTasks.update((todos) =>
+							todos.map((t) =>
+								t.id === taskId ? { ...t, x: undefined, y: undefined, pageId: undefined } : t
+							)
+						)
+					}
+				}
+
+				document.addEventListener('pointermove', handlePointerMove)
+				document.addEventListener('pointerup', handlePointerUp)
+				return
+			}
+
+			// If no coordinates, set up drag to place
+			const startX = e.clientX
+			const startY = e.clientY
+
+			const handlePointerMove = (moveEvent: PointerEvent) => {
+				const deltaX = moveEvent.clientX - startX
+				const deltaY = moveEvent.clientY - startY
+
+				// Start dragging if moved more than 1 pixel
+				if (Math.abs(deltaX) > 1 || Math.abs(deltaY) > 1) {
+					document.removeEventListener('pointermove', handlePointerMove)
+					document.removeEventListener('pointerup', handlePointerUp)
+
+					// Activate the drag tool
+					const tool = editor.getStateDescendant('select.task-drag')
+					if (tool && 'setTodoId' in tool) {
+						;(tool as FairyTaskDragTool).setTodoId(taskId)
+						editor.setCurrentTool('select.task-drag')
+					}
+				}
+			}
+
+			const handlePointerUp = () => {
+				document.removeEventListener('pointermove', handlePointerMove)
+				document.removeEventListener('pointerup', handlePointerUp)
+			}
+
+			document.addEventListener('pointermove', handlePointerMove)
+			document.addEventListener('pointerup', handlePointerUp)
+		},
+		[editor, tasks]
+	)
+
+	return (
+		<div className="shared-todo-list-inline">
+			<form onSubmit={handleAddTask} className="shared-todo-input">
+				<input
+					type="text"
+					value={newTaskText}
+					onChange={(e) => setNewTaskText(e.target.value)}
+					placeholder={addTaskPlaceholder}
+					className="shared-todo-input-field"
+				/>
+				<button type="submit" className="shared-todo-input-submit" disabled={!newTaskText.trim()}>
+					+
+				</button>
+			</form>
+			{tasks.length > 0 && (
+				<div className="shared-todo-list-items">
+					{tasks.map((task) => {
+						const statusClass =
+							task.status === 'done'
+								? 'shared-todo-item--done'
+								: task.status === 'in-progress'
+									? 'shared-todo-item--in-progress'
+									: 'shared-todo-item--todo'
+
+						const icon = getStatusIcon(task.status)
+						const project = task.projectId ? getProjectById(task.projectId) : undefined
+						const projectColor = project ? getProjectColor(editor, project.color) : undefined
+
+						return (
+							<div key={task.id} className={`shared-todo-item ${statusClass}`}>
+								{projectColor && (
+									<div
+										className="shared-todo-item-project-indicator"
+										style={{ backgroundColor: projectColor }}
+									/>
+								)}
+								<div className="shared-todo-item-main">
+									<span className="shared-todo-item-icon">{icon}</span>
+									<span className="shared-todo-item-text">
+										{task.id}. {task.text}
+										{task.x != null && task.y != null && (
+											<span className="shared-todo-item-coords">
+												{' '}
+												({Math.round(task.x)}, {Math.round(task.y)})
+											</span>
+										)}
+									</span>
+									<button
+										className="shared-todo-item-drag"
+										onPointerDown={(e) => {
+											e.preventDefault()
+											e.stopPropagation()
+											handleDragStart(e, task.id)
+										}}
+										title={task.x != null && task.y != null ? clickToRemoveOrDrag : dragToCanvas}
+									>
+										{task.x != null && task.y != null ? '⊖' : '◎'}
+									</button>
+									<button
+										className="shared-todo-item-delete"
+										onClick={() => deleteFairyTask(task.id)}
+										title={deleteTask}
+									>
+										×
+									</button>
+								</div>
+								<div className="shared-todo-item-assign">
+									<select
+										value={task.assignedTo || ''}
+										onChange={(e) => assignFairyToTask(task.id, e.target.value, agents)}
+										className="shared-todo-item-fairy-select"
+									>
+										<option value="">
+											<F defaultMessage="Auto" />
+										</option>
+										{agents.map((agent) => (
+											<option key={agent.id} value={agent.id}>
+												{agent.$fairyConfig.get().name}
+											</option>
+										))}
+									</select>
+								</div>
+							</div>
+						)
+					})}
+				</div>
+			)}
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskListMenuContent.tsx b/apps/dotcom/client/src/fairy/FairyTaskListMenuContent.tsx
new file mode 100644
index 000000000000..6b49ef5ca4da
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskListMenuContent.tsx
@@ -0,0 +1,118 @@
+import { useCallback } from 'react'
+import {
+	TldrawUiMenuContextProvider,
+	TldrawUiMenuGroup,
+	TldrawUiMenuItem,
+	useDefaultHelpers,
+	useEditor,
+	useValue,
+} from 'tldraw'
+import { useApp } from '../tla/hooks/useAppState'
+import { useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { $fairyAgentsAtom } from './fairy-agent/agent/fairyAgentsAtom'
+import { fairyMessages } from './fairy-messages'
+import { FairyDebugDialog } from './FairyDebugDialog'
+import { $showCanvasFairyTasks, clearFairyTasks } from './FairyTaskList'
+
+export function FairyTaskListMenuContent({
+	agents,
+	menuType = 'menu',
+}: {
+	agents: FairyAgent[]
+	menuType?: 'menu' | 'context-menu'
+}) {
+	const editor = useEditor()
+	const { addDialog } = useDefaultHelpers()
+	const showCanvasTasks = useValue('show-canvas-tasks', () => $showCanvasFairyTasks.get(), [
+		$showCanvasFairyTasks,
+	])
+	const showTasksOnCanvas = useMsg(fairyMessages.showTasksOnCanvas)
+	const hideTasksOnCanvas = useMsg(fairyMessages.hideTasksOnCanvas)
+
+	const resetAllChats = useCallback(() => {
+		agents.forEach((agent) => {
+			agent.reset()
+		})
+	}, [agents])
+
+	const app = useApp()
+	const deleteAllFairies = useCallback(() => {
+		app.z.mutate.user.deleteAllFairyConfigs()
+		agents.forEach((agent) => {
+			agent.dispose()
+		})
+	}, [app, agents])
+
+	const openDebugDialog = useCallback(() => {
+		addDialog({
+			component: ({ onClose }) => <FairyDebugDialog agents={agents} onClose={onClose} />,
+		})
+	}, [addDialog, agents])
+
+	const summonAllFairies = useCallback(() => {
+		const spacing = 150 // Distance between fairies
+		agents.forEach((agent, index) => {
+			if (agents.length === 1) {
+				agent.summon()
+			} else {
+				// Arrange fairies in a circle around the center
+				const angleStep = (2 * Math.PI) / agents.length
+				const angle = index * angleStep
+				const offset = {
+					x: Math.cos(angle) * spacing,
+					y: Math.sin(angle) * spacing,
+				}
+				agent.summon(offset)
+			}
+		})
+	}, [agents])
+
+	const disbandProjects = useCallback(() => {
+		clearFairyTasks()
+		for (const agent of $fairyAgentsAtom.get(editor)) {
+			agent.interrupt({ mode: 'idling', input: null })
+		}
+	}, [editor])
+
+	const summonAllFairiesLabel = useMsg(fairyMessages.summonAllFairies)
+	const disbandProjectsLabel = useMsg(fairyMessages.disbandProjects)
+	const resetAllChatsLabel = useMsg(fairyMessages.resetAllChats)
+	const deleteAllFairiesLabel = useMsg(fairyMessages.deleteAllFairies)
+	const debugViewLabel = useMsg(fairyMessages.debugView)
+
+	return (
+		<TldrawUiMenuContextProvider type={menuType} sourceId="fairy-panel">
+			<TldrawUiMenuGroup id="todo-menu">
+				<TldrawUiMenuItem
+					id="summon-all-fairies"
+					onSelect={summonAllFairies}
+					label={summonAllFairiesLabel}
+				/>
+			</TldrawUiMenuGroup>
+			<TldrawUiMenuGroup id="todo-list-config-menu">
+				<TldrawUiMenuItem
+					id="clear-todo-list"
+					onSelect={() => disbandProjects()}
+					label={disbandProjectsLabel}
+				/>
+				<TldrawUiMenuItem
+					id="toggle-canvas-todos"
+					onSelect={() => {
+						$showCanvasFairyTasks.update((v) => !v)
+					}}
+					label={showCanvasTasks ? hideTasksOnCanvas : showTasksOnCanvas}
+				/>
+			</TldrawUiMenuGroup>
+			<TldrawUiMenuGroup id="fairy-management-menu">
+				<TldrawUiMenuItem id="reset-chats" onSelect={resetAllChats} label={resetAllChatsLabel} />
+				<TldrawUiMenuItem
+					id="delete-fairies"
+					onSelect={deleteAllFairies}
+					label={deleteAllFairiesLabel}
+				/>
+				<TldrawUiMenuItem id="debug-fairies" onSelect={openDebugDialog} label={debugViewLabel} />
+			</TldrawUiMenuGroup>
+		</TldrawUiMenuContextProvider>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyTaskListSidebarButton.tsx b/apps/dotcom/client/src/fairy/FairyTaskListSidebarButton.tsx
new file mode 100644
index 000000000000..307f86639808
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyTaskListSidebarButton.tsx
@@ -0,0 +1,32 @@
+import { ContextMenu as _ContextMenu } from 'radix-ui'
+import { TldrawUiButton, TldrawUiIcon } from 'tldraw'
+import { useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { fairyMessages } from './fairy-messages'
+import { FairyTaskListContextMenuContent } from './FairyTaskListContextMenuContent'
+
+export function FairyTaskListSidebarButton({
+	onClick,
+	hasUnreadTasks,
+	agents,
+}: {
+	onClick(): void
+	hasUnreadTasks: boolean
+	agents: FairyAgent[]
+}) {
+	const taskListLabel = useMsg(fairyMessages.taskList)
+
+	return (
+		<div style={{ position: 'relative' }}>
+			<_ContextMenu.Root dir="ltr">
+				<_ContextMenu.Trigger asChild>
+					<TldrawUiButton type="icon" className="fairy-toolbar-sidebar-button" onClick={onClick}>
+						<TldrawUiIcon icon="clipboard-copied" label={taskListLabel} />
+					</TldrawUiButton>
+				</_ContextMenu.Trigger>
+				<FairyTaskListContextMenuContent agents={agents} />
+			</_ContextMenu.Root>
+			{hasUnreadTasks && <div className="fairy-todo-unread-indicator" />}
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/FairyThrowTool.tsx b/apps/dotcom/client/src/fairy/FairyThrowTool.tsx
index 964fe0e6f9f7..f4422ccad70a 100644
--- a/apps/dotcom/client/src/fairy/FairyThrowTool.tsx
+++ b/apps/dotcom/client/src/fairy/FairyThrowTool.tsx
@@ -8,18 +8,25 @@ export class FairyThrowTool extends StateNode {
 	}
 	static override initial = 'pointing'
 
-	fairy: Atom<FairyEntity> | null = null
+	static override isLockable = false
 
-	clickOffset = { x: 0, y: 0 }
+	fairies: Atom<FairyEntity>[] = []
+
+	clickOffsets = new Map<Atom<FairyEntity>, { x: number; y: number }>()
 
 	override onEnter() {
-		if (!this.fairy) return
-		this.fairy.update((f) => ({ ...f, isSelected: true }))
-		this.editor.setCursor({ type: 'grabbing', rotation: 0 })
+		if (this.fairies.length === 0) return
+		for (const fairy of this.fairies) {
+			fairy.update((f) => ({ ...f, isSelected: true }))
+		}
+	}
+
+	override onExit() {
+		this.editor.setCursor({ type: 'default', rotation: 0 })
 	}
 
-	setFairy(fairy: Atom<FairyEntity>) {
-		this.fairy = fairy
+	setFairies(fairies: Atom<FairyEntity>[]) {
+		this.fairies = fairies
 	}
 }
 
@@ -30,21 +37,27 @@ class PointingState extends StateNode {
 		const tool = this.parent as FairyThrowTool
 		const { editor } = this
 
-		if (!tool.fairy) return
+		if (tool.fairies.length === 0) return
 
-		// Calculate offset between click position and fairy position
+		// Calculate offset between click position and each fairy position
 		const originPagePoint = editor.inputs.currentPagePoint
-		const fairyPosition = tool.fairy.get().position
+		tool.clickOffsets.clear()
 
-		tool.clickOffset = {
-			x: fairyPosition.x - originPagePoint.x,
-			y: fairyPosition.y - originPagePoint.y,
+		for (const fairy of tool.fairies) {
+			const fairyEntity = fairy.get()
+			if (!fairyEntity) continue
+
+			const fairyPosition = fairyEntity.position
+			tool.clickOffsets.set(fairy, {
+				x: fairyPosition.x - originPagePoint.x,
+				y: fairyPosition.y - originPagePoint.y,
+			})
 		}
 	}
 
 	override onPointerUp() {
 		// User released without moving - cancel the tool
-		this.editor.setCurrentTool('select')
+		this.editor.setCurrentTool('select.idle')
 	}
 
 	override onPointerMove() {
@@ -54,7 +67,7 @@ class PointingState extends StateNode {
 
 	override onKeyDown(info: TLKeyboardEventInfo): void {
 		if (info.key === 'Escape') {
-			this.editor.setCurrentTool('select')
+			this.editor.setCurrentTool('select.idle')
 		}
 	}
 }
@@ -66,7 +79,7 @@ class ThrowingState extends StateNode {
 		const tool = this.parent as FairyThrowTool
 		const { editor } = this
 
-		if (!tool.fairy) return
+		if (tool.fairies.length === 0) return
 		// Get current pointer position and convert to page space
 		const screenPoint = editor.inputs.currentScreenPoint
 		const { screenBounds } = editor.getInstanceState()
@@ -75,16 +88,21 @@ class ThrowingState extends StateNode {
 			y: screenPoint.y + screenBounds.y,
 		})
 
-		const newPosition = {
-			x: pagePoint.x + tool.clickOffset.x,
-			y: pagePoint.y + tool.clickOffset.y,
-		}
+		// Update positions for all fairies
+		for (const fairy of tool.fairies) {
+			const offset = tool.clickOffsets.get(fairy)
+			if (!offset) continue
 
-		// Update fairy position
-		tool.fairy.update((f) => ({
-			...f,
-			position: newPosition,
-		}))
+			const newPosition = {
+				x: pagePoint.x + offset.x,
+				y: pagePoint.y + offset.y,
+			}
+
+			fairy.update((f) => ({
+				...f,
+				position: newPosition,
+			}))
+		}
 	}
 
 	override onPointerUp() {
@@ -92,7 +110,6 @@ class ThrowingState extends StateNode {
 	}
 
 	cancel() {
-		this.editor.setCurrentTool('select')
-		this.editor.setCursor({ type: 'grab', rotation: 0 })
+		this.editor.setCurrentTool('select.idle')
 	}
 }
diff --git a/apps/dotcom/client/src/fairy/FairyUtils.tsx b/apps/dotcom/client/src/fairy/FairyUtils.tsx
new file mode 100644
index 000000000000..c5ff185059a3
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyUtils.tsx
@@ -0,0 +1,199 @@
+import { AgentAction, PromptPart } from '@tldraw/fairy-shared'
+import { AgentActionUtil, AgentActionUtilConstructor } from './actions/AgentActionUtil'
+import { AlignActionUtil } from './actions/AlignActionUtil'
+import { AwaitDuoTasksCompletionActionUtil } from './actions/AwaitDuoTasksCompletionActionUtil'
+import { AwaitTasksCompletionActionUtil } from './actions/AwaitTasksCompletionActionUtil'
+import { BringToFrontActionUtil } from './actions/BringToFrontActionUtil'
+import { ChangePageActionUtil } from './actions/ChangePageActionUtil'
+import { ClaimTodoItemActionUtil } from './actions/ClaimTodoItemActionUtil'
+import { CreateActionUtil } from './actions/CreateActionUtil'
+import { CreateDuoTaskActionUtil } from './actions/CreateDuoTaskActionUtil'
+import { CreatePageActionUtil } from './actions/CreatePageActionUtil'
+import { CreateProjectTaskActionUtil } from './actions/CreateProjectTaskActionUtil'
+import { CreateSoloTaskActionUtil } from './actions/CreateSoloTaskActionUtil'
+import { DeleteActionUtil } from './actions/DeleteActionUtil'
+import { DirectToStartDuoTaskActionUtil } from './actions/DirectToStartDuoTaskActionUtil'
+import { DirectToStartTaskActionUtil } from './actions/DirectToStartTaskActionUtil'
+import { DistributeActionUtil } from './actions/DistributeActionUtil'
+import { EndCurrentProjectActionUtil } from './actions/EndCurrentProjectActionUtil'
+import { EndDuoProjectActionUtil } from './actions/EndDuoProjectActionUtil'
+import { FlyToBoundsActionUtil } from './actions/FlyToBoundsActionUtil'
+import { LabelActionUtil } from './actions/LabelActionUtil'
+import { MarkDroneTaskDoneActionUtil } from './actions/MarkDroneTaskDoneActionUtil'
+import { MarkDuoTaskDoneActionUtil } from './actions/MarkDuoTaskDoneActionUtil'
+import { MarkSoloTaskDoneActionUtil } from './actions/MarkSoloTaskDoneActionUtil'
+import { MessageActionUtil } from './actions/MessageActionUtil'
+import { MoveActionUtil } from './actions/MoveActionUtil'
+import { PenActionUtil } from './actions/PenActionUtil'
+import { PersonalTodoListActionUtil } from './actions/PersonalTodoListActionUtil'
+import { PlaceActionUtil } from './actions/PlaceActionUtil'
+import { ResizeActionUtil } from './actions/ResizeActionUtil'
+import { ReviewActionUtil } from './actions/ReviewActionUtil'
+import { RotateActionUtil } from './actions/RotateActionUtil'
+import { SendToBackActionUtil } from './actions/SendToBackActionUtil'
+import { StackActionUtil } from './actions/StackActionUtil'
+import { StartDuoProjectActionUtil } from './actions/StartDuoProjectActionUtil'
+import { StartDuoTaskActionUtil } from './actions/StartDuoTaskActionUtil'
+import { StartProjectActionUtil } from './actions/StartProjectActionUtil'
+import { StartSoloTaskActionUtil } from './actions/StartSoloTaskActionUtil'
+import { ThinkActionUtil } from './actions/ThinkActionUtil'
+import { UnknownActionUtil } from './actions/UnknownActionUtil'
+import { UpdateActionUtil } from './actions/UpdateActionUtil'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { AgentViewportBoundsPartUtil } from './parts/AgentViewportBoundsPartUtil'
+import { BlurryShapesPartUtil } from './parts/BlurryShapesPartUtil'
+import { ChatHistoryPartUtil } from './parts/ChatHistoryPartUtil'
+import { CurrentProjectDronePartUtil } from './parts/CurrentProjectDronePartUtil'
+import { CurrentProjectOrchestratorPartUtil } from './parts/CurrentProjectOrchestratorPartUtil'
+import { DataPartUtil } from './parts/DataPartUtil'
+import { DebugPartUtil } from './parts/DebugPartUtil'
+import { MessagesPartUtil } from './parts/MessagesPartUtil'
+import { ModelNamePartUtil } from './parts/ModelNamePartUtil'
+import { ModePartUtil } from './parts/ModePartUtil'
+import { OtherFairiesPartUtil } from './parts/OtherFairiesPartUtil'
+import { PagesPartUtil } from './parts/PagesPartUtil'
+import { PeripheralShapesPartUtil } from './parts/PeripheralShapesPartUtil'
+import { PersonalityPartUtil } from './parts/PersonalityPartUtil'
+import { PersonalTodoListPartUtil } from './parts/PersonalTodoListPartUtil'
+import { PromptPartUtil, PromptPartUtilConstructor } from './parts/PromptPartUtil'
+import { ScreenshotPartUtil } from './parts/ScreenshotPartUtil'
+import { SelectedShapesPartUtil } from './parts/SelectedShapesPartUtil'
+import { SoloTasksPartUtil } from './parts/SoloTasksPartUtil'
+import { TimePartUtil } from './parts/TimePartUtil'
+import { UserActionHistoryPartUtil } from './parts/UserActionHistoryPartUtil'
+import { UserViewportBoundsPartUtil } from './parts/UserViewportBoundsPartUtil'
+import { WorkingTasksPartUtil } from './parts/WorkingTasksPartUtil'
+
+/**
+ * Agent action utils determine what actions do.
+ */
+export const AGENT_ACTION_UTILS = [
+	// Communication
+	MessageActionUtil,
+
+	// Planning
+	ThinkActionUtil,
+	ReviewActionUtil,
+	FlyToBoundsActionUtil,
+	PersonalTodoListActionUtil,
+
+	// Individual shapes
+	CreateActionUtil,
+	DeleteActionUtil,
+	UpdateActionUtil,
+	LabelActionUtil,
+	MoveActionUtil,
+
+	// Groups of shapes
+	PlaceActionUtil,
+	BringToFrontActionUtil,
+	SendToBackActionUtil,
+	RotateActionUtil,
+	ResizeActionUtil,
+	AlignActionUtil,
+	DistributeActionUtil,
+	StackActionUtil,
+
+	// Drawing
+	PenActionUtil,
+
+	// Page navigation
+	ChangePageActionUtil,
+	CreatePageActionUtil,
+
+	// Project management
+
+	// Working
+	CreateSoloTaskActionUtil,
+	StartSoloTaskActionUtil,
+	MarkDroneTaskDoneActionUtil,
+	MarkSoloTaskDoneActionUtil,
+	ClaimTodoItemActionUtil, // not in use atm
+
+	// Orchestrating
+	StartProjectActionUtil,
+	CreateProjectTaskActionUtil,
+	DirectToStartTaskActionUtil,
+	EndCurrentProjectActionUtil,
+	AwaitTasksCompletionActionUtil,
+
+	// Duo orchestrating
+	StartDuoProjectActionUtil,
+	CreateDuoTaskActionUtil,
+	DirectToStartDuoTaskActionUtil,
+	StartDuoTaskActionUtil,
+	EndDuoProjectActionUtil,
+	AwaitDuoTasksCompletionActionUtil,
+	MarkDuoTaskDoneActionUtil,
+
+	// Internal (required)
+	UnknownActionUtil,
+] satisfies AgentActionUtilConstructor<AgentAction>[]
+
+/**
+ * Prompt parts determine what information will be sent to the model.
+ *
+ * To stop sending something to the model, remove it from the list.
+ * To send something new to the model, either change one of the existing parts, or add your own.
+ */
+export const PROMPT_PART_UTILS = [
+	// Request
+	MessagesPartUtil,
+	DataPartUtil,
+
+	// Viewport
+	ScreenshotPartUtil,
+	UserViewportBoundsPartUtil,
+	AgentViewportBoundsPartUtil,
+
+	// Shapes
+	BlurryShapesPartUtil,
+	PeripheralShapesPartUtil,
+	SelectedShapesPartUtil,
+
+	// History
+	ChatHistoryPartUtil,
+	UserActionHistoryPartUtil,
+	SoloTasksPartUtil,
+	WorkingTasksPartUtil,
+	PersonalTodoListPartUtil,
+
+	// Metadata
+	TimePartUtil,
+	PagesPartUtil,
+
+	// Fairy-specific
+	OtherFairiesPartUtil,
+	PersonalityPartUtil,
+	ModePartUtil,
+	CurrentProjectDronePartUtil,
+	CurrentProjectOrchestratorPartUtil,
+
+	// Model selection
+	ModelNamePartUtil,
+
+	// Debug
+	DebugPartUtil,
+] as const satisfies PromptPartUtilConstructor<PromptPart>[]
+
+/**
+ * Get an object containing all agent action utils.
+ */
+export function getAgentActionUtilsRecord(agent: FairyAgent) {
+	const object = {} as Record<AgentAction['_type'], AgentActionUtil<AgentAction>>
+	for (const util of AGENT_ACTION_UTILS) {
+		object[util.type] = new util(agent)
+	}
+	return object
+}
+
+/**
+ * Get an object containing all prompt part utils.
+ */
+export function getPromptPartUtilsRecord(agent: FairyAgent) {
+	const object = {} as Record<PromptPart['type'], PromptPartUtil<PromptPart>>
+	for (const util of PROMPT_PART_UTILS) {
+		object[util.type] = new util(agent)
+	}
+	return object
+}
diff --git a/apps/dotcom/client/src/fairy/FairyVision.tsx b/apps/dotcom/client/src/fairy/FairyVision.tsx
index 98d1b19f15d5..52b3660d53bd 100644
--- a/apps/dotcom/client/src/fairy/FairyVision.tsx
+++ b/apps/dotcom/client/src/fairy/FairyVision.tsx
@@ -1,7 +1,7 @@
-import { Box, BoxModel, SVGContainer, useEditor, useValue } from 'tldraw'
-import { TldrawFairyAgent } from './fairy-agent/agent/TldrawFairyAgent'
+import { Box, BoxModel, SVGContainer, useValue } from 'tldraw'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
 
-export function FairyVision({ agents }: { agents: TldrawFairyAgent[] }) {
+export function FairyVision({ agents }: { agents: FairyAgent[] }) {
 	return (
 		<>
 			{agents.map((agent, i) => (
@@ -11,7 +11,7 @@ export function FairyVision({ agents }: { agents: TldrawFairyAgent[] }) {
 	)
 }
 
-function AgentVision({ agent }: { agent: TldrawFairyAgent }) {
+function AgentVision({ agent }: { agent: FairyAgent }) {
 	const activeRequest = useValue(agent.$activeRequest)
 
 	if (!activeRequest) return null
@@ -40,24 +40,13 @@ export function AreaHighlight({
 	label,
 	className = '',
 }: AreaHighlightProps) {
-	const editor = useEditor()
-	const screenBounds = useValue(
-		'screenBounds',
-		() => {
-			const expandedPageBounds = Box.From(pageBounds).expandBy(4)
-			const screenCorners = expandedPageBounds.corners.map((corner) => {
-				return editor.pageToViewport(corner)
-			})
-			return Box.FromPoints(screenCorners)
-		},
-		[pageBounds]
-	)
+	const bounds = useValue('bounds', () => Box.From(pageBounds).expandBy(4), [pageBounds])
 
-	if (!screenBounds) return null
-	const minX = screenBounds.minX
-	const minY = screenBounds.minY
-	const maxX = screenBounds.maxX
-	const maxY = screenBounds.maxY
+	if (!bounds) return null
+	const minX = bounds.minX
+	const minY = bounds.minY
+	const maxX = bounds.maxX
+	const maxY = bounds.maxY
 
 	return (
 		<>
@@ -70,14 +59,14 @@ export function AreaHighlight({
 					height: maxY - minY,
 				}}
 			>
-				{screenBounds.sides.map((side, j) => {
+				{bounds.sides.map((side, j) => {
 					return (
 						<line
 							key={'context-highlight-side-' + j}
-							x1={side[0].x - screenBounds.minX}
-							y1={side[0].y - screenBounds.minY}
-							x2={side[1].x - screenBounds.minX}
-							y2={side[1].y - screenBounds.minY}
+							x1={side[0].x - bounds.minX}
+							y1={side[0].y - bounds.minY}
+							x2={side[1].x - bounds.minX}
+							y2={side[1].y - bounds.minY}
 							stroke={color}
 						/>
 					)
@@ -86,7 +75,7 @@ export function AreaHighlight({
 			{label && (
 				<div
 					className="context-highlight-label"
-					style={{ top: screenBounds.y, left: screenBounds.x, backgroundColor: color }}
+					style={{ top: bounds.y, left: bounds.x, backgroundColor: color }}
 				>
 					{label}
 				</div>
diff --git a/apps/dotcom/client/src/fairy/FairyWaitNotifications.ts b/apps/dotcom/client/src/fairy/FairyWaitNotifications.ts
new file mode 100644
index 000000000000..e01f1d5f474e
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/FairyWaitNotifications.ts
@@ -0,0 +1,113 @@
+import {
+	AgentModeTransitionEvent,
+	FairyModeDefinition,
+	FairyTask,
+	TaskCompletedEvent,
+	type FairyWaitCondition,
+	type FairyWaitEvent,
+} from '@tldraw/fairy-shared'
+import { Editor } from 'tldraw'
+import { $fairyAgentsAtom } from './fairy-agent/agent/fairyAgentsAtom'
+
+/**
+ * Notify all agents that are waiting for an event.
+ * This is the central function for broadcasting events to waiting agents.
+ *
+ * @param eventType - The type of event that occurred
+ * @param event - The event data
+ * @param editor - The editor instance
+ * @param getMessage - Optional function to generate a wake-up message for each matched agent
+ */
+export function notifyWaitingAgents(
+	eventType: FairyWaitEvent['type'],
+	event: FairyWaitEvent,
+	editor: Editor,
+	getMessage?: (agentId: string, condition: FairyWaitCondition<FairyWaitEvent>) => string
+) {
+	const agents = $fairyAgentsAtom.get(editor)
+
+	for (const agent of agents) {
+		const waitingConditions = agent.$waitingFor.get()
+		const matchingCondition = waitingConditions.find(
+			(condition) => condition.eventType === eventType && condition.matcher(event)
+		) // if there are multiple matching conditions, this will miss all but the first
+
+		if (matchingCondition) {
+			// Remove the matched condition from the agent's waiting list
+			const remainingConditions = waitingConditions.filter(
+				(condition) => condition !== matchingCondition
+			)
+			agent.$waitingFor.set(remainingConditions)
+
+			// Wake up the agent with a notification message
+			const message = getMessage?.(agent.id, matchingCondition) ?? `Event "${eventType}" occurred.`
+			agent.notifyWaitConditionFulfilled(message, matchingCondition, event)
+		}
+	}
+}
+
+/**
+ * Notify all agents waiting for task completion events.
+ *
+ * @param taskId - The ID of the completed task
+ * @param task - The completed task object
+ * @param editor - The editor instance
+ */
+export function notifyTaskCompleted(task: FairyTask, editor: Editor) {
+	notifyWaitingAgents(
+		'task-completed',
+		{ type: 'task-completed', task },
+		editor,
+		() => `Task ${task.id} ("${task.text}") has been completed.`
+	)
+}
+
+/**
+ * Create a wait condition for waiting on a specific task completion.
+ *
+ * @param taskId - The task ID to wait for
+ * @returns A WaitCondition that matches when the specified task completes
+ */
+export function createTaskWaitCondition(taskId: string): FairyWaitCondition<TaskCompletedEvent> {
+	return {
+		eventType: 'task-completed',
+		matcher: (event) => event.task.id === taskId,
+	}
+}
+
+/**
+ * Notify all agents waiting for a mode transition event.
+ *
+ * @param agentId - The ID of the agent that transitioned
+ * @param mode - The mode to transition to
+ * @param editor - The editor instance
+ */
+export function notifyAgentModeTransition(
+	agentId: string,
+	mode: FairyModeDefinition['type'],
+	editor: Editor
+) {
+	notifyWaitingAgents(
+		'agent-mode-transition',
+		{ type: 'agent-mode-transition', agentId, mode },
+		editor,
+		() => `Agent ${agentId} has transitioned to mode ${mode}.`
+	)
+}
+
+/**
+ * Create a wait condition for waiting on a specific mode transition.
+ *
+ * @param agentId - The ID of the agent that transitioned
+ * @param mode - The mode to transition to
+ * @returns A WaitCondition that matches when the specified mode transition occurs
+ */
+export function createAgentModeTransitionWaitCondition(
+	agentId: string,
+	mode: FairyModeDefinition['type']
+): FairyWaitCondition<AgentModeTransitionEvent> {
+	return {
+		eventType: 'agent-mode-transition',
+		matcher: (event) => event.agentId === agentId && event.mode === mode,
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/InCanvasTaskList.tsx b/apps/dotcom/client/src/fairy/InCanvasTaskList.tsx
new file mode 100644
index 000000000000..4bbb42bcedeb
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/InCanvasTaskList.tsx
@@ -0,0 +1,147 @@
+import { FairyTask } from '@tldraw/fairy-shared'
+import { useEditor, useValue } from 'tldraw'
+import { useMsg } from '../tla/utils/i18n'
+import { FairyAgent } from './fairy-agent/agent/FairyAgent'
+import { fairyMessages } from './fairy-messages'
+import { $fairyDebugFlags } from './FairyDebugFlags'
+import { getProjectById } from './FairyProjects'
+import { $fairyTasks, $showCanvasFairyTasks, deleteFairyTask } from './FairyTaskList'
+import { getProjectColor } from './getProjectColor'
+
+export function InCanvasTaskList({ agents }: { agents: FairyAgent[] }) {
+	const editor = useEditor()
+	const tasks = useValue('fairy-tasks-list', () => $fairyTasks.get(), [$fairyTasks])
+	const showCanvasTodos = useValue('show-canvas-todos', () => $showCanvasFairyTasks.get(), [
+		$showCanvasFairyTasks,
+	])
+	const currentPageId = useValue('current page id', () => editor.getCurrentPageId(), [editor])
+	const isInTodoDragTool = useValue(
+		'is-in-todo-drag-tool',
+		() => editor.isIn('select.task-drag.dragging'),
+		[editor]
+	)
+
+	// Filter tasks that are on canvas (have x/y coordinates) AND are on the current page
+	const inCanvasTasks = useValue(
+		'in-canvas-tasks-on-page',
+		() => {
+			return tasks.filter((task) => {
+				// Must have coordinates to be shown on canvas
+				const hasCoordinates = task.x != null && task.y != null
+				// Must be on the current page (or have no pageId for backwards compatibility)
+				const isOnCurrentPage = !task.pageId || task.pageId === currentPageId
+				return hasCoordinates && isOnCurrentPage
+			})
+		},
+		[tasks, currentPageId]
+	)
+
+	const showTaskBounds = useValue('show-task-bounds', () => $fairyDebugFlags.get().showTaskBounds, [
+		$fairyDebugFlags,
+	])
+
+	if (!showCanvasTodos) return null
+
+	return (
+		<>
+			<div
+				className={`in-canvas-todo-list ${isInTodoDragTool ? 'in-canvas-todo-list--dragging' : ''}`}
+			>
+				{inCanvasTasks.map((task) => (
+					<InCanvasTaskItem key={task.id} agents={agents} task={task} />
+				))}
+			</div>
+			{showTaskBounds &&
+				inCanvasTasks
+					.filter((task) => task.x != null && task.y != null && task.w != null && task.h != null)
+					.map((task) => (
+						<TaskBoundsOverlay
+							key={`bounds-${task.id}`}
+							x={task.x!}
+							y={task.y!}
+							w={task.w!}
+							h={task.h!}
+						/>
+					))}
+		</>
+	)
+}
+
+function getStatusIcon(status: FairyTask['status']) {
+	switch (status) {
+		case 'todo':
+			return '○'
+		case 'in-progress':
+			return '➤'
+		case 'done':
+			return '●'
+		default:
+			return '○'
+	}
+}
+
+function InCanvasTaskItem({ agents, task }: { agents: FairyAgent[]; task: FairyTask }) {
+	const deleteTaskLabel = useMsg(fairyMessages.deleteTask)
+	const statusClass =
+		task.status === 'done'
+			? 'in-canvas-todo-item--done'
+			: task.status === 'in-progress'
+				? 'in-canvas-todo-item--in-progress'
+				: 'in-canvas-todo-item--todo'
+
+	const icon = getStatusIcon(task.status)
+	const project = task.projectId ? getProjectById(task.projectId) : undefined
+	const projectColor =
+		project && agents.length > 0 ? getProjectColor(agents[0].editor, project.color) : undefined
+
+	if (task.x == null || task.y == null) return null
+
+	return (
+		<div
+			className={`in-canvas-todo-item-wrapper`}
+			style={{
+				left: task.x,
+				top: task.y,
+			}}
+		>
+			<div className={`in-canvas-todo-item ${statusClass}`}>
+				{projectColor && (
+					<div
+						className="in-canvas-todo-item-project-indicator"
+						style={{ backgroundColor: projectColor }}
+					/>
+				)}
+				<div className="in-canvas-todo-item-icon">{icon}</div>
+				<span className="in-canvas-todo-item-text">{task.text}</span>
+				<button
+					className="in-canvas-todo-item-delete"
+					onPointerDown={(e) => {
+						e.stopPropagation()
+						deleteFairyTask(task.id)
+					}}
+					title={deleteTaskLabel}
+				>
+					×
+				</button>
+			</div>
+		</div>
+	)
+}
+
+function TaskBoundsOverlay({ x, y, w, h }: { x: number; y: number; w: number; h: number }) {
+	return (
+		<div
+			className="in-canvas-todo-item-bounds"
+			style={{
+				position: 'absolute',
+				left: x,
+				top: y,
+				width: w,
+				height: h,
+				border: '2px dashed rgba(255, 0, 0, 0.5)',
+				pointerEvents: 'none',
+				boxSizing: 'border-box',
+			}}
+		/>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/RemoteFairies.tsx b/apps/dotcom/client/src/fairy/RemoteFairies.tsx
new file mode 100644
index 000000000000..07fba5dea2a1
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/RemoteFairies.tsx
@@ -0,0 +1,106 @@
+import {
+	FairyEntity,
+	fairyEntityValidator,
+	FairyOutfit,
+	fairyOutfitValidator,
+} from '@tldraw/fairy-shared'
+import { T, useEditor, usePeerIds, usePresence } from 'tldraw'
+import { FAIRY_SIZE } from './Fairy'
+import { FairySpriteComponent } from './fairy-sprite/FairySprite'
+
+/**
+ * Component that renders fairies for all remote users who have an active fairy.
+ */
+export function RemoteFairies() {
+	const peerIds = usePeerIds()
+	return (
+		<>
+			{peerIds.map((id) => (
+				<RemoteFairy key={id} userId={id} />
+			))}
+		</>
+	)
+}
+
+interface FairyPresence {
+	entity: FairyEntity
+	outfit: FairyOutfit
+}
+
+const fairyPresenceValidator: T.ObjectValidator<FairyPresence> = T.object({
+	entity: fairyEntityValidator,
+	outfit: fairyOutfitValidator,
+})
+
+function RemoteFairy({ userId }: { userId: string }) {
+	const editor = useEditor()
+	const presence = usePresence(userId)
+
+	// Only render if the user is on the same page and has active agents
+	if (!presence || presence.currentPageId !== editor.getCurrentPageId()) {
+		return null
+	}
+
+	const { meta, color } = presence
+	if (!meta.fairies || !Array.isArray(meta.fairies) || meta.fairies.length === 0) {
+		return null
+	}
+
+	const fairyPresences = meta.fairies
+		.map((fairy) => fairyPresenceValidator.validate(fairy))
+		.filter((fairyPresence) => fairyPresence !== null)
+
+	return (
+		<>
+			{fairyPresences.map((fairyPresence, index) => {
+				return (
+					<RemoteFairyIndicator
+						key={`${userId}_fairy_${index}`}
+						entity={fairyPresence.entity}
+						outfit={fairyPresence.outfit}
+						color={color}
+					/>
+				)
+			})}
+		</>
+	)
+}
+
+function RemoteFairyIndicator({
+	entity,
+	outfit,
+	color,
+}: {
+	entity: FairyEntity
+	outfit: FairyOutfit
+	color: string
+}) {
+	return (
+		<div
+			style={{
+				position: 'absolute',
+				left: entity.position.x,
+				top: entity.position.y,
+				width: `${FAIRY_SIZE}px`,
+				height: `${FAIRY_SIZE}px`,
+				transform: `translate(-75%, -25%) scale(var(--tl-scale)) ${entity.flipX ? ' scaleX(-1)' : ''}`,
+				transformOrigin: '75% 25%',
+				transition: 'left 0.1s ease-in-out, top 0.1s ease-in-out',
+			}}
+		>
+			<FairySpriteComponent
+				animated={true}
+				entity={{
+					position: entity.position,
+					flipX: entity.flipX,
+					isSelected: false,
+					pose: entity.pose,
+					gesture: entity.gesture,
+					currentPageId: entity.currentPageId,
+				}}
+				outfit={outfit}
+				tint={color}
+			/>
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/actions/AgentActionUtil.ts b/apps/dotcom/client/src/fairy/actions/AgentActionUtil.ts
new file mode 100644
index 000000000000..62459a74ce64
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/AgentActionUtil.ts
@@ -0,0 +1,55 @@
+import { AgentAction, AgentActionInfo, BaseAgentAction, Streaming } from '@tldraw/fairy-shared'
+import { Editor } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { FairyAgent } from '../fairy-agent/agent/FairyAgent'
+
+export abstract class AgentActionUtil<T extends BaseAgentAction = BaseAgentAction> {
+	static type: AgentAction['_type']
+
+	protected agent: FairyAgent
+	protected editor: Editor
+
+	constructor(agent: FairyAgent) {
+		this.agent = agent
+		this.editor = agent.editor
+	}
+
+	/**
+	 * Get information about the action to display within the chat history UI.
+	 * Return null to not show anything.
+	 * Defaults to the stringified action if not set.
+	 */
+	getInfo(_action: Streaming<T>): Partial<AgentActionInfo> | null {
+		return {}
+	}
+
+	/**
+	 * Transforms the action before saving it to chat history.
+	 * Useful for sanitizing or correcting actions.
+	 * @returns The transformed action, or null to reject the action
+	 */
+	sanitizeAction(action: Streaming<T>, _helpers: AgentHelpers): Streaming<T> | null {
+		return action
+	}
+
+	/**
+	 * Apply the action to the editor.
+	 * Any changes that happen during this function will be displayed as a diff.
+	 * @returns An optional object containing a promise and/or coordinates to move the fairy to
+	 */
+	applyAction(_action: Streaming<T>, _helpers: AgentHelpers): Promise<void> | void {
+		// Do nothing by default
+	}
+
+	/**
+	 * Whether the action gets saved to history.
+	 */
+	savesToHistory(): boolean {
+		return true
+	}
+}
+
+export interface AgentActionUtilConstructor<T extends BaseAgentAction = BaseAgentAction> {
+	new (agent: FairyAgent, editor: Editor): AgentActionUtil<T>
+	type: T['_type']
+}
diff --git a/packages/fairy-shared/src/actions/AlignActionUtil.ts b/apps/dotcom/client/src/fairy/actions/AlignActionUtil.ts
similarity index 51%
rename from packages/fairy-shared/src/actions/AlignActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/AlignActionUtil.ts
index da63607f05f3..f6735b8ab621 100644
--- a/packages/fairy-shared/src/actions/AlignActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/AlignActionUtil.ts
@@ -1,31 +1,11 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const AlignAction = z
-	.object({
-		_type: z.literal('align'),
-		alignment: z.enum(['top', 'bottom', 'left', 'right', 'center-horizontal', 'center-vertical']),
-		gap: z.number(),
-		intent: z.string(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({ title: 'Align', description: 'The fairy aligns shapes to each other on an axis.' })
-
-type AlignAction = z.infer<typeof AlignAction>
+import { AlignAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class AlignActionUtil extends AgentActionUtil<AlignAction> {
 	static override type = 'align' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('align')) {
-			return null
-		}
-		return AlignAction
-	}
-
 	override getInfo(action: Streaming<AlignAction>) {
 		return {
 			icon: 'cursor' as const,
diff --git a/apps/dotcom/client/src/fairy/actions/AwaitDuoTasksCompletionActionUtil.ts b/apps/dotcom/client/src/fairy/actions/AwaitDuoTasksCompletionActionUtil.ts
new file mode 100644
index 000000000000..f19dc96bea67
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/AwaitDuoTasksCompletionActionUtil.ts
@@ -0,0 +1,54 @@
+import { AwaitDuoTasksCompletionAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { getFairyTaskById } from '../FairyTaskList'
+import { createTaskWaitCondition } from '../FairyWaitNotifications'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class AwaitDuoTasksCompletionActionUtil extends AgentActionUtil<AwaitDuoTasksCompletionAction> {
+	static override type = 'await-duo-tasks-completion' as const
+
+	override getInfo(action: Streaming<AwaitDuoTasksCompletionAction>) {
+		const taskCount = action.taskIds?.length ?? 0
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Waiting for ${taskCount} duo task${taskCount === 1 ? '' : 's'} to complete`
+				: 'Setting up wait conditions...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<AwaitDuoTasksCompletionAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const taskIds = action.taskIds ?? []
+		if (taskIds.length === 0) {
+			return
+		}
+
+		// Check if all tasks are real
+		const invalidTaskIds: string[] = []
+		for (const taskId of taskIds) {
+			const task = getFairyTaskById(taskId)
+			if (!task || task.status === 'done') {
+				// todo, should we check if task is in project?
+				invalidTaskIds.push(taskId)
+			}
+		}
+
+		// If any tasks are invalid, interrupt the agent
+		if (invalidTaskIds.length > 0) {
+			const invalidIdsList = invalidTaskIds.join(', ')
+			this.agent.interrupt({
+				input: `The following task IDs do not exist or are already completed: ${invalidIdsList}. No tasks have been awaited. Please check the task list and try again.`,
+			})
+			return
+		}
+
+		// Create a wait condition for each task ID
+		for (const taskId of taskIds) {
+			const condition = createTaskWaitCondition(taskId)
+			this.agent.waitFor(condition)
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/AwaitTasksCompletionActionUtil.ts b/apps/dotcom/client/src/fairy/actions/AwaitTasksCompletionActionUtil.ts
new file mode 100644
index 000000000000..5b69aebc24fd
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/AwaitTasksCompletionActionUtil.ts
@@ -0,0 +1,54 @@
+import { AwaitTasksCompletionAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { getFairyTaskById } from '../FairyTaskList'
+import { createTaskWaitCondition } from '../FairyWaitNotifications'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class AwaitTasksCompletionActionUtil extends AgentActionUtil<AwaitTasksCompletionAction> {
+	static override type = 'await-tasks-completion' as const
+
+	override getInfo(action: Streaming<AwaitTasksCompletionAction>) {
+		const taskCount = action.taskIds?.length ?? 0
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Waiting for ${taskCount} task${taskCount === 1 ? '' : 's'} to complete`
+				: 'Setting up wait conditions...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<AwaitTasksCompletionAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const taskIds = action.taskIds ?? []
+		if (taskIds.length === 0) {
+			return
+		}
+
+		// Check if all tasks are real
+		const invalidTaskIds: string[] = []
+		for (const taskId of taskIds) {
+			const task = getFairyTaskById(taskId)
+			if (!task || task.status === 'done') {
+				// todo, should we check if task is in project?
+				invalidTaskIds.push(taskId)
+			}
+		}
+
+		// If any tasks are invalid, interrupt the agent
+		if (invalidTaskIds.length > 0) {
+			const invalidIdsList = invalidTaskIds.join(', ')
+			this.agent.interrupt({
+				input: `The following task IDs do not exist or are already completed: ${invalidIdsList}. No tasks have been awaited. Please check the task list and try again.`,
+			})
+			return
+		}
+
+		// Create a wait condition for each task ID
+		for (const taskId of taskIds) {
+			const condition = createTaskWaitCondition(taskId)
+			this.agent.waitFor(condition)
+		}
+	}
+}
diff --git a/packages/fairy-shared/src/actions/BringToFrontActionUtil.ts b/apps/dotcom/client/src/fairy/actions/BringToFrontActionUtil.ts
similarity index 50%
rename from packages/fairy-shared/src/actions/BringToFrontActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/BringToFrontActionUtil.ts
index 494597e8e8ae..32eaa9658dd7 100644
--- a/packages/fairy-shared/src/actions/BringToFrontActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/BringToFrontActionUtil.ts
@@ -1,32 +1,10 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const BringToFrontAction = z
-	.object({
-		_type: z.literal('bringToFront'),
-		intent: z.string(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({
-		title: 'Bring to Front',
-		description:
-			'The fairy brings one or more shapes to the front so that they appear in front of everything else.',
-	})
-
-type BringToFrontAction = z.infer<typeof BringToFrontAction>
+import { BringToFrontAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class BringToFrontActionUtil extends AgentActionUtil<BringToFrontAction> {
-	static override type = 'bringToFront' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('bringToFront')) {
-			return null
-		}
-		return BringToFrontAction
-	}
+	static override type = 'bring-to-front' as const
 
 	override getInfo(action: Streaming<BringToFrontAction>) {
 		return {
diff --git a/apps/dotcom/client/src/fairy/actions/ChangePageActionUtil.ts b/apps/dotcom/client/src/fairy/actions/ChangePageActionUtil.ts
new file mode 100644
index 000000000000..18a81bcecc99
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/ChangePageActionUtil.ts
@@ -0,0 +1,46 @@
+import { ChangePageAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class ChangePageActionUtil extends AgentActionUtil<ChangePageAction> {
+	static override type = 'change-page' as const
+
+	override getInfo(action: Streaming<ChangePageAction>) {
+		return {
+			icon: 'target' as const,
+			description: action.intent ?? `Changing to page: ${action.pageName}`,
+		}
+	}
+
+	override applyAction(action: Streaming<ChangePageAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+		const { editor } = this.agent
+
+		// Get all pages
+		const pages = editor.getPages()
+
+		// Find the page by name
+		const targetPage = pages.find((page) => page.name === action.pageName)
+
+		if (!targetPage) {
+			// If page doesn't exist, schedule a message to let the user know
+			this.agent.schedule({
+				data: [
+					`I couldn't find a page named "${action.pageName}". Available pages are: ${pages.map((p) => p.name).join(', ')}`,
+				],
+			})
+			return
+		}
+
+		// Change to the page
+		editor.setCurrentPage(targetPage.id)
+
+		// Update the fairy's current page ID
+		this.agent.$fairyEntity.update((f) => (f ? { ...f, currentPageId: targetPage.id } : f))
+
+		// Move the fairy to the center of the viewport on the new page
+		const center = editor.getViewportPageBounds().center
+		this.agent.moveToPosition(center)
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/ClaimTodoItemActionUtil.ts b/apps/dotcom/client/src/fairy/actions/ClaimTodoItemActionUtil.ts
new file mode 100644
index 000000000000..8666237fa8e3
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/ClaimTodoItemActionUtil.ts
@@ -0,0 +1,24 @@
+import { ClaimTodoItemAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class ClaimTodoItemActionUtil extends AgentActionUtil<ClaimTodoItemAction> {
+	static override type = 'claim-todo-item' as const
+
+	override getInfo(action: Streaming<ClaimTodoItemAction>) {
+		const text = action.complete
+			? `Claimed todo item ${action.todoItemId}.`
+			: `Claiming todo item ${action.todoItemId}...`
+
+		return {
+			icon: 'pencil' as const,
+			description: text,
+		}
+	}
+
+	override applyAction(action: Streaming<ClaimTodoItemAction>) {
+		if (!action.complete) return
+		if (!this.agent || !this.editor) return
+
+		// Todo
+	}
+}
diff --git a/packages/fairy-shared/src/actions/CreateActionUtil.ts b/apps/dotcom/client/src/fairy/actions/CreateActionUtil.ts
similarity index 83%
rename from packages/fairy-shared/src/actions/CreateActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/CreateActionUtil.ts
index 4a907fb9b159..ec83b999f83f 100644
--- a/packages/fairy-shared/src/actions/CreateActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/CreateActionUtil.ts
@@ -1,34 +1,17 @@
-import { IndexKey, toRichText } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
 import {
 	convertFocusedShapeToTldrawShape,
+	CreateAction,
+	FocusedShape,
 	SIMPLE_TO_GEO_TYPES,
-} from '../format/convertFocusedShapeToTldrawShape'
-import { FocusedShape, FocusedShapeSchema } from '../format/FocusedShape'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const CreateAction = z
-	.object({
-		_type: z.literal('create'),
-		intent: z.string(),
-		shape: FocusedShapeSchema,
-	})
-	.meta({ title: 'Create', description: 'The fairy creates a new shape.' })
-
-type CreateAction = z.infer<typeof CreateAction>
+	Streaming,
+} from '@tldraw/fairy-shared'
+import { IndexKey, toRichText } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class CreateActionUtil extends AgentActionUtil<CreateAction> {
 	static override type = 'create' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('create')) {
-			return null
-		}
-		return CreateAction
-	}
-
 	override getInfo(action: Streaming<CreateAction>) {
 		return {
 			icon: 'pencil' as const,
diff --git a/apps/dotcom/client/src/fairy/actions/CreateDuoTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/CreateDuoTaskActionUtil.ts
new file mode 100644
index 000000000000..f69d3fc09cde
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/CreateDuoTaskActionUtil.ts
@@ -0,0 +1,58 @@
+import { CreateDuoTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { getProjectByAgentId } from '../FairyProjects'
+import { createFairyTask } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+// Creates a task for a duo project with a specifiable assignedTo id
+export class CreateDuoTaskActionUtil extends AgentActionUtil<CreateDuoTaskAction> {
+	static override type = 'create-duo-task' as const
+
+	override getInfo(action: Streaming<CreateDuoTaskAction>) {
+		const label = action.complete ? 'Created duo task' : 'Creating duo task'
+		return {
+			icon: 'note' as const,
+			description: `${label}: ${action.text}`,
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<CreateDuoTaskAction>, helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const project = this.agent.getProject()
+		if (!project) return // todo error
+
+		const assignedToId = action.assignedTo
+		const assignedAgentsProject = getProjectByAgentId(assignedToId)
+		if (!assignedAgentsProject || assignedAgentsProject.id !== project.id) {
+			this.agent.interrupt({
+				input: `Fairy ${assignedToId} is not in the same project as you. You may only assign tasks to your partner in the same duo project.`,
+			})
+			return
+		}
+
+		// todo don't allow them to assign to themselves for now
+
+		const bounds = helpers.removeOffsetFromBox({
+			x: action.x,
+			y: action.y,
+			w: action.w,
+			h: action.h,
+		})
+
+		createFairyTask({
+			id: action.taskId,
+			title: action.title,
+			text: action.text,
+			assignedTo: action.assignedTo,
+			projectId: project.id,
+			status: 'todo',
+			pageId: this.agent.editor.getCurrentPageId(),
+			x: bounds.x,
+			y: bounds.y,
+			w: bounds.w,
+			h: bounds.h,
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/CreatePageActionUtil.ts b/apps/dotcom/client/src/fairy/actions/CreatePageActionUtil.ts
new file mode 100644
index 000000000000..9ae37a40fda0
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/CreatePageActionUtil.ts
@@ -0,0 +1,68 @@
+import { CreatePageAction, Streaming } from '@tldraw/fairy-shared'
+import { PageRecordType } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class CreatePageActionUtil extends AgentActionUtil<CreatePageAction> {
+	static override type = 'create-page' as const
+
+	override getInfo(action: Streaming<CreatePageAction>) {
+		return {
+			icon: 'note' as const,
+			description: action.intent ?? `Creating page: ${action.pageName}`,
+		}
+	}
+
+	override applyAction(action: Streaming<CreatePageAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+		const { editor } = this.agent
+
+		// Check if we're in readonly mode
+		if (editor.getIsReadonly()) {
+			this.agent.schedule({
+				data: ['I cannot create pages in readonly mode.'],
+			})
+			return
+		}
+
+		// Check if we've reached the max pages limit
+		const pages = editor.getPages()
+		if (pages.length >= editor.options.maxPages) {
+			this.agent.schedule({
+				data: [
+					`I cannot create more pages. The maximum number of pages (${editor.options.maxPages}) has been reached.`,
+				],
+			})
+			return
+		}
+
+		// Check if a page with this name already exists
+		const existingPage = pages.find((page) => page.name === action.pageName)
+		if (existingPage) {
+			this.agent.schedule({
+				data: [`A page named "${action.pageName}" already exists.`],
+			})
+			return
+		}
+
+		// Create the new page
+		editor.run(() => {
+			editor.markHistoryStoppingPoint('creating page')
+			const newPageId = PageRecordType.createId()
+			editor.createPage({ name: action.pageName, id: newPageId })
+
+			// If switchToPage is true, navigate to the new page
+			if (action.switchToPage) {
+				editor.setCurrentPage(newPageId)
+
+				// Update the fairy's current page ID
+				this.agent.$fairyEntity.update((f) => (f ? { ...f, currentPageId: newPageId } : f))
+
+				// Move the fairy to the center of the viewport on the new page
+				const center = editor.getViewportPageBounds().center
+				this.agent.moveToPosition(center)
+			}
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/CreateProjectTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/CreateProjectTaskActionUtil.ts
new file mode 100644
index 000000000000..9fb7db32f5a9
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/CreateProjectTaskActionUtil.ts
@@ -0,0 +1,58 @@
+import { CreateProjectTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { getProjectByAgentId } from '../FairyProjects'
+import { createFairyTask } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+// Creates a task for a project with a specifiable assignedTo id
+export class CreateProjectTaskActionUtil extends AgentActionUtil<CreateProjectTaskAction> {
+	static override type = 'create-project-task' as const
+
+	override getInfo(action: Streaming<CreateProjectTaskAction>) {
+		const label = action.complete ? 'Created project task' : 'Creating project task'
+		return {
+			icon: 'note' as const,
+			description: `${label}: ${action.text}`,
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<CreateProjectTaskAction>, helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const project = this.agent.getProject()
+		if (!project) return // todo error
+
+		const assignedToId = action.assignedTo
+		const assignedAgentsProject = getProjectByAgentId(assignedToId)
+		if (!assignedAgentsProject || assignedAgentsProject.id !== project.id) {
+			this.agent.interrupt({
+				input: `Fairy ${assignedToId} is not in the same project as you. You may only assign tasks to fairies in the same project.`,
+			})
+			return
+		}
+
+		// todo don't allow them to assign to themselves for now
+
+		const bounds = helpers.removeOffsetFromBox({
+			x: action.x,
+			y: action.y,
+			w: action.w,
+			h: action.h,
+		})
+
+		createFairyTask({
+			id: action.taskId,
+			title: action.title,
+			text: action.text,
+			assignedTo: action.assignedTo,
+			projectId: project.id,
+			status: 'todo',
+			pageId: this.agent.editor.getCurrentPageId(),
+			x: bounds.x,
+			y: bounds.y,
+			w: bounds.w,
+			h: bounds.h,
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/CreateSoloTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/CreateSoloTaskActionUtil.ts
new file mode 100644
index 000000000000..8207452db775
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/CreateSoloTaskActionUtil.ts
@@ -0,0 +1,42 @@
+import { CreateTaskAction as CreateSoloTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { createFairyTask } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+// Creates a task for themselves
+export class CreateSoloTaskActionUtil extends AgentActionUtil<CreateSoloTaskAction> {
+	static override type = 'create-task' as const
+
+	override getInfo(action: Streaming<CreateSoloTaskAction>) {
+		const label = action.complete ? 'Created task' : 'Creating task'
+		return {
+			icon: 'note' as const,
+			description: `${label}: ${action.text}`,
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<CreateSoloTaskAction>, helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const bounds = helpers.removeOffsetFromBox({
+			x: action.x,
+			y: action.y,
+			w: action.w,
+			h: action.h,
+		})
+
+		createFairyTask({
+			id: action.taskId,
+			title: action.title,
+			text: action.text,
+			assignedTo: this.agent.id,
+			status: 'todo',
+			pageId: this.agent.editor.getCurrentPageId(),
+			x: bounds.x,
+			y: bounds.y,
+			w: bounds.w,
+			h: bounds.h,
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/DeleteActionUtil.ts b/apps/dotcom/client/src/fairy/actions/DeleteActionUtil.ts
new file mode 100644
index 000000000000..3337b4a27f12
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/DeleteActionUtil.ts
@@ -0,0 +1,38 @@
+import { DeleteAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class DeleteActionUtil extends AgentActionUtil<DeleteAction> {
+	static override type = 'delete' as const
+
+	override getInfo(action: Streaming<DeleteAction>) {
+		return {
+			icon: 'trash' as const,
+			description: action.intent ?? '',
+			//canGroup: (other: Streaming<BaseAgentAction>) => other._type === 'delete',
+		}
+	}
+
+	override sanitizeAction(action: Streaming<DeleteAction>, helpers: AgentHelpers) {
+		if (!action.complete) return action
+
+		const shapeId = helpers.ensureShapeIdExists(action.shapeId)
+		if (!shapeId) return null
+
+		action.shapeId = shapeId
+		return action
+	}
+
+	override applyAction(action: Streaming<DeleteAction>) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const shapeId = `shape:${action.shapeId}` as TLShapeId
+		const shape = this.agent.editor.getShape(shapeId)
+		if (!shape) return
+
+		this.agent.editor.deleteShape(shapeId)
+		this.agent.moveToPosition({ x: shape.x, y: shape.y })
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/DirectToStartDuoTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/DirectToStartDuoTaskActionUtil.ts
new file mode 100644
index 000000000000..abfdfb398131
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/DirectToStartDuoTaskActionUtil.ts
@@ -0,0 +1,84 @@
+import { AgentRequest, DirectToStartDuoTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { $fairyAgentsAtom } from '../fairy-agent/agent/fairyAgentsAtom'
+import { assignFairyToTask, getFairyTaskById, setFairyTaskStatus } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class DirectToStartDuoTaskActionUtil extends AgentActionUtil<DirectToStartDuoTaskAction> {
+	static override type = 'direct-to-start-duo-task' as const
+
+	override getInfo(action: Streaming<DirectToStartDuoTaskAction>) {
+		let otherFairyName = 'your partner'
+
+		if (action.complete) {
+			const otherFairy = $fairyAgentsAtom
+				.get(this.editor)
+				.find((fairy) => fairy.id === action.otherFairyId)
+			otherFairyName = otherFairy ? otherFairy.$fairyConfig.get().name : 'your partner'
+		}
+
+		const text = action.complete
+			? `Directed ${otherFairyName} to start task ${action.taskId}.`
+			: `Directing ${otherFairyName} to start task ${action.taskId}...`
+
+		return {
+			icon: 'pencil' as const,
+			description: text,
+		}
+	}
+
+	override applyAction(action: Streaming<DirectToStartDuoTaskAction>) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const { otherFairyId, taskId } = action
+
+		const project = this.agent.getProject()
+		if (!project) return // shouldn't be possible
+
+		const otherFairy = $fairyAgentsAtom.get(this.editor).find((fairy) => fairy.id === otherFairyId)
+		if (!otherFairy) {
+			this.agent.interrupt({
+				input: `Fairy ${otherFairyId} not found. Please take another look at the fairy list and try again.`,
+			})
+			return
+		}
+
+		const task = getFairyTaskById(taskId)
+		if (!task) {
+			this.agent.interrupt({
+				input: `Task ${taskId} not found. Please take another look at the task list and try again.`,
+			})
+			return
+		}
+
+		if (task.projectId !== project.id) {
+			this.agent.interrupt({
+				input: `Task ${taskId} is not in the same project as you. Please take another look at the task list and try again.`,
+			})
+			return
+		}
+
+		assignFairyToTask(taskId, otherFairyId, $fairyAgentsAtom.get(this.editor))
+		setFairyTaskStatus(taskId, 'in-progress')
+
+		const otherFairyPrompt: Partial<AgentRequest> = {
+			messages: [`You have been asked to complete task ${taskId}. Please complete it.`],
+			source: 'other-agent',
+		}
+		if (
+			task.x !== undefined &&
+			task.y !== undefined &&
+			task.w !== undefined &&
+			task.h !== undefined
+		) {
+			otherFairyPrompt.bounds = {
+				x: task.x,
+				y: task.y,
+				w: task.w,
+				h: task.h,
+			}
+		}
+
+		otherFairy.interrupt({ mode: 'working-drone', input: otherFairyPrompt })
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/DirectToStartTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/DirectToStartTaskActionUtil.ts
new file mode 100644
index 000000000000..6b371b86bfce
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/DirectToStartTaskActionUtil.ts
@@ -0,0 +1,84 @@
+import { AgentRequest, DirectToStartTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { $fairyAgentsAtom } from '../fairy-agent/agent/fairyAgentsAtom'
+import { assignFairyToTask, getFairyTaskById, setFairyTaskStatus } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class DirectToStartTaskActionUtil extends AgentActionUtil<DirectToStartTaskAction> {
+	static override type = 'direct-to-start-project-task' as const
+
+	override getInfo(action: Streaming<DirectToStartTaskAction>) {
+		let otherFairyName = 'a fairy'
+
+		if (action.complete) {
+			const otherFairy = $fairyAgentsAtom
+				.get(this.editor)
+				.find((fairy) => fairy.id === action.otherFairyId)
+			otherFairyName = otherFairy ? otherFairy.$fairyConfig.get().name : 'a fairy'
+		}
+
+		const text = action.complete
+			? `Directed ${otherFairyName} to start task ${action.taskId}.`
+			: `Directing ${otherFairyName} to start task ${action.taskId}...`
+
+		return {
+			icon: 'pencil' as const,
+			description: text,
+		}
+	}
+
+	override applyAction(action: Streaming<DirectToStartTaskAction>) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const { otherFairyId, taskId } = action
+
+		const project = this.agent.getProject()
+		if (!project) return // shouldn't be possible
+
+		const otherFairy = $fairyAgentsAtom.get(this.editor).find((fairy) => fairy.id === otherFairyId)
+		if (!otherFairy) {
+			this.agent.interrupt({
+				input: `Fairy ${otherFairyId} not found. Please take another look at the fairy list and try again.`,
+			})
+			return
+		}
+
+		const task = getFairyTaskById(taskId)
+		if (!task) {
+			this.agent.interrupt({
+				input: `Task ${taskId} not found. Please take another look at the task list and try again.`,
+			})
+			return
+		}
+
+		if (task.projectId !== project.id) {
+			this.agent.interrupt({
+				input: `Task ${taskId} is not in the same project as you. Please take another look at the task list and try again.`,
+			})
+			return
+		}
+
+		assignFairyToTask(taskId, otherFairyId, $fairyAgentsAtom.get(this.editor))
+		setFairyTaskStatus(taskId, 'in-progress')
+
+		const otherFairyPrompt: Partial<AgentRequest> = {
+			messages: [`You have been asked to complete task ${taskId}. Please complete it.`],
+			source: 'other-agent',
+		}
+		if (
+			task.x !== undefined &&
+			task.y !== undefined &&
+			task.w !== undefined &&
+			task.h !== undefined
+		) {
+			otherFairyPrompt.bounds = {
+				x: task.x,
+				y: task.y,
+				w: task.w,
+				h: task.h,
+			}
+		}
+
+		otherFairy.interrupt({ mode: 'working-drone', input: otherFairyPrompt })
+	}
+}
diff --git a/packages/fairy-shared/src/actions/DistributeActionUtil.ts b/apps/dotcom/client/src/fairy/actions/DistributeActionUtil.ts
similarity index 53%
rename from packages/fairy-shared/src/actions/DistributeActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/DistributeActionUtil.ts
index 43dfecd94905..1a1bed0fd22d 100644
--- a/packages/fairy-shared/src/actions/DistributeActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/DistributeActionUtil.ts
@@ -1,33 +1,11 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const DistributeAction = z
-	.object({
-		_type: z.literal('distribute'),
-		direction: z.enum(['horizontal', 'vertical']),
-		intent: z.string(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({
-		title: 'Distribute',
-		description: 'The fairy distributes shapes horizontally or vertically.',
-	})
-
-type DistributeAction = z.infer<typeof DistributeAction>
+import { DistributeAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class DistributeActionUtil extends AgentActionUtil<DistributeAction> {
 	static override type = 'distribute' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('distribute')) {
-			return null
-		}
-		return DistributeAction
-	}
-
 	override getInfo(action: Streaming<DistributeAction>) {
 		return {
 			icon: 'cursor' as const,
diff --git a/apps/dotcom/client/src/fairy/actions/EndCurrentProjectActionUtil.ts b/apps/dotcom/client/src/fairy/actions/EndCurrentProjectActionUtil.ts
new file mode 100644
index 000000000000..456efe70d200
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/EndCurrentProjectActionUtil.ts
@@ -0,0 +1,69 @@
+import { EndCurrentProjectAction, Streaming } from '@tldraw/fairy-shared'
+import { deleteProject } from '../FairyProjects'
+import { getFairyTasksByProjectId } from '../FairyTaskList'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyAgentsAtom } from '../fairy-agent/agent/fairyAgentsAtom'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class EndCurrentProjectActionUtil extends AgentActionUtil<EndCurrentProjectAction> {
+	static override type = 'end-project' as const
+
+	override getInfo(action: Streaming<EndCurrentProjectAction>) {
+		return {
+			icon: 'note' as const,
+			description: action.complete ? 'Ended current project' : 'Ending current project...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<EndCurrentProjectAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const project = this.agent.getProject()
+		if (!project) return // todo error
+
+		const membersIds = project.members.map((member) => member.id)
+		const memberAgents = $fairyAgentsAtom
+			.get(this.editor)
+			.filter((agent) => membersIds.includes(agent.id))
+
+		const completedTasks = getFairyTasksByProjectId(project.id).filter(
+			(task) => task.status === 'done'
+		)
+
+		memberAgents.forEach((memberAgent) => {
+			const otherMemberIds = memberAgents
+				.map((agent) => agent.id)
+				.filter((id) => id !== memberAgent.id)
+
+			if (memberAgent.id === this.agent.id) {
+				memberAgent.$chatHistory.update((prev) => [
+					...prev,
+					{
+						type: 'memory-transition',
+						memoryLevel: 'project',
+						message: `I led and completed the "${project.title}" project with ${otherMemberIds.length} other fairy(s): ${otherMemberIds.join(', ')}`,
+					},
+				])
+			}
+
+			const memberCompletedTasks = completedTasks.filter(
+				(task) => task.assignedTo === memberAgent.id
+			)
+			if (memberCompletedTasks.length > 0) {
+				memberAgent.$chatHistory.update((prev) => [
+					...prev,
+					{
+						type: 'memory-transition',
+						memoryLevel: 'project',
+						message: `I completed ${memberCompletedTasks.length} tasks as part of the "${project.title}" project, with ${otherMemberIds.length} other fairy(s): ${otherMemberIds.join(', ')}`,
+					},
+				])
+			}
+			memberAgent.interrupt({ mode: 'idling', input: null })
+		})
+
+		deleteProject(project.id)
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/EndDuoProjectActionUtil.ts b/apps/dotcom/client/src/fairy/actions/EndDuoProjectActionUtil.ts
new file mode 100644
index 000000000000..b97604cb9855
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/EndDuoProjectActionUtil.ts
@@ -0,0 +1,66 @@
+import { EndDuoProjectAction, Streaming } from '@tldraw/fairy-shared'
+import { deleteProject } from '../FairyProjects'
+import { getFairyTasksByProjectId } from '../FairyTaskList'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyAgentsAtom } from '../fairy-agent/agent/fairyAgentsAtom'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class EndDuoProjectActionUtil extends AgentActionUtil<EndDuoProjectAction> {
+	static override type = 'end-duo-project' as const
+
+	override getInfo(action: Streaming<EndDuoProjectAction>) {
+		return {
+			icon: 'note' as const,
+			description: action.complete ? 'Ended duo project' : 'Ending duo project...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<EndDuoProjectAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const project = this.agent.getProject()
+		if (!project) return // todo error
+
+		const membersIds = project.members.map((member) => member.id)
+		const memberAgents = $fairyAgentsAtom
+			.get(this.editor)
+			.filter((agent) => membersIds.includes(agent.id))
+
+		const completedTasks = getFairyTasksByProjectId(project.id).filter(
+			(task) => task.status === 'done'
+		)
+
+		memberAgents.forEach((memberAgent) => {
+			if (memberAgent.id === this.agent.id) {
+				memberAgent.$chatHistory.update((prev) => [
+					...prev,
+					{
+						type: 'memory-transition',
+						memoryLevel: 'project',
+						message: `I collaborated with my partner and completed the "${project.title}" duo project`,
+					},
+				])
+			} else {
+				// The partner
+				const partnerCompletedTasks = completedTasks.filter(
+					(task) => task.assignedTo === memberAgent.id
+				)
+				if (partnerCompletedTasks.length > 0) {
+					memberAgent.$chatHistory.update((prev) => [
+						...prev,
+						{
+							type: 'memory-transition',
+							memoryLevel: 'project',
+							message: `I completed ${partnerCompletedTasks.length} tasks as part of the "${project.title}" duo project with my partner`,
+						},
+					])
+				}
+			}
+			memberAgent.interrupt({ mode: 'idling', input: null })
+		})
+
+		deleteProject(project.id)
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/FlyToBoundsActionUtil.ts b/apps/dotcom/client/src/fairy/actions/FlyToBoundsActionUtil.ts
new file mode 100644
index 000000000000..5eb671a99fcc
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/FlyToBoundsActionUtil.ts
@@ -0,0 +1,38 @@
+import { FlyToBoundsAction, Streaming } from '@tldraw/fairy-shared'
+import { Box } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class FlyToBoundsActionUtil extends AgentActionUtil<FlyToBoundsAction> {
+	static override type = 'fly-to-bounds' as const
+
+	override getInfo(action: Streaming<FlyToBoundsAction>) {
+		const text = action.intent?.startsWith('#') ? `\n\n${action.intent}` : action.intent
+		return {
+			icon: 'eye' as const,
+			description: `${text ?? ''}`,
+		}
+	}
+
+	override applyAction(action: Streaming<FlyToBoundsAction>, helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const bounds = helpers.removeOffsetFromBox({
+			x: action.x,
+			y: action.y,
+			w: action.w,
+			h: action.h,
+		})
+
+		this.agent.moveToPosition(Box.From(bounds).center)
+		this.agent.interrupt({
+			input: {
+				bounds,
+				messages: [
+					`Just flew to new area with the intent: ${action.intent}. Can now see the new area at (${bounds.x}, ${bounds.y}) and is ${bounds.w}x${bounds.h} in size.`,
+				],
+			},
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/LabelActionUtil.ts b/apps/dotcom/client/src/fairy/actions/LabelActionUtil.ts
new file mode 100644
index 000000000000..6b715b4b815a
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/LabelActionUtil.ts
@@ -0,0 +1,69 @@
+import { LabelAction, Streaming } from '@tldraw/fairy-shared'
+import { ExtractShapeByProps, TLRichText, TLShape, TLShapeId, toRichText } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+type ShapeWithRichText = ExtractShapeByProps<{ richText: TLRichText }>
+
+function isShapeWithRichText(shape: TLShape | null | undefined): shape is ShapeWithRichText {
+	return !!(shape && 'richText' in shape.props)
+}
+
+function assertShapeWithRichText(
+	shape: TLShape | null | undefined
+): asserts shape is ShapeWithRichText {
+	if (!isShapeWithRichText(shape)) {
+		throw new Error('Shape is not a valid ShapeWithRichText')
+	}
+}
+
+export class LabelActionUtil extends AgentActionUtil<LabelAction> {
+	static override type = 'label' as const
+
+	override getInfo(action: Streaming<LabelAction>) {
+		return {
+			icon: 'pencil' as const,
+			description: action.intent ?? '',
+		}
+	}
+
+	override sanitizeAction(action: Streaming<LabelAction>, helpers: AgentHelpers) {
+		if (!action.complete) return action
+
+		const shapeId = helpers.ensureShapeIdExists(action.shapeId)
+		if (!shapeId || !this.agent?.editor) {
+			return null
+		}
+		const shape = this.agent.editor.getShape(`shape:${shapeId}` as TLShapeId)
+		if (!shape) {
+			return null
+		}
+		if (!isShapeWithRichText(shape)) {
+			console.warn(`Shape type "${shape.type}" does not support richText labels`)
+			return null
+		}
+		action.shapeId = shapeId
+		return action
+	}
+
+	override applyAction(action: Streaming<LabelAction>) {
+		if (!action.complete) return
+		if (!this.agent) return
+		const { editor } = this.agent
+
+		const shapeId = `shape:${action.shapeId}` as TLShapeId
+		const shape = editor.getShape(shapeId)
+		assertShapeWithRichText(shape)
+
+		editor.updateShape({
+			id: shapeId,
+			type: shape.type,
+			props: { richText: toRichText(action.text ?? '') },
+		})
+
+		this.agent.moveToPosition({
+			x: shape.x,
+			y: shape.y,
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/MarkDroneTaskDoneActionUtil.ts b/apps/dotcom/client/src/fairy/actions/MarkDroneTaskDoneActionUtil.ts
new file mode 100644
index 000000000000..4948c1873658
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/MarkDroneTaskDoneActionUtil.ts
@@ -0,0 +1,38 @@
+import { MarkDroneTaskDoneAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks, setFairyTaskStatusAndNotifyCompletion } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class MarkDroneTaskDoneActionUtil extends AgentActionUtil<MarkDroneTaskDoneAction> {
+	static override type = 'mark-my-task-done' as const
+
+	override getInfo(action: Streaming<MarkDroneTaskDoneAction>) {
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Completed task: ${task?.text ?? action.taskId}`
+				: 'Completing task...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<MarkDroneTaskDoneAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+		if (!task) return
+
+		setFairyTaskStatusAndNotifyCompletion(action.taskId, 'done', this.editor)
+		this.agent.$chatHistory.update((prev) => [
+			...prev,
+			{
+				type: 'memory-transition',
+				memoryLevel: 'project',
+				message: `I marked task ${action.taskId} as done: ${task.text}`,
+			},
+		])
+		this.agent.interrupt({ mode: 'standing-by', input: null })
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/MarkDuoTaskDoneActionUtil.ts b/apps/dotcom/client/src/fairy/actions/MarkDuoTaskDoneActionUtil.ts
new file mode 100644
index 000000000000..05e58db16e52
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/MarkDuoTaskDoneActionUtil.ts
@@ -0,0 +1,43 @@
+import { MarkDuoTaskDoneAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks, setFairyTaskStatusAndNotifyCompletion } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class MarkDuoTaskDoneActionUtil extends AgentActionUtil<MarkDuoTaskDoneAction> {
+	static override type = 'mark-duo-task-done' as const
+
+	override getInfo(action: Streaming<MarkDuoTaskDoneAction>) {
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Completed duo task: ${task?.text ?? action.taskId}`
+				: 'Completing duo task...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<MarkDuoTaskDoneAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+		if (!task) return
+
+		setFairyTaskStatusAndNotifyCompletion(action.taskId, 'done', this.editor)
+		this.agent.$chatHistory.update((prev) => [
+			...prev,
+			{
+				type: 'memory-transition',
+				memoryLevel: 'project',
+				message: `I marked task ${action.taskId} as done: ${task.text}`,
+			},
+		])
+
+		// Return to duo-orchestrating-active mode after completing a task
+		this.agent.interrupt({
+			mode: 'duo-orchestrating-active',
+			input: { message: `I marked task ${action.taskId} as done: ${task.text}` },
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/MarkSoloTaskDoneActionUtil.ts b/apps/dotcom/client/src/fairy/actions/MarkSoloTaskDoneActionUtil.ts
new file mode 100644
index 000000000000..0e48a5349391
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/MarkSoloTaskDoneActionUtil.ts
@@ -0,0 +1,53 @@
+import { MarkSoloTaskDoneAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks, setFairyTaskStatusAndNotifyCompletion } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class MarkSoloTaskDoneActionUtil extends AgentActionUtil<MarkSoloTaskDoneAction> {
+	static override type = 'mark-task-done' as const
+
+	override getInfo(action: Streaming<MarkSoloTaskDoneAction>) {
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Completed task: ${task?.text ?? action.taskId}`
+				: 'Completing task...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<MarkSoloTaskDoneAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+		if (!task) return
+
+		setFairyTaskStatusAndNotifyCompletion(action.taskId, 'done', this.editor)
+		this.agent.$chatHistory.update((prev) => [
+			...prev,
+			{
+				type: 'memory-transition',
+				memoryLevel: 'fairy',
+				message: `I marked task ${action.taskId} as done: ${task.text}`,
+			},
+		])
+
+		const currentBounds = this.agent.$activeRequest.get()?.bounds
+		if (!currentBounds) return
+
+		this.agent.interrupt({
+			mode: 'soloing',
+			input: {
+				message: `I marked task ${action.taskId} as done: ${task.text}`,
+				bounds: {
+					x: task.x ?? currentBounds.x,
+					y: task.y ?? currentBounds.y,
+					w: task.w ?? currentBounds.w,
+					h: task.h ?? currentBounds.h,
+				},
+			},
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/MessageActionUtil.ts b/apps/dotcom/client/src/fairy/actions/MessageActionUtil.ts
new file mode 100644
index 000000000000..db8c72c60c16
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/MessageActionUtil.ts
@@ -0,0 +1,14 @@
+import { MessageAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class MessageActionUtil extends AgentActionUtil<MessageAction> {
+	static override type = 'message' as const
+
+	override getInfo(action: Streaming<MessageAction>) {
+		return {
+			description: action.text ?? '',
+			canGroup: () => false,
+			pose: 'thinking' as const,
+		}
+	}
+}
diff --git a/packages/fairy-shared/src/actions/MoveActionUtil.ts b/apps/dotcom/client/src/fairy/actions/MoveActionUtil.ts
similarity index 72%
rename from packages/fairy-shared/src/actions/MoveActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/MoveActionUtil.ts
index 795097e105cf..50e3e9ad9952 100644
--- a/packages/fairy-shared/src/actions/MoveActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/MoveActionUtil.ts
@@ -1,31 +1,11 @@
-import { TLShapeId, Vec } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const MoveAction = z
-	.object({
-		_type: z.literal('move'),
-		intent: z.string(),
-		shapeId: z.string(),
-		x: z.number(),
-		y: z.number(),
-	})
-	.meta({ title: 'Move', description: 'The fairy moves a shape to a new position.' })
-
-type MoveAction = z.infer<typeof MoveAction>
+import { MoveAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId, Vec } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class MoveActionUtil extends AgentActionUtil<MoveAction> {
 	static override type = 'move' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('move')) {
-			return null
-		}
-		return MoveAction
-	}
-
 	override getInfo(action: Streaming<MoveAction>) {
 		return {
 			icon: 'cursor' as const,
diff --git a/packages/fairy-shared/src/actions/PenActionUtil.ts b/apps/dotcom/client/src/fairy/actions/PenActionUtil.ts
similarity index 60%
rename from packages/fairy-shared/src/actions/PenActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/PenActionUtil.ts
index fdf47e77b502..e3da87d9ca1d 100644
--- a/packages/fairy-shared/src/actions/PenActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/PenActionUtil.ts
@@ -1,45 +1,11 @@
-import { createShapeId, TLDrawShape, TLDrawShapeSegment, Vec, VecModel } from '@tldraw/editor'
-import { last } from '@tldraw/utils'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { asColor, SimpleColor } from '../format/SimpleColor'
-import { convertSimpleFillToTldrawFill, SimpleFillSchema } from '../format/SimpleFill'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const PenAction = z
-	.object({
-		_type: z.literal('pen'),
-		color: SimpleColor,
-		closed: z.boolean(),
-		fill: SimpleFillSchema,
-		intent: z.string(),
-		points: z.array(
-			z.object({
-				x: z.number(),
-				y: z.number(),
-			})
-		),
-		style: z.enum(['smooth', 'straight']),
-	})
-	.meta({
-		title: 'Pen',
-		description:
-			'The fairy draws a freeform line with a pen. This is useful for drawing custom paths that are not available with the other available shapes. The "smooth" style will automatically smooth the line between points. The "straight" style will render a straight line between points. The "closed" property will determine if the drawn line gets automatically closed to form a complete shape or not. Remember that the pen will be *down* until the action is over. If you want to lift up the pen, start a new pen action.',
-	})
-
-type PenAction = z.infer<typeof PenAction>
+import { PenAction, Streaming, asColor, convertFocusFillToTldrawFill } from '@tldraw/fairy-shared'
+import { TLDrawShapeSegment, Vec, VecModel, createShapeId, last } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class PenActionUtil extends AgentActionUtil<PenAction> {
 	static override type = 'pen' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('pen')) {
-			return null
-		}
-		return PenAction
-	}
-
 	override getInfo(action: Streaming<PenAction>) {
 		return {
 			icon: 'pencil' as const,
@@ -111,14 +77,14 @@ export class PenActionUtil extends AgentActionUtil<PenAction> {
 			},
 		]
 
-		this.agent.editor.createShape<TLDrawShape>({
+		this.agent.editor.createShape({
 			id: createShapeId(),
 			type: 'draw',
 			x: minX,
 			y: minY,
 			props: {
 				color: asColor(action.color ?? 'black'),
-				fill: convertSimpleFillToTldrawFill(action.fill ?? 'none'),
+				fill: convertFocusFillToTldrawFill(action.fill ?? 'none'),
 				dash: 'draw',
 				size: 's',
 				segments,
diff --git a/apps/dotcom/client/src/fairy/actions/PersonalTodoListActionUtil.ts b/apps/dotcom/client/src/fairy/actions/PersonalTodoListActionUtil.ts
new file mode 100644
index 000000000000..b175dc535873
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/PersonalTodoListActionUtil.ts
@@ -0,0 +1,44 @@
+import { PersonalTodoListAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class PersonalTodoListActionUtil extends AgentActionUtil<PersonalTodoListAction> {
+	static override type = 'update-personal-todo-list' as const
+
+	override getInfo(action: Streaming<PersonalTodoListAction>) {
+		if (!action.complete) {
+			return {
+				icon: 'note' as const,
+				description: 'Updating personal todo list...',
+				pose: 'thinking' as const,
+			}
+		}
+
+		if (action.id) {
+			return {
+				icon: 'note' as const,
+				description: `Updated personal todo item ${action.id} with status "${action.status}"`,
+				pose: 'thinking' as const,
+			}
+		} else {
+			return {
+				icon: 'note' as const,
+				description: `Created new personal todo item: "${action.text}"`,
+				pose: 'thinking' as const,
+			}
+		}
+	}
+
+	override applyAction(action: Streaming<PersonalTodoListAction>) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const { id, text, status } = action
+
+		const index = this.agent.$personalTodoList.get().findIndex((item) => item.id === id)
+		if (index === -1) {
+			this.agent.addPersonalTodo(id, text)
+		} else {
+			this.agent.updateTodo({ id, text, status })
+		}
+	}
+}
diff --git a/packages/fairy-shared/src/actions/PlaceActionUtil.ts b/apps/dotcom/client/src/fairy/actions/PlaceActionUtil.ts
similarity index 78%
rename from packages/fairy-shared/src/actions/PlaceActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/PlaceActionUtil.ts
index 500f8902b2fe..4bbe7c1f7916 100644
--- a/packages/fairy-shared/src/actions/PlaceActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/PlaceActionUtil.ts
@@ -1,34 +1,11 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const PlaceAction = z
-	.object({
-		_type: z.literal('place'),
-		align: z.enum(['start', 'center', 'end']),
-		alignOffset: z.number(),
-		intent: z.string(),
-		referenceShapeId: z.string(),
-		side: z.enum(['top', 'bottom', 'left', 'right']),
-		sideOffset: z.number(),
-		shapeId: z.string(),
-	})
-	.meta({ title: 'Place', description: 'The fairy places a shape relative to another shape.' })
-
-type PlaceAction = z.infer<typeof PlaceAction>
+import { PlaceAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class PlaceActionUtil extends AgentActionUtil<PlaceAction> {
 	static override type = 'place' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('place')) {
-			return null
-		}
-		return PlaceAction
-	}
-
 	override getInfo(action: Streaming<PlaceAction>) {
 		return {
 			icon: 'target' as const,
diff --git a/packages/fairy-shared/src/actions/ResizeActionUtil.ts b/apps/dotcom/client/src/fairy/actions/ResizeActionUtil.ts
similarity index 57%
rename from packages/fairy-shared/src/actions/ResizeActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/ResizeActionUtil.ts
index f7a651c7af6f..751216974097 100644
--- a/packages/fairy-shared/src/actions/ResizeActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/ResizeActionUtil.ts
@@ -1,37 +1,11 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const ResizeAction = z
-	.object({
-		_type: z.literal('resize'),
-		intent: z.string(),
-		originX: z.number(),
-		originY: z.number(),
-		scaleX: z.number(),
-		scaleY: z.number(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({
-		title: 'Resize',
-		description:
-			'The fairy resizes one or more shapes, with the resize operation being performed relative to an origin point.',
-	})
-
-type ResizeAction = z.infer<typeof ResizeAction>
+import { ResizeAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class ResizeActionUtil extends AgentActionUtil<ResizeAction> {
 	static override type = 'resize' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('resize')) {
-			return null
-		}
-		return ResizeAction
-	}
-
 	override getInfo(action: Streaming<ResizeAction>) {
 		return {
 			icon: 'cursor' as const,
diff --git a/apps/dotcom/client/src/fairy/actions/ReviewActionUtil.ts b/apps/dotcom/client/src/fairy/actions/ReviewActionUtil.ts
new file mode 100644
index 000000000000..cbe429a74c4d
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/ReviewActionUtil.ts
@@ -0,0 +1,53 @@
+import { ReviewAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class ReviewActionUtil extends AgentActionUtil<ReviewAction> {
+	static override type = 'review' as const
+
+	override getInfo(action: Streaming<ReviewAction>) {
+		const label = action.complete ? 'Review' : 'Reviewing'
+		const text = action.intent?.startsWith('#') ? `\n\n${action.intent}` : action.intent
+		const description = `**${label}:** ${text ?? ''}`
+		// const description = `${text ?? ''}`
+
+		return {
+			icon: 'search' as const,
+			description,
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<ReviewAction>, helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const reviewBounds = helpers.removeOffsetFromBox({
+			x: action.x,
+			y: action.y,
+			w: action.w,
+			h: action.h,
+		})
+
+		this.agent.schedule({
+			bounds: reviewBounds,
+			message: getReviewMessage(action.intent),
+		})
+
+		const fairy = this.agent.$fairyEntity.get()
+		if (!fairy) return
+		if (!action.complete) {
+			this.agent.$fairyEntity.set({ ...fairy, pose: 'thinking' })
+		} else {
+			this.agent.$fairyEntity.set({ ...fairy, pose: 'idle' })
+		}
+	}
+}
+
+function getReviewMessage(intent: string) {
+	return `Examine the actions that you (the agent) took since the most recent user message, with the intent: "${intent}". What's next?
+
+- Is there still more work to do? If so, continue it.
+- Is the task supposed to be complete? If so, it's time to review the results of that. Did you do what the user asked for? Did the plan work? Think through your findings and pay close attention to the image, because that's what you can see right now. If you make any corrections, let the user know what you did and why. If no corrections are needed, there's no need to say anything.
+- Make sure to reference your previous actions (denoted by [ACTION]) in order to see what you were intending to do.`
+}
diff --git a/packages/fairy-shared/src/actions/RotateActionUtil.ts b/apps/dotcom/client/src/fairy/actions/RotateActionUtil.ts
similarity index 56%
rename from packages/fairy-shared/src/actions/RotateActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/RotateActionUtil.ts
index 774d08dba837..cdabdc982008 100644
--- a/packages/fairy-shared/src/actions/RotateActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/RotateActionUtil.ts
@@ -1,36 +1,11 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const RotateAction = z
-	.object({
-		_type: z.literal('rotate'),
-		centerY: z.number(),
-		degrees: z.number(),
-		intent: z.string(),
-		originX: z.number(),
-		originY: z.number(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({
-		title: 'Rotate',
-		description: 'The fairy rotates one or more shapes around an origin point.',
-	})
-
-type RotateAction = z.infer<typeof RotateAction>
+import { RotateAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class RotateActionUtil extends AgentActionUtil<RotateAction> {
 	static override type = 'rotate' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('rotate')) {
-			return null
-		}
-		return RotateAction
-	}
-
 	override getInfo(action: Streaming<RotateAction>) {
 		return {
 			icon: 'cursor' as const,
diff --git a/packages/fairy-shared/src/actions/SendToBackActionUtil.ts b/apps/dotcom/client/src/fairy/actions/SendToBackActionUtil.ts
similarity index 50%
rename from packages/fairy-shared/src/actions/SendToBackActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/SendToBackActionUtil.ts
index 66c56d0c93cd..213716aaa607 100644
--- a/packages/fairy-shared/src/actions/SendToBackActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/SendToBackActionUtil.ts
@@ -1,32 +1,10 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const SendToBackAction = z
-	.object({
-		_type: z.literal('sendToBack'),
-		intent: z.string(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({
-		title: 'Send to Back',
-		description:
-			'The fairy sends one or more shapes to the back so that they appear behind everything else.',
-	})
-
-type SendToBackAction = z.infer<typeof SendToBackAction>
+import { SendToBackAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class SendToBackActionUtil extends AgentActionUtil<SendToBackAction> {
-	static override type = 'sendToBack' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('sendToBack')) {
-			return null
-		}
-		return SendToBackAction
-	}
+	static override type = 'send-to-back' as const
 
 	override getInfo(action: Streaming<SendToBackAction>) {
 		return {
diff --git a/apps/dotcom/client/src/fairy/actions/StackActionUtil.ts b/apps/dotcom/client/src/fairy/actions/StackActionUtil.ts
new file mode 100644
index 000000000000..f93cda2a4216
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/StackActionUtil.ts
@@ -0,0 +1,39 @@
+import { StackAction, Streaming } from '@tldraw/fairy-shared'
+import { TLShapeId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class StackActionUtil extends AgentActionUtil<StackAction> {
+	static override type = 'stack' as const
+
+	override getInfo(action: Streaming<StackAction>) {
+		return {
+			icon: 'cursor' as const,
+			description: action.intent ?? '',
+		}
+	}
+
+	override sanitizeAction(action: Streaming<StackAction>, helpers: AgentHelpers) {
+		if (!action.complete) return action
+
+		action.shapeIds = helpers.ensureShapeIdsExist(action.shapeIds)
+
+		return action
+	}
+
+	override applyAction(action: Streaming<StackAction>) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		const shapeIds = action.shapeIds.map((id) => `shape:${id}` as TLShapeId)
+		this.agent.editor.stackShapes(shapeIds, action.direction, Math.min(action.gap, 1))
+
+		const bounds = this.agent.editor.getShapesPageBounds(shapeIds)
+
+		if (!bounds) {
+			return
+		}
+
+		this.agent.moveToPosition(bounds.center)
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/StartDuoProjectActionUtil.ts b/apps/dotcom/client/src/fairy/actions/StartDuoProjectActionUtil.ts
new file mode 100644
index 000000000000..d393752636fa
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/StartDuoProjectActionUtil.ts
@@ -0,0 +1,46 @@
+import { StartDuoProjectAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyProjects, getProjectByAgentId, updateProject } from '../FairyProjects'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class StartDuoProjectActionUtil extends AgentActionUtil<StartDuoProjectAction> {
+	static override type = 'start-duo-project' as const
+
+	override getInfo(action: Streaming<StartDuoProjectAction>) {
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Started duo project: ${action.projectName}`
+				: 'Starting duo project...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<StartDuoProjectAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		// Assumptions:
+		// FairyGroupChat already handles creating the project, assigning roles programmatically as well as prompting the duo orchestrator
+
+		const { projectName, projectDescription, projectColor, projectPlan } = action
+
+		const project = getProjectByAgentId(this.agent.id)
+		if (!project) return // todo error
+
+		const colorAlreadyChosen = $fairyProjects.get().some((p) => p.color === projectColor)
+		if (colorAlreadyChosen) {
+			this.agent.interrupt({
+				input: `The color ${projectColor} has already been chosen for another project. Please choose a different color.`,
+			})
+			return
+		}
+
+		updateProject(project.id, {
+			title: projectName,
+			description: projectDescription,
+			plan: projectPlan,
+			color: projectColor,
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/StartDuoTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/StartDuoTaskActionUtil.ts
new file mode 100644
index 000000000000..49b1b73e3544
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/StartDuoTaskActionUtil.ts
@@ -0,0 +1,71 @@
+import { StartDuoTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class StartDuoTaskActionUtil extends AgentActionUtil<StartDuoTaskAction> {
+	static override type = 'start-duo-task' as const
+
+	override getInfo(action: Streaming<StartDuoTaskAction>) {
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Started duo task: ${task?.text ?? action.taskId}`
+				: 'Starting duo task...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<StartDuoTaskAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+		if (!task) return
+
+		const project = this.agent.getProject()
+		if (!project) return
+
+		// In duo mode, the orchestrator can start tasks assigned to themselves or their partner
+		if (
+			task.assignedTo !== this.agent.id &&
+			task.assignedTo !== project.members.find((m) => m.id !== this.agent.id)?.id
+		) {
+			this.agent.interrupt({
+				input: `Task "${task.text}" with id ${action.taskId} is not assigned to you or your partner. Please take another look at the task list and try again.`,
+			})
+			return
+		}
+
+		// Make sure the task is actually assigned to me
+		if (task.assignedTo !== this.agent.id) {
+			this.agent.interrupt({
+				input: `Task "${task.text}" with id ${action.taskId} is not assigned to you. Please direct your partner to start the task, or start another task yourself.`,
+			})
+			return
+		}
+
+		$fairyTasks.update((tasks) =>
+			tasks.map((task) =>
+				task.id === action.taskId ? { ...task, status: 'in-progress' as const } : task
+			)
+		)
+
+		const currentBounds = this.agent.$activeRequest.get()?.bounds
+		if (!currentBounds) return
+
+		this.agent.interrupt({
+			mode: 'working-orchestrator',
+			input: {
+				messages: [`You have started working on task "${task.text}" with id ${task.id}.`],
+				bounds: {
+					x: task.x ?? currentBounds.x,
+					y: task.y ?? currentBounds.y,
+					w: task.w ?? currentBounds.w,
+					h: task.h ?? currentBounds.h,
+				},
+			},
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/StartProjectActionUtil.ts b/apps/dotcom/client/src/fairy/actions/StartProjectActionUtil.ts
new file mode 100644
index 000000000000..84e6a3672be8
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/StartProjectActionUtil.ts
@@ -0,0 +1,46 @@
+import { StartProjectAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyProjects, getProjectByAgentId, updateProject } from '../FairyProjects'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class StartProjectActionUtil extends AgentActionUtil<StartProjectAction> {
+	static override type = 'start-project' as const
+
+	override getInfo(action: Streaming<StartProjectAction>) {
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Started project: ${action.projectName}`
+				: 'Starting project...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<StartProjectAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+		if (!this.agent) return
+
+		// Assumptions:
+		// FairyGroupChat already handles creating the project, assigning roles programmatically as well as prompting the orchestrator
+
+		const { projectName, projectDescription, projectColor, projectPlan } = action
+
+		const project = getProjectByAgentId(this.agent.id)
+		if (!project) return // todo error
+
+		const colorAlreadyChosen = $fairyProjects.get().some((p) => p.color === projectColor)
+		if (colorAlreadyChosen) {
+			this.agent.interrupt({
+				input: `The color ${projectColor} has already been chosen for another project. Please choose a different color.`,
+			})
+			return
+		}
+
+		updateProject(project.id, {
+			title: projectName,
+			description: projectDescription,
+			plan: projectPlan,
+			color: projectColor,
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/StartSoloTaskActionUtil.ts b/apps/dotcom/client/src/fairy/actions/StartSoloTaskActionUtil.ts
new file mode 100644
index 000000000000..1c11c54f31e2
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/StartSoloTaskActionUtil.ts
@@ -0,0 +1,56 @@
+import { StartSoloTaskAction, Streaming } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks } from '../FairyTaskList'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class StartSoloTaskActionUtil extends AgentActionUtil<StartSoloTaskAction> {
+	static override type = 'start-task' as const
+
+	override getInfo(action: Streaming<StartSoloTaskAction>) {
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+
+		return {
+			icon: 'note' as const,
+			description: action.complete
+				? `Started task: ${task?.text ?? action.taskId}`
+				: 'Starting task...',
+			pose: 'thinking' as const,
+		}
+	}
+
+	override applyAction(action: Streaming<StartSoloTaskAction>, _helpers: AgentHelpers) {
+		if (!action.complete) return
+
+		const task = $fairyTasks.get().find((task) => task.id === action.taskId)
+		if (!task) return
+
+		if (task.assignedTo !== this.agent.id) {
+			this.agent.interrupt({
+				input: `Task "${task.text}" with id ${action.taskId} is not assigned to you. Please take another look at the task list and try again.`,
+			})
+			return
+		}
+
+		$fairyTasks.update((tasks) =>
+			tasks.map((task) =>
+				task.id === action.taskId ? { ...task, status: 'in-progress' as const } : task
+			)
+		)
+
+		const currentBounds = this.agent.$activeRequest.get()?.bounds
+		if (!currentBounds) return
+
+		this.agent.interrupt({
+			mode: 'working-solo',
+			input: {
+				messages: [`You have started working on task "${task.text}" with id ${task.id}.`],
+				bounds: {
+					x: task.x ?? currentBounds.x,
+					y: task.y ?? currentBounds.y,
+					w: task.w ?? currentBounds.w,
+					h: task.h ?? currentBounds.h,
+				},
+			},
+		})
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/actions/ThinkActionUtil.ts b/apps/dotcom/client/src/fairy/actions/ThinkActionUtil.ts
new file mode 100644
index 000000000000..b7d8a64cc332
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/actions/ThinkActionUtil.ts
@@ -0,0 +1,20 @@
+import { Streaming, ThinkAction } from '@tldraw/fairy-shared'
+import { AgentActionUtil } from './AgentActionUtil'
+
+export class ThinkActionUtil extends AgentActionUtil<ThinkAction> {
+	static override type = 'think' as const
+
+	override getInfo(action: Streaming<ThinkAction>) {
+		const time = Math.floor(action.time / 1000)
+		let summary = `Thought for ${time} seconds`
+		if (time === 0) summary = 'Thought for less than a second'
+		if (time === 1) summary = 'Thought for 1 second'
+
+		return {
+			icon: 'brain' as const,
+			description: action.text ?? (action.complete ? null : 'Thinking...'),
+			summary,
+			pose: 'thinking' as const,
+		}
+	}
+}
diff --git a/packages/fairy-shared/src/actions/UnknownActionUtil.ts b/apps/dotcom/client/src/fairy/actions/UnknownActionUtil.ts
similarity index 72%
rename from packages/fairy-shared/src/actions/UnknownActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/UnknownActionUtil.ts
index 64cea1789251..03789474decf 100644
--- a/packages/fairy-shared/src/actions/UnknownActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/UnknownActionUtil.ts
@@ -1,8 +1,6 @@
-import { BaseAgentAction } from '../types/BaseAgentAction'
+import { UnknownAction } from '@tldraw/fairy-shared'
 import { AgentActionUtil } from './AgentActionUtil'
 
-export type UnknownAction = BaseAgentAction<'unknown'>
-
 /**
  * This event util is used when the event type is unknown.
  * This usually happens because the event type has not finished streaming yet.
@@ -12,7 +10,6 @@ export class UnknownActionUtil extends AgentActionUtil<UnknownAction> {
 	static override type = 'unknown' as const
 
 	override getInfo() {
-		// Don't show anything in the UI for unknown actions
 		return {
 			pose: 'thinking' as const,
 		}
diff --git a/packages/fairy-shared/src/actions/UpdateActionUtil.ts b/apps/dotcom/client/src/fairy/actions/UpdateActionUtil.ts
similarity index 76%
rename from packages/fairy-shared/src/actions/UpdateActionUtil.ts
rename to apps/dotcom/client/src/fairy/actions/UpdateActionUtil.ts
index f43730bb37aa..e491acc15b1f 100644
--- a/packages/fairy-shared/src/actions/UpdateActionUtil.ts
+++ b/apps/dotcom/client/src/fairy/actions/UpdateActionUtil.ts
@@ -1,37 +1,16 @@
-import { TLBindingId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
 import {
 	convertFocusedShapeToTldrawShape,
 	convertSimpleIdToTldrawId,
-} from '../format/convertFocusedShapeToTldrawShape'
-import { FocusedShapeSchema } from '../format/FocusedShape'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const UpdateAction = z
-	.object({
-		_type: z.literal('update'),
-		intent: z.string(),
-		update: FocusedShapeSchema,
-	})
-	.meta({
-		title: 'Update',
-		description: 'The fairy updates an existing shape.',
-	})
-
-type UpdateAction = z.infer<typeof UpdateAction>
+	Streaming,
+	UpdateAction,
+} from '@tldraw/fairy-shared'
+import { TLBindingId } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { AgentActionUtil } from './AgentActionUtil'
 
 export class UpdateActionUtil extends AgentActionUtil<UpdateAction> {
 	static override type = 'update' as const
 
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('update')) {
-			return null
-		}
-		return UpdateAction
-	}
-
 	override getInfo(action: Streaming<UpdateAction>) {
 		return {
 			icon: 'cursor' as const,
@@ -43,7 +22,6 @@ export class UpdateActionUtil extends AgentActionUtil<UpdateAction> {
 		if (!action.complete) return action
 
 		const { update } = action
-
 		if (!update) return null
 
 		// Ensure the shape ID refers to a real shape
diff --git a/packages/fairy-shared/src/AgentHelpers.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/AgentHelpers.ts
similarity index 96%
rename from packages/fairy-shared/src/AgentHelpers.ts
rename to apps/dotcom/client/src/fairy/fairy-agent/agent/AgentHelpers.ts
index 78d0b77b2354..7cc8a14d1a05 100644
--- a/packages/fairy-shared/src/AgentHelpers.ts
+++ b/apps/dotcom/client/src/fairy/fairy-agent/agent/AgentHelpers.ts
@@ -1,9 +1,6 @@
-import { Editor } from '@tldraw/editor'
-import { BoxModel, TLShapeId, VecModel } from '@tldraw/tlschema'
-import { FocusedShape } from './format/FocusedShape'
-import { SimpleFill, SimpleFillSchema } from './format/SimpleFill'
-import { ContextItem } from './types/ContextItem'
-import { TldrawFairyAgent } from './types/TldrawFairyAgent'
+import { ContextItem, FocusFill, FocusFillSchema, FocusedShape } from '@tldraw/fairy-shared'
+import { BoxModel, Editor, TLShapeId, VecModel } from 'tldraw'
+import { FairyAgent } from './FairyAgent'
 
 /**
  * This class contains handles the transformations that happen throughout a
@@ -25,14 +22,14 @@ export class AgentHelpers {
 	/**
 	 * The agent that the this intance of AgentHelpers is for.
 	 */
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 
 	/**
 	 * The editor that the this intance of AgentHelpers is for.
 	 */
 	editor: Editor
 
-	constructor(agent: TldrawFairyAgent) {
+	constructor(agent: FairyAgent) {
 		this.agent = agent
 		this.editor = agent.editor
 		const origin = agent.$chatOrigin.get()
@@ -481,8 +478,8 @@ export class AgentHelpers {
 	 * Used for checking incoming data from the model.
 	 * @returns The simple fill, or null if the value is not a simple fill.
 	 */
-	ensureValueIsSimpleFill(value: any): SimpleFill | null {
-		const simpleFill = SimpleFillSchema.safeParse(value)
+	ensureValueIsSimpleFill(value: any): FocusFill | null {
+		const simpleFill = FocusFillSchema.safeParse(value)
 		if (simpleFill.success) {
 			return simpleFill.data
 		}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyAgent.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyAgent.ts
new file mode 100644
index 000000000000..68b5d96fa1c1
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyAgent.ts
@@ -0,0 +1,1835 @@
+import {
+	AgentAction,
+	AgentActionInfo,
+	AgentInput,
+	AgentModelName,
+	AgentPrompt,
+	AgentRequest,
+	BaseAgentPrompt,
+	ChatHistoryItem,
+	DEFAULT_MODEL_NAME,
+	FAIRY_VISION_DIMENSIONS,
+	FairyConfig,
+	FairyEntity,
+	FairyModeDefinition,
+	FairyPose,
+	FairyProject,
+	FairyProjectRole,
+	FairyTask,
+	FairyTodoItem,
+	FairyWaitCondition,
+	FairyWaitEvent,
+	FairyWork,
+	getFairyModeDefinition,
+	getModelPricing,
+	ModelNamePart,
+	PromptPart,
+	Streaming,
+	TIER_THRESHOLD,
+} from '@tldraw/fairy-shared'
+import {
+	Atom,
+	atom,
+	Box,
+	computed,
+	Computed,
+	Editor,
+	EditorAtom,
+	fetch,
+	react,
+	RecordsDiff,
+	reverseRecordsDiff,
+	structuredClone,
+	TLRecord,
+	VecModel,
+} from 'tldraw'
+import { TldrawApp } from '../../../tla/app/TldrawApp'
+import { FAIRY_WORKER } from '../../../utils/config'
+import { AgentActionUtil } from '../../actions/AgentActionUtil'
+import { $fairyIsApplyingAction } from '../../FairyIsApplyingAction'
+import { getProjectByAgentId } from '../../FairyProjects'
+import { $fairyTasks } from '../../FairyTaskList'
+import { getAgentActionUtilsRecord, getPromptPartUtilsRecord } from '../../FairyUtils'
+import { notifyAgentModeTransition } from '../../FairyWaitNotifications'
+import { PromptPartUtil } from '../../parts/PromptPartUtil'
+import { AgentHelpers } from './AgentHelpers'
+import { FairyAgentOptions } from './FairyAgentOptions'
+import { $fairyAgentsAtom, getFairyAgentById } from './fairyAgentsAtom'
+import { FAIRY_MODE_CHART } from './FairyModeNode'
+
+/**
+ * An agent that can be prompted to edit the canvas.
+ * Returned by the `useTldrawAgent` hook.
+ *
+ * @example
+ * ```tsx
+ * const agent = useTldrawAgent(editor)
+ * agent.prompt({ message: 'Draw a snowman' })
+ * ```
+ */
+export class FairyAgent {
+	/** The editor associated with this agent. */
+	editor: Editor
+	app: TldrawApp
+
+	/** An id to differentiate the agent from other agents. */
+	id: string
+
+	/** The fairy entity associated with this agent. */
+	$fairyEntity: Atom<FairyEntity>
+
+	/** The fairy configuration associated with this agent. */
+	$fairyConfig: Computed<FairyConfig>
+
+	/** A callback for when an error occurs. */
+	onError: (e: any) => void
+
+	/** A function to get the authentication token. */
+	getToken?: () => Promise<string | undefined>
+
+	/**
+	 * An atom containing the currently active request.
+	 * This is mainly used to render highlights and other UI elements.
+	 */
+	$activeRequest = atom<AgentRequest | null>('activeRequest', null)
+
+	/**
+	 * An atom containing the next request that the agent has scheduled for
+	 * itself. Null if there is no scheduled request.
+	 */
+	$scheduledRequest = atom<AgentRequest | null>('scheduledRequest', null)
+
+	/**
+	 * An atom containing the agent's chat history.
+	 */
+	$chatHistory = atom<ChatHistoryItem[]>('chatHistory', [])
+
+	/**
+	 * An atom containing the position on the page where the current chat
+	 * started.
+	 */
+	$chatOrigin = atom<VecModel>('chatOrigin', { x: 0, y: 0 })
+
+	/**
+	 * An atom containing the agent's todo list.
+	 */
+	$personalTodoList = atom<FairyTodoItem[]>('personalTodoList', [])
+
+	/**
+	 * An atom that's used to store document changes made by the user since the
+	 * previous request.
+	 */
+	$userActionHistory = atom<RecordsDiff<TLRecord>[]>('userActionHistory', [])
+
+	/**
+	 * An atom containing the current fairy mode.
+	 */
+	private $mode = atom<FairyModeDefinition['type']>('fairyMode', 'idling')
+
+	/**
+	 * Debug flags for controlling logging behavior in the worker.
+	 */
+	$debugFlags = atom<{ logSystemPrompt: boolean; logMessages: boolean; logResponseTime: boolean }>(
+		'debugFlags',
+		{
+			logSystemPrompt: false,
+			logMessages: false,
+			logResponseTime: false,
+		}
+	)
+
+	/**
+	 * An atom containing the conditions this agent is waiting for.
+	 * When events matching these conditions occur, the agent will be notified.
+	 */
+	$waitingFor = atom<FairyWaitCondition<FairyWaitEvent>[]>('waitingFor', [])
+
+	/**
+	 * Change the mode of the agent.
+	 * @param mode - The mode to set.
+	 */
+	setMode(mode: FairyModeDefinition['type']) {
+		const fromMode = this.getMode()
+		const fromModeNode = FAIRY_MODE_CHART[fromMode]
+		const toModeNode = FAIRY_MODE_CHART[mode]
+
+		// todo the order we call these vs notifyAgentModeTransition is probably important
+		fromModeNode.onExit?.(this, mode)
+		toModeNode.onEnter?.(this, fromMode)
+
+		notifyAgentModeTransition(this.id, mode, this.editor)
+
+		this.$mode.set(mode)
+	}
+
+	/**
+	 * Get the current mode of the agent.
+	 * @returns The mode.
+	 */
+	getMode(): FairyModeDefinition['type'] {
+		return this.$mode.get()
+	}
+
+	/**
+	 * Cumulative token usage tracking for this chat session.
+	 * Tracked per model to handle different pricing models.
+	 */
+	cumulativeUsage: {
+		// Usage per model, separated by tier for models with tiered pricing
+		byModel: Record<
+			AgentModelName,
+			{
+				// Tier 1: Prompts ≤ 200K tokens (for models with tiered pricing)
+				tier1: {
+					promptTokens: number // Total input tokens (cached + uncached)
+					cachedInputTokens: number // Cached input tokens (cheaper pricing)
+					completionTokens: number
+				}
+				// Tier 2: Prompts > 200K tokens (for models with tiered pricing)
+				tier2: {
+					promptTokens: number // Total input tokens (cached + uncached)
+					cachedInputTokens: number // Cached input tokens (cheaper pricing)
+					completionTokens: number
+				}
+			}
+		>
+		// Total across all models and tiers
+		totalTokens: number
+	} = {
+		byModel: {} as Record<
+			AgentModelName,
+			{
+				tier1: { promptTokens: number; cachedInputTokens: number; completionTokens: number }
+				tier2: { promptTokens: number; cachedInputTokens: number; completionTokens: number }
+			}
+		>,
+		totalTokens: 0,
+	}
+
+	/**
+	 * Get the current project that the agent is working on.
+	 */
+	getProject(): FairyProject | null {
+		return getProjectByAgentId(this.id) ?? null
+	}
+
+	/**
+	 * Get the tasks that the agent is working on.
+	 */
+	getTasks(): FairyTask[] {
+		return $fairyTasks.get().filter((task) => task.assignedTo === this.id)
+	}
+
+	/**
+	 * Get the role of the agent within its current project.
+	 */
+	getRole(): FairyProjectRole | null {
+		const project = this.getProject()
+		if (!project) return null
+		return project.members.find((member) => member.id === this.id)?.role ?? null
+	}
+
+	/**
+	 * Get the work that the agent is currently working on.
+	 * @returns The work.
+	 */
+	getWork(): FairyWork {
+		return {
+			project: this.getProject(),
+			tasks: this.getTasks(),
+		}
+	}
+
+	/**
+	 * Create a new tldraw agent.
+	 */
+	constructor({ id, editor, app, onError, getToken }: FairyAgentOptions) {
+		this.editor = editor
+		this.app = app
+		this.id = id
+		this.getToken = getToken
+
+		const center = editor.getViewportPageBounds().center
+		const spawnPoint = findFairySpawnPoint(center, editor)
+
+		this.$fairyEntity = atom<FairyEntity>(`fairy-${id}`, {
+			position: spawnPoint,
+			flipX: false,
+			isSelected: false,
+			pose: 'idle',
+			gesture: null,
+			currentPageId: editor.getCurrentPageId(),
+		})
+
+		this.$fairyConfig = computed<FairyConfig>(
+			`fairy-config-${id}`,
+			() => JSON.parse(app.getUser().fairies || '{}')[id] as FairyConfig
+		)
+
+		this.onError = onError
+
+		$fairyAgentsAtom.update(editor, (agents) => [...agents, this])
+
+		// A fairy agent's action utils and prompt part utils are static. They don't change.
+		this.agentActionUtils = getAgentActionUtilsRecord(this)
+		this.promptPartUtils = getPromptPartUtilsRecord(this)
+		this.unknownActionUtil = this.agentActionUtils.unknown
+
+		this.stopRecordingFn = this.startRecordingUserActions()
+	}
+
+	/**
+	 * Dispose of the agent by cancelling requests and stopping listeners.
+	 */
+	dispose() {
+		this.cancel()
+		this.stopRecordingUserActions()
+		// Stop following this fairy if it's currently being followed
+		if (getFollowingFairyId(this.editor) === this.id) {
+			stopFollowingFairy(this.editor)
+		}
+		$fairyAgentsAtom.update(this.editor, (agents) => agents.filter((agent) => agent.id !== this.id))
+	}
+
+	/**
+	 * Serialize the fairy agent's state to a plain object for persistence.
+	 * This is stored in the database as JSON.
+	 */
+	serializeState() {
+		return {
+			fairyEntity: this.$fairyEntity.get(),
+			chatHistory: this.$chatHistory.get(),
+			chatOrigin: this.$chatOrigin.get(),
+			personalTodoList: this.$personalTodoList.get(),
+		}
+	}
+
+	/**
+	 * Load previously persisted state into the fairy agent.
+	 * This is called when opening a file to restore the fairy's state.
+	 */
+	loadState(state: {
+		fairyEntity?: FairyEntity
+		chatHistory?: ChatHistoryItem[]
+		chatOrigin?: VecModel
+		personalTodoList?: FairyTodoItem[]
+	}) {
+		if (state.fairyEntity) {
+			this.$fairyEntity.update((entity) => {
+				return {
+					...entity,
+					position: state.fairyEntity?.position ?? entity.position,
+					flipX: state.fairyEntity?.flipX ?? entity.flipX,
+					currentPageId: state.fairyEntity?.currentPageId ?? entity.currentPageId,
+					isSelected: state.fairyEntity?.isSelected ?? entity.isSelected,
+					pose: state.fairyEntity?.pose ?? entity.pose,
+					gesture: state.fairyEntity?.gesture ?? entity.gesture,
+				}
+			})
+		}
+		if (state.chatHistory) {
+			this.$chatHistory.set(state.chatHistory)
+		}
+		if (state.chatOrigin) {
+			this.$chatOrigin.set(state.chatOrigin)
+		}
+		if (state.personalTodoList) {
+			this.$personalTodoList.set(state.personalTodoList)
+		}
+	}
+
+	/**
+	 * Reset the cumulative usage tracking for this fairy agent.
+	 * Useful when starting a new chat session.
+	 */
+	resetCumulativeUsage() {
+		this.cumulativeUsage = {
+			byModel: {} as Record<
+				AgentModelName,
+				{
+					tier1: { promptTokens: number; cachedInputTokens: number; completionTokens: number }
+					tier2: { promptTokens: number; cachedInputTokens: number; completionTokens: number }
+				}
+			>,
+			totalTokens: 0,
+		}
+	}
+
+	/**
+	 * Extract the model name from a prompt.
+	 * @param prompt - The agent prompt
+	 * @returns The model name, or DEFAULT_MODEL_NAME if not found
+	 */
+	getModelNameFromPrompt(prompt: AgentPrompt): AgentModelName {
+		for (const part of Object.values(prompt)) {
+			if (part.type === 'modelName') {
+				return (part as ModelNamePart).name
+			}
+		}
+		return DEFAULT_MODEL_NAME
+	}
+
+	/**
+	 * Get the current cumulative cost for this fairy agent.
+	 * Calculates costs based on model-specific pricing, accounting for cached input tokens.
+	 * @returns An object with input cost, output cost, and total cost in USD.
+	 */
+	getCumulativeCost() {
+		let totalInputCost = 0
+		let totalOutputCost = 0
+
+		// Iterate through all models and calculate costs
+		for (const [modelName, usage] of Object.entries(this.cumulativeUsage.byModel)) {
+			const typedModelName = modelName as AgentModelName
+
+			// Calculate cost for tier 1 (≤ 200K tokens)
+			const tier1Pricing = getModelPricing(typedModelName, 200_000)
+			const tier1UncachedInputTokens = usage.tier1.promptTokens - usage.tier1.cachedInputTokens
+			const tier1UncachedInputCost =
+				(tier1UncachedInputTokens / 1_000_000) * tier1Pricing.inputPrice
+			const tier1CachedInputCost =
+				tier1Pricing.cachedInputPrice !== null
+					? (usage.tier1.cachedInputTokens / 1_000_000) * tier1Pricing.cachedInputPrice
+					: 0
+			const tier1InputCost = tier1UncachedInputCost + tier1CachedInputCost
+			const tier1OutputCost = (usage.tier1.completionTokens / 1_000_000) * tier1Pricing.outputPrice
+
+			// Calculate cost for tier 2 (> 200K tokens)
+			const tier2Pricing = getModelPricing(typedModelName, 200_001)
+			const tier2UncachedInputTokens = usage.tier2.promptTokens - usage.tier2.cachedInputTokens
+			const tier2UncachedInputCost =
+				(tier2UncachedInputTokens / 1_000_000) * tier2Pricing.inputPrice
+			const tier2CachedInputCost =
+				tier2Pricing.cachedInputPrice !== null
+					? (usage.tier2.cachedInputTokens / 1_000_000) * tier2Pricing.cachedInputPrice
+					: 0
+			const tier2InputCost = tier2UncachedInputCost + tier2CachedInputCost
+			const tier2OutputCost = (usage.tier2.completionTokens / 1_000_000) * tier2Pricing.outputPrice
+
+			totalInputCost += tier1InputCost + tier2InputCost
+			totalOutputCost += tier1OutputCost + tier2OutputCost
+		}
+
+		const totalCost = totalInputCost + totalOutputCost
+
+		return { inputCost: totalInputCost, outputCost: totalOutputCost, totalCost }
+	}
+
+	/**
+	 * Get an agent action util for a specific action type.
+	 *
+	 * @param type - The type of action to get the util for.
+	 * @returns The action util.
+	 */
+	getAgentActionUtil(type?: string) {
+		const utilType = this.getAgentActionUtilType(type)
+		return this.agentActionUtils[utilType]
+	}
+
+	/**
+	 * Get the util type for a provided action type.
+	 * If no util type is found, returns 'unknown'.
+	 */
+	getAgentActionUtilType(type?: string) {
+		if (!type) return 'unknown'
+		const util = this.agentActionUtils[type as AgentAction['_type']]
+		if (!util) return 'unknown'
+		return type as AgentAction['_type']
+	}
+
+	/**
+	 * Get a prompt part util for a specific part type.
+	 *
+	 * @param type - The type of part to get the util for.
+	 * @returns The part util.
+	 */
+	getPromptPartUtil(type: PromptPart['type']) {
+		return this.promptPartUtils[type]
+	}
+
+	/**
+	 * A record of the agent's action util instances.
+	 * Used by the `getAgentActionUtil` method.
+	 */
+	agentActionUtils: Record<AgentAction['_type'], AgentActionUtil<AgentAction>>
+
+	/**
+	 * The agent action util instance for the "unknown" action type.
+	 *
+	 * This is returned by the `getAgentActionUtil` method when the action type
+	 * isn't properly specified. This can happen if the model isn't finished
+	 * streaming yet or makes a mistake.
+	 */
+	unknownActionUtil: AgentActionUtil<AgentAction>
+
+	/**
+	 * A record of the agent's prompt part util instances.
+	 * Used by the `getPromptPartUtil` method.
+	 */
+	promptPartUtils: Record<PromptPart['type'], PromptPartUtil<PromptPart>>
+
+	/**
+	 * Get a full agent request from a user input by filling out any missing
+	 * values with defaults.
+	 * @param input - A partial agent request or a string message.
+	 */
+	getFullRequestFromInput(input: AgentInput): AgentRequest {
+		const request = this.getPartialRequestFromInput(input)
+
+		const activeRequest = this.$activeRequest.get()
+
+		return {
+			messages: request.messages ?? [],
+			source: request.source ?? 'user',
+			data: request.data ?? [],
+			bounds:
+				request.bounds ??
+				activeRequest?.bounds ??
+				Box.FromCenter(this.$fairyEntity.get().position, FAIRY_VISION_DIMENSIONS),
+		} satisfies AgentRequest
+	}
+
+	/**
+	 * Convert an input into a partial request.
+	 * This involves handling the various ways that the input can be provided.
+	 *
+	 * @example
+	 * ```tsx
+	 * agent.prompt('Draw a cat')
+	 * agent.prompt(['Draw a cat', 'Draw a dog'])
+	 * agent.prompt({ messages: 'Draw a cat' })
+	 * agent.prompt({ message: 'Draw a cat' })
+	 * ```
+	 *
+	 * @param input - The input to get the request partial from.
+	 * @returns The request partial.
+	 */
+	private getPartialRequestFromInput(input: AgentInput): Partial<AgentRequest> {
+		// eg: agent.prompt('Draw a cat')
+		if (typeof input === 'string') {
+			return { messages: [input] }
+		}
+
+		// eg: agent.prompt(['Draw a cat', 'Draw a dog'])
+		if (Array.isArray(input)) {
+			return { messages: input }
+		}
+
+		// eg: agent.prompt({ messages: 'Draw a cat' })
+		if (typeof input.messages === 'string') {
+			return { ...input, messages: [input.messages] }
+		}
+
+		// eg: agent.prompt({ message: 'Draw a cat' })
+		if (typeof input.message === 'string') {
+			return { ...input, messages: [input.message, ...(input.messages ?? [])] }
+		}
+
+		return input
+	}
+
+	/**
+	 * Get a full prompt based on a request.
+	 *
+	 * @param request - The request to use for the prompt.
+	 * @param helpers - The helpers to use.
+	 * @returns The fully assembled prompt.
+	 */
+	async preparePrompt(request: AgentRequest, helpers: AgentHelpers): Promise<AgentPrompt> {
+		const { promptPartUtils } = this
+		const parts: PromptPart[] = []
+
+		const mode = getFairyModeDefinition(this.getMode())
+		if (!mode.active) {
+			throw new Error(`Fairy is not in an active mode so can't act right now`)
+		}
+		const availablePromptPartTypes = mode.parts(this.getWork())
+		for (const partType of availablePromptPartTypes) {
+			const util = promptPartUtils[partType]
+			if (!util) throw new Error(`Prompt part util not found for part type: ${partType}`)
+			const part = await util.getPart(structuredClone(request), helpers)
+			if (!part) continue
+			parts.push(part)
+		}
+
+		return Object.fromEntries(parts.map((part) => [part.type, part])) as AgentPrompt
+	}
+
+	private $isPrompting = atom<boolean>('isPrompting', false)
+
+	/**
+	 * Prompt the agent to edit the canvas.
+	 *
+	 * @example
+	 * ```tsx
+	 * const agent = useTldrawAgent(editor)
+	 * agent.prompt('Draw a cat')
+	 * ```
+	 *
+	 * ```tsx
+	 * agent.prompt({
+	 *   message: 'Draw a cat in this area',
+	 *   bounds: {
+	 *     x: 0,
+	 *     y: 0,
+	 *     w: 300,
+	 *     h: 400,
+	 *   },
+	 * })
+	 * ```
+	 *
+	 * @returns A promise for when the agent has finished its work.
+	 */
+	async prompt(input: AgentInput, { nested = false }: { nested?: boolean } = {}) {
+		if (this.$isPrompting.get() && !nested) {
+			throw new Error('Agent is already prompting. Please wait for the current prompt to finish.')
+		}
+
+		this.$isPrompting.set(true)
+
+		if (this.isActing) {
+			throw new Error(
+				"Agent is already acting. It's illegal to prompt an agent during an action. Please use schedule instead."
+			)
+		}
+
+		const request = this.getFullRequestFromInput(input)
+		const startingNode = FAIRY_MODE_CHART[this.getMode()]
+		await startingNode.onPromptStart?.(this, request)
+
+		const initialModeDefinition = getFairyModeDefinition(this.getMode())
+		if (!initialModeDefinition.active) {
+			throw new Error(
+				`Fairy is not in an active mode so can't act right now. First change to an active mode. Current mode: ${this.getMode()}`
+			)
+		}
+
+		const startingFairy = this.$fairyEntity.get()
+		if (startingFairy.pose === 'idle') {
+			this.$fairyEntity.update((fairy) => ({ ...fairy, pose: 'active' }))
+		}
+
+		// Submit the request to the agent.
+		await this.request(request)
+
+		// If there's no schedule request...
+		// Trigger onPromptEnd callback(s)
+		let modeChanged = true
+		while (!this.$scheduledRequest.get() && modeChanged) {
+			modeChanged = false
+			this.$fairyEntity.update((fairy) => ({ ...fairy, pose: 'idle' }))
+			const mode = this.getMode()
+			const node = FAIRY_MODE_CHART[mode]
+			node.onPromptEnd?.(this, request)
+			const newMode = this.getMode()
+			if (newMode !== mode) {
+				modeChanged = true
+			}
+		}
+
+		// If there's still no scheduled request, quit
+		const scheduledRequest = this.$scheduledRequest.get()
+		const eventualMode = this.getMode()
+		const eventualModeDefinition = getFairyModeDefinition(eventualMode)
+		if (!scheduledRequest) {
+			if (eventualModeDefinition.active) {
+				throw new Error(
+					`Fairy is not allowed to become inactive during the active mode: ${eventualMode}`
+				)
+			}
+			this.$isPrompting.set(false)
+			this.cancelFn = null
+			return
+		}
+
+		// If there *is* a scheduled request...
+		// Add the scheduled request to chat history
+		const resolvedData = await Promise.all(scheduledRequest.data)
+		this.$chatHistory.update((prev) => [
+			...prev,
+			{
+				type: 'continuation',
+				data: resolvedData,
+				memoryLevel: eventualModeDefinition.memoryLevel,
+			},
+		])
+
+		// Handle the scheduled request and clear it
+		this.$scheduledRequest.set(null)
+		await this.prompt(scheduledRequest, { nested: true })
+	}
+
+	/**
+	 * Send a single request to the agent and handle its response.
+	 *
+	 * Note: This method does not chain multiple requests together. For a full
+	 * agentic system, use the `prompt` method.
+	 *
+	 * Most developers will not want to use this method directly. It's mostly
+	 * used internally by the `prompt` method, but can also be useful for
+	 * carrying out evals.
+	 *
+	 * @param input - The input to form the request from.
+	 * @returns A promise for when the request is complete and a cancel function
+	 * to abort the request.
+	 */
+	async request(input: AgentInput) {
+		const request = this.getFullRequestFromInput(input)
+
+		// Interrupt any currently active request
+		if (this.$activeRequest.get() !== null) {
+			this.cancel()
+		}
+		this.$activeRequest.set(request)
+
+		// Call an external helper function to request the agent
+		const { promise, cancel } = requestAgentActions({ agent: this, request })
+
+		this.cancelFn = cancel
+		// promise.finally(() => {
+		// 	this.cancelFn = null
+		// })
+
+		const results = await promise
+		this.$activeRequest.set(null)
+		return results
+	}
+
+	/**
+	 * Schedule further work for the agent to do after this request has finished.
+	 * If there's no active request, then do the scheduled request immediately.
+	 * What you schedule will get merged with the currently scheduled request, if there is one.
+	 *
+	 * @example
+	 * ```tsx
+	 * // Add an instruction
+	 * agent.schedule('Add more detail.')
+	 * ```
+	 *
+	 * @example
+	 * ```tsx
+	 * // Move the viewport
+	 * agent.schedule({
+	 *  bounds: { x: 0, y: 0, w: 100, h: 100 },
+	 * })
+	 * ```
+	 *
+	 * @example
+	 * ```tsx
+	 * // Add data to the request
+	 * agent.schedule({ data: [value] })
+	 * ```
+	 */
+	schedule(input: AgentInput) {
+		const scheduledRequest = this.$scheduledRequest.get()
+
+		// If there's no request scheduled yet, schedule one
+		if (!scheduledRequest) {
+			this._schedule(input)
+			return
+		}
+
+		// If there's already a scheduled request, append to it
+		const request = this.getPartialRequestFromInput(input)
+		this._schedule({
+			// Append to properties where possible
+			messages: [...scheduledRequest.messages, ...(request.messages ?? [])],
+			data: [...scheduledRequest.data, ...(request.data ?? [])],
+
+			// Override other properties
+			bounds: request.bounds ?? scheduledRequest.bounds,
+			source: request.source ?? scheduledRequest.source ?? 'self',
+		})
+	}
+
+	/**
+	 * Interrupt the agent and set their mode.
+	 * Optionally, schedule a request.
+	 */
+	interrupt({ input, mode }: { input: AgentInput | null; mode?: FairyModeDefinition['type'] }) {
+		this.cancelFn?.()
+		this.$activeRequest.set(null)
+		this.$scheduledRequest.set(null)
+		this.cancelFn = null
+
+		if (mode) {
+			this.setMode(mode)
+		}
+		if (input !== null) {
+			this.schedule(input)
+		}
+	}
+
+	/**
+	 * Manually override what the agent should do next.
+	 *
+	 * @example
+	 * ```tsx
+	 * agent.setScheduledRequest('Add more detail.')
+	 * ```
+	 *
+	 * @example
+	 * ```tsx
+	 * agent.setScheduledRequest({
+	 *  message: 'Add more detail to this area.',
+	 *  bounds: { x: 0, y: 0, w: 100, h: 100 },
+	 * })
+	 * ```
+	 *
+	 * @example
+	 * ```tsx
+	 * // Cancel the scheduled request
+	 * agent.setScheduledRequest(null)
+	 * ```
+	 *
+	 * @param input - What to set the scheduled request to, or null to cancel
+	 * the scheduled request.
+	 */
+	private _schedule(input: AgentInput | null) {
+		if (input === null) {
+			this.$scheduledRequest.set(null)
+			return
+		}
+
+		const activeRequest = this.$activeRequest.get()
+		const partialRequest = this.getPartialRequestFromInput(input)
+		const request: AgentRequest = {
+			messages: partialRequest.messages ?? [],
+			bounds:
+				partialRequest.bounds ??
+				activeRequest?.bounds ??
+				Box.FromCenter(this.$fairyEntity.get().position, FAIRY_VISION_DIMENSIONS),
+			data: partialRequest.data ?? [],
+			source: partialRequest.source ?? 'self',
+		}
+		this.$scheduledRequest.set(request)
+
+		const isCurrentlyActive = this.isGenerating()
+		if (!isCurrentlyActive) {
+			this.prompt(request)
+		}
+	}
+
+	/**
+	 * Add a todo item to the agent's todo list.
+	 * @param id The id of the todo item.
+	 * @param text The text of the todo item.
+	 * @returns The id of the todo item.
+	 */
+	addPersonalTodo(id: string, text: string) {
+		this.$personalTodoList.update((personalTodoItems) => {
+			return [
+				...personalTodoItems,
+				{
+					id,
+					status: 'todo' as const,
+					text,
+				},
+			]
+		})
+		return id
+	}
+
+	updateTodo({ id, text, status }: FairyTodoItem) {
+		this.$personalTodoList.update((todoItems) => {
+			const index = todoItems.findIndex((item) => item.id === id)
+			if (index !== -1) {
+				return [
+					...todoItems.slice(0, index),
+					{ ...todoItems[index], text, status },
+					...todoItems.slice(index + 1),
+				]
+			}
+			return todoItems
+		})
+	}
+
+	/**
+	 * Check if the agent is currently waiting for any events.
+	 * @returns true if the agent has any wait conditions
+	 */
+	isWaiting() {
+		return this.$waitingFor.get().length > 0
+	}
+
+	/**
+	 * Add a wait condition to the agent.
+	 * The agent will be notified when an event matching this condition occurs.
+	 * @param condition - The wait condition to add
+	 */
+	waitFor(condition: FairyWaitCondition<FairyWaitEvent>) {
+		this.$waitingFor.update((conditions) => [...conditions, condition])
+	}
+
+	/**
+	 * Clear all wait conditions for this agent.
+	 */
+	stopWaiting() {
+		this.$waitingFor.set([])
+	}
+
+	/**
+	 * Wake up the agent from waiting with a notification message.
+	 * Note: This does NOT remove wait conditions - the matched conditions should
+	 * already be removed by the notification system before calling this method.
+	 * @param message - The message to send to the agent when waking up
+	 * @param _condition - The condition that was fulfilled
+	 * @param _event - Optional event data that triggered the wake-up (currently unused)
+	 */
+	notifyWaitConditionFulfilled(
+		message: string,
+		_condition: FairyWaitCondition<FairyWaitEvent>,
+		_event?: FairyWaitEvent
+	) {
+		if (this.$isPrompting.get()) {
+			this.schedule({
+				messages: [message],
+				source: 'other-agent',
+			})
+		} else {
+			this.prompt({
+				messages: [message],
+				source: 'other-agent',
+			})
+		}
+	}
+
+	/**
+	 * Make the agent perform an action.
+	 * @param action The action to make the agent do.
+	 * @param helpers The helpers to use.
+	 * @returns The diff of the action, a promise for when the action is finished
+	 */
+	act(
+		action: Streaming<AgentAction>,
+		helpers: AgentHelpers = new AgentHelpers(this)
+	): {
+		diff: RecordsDiff<TLRecord>
+		promise: Promise<void> | null
+	} {
+		const { editor } = this
+		const util = this.getAgentActionUtil(action._type)
+		this.isActing = true
+
+		const actionInfo = this.getActionInfo(action)
+		this.$fairyEntity.update((fairy) => ({ ...fairy, pose: actionInfo.pose }))
+
+		// Ensure the fairy is on the correct page before performing the action
+		this.ensureFairyIsOnCorrectPage(action)
+
+		const modeDefinition = getFairyModeDefinition(this.getMode())
+		let promise: Promise<void> | null = null
+		let diff: RecordsDiff<TLRecord>
+		try {
+			diff = editor.store.extractingChanges(() => {
+				$fairyIsApplyingAction.set(true)
+				promise = util.applyAction(structuredClone(action), helpers) ?? null
+				$fairyIsApplyingAction.set(false)
+			})
+		} finally {
+			this.isActing = false
+		}
+
+		// Add the action to chat history
+		if (util.savesToHistory()) {
+			const historyItem: ChatHistoryItem = {
+				type: 'action',
+				action,
+				diff,
+				acceptance: 'pending',
+				memoryLevel: modeDefinition.memoryLevel,
+			}
+
+			this.$chatHistory.update((historyItems) => {
+				// If there are no items, start off the chat history with the first item
+				if (historyItems.length === 0) return [historyItem]
+
+				// If the last item is still in progress, replace it with the new item
+				const lastActionHistoryItemIndex = historyItems.findLastIndex(
+					(item) => item.type === 'action'
+				)
+				const lastActionHistoryItem =
+					lastActionHistoryItemIndex !== -1 ? historyItems[lastActionHistoryItemIndex] : null
+				if (
+					lastActionHistoryItem &&
+					lastActionHistoryItem.type === 'action' &&
+					!lastActionHistoryItem.action.complete
+				) {
+					const newHistoryItems = [...historyItems]
+					newHistoryItems[lastActionHistoryItemIndex] = historyItem
+					return newHistoryItems
+				} else {
+					// Otherwise, just add the new item to the end of the list
+					return [...historyItems, historyItem]
+				}
+			})
+		}
+
+		return { diff, promise }
+	}
+
+	/**
+	 * Remove all completed todo items from the todo list.
+	 * Renumber the personal todo items to ensure the ids are sequential.
+	 */
+	flushTodoList() {
+		this.$personalTodoList.update((personalTodoItems) => {
+			return personalTodoItems.filter((item) => item.status !== 'done')
+		})
+	}
+
+	/**
+	 * Stream a response from the model.
+	 * Act on the model's events as they come in.
+	 *
+	 * Not to be called directly. Use `prompt` instead.
+	 * This is a helper function that is used internally by the agent.
+	 */
+	async *_streamActions({
+		prompt,
+		signal,
+	}: {
+		prompt: BaseAgentPrompt
+		signal: AbortSignal
+	}): AsyncGenerator<Streaming<AgentAction>> {
+		const headers: HeadersInit = {
+			'Content-Type': 'application/json',
+		}
+
+		// Add authentication token if available
+		if (this.getToken) {
+			const token = await this.getToken()
+			if (token) {
+				headers['Authorization'] = `Bearer ${token}`
+			}
+		}
+
+		const res = await fetch(`${FAIRY_WORKER}/stream-actions`, {
+			method: 'POST',
+			body: JSON.stringify(prompt),
+			headers,
+			signal,
+		})
+
+		if (!res.body) {
+			throw Error('No body in response')
+		}
+
+		const reader = res.body.getReader()
+		const decoder = new TextDecoder()
+		let buffer = ''
+
+		try {
+			while (true) {
+				const { value, done } = await reader.read()
+				if (done) break
+
+				buffer += decoder.decode(value, { stream: true })
+				const actions = buffer.split('\n\n')
+				buffer = actions.pop() || ''
+
+				for (const action of actions) {
+					const match = action.match(/^data: (.+)$/m)
+					if (match) {
+						try {
+							const data = JSON.parse(match[1])
+
+							// If the response contains an error, throw it
+							if ('error' in data) {
+								throw new Error(data.error)
+							}
+
+							const agentAction: Streaming<AgentAction> = data
+							yield agentAction
+						} catch (err: any) {
+							throw new Error(err.message)
+						}
+					}
+				}
+			}
+		} finally {
+			reader.releaseLock()
+		}
+	}
+
+	/**
+	 * Request a text response from the model.
+	 * @param input - The input to form the request from.
+	 * @returns The text response from the model.
+	 */
+	async requestText(input: AgentInput) {
+		const request = this.getFullRequestFromInput(input)
+		const { fulltextPromise, cancel: _cancel } = requestAgentText({ agent: this, request })
+		return await fulltextPromise
+	}
+
+	/**
+	 * Stream a text response from the model.
+	 * Not to be called directly. Use `requestText` instead.
+	 * This is a helper function that is used internally by the agent.
+	 */
+	async *_streamText({
+		prompt,
+		signal,
+	}: {
+		prompt: BaseAgentPrompt
+		signal: AbortSignal
+	}): AsyncGenerator<string> {
+		const headers: HeadersInit = {
+			'Content-Type': 'application/json',
+		}
+
+		// Add authentication token if available
+		if (this.getToken) {
+			const token = await this.getToken()
+			if (token) {
+				headers['Authorization'] = `Bearer ${token}`
+			}
+		}
+
+		const res = await fetch(`${FAIRY_WORKER}/stream-text`, {
+			method: 'POST',
+			body: JSON.stringify(prompt),
+			headers,
+			signal,
+		})
+
+		if (!res.body) {
+			throw Error('No body in response')
+		}
+
+		const reader = res.body.getReader()
+		const decoder = new TextDecoder()
+		let buffer = ''
+
+		try {
+			while (true) {
+				const { value, done } = await reader.read()
+				if (done) break
+
+				buffer += decoder.decode(value, { stream: true })
+				const chunks = buffer.split('\n\n')
+				buffer = chunks.pop() || ''
+
+				for (const chunk of chunks) {
+					const match = chunk.match(/^data: (.+)$/m)
+					if (match) {
+						try {
+							yield match[1]
+						} catch (err: any) {
+							throw new Error(err.message)
+						}
+					}
+				}
+			}
+		} finally {
+			reader.releaseLock()
+		}
+	}
+
+	/**
+	 * A function that cancels the agent's current prompt, if one is active.
+	 */
+	private cancelFn: (() => void) | null = null
+
+	/**
+	 * Cancel the agent's current prompt, if one is active.
+	 */
+	cancel() {
+		const request = this.$activeRequest.get()
+		if (request) {
+			const mode = this.getMode()
+			const node = FAIRY_MODE_CHART[mode]
+			node.onPromptCancel?.(this, request)
+
+			const newMode = this.getMode()
+			const newModeDefinition = getFairyModeDefinition(newMode)
+			if (newModeDefinition.active) {
+				throw new Error(
+					`Fairy is not allowed to become inactive during the active mode: ${newMode}`
+				)
+			}
+		}
+
+		this.cancelFn?.()
+		this.$activeRequest.set(null)
+		this.$scheduledRequest.set(null)
+		this.cancelFn = null
+		this.$fairyEntity.update((fairy) => ({ ...fairy, pose: 'idle' }))
+	}
+
+	/**
+	 * Reset the agent's chat and memory.
+	 * Cancel the current request if there's one active.
+	 */
+	reset() {
+		this.cancel()
+		this.promptStartTime = null
+		this.$personalTodoList.set([])
+		this.$userActionHistory.set([])
+		this.setMode('idling')
+
+		this.$chatHistory.set([])
+		this.$chatOrigin.set({ x: 0, y: 0 })
+
+		// clear any waiting conditions
+		this.stopWaiting()
+
+		// Reset cumulative usage tracking when starting a new chat
+		this.resetCumulativeUsage()
+	}
+
+	/**
+	 * Check if the agent is currently working on a prompt or not.
+	 */
+	isGenerating() {
+		return this.$isPrompting.get()
+	}
+
+	/**
+	 * Whether the agent is currently acting on the editor or not.
+	 * This flag is used to prevent agent actions from being recorded as user actions.
+	 *
+	 * Do not use this to check if the agent is currently working on a request. Use `isGenerating` instead.
+	 */
+	private isActing = false
+
+	/**
+	 * Tracks the start time of the current prompt being timed.
+	 * Set when timing starts, cleared when timing stops.
+	 */
+	promptStartTime: number | null = null
+
+	/**
+	 * Start recording user actions.
+	 * @returns A cleanup function to stop recording user actions.
+	 */
+	private startRecordingUserActions() {
+		const { editor } = this
+		const cleanUpCreate = editor.sideEffects.registerAfterCreateHandler(
+			'shape',
+			(shape, source) => {
+				if (source !== 'user') return
+				if (this.isActing) return
+				if ($fairyIsApplyingAction.get()) return
+				const change = {
+					added: { [shape.id]: shape },
+					updated: {},
+					removed: {},
+				}
+				this.$userActionHistory.update((prev) => [...prev, change])
+				return
+			}
+		)
+
+		const cleanUpDelete = editor.sideEffects.registerAfterDeleteHandler(
+			'shape',
+			(shape, source) => {
+				if (source !== 'user') return
+				if (this.isActing) return
+				if ($fairyIsApplyingAction.get()) return
+				const change = {
+					added: {},
+					updated: {},
+					removed: { [shape.id]: shape },
+				}
+				this.$userActionHistory.update((prev) => [...prev, change])
+				return
+			}
+		)
+
+		const cleanUpChange = editor.sideEffects.registerAfterChangeHandler(
+			'shape',
+			(prev, next, source) => {
+				if (source !== 'user') return
+				if (this.isActing) return
+				if ($fairyIsApplyingAction.get()) return
+				const change: RecordsDiff<TLRecord> = {
+					added: {},
+					updated: { [prev.id]: [prev, next] },
+					removed: {},
+				}
+				this.$userActionHistory.update((prev) => [...prev, change])
+				return
+			}
+		)
+
+		function cleanUp() {
+			cleanUpCreate()
+			cleanUpDelete()
+			cleanUpChange()
+		}
+
+		return cleanUp
+	}
+
+	/**
+	 * A function that stops recording user actions.
+	 */
+	private stopRecordingFn: () => void
+
+	/**
+	 * Stop recording user actions.
+	 */
+	private stopRecordingUserActions() {
+		this.stopRecordingFn?.()
+	}
+
+	/**
+	 * Get information about an agent action, mostly used to display actions within the chat history UI.
+	 * @param action - The action to get information about.
+	 * @returns The information about the action.
+	 */
+	getActionInfo(action: Streaming<AgentAction>): AgentActionInfo {
+		const util = this.getAgentActionUtil(action._type)
+		const info = util.getInfo(action) ?? {}
+		const {
+			icon = null,
+			description = null,
+			summary = null,
+			canGroup = () => true,
+			pose = 'active' as const,
+		} = info
+
+		return {
+			icon,
+			description,
+			summary,
+			canGroup,
+			pose,
+		}
+	}
+
+	/**
+	 * Move the fairy to a position.
+	 * @param position - The position to move the fairy to.
+	 */
+	moveToPosition(position: VecModel) {
+		this.$fairyEntity.update((fairy) => {
+			return {
+				...fairy,
+				position,
+				flipX: false,
+			}
+		})
+	}
+
+	/**
+	 * Ensures the fairy is on the correct page before performing an action.
+	 * For actions that work with existing shapes, switches to the shape's page.
+	 * For actions that create new content, ensures the fairy is on the current editor page.
+	 */
+	private ensureFairyIsOnCorrectPage(action: Streaming<AgentAction>) {
+		const { editor } = this
+		const fairyEntity = this.$fairyEntity.get()
+		if (!fairyEntity) return
+
+		// Extract shape IDs from the action based on action type
+		let shapeIds: string[] = []
+
+		// Actions with single shapeId
+		if ('shapeId' in action && typeof action.shapeId === 'string') {
+			shapeIds = [action.shapeId]
+		}
+		// Actions with shapeIds array
+		else if ('shapeIds' in action && Array.isArray(action.shapeIds)) {
+			shapeIds = action.shapeIds as string[]
+		}
+		// Update action has shape in 'update' property
+		else if (
+			action._type === 'update' &&
+			'update' in action &&
+			action.update &&
+			typeof action.update === 'object' &&
+			'shapeId' in action.update
+		) {
+			shapeIds = [action.update.shapeId as string]
+		}
+
+		// If we have shape IDs, ensure the fairy is on the same page as the first shape
+		if (shapeIds.length > 0) {
+			const firstShapeId = shapeIds[0].startsWith('shape:') ? shapeIds[0] : `shape:${shapeIds[0]}`
+			const shape = editor.getShape(firstShapeId as any)
+
+			if (shape) {
+				const shapePageId = editor.getAncestorPageId(shape)
+				if (shapePageId && fairyEntity.currentPageId !== shapePageId) {
+					// Switch to the shape's page
+					editor.setCurrentPage(shapePageId)
+					this.$fairyEntity.update((f) => (f ? { ...f, currentPageId: shapePageId } : f))
+				}
+			}
+		}
+		// For create actions or actions without shape IDs, ensure fairy is on the current editor page
+		else if (action._type === 'create' || action._type === 'pen') {
+			const currentPageId = editor.getCurrentPageId()
+			if (fairyEntity.currentPageId !== currentPageId) {
+				this.$fairyEntity.update((f) => (f ? { ...f, currentPageId } : f))
+			}
+		}
+	}
+
+	/**
+	 * Set the fairy's gesture.
+	 * @param gesture - The gesture to set the fairy to.
+	 */
+	setGesture(gesture: FairyPose | null) {
+		this.$fairyEntity.update((fairy) => ({ ...fairy, gesture }))
+	}
+
+	updateFairyConfig(partial: Partial<FairyConfig>) {
+		this.app.z.mutate.user.updateFairyConfig({
+			id: this.id,
+			properties: partial,
+		})
+	}
+
+	public deleteFairyConfig() {
+		this.app.z.mutate.user.deleteFairyConfig({ id: this.id })
+	}
+
+	/**
+	 * Set the fairy's personality.
+	 * @param personality - A description of the fairy's personality.
+	 */
+	setFairyPersonality(personality: string) {
+		this.updateFairyConfig({ personality })
+	}
+
+	/**
+	 * Move the camera to the fairy's position.
+	 * Also switches to the page where the fairy is located.
+	 */
+	zoomTo() {
+		const entity = this.$fairyEntity.get()
+		if (!entity) return
+
+		// Switch to the fairy's page
+		if (entity.currentPageId !== this.editor.getCurrentPageId()) {
+			this.editor.setCurrentPage(entity.currentPageId)
+		}
+
+		// Zoom to the fairy's position
+		this.editor.zoomToBounds(Box.FromCenter(entity.position, { x: 100, y: 100 }), {
+			animation: { duration: 220 },
+			targetZoom: 1,
+		})
+	}
+
+	/**
+	 * Instantly move the fairy to the center of the screen on the current page.
+	 * Updates the fairy's currentPageId to match the current editor page.
+	 * @param offset Optional offset from the center position
+	 */
+	summon(offset?: { x: number; y: number }) {
+		const center = this.editor.getViewportPageBounds().center
+		const position = offset ? { x: center.x + offset.x, y: center.y + offset.y } : center
+		const currentPageId = this.editor.getCurrentPageId()
+		this.$fairyEntity.update((f) => (f ? { ...f, position, gesture: 'poof', currentPageId } : f))
+	}
+
+	/**
+	 * Start following this fairy with the camera.
+	 */
+	startFollowing() {
+		startFollowingFairy(this.editor, this.id)
+	}
+
+	/**
+	 * Stop following this fairy with the camera.
+	 */
+	stopFollowing() {
+		stopFollowingFairy(this.editor)
+	}
+
+	/**
+	 * Check if this fairy is currently being followed.
+	 */
+	isFollowing() {
+		return getFollowingFairyId(this.editor) === this.id
+	}
+}
+
+/**
+ * Send a request for a text response from the model and return its response.
+ * Note: You probably want to setup a custom system prompt to get any use out of this.
+ *
+ * @returns A promise for the text response from the model and a function to cancel the request.
+ */
+function requestAgentText({ agent, request }: { agent: FairyAgent; request: AgentRequest }) {
+	let cancelled = false
+	const controller = new AbortController()
+	const signal = controller.signal
+	const helpers = new AgentHelpers(agent)
+
+	const fulltextPromise = (async () => {
+		const prompt = await agent.preparePrompt(request, helpers)
+		let text = ''
+		try {
+			for await (const v of agent._streamText({ prompt, signal })) {
+				if (cancelled) break
+				text += v
+			}
+			return text
+		} catch (e) {
+			if (e === 'Cancelled by user' || (e instanceof Error && e.name === 'AbortError')) {
+				return
+			}
+			agent.onError(e)
+		}
+	})()
+
+	const cancel = () => {
+		cancelled = true
+		controller.abort('Cancelled by user')
+	}
+
+	return { fulltextPromise, cancel }
+}
+
+/**
+ * Send a request to the agent and handle its response.
+ *
+ * This is a helper function that is used internally by the agent.
+ */
+function requestAgentActions({ agent, request }: { agent: FairyAgent; request: AgentRequest }) {
+	const { editor } = agent
+
+	// If the request is from the user, add it to chat history
+	if (request.source === 'user') {
+		const mode = getFairyModeDefinition(agent.getMode())
+		const promptHistoryItem: ChatHistoryItem = {
+			type: 'prompt',
+			message: request.messages.join('\n'),
+			memoryLevel: mode.memoryLevel,
+		}
+		agent.$chatHistory.update((prev) => [...prev, promptHistoryItem])
+	}
+
+	let cancelled = false
+	const controller = new AbortController()
+	const signal = controller.signal
+	const helpers = new AgentHelpers(agent)
+	const mode = getFairyModeDefinition(agent.getMode())
+	if (!mode.active) {
+		agent.cancel()
+		throw new Error(`Fairy is not in an active mode so can't act right now`)
+	}
+	const availableActions = mode.actions(agent.getWork())
+
+	const requestPromise = (async () => {
+		const prompt = await agent.preparePrompt(request, helpers)
+		let incompleteDiff: RecordsDiff<TLRecord> | null = null
+		const actionPromises: Promise<void>[] = []
+		try {
+			for await (const action of agent._streamActions({ prompt, signal })) {
+				if (cancelled) break
+
+				// Handle usage information
+				if ((action as any)._type === '__usage__') {
+					const usage = (action as any).usage
+					if (usage) {
+						// AI SDK returns: { inputTokens, outputTokens, totalTokens, cachedInputTokens }
+						// cachedInputTokens can be undefined, which means 0
+						const promptTokens = usage.inputTokens || 0
+						const completionTokens = usage.outputTokens || 0
+						const cachedInputTokens = usage.cachedInputTokens || 0
+
+						// Extract model name from prompt
+						const modelName = agent.getModelNameFromPrompt(prompt)
+
+						// Initialize model usage if it doesn't exist
+						if (!agent.cumulativeUsage.byModel[modelName]) {
+							agent.cumulativeUsage.byModel[modelName] = {
+								tier1: { promptTokens: 0, cachedInputTokens: 0, completionTokens: 0 },
+								tier2: { promptTokens: 0, cachedInputTokens: 0, completionTokens: 0 },
+							}
+						}
+
+						// Determine which tier this request falls into
+						// Tier 1: ≤ 200K tokens, Tier 2: > 200K tokens
+						if (promptTokens <= TIER_THRESHOLD) {
+							agent.cumulativeUsage.byModel[modelName].tier1.promptTokens += promptTokens
+							agent.cumulativeUsage.byModel[modelName].tier1.cachedInputTokens += cachedInputTokens
+							agent.cumulativeUsage.byModel[modelName].tier1.completionTokens += completionTokens
+						} else {
+							agent.cumulativeUsage.byModel[modelName].tier2.promptTokens += promptTokens
+							agent.cumulativeUsage.byModel[modelName].tier2.cachedInputTokens += cachedInputTokens
+							agent.cumulativeUsage.byModel[modelName].tier2.completionTokens += completionTokens
+						}
+
+						agent.cumulativeUsage.totalTokens += usage.totalTokens || 0
+
+						// Calculate cumulative costs
+						const { inputCost, outputCost, totalCost } = agent.getCumulativeCost()
+
+						// Calculate total prompt and completion tokens across all models and tiers
+						let totalPromptTokens = 0
+						let totalCompletionTokens = 0
+						let totalCachedInputTokens = 0
+						for (const modelUsage of Object.values(agent.cumulativeUsage.byModel)) {
+							totalPromptTokens += modelUsage.tier1.promptTokens + modelUsage.tier2.promptTokens
+							totalCompletionTokens +=
+								modelUsage.tier1.completionTokens + modelUsage.tier2.completionTokens
+							totalCachedInputTokens +=
+								modelUsage.tier1.cachedInputTokens + modelUsage.tier2.cachedInputTokens
+						}
+
+						// Calculate percentage of input tokens that were cached
+						const cachedPercentage =
+							totalPromptTokens > 0
+								? ((totalCachedInputTokens / totalPromptTokens) * 100).toFixed(1)
+								: '0.0'
+
+						// Build input cost string with cached breakdown if applicable
+						const inputCostStr =
+							totalCachedInputTokens > 0
+								? `Input: $${inputCost.toFixed(4)} (${cachedPercentage}% cached)`
+								: `Input: $${inputCost.toFixed(4)}`
+
+						// eslint-disable-next-line no-console
+						console.debug(
+							`🧚 Fairy "${agent.$fairyConfig.get().name}" Cumulative Usage:\n` +
+								`  Model: ${modelName}\n` +
+								`  Prompt tokens: ${totalPromptTokens.toLocaleString()}\n` +
+								`  Completion tokens: ${totalCompletionTokens.toLocaleString()}\n` +
+								`  Total tokens: ${agent.cumulativeUsage.totalTokens.toLocaleString()}\n` +
+								`  💰 Cumulative Cost: $${totalCost.toFixed(4)}\n` +
+								`     (${inputCostStr}, Output: $${outputCost.toFixed(4)})`
+						)
+					}
+					continue
+				}
+
+				editor.run(
+					() => {
+						const actionUtilType = agent.getAgentActionUtilType(action._type)
+						const actionUtil = agent.getAgentActionUtil(action._type)
+
+						// If the action is not in the wand's available actions, skip it
+						if (!(availableActions as string[]).includes(actionUtilType)) {
+							return
+						}
+
+						// helpers the agent's action
+						const transformedAction = actionUtil.sanitizeAction(action, helpers)
+						if (!transformedAction) {
+							incompleteDiff = null
+							return
+						}
+
+						// If there was a diff from an incomplete action, revert it so that we can reapply the action
+						if (incompleteDiff) {
+							const inversePrevDiff = reverseRecordsDiff(incompleteDiff)
+							editor.store.applyDiff(inversePrevDiff)
+						}
+
+						// Apply the action to the app and editor
+						const { diff, promise } = agent.act(transformedAction, helpers)
+
+						if (promise) {
+							actionPromises.push(promise)
+						}
+
+						// The the action is incomplete, save the diff so that we can revert it in the future
+						if (transformedAction.complete) {
+							incompleteDiff = null
+						} else {
+							incompleteDiff = diff
+						}
+					},
+					{
+						ignoreShapeLock: false,
+						history: 'ignore',
+					}
+				)
+			}
+			await Promise.all(actionPromises)
+		} catch (e) {
+			if (e === 'Cancelled by user' || (e instanceof Error && e.name === 'AbortError')) {
+				return
+			}
+			agent.onError(e)
+		}
+	})()
+
+	const cancel = () => {
+		cancelled = true
+		controller.abort('Cancelled by user')
+	}
+
+	return { promise: requestPromise, cancel }
+}
+
+/**
+ * Find a spawn point for the fairy that is at least 200px away from other fairies.
+ * Note: If no space can be easily found, fairies may still overlap.
+ */
+function findFairySpawnPoint(initialPosition: VecModel, editor: Editor): VecModel {
+	const existingAgents = $fairyAgentsAtom.get(editor)
+	const MIN_DISTANCE = 200
+	const INITIAL_BOX_SIZE = 200
+	const BOX_EXPANSION = 100
+
+	// Start with the provided initial position
+	let candidate = { x: initialPosition.x, y: initialPosition.y }
+	const viewportCenter = editor.getViewportPageBounds().center
+
+	// If no other fairies exist, use the center
+	if (existingAgents.length === 0) {
+		return candidate
+	}
+
+	// Try to find a valid spawn point
+	let boxSize = INITIAL_BOX_SIZE
+	let attempts = 0
+	const MAX_ATTEMPTS = 100
+
+	while (attempts < MAX_ATTEMPTS) {
+		// Check if the candidate is far enough from all existing fairies
+		const tooClose = existingAgents.some((agent) => {
+			const otherPosition = agent.$fairyEntity.get().position
+			const distance = Math.sqrt(
+				Math.pow(candidate.x - otherPosition.x, 2) + Math.pow(candidate.y - otherPosition.y, 2)
+			)
+			return distance < MIN_DISTANCE
+		})
+
+		if (!tooClose) {
+			return candidate
+		}
+
+		// Generate a new random point in an expanding box around the viewport center
+		candidate = {
+			x: viewportCenter.x + (Math.random() - 0.5) * boxSize,
+			y: viewportCenter.y + (Math.random() - 0.5) * boxSize,
+		}
+
+		// Expand the search area after every 10 attempts
+		if (attempts % 10 === 9) {
+			boxSize += BOX_EXPANSION
+		}
+
+		attempts++
+	}
+
+	// If we couldn't find a good spot, just return the candidate anyway
+	return candidate
+}
+
+/**
+ * Atom to track which fairy is currently being followed by the camera.
+ * Maps from Editor instance to the fairy ID being followed, or null if not following any fairy.
+ */
+export const $followingFairyId = new EditorAtom<string | null>('followingFairyId', () => null)
+
+/**
+ * Store for the reactive dispose functions so we can properly clean them up.
+ */
+const followDisposeHandlers = new WeakMap<Editor, () => void>()
+
+/**
+ * Get the ID of the fairy currently being followed for a given editor.
+ */
+export function getFollowingFairyId(editor: Editor): string | null {
+	return $followingFairyId.get(editor)
+}
+
+/**
+ * Start following a fairy with the camera.
+ * Similar to editor.startFollowingUser but for fairies.
+ */
+export function startFollowingFairy(editor: Editor, fairyId: string) {
+	stopFollowingFairy(editor)
+
+	const agent = getFairyAgentById(fairyId, editor)
+	if (!agent) {
+		console.warn('Could not find fairy agent with id:', fairyId)
+		return
+	}
+
+	$followingFairyId.update(editor, () => fairyId)
+
+	// Track last seen position/page to avoid redundant zooms and feedback loops
+	let lastX: number | null = null
+	let lastY: number | null = null
+	let lastPageId: string | null = null
+
+	const disposeFollow = react('follow fairy', () => {
+		const currentFairyId = getFollowingFairyId(editor)
+		if (currentFairyId !== fairyId) {
+			// We're no longer following this fairy
+			return
+		}
+
+		const currentAgent = getFairyAgentById(fairyId, editor)
+		if (!currentAgent) {
+			stopFollowingFairy(editor)
+			return
+		}
+
+		const fairyEntity = currentAgent.$fairyEntity.get()
+		if (!fairyEntity) {
+			stopFollowingFairy(editor)
+			return
+		}
+
+		// Only react when position or page actually changes
+		const { x, y } = fairyEntity.position
+		const pageId = fairyEntity.currentPageId
+		const EPS = 0.5
+		const samePage = lastPageId === pageId
+		const sameX = lastX !== null && Math.abs(lastX - x) < EPS
+		const sameY = lastY !== null && Math.abs(lastY - y) < EPS
+		if (samePage && sameX && sameY) return
+
+		lastX = x
+		lastY = y
+		lastPageId = pageId
+
+		currentAgent.zoomTo()
+	})
+
+	// Listen for user input events that should stop following
+	const onWheel = () => stopFollowingFairy(editor)
+	document.addEventListener('wheel', onWheel, { passive: false, capture: true })
+
+	// Also stop following when the user manually changes pages
+	const disposePageChange = react('stop following on page change', () => {
+		const currentPageId = editor.getCurrentPageId()
+
+		// Skip initial page check
+		if (!lastPageId) {
+			return
+		}
+
+		// If user changed page manually (not from following), stop following
+		const currentAgent = getFairyAgentById(fairyId, editor)
+		if (currentAgent) {
+			const fairyPageId = currentAgent.$fairyEntity.get()?.currentPageId
+			if (currentPageId !== fairyPageId && currentPageId !== lastPageId) {
+				stopFollowingFairy(editor)
+			}
+		}
+	})
+
+	// Store dispose functions so we can clean them up later
+	const dispose = () => {
+		disposeFollow()
+		disposePageChange()
+		document.removeEventListener('wheel', onWheel)
+	}
+	followDisposeHandlers.set(editor, dispose)
+}
+
+/**
+ * Stop following any fairy with the camera.
+ */
+export function stopFollowingFairy(editor: Editor) {
+	const dispose = followDisposeHandlers.get(editor)
+	if (dispose) {
+		dispose()
+		followDisposeHandlers.delete(editor)
+	}
+	$followingFairyId.update(editor, () => null)
+}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyAgentOptions.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyAgentOptions.ts
new file mode 100644
index 000000000000..0ea0cfe0dbe5
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyAgentOptions.ts
@@ -0,0 +1,15 @@
+import { Editor } from 'tldraw'
+import { TldrawApp } from '../../../tla/app/TldrawApp'
+
+export interface FairyAgentOptions {
+	/** The editor to associate the agent with. */
+	editor: Editor
+	/** The app to associate the agent with. */
+	app: TldrawApp
+	/** A key used to differentiate the agent from other agents. */
+	id: string
+	/** A callback for when an error occurs. */
+	onError(e: any): void
+	/** A function to get the authentication token. */
+	getToken?(): Promise<string | undefined>
+}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyModeNode.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyModeNode.ts
new file mode 100644
index 000000000000..44ece9b2b3bf
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/fairy-agent/agent/FairyModeNode.ts
@@ -0,0 +1,217 @@
+import { AgentRequest, FairyModeDefinition } from '@tldraw/fairy-shared'
+import { $fairyTasks } from '../../FairyTaskList'
+import { FairyAgent } from './FairyAgent'
+import { $fairyAgentsAtom } from './fairyAgentsAtom'
+
+export interface FairyModeNode {
+	onEnter?(agent: FairyAgent, fromMode: FairyModeDefinition['type']): void
+	onExit?(agent: FairyAgent, toMode: FairyModeDefinition['type']): void
+	onPromptStart?(agent: FairyAgent, request: AgentRequest): void
+	onPromptEnd?(agent: FairyAgent, request: AgentRequest): void
+	onPromptCancel?(agent: FairyAgent, request: AgentRequest): void
+}
+
+export const FAIRY_MODE_CHART: Record<FairyModeDefinition['type'], FairyModeNode> = {
+	idling: {
+		onPromptStart(agent) {
+			// Start timing if enabled
+			const debugFlags = agent.$debugFlags.get()
+			if (debugFlags.logResponseTime && agent.promptStartTime === null) {
+				agent.promptStartTime = performance.now()
+			}
+
+			agent.setMode('soloing')
+		},
+		onEnter(agent) {
+			agent.$personalTodoList.set([])
+			agent.$userActionHistory.set([])
+		},
+	},
+	soloing: {
+		onPromptEnd(agent) {
+			// Stop timing and log
+			if (agent.promptStartTime !== null) {
+				const endTime = performance.now()
+				const duration = (endTime - agent.promptStartTime) / 1000
+				const fairyName = agent.$fairyConfig.get().name
+				// eslint-disable-next-line no-console
+				console.log(`🧚 Fairy "${fairyName}" prompt completed in ${duration.toFixed(2)}s`)
+				agent.promptStartTime = null
+			}
+
+			// Continue if there are outstanding tasks
+			const myTasks = $fairyTasks.get().filter((task) => task.assignedTo === agent.id)
+			const incompleteTasks = myTasks.filter((task) => task.status !== 'done')
+			if (incompleteTasks.length > 0) {
+				agent.schedule('Continue until all tasks are marked as complete.')
+			} else {
+				agent.setMode('idling')
+			}
+		},
+		onPromptCancel(agent) {
+			// Stop timing and log
+			if (agent.promptStartTime !== null) {
+				const endTime = performance.now()
+				const duration = (endTime - agent.promptStartTime) / 1000
+				const fairyName = agent.$fairyConfig.get().name
+				// eslint-disable-next-line no-console
+				console.log(`🧚 Fairy "${fairyName}" prompt completed in ${duration.toFixed(2)}s`)
+				agent.promptStartTime = null
+			}
+
+			agent.setMode('idling')
+		},
+	},
+	['standing-by']: {},
+	['working-drone']: {
+		onEnter(agent) {
+			agent.$userActionHistory.set([])
+			agent.$personalTodoList.set([])
+		},
+		onExit(agent) {
+			agent.$userActionHistory.set([])
+			agent.$personalTodoList.set([])
+		},
+		onPromptEnd(agent, request) {
+			// Keep going until the task is complete
+			agent.schedule({
+				message: 'Continue until the task is marked as done.',
+				bounds: request.bounds,
+			})
+		},
+		onPromptCancel() {
+			throw new Error('Cannot cancel a fairy mid-project. Clear the project first.')
+		},
+	},
+	['working-solo']: {
+		onEnter(agent) {
+			agent.$userActionHistory.set([])
+			agent.flushTodoList()
+		},
+		onExit(agent) {
+			// Wipe todo list after finishing a task
+			agent.$userActionHistory.set([])
+			agent.flushTodoList()
+		},
+		onPromptEnd(agent, request) {
+			// Keep going until the task is complete
+			agent.schedule({
+				message: 'Continue until the task is marked as done.',
+				bounds: request.bounds,
+			})
+		},
+		onPromptCancel(agent) {
+			agent.setMode('idling')
+		},
+	},
+	['orchestrating-active']: {
+		onPromptEnd(agent) {
+			if (agent.$waitingFor.get().length > 0) {
+				const project = agent.getProject()
+				if (!project) {
+					// This should never happen
+					agent.setMode('idling')
+					return
+				}
+
+				const members = project.members.filter((member) => member.id !== agent.id)
+				const memberAgents = $fairyAgentsAtom
+					.get(agent.editor)
+					.filter((agent) => members.some((member) => member.id === agent.id))
+				const activeMemberAgents = memberAgents.filter((agent) => agent.isGenerating())
+
+				// If there are no active members, we need to deploy someone again probably!
+				if (activeMemberAgents.length === 0) {
+					agent.schedule(
+						'No one is currently working on tasks. Consider deploying someone again, or end the project if all tasks are complete.'
+					)
+					return
+				}
+
+				// Wait for all other members to finish their tasks
+				agent.setMode('orchestrating-waiting')
+				return
+			}
+
+			if (agent.$waitingFor.get().length === 0) {
+				agent.schedule('Continue reviewing until the project is marked as completed.')
+			}
+		},
+		onPromptCancel() {
+			throw new Error('Cannot cancel a fairy mid-project. Clear the project first.')
+		},
+	},
+	['orchestrating-waiting']: {
+		onPromptStart(agent) {
+			agent.setMode('orchestrating-active')
+		},
+	},
+	['duo-orchestrating-active']: {
+		onPromptEnd(agent) {
+			if (agent.$waitingFor.get().length > 0) {
+				const project = agent.getProject()
+				if (!project) {
+					// This should never happen
+					agent.setMode('idling')
+					return
+				}
+
+				const partner = project.members.find((member) => member.id !== agent.id)
+				if (!partner) {
+					agent.setMode('idling')
+					return
+				}
+
+				const partnerAgent = $fairyAgentsAtom.get(agent.editor).find((a) => a.id === partner.id)
+				if (!partnerAgent) {
+					agent.setMode('idling')
+					return
+				}
+
+				// If partner is not active, we might need to deploy them again or continue ourselves
+				if (!partnerAgent.isGenerating()) {
+					agent.schedule(
+						'Your partner is not currently working on tasks. Consider directing them to start a task, starting a task yourself, or ending the project if all tasks are complete.'
+					)
+					return
+				}
+
+				// Wait for partner to finish their tasks
+				agent.setMode('duo-orchestrating-waiting')
+				return
+			}
+
+			if (agent.$waitingFor.get().length === 0) {
+				agent.schedule('Continue reviewing until the project is marked as completed.')
+			}
+		},
+		onPromptCancel() {
+			throw new Error('Cannot cancel a fairy mid-project. Clear the project first.')
+		},
+	},
+	['duo-orchestrating-waiting']: {
+		onPromptStart(agent) {
+			agent.setMode('duo-orchestrating-active')
+		},
+	},
+	['working-orchestrator']: {
+		onEnter(agent) {
+			agent.$userActionHistory.set([])
+			agent.$personalTodoList.set([])
+		},
+		onExit(agent) {
+			agent.$userActionHistory.set([])
+			agent.$personalTodoList.set([])
+		},
+		onPromptEnd(agent, request) {
+			// Keep going until the task is complete
+			agent.schedule({
+				message: 'Continue until the task is marked as done.',
+				bounds: request.bounds,
+			})
+		},
+		onPromptCancel() {
+			throw new Error('Cannot cancel a fairy mid-project. Clear the project first.')
+		},
+	},
+}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/agent/TldrawFairyAgent.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/TldrawFairyAgent.ts
deleted file mode 100644
index 7786d07f0272..000000000000
--- a/apps/dotcom/client/src/fairy/fairy-agent/agent/TldrawFairyAgent.ts
+++ /dev/null
@@ -1,1115 +0,0 @@
-import {
-	AgentAction,
-	AgentActionInfo,
-	AgentActionUtil,
-	AgentHelpers,
-	AgentInput,
-	AgentModelName,
-	AgentPrompt,
-	AgentRequest,
-	AreaContextItem,
-	BaseAgentPrompt,
-	ChatHistoryItem,
-	ContextItem,
-	DEFAULT_FAIRY_ACTIONS,
-	DEFAULT_FAIRY_PROMPT_PARTS,
-	DEFAULT_FAIRY_VISION,
-	DEFAULT_MODEL_NAME,
-	FairyEntity,
-	FocusedShape,
-	getAgentActionUtilsRecordByTypes,
-	getPromptPartUtilsRecordByTypes,
-	TldrawFairyAgent as ITldrawFairyAgent,
-	PointContextItem,
-	PromptPart,
-	PromptPartUtil,
-	ShapeContextItem,
-	ShapesContextItem,
-	Streaming,
-	TldrawFairyAgentOptions,
-	TodoItem,
-} from '@tldraw/fairy-shared'
-import {
-	Atom,
-	atom,
-	Box,
-	BoxModel,
-	computed,
-	Editor,
-	fetch,
-	getFromLocalStorage,
-	react,
-	RecordsDiff,
-	reverseRecordsDiff,
-	setInLocalStorage,
-	structuredClone,
-	TLRecord,
-	Vec,
-	VecModel,
-} from 'tldraw'
-import { FAIRY_WORKER } from '../../../utils/config'
-import { $fairyAgentsAtom } from './fairyAgentsAtom'
-
-/**
- * An agent that can be prompted to edit the canvas.
- * Returned by the `useTldrawAgent` hook.
- *
- * @example
- * ```tsx
- * const agent = useTldrawAgent(editor)
- * agent.prompt({ message: 'Draw a snowman' })
- * ```
- */
-export class TldrawFairyAgent implements ITldrawFairyAgent {
-	/** The editor associated with this agent. */
-	editor: Editor
-
-	/** An id to differentiate the agent from other agents. */
-	id: string
-
-	/** The fairy associated with this agent. */
-	$fairy: Atom<FairyEntity>
-
-	/** A callback for when an error occurs. */
-	onError: (e: any) => void
-
-	/** A function to get the authentication token. */
-	getToken?: () => Promise<string | undefined>
-
-	/**
-	 * An atom containing the currently active request.
-	 * This is mainly used to render highlights and other UI elements.
-	 */
-	$activeRequest = atom<AgentRequest | null>('activeRequest', null)
-
-	/**
-	 * An atom containing the next request that the agent has scheduled for
-	 * itself. Null if there is no scheduled request.
-	 */
-	$scheduledRequest = atom<AgentRequest | null>('scheduledRequest', null)
-
-	/**
-	 * An atom containing the agent's chat history.
-	 */
-	$chatHistory = atom<ChatHistoryItem[]>('chatHistory', [])
-
-	/**
-	 * An atom containing the position on the page where the current chat
-	 * started.
-	 */
-	$chatOrigin = atom<VecModel>('chatOrigin', { x: 0, y: 0 })
-
-	/**
-	 * An atom containing the agent's todo list.
-	 */
-	$todoList = atom<TodoItem[]>('todoList', [])
-
-	/**
-	 * An atom that's used to store document changes made by the user since the
-	 * previous request.
-	 */
-	$userActionHistory = atom<RecordsDiff<TLRecord>[]>('userActionHistory', [])
-
-	/**
-	 * An atom containing currently selected context items.
-	 *
-	 * To send context items to the model, include them in the `contextItems`
-	 * field of a request.
-	 */
-	$contextItems = atom<ContextItem[]>('contextItems', [])
-
-	/**
-	 * An atom containing the model name that the user has selected. This gets
-	 * passed through to prompts unless manually overridden.
-	 *
-	 * Note: Prompt part utils may ignore or override this value. See the
-	 * ModelNamePartUtil for an example.
-	 */
-	$modelName = atom<AgentModelName>('modelName', DEFAULT_MODEL_NAME)
-
-	private stopReactingToActions: () => void
-	private stopReactingToParts: () => void
-
-	/**
-	 * Create a new tldraw agent.
-	 */
-	constructor({ editor, id, onError, getToken }: TldrawFairyAgentOptions) {
-		this.editor = editor
-		this.id = id
-		this.getToken = getToken
-
-		const availableActions = DEFAULT_FAIRY_ACTIONS
-		const availableParts = DEFAULT_FAIRY_PROMPT_PARTS
-
-		this.$fairy = atom<FairyEntity>(`fairy-${id}`, {
-			position: { x: 0, y: 0 },
-			flipX: false,
-			isSelected: false,
-			pose: 'idle',
-			actions: availableActions,
-			parts: availableParts,
-		})
-
-		this.onError = onError
-
-		$fairyAgentsAtom.update(editor, (agents) => [...agents, this])
-
-		// This below can probably be cleaned up a bit
-
-		// Source of truth for the actions and parts are the values in the $fairy atom
-		const computedActions = computed('computedActions', () => this.$fairy.get().actions)
-		const computedParts = computed('computedParts', () => this.$fairy.get().parts)
-
-		// Change the utils only if the actions or parts have changed
-		const stopReactingToActionsFn = react('update available actions', () => {
-			this.agentActionUtils = getAgentActionUtilsRecordByTypes(computedActions.get(), this)
-		})
-		this.stopReactingToActions = stopReactingToActionsFn
-
-		const stopReactingToPartsFn = react('update available parts', () => {
-			this.promptPartUtils = getPromptPartUtilsRecordByTypes(computedParts.get(), this)
-		})
-		this.stopReactingToParts = stopReactingToPartsFn
-
-		// Some of this might be vestigal
-		this.agentActionUtils = getAgentActionUtilsRecordByTypes(availableActions, this)
-		this.promptPartUtils = getPromptPartUtilsRecordByTypes(availableParts, this)
-		this.unknownActionUtil = this.agentActionUtils.unknown
-
-		persistAtomInLocalStorage(this.$chatHistory, `${id}:chat-history`)
-		persistAtomInLocalStorage(this.$chatOrigin, `${id}:chat-origin`)
-		persistAtomInLocalStorage(this.$modelName, `${id}:model-name`)
-		persistAtomInLocalStorage(this.$todoList, `${id}:todo-items`)
-		persistAtomInLocalStorage(this.$contextItems, `${id}:context-items`)
-		persistAtomInLocalStorage(this.$fairy, `${id}:fairy`)
-
-		this.stopRecordingFn = this.startRecordingUserActions()
-	}
-
-	/**
-	 * Dispose of the agent by cancelling requests and stopping listeners.
-	 */
-	dispose() {
-		this.cancel()
-		this.stopRecordingUserActions()
-		this.stopReactingToActions()
-		this.stopReactingToParts()
-		$fairyAgentsAtom.update(this.editor, (agents) => agents.filter((agent) => agent.id !== this.id))
-	}
-
-	/**
-	 * Get an agent action util for a specific action type.
-	 *
-	 * @param type - The type of action to get the util for.
-	 * @returns The action util.
-	 */
-	getAgentActionUtil(type?: string) {
-		const utilType = this.getAgentActionUtilType(type)
-		return this.agentActionUtils[utilType]
-	}
-
-	/**
-	 * Get the util type for a provided action type.
-	 * If no util type is found, returns 'unknown'.
-	 */
-	getAgentActionUtilType(type?: string) {
-		if (!type) return 'unknown'
-		const util = this.agentActionUtils[type as AgentAction['_type']]
-		if (!util) return 'unknown'
-		return type as AgentAction['_type']
-	}
-
-	/**
-	 * Get a prompt part util for a specific part type.
-	 *
-	 * @param type - The type of part to get the util for.
-	 * @returns The part util.
-	 */
-	getPromptPartUtil(type: PromptPart['type']) {
-		return this.promptPartUtils[type]
-	}
-
-	/**
-	 * A record of the agent's action util instances.
-	 * Used by the `getAgentActionUtil` method.
-	 */
-	agentActionUtils: Record<AgentAction['_type'], AgentActionUtil<AgentAction>>
-
-	/**
-	 * The agent action util instance for the "unknown" action type.
-	 *
-	 * This is returned by the `getAgentActionUtil` method when the action type
-	 * isn't properly specified. This can happen if the model isn't finished
-	 * streaming yet or makes a mistake.
-	 */
-	unknownActionUtil: AgentActionUtil<AgentAction>
-
-	/**
-	 * A record of the agent's prompt part util instances.
-	 * Used by the `getPromptPartUtil` method.
-	 */
-	promptPartUtils: Record<PromptPart['type'], PromptPartUtil<PromptPart>>
-
-	/**
-	 * Get a full agent request from a user input by filling out any missing
-	 * values with defaults.
-	 * @param input - A partial agent request or a string message.
-	 */
-	getFullRequestFromInput(input: AgentInput): AgentRequest {
-		const request = this.getPartialRequestFromInput(input)
-
-		const activeRequest = this.$activeRequest.get()
-		return {
-			type: request.type ?? 'user',
-			messages: request.messages ?? [],
-			data: request.data ?? [],
-			selectedShapes: request.selectedShapes ?? [],
-			contextItems: request.contextItems ?? [],
-			bounds:
-				request.bounds ??
-				activeRequest?.bounds ??
-				Box.FromCenter(this.$fairy.get().position, DEFAULT_FAIRY_VISION),
-			// this.editor.getViewportPageBounds(),
-			modelName: request.modelName ?? activeRequest?.modelName ?? this.$modelName.get(),
-		}
-	}
-
-	/**
-	 * Convert an input into a partial request.
-	 * This involves handling the various ways that the input can be provided.
-	 *
-	 * @example
-	 * ```tsx
-	 * agent.prompt('Draw a cat')
-	 * agent.prompt(['Draw a cat', 'Draw a dog'])
-	 * agent.prompt({ messages: 'Draw a cat' })
-	 * agent.prompt({ message: 'Draw a cat' })
-	 * ```
-	 *
-	 * @param input - The input to get the request partial from.
-	 * @returns The request partial.
-	 */
-	private getPartialRequestFromInput(input: AgentInput): Partial<AgentRequest> {
-		// eg: agent.prompt('Draw a cat')
-		if (typeof input === 'string') {
-			return { messages: [input] }
-		}
-
-		// eg: agent.prompt(['Draw a cat', 'Draw a dog'])
-		if (Array.isArray(input)) {
-			return { messages: input }
-		}
-
-		// eg: agent.prompt({ messages: 'Draw a cat' })
-		if (typeof input.messages === 'string') {
-			return { ...input, messages: [input.messages] }
-		}
-
-		// eg: agent.prompt({ message: 'Draw a cat' })
-		if (typeof input.message === 'string') {
-			return { ...input, messages: [input.message, ...(input.messages ?? [])] }
-		}
-
-		return input
-	}
-
-	/**
-	 * Get a full prompt based on a request.
-	 *
-	 * @param request - The request to use for the prompt.
-	 * @param helpers - The helpers to use.
-	 * @returns The fully assembled prompt.
-	 */
-	async preparePrompt(request: AgentRequest, helpers: AgentHelpers): Promise<AgentPrompt> {
-		const { promptPartUtils } = this
-		const transformedParts: PromptPart[] = []
-
-		for (const util of Object.values(promptPartUtils)) {
-			const part = await util.getPart(structuredClone(request), helpers, this.$fairy.get().parts)
-			if (!part) continue
-			transformedParts.push(part)
-		}
-
-		return Object.fromEntries(transformedParts.map((part) => [part.type, part])) as AgentPrompt
-	}
-
-	/**
-	 * Prompt the agent to edit the canvas.
-	 *
-	 * @example
-	 * ```tsx
-	 * const agent = useTldrawAgent(editor)
-	 * agent.prompt('Draw a cat')
-	 * ```
-	 *
-	 * ```tsx
-	 * agent.prompt({
-	 *   message: 'Draw a cat in this area',
-	 *   bounds: {
-	 *     x: 0,
-	 *     y: 0,
-	 *     w: 300,
-	 *     h: 400,
-	 *   },
-	 * })
-	 * ```
-	 *
-	 * @returns A promise for when the agent has finished its work.
-	 */
-	async prompt(input: AgentInput) {
-		if (this.$fairy.get().pose === 'idle') {
-			this.$fairy.update((fairy) => ({ ...fairy, pose: 'active' }))
-		}
-		const request = this.getFullRequestFromInput(input)
-
-		// Submit the request to the agent.
-		await this.request(request)
-
-		// After the request is handled, check if there are any outstanding todo items or requests
-		let scheduledRequest = this.$scheduledRequest.get()
-		const todoItemsRemaining = this.$todoList.get().filter((item) => item.status !== 'done')
-
-		if (!scheduledRequest) {
-			// If there no outstanding todo items or requests, finish
-			if (todoItemsRemaining.length === 0 || !this.cancelFn) {
-				this.$fairy.update((fairy) => ({ ...fairy, pose: 'idle' }))
-				this.moveToBounds(request.bounds)
-				return
-			}
-
-			// If there are outstanding todo items, schedule a request
-			scheduledRequest = {
-				messages: request.messages,
-				contextItems: request.contextItems,
-				bounds: request.bounds,
-				modelName: request.modelName,
-				selectedShapes: request.selectedShapes,
-				data: request.data,
-				type: 'todo',
-			}
-		}
-
-		// Add the scheduled request to chat history
-		const resolvedData = await Promise.all(scheduledRequest.data)
-		this.$chatHistory.update((prev) => [
-			...prev,
-			{
-				type: 'continuation',
-				data: resolvedData,
-			},
-		])
-
-		// Handle the scheduled request
-		this.$scheduledRequest.set(null)
-		await this.prompt(scheduledRequest)
-	}
-
-	/**
-	 * Send a single request to the agent and handle its response.
-	 *
-	 * Note: This method does not chain multiple requests together. For a full
-	 * agentic system, use the `prompt` method.
-	 *
-	 * Most developers will not want to use this method directly. It's mostly
-	 * used internally by the `prompt` method, but can also be useful for
-	 * carrying out evals.
-	 *
-	 * @param input - The input to form the request from.
-	 * @returns A promise for when the request is complete and a cancel function
-	 * to abort the request.
-	 */
-	async request(input: AgentInput) {
-		const request = this.getFullRequestFromInput(input)
-
-		// Interrupt any currently active request
-		if (this.$activeRequest.get() !== null) {
-			this.cancel()
-		}
-		this.$activeRequest.set(request)
-
-		// Call an external helper function to request the agent
-		const { promise, cancel } = requestAgent({ agent: this, request })
-
-		this.cancelFn = cancel
-		promise.finally(() => {
-			this.cancelFn = null
-		})
-
-		const results = await promise
-		this.$activeRequest.set(null)
-		return results
-	}
-
-	/**
-	 * Schedule further work for the agent to do after this request has finished.
-	 * What you schedule will get merged with the currently scheduled request, if there is one.
-	 *
-	 * @example
-	 * ```tsx
-	 * // Add an instruction
-	 * agent.schedule('Add more detail.')
-	 * ```
-	 *
-	 * @example
-	 * ```tsx
-	 * // Move the viewport
-	 * agent.schedule({
-	 *  bounds: { x: 0, y: 0, w: 100, h: 100 },
-	 * })
-	 * ```
-	 *
-	 * @example
-	 * ```tsx
-	 * // Add data to the request
-	 * agent.schedule({ data: [value] })
-	 * ```
-	 */
-	schedule(input: AgentInput) {
-		const scheduledRequest = this.$scheduledRequest.get()
-
-		// If there's no request scheduled yet, schedule one
-		if (!scheduledRequest) {
-			this.setScheduledRequest(input)
-			return
-		}
-
-		const request = this.getPartialRequestFromInput(input)
-
-		this.setScheduledRequest({
-			type: 'schedule',
-
-			// Append to properties where possible
-			messages: [...scheduledRequest.messages, ...(request.messages ?? [])],
-			contextItems: [...scheduledRequest.contextItems, ...(request.contextItems ?? [])],
-			selectedShapes: [...scheduledRequest.selectedShapes, ...(request.selectedShapes ?? [])],
-			data: [...scheduledRequest.data, ...(request.data ?? [])],
-
-			// Override specific properties
-			bounds: request.bounds ?? scheduledRequest.bounds,
-			modelName: request.modelName ?? scheduledRequest.modelName,
-		})
-	}
-
-	/**
-	 * Manually override what the agent should do next.
-	 *
-	 * @example
-	 * ```tsx
-	 * agent.setScheduledRequest('Add more detail.')
-	 * ```
-	 *
-	 * @example
-	 * ```tsx
-	 * agent.setScheduledRequest({
-	 *  message: 'Add more detail to this area.',
-	 *  bounds: { x: 0, y: 0, w: 100, h: 100 },
-	 * })
-	 * ```
-	 *
-	 * @example
-	 * ```tsx
-	 * // Cancel the scheduled request
-	 * agent.setScheduledRequest(null)
-	 * ```
-	 *
-	 * @param input - What to set the scheduled request to, or null to cancel
-	 * the scheduled request.
-	 */
-	setScheduledRequest(input: AgentInput | null) {
-		if (input === null) {
-			this.$scheduledRequest.set(null)
-			return
-		}
-
-		const request = this.getFullRequestFromInput(input)
-		request.type = 'schedule'
-		this.$scheduledRequest.set(request)
-	}
-
-	/**
-	 * Add a todo item to the agent's todo list.
-	 * @param text The text of the todo item.
-	 * @returns The id of the todo item.
-	 */
-	addTodo(text: string) {
-		const id = this.$todoList.get().length
-		this.$todoList.update((todoItems) => {
-			return [
-				...todoItems,
-				{
-					id,
-					status: 'todo' as const,
-					text,
-				},
-			]
-		})
-		return id
-	}
-
-	/**
-	 * Make the agent perform an action.
-	 * @param action The action to make the agent do.
-	 * @param helpers The helpers to use.
-	 * @returns The diff of the action, a promise for when the action is finished
-	 */
-	act(
-		action: Streaming<AgentAction>,
-		helpers: AgentHelpers = new AgentHelpers(this)
-	): {
-		diff: RecordsDiff<TLRecord>
-		promise: Promise<void> | null
-	} {
-		const { editor } = this
-		const util = this.getAgentActionUtil(action._type)
-		this.isActing = true
-
-		const actionInfo = this.getActionInfo(action)
-		this.$fairy.update((fairy) => ({ ...fairy, pose: actionInfo.pose }))
-
-		let promise: Promise<void> | null = null
-		let diff: RecordsDiff<TLRecord>
-		try {
-			diff = editor.store.extractingChanges(() => {
-				promise = util.applyAction(structuredClone(action), helpers) ?? null
-			})
-		} finally {
-			this.isActing = false
-		}
-
-		// Add the action to chat history
-		if (util.savesToHistory()) {
-			const historyItem: ChatHistoryItem = {
-				type: 'action',
-				action,
-				diff,
-				acceptance: 'pending',
-			}
-
-			this.$chatHistory.update((historyItems) => {
-				// If there are no items, start off the chat history with the first item
-				if (historyItems.length === 0) return [historyItem]
-
-				// If the last item is still in progress, replace it with the new item
-				const lastHistoryItem = historyItems.at(-1)
-				if (
-					lastHistoryItem &&
-					lastHistoryItem.type === 'action' &&
-					!lastHistoryItem.action.complete
-				) {
-					return [...historyItems.slice(0, -1), historyItem]
-				}
-
-				// Otherwise, just add the new item to the end of the list
-				return [...historyItems, historyItem]
-			})
-		}
-
-		return { diff, promise }
-	}
-
-	/**
-	 * Stream a response from the model.
-	 * Act on the model's events as they come in.
-	 *
-	 * This is a helper function that is used internally by the agent.
-	 */
-	async *streamAgent({
-		prompt,
-		signal,
-	}: {
-		prompt: BaseAgentPrompt
-		signal: AbortSignal
-	}): AsyncGenerator<Streaming<AgentAction>> {
-		const headers: HeadersInit = {
-			'Content-Type': 'application/json',
-		}
-
-		// Add authentication token if available
-		if (this.getToken) {
-			const token = await this.getToken()
-			if (token) {
-				headers['Authorization'] = `Bearer ${token}`
-			}
-		}
-
-		const res = await fetch(`${FAIRY_WORKER}/stream`, {
-			method: 'POST',
-			body: JSON.stringify({
-				prompt,
-				actions: this.$fairy.get().actions,
-				parts: this.$fairy.get().parts,
-			}),
-			headers,
-			signal,
-		})
-
-		if (!res.body) {
-			throw Error('No body in response')
-		}
-
-		const reader = res.body.getReader()
-		const decoder = new TextDecoder()
-		let buffer = ''
-
-		try {
-			while (true) {
-				const { value, done } = await reader.read()
-				if (done) break
-
-				buffer += decoder.decode(value, { stream: true })
-				const actions = buffer.split('\n\n')
-				buffer = actions.pop() || ''
-
-				for (const action of actions) {
-					const match = action.match(/^data: (.+)$/m)
-					if (match) {
-						try {
-							const data = JSON.parse(match[1])
-
-							// If the response contains an error, throw it
-							if ('error' in data) {
-								throw new Error(data.error)
-							}
-
-							const agentAction: Streaming<AgentAction> = data
-							yield agentAction
-						} catch (err: any) {
-							throw new Error(err.message)
-						}
-					}
-				}
-			}
-		} finally {
-			reader.releaseLock()
-		}
-	}
-
-	/**
-	 * A function that cancels the agent's current prompt, if one is active.
-	 */
-	private cancelFn: (() => void) | null = null
-
-	/**
-	 * Cancel the agent's current prompt, if one is active.
-	 */
-	cancel() {
-		this.cancelFn?.()
-		this.$activeRequest.set(null)
-		this.$scheduledRequest.set(null)
-		this.cancelFn = null
-	}
-
-	/**
-	 * Reset the agent's chat and memory.
-	 * Cancel the current request if there's one active.
-	 */
-	reset() {
-		this.cancel()
-		this.$contextItems.set([])
-		this.$todoList.set([])
-		this.$userActionHistory.set([])
-
-		const viewport = Box.FromCenter(this.$fairy.get().position, DEFAULT_FAIRY_VISION)
-		// const viewport = this.editor.getViewportPageBounds()
-		this.$chatHistory.set([])
-		this.$chatOrigin.set({ x: viewport.x, y: viewport.y })
-	}
-
-	/**
-	 * Check if the agent is currently working on a request or not.
-	 */
-	isGenerating() {
-		return this.$activeRequest.get() !== null
-	}
-
-	/**
-	 * Whether the agent is currently acting on the editor or not.
-	 * This flag is used to prevent agent actions from being recorded as user actions.
-	 */
-	private isActing = false
-
-	/**
-	 * Start recording user actions.
-	 * @returns A cleanup function to stop recording user actions.
-	 */
-	private startRecordingUserActions() {
-		const { editor } = this
-		const cleanUpCreate = editor.sideEffects.registerAfterCreateHandler(
-			'shape',
-			(shape, source) => {
-				if (source !== 'user') return
-				if (this.isActing) return
-				const change = {
-					added: { [shape.id]: shape },
-					updated: {},
-					removed: {},
-				}
-				this.$userActionHistory.update((prev) => [...prev, change])
-				return
-			}
-		)
-
-		const cleanUpDelete = editor.sideEffects.registerAfterDeleteHandler(
-			'shape',
-			(shape, source) => {
-				if (source !== 'user') return
-				if (this.isActing) return
-				const change = {
-					added: {},
-					updated: {},
-					removed: { [shape.id]: shape },
-				}
-				this.$userActionHistory.update((prev) => [...prev, change])
-				return
-			}
-		)
-
-		const cleanUpChange = editor.sideEffects.registerAfterChangeHandler(
-			'shape',
-			(prev, next, source) => {
-				if (source !== 'user') return
-				if (this.isActing) return
-				const change: RecordsDiff<TLRecord> = {
-					added: {},
-					updated: { [prev.id]: [prev, next] },
-					removed: {},
-				}
-				this.$userActionHistory.update((prev) => [...prev, change])
-				return
-			}
-		)
-
-		function cleanUp() {
-			cleanUpCreate()
-			cleanUpDelete()
-			cleanUpChange()
-		}
-
-		return cleanUp
-	}
-
-	/**
-	 * A function that stops recording user actions.
-	 */
-	private stopRecordingFn: () => void
-
-	/**
-	 * Stop recording user actions.
-	 */
-	private stopRecordingUserActions() {
-		this.stopRecordingFn?.()
-	}
-
-	/**
-	 * Add a context item to the agent's context, ensuring that duplicates are
-	 * not included.
-	 *
-	 * @param item The context item to add.
-	 */
-	addToContext(item: ContextItem) {
-		this.$contextItems.update((items) => {
-			// Don't add shapes that are already within context
-			if (item.type === 'shapes') {
-				const newItems = dedupeShapesContextItem(item, items)
-				return [...items, ...newItems]
-			}
-
-			// Don't add items that are already in context
-			if (this.hasContextItem(item)) {
-				return items
-			}
-
-			return [...items, structuredClone(item)]
-		})
-	}
-
-	/**
-	 * Remove a context item from the agent's context.
-	 * @param item The context item to remove.
-	 */
-	removeFromContext(item: ContextItem) {
-		this.$contextItems.update((items) => items.filter((v) => item !== v))
-	}
-
-	/**
-	 * Check if the agent's context contains a specific context item. This could
-	 * mean as an individual item, or as part of a group of items.
-	 *
-	 * @param item The context item to check for.
-	 * @returns True if the agent's context contains the item, false otherwise.
-	 */
-	hasContextItem(item: ContextItem) {
-		const items = this.$contextItems.get()
-		if (items.some((v) => areContextItemsEqual(v, item))) {
-			return true
-		}
-
-		if (item.type === 'shape') {
-			for (const existingItem of items) {
-				if (existingItem.type === 'shapes') {
-					if (existingItem.shapes.some((shape) => shape.shapeId === item.shape.shapeId)) {
-						return true
-					}
-				}
-			}
-		}
-
-		return false
-	}
-
-	getActionInfo(action: Streaming<AgentAction>): AgentActionInfo {
-		const util = this.getAgentActionUtil(action._type)
-		const info = util.getInfo(action) ?? {}
-		const {
-			icon = null,
-			description = null,
-			summary = null,
-			canGroup = () => true,
-			pose = 'active' as const,
-		} = info
-
-		return {
-			icon,
-			description,
-			summary,
-			canGroup,
-			pose,
-		}
-	}
-
-	MOVE_OFFSET = { x: -70, y: 70 }
-
-	moveToPosition(position: VecModel) {
-		this.$fairy.update((fairy) => {
-			const offsetPosition = Vec.Add(position, this.MOVE_OFFSET)
-
-			// const isMovingLeft = offsetPosition.x < fairy.position.x
-			return {
-				...fairy,
-				position: offsetPosition,
-				flipX: false,
-			}
-		})
-	}
-
-	moveToBounds(bounds: BoxModel) {
-		this.$fairy.update((fairy) => {
-			const bottomLeft = new Vec(bounds.x, bounds.y + bounds.h)
-			let offsetPosition = Vec.Add(bottomLeft, this.MOVE_OFFSET)
-
-			// Check if the position is offscreen and adjust to keep it onscreen
-			const viewport = this.editor.getViewportPageBounds()
-			if (offsetPosition.x < viewport.x) {
-				offsetPosition = new Vec(viewport.x, offsetPosition.y)
-			}
-
-			return {
-				...fairy,
-				position: offsetPosition,
-				flipX: false,
-			}
-		})
-	}
-}
-
-/**
- * Send a request to the agent and handle its response.
- *
- * This is a helper function that is used internally by the agent.
- */
-function requestAgent({ agent, request }: { agent: TldrawFairyAgent; request: AgentRequest }) {
-	const { editor } = agent
-
-	// If the request is from the user, add it to chat history
-	if (request.type === 'user') {
-		const promptHistoryItem: ChatHistoryItem = {
-			type: 'prompt',
-			message: request.messages.join('\n'),
-			contextItems: request.contextItems,
-			selectedShapes: request.selectedShapes,
-		}
-		agent.$chatHistory.update((prev) => [...prev, promptHistoryItem])
-	}
-
-	let cancelled = false
-	const controller = new AbortController()
-	const signal = controller.signal
-	const helpers = new AgentHelpers(agent)
-
-	const requestPromise = (async () => {
-		const prompt = await agent.preparePrompt(request, helpers)
-		let incompleteDiff: RecordsDiff<TLRecord> | null = null
-		const actionPromises: Promise<void>[] = []
-		try {
-			for await (const action of agent.streamAgent({ prompt, signal })) {
-				if (cancelled) break
-
-				editor.run(
-					() => {
-						const actionUtil = agent.getAgentActionUtil(action._type)
-
-						// helpers the agent's action
-						const transformedAction = actionUtil.sanitizeAction(action, helpers)
-						if (!transformedAction) {
-							incompleteDiff = null
-							return
-						}
-
-						// If there was a diff from an incomplete action, revert it so that we can reapply the action
-						if (incompleteDiff) {
-							const inversePrevDiff = reverseRecordsDiff(incompleteDiff)
-							editor.store.applyDiff(inversePrevDiff)
-						}
-
-						// Apply the action to the app and editor
-						const { diff, promise } = agent.act(transformedAction, helpers)
-
-						if (promise) {
-							actionPromises.push(promise)
-						}
-
-						// The the action is incomplete, save the diff so that we can revert it in the future
-						if (transformedAction.complete) {
-							incompleteDiff = null
-						} else {
-							incompleteDiff = diff
-						}
-					},
-					{
-						ignoreShapeLock: false,
-						history: 'ignore',
-					}
-				)
-			}
-			await Promise.all(actionPromises)
-		} catch (e) {
-			if (e === 'Cancelled by user' || (e instanceof Error && e.name === 'AbortError')) {
-				return
-			}
-			agent.onError(e)
-		}
-	})()
-
-	const cancel = () => {
-		cancelled = true
-		controller.abort('Cancelled by user')
-	}
-
-	return { promise: requestPromise, cancel }
-}
-
-/**
- * Check if two context items are equal.
- *
- * This is a helper function that is used internally by the agent.
- */
-function areContextItemsEqual(a: ContextItem, b: ContextItem): boolean {
-	if (a.type !== b.type) return false
-
-	switch (a.type) {
-		case 'shape': {
-			const _b = b as ShapeContextItem
-			return a.shape.shapeId === _b.shape.shapeId
-		}
-		case 'shapes': {
-			const _b = b as ShapesContextItem
-			if (a.shapes.length !== _b.shapes.length) return false
-			return a.shapes.every((shape) => _b.shapes.find((s) => s.shapeId === shape.shapeId))
-		}
-		case 'area': {
-			const _b = b as AreaContextItem
-			return Box.Equals(a.bounds, _b.bounds)
-		}
-		case 'point': {
-			const _b = b as PointContextItem
-			return Vec.Equals(a.point, _b.point)
-		}
-		default: {
-			exhaustiveSwitchError(a)
-		}
-	}
-}
-
-/**
- * Remove duplicate shapes from a shapes context item.
- * If there's only one shape left, return it as a shape item instead.
- *
- * This is a helper function that is used internally by the agent.
- */
-function dedupeShapesContextItem(
-	item: ShapesContextItem,
-	existingItems: ContextItem[]
-): ContextItem[] {
-	// Get all shape IDs that are already in the context
-	const existingShapeIds = new Set<string>()
-
-	// Check individual shapes
-	existingItems.forEach((contextItem) => {
-		if (contextItem.type === 'shape') {
-			existingShapeIds.add(contextItem.shape.shapeId)
-		} else if (contextItem.type === 'shapes') {
-			contextItem.shapes.forEach((shape: FocusedShape) => {
-				existingShapeIds.add(shape.shapeId)
-			})
-		}
-	})
-
-	// Filter out shapes that are already in the context
-	const newShapes = item.shapes.filter((shape) => !existingShapeIds.has(shape.shapeId))
-
-	// Only add if there are remaining shapes
-	if (newShapes.length > 0) {
-		// If only one shape remains, add it as a single shape item
-		if (newShapes.length === 1) {
-			const newItem: ContextItem = {
-				type: 'shape',
-				shape: newShapes[0],
-				source: item.source,
-			}
-			return [structuredClone(newItem)]
-		}
-
-		// Otherwise add as a shapes group
-		const newItem: ContextItem = {
-			type: 'shapes',
-			shapes: newShapes,
-			source: item.source,
-		}
-		return [structuredClone(newItem)]
-	}
-
-	// No new shapes to add
-	return []
-}
-
-/**
- * Load an atom's value from local storage and persist it to local storage whenever it changes.
- *
- * This is a helper function that is used internally by the agent.
- */
-function persistAtomInLocalStorage<T>(atom: Atom<T>, key: string) {
-	try {
-		const stored = getFromLocalStorage(key)
-		if (stored) {
-			const value = JSON.parse(stored) as T
-			atom.set(value)
-		}
-	} catch {
-		console.warn(`Couldn't load ${key} from localStorage`)
-	}
-
-	react(`save ${key} to localStorage`, () => {
-		setInLocalStorage(key, JSON.stringify(atom.get()))
-	})
-}
-
-/**
- * Throw an error if a switch case is not exhaustive.
- *
- * This is a helper function that is used internally by the agent.
- */
-function exhaustiveSwitchError(value: never, property?: string): never {
-	const debugValue =
-		property && value && typeof value === 'object' && property in value ? value[property] : value
-	throw new Error(`Unknown switch case ${debugValue}`)
-}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/agent/fairyAgentsAtom.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/fairyAgentsAtom.ts
index f7c31907d484..c1cb41cb2aef 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/agent/fairyAgentsAtom.ts
+++ b/apps/dotcom/client/src/fairy/fairy-agent/agent/fairyAgentsAtom.ts
@@ -1,5 +1,5 @@
-import { EditorAtom } from 'tldraw'
-import { TldrawFairyAgent } from './TldrawFairyAgent'
+import { Editor, EditorAtom } from 'tldraw'
+import { FairyAgent } from './FairyAgent'
 
 /**
  * An atom containing all the agents attached to an editor.
@@ -7,4 +7,19 @@ import { TldrawFairyAgent } from './TldrawFairyAgent'
  * More than one agent can be attached to a single editor.
  * This starter doesn't take advantage of that, but you could.
  */
-export const $fairyAgentsAtom = new EditorAtom<TldrawFairyAgent[]>('agents', () => [])
+export const $fairyAgentsAtom = new EditorAtom<FairyAgent[]>('agents', () => [])
+
+export function getFairyAgents(editor: Editor) {
+	return $fairyAgentsAtom.get(editor)
+}
+
+export function getFairyAgentById(id: string, editor: Editor) {
+	return $fairyAgentsAtom.get(editor).find((agent) => agent.id === id)
+}
+
+export function getFairyNameById(id: string, editor: Editor) {
+	return $fairyAgentsAtom
+		.get(editor)
+		.find((agent) => agent.id === id)
+		?.$fairyConfig.get().name
+}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/agent/useTldrawFairyAgent.ts b/apps/dotcom/client/src/fairy/fairy-agent/agent/useFairyAgent.ts
similarity index 64%
rename from apps/dotcom/client/src/fairy/fairy-agent/agent/useTldrawFairyAgent.ts
rename to apps/dotcom/client/src/fairy/fairy-agent/agent/useFairyAgent.ts
index 783aaf2d2195..fd312b7303ce 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/agent/useTldrawFairyAgent.ts
+++ b/apps/dotcom/client/src/fairy/fairy-agent/agent/useFairyAgent.ts
@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from 'react'
 import { Editor, useToasts } from 'tldraw'
-import { FairyThrowTool } from '../../FairyThrowTool'
-import { TldrawFairyAgent } from './TldrawFairyAgent'
+import { useApp } from '../../../tla/hooks/useAppState'
+import { FairyAgent } from './FairyAgent'
 import { $fairyAgentsAtom } from './fairyAgentsAtom'
 
 /**
@@ -11,24 +11,29 @@ import { $fairyAgentsAtom } from './fairyAgentsAtom'
  *
  * @example
  * ```tsx
- * const agent = useTldrawAgent(editor)
+ * const agent = useFairyAgent({ fairyConfig, editor, id: 'fairy-agent', getToken })
  * agent.prompt({ message: 'Draw a snowman' })
  * ```
  *
  * @example
  * ```tsx
- * const agent1 = useTldrawAgent(editor, 'agent-1')
- * const agent2 = useTldrawAgent(editor, 'agent-2')
+ * const agent1 = useFairyAgent({ fairyConfig, editor, id: 'agent-1' })
+ * const agent2 = useFairyAgent({ fairyConfig, editor, id: 'agent-2' })
  * agent1.prompt({ message: 'Draw a snowman on the left' })
  * agent2.prompt({ message: 'Draw a snowman on the right' })
  * ```
  */
-export function useTldrawFairyAgent(
-	editor: Editor,
-	id: string = 'tldraw-fairy-agent',
-	getToken?: () => Promise<string | undefined>
-): TldrawFairyAgent {
+export function useFairyAgent({
+	id,
+	editor,
+	getToken,
+}: {
+	id: string
+	editor: Editor
+	getToken(): Promise<string | undefined>
+}): FairyAgent {
 	const toasts = useToasts()
+	const app = useApp()
 
 	const handleError = useCallback(
 		(e: any) => {
@@ -50,12 +55,9 @@ export function useTldrawFairyAgent(
 			existingAgent.dispose()
 		}
 
-		editor.removeTool(FairyThrowTool)
-		editor.setTool(FairyThrowTool)
-
 		// Create a new agent
-		return new TldrawFairyAgent({ editor, id, onError: handleError, getToken })
-	}, [editor, handleError, id, getToken])
+		return new FairyAgent({ id, editor, app, onError: handleError, getToken })
+	}, [editor, handleError, id, getToken, app])
 
 	return agent
 }
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistory.tsx b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistory.tsx
index b099354f40bd..ce31c728aba6 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistory.tsx
+++ b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistory.tsx
@@ -1,26 +1,52 @@
 import { useEffect, useRef } from 'react'
 import { useValue } from 'tldraw'
-import { TldrawFairyAgent } from '../agent/TldrawFairyAgent'
+import { FairyAgent } from '../agent/FairyAgent'
 import { FairyChatHistorySection, getAgentHistorySections } from './FairyChatHistorySection'
 
-export function FairyChatHistory({ agent }: { agent: TldrawFairyAgent }) {
+/*
+Chat history is stored as a list of history items.
+
+Within the UI, we split this list of items into sections.
+Each section contains a user prompt item, and all the agent's actions that follow it.
+
+Each section is rendered as a separate component.
+The model's actions are grouped together into collapsible groups if appropriate.
+
+
+Here's an example of how the UI might look:
+
+- Chat history
+	- Section 
+		- Prompt
+		- Action group
+			- Action
+			- Action
+		- Action group
+			- Action
+	- Section
+		- Prompt
+		- Action group
+			- Action
+
+*/
+
+export function FairyChatHistory({ agent }: { agent: FairyAgent }) {
 	const historyItems = useValue(agent.$chatHistory)
 	const sections = getAgentHistorySections(historyItems)
 	const historyRef = useRef<HTMLDivElement>(null)
 	const previousScrollDistanceFromBottomRef = useRef(0)
-	const isGenerating = useValue('isGenerating', () => agent.isGenerating(), [agent])
 
 	useEffect(() => {
 		if (!historyRef.current) return
 
+		// If a new prompt is submitted by the user, scroll to the bottom
 		if (historyItems.at(-1)?.type === 'prompt') {
-			if (previousScrollDistanceFromBottomRef.current <= 0) {
-				historyRef.current.scrollTo(0, historyRef.current.scrollHeight)
-				previousScrollDistanceFromBottomRef.current = 0
-			}
+			historyRef.current.scrollTo(0, historyRef.current.scrollHeight)
+			previousScrollDistanceFromBottomRef.current = 0
 			return
 		}
 
+		// If the user is scrolled to the bottom, keep them there while new actions appear
 		if (previousScrollDistanceFromBottomRef.current <= 0) {
 			const scrollDistanceFromBottom =
 				historyRef.current.scrollHeight -
@@ -29,11 +55,11 @@ export function FairyChatHistory({ agent }: { agent: TldrawFairyAgent }) {
 
 			if (scrollDistanceFromBottom > 0) {
 				historyRef.current.scrollTo(0, historyRef.current.scrollHeight)
-				previousScrollDistanceFromBottomRef.current = 0
 			}
 		}
-	}, [historyRef, historyItems, isGenerating])
+	}, [historyRef, historyItems])
 
+	// Keep track of the user's scroll position
 	const handleScroll = () => {
 		if (!historyRef.current) return
 		const scrollDistanceFromBottom =
@@ -46,21 +72,11 @@ export function FairyChatHistory({ agent }: { agent: TldrawFairyAgent }) {
 
 	return (
 		<div className="fairy-chat-history" ref={historyRef} onScroll={handleScroll}>
-			{sections.length === 0 ? (
-				<div className="fairy-chat-empty"></div>
-			) : (
-				sections.map((section: FairyChatHistorySection, i: number) => {
-					const isLastSection = i === sections.length - 1
-					return (
-						<FairyChatHistorySection
-							key={'history-section-' + i}
-							section={section}
-							agent={agent}
-							loading={isGenerating && isLastSection}
-						/>
-					)
-				})
-			)}
+			{sections.map((section, i) => {
+				return (
+					<FairyChatHistorySection key={'history-section-' + i} section={section} agent={agent} />
+				)
+			})}
 		</div>
 	)
 }
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryAction.tsx b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryAction.tsx
index 7082203d141a..480d76e1e8bf 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryAction.tsx
+++ b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryAction.tsx
@@ -1,12 +1,13 @@
-import { AgentIcon, ChatHistoryActionItem, TldrawFairyAgent } from '@tldraw/fairy-shared'
-import { getActionInfo } from './getActionInfo'
+import { AgentIcon, ChatHistoryActionItem } from '@tldraw/fairy-shared'
+import Markdown from 'react-markdown'
+import { FairyAgent } from '../agent/FairyAgent'
 
 export function FairyChatHistoryAction({
 	item,
 	agent,
 }: {
 	item: ChatHistoryActionItem
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 }) {
 	const { action } = item
 
@@ -22,10 +23,10 @@ function FairyChatHistoryMessageDisplay({
 	agent,
 }: {
 	item: ChatHistoryActionItem
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 }) {
 	const { action } = item
-	const info = getActionInfo(action, agent)
+	const info = agent.getActionInfo(action)
 	const content = info.description
 
 	if (!content) return null
@@ -33,7 +34,7 @@ function FairyChatHistoryMessageDisplay({
 	return (
 		<div className="fairy-chat-history-action">
 			<div className="fairy-chat-history-action-content fairy-chat-history-action-message">
-				{content}
+				<Markdown>{content}</Markdown>
 			</div>
 		</div>
 	)
@@ -44,14 +45,14 @@ function FairyChatHistoryActionDisplay({
 	agent,
 }: {
 	item: ChatHistoryActionItem
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 }) {
 	const { action } = item
-	if (action._type === 'update-todo-list') return null
-	const info = getActionInfo(action, agent)
+	// if (action._type === 'update-shared-todo-list') return null
+	const info = agent.getActionInfo(action)
 
 	const displayText =
-		info.summary || info.description || formatActionName(action._type || 'unknown')
+		info.description || info.summary || formatActionName(action._type || 'unknown')
 
 	return (
 		<div className="fairy-chat-history-action">
@@ -60,7 +61,9 @@ function FairyChatHistoryActionDisplay({
 					<AgentIcon type={info.icon} />
 				</div>
 			)}
-			<p>{displayText}</p>
+			<div>
+				<Markdown>{displayText}</Markdown>
+			</div>
 		</div>
 	)
 }
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryActionGroup.tsx b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryActionGroup.tsx
new file mode 100644
index 000000000000..2574d4d48091
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryActionGroup.tsx
@@ -0,0 +1,107 @@
+import { AgentIcon, ChatHistoryActionItem } from '@tldraw/fairy-shared'
+import { useState } from 'react'
+import Markdown from 'react-markdown'
+import { FairyAgent } from '../agent/FairyAgent'
+import { FairyChatHistoryAction } from './FairyChatHistoryAction'
+
+export interface FairyChatHistoryActionGroup {
+	items: ChatHistoryActionItem[]
+}
+
+export function FairyChatHistoryActionGroup({
+	items,
+	agent,
+}: {
+	items: ChatHistoryActionItem[]
+	agent: FairyAgent
+}) {
+	// Track collapsed state for each action segment
+	const [collapsedSegments, setCollapsedSegments] = useState<Record<number, boolean>>({})
+
+	// Split items into segments by message actions
+	// Normal actions get grouped in dropdowns, messages render on their own
+	type Segment =
+		| { type: 'actions'; items: ChatHistoryActionItem[] }
+		| { type: 'message'; item: ChatHistoryActionItem }
+
+	const segments: Segment[] = []
+	let currentActionSegment: ChatHistoryActionItem[] = []
+
+	for (const item of items) {
+		if (item.action._type === 'message') {
+			// Flush any accumulated actions
+			if (currentActionSegment.length > 0) {
+				segments.push({ type: 'actions', items: currentActionSegment })
+				currentActionSegment = []
+			}
+			// Add the message as its own segment
+			segments.push({ type: 'message', item })
+		} else {
+			// Accumulate non-message actions
+			currentActionSegment.push(item)
+		}
+	}
+
+	// Flush any remaining actions
+	if (currentActionSegment.length > 0) {
+		segments.push({ type: 'actions', items: currentActionSegment })
+	}
+
+	return (
+		<div className="fairy-chat-history-group">
+			{segments.map((segment, segmentIdx) => {
+				if (segment.type === 'message') {
+					// Render message without group UI
+					return (
+						<FairyChatHistoryAction
+							item={segment.item}
+							agent={agent}
+							key={`segment-${segmentIdx}-message`}
+						/>
+					)
+				} else {
+					// Render actions group with dropdown
+					const segmentItems = segment.items
+					const segmentComplete = segmentItems.every((item) => item.action.complete)
+					const segmentTime = segmentItems.reduce((acc, item) => acc + item.action.time, 0)
+					const segmentTimeSeconds = Math.floor(segmentTime / 1000)
+					const verb = segmentComplete ? 'Worked' : 'Working'
+					const segmentSummary =
+						segmentTimeSeconds === 0
+							? `${verb} for less than a second`
+							: segmentTimeSeconds === 1
+								? `${verb} for 1 second`
+								: `${verb} for ${segmentTimeSeconds} seconds`
+
+					// Each segment has its own collapsed state (defaults to true = collapsed)
+					const isCollapsed = collapsedSegments[segmentIdx] ?? true
+					const toggleCollapsed = () => {
+						setCollapsedSegments((prev) => ({
+							...prev,
+							[segmentIdx]: !isCollapsed,
+						}))
+					}
+
+					return (
+						<div
+							className="fairy-chat-history-group-toggle-and-items"
+							key={`segment-${segmentIdx}-actions`}
+						>
+							<button className="fairy-chat-history-group-toggle" onClick={toggleCollapsed}>
+								<AgentIcon type={isCollapsed ? 'chevron-right' : 'chevron-down'} />
+								<Markdown>{segmentSummary}</Markdown>
+							</button>
+							{!isCollapsed && (
+								<div className="fairy-chat-history-group-items">
+									{segmentItems.map((item, i) => {
+										return <FairyChatHistoryAction item={item} agent={agent} key={'action-' + i} />
+									})}
+								</div>
+							)}
+						</div>
+					)
+				}
+			})}
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryGroup.tsx b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryGroup.tsx
index e76f7be01724..7b33fbfe74f2 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryGroup.tsx
+++ b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryGroup.tsx
@@ -1,7 +1,7 @@
-import { AgentIcon, ChatHistoryActionItem, TldrawFairyAgent } from '@tldraw/fairy-shared'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { AgentIcon, ChatHistoryActionItem } from '@tldraw/fairy-shared'
+import { useMemo, useState } from 'react'
+import { FairyAgent } from '../agent/FairyAgent'
 import { FairyChatHistoryAction } from './FairyChatHistoryAction'
-import { getActionInfo } from './getActionInfo'
 
 export interface FairyChatHistoryGroup {
 	items: ChatHistoryActionItem[]
@@ -12,79 +12,40 @@ export function FairyChatHistoryGroup({
 	agent,
 }: {
 	group: FairyChatHistoryGroup
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 }) {
 	const { items } = group
 
 	const nonEmptyItems = useMemo(() => {
 		return items.filter((item) => {
-			const { description } = getActionInfo(item.action, agent)
+			const { description } = agent.getActionInfo(item.action)
 			return description !== null
 		})
 	}, [items, agent])
 
-	// For rendering, only show complete actions (but keep incomplete ones in items for timing)
-	const completeNonEmptyItems = useMemo(() => {
-		return nonEmptyItems.filter((item) => {
-			// Always show messages, even if incomplete
-			if (item.action._type === 'message') return true
-			// Only show other actions if they're complete
-			return item.action.complete
-		})
-	}, [nonEmptyItems])
-
 	const [collapsed, setCollapsed] = useState(true)
 
 	const complete = useMemo(() => {
 		return items.every((item) => item.action.complete)
 	}, [items])
 
-	const [_tick, setTick] = useState(0)
-
-	// Track the last time we got an update from the server
-	const lastServerTimeRef = useRef(0)
-	const lastUpdateAtRef = useRef(Date.now())
-
-	const currentServerTime = items.reduce((acc, item) => acc + item.action.time, 0)
-	if (currentServerTime !== lastServerTimeRef.current) {
-		lastServerTimeRef.current = currentServerTime
-		lastUpdateAtRef.current = Date.now()
-	}
-
-	// Update every second while incomplete to keep the time display fresh
-	useEffect(() => {
-		if (complete) return
-
-		const interval = setInterval(() => {
-			setTick((t) => t + 1)
-		}, 1000)
-
-		return () => clearInterval(interval)
-	}, [complete])
-
-	// Calculate elapsed time: server time + time since last update
-	const timeSinceLastUpdate = complete ? 0 : Date.now() - lastUpdateAtRef.current
-	const totalTime = currentServerTime + timeSinceLastUpdate
-	const time = Math.floor(totalTime / 1000)
-
-	const summary =
-		time === 0
-			? 'Worked for less than a second'
-			: time === 1
-				? 'Worked for 1 second'
-				: `Worked for ${time} seconds`
+	const summary = useMemo(() => {
+		const time = Math.floor(items.reduce((acc, item) => acc + item.action.time, 0) / 1000)
+		if (time === 0) return 'Worked for less than a second'
+		if (time === 1) return 'Worked for 1 second'
+		return `Worked for ${time} seconds`
+	}, [items])
 
-	if (completeNonEmptyItems.length === 0) {
+	if (nonEmptyItems.length === 0) {
 		return null
 	}
 
-	// Messages are rendered without group UI
-	const isMessage = completeNonEmptyItems[0]?.action._type === 'message'
-	if (isMessage) {
+	// If there's only one item, render it directly without grouping UI
+	if (nonEmptyItems.length < 2) {
 		return (
 			<div className="fairy-chat-history-group">
-				{completeNonEmptyItems.map((item, i) => {
-					return <FairyChatHistoryAction item={item} agent={agent} key={'action-' + i} />
+				{nonEmptyItems.map((item, i) => {
+					return <FairyChatHistoryItem item={item} agent={agent} key={'action-' + i} />
 				})}
 			</div>
 		)
@@ -94,20 +55,17 @@ export function FairyChatHistoryGroup({
 
 	return (
 		<div className="fairy-chat-history-group">
-			{/* Show toggle if complete, or just the summary if incomplete */}
-			{complete ? (
+			{complete && (
 				<button className="fairy-chat-history-group-toggle" onClick={() => setCollapsed((v) => !v)}>
-					<AgentIcon type={showContent ? 'chevron-down' : 'chevron-right'} />
-					<span>{summary}</span>
+					<div className="fairy-chat-history-action-icon">
+						<AgentIcon type={showContent ? 'chevron-down' : 'chevron-right'} />
+					</div>
+					{summary}
 				</button>
-			) : (
-				<div className="fairy-chat-history-group-summary">
-					<span>{summary}</span>
-				</div>
 			)}
 			{showContent && (
 				<div className="fairy-chat-history-group-items">
-					{completeNonEmptyItems.map((item, i) => {
+					{nonEmptyItems.map((item, i) => {
 						return <FairyChatHistoryAction item={item} agent={agent} key={'action-' + i} />
 					})}
 				</div>
@@ -116,32 +74,45 @@ export function FairyChatHistoryGroup({
 	)
 }
 
+function FairyChatHistoryItem({ item, agent }: { item: ChatHistoryActionItem; agent: FairyAgent }) {
+	const { action } = item
+	const { description, summary } = agent.getActionInfo(action)
+	const collapsible = summary !== null
+	const [collapsed, setCollapsed] = useState(collapsible)
+
+	if (!description) return null
+
+	return (
+		<div className="fairy-chat-history-item-container">
+			{action.complete && collapsible && (
+				<button className="fairy-chat-history-group-toggle" onClick={() => setCollapsed((v) => !v)}>
+					<div className="fairy-chat-history-action-icon">
+						<AgentIcon type={collapsed ? 'chevron-right' : 'chevron-down'} />
+					</div>
+					{summary}
+				</button>
+			)}
+
+			{(!collapsed || !action.complete) && <FairyChatHistoryAction item={item} agent={agent} />}
+		</div>
+	)
+}
+
 /**
  * Merge adjacent actions into groups where possible.
- * Messages are never grouped - they're always rendered individually.
  */
 export function getActionHistoryGroups(
 	items: ChatHistoryActionItem[],
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 ): FairyChatHistoryGroup[] {
 	const groups: FairyChatHistoryGroup[] = []
 
 	for (const item of items) {
-		const { description } = getActionInfo(item.action, agent)
+		const { description } = agent.getActionInfo(item.action)
 		if (description === null) {
 			continue
 		}
 
-		// Note: We now show incomplete actions so the timer can run in real-time
-
-		// Messages are never grouped - always create a new group for them
-		if (item.action._type === 'message') {
-			groups.push({
-				items: [item],
-			})
-			continue
-		}
-
 		const group = groups[groups.length - 1]
 		if (group && canActionBeGrouped({ item, group, agent })) {
 			group.items.push(item)
@@ -165,16 +136,19 @@ export function canActionBeGrouped({
 }: {
 	item: ChatHistoryActionItem
 	group: FairyChatHistoryGroup
-	agent: TldrawFairyAgent
+	agent: FairyAgent
 }) {
 	if (!item.action.complete) return false
 	if (!group) return false
 
+	const groupAcceptance = group.items[0]?.acceptance
+	if (groupAcceptance !== item.acceptance) return false
+
 	const prevAction = group.items.at(-1)?.action
 	if (!prevAction) return false
 
-	const actionInfo = getActionInfo(item.action, agent)
-	const prevActionInfo = getActionInfo(prevAction, agent)
+	const actionInfo = agent.getActionInfo(item.action)
+	const prevActionInfo = agent.getActionInfo(prevAction)
 
 	if (actionInfo.canGroup(prevAction) && prevActionInfo.canGroup(item.action)) {
 		return true
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryPrompt.tsx b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryPrompt.tsx
deleted file mode 100644
index 43c4867f8364..000000000000
--- a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistoryPrompt.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ChatHistoryPromptItem } from '@tldraw/fairy-shared'
-
-export function FairyChatHistoryPrompt({ item }: { item: ChatHistoryPromptItem }) {
-	const { message } = item
-
-	return (
-		<div className="fairy-chat-history-prompt-container fairy-chat-history-prompt-sticky">
-			<div className="fairy-chat-history-prompt">
-				<div className="fairy-chat-history-prompt-content">{message}</div>
-			</div>
-		</div>
-	)
-}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistorySection.tsx b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistorySection.tsx
index f1149aa8c326..5ff8a5f73ee7 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistorySection.tsx
+++ b/apps/dotcom/client/src/fairy/fairy-agent/chat/FairyChatHistorySection.tsx
@@ -3,37 +3,41 @@ import {
 	ChatHistoryContinuationItem,
 	ChatHistoryItem,
 	ChatHistoryPromptItem,
-	SmallSpinner,
-	TldrawFairyAgent,
 } from '@tldraw/fairy-shared'
+import { FairyAgent } from '../agent/FairyAgent'
 import { FairyChatHistoryGroup, getActionHistoryGroups } from './FairyChatHistoryGroup'
-import { FairyChatHistoryPrompt } from './FairyChatHistoryPrompt'
 
 export interface FairyChatHistorySection {
-	prompt: ChatHistoryPromptItem
+	prompt: ChatHistoryPromptItem | null
 	items: (ChatHistoryActionItem | ChatHistoryContinuationItem)[]
 }
 
 export function FairyChatHistorySection({
 	section,
 	agent,
-	loading,
 }: {
 	section: FairyChatHistorySection
-	agent: TldrawFairyAgent
-	loading: boolean
+	agent: FairyAgent
 }) {
 	const actions = section.items.filter((item) => item.type === 'action') as ChatHistoryActionItem[]
 	const groups = getActionHistoryGroups(actions, agent)
+
 	return (
 		<div className="fairy-chat-history-section">
-			<FairyChatHistoryPrompt item={section.prompt} />
-			<div className="fairy-chat-history-actions">
-				{groups.map((group, i) => (
-					<FairyChatHistoryGroup key={'group-' + i} group={group} agent={agent} />
-				))}
+			<div className="fairy-chat-history-prompt-container fairy-chat-history-prompt-sticky">
+				{section.prompt?.message ? (
+					<div className="fairy-chat-history-prompt">
+						<div className="fairy-chat-history-prompt-content">{section.prompt?.message}</div>
+					</div>
+				) : (
+					<div className="fairy-chat-history-prompt-fairy">
+						<div className="fairy-chat-history-prompt-content">Awakened...</div>
+					</div>
+				)}
 			</div>
-			{loading && <SmallSpinner />}
+			{groups.map((group, i) => {
+				return <FairyChatHistoryGroup key={'chat-history-group-' + i} group={group} agent={agent} />
+			})}
 		</div>
 	)
 }
@@ -42,13 +46,21 @@ export function getAgentHistorySections(items: ChatHistoryItem[]): FairyChatHist
 	const sections: FairyChatHistorySection[] = []
 
 	for (const item of items) {
+		// Add a new section for each prompt
 		if (item.type === 'prompt') {
 			sections.push({ prompt: item, items: [] })
 			continue
 		}
 
+		// Ignore memory transition items in the UI
+		if (item.type === 'memory-transition') {
+			continue
+		}
+
 		if (sections.length > 0) {
 			sections[sections.length - 1].items.push(item)
+		} else {
+			sections.push({ prompt: null, items: [item] })
 		}
 	}
 
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/chat/getActionInfo.ts b/apps/dotcom/client/src/fairy/fairy-agent/chat/getActionInfo.ts
deleted file mode 100644
index acf9d48fa020..000000000000
--- a/apps/dotcom/client/src/fairy/fairy-agent/chat/getActionInfo.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { AgentAction, AgentActionInfo, Streaming, TldrawFairyAgent } from '@tldraw/fairy-shared'
-
-/**
- * Get the full info for an action to display in chat history UI.
- * This function adds default values for any unset properties.
- * If the action's util returns null, the action will not be shown in chat history.
- */
-export function getActionInfo(
-	action: Streaming<AgentAction>,
-	agent: TldrawFairyAgent
-): AgentActionInfo {
-	const util = agent.getAgentActionUtil(action._type)
-	const info = util.getInfo(action) ?? { description: null }
-	const {
-		icon = null,
-		description = JSON.stringify(action, null, 2),
-		summary = null,
-		canGroup = () => true,
-		pose = 'idle',
-	} = info
-
-	return {
-		icon,
-		description,
-		summary,
-		canGroup,
-		pose,
-	}
-}
diff --git a/apps/dotcom/client/src/fairy/fairy-agent/input/FairyBasicInput.tsx b/apps/dotcom/client/src/fairy/fairy-agent/input/FairyBasicInput.tsx
index da60f8fb0cda..c9077c3dec16 100644
--- a/apps/dotcom/client/src/fairy/fairy-agent/input/FairyBasicInput.tsx
+++ b/apps/dotcom/client/src/fairy/fairy-agent/input/FairyBasicInput.tsx
@@ -1,22 +1,32 @@
-import { convertTldrawShapeToFocusedShape, DEFAULT_FAIRY_VISION } from '@tldraw/fairy-shared'
-import { useCallback, useRef, useState } from 'react'
+import { FAIRY_VISION_DIMENSIONS } from '@tldraw/fairy-shared'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { Box, TldrawUiInput, useValue } from 'tldraw'
-import { TldrawFairyAgent } from '../agent/TldrawFairyAgent'
+import { useMsg } from '../../../tla/utils/i18n'
+import { fairyMessages } from '../../fairy-messages'
+// import { $fairyTasks } from '../../FairyTaskList'
+import { FairyAgent } from '../agent/FairyAgent'
 
-export function FairyBasicInput({ agent }: { agent: TldrawFairyAgent }) {
-	const { editor } = agent
+export function FairyBasicInput({ agent, onCancel }: { agent: FairyAgent; onCancel(): void }) {
 	const inputRef = useRef<HTMLInputElement>(null)
 	const [inputValue, setInputValue] = useState('')
 	const isGenerating = useValue('isGenerating', () => agent.isGenerating(), [agent])
-	const modelName = useValue(agent.$modelName)
 
-	const fairy = useValue('fairy', () => agent.$fairy, [agent])
+	const fairyEntity = useValue(agent.$fairyEntity)
+	const fairyConfig = useValue(agent.$fairyConfig)
+
+	useEffect(() => {
+		if (inputRef.current) {
+			inputRef.current.spellcheck = false
+		}
+	}, [])
 
 	const handleComplete = useCallback(
 		async (value: string) => {
+			inputRef.current?.focus()
+			agent.cancel()
+
 			// If the user's message is empty, just cancel the current request (if there is one)
 			if (value === '') {
-				agent.cancel()
 				return
 			}
 
@@ -24,24 +34,25 @@ export function FairyBasicInput({ agent }: { agent: TldrawFairyAgent }) {
 			setInputValue('')
 
 			// Prompt the agent
-			const selectedShapes = editor
-				.getSelectedShapes()
-				.map((shape) => convertTldrawShapeToFocusedShape(editor, shape))
-
-			const fairyPosition = fairy.get().position
+			const fairyPosition = fairyEntity.position
+			const fairyVision = Box.FromCenter(fairyPosition, FAIRY_VISION_DIMENSIONS)
 
-			const fairyVision = Box.FromCenter(fairyPosition, DEFAULT_FAIRY_VISION)
+			// Clear the shared todo list if it's all completed - same as the agent starter kit's behavior
+			// I dont think we should do this in case the agent wants to add more tasks before the current ones are done
+			// $fairyTasks.update((fairyTaskList) => {
+			// 	if (fairyTaskList.every((item) => item.status === 'done')) {
+			// 		return []
+			// 	}
+			// 	return fairyTaskList
+			// })
 
 			await agent.prompt({
 				message: value,
-				contextItems: [],
 				bounds: fairyVision,
-				modelName,
-				selectedShapes,
-				type: 'user',
+				source: 'user',
 			})
 		},
-		[agent, modelName, editor, fairy]
+		[agent, fairyEntity]
 	)
 
 	const shouldCancel = isGenerating && inputValue === ''
@@ -54,14 +65,19 @@ export function FairyBasicInput({ agent }: { agent: TldrawFairyAgent }) {
 		}
 	}
 
+	const whisperPlaceholder = useMsg(fairyMessages.whisperToFairy, { name: fairyConfig.name })
+	const stopLabel = useMsg(fairyMessages.stopLabel)
+	const sendLabel = useMsg(fairyMessages.sendLabel)
+
 	return (
 		<div className="fairy-input">
 			<TldrawUiInput
 				ref={inputRef}
-				placeholder={`Whisper to ${agent.id}...`}
+				placeholder={whisperPlaceholder}
 				value={inputValue}
 				onValueChange={setInputValue}
 				onComplete={handleComplete}
+				onCancel={onCancel}
 				autoFocus
 				className="fairy-input__field"
 			/>
@@ -69,7 +85,7 @@ export function FairyBasicInput({ agent }: { agent: TldrawFairyAgent }) {
 				onClick={handleButtonClick}
 				disabled={inputValue === '' && !isGenerating}
 				className="fairy-input__submit"
-				title={shouldCancel ? 'Stop' : 'Send'}
+				title={shouldCancel ? stopLabel : sendLabel}
 			>
 				{shouldCancel ? '⏹' : '👄'}
 			</button>
diff --git a/apps/dotcom/client/src/fairy/fairy-messages.ts b/apps/dotcom/client/src/fairy/fairy-messages.ts
new file mode 100644
index 000000000000..c37223b199c4
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/fairy-messages.ts
@@ -0,0 +1,69 @@
+import { defineMessages } from '../tla/utils/i18n'
+
+export const fairyMessages = defineMessages({
+	// Toolbar and navigation (aria-labels)
+	toolbar: { defaultMessage: 'Fairies' },
+	taskList: { defaultMessage: 'Task list' },
+	newFairy: { defaultMessage: 'New fairy' },
+	selectFairy: { defaultMessage: 'Select fairy' },
+	deselectFairy: { defaultMessage: 'Deselect fairy' },
+	resetChat: { defaultMessage: 'Reset chat' },
+
+	// Task list (titles and placeholders)
+	addTaskPlaceholder: { defaultMessage: 'Add a new task…' },
+	dragToCanvas: { defaultMessage: 'Drag to canvas' },
+	clickToRemoveOrDrag: { defaultMessage: 'Click to remove or drag to move' },
+	deleteTask: { defaultMessage: 'Delete task' },
+	showTasksOnCanvas: { defaultMessage: 'Show tasks on canvas' },
+	hideTasksOnCanvas: { defaultMessage: 'Hide tasks on canvas' },
+
+	// Fairy menu (labels)
+	goToFairy: { defaultMessage: 'Go to fairy' },
+	summonFairy: { defaultMessage: 'Summon fairy' },
+	followFairy: { defaultMessage: 'Follow fairy' },
+	unfollowFairy: { defaultMessage: 'Unfollow fairy' },
+	askForHelp: { defaultMessage: 'Ask for help' },
+	customizeFairy: { defaultMessage: 'Customize fairy' },
+	deleteFairy: { defaultMessage: 'Delete fairy' },
+
+	// Task list menu (labels)
+	askForHelpFromEveryone: { defaultMessage: 'Ask for help' },
+	summonAllFairies: { defaultMessage: 'Summon all fairies' },
+	disbandProjects: { defaultMessage: 'Disband projects' },
+	resetAllChats: { defaultMessage: 'Reset all chats' },
+	resetAllWands: { defaultMessage: 'Reset all wands' },
+	deleteAllFairies: { defaultMessage: 'Delete all fairies' },
+	debugView: { defaultMessage: 'Debug view' },
+
+	// Fairy config dialog (placeholders)
+	fairyNamePlaceholder: { defaultMessage: 'Fairy’s name' },
+	fairyPersonalityPlaceholder: { defaultMessage: 'Fairy’s personality' },
+
+	// Group chat (placeholders and aria-labels)
+	leaderFairySelection: { defaultMessage: 'Leader fairy selection' },
+	instructGroupPlaceholder: { defaultMessage: 'Instruct the group…' },
+	selectLeaderFirstPlaceholder: { defaultMessage: 'Select a leader first…' },
+	selectLeader: { defaultMessage: 'Select leader' },
+	deselectLeader: { defaultMessage: 'Deselect leader' },
+	stopTitle: { defaultMessage: 'Stop' },
+	sendTitle: { defaultMessage: 'Send' },
+
+	// Fairy input (placeholder and title)
+	whisperToFairy: { defaultMessage: 'Whisper to {name}…' },
+	stopLabel: { defaultMessage: 'Stop' },
+	sendLabel: { defaultMessage: 'Send' },
+
+	// HUD toggle labels
+	switchToFairyChat: { defaultMessage: 'Switch to fairy chat' },
+	switchToTaskList: { defaultMessage: 'Switch to task list' },
+
+	// Hat types
+	hatTop: { defaultMessage: 'Top' },
+	hatPointy: { defaultMessage: 'Pointy' },
+	hatBald: { defaultMessage: 'Bald' },
+	hatAntenna: { defaultMessage: 'Antenna' },
+	hatSpiky: { defaultMessage: 'Spiky' },
+	hatHair: { defaultMessage: 'Hair' },
+	hatEars: { defaultMessage: 'Ears' },
+	hatPropeller: { defaultMessage: 'Propeller' },
+})
diff --git a/apps/dotcom/client/src/fairy/fairy-sprite/FairyOutfit.tsx b/apps/dotcom/client/src/fairy/fairy-sprite/FairyOutfit.tsx
deleted file mode 100644
index 0219c3a92aec..000000000000
--- a/apps/dotcom/client/src/fairy/fairy-sprite/FairyOutfit.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FairyVariantType } from './FairyVariant'
-
-/**
- * A fairy outfit is a combination of variants for each part of the fairy.
- */
-export interface FairyOutfit {
-	body: FairyVariantType<'body'>
-	hat: FairyVariantType<'hat'>
-	wings: FairyVariantType<'wings'>
-}
diff --git a/apps/dotcom/client/src/fairy/fairy-sprite/FairySprite.tsx b/apps/dotcom/client/src/fairy/fairy-sprite/FairySprite.tsx
index a5c5cd7519bd..0121ceaefad2 100644
--- a/apps/dotcom/client/src/fairy/fairy-sprite/FairySprite.tsx
+++ b/apps/dotcom/client/src/fairy/fairy-sprite/FairySprite.tsx
@@ -1,8 +1,13 @@
-import { FAIRY_POSE, FairyPose } from '@tldraw/fairy-shared'
-import { useEffect, useMemo, useState } from 'react'
+import {
+	FAIRY_POSE,
+	FAIRY_VARIANTS,
+	FairyEntity,
+	FairyOutfit,
+	FairyPose,
+	FairyVariantDefinition,
+} from '@tldraw/fairy-shared'
+import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { FileHelpers, Image } from 'tldraw'
-import { FairyOutfit } from './FairyOutfit'
-import { FAIRY_VARIANTS, FairyVariantDefinition } from './FairyVariant'
 
 /**
  * This file contains a rough skeleton for some sprite and animation management.
@@ -21,11 +26,11 @@ const fairySpriteMap = new Map<string, FairySprite>()
  * If we've already initialized this sprite, get the existing one.
  * If we haven't yet, initialize it and return the new one.
  */
-export function getFairySprite(variants: FairyOutfit) {
-	const key = JSON.stringify(variants)
+function getFairySprite({ outfit, tint }: { outfit: FairyOutfit; tint?: string | null }) {
+	const key = getFairySpriteCacheKey({ outfit, tint })
 	const existingSprite = fairySpriteMap.get(key)
 	if (!existingSprite) {
-		const newSprite = new FairySprite(variants)
+		const newSprite = new FairySprite(outfit, tint ?? null)
 		fairySpriteMap.set(key, newSprite)
 		return newSprite
 	}
@@ -34,14 +39,10 @@ export function getFairySprite(variants: FairyOutfit) {
 }
 
 /**
- * Dispose of a fairy sprite to free up memory.
+ * Get a cache key for a fairy sprite.
  */
-export function disposeFairySprite(variants: FairyOutfit) {
-	const key = JSON.stringify(variants)
-	const sprite = fairySpriteMap.get(key)
-	if (sprite) {
-		sprite.dispose()
-	}
+function getFairySpriteCacheKey({ outfit, tint }: { outfit: FairyOutfit; tint?: string | null }) {
+	return JSON.stringify({ outfit, tint })
 }
 
 const OFFSCREEN_CANVAS_SIZE = 1200
@@ -54,16 +55,26 @@ const offscreenCanvas = new OffscreenCanvas(OFFSCREEN_CANVAS_SIZE, OFFSCREEN_CAN
 const offscreenContext = offscreenCanvas.getContext('2d')!
 offscreenContext.imageSmoothingEnabled = false
 
+/**
+ * A temporary canvas for storing alpha masks when tinting
+ */
+const offscreenCanvasBuffer = new OffscreenCanvas(OFFSCREEN_CANVAS_SIZE, OFFSCREEN_CANVAS_SIZE)
+const tempContext = offscreenCanvasBuffer.getContext('2d')!
+tempContext.imageSmoothingEnabled = false
+
 /**
  * A fairy sprite that we can render on the screen.
  */
 class FairySprite {
-	constructor(public definition: FairyOutfit) {
+	constructor(
+		public outfit: FairyOutfit,
+		public tint: string | null
+	) {
 		fairySpriteMap.set(this.getKey(), this)
 		this.variants = {
-			body: FAIRY_VARIANTS.body[definition.body],
-			hat: FAIRY_VARIANTS.hat[definition.hat],
-			wings: FAIRY_VARIANTS.wings[definition.wings],
+			body: FAIRY_VARIANTS.body[outfit.body],
+			hat: FAIRY_VARIANTS.hat[outfit.hat],
+			wings: FAIRY_VARIANTS.wings[outfit.wings],
 		}
 
 		this.generateAllPosesFrames()
@@ -158,6 +169,34 @@ class FairySprite {
 			offscreenContext.drawImage(wingsFrameImages[i % wingsFrameImages.length], 0, 0)
 			offscreenContext.drawImage(bodyFrameImages[i % bodyFrameImages.length], 0, 0)
 			offscreenContext.drawImage(hatFrameImages[i % hatFrameImages.length], 0, 0)
+
+			// Apply tint to black parts only using screen blend mode, preserving alpha
+			if (this.tint) {
+				// Save the original composite to temp canvas for alpha masking
+				tempContext.clearRect(0, 0, OFFSCREEN_CANVAS_SIZE, OFFSCREEN_CANVAS_SIZE)
+				tempContext.drawImage(offscreenCanvas, 0, 0)
+
+				// Apply screen blend to tint the black parts
+				offscreenContext.globalCompositeOperation = 'screen'
+				offscreenContext.fillStyle = this.tint
+				offscreenContext.fillRect(0, 0, 200, 200)
+
+				// Mask the result using the original alpha channel
+				offscreenContext.globalCompositeOperation = 'destination-in'
+				offscreenContext.drawImage(
+					offscreenCanvasBuffer,
+					0,
+					0,
+					OFFSCREEN_CANVAS_SIZE,
+					OFFSCREEN_CANVAS_SIZE,
+					0,
+					0,
+					200,
+					200
+				)
+				offscreenContext.globalCompositeOperation = 'source-over'
+			}
+
 			offscreenContext.scale(1 / FAIRY_ASSET_SCALE, 1 / FAIRY_ASSET_SCALE)
 
 			const blob = await offscreenCanvas.convertToBlob()
@@ -204,29 +243,66 @@ class FairySprite {
 	 * Get the key for the fairy sprite.
 	 */
 	getKey() {
-		return JSON.stringify(this.variants)
+		return getFairySpriteCacheKey({
+			outfit: this.outfit,
+			tint: this.tint,
+		})
 	}
 }
 
-export function FairySpriteComponent({ pose, outfit }: { pose: FairyPose; outfit: FairyOutfit }) {
-	const [frameNumber, setFrameNumber] = useState(0)
-	const sprite = useMemo(() => getFairySprite(outfit), [outfit])
-	const [poseFrames, setPoseFrames] = useState<string[]>([])
+export function FairySpriteComponent({
+	entity,
+	outfit,
+	onGestureEnd,
+	animated,
+	tint,
+}: {
+	entity: FairyEntity
+	outfit: FairyOutfit
+	onGestureEnd?(): void
+	animated: boolean
+	tint?: string | null
+}) {
+	const { pose, gesture } = entity
+	const sprite = useMemo(() => getFairySprite({ outfit, tint }), [outfit, tint])
+
+	const imageRef = useRef<HTMLImageElement>(null)
+	const startTimeRef = useRef(Date.now())
 
 	const FRAME_DURATION = 400
+	const INTERVAL_DURATION = 32
 
 	useEffect(() => {
-		const frames = sprite.getPoseFrames(pose)
-		setPoseFrames(frames)
+		startTimeRef.current = Date.now()
+	}, [gesture, pose])
+
+	const updateFrame = useCallback(
+		(timeElapsed: number) => {
+			if (!imageRef.current) return
+			const poseFrames = sprite.getPoseFrames(pose)
+			const gestureFrames = gesture ? sprite.getPoseFrames(gesture) : null
+			const unwrappedFrameNumber = Math.floor(timeElapsed / FRAME_DURATION)
+
+			const poseFrame = poseFrames[unwrappedFrameNumber % poseFrames.length]
+			const gestureFrame = gestureFrames ? gestureFrames[unwrappedFrameNumber] : null
+			if (gesture && !gestureFrame) {
+				onGestureEnd?.()
+			}
+
+			const frame = gestureFrame ?? poseFrame
+			imageRef.current.src = frame
+		},
+		[pose, gesture, sprite, onGestureEnd]
+	)
+
+	useEffect(() => {
+		updateFrame(Date.now() - startTimeRef.current)
+		if (!animated) return
 		const timer = setInterval(() => {
-			const frames = sprite.getPoseFrames(pose)
-			setPoseFrames(frames)
-			setFrameNumber((frameNumber) => (frameNumber + 1) % frames.length)
-		}, FRAME_DURATION)
+			updateFrame(Date.now() - startTimeRef.current)
+		}, INTERVAL_DURATION)
 		return () => clearInterval(timer)
-	}, [pose, sprite, sprite.loadingState])
-
-	const frame = poseFrames[frameNumber % poseFrames.length]
+	}, [updateFrame, animated])
 
-	return <img className="fairy-sprite" src={frame} />
+	return <img className="fairy-sprite" ref={imageRef} />
 }
diff --git a/apps/dotcom/client/src/fairy/getProjectColor.ts b/apps/dotcom/client/src/fairy/getProjectColor.ts
new file mode 100644
index 000000000000..6bc92504fb2c
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/getProjectColor.ts
@@ -0,0 +1,23 @@
+import { asColor, FocusColor } from '@tldraw/fairy-shared'
+import { Editor, getColorValue, getDefaultColorTheme, TLDefaultColorStyle } from 'tldraw'
+
+/**
+ * Gets the CSS color value for a project color, using the editor's theme.
+ * First normalizes the color using asColor, then resolves it using the DefaultColorThemePalette.
+ *
+ * @param editor - The tldraw editor instance (used to detect dark mode)
+ * @param color - The FocusColor value to convert
+ * @returns The CSS color string (e.g., '#4465e9')
+ */
+export function getProjectColor(editor: Editor, color: FocusColor | string): string {
+	// First normalize the color using asColor
+	const normalizedColor = asColor(color)
+
+	// Get the appropriate theme based on editor's dark mode setting
+	const isDarkMode = editor.user.getIsDarkMode()
+	const theme = getDefaultColorTheme({ isDarkMode })
+
+	// Get the solid color value from the theme
+	// FocusColor values match TLDefaultColorStyle values, so we can cast
+	return getColorValue(theme, normalizedColor as TLDefaultColorStyle, 'solid')
+}
diff --git a/apps/dotcom/client/src/fairy/getRandomFairyName.ts b/apps/dotcom/client/src/fairy/getRandomFairyName.ts
new file mode 100644
index 000000000000..450ad3d2ce26
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/getRandomFairyName.ts
@@ -0,0 +1,58 @@
+export function getRandomFairyName() {
+	let firstNamePrefix = NAME_PARTS[Math.floor(Math.random() * NAME_PARTS.length)]
+	const firstNameSuffix = NAME_PARTS[Math.floor(Math.random() * NAME_PARTS.length)]
+	let lastNamePrefix = NAME_PARTS[Math.floor(Math.random() * NAME_PARTS.length)]
+	const lastNameSuffix = NAME_PARTS[Math.floor(Math.random() * NAME_PARTS.length)]
+
+	if (firstNamePrefix.at(-1) === firstNameSuffix[0]) {
+		firstNamePrefix = firstNamePrefix.slice(0, -1)
+	}
+
+	if (lastNamePrefix.at(-1) === lastNameSuffix[0]) {
+		lastNamePrefix = lastNamePrefix.slice(0, -1)
+	}
+
+	let firstName = `${firstNamePrefix[0].toUpperCase()}${firstNamePrefix.slice(1)}${firstNameSuffix}`
+	let lastName = `${lastNamePrefix[0].toUpperCase()}${lastNamePrefix.slice(1)}${lastNameSuffix}`
+
+	if (firstName in BANNED_NAMES) {
+		firstName = BANNED_NAMES[firstName]
+	}
+	if (lastName in BANNED_NAMES) {
+		lastName = BANNED_NAMES[lastName]
+	}
+
+	return `${firstName} ${lastName}`
+}
+
+const NAME_PARTS = [
+	'tinker',
+	'spark',
+	'glimmer',
+	'blue',
+	'flutter',
+	'wind',
+	'bolt',
+	'flame',
+	'spark',
+	'star',
+	'moon',
+	'sun',
+	'bell',
+	'snell',
+	'flick',
+	'bubble',
+	'bark',
+	'fluff',
+	'fuzz',
+	'shine',
+	'glow',
+	'petal',
+	'gum',
+	'toe',
+	'branch',
+	'tooth',
+	'gold',
+]
+
+const BANNED_NAMES: { [key: string]: string } = { Tinkerbell: 'Bellertink' }
diff --git a/apps/dotcom/client/src/fairy/parts/AgentViewportBoundsPartUtil.ts b/apps/dotcom/client/src/fairy/parts/AgentViewportBoundsPartUtil.ts
new file mode 100644
index 000000000000..71fd70a00f85
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/AgentViewportBoundsPartUtil.ts
@@ -0,0 +1,16 @@
+import { AgentRequest, AgentViewportBoundsPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class AgentViewportBoundsPartUtil extends PromptPartUtil<AgentViewportBoundsPart> {
+	static override type = 'agentViewportBounds' as const
+
+	override getPart(request: AgentRequest, helpers: AgentHelpers): AgentViewportBoundsPart {
+		const offsetAgentBounds = helpers.applyOffsetToBox(request.bounds)
+
+		return {
+			type: 'agentViewportBounds',
+			agentBounds: helpers.roundBox(offsetAgentBounds),
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/BlurryShapesPartUtil.ts b/apps/dotcom/client/src/fairy/parts/BlurryShapesPartUtil.ts
new file mode 100644
index 000000000000..0255956b2aaf
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/BlurryShapesPartUtil.ts
@@ -0,0 +1,50 @@
+import {
+	AgentRequest,
+	BlurryShapesPart,
+	convertTldrawShapeToBlurryShape,
+} from '@tldraw/fairy-shared'
+import { Box } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class BlurryShapesPartUtil extends PromptPartUtil<BlurryShapesPart> {
+	static override type = 'blurryShapes' as const
+
+	override getPart(request: AgentRequest, helpers: AgentHelpers): BlurryShapesPart {
+		const { editor } = this
+
+		const shapes = editor.getCurrentPageShapesSorted()
+		const contextBoundsBox = Box.From(request.bounds)
+
+		// Get all shapes within the agent's viewport
+		const shapesInBounds = shapes.filter((shape) => {
+			if (!editor) return false
+			const bounds = editor.getShapeMaskedPageBounds(shape)
+			if (!bounds) return false
+			return contextBoundsBox.includes(bounds)
+		})
+
+		// Convert the shapes to the blurry shape format
+		const blurryShapes = shapesInBounds
+			.map((shape) => {
+				if (!editor) return null
+				return convertTldrawShapeToBlurryShape(editor, shape)
+			})
+			.filter((s) => s !== null)
+
+		// Apply the offset and round the blurry shapes
+		const normalizedBlurryShapes = blurryShapes.map((shape) => {
+			const bounds = helpers.roundBox(
+				helpers.applyOffsetToBox({
+					x: shape.x,
+					y: shape.y,
+					w: shape.w,
+					h: shape.h,
+				})
+			)
+			return { ...shape, x: bounds.x, y: bounds.y, w: bounds.w, h: bounds.h }
+		})
+
+		return { type: 'blurryShapes', shapes: normalizedBlurryShapes }
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/ChatHistoryPartUtil.ts b/apps/dotcom/client/src/fairy/parts/ChatHistoryPartUtil.ts
new file mode 100644
index 000000000000..2b2b159917c6
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/ChatHistoryPartUtil.ts
@@ -0,0 +1,57 @@
+import {
+	AgentRequest,
+	ChatHistoryItem,
+	ChatHistoryPart,
+	getFairyModeDefinition,
+} from '@tldraw/fairy-shared'
+import { structuredClone } from 'tldraw'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class ChatHistoryPartUtil extends PromptPartUtil<ChatHistoryPart> {
+	static override type = 'chatHistory' as const
+
+	override async getPart(_request: AgentRequest) {
+		const allItems = structuredClone(this.agent.$chatHistory.get())
+
+		// Get the current mode's memory level
+		const modeDefinition = getFairyModeDefinition(this.agent.getMode())
+		const { memoryLevel } = modeDefinition
+
+		let filteredItems: ChatHistoryItem[]
+		switch (memoryLevel) {
+			case 'fairy':
+				filteredItems = allItems.filter((item) => item.memoryLevel === 'fairy')
+				break
+			case 'project': {
+				filteredItems = []
+				for (let i = allItems.length - 1; i >= 0; i--) {
+					const item = allItems[i]
+					if (item.memoryLevel === 'project') {
+						filteredItems.unshift(item)
+					} else if (item.memoryLevel === 'task') {
+						continue
+					} else if (item.memoryLevel === 'fairy') {
+						break
+					}
+				}
+				break
+			}
+			case 'task': {
+				filteredItems = []
+				for (let i = allItems.length - 1; i >= 0; i--) {
+					const item = allItems[i]
+					if (item.memoryLevel === 'task') {
+						filteredItems.unshift(item)
+					} else {
+						break
+					}
+				}
+			}
+		}
+
+		return {
+			type: 'chatHistory' as const,
+			items: filteredItems,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/CurrentProjectDronePartUtil.ts b/apps/dotcom/client/src/fairy/parts/CurrentProjectDronePartUtil.ts
new file mode 100644
index 000000000000..c037958fb787
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/CurrentProjectDronePartUtil.ts
@@ -0,0 +1,15 @@
+import { AgentRequest, CurrentProjectDronePart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class CurrentProjectDronePartUtil extends PromptPartUtil<CurrentProjectDronePart> {
+	static override type = 'currentProjectDrone' as const
+
+	override getPart(_request: AgentRequest, _helpers: AgentHelpers): CurrentProjectDronePart {
+		const currentProject = this.agent.getProject() ?? null
+		return {
+			type: 'currentProjectDrone',
+			currentProject,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/CurrentProjectOrchestratorPartUtil.ts b/apps/dotcom/client/src/fairy/parts/CurrentProjectOrchestratorPartUtil.ts
new file mode 100644
index 000000000000..2174e22487a4
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/CurrentProjectOrchestratorPartUtil.ts
@@ -0,0 +1,18 @@
+import { AgentRequest, CurrentProjectOrchestratorPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { getFairyTasksByProjectId } from '../FairyTaskList'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class CurrentProjectOrchestratorPartUtil extends PromptPartUtil<CurrentProjectOrchestratorPart> {
+	static override type = 'currentProjectOrchestrator' as const
+
+	override getPart(_request: AgentRequest, _helpers: AgentHelpers): CurrentProjectOrchestratorPart {
+		const currentProject = this.agent.getProject() ?? null
+		const currentProjectTasks = currentProject ? getFairyTasksByProjectId(currentProject.id) : []
+		return {
+			type: 'currentProjectOrchestrator',
+			currentProject,
+			currentProjectTasks,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/DataPartUtil.ts b/apps/dotcom/client/src/fairy/parts/DataPartUtil.ts
new file mode 100644
index 000000000000..e6a528699dda
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/DataPartUtil.ts
@@ -0,0 +1,30 @@
+import { AgentRequest, DataPart } from '@tldraw/fairy-shared'
+import { PromptPartUtil } from './PromptPartUtil'
+
+/**
+ * This prompt part collects up data retrieved by agent actions in the previous request.
+ */
+export class DataPartUtil extends PromptPartUtil<DataPart> {
+	static override type = 'data' as const
+
+	override async getPart(request: AgentRequest): Promise<DataPart> {
+		const { data } = request
+
+		const values = await Promise.all(
+			data.map(async (item) => {
+				try {
+					return await item
+				} catch (error) {
+					console.error('Error retrieving data:', error)
+					// Tell the agent that something went wrong
+					return 'An error occurred while retrieving some data.'
+				}
+			})
+		)
+
+		return {
+			type: 'data',
+			data: values,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/DebugPartUtil.ts b/apps/dotcom/client/src/fairy/parts/DebugPartUtil.ts
new file mode 100644
index 000000000000..23bfda881c54
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/DebugPartUtil.ts
@@ -0,0 +1,16 @@
+import { AgentRequest, DebugPart } from '@tldraw/fairy-shared'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class DebugPartUtil extends PromptPartUtil<DebugPart> {
+	static override type = 'debug' as const
+
+	override getPart(_request: AgentRequest): DebugPart {
+		const debugFlags = this.agent.$debugFlags.get()
+
+		return {
+			type: 'debug',
+			logSystemPrompt: debugFlags.logSystemPrompt,
+			logMessages: debugFlags.logMessages,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/MessagesPartUtil.ts b/apps/dotcom/client/src/fairy/parts/MessagesPartUtil.ts
new file mode 100644
index 000000000000..c1c537acd657
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/MessagesPartUtil.ts
@@ -0,0 +1,15 @@
+import { AgentRequest, MessagesPart } from '@tldraw/fairy-shared'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class MessagesPartUtil extends PromptPartUtil<MessagesPart> {
+	static override type = 'messages' as const
+
+	override getPart(request: AgentRequest): MessagesPart {
+		const { messages, source } = request
+		return {
+			type: 'messages',
+			messages,
+			source,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/ModePartUtil.ts b/apps/dotcom/client/src/fairy/parts/ModePartUtil.ts
new file mode 100644
index 000000000000..c390fb1bf789
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/ModePartUtil.ts
@@ -0,0 +1,17 @@
+import { AgentRequest, getFairyModeDefinition, ModePart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class ModePartUtil extends PromptPartUtil<ModePart> {
+	static override type = 'mode' as const
+
+	override getPart(_request: AgentRequest, _helpers: AgentHelpers): ModePart {
+		const modeDefinition = getFairyModeDefinition(this.agent.getMode())
+		if (!modeDefinition.active) throw new Error('Fairy is not in an active mode so cannot act.')
+		return {
+			type: 'mode',
+			mode: modeDefinition.type,
+			work: this.agent.getWork(),
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/ModelNamePartUtil.ts b/apps/dotcom/client/src/fairy/parts/ModelNamePartUtil.ts
new file mode 100644
index 000000000000..575615949d02
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/ModelNamePartUtil.ts
@@ -0,0 +1,17 @@
+import { AgentRequest, DEFAULT_MODEL_NAME, ModelNamePart } from '@tldraw/fairy-shared'
+import { $fairyModelSelection } from '../FairyModelSelection'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class ModelNamePartUtil extends PromptPartUtil<ModelNamePart> {
+	static override type = 'modelName' as const
+
+	override getPart(_request: AgentRequest): ModelNamePart {
+		const selectedModel = $fairyModelSelection.get()
+		const modelName = selectedModel ?? DEFAULT_MODEL_NAME
+
+		return {
+			type: 'modelName',
+			name: modelName,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/OtherFairiesPartUtil.ts b/apps/dotcom/client/src/fairy/parts/OtherFairiesPartUtil.ts
new file mode 100644
index 000000000000..d84482007d77
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/OtherFairiesPartUtil.ts
@@ -0,0 +1,44 @@
+import { AgentRequest, OtherFairiesPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyAgentsAtom } from '../fairy-agent/agent/fairyAgentsAtom'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class OtherFairiesPartUtil extends PromptPartUtil<OtherFairiesPart> {
+	static override type = 'otherFairies' as const
+
+	override getPart(_request: AgentRequest, helpers: AgentHelpers): OtherFairiesPart {
+		const otherFairies = $fairyAgentsAtom
+			.get(this.editor)
+			.filter((agent) => agent.id !== this.agent.id)
+
+		const otherFairiesData = otherFairies.map((agent) => {
+			const activeRequest = agent.$activeRequest.get()
+			return {
+				id: agent.id,
+				name: agent.$fairyConfig.get().name,
+				position: helpers.applyOffsetToVec(agent.$fairyEntity.get().position),
+				isGenerating: activeRequest !== null,
+				bounds: activeRequest?.bounds ? helpers.applyOffsetToBox(activeRequest.bounds) : null,
+				personality: agent.$fairyConfig.get().personality,
+				currentProjectId: agent.getProject()?.id ?? null,
+			}
+		})
+
+		const thisActiveRequest = this.agent.$activeRequest.get()
+		const thisFairyData = {
+			id: this.agent.id,
+			name: this.agent.$fairyConfig.get().name,
+			position: helpers.applyOffsetToVec(this.agent.$fairyEntity.get().position),
+			isGenerating: thisActiveRequest !== null,
+			bounds: thisActiveRequest?.bounds ? helpers.applyOffsetToBox(thisActiveRequest.bounds) : null,
+			personality: this.agent.$fairyConfig.get().personality,
+			currentProjectId: this.agent.getProject()?.id ?? null,
+		}
+
+		return {
+			type: 'otherFairies',
+			otherFairies: otherFairiesData,
+			thisFairy: thisFairyData,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/PagesPartUtil.ts b/apps/dotcom/client/src/fairy/parts/PagesPartUtil.ts
new file mode 100644
index 000000000000..1f5b38d95227
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/PagesPartUtil.ts
@@ -0,0 +1,23 @@
+import { AgentRequest, PagesPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class PagesPartUtil extends PromptPartUtil<PagesPart> {
+	static override type = 'pages' as const
+
+	override getPart(_request: AgentRequest, _helpers: AgentHelpers): PagesPart {
+		const pages = this.agent.editor.getPages()
+		const currentPageId = this.agent.editor.getCurrentPageId()
+		const currentPage = this.agent.editor.getCurrentPage()
+
+		return {
+			type: 'pages',
+			pages: pages.map((page) => ({
+				id: page.id,
+				name: page.name,
+			})),
+			currentPageId,
+			currentPageName: currentPage.name,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/PeripheralShapesPartUtil.ts b/apps/dotcom/client/src/fairy/parts/PeripheralShapesPartUtil.ts
new file mode 100644
index 000000000000..2d43a45a5d3e
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/PeripheralShapesPartUtil.ts
@@ -0,0 +1,48 @@
+import {
+	AgentRequest,
+	convertTldrawShapesToPeripheralShapes,
+	PeripheralShapesPart,
+} from '@tldraw/fairy-shared'
+import { Box } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class PeripheralShapesPartUtil extends PromptPartUtil<PeripheralShapesPart> {
+	static override type = 'peripheralShapes' as const
+
+	override getPart(request: AgentRequest, helpers: AgentHelpers): PeripheralShapesPart {
+		const { editor } = this
+
+		const shapes = editor.getCurrentPageShapesSorted()
+		const contextBounds = request.bounds
+
+		const contextBoundsBox = Box.From(contextBounds)
+
+		// Get all shapes that are outside the context bounds (these are what we want to peripheralize)
+		const shapesOutsideViewport = shapes.filter((shape) => {
+			const bounds = editor.getShapeMaskedPageBounds(shape)
+			if (!bounds) return false
+			if (contextBoundsBox.includes(bounds)) return false
+			return true
+		})
+
+		// Convert the shapes to peripheral shape cluster format
+		const clusters = convertTldrawShapesToPeripheralShapes(editor, shapesOutsideViewport, {
+			padding: 75,
+		})
+
+		// Apply the offset and round the clusters
+		const normalizedClusters = clusters.map((cluster) => {
+			const offsetBounds = helpers.applyOffsetToBox(cluster.bounds)
+			return {
+				numberOfShapes: cluster.numberOfShapes,
+				bounds: helpers.roundBox(offsetBounds),
+			}
+		})
+
+		return {
+			type: 'peripheralShapes',
+			clusters: normalizedClusters,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/PersonalTodoListPartUtil.ts b/apps/dotcom/client/src/fairy/parts/PersonalTodoListPartUtil.ts
new file mode 100644
index 000000000000..2b20fb23ba35
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/PersonalTodoListPartUtil.ts
@@ -0,0 +1,14 @@
+import { AgentRequest, PersonalTodoListPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class PersonalTodoListPartUtil extends PromptPartUtil<PersonalTodoListPart> {
+	static override type = 'personalTodoList' as const
+
+	override getPart(_request: AgentRequest, _helpers: AgentHelpers): PersonalTodoListPart {
+		return {
+			type: 'personalTodoList',
+			items: this.agent.$personalTodoList.get(),
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/PersonalityPartUtil.ts b/apps/dotcom/client/src/fairy/parts/PersonalityPartUtil.ts
new file mode 100644
index 000000000000..37bb2c74c014
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/PersonalityPartUtil.ts
@@ -0,0 +1,14 @@
+import { PersonalityPart } from '@tldraw/fairy-shared'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class PersonalityPartUtil extends PromptPartUtil<PersonalityPart> {
+	static override type = 'personality' as const
+
+	override getPart(): PersonalityPart {
+		const personality = this.agent.$fairyConfig.get().personality
+		return {
+			type: 'personality',
+			personality: personality || '',
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/PromptPartUtil.ts b/apps/dotcom/client/src/fairy/parts/PromptPartUtil.ts
new file mode 100644
index 000000000000..61ed1c2df4b3
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/PromptPartUtil.ts
@@ -0,0 +1,27 @@
+import { AgentRequest, PromptPart } from '@tldraw/fairy-shared'
+import { Editor } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { FairyAgent } from '../fairy-agent/agent/FairyAgent'
+
+export abstract class PromptPartUtil<T extends PromptPart = PromptPart> {
+	static type: PromptPart['type']
+
+	protected agent: FairyAgent
+	protected editor: Editor
+
+	constructor(agent: FairyAgent) {
+		this.agent = agent
+		this.editor = agent.editor
+	}
+
+	/**
+	 * Get some data to add to the prompt.
+	 * @returns The prompt part.
+	 */
+	abstract getPart(request: AgentRequest, helpers: AgentHelpers): Promise<T> | T
+}
+
+export interface PromptPartUtilConstructor<T extends PromptPart> {
+	new (agent: FairyAgent): PromptPartUtil<T>
+	type: T['type']
+}
diff --git a/apps/dotcom/client/src/fairy/parts/ScreenshotPartUtil.ts b/apps/dotcom/client/src/fairy/parts/ScreenshotPartUtil.ts
new file mode 100644
index 000000000000..11dfed1beb53
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/ScreenshotPartUtil.ts
@@ -0,0 +1,52 @@
+import { AgentRequest, ScreenshotPart } from '@tldraw/fairy-shared'
+import { Box, FileHelpers } from 'tldraw'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class ScreenshotPartUtil extends PromptPartUtil<ScreenshotPart> {
+	static override type = 'screenshot' as const
+
+	override async getPart(request: AgentRequest): Promise<ScreenshotPart> {
+		const { editor } = this
+
+		const contextBounds = request.bounds
+
+		const contextBoundsBox = Box.From(contextBounds)
+
+		const shapes = editor.getCurrentPageShapesSorted().filter((shape) => {
+			if (!editor) return false
+			const bounds = editor.getShapeMaskedPageBounds(shape)
+			if (!bounds) return false
+			return contextBoundsBox.includes(bounds)
+		})
+
+		if (shapes.length === 0) {
+			return { type: 'screenshot', screenshot: null }
+		}
+
+		const largestDimension = Math.max(request.bounds.w, request.bounds.h)
+		const scale = largestDimension > 8000 ? 8000 / largestDimension : 1
+
+		const result = await editor.toImage(shapes, {
+			format: 'jpeg',
+			background: true,
+			bounds: Box.From(request.bounds),
+			padding: 0,
+			pixelRatio: 1,
+			scale,
+		})
+
+		return {
+			type: 'screenshot',
+			screenshot: await FileHelpers.blobToDataUrl(result.blob),
+		}
+	}
+
+	// override buildContent({ screenshot }: ScreenshotPart) {
+	// 	if (!screenshot) return []
+
+	// 	return [
+	// 		'Here is the part of the canvas that you can currently see at this moment. It is not a reference image.',
+	// 		screenshot,
+	// 	]
+	// }
+}
diff --git a/apps/dotcom/client/src/fairy/parts/SelectedShapesPartUtil.ts b/apps/dotcom/client/src/fairy/parts/SelectedShapesPartUtil.ts
new file mode 100644
index 000000000000..150e80aff09a
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/SelectedShapesPartUtil.ts
@@ -0,0 +1,18 @@
+import { AgentRequest, SelectedShapesPart } from '@tldraw/fairy-shared'
+import { structuredClone } from 'tldraw'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class SelectedShapesPartUtil extends PromptPartUtil<SelectedShapesPart> {
+	static override type = 'selectedShapes' as const
+
+	override getPart(_request: AgentRequest): SelectedShapesPart {
+		const { editor } = this
+
+		const userSelectedShapes = editor.getSelectedShapes().map((v) => structuredClone(v)) ?? []
+
+		return {
+			type: 'selectedShapes',
+			shapeIds: userSelectedShapes.map((shape) => shape.id),
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/SoloTasksPartUtil.ts b/apps/dotcom/client/src/fairy/parts/SoloTasksPartUtil.ts
new file mode 100644
index 000000000000..a78df9b4e90f
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/SoloTasksPartUtil.ts
@@ -0,0 +1,34 @@
+import { AgentRequest, SoloTasksPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks } from '../FairyTaskList'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class SoloTasksPartUtil extends PromptPartUtil<SoloTasksPart> {
+	static override type = 'soloTasks' as const
+
+	override getPart(_request: AgentRequest, helpers: AgentHelpers): SoloTasksPart {
+		const allTasks = $fairyTasks.get()
+		const tasks = allTasks
+			.filter((task) => task.assignedTo === this.agent.id)
+			.map((task) => {
+				const transformedTaskBounds =
+					task.x !== undefined &&
+					task.y !== undefined &&
+					task.w !== undefined &&
+					task.h !== undefined
+						? helpers.applyOffsetToBox({ x: task.x, y: task.y, w: task.w, h: task.h })
+						: task.x !== undefined && task.y !== undefined
+							? helpers.applyOffsetToVec({ x: task.x, y: task.y })
+							: { x: task.x, y: task.y, w: task.w, h: task.h }
+
+				return {
+					...task,
+					...transformedTaskBounds,
+				}
+			})
+		return {
+			type: 'soloTasks',
+			tasks,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/TimePartUtil.ts b/apps/dotcom/client/src/fairy/parts/TimePartUtil.ts
new file mode 100644
index 000000000000..ad6566aa11d2
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/TimePartUtil.ts
@@ -0,0 +1,13 @@
+import { TimePart } from '@tldraw/fairy-shared'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class TimePartUtil extends PromptPartUtil<TimePart> {
+	static override type = 'time' as const
+
+	override getPart(): TimePart {
+		return {
+			type: 'time',
+			time: new Date().toLocaleTimeString(),
+		}
+	}
+}
diff --git a/packages/fairy-shared/src/parts/UserActionHistoryPartUtil.ts b/apps/dotcom/client/src/fairy/parts/UserActionHistoryPartUtil.ts
similarity index 63%
rename from packages/fairy-shared/src/parts/UserActionHistoryPartUtil.ts
rename to apps/dotcom/client/src/fairy/parts/UserActionHistoryPartUtil.ts
index c1e6cb3e25bc..5bb0ddfebb3f 100644
--- a/packages/fairy-shared/src/parts/UserActionHistoryPartUtil.ts
+++ b/apps/dotcom/client/src/fairy/parts/UserActionHistoryPartUtil.ts
@@ -1,53 +1,19 @@
-import { squashRecordDiffs } from '@tldraw/store'
-import { AgentHelpers } from '../AgentHelpers'
 import {
+	AgentRequest,
 	convertTldrawIdToSimpleId,
 	convertTldrawShapeToFocusedShape,
-	convertTldrawShapeToSimpleType,
-} from '../format/convertTldrawShapeToFocusedShape'
-import { FocusedShape } from '../format/FocusedShape'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface UserActionHistoryPart extends BasePromptPart<'userActionHistory'> {
-	added: {
-		shapeId: string
-		type: FocusedShape['_type']
-	}[]
-	removed: {
-		shapeId: string
-		type: FocusedShape['_type']
-	}[]
-	updated: {
-		shapeId: string
-		type: FocusedShape['_type']
-		before: Partial<FocusedShape>
-		after: Partial<FocusedShape>
-	}[]
-}
+	convertTldrawShapeToFocusedType,
+	FocusedShape,
+	UserActionHistoryPart,
+} from '@tldraw/fairy-shared'
+import { squashRecordDiffs } from 'tldraw'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
 
 export class UserActionHistoryPartUtil extends PromptPartUtil<UserActionHistoryPart> {
 	static override type = 'userActionHistory' as const
 
-	override getPriority() {
-		return 40
-	}
-
-	override getPart(
-		_request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): UserActionHistoryPart {
-		if (!parts.includes('userActionHistory')) {
-			return {
-				type: 'userActionHistory',
-				added: [],
-				removed: [],
-				updated: [],
-			}
-		}
-
+	override getPart(_request: AgentRequest, helpers: AgentHelpers): UserActionHistoryPart {
 		const { editor, agent } = helpers
 
 		// Get the action history and clear it so that we can start tracking changes for the next request
@@ -69,7 +35,7 @@ export class UserActionHistoryPartUtil extends PromptPartUtil<UserActionHistoryP
 			if (shape.typeName !== 'shape') continue
 			part.added.push({
 				shapeId: convertTldrawIdToSimpleId(shape.id),
-				type: convertTldrawShapeToSimpleType(shape),
+				type: convertTldrawShapeToFocusedType(shape),
 			})
 		}
 
@@ -105,18 +71,6 @@ export class UserActionHistoryPartUtil extends PromptPartUtil<UserActionHistoryP
 
 		return part
 	}
-
-	override buildContent(part: UserActionHistoryPart): string[] {
-		const { updated, removed, added } = part
-		if (updated.length === 0 && removed.length === 0 && added.length === 0) {
-			return []
-		}
-
-		return [
-			'Since the previous request, the user has made the following changes to the canvas:',
-			JSON.stringify(part),
-		]
-	}
 }
 
 /**
diff --git a/apps/dotcom/client/src/fairy/parts/UserViewportBoundsPartUtil.ts b/apps/dotcom/client/src/fairy/parts/UserViewportBoundsPartUtil.ts
new file mode 100644
index 000000000000..7f03388d68ec
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/UserViewportBoundsPartUtil.ts
@@ -0,0 +1,17 @@
+import { AgentRequest, UserViewportBoundsPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class UserViewportBoundsPartUtil extends PromptPartUtil<UserViewportBoundsPart> {
+	static override type = 'userViewportBounds' as const
+
+	override getPart(_request: AgentRequest, helpers: AgentHelpers): UserViewportBoundsPart {
+		const userBounds = this.agent.editor.getViewportPageBounds()
+		const offsetUserBounds = helpers.applyOffsetToBox(userBounds)
+
+		return {
+			type: 'userViewportBounds',
+			userBounds: helpers.roundBox(offsetUserBounds),
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/parts/WorkingTasksPartUtil.ts b/apps/dotcom/client/src/fairy/parts/WorkingTasksPartUtil.ts
new file mode 100644
index 000000000000..349fe58b22d3
--- /dev/null
+++ b/apps/dotcom/client/src/fairy/parts/WorkingTasksPartUtil.ts
@@ -0,0 +1,34 @@
+import { AgentRequest, WorkingTasksPart } from '@tldraw/fairy-shared'
+import { AgentHelpers } from '../fairy-agent/agent/AgentHelpers'
+import { $fairyTasks } from '../FairyTaskList'
+import { PromptPartUtil } from './PromptPartUtil'
+
+export class WorkingTasksPartUtil extends PromptPartUtil<WorkingTasksPart> {
+	static override type = 'workingTasks' as const
+
+	override getPart(_request: AgentRequest, helpers: AgentHelpers): WorkingTasksPart {
+		const allTasks = $fairyTasks.get()
+		const tasks = allTasks
+			.filter((task) => task.assignedTo === this.agent.id && task.status === 'in-progress')
+			.map((task) => {
+				const transformedTaskBounds =
+					task.x !== undefined &&
+					task.y !== undefined &&
+					task.w !== undefined &&
+					task.h !== undefined
+						? helpers.applyOffsetToBox({ x: task.x, y: task.y, w: task.w, h: task.h })
+						: task.x !== undefined && task.y !== undefined
+							? helpers.applyOffsetToVec({ x: task.x, y: task.y })
+							: { x: task.x, y: task.y, w: task.w, h: task.h }
+
+				return {
+					...task,
+					...transformedTaskBounds,
+				}
+			})
+		return {
+			type: 'workingTasks',
+			tasks,
+		}
+	}
+}
diff --git a/apps/dotcom/client/src/fairy/utils/scaleBoxFromCenter.ts b/apps/dotcom/client/src/fairy/utils/scaleBoxFromCenter.ts
deleted file mode 100644
index 0013325e15d9..000000000000
--- a/apps/dotcom/client/src/fairy/utils/scaleBoxFromCenter.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { BoxLike } from 'tldraw'
-
-export function scaleBoxFromCenter(box: BoxLike, n: number): BoxLike {
-	const centerX = box.x + box.w / 2
-	const centerY = box.y + box.h / 2
-
-	const newW = box.w * n
-	const newH = box.h * n
-
-	return {
-		x: centerX - newW / 2,
-		y: centerY - newH / 2,
-		w: newW,
-		h: newH,
-	}
-}
diff --git a/apps/dotcom/client/src/hooks/useOpenUrlAndTrack.ts b/apps/dotcom/client/src/hooks/useOpenUrlAndTrack.ts
index 8f1d843f3ebe..e54db1c4d87d 100644
--- a/apps/dotcom/client/src/hooks/useOpenUrlAndTrack.ts
+++ b/apps/dotcom/client/src/hooks/useOpenUrlAndTrack.ts
@@ -3,8 +3,8 @@ import { openUrl } from '../utils/url'
 
 export function useOpenUrlAndTrack(source: TLUiEventSource) {
 	const trackEvent = useUiEvents()
-	return (url: string) => {
+	return (url: string, allowReferrer?: boolean) => {
 		trackEvent('open-url', { source, destinationUrl: url })
-		openUrl(url)
+		openUrl(url, allowReferrer)
 	}
 }
diff --git a/apps/dotcom/client/src/pages/admin.module.css b/apps/dotcom/client/src/pages/admin.module.css
index 2a2165c7bf57..476ca5f5d411 100644
--- a/apps/dotcom/client/src/pages/admin.module.css
+++ b/apps/dotcom/client/src/pages/admin.module.css
@@ -239,6 +239,52 @@
 	margin-top: 16px;
 }
 
+/* Stats Display */
+.statsContainer {
+	display: flex;
+	gap: 16px;
+	padding: 12px;
+	flex-wrap: wrap;
+}
+
+.statItem {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.statLabel {
+	font-size: 11px;
+	font-weight: 600;
+	color: var(--tla-color-text-3);
+	text-transform: uppercase;
+}
+
+.statValue {
+	font-size: 16px;
+	font-weight: 600;
+	color: var(--tla-color-text-1);
+}
+
+/* Count Container */
+.countContainer {
+	display: flex;
+	gap: 12px;
+	align-items: center;
+}
+
+.countDisplay {
+	font-size: 12px;
+	color: var(--tla-color-text-2);
+}
+
+/* Config Container */
+.configContainer {
+	display: flex;
+	gap: 16px;
+	flex-wrap: wrap;
+}
+
 /* Responsive adjustments */
 @media (max-width: 768px) {
 	.adminHeader {
diff --git a/apps/dotcom/client/src/pages/admin.tsx b/apps/dotcom/client/src/pages/admin.tsx
index 5b2ad81dd12d..ab08aa8b8069 100644
--- a/apps/dotcom/client/src/pages/admin.tsx
+++ b/apps/dotcom/client/src/pages/admin.tsx
@@ -1,10 +1,11 @@
-import { TlaFile, TlaUser, ZStoreData } from '@tldraw/dotcom-shared'
+import { TlaFile, TlaUser, userHasFlag, ZStoreData } from '@tldraw/dotcom-shared'
 import { RefObject, useCallback, useEffect, useRef, useState } from 'react'
 import { Navigate } from 'react-router-dom'
 import { fetch } from 'tldraw'
 import { TlaButton } from '../tla/components/TlaButton/TlaButton'
 import { useTldrawUser } from '../tla/hooks/useUser'
 import styles from './admin.module.css'
+import { saveMigrationLog } from './migrationLogsDB'
 
 // Helper component for structured data display
 function StructuredDataDisplay({ data }: { data: ZStoreData }) {
@@ -213,7 +214,7 @@ export function Component() {
 							onSuccess={loadData}
 							onError={setError}
 							onSuccessMessage={setSuccessMessage}
-							didMigrate={(data.user[0] as TlaUser).flags.includes('groups_backend')}
+							didMigrate={userHasFlag((data.user[0] as TlaUser).flags, 'groups_backend')}
 						/>
 						<StructuredDataDisplay data={data} />
 					</section>
@@ -227,6 +228,12 @@ export function Component() {
 					</section>
 				)}
 
+				{/* Batch Migration Section */}
+				<section className={styles.adminSection}>
+					<h3 className="tla-text_ui__title">Batch Migration</h3>
+					<BatchMigrateUsersToGroups />
+				</section>
+
 				{/* File Operations Section */}
 				<section className={styles.adminSection}>
 					<h3 className="tla-text_ui__title">File Operations</h3>
@@ -477,6 +484,269 @@ function MigrateUserToGroups({
 	)
 }
 
+function BatchMigrateUsersToGroups() {
+	const [isMigrating, setIsMigrating] = useState(false)
+	const [progressLog, setProgressLog] = useState<string[]>([])
+	const [error, setError] = useState(null as string | null)
+	const [isComplete, setIsComplete] = useState(false)
+	const [stats, setStats] = useState(
+		{} as {
+			successCount: number
+			failureCount: number
+			totalUsers: number
+			usersToMigrate: number
+			progress: number
+		}
+	)
+	const [unmigratedCount, setUnmigratedCount] = useState<number | null>(null)
+	const [isLoadingCount, setIsLoadingCount] = useState(false)
+	const [eventSource, setEventSource] = useState<EventSource | null>(null)
+	const [sleepMs, setSleepMs] = useState(100)
+	const logContainerRef = useRef<HTMLDivElement>(null)
+	const shouldContinueRef = useRef(true)
+
+	// Cleanup EventSource on unmount
+	useEffect(() => {
+		return () => {
+			if (eventSource) {
+				eventSource.close()
+			}
+		}
+	}, [eventSource])
+
+	// Auto-scroll log container to bottom when new entries are added
+	useEffect(() => {
+		if (logContainerRef.current) {
+			logContainerRef.current.scrollTop = logContainerRef.current.scrollHeight
+		}
+	}, [progressLog])
+
+	const fetchUnmigratedCount = useCallback(async () => {
+		setIsLoadingCount(true)
+		setError(null)
+		try {
+			const res = await fetch('/api/app/admin/unmigrated_users_count')
+			if (!res.ok) {
+				setError(res.statusText + ': ' + (await res.text()))
+				return
+			}
+			const data = await res.json()
+			setUnmigratedCount(data.count)
+		} catch (err) {
+			setError(err instanceof Error ? err.message : 'Failed to fetch count')
+		} finally {
+			setIsLoadingCount(false)
+		}
+	}, [])
+
+	const stopMigration = useCallback(() => {
+		shouldContinueRef.current = false
+		if (eventSource) {
+			eventSource.close()
+			setEventSource(null)
+			setIsMigrating(false)
+		}
+	}, [eventSource])
+
+	const onMigrate = useCallback(async () => {
+		const migrationMessage = `Are you sure you want to migrate ALL users without the groups_backend flag? This action cannot be undone.`
+
+		if (!window.confirm(migrationMessage)) {
+			return
+		}
+
+		setIsMigrating(true)
+		shouldContinueRef.current = true
+		setError(null)
+		setProgressLog([])
+		setIsComplete(false)
+		setStats({ successCount: 0, failureCount: 0, totalUsers: 0, usersToMigrate: 0, progress: 0 })
+
+		const startBatch = () => {
+			return new Promise<void>((resolve, reject) => {
+				try {
+					const params = new URLSearchParams({
+						sleepMs: sleepMs.toString(),
+					})
+					const es = new EventSource(`/api/app/admin/migrate_users_batch?${params}`)
+					setEventSource(es)
+
+					es.onmessage = async (event) => {
+						const data = JSON.parse(event.data)
+
+						const timestamp = new Date(data.timestamp).toLocaleTimeString()
+						const logEntry = `[${timestamp}] ${data.message}`
+
+						// Keep only the last 500 log entries to prevent memory issues
+						setProgressLog((prev) => {
+							const updated = [...prev, logEntry]
+							return updated.length > 500 ? updated.slice(-500) : updated
+						})
+
+						// Save failure events to IndexedDB
+						if (data.step === 'failure') {
+							try {
+								await saveMigrationLog(data)
+							} catch (err) {
+								console.error('Failed to save migration log to IndexedDB:', err)
+							}
+						}
+
+						// Update stats from details
+						if (data.details) {
+							setStats(data.details)
+						}
+
+						if (data.type === 'complete') {
+							es.close()
+							setEventSource(null)
+							if (data.hasMore && shouldContinueRef.current) {
+								// Start next batch
+								setTimeout(() => startBatch().then(resolve).catch(reject), 100)
+							} else {
+								setIsComplete(true)
+								setIsMigrating(false)
+								resolve()
+							}
+						} else if (data.type === 'error') {
+							setError(data.message)
+							setIsMigrating(false)
+							es.close()
+							setEventSource(null)
+							reject(new Error(data.message))
+						}
+					}
+
+					es.onerror = () => {
+						setError('Connection failed')
+						setIsMigrating(false)
+						es.close()
+						setEventSource(null)
+						reject(new Error('Connection failed'))
+					}
+				} catch (err) {
+					setError(err instanceof Error ? err.message : 'Unknown error occurred')
+					setIsMigrating(false)
+					setEventSource(null)
+					reject(err)
+				}
+			})
+		}
+
+		try {
+			await startBatch()
+		} catch (_err) {
+			// Error already handled in startBatch
+		}
+	}, [sleepMs])
+
+	return (
+		<div className={styles.dangerZone}>
+			<h4 className="tla-text_ui__medium">Migrate All Users to Groups Backend</h4>
+
+			{/* Unmigrated Users Count */}
+			<div className={styles.countContainer}>
+				<TlaButton
+					onClick={fetchUnmigratedCount}
+					variant="secondary"
+					isLoading={isLoadingCount}
+					disabled={isMigrating}
+				>
+					Check Unmigrated Users Count
+				</TlaButton>
+				{unmigratedCount !== null && (
+					<span className={styles.countDisplay}>
+						{unmigratedCount} user{unmigratedCount !== 1 ? 's' : ''} need migration
+					</span>
+				)}
+			</div>
+
+			<p className="tla-text_ui__small">
+				This will migrate all users who don&apos;t have the groups_backend flag. The process will
+				run sequentially (one user at a time) and report progress in real-time. Configure the sleep
+				duration (milliseconds to wait between each user migration) below.
+			</p>
+
+			{error && <div className={styles.errorMessage}>{error}</div>}
+
+			{/* Configuration Inputs */}
+			<div className={styles.configContainer}>
+				<div>
+					<label htmlFor="sleepMs">Sleep between migrations (ms):</label>
+					<input
+						id="sleepMs"
+						type="number"
+						value={sleepMs}
+						onChange={(e) => setSleepMs(Number(e.target.value))}
+						disabled={isMigrating}
+						min={0}
+						className={styles.searchInput}
+						style={{ width: '100px', marginLeft: '8px' }}
+					/>
+				</div>
+			</div>
+
+			{/* Stats Display */}
+			{stats.totalUsers > 0 && (
+				<div className={styles.statsContainer}>
+					<div className={styles.statItem}>
+						<span className={styles.statLabel}>Total Users:</span>
+						<span className={styles.statValue}>{stats.totalUsers}</span>
+					</div>
+					<div className={styles.statItem}>
+						<span className={styles.statLabel}>Users to Migrate:</span>
+						<span className={styles.statValue}>{stats.usersToMigrate}</span>
+					</div>
+					<div className={styles.statItem}>
+						<span className={styles.statLabel}>Succeeded:</span>
+						<span className={styles.statValue}>{stats.successCount}</span>
+					</div>
+					<div className={styles.statItem}>
+						<span className={styles.statLabel}>Failed:</span>
+						<span className={styles.statValue}>{stats.failureCount}</span>
+					</div>
+					<div className={styles.statItem}>
+						<span className={styles.statLabel}>Progress:</span>
+						<span className={styles.statValue}>{(stats.progress * 100).toFixed(2)}%</span>
+					</div>
+				</div>
+			)}
+
+			<div className={styles.deleteContainer}>
+				<TlaButton
+					onClick={isMigrating ? stopMigration : onMigrate}
+					variant="warning"
+					className={styles.deleteButton}
+					disabled={!isMigrating && isLoadingCount}
+				>
+					{isMigrating ? 'Stop Migration' : 'Start Batch Migration'}
+				</TlaButton>
+			</div>
+
+			{isComplete && (
+				<div className={styles.successMessage}>
+					Migration completed! {stats.successCount} user{stats.successCount !== 1 ? 's' : ''}{' '}
+					migrated successfully, {stats.failureCount} failed
+				</div>
+			)}
+
+			{/* Progress Log */}
+			{progressLog.length > 0 && (
+				<div className={styles.progressLog}>
+					<h5>Migration Progress:</h5>
+					<div ref={logContainerRef} className={styles.logContainer}>
+						{progressLog.map((log, index) => (
+							<div key={index} className={styles.logEntry}>
+								{log}
+							</div>
+						))}
+					</div>
+				</div>
+			)}
+		</div>
+	)
+}
+
 function DeleteUser() {
 	const inputRef = useRef<HTMLInputElement>(null)
 	const [isDeleting, setIsDeleting] = useState(false)
diff --git a/apps/dotcom/client/src/pages/migrationLogsDB.ts b/apps/dotcom/client/src/pages/migrationLogsDB.ts
new file mode 100644
index 000000000000..637667ff7769
--- /dev/null
+++ b/apps/dotcom/client/src/pages/migrationLogsDB.ts
@@ -0,0 +1,26 @@
+import { openDB, type IDBPDatabase } from 'idb'
+
+const DB_NAME = 'migration-errors'
+const DB_VERSION = 1
+const STORE_NAME = 'errors'
+
+let dbPromise: Promise<IDBPDatabase> | null = null
+
+function getDB(): Promise<IDBPDatabase> {
+	if (!dbPromise) {
+		dbPromise = openDB(DB_NAME, DB_VERSION, {
+			upgrade(db, _oldVersion, _newVersion, _transaction) {
+				db.createObjectStore(STORE_NAME, {
+					keyPath: 'id',
+					autoIncrement: true,
+				})
+			},
+		})
+	}
+	return dbPromise
+}
+
+export async function saveMigrationLog(entry: object): Promise<void> {
+	const db = await getDB()
+	await db.add(STORE_NAME, entry)
+}
diff --git a/apps/dotcom/client/src/routeDefs.ts b/apps/dotcom/client/src/routeDefs.ts
index edf46ac08057..bf7c0b205b5b 100644
--- a/apps/dotcom/client/src/routeDefs.ts
+++ b/apps/dotcom/client/src/routeDefs.ts
@@ -8,9 +8,12 @@ export const ROUTES = {
 	tlaFile: `/f/:fileSlug`,
 	tlaFileHistory: `/f/:fileSlug/history`,
 	tlaFileHistorySnapshot: `/f/:fileSlug/history/:timestamp`,
+	tlaFilePierreHistory: `/f/:fileSlug/pierre-history`,
+	tlaFilePierreHistorySnapshot: `/f/:fileSlug/pierre-history/:commitHash`,
 	tlaLocalFileIndex: `/lf`,
 	tlaLocalFile: `/lf/:fileSlug`,
 	tlaPublish: `/p/:fileSlug`,
+	tlaInvite: `/invite/:token`,
 	// Legacy routes
 	tlaLegacyRoom: '/r/:roomId',
 	tlaLegacyRoomHistory: '/r/:boardId/history',
diff --git a/apps/dotcom/client/src/routes.tsx b/apps/dotcom/client/src/routes.tsx
index 1b623ba758a7..639345374951 100644
--- a/apps/dotcom/client/src/routes.tsx
+++ b/apps/dotcom/client/src/routes.tsx
@@ -78,8 +78,17 @@ export const router = createRoutesFromElements(
 					path={ROUTES.tlaFileHistorySnapshot}
 					lazy={() => import('./tla/pages/file-history-snapshot')}
 				/>
+				<Route
+					path={ROUTES.tlaFilePierreHistory}
+					lazy={() => import('./tla/pages/file-pierre-history')}
+				/>
+				<Route
+					path={ROUTES.tlaFilePierreHistorySnapshot}
+					lazy={() => import('./tla/pages/file-pierre-history-snapshot')}
+				/>
 
 				<Route path={ROUTES.tlaPublish} lazy={() => import('./tla/pages/publish')} />
+				<Route path={ROUTES.tlaInvite} lazy={() => import('./tla/pages/invite')} />
 				{/* Legacy room */}
 				<Route path={ROUTES.tlaLegacyRoom} lazy={() => import('./tla/pages/legacy-room')} />
 				{/* Legacy readonly */}
diff --git a/apps/dotcom/client/src/tla/app/ClientQuery.ts b/apps/dotcom/client/src/tla/app/ClientQuery.ts
index bfd613a1cc04..17685d5af599 100644
--- a/apps/dotcom/client/src/tla/app/ClientQuery.ts
+++ b/apps/dotcom/client/src/tla/app/ClientQuery.ts
@@ -4,6 +4,7 @@ import {
 	TlaGroupUser,
 	TlaRow,
 	TlaSchema,
+	TlaUser,
 } from '@tldraw/dotcom-shared'
 import { assert, compact, computed, react, sleep } from 'tldraw'
 
@@ -39,6 +40,15 @@ export class ClientQuery<Row extends TlaRow, isOne extends boolean = false> {
 			this.wheres.every(([key, value]) => row[key] === value)
 		) as any[]
 
+		if (this.table === 'user') {
+			rows = rows.map((row: TlaUser) => {
+				return {
+					...row,
+					fairies: data.user_fairies.find((uf) => uf.userId === row.id)?.fairies || null,
+				}
+			})
+		}
+
 		if (this.table === 'file_state') {
 			rows = compact(
 				rows.map((row: TlaFileState) => {
@@ -47,6 +57,8 @@ export class ClientQuery<Row extends TlaRow, isOne extends boolean = false> {
 					return {
 						...row,
 						file,
+						fairyState:
+							data.file_fairies.find((ff) => ff.fileId === row.fileId)?.fairyState || null,
 					}
 				})
 			)
diff --git a/apps/dotcom/client/src/tla/app/TldrawApp.ts b/apps/dotcom/client/src/tla/app/TldrawApp.ts
index 5ca8f859577c..eed2dfbde32b 100644
--- a/apps/dotcom/client/src/tla/app/TldrawApp.ts
+++ b/apps/dotcom/client/src/tla/app/TldrawApp.ts
@@ -2,8 +2,11 @@
 import { Zero } from '@rocicorp/zero'
 import { captureException } from '@sentry/react'
 import {
+	AcceptInviteResponseBody,
 	CreateFilesResponseBody,
 	CreateSnapshotRequestBody,
+	DragFileOperation,
+	DragReorderOperation,
 	FILE_PREFIX,
 	LOCAL_FILE_PREFIX,
 	MAX_NUMBER_OF_FILES,
@@ -22,6 +25,7 @@ import {
 	ZErrorCode,
 	Z_PROTOCOL_VERSION,
 	createMutators,
+	parseFlags,
 	schema as zeroSchema,
 } from '@tldraw/dotcom-shared'
 import {
@@ -32,6 +36,7 @@ import {
 	isEqual,
 	promiseWithResolve,
 	setInLocalStorage,
+	sleep,
 	sortByIndex,
 	sortByMaybeIndex,
 	structuredClone,
@@ -39,6 +44,7 @@ import {
 	uniqueId,
 } from '@tldraw/utils'
 import pick from 'lodash.pick'
+import { useNavigate } from 'react-router-dom'
 import {
 	Atom,
 	Signal,
@@ -60,6 +66,7 @@ import {
 	react,
 	transact,
 } from 'tldraw'
+import { routes } from '../../routeDefs'
 import { trackEvent } from '../../utils/analytics'
 import { MULTIPLAYER_SERVER, ZERO_SERVER } from '../../utils/config'
 import { multiplayerAssetStore } from '../../utils/multiplayerAssetStore'
@@ -70,6 +77,25 @@ import { createIntl, defineMessages, setupCreateIntl } from '../utils/i18n'
 import { updateLocalSessionState } from '../utils/local-session-state'
 import { Zero as ZeroPolyfill } from './zero-polyfill'
 
+export interface DragGroupOperation {
+	reorder?: DragReorderOperation
+}
+
+export type DragState =
+	| null
+	| {
+			type: 'file'
+			id: string
+			operation: DragFileOperation
+			hasDragStarted: boolean
+	  }
+	| {
+			type: 'group'
+			id: string
+			operation: DragGroupOperation
+			hasDragStarted: boolean
+	  }
+
 export const TLDR_FILE_ENDPOINT = `/api/app/tldr`
 export const PUBLISH_ENDPOINT = `/api/app/publish`
 
@@ -90,8 +116,8 @@ export class TldrawApp {
 
 	readonly z: ZeroPolyfill | Zero<TlaSchema, TlaMutators>
 
-	private readonly user$: Signal<TlaUser | undefined>
-	private readonly fileStates$: Signal<(TlaFileState & { file: TlaFile })[]>
+	private readonly user$: Signal<(TlaUser & { fairies: string }) | undefined>
+	private readonly fileStates$: Signal<(TlaFileState & { file: TlaFile; fairyState: string })[]>
 	private readonly groupMemberships$: Signal<
 		(TlaGroupUser & {
 			group: TlaGroup
@@ -137,13 +163,16 @@ export class TldrawApp {
 
 	toasts: TLUiToastsContextType | null = null
 	trackEvent: TLAppUiContextType
+	navigate: ReturnType<typeof useNavigate>
 
 	private constructor(
 		public readonly userId: string,
 		getToken: () => Promise<string | undefined>,
 		onClientTooOld: () => void,
-		trackEvent: TLAppUiContextType
+		trackEvent: TLAppUiContextType,
+		navigate: ReturnType<typeof useNavigate>
 	) {
+		this.navigate = navigate
 		this.trackEvent = trackEvent
 		const sessionId = uniqueId()
 		this.z = useProperZero
@@ -203,39 +232,21 @@ export class TldrawApp {
 			.related('groupMembers')
 	}
 
-	async preload(initialUserData: TlaUser) {
-		let didCreate = false
+	async preload() {
 		await this.userQuery().preload().complete
 		await this.changesFlushed
-		if (!this.user$.get()) {
-			didCreate = true
-
-			// Check localStorage feature flag for new groups initialization
-			const useNewGroupsInit = getFromLocalStorage('tldraw_groups_init') === 'true'
-
-			if (useNewGroupsInit) {
-				// New groups initialization
-				await this.z.mutate.init({ user: initialUserData, time: Date.now() })
-			} else {
-				// Legacy initialization (no groups) - just insert user like before
-				// eslint-disable-next-line @typescript-eslint/no-deprecated
-				await this.z.mutate.user.insert({ ...initialUserData, flags: '' })
-			}
-
-			updateLocalSessionState((state) => ({ ...state, shouldShowWelcomeDialog: true }))
-		}
 		await new Promise((resolve) => {
 			let unlisten = () => {}
 			unlisten = react('wait for user', () => this.user$.get() && resolve(unlisten()))
 		})
-		if (!this.user$.get()) {
-			throw Error('could not create user')
-		}
 		await this.fileStateQuery().preload().complete
-		return didCreate
 	}
 
 	messages = defineMessages({
+		max_groups_reached: {
+			defaultMessage:
+				'You have reached the maximum number of groups. You need to delete old groups before creating new ones.',
+		},
 		// toast title
 		mutation_error_toast_title: { defaultMessage: 'Error' },
 		// toast descriptions
@@ -310,7 +321,7 @@ export class TldrawApp {
 	@computed({ isEqual })
 	getUserFlags(): Set<TlaFlags> {
 		const user = this.getUser()
-		return new Set(user.flags?.split(',') ?? []) as Set<TlaFlags>
+		return new Set(parseFlags(user.flags)) as Set<TlaFlags>
 	}
 
 	hasFlag(flag: TlaFlags) {
@@ -439,7 +450,7 @@ export class TldrawApp {
 	>()
 
 	@computed({ isEqual })
-	getUserRecentFiles() {
+	getMyFiles() {
 		if (this.isGroupsMigrated()) {
 			return this.getGroupFilesSorted(this.getHomeGroupId())
 		}
@@ -447,6 +458,7 @@ export class TldrawApp {
 		const myStates = objectMapFromEntries(this.getUserFileStates().map((f) => [f.fileId, f]))
 
 		const myFileIds = new Set<string>([...objectMapKeys(myFiles), ...objectMapKeys(myStates)])
+		const myGroupMemberships = this.getGroupMemberships()
 
 		const nextRecentFileOrdering: {
 			fileId: TlaFile['id']
@@ -458,35 +470,67 @@ export class TldrawApp {
 			const file = myFiles[fileId]
 			let state: (typeof myStates)[string] | undefined = myStates[fileId]
 			if (!file) continue
+			if (file.isDeleted) continue
+
 			if (!state && !file.isDeleted && file.ownerId === this.userId) {
-				// create a file state for this file
-				// this allows us to 'undelete' soft-deleted files by manually toggling 'isDeleted' in the backend
 				state = this.fileStates$.get().find((fs) => fs.fileId === fileId)
 			}
 			if (!state) {
 				// if the file is deleted, we don't want to show it in the recent files
 				continue
 			}
+
+			// if the file is in a group we have access to, we don't want to show it in my files
+			if (myGroupMemberships.some((g) => g.groupFiles.some((gf) => gf.fileId === fileId))) {
+				continue
+			}
+
 			const existing = this.lastRecentFileOrdering?.find((f) => f.fileId === fileId)
-			if (existing && existing.isPinned === state.isPinned) {
+			const isPinned = state.isPinned ?? false
+
+			if (existing && existing.isPinned === isPinned) {
+				// Preserve existing entry to maintain ordering
 				nextRecentFileOrdering.push(existing)
 				continue
 			}
 
-			nextRecentFileOrdering.push({
+			// For new entries or pinned status changes
+			const newEntry = {
 				fileId,
-				isPinned: state.isPinned ?? false,
+				isPinned,
 				date: state.lastEditAt ?? state.firstVisitAt ?? file.createdAt ?? 0,
-			})
+			}
+
+			// If this was previously unpinned and we have existing ordering,
+			// preserve its position in the unpinned section to avoid real-time reordering
+			if (!isPinned && existing && !existing.isPinned) {
+				// Keep the old date to preserve ordering in "My files"
+				newEntry.date = existing.date
+			}
+
+			nextRecentFileOrdering.push(newEntry)
 		}
 
-		// sort by date with most recent first
-		nextRecentFileOrdering.sort((a, b) => b.date - a.date)
+		// separate pinned and unpinned files
+		const pinnedFiles = nextRecentFileOrdering.filter((f) => f.isPinned)
+		const unpinnedFiles = nextRecentFileOrdering.filter((f) => !f.isPinned)
+
+		// sort pinned files by their pinnedIndex
+		pinnedFiles.sort((a, b) => {
+			// If neither has an index, sort by date (fallback)
+			return b.date - a.date
+		})
+
+		// sort unpinned files by date with most recent first
+		unpinnedFiles.sort((a, b) => b.date - a.date)
+
+		// combine: pinned files first, then unpinned
+		const sortedFiles = [...pinnedFiles, ...unpinnedFiles]
 
 		// stash the ordering for next time
-		this.lastRecentFileOrdering = nextRecentFileOrdering
+		this.lastRecentFileOrdering = sortedFiles
 
-		return nextRecentFileOrdering
+		return sortedFiles
 	}
 
 	private canCreateNewFile(groupId: string) {
@@ -530,7 +574,7 @@ export class TldrawApp {
 		name?: string
 		createSource?: string | null
 	} = {}): Promise<Result<{ fileId: string }, 'max number of files reached'>> {
-		if (!this.canCreateNewFile(this.getHomeGroupId())) {
+		if (!this.canCreateNewFile(groupId)) {
 			this.showMaxFilesToast()
 			return Result.err('max number of files reached')
 		}
@@ -705,12 +749,14 @@ export class TldrawApp {
 
 	/**
 	 * Remove a user's file states for a file and delete the file if the user is the owner of the file.
-	 *
-	 * @param fileId - The file id.
 	 */
-	async deleteOrForgetFile(fileId: string) {
+	async deleteOrForgetFile(fileId: string, groupId: string = this.getHomeGroupId()) {
 		// Optimistic update, remove file and file states
-		await this.z.mutate.removeFileFromGroup({ fileId, groupId: this.getHomeGroupId() })
+		await this.z.mutate.removeFileFromGroup({ fileId, groupId }).client
+	}
+
+	async addFileLinkToGroup(fileId: string, groupId: string) {
+		await this.z.mutate.addFileLinkToGroup({ fileId, groupId }).client
 	}
 
 	setFileSharedLinkType(fileId: string, sharedLinkType: TlaFile['sharedLinkType'] | 'no-access') {
@@ -755,6 +801,13 @@ export class TldrawApp {
 		this.z.mutate.onEnterFile({ fileId, time: Date.now() })
 	}
 
+	onFairyStateUpdate(fileId: string, fairyState: any) {
+		this.z.mutate.file_state.updateFairies({
+			fileId,
+			fairyState: JSON.stringify(fairyState),
+		})
+	}
+
 	onFileEdit(fileId: string) {
 		this.updateFileState(fileId, { lastEditAt: Date.now() })
 	}
@@ -772,52 +825,48 @@ export class TldrawApp {
 
 	static async create(opts: {
 		userId: string
-		fullName: string
-		email: string
-		avatar: string
 		getToken(): Promise<string | undefined>
 		onClientTooOld(): void
 		trackEvent: TLAppUiContextType
+		navigate: ReturnType<typeof useNavigate>
 	}) {
 		// This is an issue: we may have a user record but not in the store.
 		// Could be just old accounts since before the server had a version
 		// of the store... but we should probably identify that better.
 
 		const { id: _id, name: _name, color, ...restOfPreferences } = getUserPreferences()
-		const app = new TldrawApp(opts.userId, opts.getToken, opts.onClientTooOld, opts.trackEvent)
+		const app = new TldrawApp(
+			opts.userId,
+			opts.getToken,
+			opts.onClientTooOld,
+			opts.trackEvent,
+			opts.navigate
+		)
 		// @ts-expect-error
 		window.app = app
-		const didCreate = await app.preload({
-			id: opts.userId,
-			name: opts.fullName,
-			email: opts.email,
-			color: color ?? defaultUserPreferences.color,
-			avatar: opts.avatar,
-			exportFormat: 'png',
-			exportTheme: 'light',
-			exportBackground: false,
-			exportPadding: true,
-			createdAt: Date.now(),
-			updatedAt: Date.now(),
-			flags: '',
-			allowAnalyticsCookie: null,
-			...restOfPreferences,
-			inputMode: restOfPreferences.inputMode ?? null,
-			locale: restOfPreferences.locale ?? null,
-			animationSpeed: restOfPreferences.animationSpeed ?? null,
-			areKeyboardShortcutsEnabled: restOfPreferences.areKeyboardShortcutsEnabled ?? null,
-			edgeScrollSpeed: restOfPreferences.edgeScrollSpeed ?? null,
-			colorScheme: restOfPreferences.colorScheme ?? null,
-			isSnapMode: restOfPreferences.isSnapMode ?? null,
-			isWrapMode: restOfPreferences.isWrapMode ?? null,
-			isDynamicSizeMode: restOfPreferences.isDynamicSizeMode ?? null,
-			isPasteAtCursorMode: restOfPreferences.isPasteAtCursorMode ?? null,
-			enhancedA11yMode: restOfPreferences.enhancedA11yMode ?? null,
-		})
-		if (didCreate) {
+		await app.preload()
+		const user = app.getUser()
+		if (user.color === '___INIT___') {
+			app.updateUser({
+				color: color ?? defaultUserPreferences.color,
+				...restOfPreferences,
+				inputMode: restOfPreferences.inputMode ?? null,
+				locale: restOfPreferences.locale ?? null,
+				animationSpeed: restOfPreferences.animationSpeed ?? null,
+				areKeyboardShortcutsEnabled: restOfPreferences.areKeyboardShortcutsEnabled ?? null,
+				edgeScrollSpeed: restOfPreferences.edgeScrollSpeed ?? null,
+				colorScheme: restOfPreferences.colorScheme ?? null,
+				isSnapMode: restOfPreferences.isSnapMode ?? null,
+				isWrapMode: restOfPreferences.isWrapMode ?? null,
+				isDynamicSizeMode: restOfPreferences.isDynamicSizeMode ?? null,
+				isPasteAtCursorMode: restOfPreferences.isPasteAtCursorMode ?? null,
+				enhancedA11yMode: restOfPreferences.enhancedA11yMode ?? null,
+			})
+
 			opts.trackEvent('create-user', { source: 'app' })
+			updateLocalSessionState((state) => ({ ...state, shouldShowWelcomeDialog: true }))
 		}
-		return { app, userId: opts.userId }
+		return { app, userId: user.id }
 	}
 
 	getIntl() {
@@ -832,7 +881,11 @@ export class TldrawApp {
 		return createIntl()!
 	}
 
-	async uploadTldrFiles(files: File[], onFirstFileUploaded?: (fileId: string) => void) {
+	async uploadTldrFiles(
+		files: File[],
+		onFirstFileUploaded?: (fileId: string) => void,
+		groupId?: string
+	) {
 		const totalFiles = files.length
 		let uploadedFiles = 0
 		if (totalFiles === 0) return
@@ -883,10 +936,14 @@ export class TldrawApp {
 		}
 
 		for (const f of files) {
-			const res = await this.uploadTldrFile(f, (bytes) => {
-				bytesUploaded += bytes
-				updateProgress()
-			}).catch((e) => Result.err(e))
+			const res = await this.uploadTldrFile(
+				f,
+				(bytes) => {
+					bytesUploaded += bytes
+					updateProgress()
+				},
+				groupId
+			).catch((e) => Result.err(e))
 			if (!res.ok) {
 				clearTimeout(uploadingToastTimeout)
 				if (uploadingToastId) this.toasts?.removeToast(uploadingToastId)
@@ -928,7 +985,8 @@ export class TldrawApp {
 
 	private async uploadTldrFile(
 		file: File,
-		onProgress?: (bytesUploadedSinceLastProgressUpdate: number) => void
+		onProgress?: (bytesUploadedSinceLastProgressUpdate: number) => void,
+		groupId?: string
 	) {
 		const json = await file.text()
 		const parseFileResult = parseTldrawJsonFile({
@@ -996,6 +1054,137 @@ export class TldrawApp {
 			Object.values(snapshot.store).find((d): d is TLDocument => d.typeName === 'document')?.name ??
 			''
 
-		return this.createFile({ fileId, name })
+		return this.createFile({ fileId, name, groupId })
+	}
+
+	sidebarState = atom('sidebar state', {
+		expandedGroups: {} as Record<string, 'closed' | 'expanded_show_less' | 'expanded_show_more'>,
+		recentFilesShowMore: false,
+		noAnimationGroups: [] as string[],
+		renameState: null as null | {
+			fileId: string
+			groupId: string
+		},
+		dragState: null as DragState,
+	})
+
+	ensureSidebarGroupExpanded(groupId: string) {
+		const currentExpansionState = this.sidebarState.get().expandedGroups[groupId]
+		if (!currentExpansionState || currentExpansionState === 'closed') {
+			this.sidebarState.update((prev) => ({
+				...prev,
+				expandedGroups: { ...prev.expandedGroups, [groupId]: 'expanded_show_less' },
+			}))
+		}
+	}
+
+	ensureFileVisibleInSidebar(fileId: string) {
+		const file = this.getFile(fileId)
+		if (!file) return
+
+		// If file is pinned, nothing to do
+		if (this.getFileState(fileId)?.isPinned) {
+			return
+		}
+
+		// If file is in a group
+		if (file.owningGroupId) {
+			const group = this.getGroupMembership(file.owningGroupId)
+			if (!group) return
+
+			const groupFiles = this.getGroupFilesSorted(file.owningGroupId)
+			const MAX_FILES_TO_SHOW = 4
+			const fileIndex = groupFiles.findIndex((f) => f?.fileId === fileId)
+
+			if (fileIndex >= MAX_FILES_TO_SHOW) {
+				// File is in the "show more" section, expand fully
+				this.sidebarState.update((prev) => ({
+					...prev,
+					expandedGroups: { ...prev.expandedGroups, [file.owningGroupId!]: 'expanded_show_more' },
+				}))
+			} else {
+				// File is in the "show less" section, ensure group is expanded
+				this.ensureSidebarGroupExpanded(file.owningGroupId)
+			}
+			return
+		}
+
+		// // If file is in recent files (not in a group)
+		// const recentFiles = this.getMyFiles()
+		// if (!recentFiles) return
+
+		// const groupMemberships = this.getGroupMemberships()
+		// const otherFiles = recentFiles.filter(
+		// 	(item) =>
+		// 		!this.isPinned(item.id) &&
+		// 		!groupMemberships.some(
+		// 			(group) => group.group.id === this.getFile(item.fileId)?.owningGroupId
+		// 		)
+		// )
+
+		// const MAX_FILES_TO_SHOW = groupMemberships.length > 0 ? 6 : +Infinity
+		// const fileIndex = otherFiles.findIndex((item) => item.fileId === fileId)
+
+		// if (fileIndex >= MAX_FILES_TO_SHOW) {
+		// 	// File is in the "show more" section of recent files
+		// 	patch(this.sidebarState).recentFilesShowMore(true)
+		// }
+		// If file is in the "show less" section, nothing to do
+	}
+
+	copyGroupInvite(groupId: string, showToast = true) {
+		const group = this.getGroupMembership(groupId)
+		if (!group?.group.inviteSecret) return
+
+		const inviteText = `${location.origin}/invite/${group.group.inviteSecret}`
+		navigator.clipboard.writeText(inviteText)
+
+		if (showToast) {
+			this.toasts?.addToast({
+				id: 'copied-invite-link',
+				title: 'Copied invite link',
+			})
+		}
+
+		this.trackEvent('copy-share-link', { source: 'sidebar' })
+	}
+
+	async acceptGroupInvite(inviteSecret: string) {
+		const response = await fetch(`/api/app/invite/${inviteSecret}/accept`, {
+			method: 'POST',
+		})
+
+		const payload = (await response.json()) as AcceptInviteResponseBody
+
+		if (payload.error || !response.ok) {
+			this.toasts?.addToast({
+				severity: 'error',
+				title: 'Error accepting invite',
+				description: payload.message,
+			})
+			this.navigate(routes.tlaRoot())
+			return
+		}
+
+		this.trackEvent('accept-group-invite', { source: 'sidebar' })
+
+		// wait for the group to appear in the store
+		while (!this.getGroupMembership(payload.groupId)) {
+			await sleep(50)
+		}
+
+		this.sidebarState.update((prev) => ({
+			...prev,
+			expandedGroups: { ...prev.expandedGroups, [payload.groupId]: 'expanded_show_less' },
+		}))
+
+		// Clear any existing ordering for this new group to get fresh ordering
+		this.lastGroupFileOrderings.delete(payload.groupId)
+		const files = this.getGroupFilesSorted(payload.groupId)
+		if (!files.length) {
+			this.navigate(routes.tlaRoot())
+			return
+		}
+		this.navigate(routes.tlaFile(files[0]!.fileId))
 	}
 }
diff --git a/apps/dotcom/client/src/tla/app/zero-polyfill.ts b/apps/dotcom/client/src/tla/app/zero-polyfill.ts
index 7ef08711113a..284207115f1e 100644
--- a/apps/dotcom/client/src/tla/app/zero-polyfill.ts
+++ b/apps/dotcom/client/src/tla/app/zero-polyfill.ts
@@ -16,6 +16,8 @@ import {
 	deferAsyncEffects,
 	mapObjectMapValues,
 	objectMapKeys,
+	promiseWithResolve,
+	react,
 	sleep,
 	transact,
 	uniqueId,
@@ -92,8 +94,9 @@ export class Zero {
 		})
 		const mutationQueue = new ExecutionQueue()
 		const mutatorWrapper = (name: string, mutatorFn: any) => {
-			return async (props: any) => {
-				await mutationQueue.push(async () => {
+			return (props: any) => {
+				const server = promiseWithResolve()
+				const client = mutationQueue.push(async () => {
 					if (this.clientTooOld) {
 						this.opts.onMutationRejected('client_too_old')
 						return
@@ -110,6 +113,18 @@ export class Zero {
 					} finally {
 						controller.abort()
 					}
+					let didResolve = false
+					const unlisten = react('resolve server promise', () => {
+						if (
+							!didResolve &&
+							this.store.getOptimisticUpdates().filter((u) => u.mutationId === mutationId)
+								.length === 0
+						) {
+							didResolve = true
+							server.resolve(null)
+							queueMicrotask(() => unlisten?.())
+						}
+					})
 					this.pendingUpdates.push({
 						type: 'mutator',
 						mutationId,
@@ -122,6 +137,7 @@ export class Zero {
 						}, 50)
 					}
 				})
+				return { client, server }
 			}
 		}
 		const mutators = createMutators(opts.userId) as any
diff --git a/apps/dotcom/client/src/tla/components/ExternalLink/ExternalLink.tsx b/apps/dotcom/client/src/tla/components/ExternalLink/ExternalLink.tsx
index af85e3a6cd4f..32b3c86533d9 100644
--- a/apps/dotcom/client/src/tla/components/ExternalLink/ExternalLink.tsx
+++ b/apps/dotcom/client/src/tla/components/ExternalLink/ExternalLink.tsx
@@ -1,10 +1,18 @@
 import { ComponentProps } from 'react'
 import { Link } from 'react-router-dom'
+import { trackEvent } from '../../../utils/analytics'
 
-export function ExternalLink(props: ComponentProps<typeof Link>) {
+export function ExternalLink(props: ComponentProps<typeof Link> & { eventName?: string }) {
+	const { eventName, ...rest } = props
 	return (
-		<Link {...props} target="_blank" rel="noopener noreferrer">
-			{props.children}
-		</Link>
+		<Link
+			{...rest}
+			target="_blank"
+			rel="noopener noreferrer"
+			onClick={(e) => {
+				if (eventName) trackEvent(eventName, { link: rest.to ?? '' })
+				rest.onClick?.(e)
+			}}
+		/>
 	)
 }
diff --git a/apps/dotcom/client/src/tla/components/TlaButton/TlaButton.tsx b/apps/dotcom/client/src/tla/components/TlaButton/TlaButton.tsx
index e8aa00bce8b0..2e5ee3d27197 100644
--- a/apps/dotcom/client/src/tla/components/TlaButton/TlaButton.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaButton/TlaButton.tsx
@@ -9,6 +9,7 @@ export const TlaButton = forwardRef<
 		isLoading?: boolean
 		icon?: string
 		iconRight?: string
+		iconRightClassName?: string
 		ghost?: boolean
 		variant?: 'primary' | 'secondary' | 'warning' | 'cta'
 	}
@@ -18,6 +19,7 @@ export const TlaButton = forwardRef<
 		className = '',
 		icon = '',
 		iconRight = '',
+		iconRightClassName = '',
 		ghost = false,
 		variant = 'primary',
 		isLoading = false,
@@ -54,11 +56,14 @@ export const TlaButton = forwardRef<
 					{children && <span>{children}</span>}
 					{iconRight &&
 						(isLoading ? (
-							<div className={styles.iconRight}>
-								<TlaIcon icon={iconRight} className={classNames(styles.spinner)} />
+							<div className={classNames(styles.iconRight, iconRightClassName)}>
+								<TlaIcon icon={iconRight} className={styles.spinner} />
 							</div>
 						) : (
-							<TlaIcon icon={iconRight} className={styles.iconRight} />
+							<TlaIcon
+								icon={iconRight}
+								className={classNames(styles.iconRight, iconRightClassName)}
+							/>
 						))}
 				</>
 			)}
diff --git a/apps/dotcom/client/src/tla/components/TlaCtaButton/TlaCtaButton.tsx b/apps/dotcom/client/src/tla/components/TlaCtaButton/TlaCtaButton.tsx
index bf60941f9850..070c79d3265c 100644
--- a/apps/dotcom/client/src/tla/components/TlaCtaButton/TlaCtaButton.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaCtaButton/TlaCtaButton.tsx
@@ -2,16 +2,25 @@ import classNames from 'classnames'
 import { ButtonHTMLAttributes, forwardRef } from 'react'
 import styles from './cta-button.module.css'
 
-export const TlaCtaButton = forwardRef<HTMLButtonElement, ButtonHTMLAttributes<HTMLButtonElement>>(
-	function TlaCtaButton(props, ref) {
-		return (
-			<button
-				ref={ref}
-				type="button"
-				draggable={false}
-				className={classNames('tla-primary-button', styles.ctaButton)}
-				{...props}
-			/>
-		)
-	}
-)
+export const TlaCtaButton = forwardRef<
+	HTMLButtonElement,
+	ButtonHTMLAttributes<HTMLButtonElement> & { canvas?: boolean; secondary?: boolean }
+>(function TlaCtaButton({ className, canvas = false, secondary = false, ...props }, ref) {
+	return (
+		<button
+			ref={ref}
+			type="button"
+			draggable={false}
+			className={classNames(
+				'tla-primary-button',
+				styles.ctaButton,
+				{
+					[styles.ctaButtonCanvas]: canvas,
+					[styles.ctaButtonSecondary]: secondary,
+				},
+				className
+			)}
+			{...props}
+		/>
+	)
+})
diff --git a/apps/dotcom/client/src/tla/components/TlaCtaButton/cta-button.module.css b/apps/dotcom/client/src/tla/components/TlaCtaButton/cta-button.module.css
index 9b642ab9ab1f..bb9ea5a1d514 100644
--- a/apps/dotcom/client/src/tla/components/TlaCtaButton/cta-button.module.css
+++ b/apps/dotcom/client/src/tla/components/TlaCtaButton/cta-button.module.css
@@ -12,6 +12,9 @@
 	align-items: center;
 	justify-content: center;
 	padding: 0px 16px;
+	font-size: 12px;
+	font-weight: 600;
+	color: #ffffff;
 	border: none;
 	cursor: pointer;
 }
@@ -23,11 +26,11 @@
 
 .ctaButton > span {
 	position: relative;
-	color: #ffffff;
+	color: inherit;
 	text-align: center;
-	font-weight: 600;
 	font-family: inherit;
-	font-size: 12px;
+	font-size: inherit;
+	font-weight: inherit;
 	z-index: 3;
 }
 
@@ -35,14 +38,18 @@
 	display: block;
 	content: '';
 	position: absolute;
-	inset: 2px;
+	inset: 0px;
 	color: #ffffff;
 	background-color: var(--tla-color-cta);
 	border-radius: 6px;
 	z-index: 2;
 }
 
-.ctaButton::after {
+.ctaButtonCanvas::before {
+	inset: 2px;
+}
+
+.ctaButtonCanvas::after {
 	display: block;
 	content: '';
 	position: absolute;
@@ -52,8 +59,31 @@
 	z-index: 1;
 }
 
+.ctaButtonSecondary {
+	color: var(--tl-color-text-1);
+}
+
+.ctaButtonSecondary::after {
+	inset: 0px;
+	border-radius: 8px;
+}
+
+.ctaButtonSecondary::before {
+	background-color: var(--tl-color-muted-2);
+	border: 1px solid var(--tl-color-muted-1);
+}
+
+.ctaButton:disabled {
+	opacity: 0.5;
+	pointer-events: none;
+}
+
 @media (hover: hover) {
-	.ctaButton:hover::before {
+	.ctaButton:not(:disabled):hover::before {
 		background-color: var(--tla-color-cta-hover);
 	}
+
+	.ctaButtonSecondary:not(:disabled):hover::before {
+		background-color: var(--tl-color-muted-1);
+	}
 }
diff --git a/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditor.tsx b/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditor.tsx
index ccbab4cd99de..1d9206bdc225 100644
--- a/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditor.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditor.tsx
@@ -1,4 +1,5 @@
-import { getLicenseKey } from '@tldraw/dotcom-shared'
+import { TLCustomServerEvent, getLicenseKey } from '@tldraw/dotcom-shared'
+import { FairyEntity } from '@tldraw/fairy-shared'
 import { useSync } from '@tldraw/sync'
 import { Suspense, lazy, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
@@ -6,12 +7,14 @@ import {
 	DefaultDebugMenuContent,
 	Editor,
 	TLComponents,
+	TLPresenceStateInfo,
 	TLSessionStateSnapshot,
 	TLUiDialogsContextType,
 	Tldraw,
 	TldrawUiMenuItem,
 	createDebugValue,
 	createSessionStateSnapshotSignal,
+	getDefaultUserPresence,
 	parseDeepLinkString,
 	react,
 	throttle,
@@ -21,16 +24,20 @@ import {
 	useEditor,
 	useEvent,
 	useValue,
+	type TLPresenceUserInfo,
+	type TLStore,
 } from 'tldraw'
 import { ThemeUpdater } from '../../../components/ThemeUpdater/ThemeUpdater'
 import { useOpenUrlAndTrack } from '../../../hooks/useOpenUrlAndTrack'
 import { useRoomLoadTracking } from '../../../hooks/useRoomLoadTracking'
-import { useHandleUiEvents } from '../../../utils/analytics'
+import { trackEvent, useHandleUiEvents } from '../../../utils/analytics'
 import { assetUrls } from '../../../utils/assetUrls'
 import { MULTIPLAYER_SERVER } from '../../../utils/config'
 import { createAssetFromUrl } from '../../../utils/createAssetFromUrl'
+import { isDevelopmentEnv, isProductionEnv } from '../../../utils/env'
 import { globalEditor } from '../../../utils/globalEditor'
 import { multiplayerAssetStore } from '../../../utils/multiplayerAssetStore'
+import { TldrawApp } from '../../app/TldrawApp'
 import { useMaybeApp } from '../../hooks/useAppState'
 import { ReadyWrapper, useSetIsReady } from '../../hooks/useIsReady'
 import { useNewRoomCreationTracking } from '../../hooks/useNewRoomCreationTracking'
@@ -51,8 +58,11 @@ import { useExtraDragIconOverrides } from './useExtraToolDragIcons'
 import { useFileEditorOverrides } from './useFileEditorOverrides'
 
 // Lazy load fairy components
+export const MAX_FAIRY_COUNT = 10
 const FairyApp = lazy(() =>
-	import('../../../fairy/FairyApp').then((m) => ({ default: m.FairyApp }))
+	import('../../../fairy/FairyApp').then((m) => ({
+		default: m.FairyApp,
+	}))
 )
 const FairyHUD = lazy(() =>
 	import('../../../fairy/FairyHUD').then((m) => ({ default: m.FairyHUD }))
@@ -61,6 +71,12 @@ const FairyVision = lazy(() =>
 	import('../../../fairy/FairyVision').then((m) => ({ default: m.FairyVision }))
 )
 const Fairies = lazy(() => import('../../../fairy/Fairies').then((m) => ({ default: m.Fairies })))
+const RemoteFairies = lazy(() =>
+	import('../../../fairy/RemoteFairies').then((m) => ({ default: m.RemoteFairies }))
+)
+const InCanvasTaskList = lazy(() =>
+	import('../../../fairy/InCanvasTaskList').then((m) => ({ default: m.InCanvasTaskList }))
+)
 
 const customFeatureFlags = {
 	fairies: createDebugValue('fairies', {
@@ -156,21 +172,7 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 			} else if (deepLink) {
 				editor.navigateToDeepLink(parseDeepLinkString(deepLink))
 			}
-			const sessionState$ = createSessionStateSnapshotSignal(editor.store)
-			const updateSessionState = throttle((state: TLSessionStateSnapshot) => {
-				app.onFileSessionStateUpdate(fileId, state)
-			}, 5000)
-			// don't want to update if they only open the file and didn't look around
-			let firstTime = true
-			const cleanup = react('update session state', () => {
-				const state = sessionState$.get()
-				if (!state) return
-				if (firstTime) {
-					firstTime = false
-					return
-				}
-				updateSessionState(state)
-			})
+			const fileStateUpdater = new FileStateUpdater(app, fileId, editor)
 
 			const abortController = new AbortController()
 			maybeSlurp({
@@ -183,9 +185,8 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 			}).then(setIsReady)
 
 			return () => {
-				updateSessionState.flush()
+				fileStateUpdater.dispose()
 				abortController.abort()
-				cleanup()
 			}
 		},
 		[addDialog, trackRoomLoaded, trackNewRoomCreation, app, fileId, remountImageShapes, setIsReady]
@@ -200,6 +201,10 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 		return multiplayerAssetStore(() => fileId)
 	}, [fileId])
 
+	// Ref to store agents for presence syncing
+	// TODO(mime): use TldrawFairyAgent[] type when ready
+	const agentsRef = useRef<any[]>([])
+
 	const store = useSync({
 		uri: useCallback(async () => {
 			const url = new URL(`${MULTIPLAYER_SERVER}/app/file/${fileSlug}`)
@@ -210,6 +215,30 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 		}, [fileSlug, hasUser, getUserToken]),
 		assets,
 		userInfo: app?.tlUser.userPreferences,
+		onCustomMessageReceived: useCallback((message: TLCustomServerEvent) => {
+			trackEvent(message.type)
+		}, []),
+		getUserPresence: useCallback(
+			(store: TLStore, userInfo: TLPresenceUserInfo): TLPresenceStateInfo | null => {
+				const defaultPresence = getDefaultUserPresence(store, userInfo)
+				if (!defaultPresence) return null
+
+				// Add fairy positions to presence for all active agents
+				const fairyPresences =
+					agentsRef.current
+						?.map((agent) => {
+							const entity = agent?.$fairyEntity?.get?.() as FairyEntity | undefined
+							const outfit = agent?.$fairyConfig?.get?.()?.outfit as string | undefined
+							if (!entity || !outfit) return null
+							return { entity, outfit }
+						})
+						.filter((agent): agent is NonNullable<typeof agent> => agent !== null) ?? []
+
+				defaultPresence.meta = { ...defaultPresence.meta, fairies: fairyPresences }
+				return defaultPresence
+			},
+			[]
+		),
 	})
 
 	// we need to prevent calling onFileExit if the store is in an error state
@@ -223,7 +252,7 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 		if (!app) return
 		if (store.status !== 'synced-remote') return
 		let didEnter = false
-		let timer: any
+		let timer: number
 
 		const fileState = app.getFileState(fileId)
 
@@ -246,7 +275,7 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 		return () => {
 			clearTimeout(timer)
 			if (didEnter && !storeError.current) {
-				app.onFileExit(fileId)
+				app.updateFileState(fileId, { lastVisitAt: Date.now() })
 			}
 		}
 	}, [app, fileId, store.status])
@@ -254,33 +283,52 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 	const overrides = useFileEditorOverrides({ fileSlug })
 	const extraDragIconOverrides = useExtraDragIconOverrides()
 
-	const showFairies = useValue('show_fairies', () => customFeatureFlags.fairies.get(), [
+	const hasFairiesFlag = useValue('show_fairies', () => customFeatureFlags.fairies.get(), [
 		customFeatureFlags,
 	])
 
 	// Fairy stuff
 
-	// TODO(mime): use TldrawFairyAgent type without importing the whole fairy package
-	const [agents, setAgents] = useState<any[]>([])
-
-	// this is ugly
-	const originalInFrontOfTheCanvasRef = useRef(components.InFrontOfTheCanvas)
-	const OriginalInFrontOfTheCanvas = originalInFrontOfTheCanvasRef.current
-	const canShowFairies = agents.length > 0 && showFairies && !!user?.isTldraw
-
-	components.InFrontOfTheCanvas = (props) => (
-		<>
-			{OriginalInFrontOfTheCanvas ? <OriginalInFrontOfTheCanvas {...props} /> : null}
-			{canShowFairies && (
-				<Suspense fallback={<div />}>
-					<FairyVision agents={agents} />
-					<Fairies agents={agents} />
-					<FairyHUD agents={agents} />
-				</Suspense>
-			)}
-		</>
-	)
-	components.DebugMenu = () => <CustomDebugMenu showFairyFeatureFlags={!!user?.isTldraw} />
+	// TODO(mime): use TldrawFairyAgent[] type when ready
+	const [_agents, setAgents] = useState<any[]>([])
+	// filter out deleted fairies (setAgents gets called after a fairy has been deleted)
+	const agents = useValue('agents', () => _agents.filter((a) => a.$fairyConfig.get()), [_agents])
+	// keep a ref in sync so getUserPresence can read current agents without re-creating the callback
+	useEffect(() => {
+		agentsRef.current = agents
+	}, [agents])
+
+	const instanceComponents = useMemo((): TLComponents => {
+		const canShowFairies = app && agents && hasFairiesFlag && (!!user?.isTldraw || isDevelopmentEnv)
+
+		return {
+			...components,
+			Overlays: () => (
+				<>
+					{canShowFairies && (
+						<Suspense fallback={<div />}>
+							<FairyVision agents={agents} />
+							<InCanvasTaskList agents={agents} />
+							<RemoteFairies />
+							<Fairies agents={agents} />
+						</Suspense>
+					)}
+				</>
+			),
+			InFrontOfTheCanvas: () => (
+				<>
+					{canShowFairies && (
+						<Suspense fallback={<div />}>
+							<FairyHUD agents={agents} />
+						</Suspense>
+					)}
+				</>
+			),
+			DebugMenu: () => (
+				<CustomDebugMenu showFairyFeatureFlags={!!user?.isTldraw || isDevelopmentEnv} />
+			),
+		}
+	}, [agents, hasFairiesFlag, user?.isTldraw, app])
 
 	return (
 		<TlaEditorWrapper>
@@ -292,7 +340,7 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 				user={app?.tlUser}
 				onMount={handleMount}
 				onUiEvent={handleUiEvent}
-				components={components}
+				components={instanceComponents}
 				options={{ actionShortcutsLocation: 'toolbar' }}
 				deepLinks={deepLinks || undefined}
 				overrides={[overrides, extraDragIconOverrides]}
@@ -302,11 +350,10 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 				<SneakyDarkModeSync />
 				<SneakyToolSwitcher />
 				{app && <SneakyTldrawFileDropHandler />}
-				<SneakyFileUpdateHandler fileId={fileId} />
 				<SneakyLargeFileHander />
-				{showFairies && (
+				{app && hasFairiesFlag && (
 					<Suspense fallback={null}>
-						<FairyApp setAgents={setAgents} />
+						<FairyApp setAgents={setAgents} fileId={fileId} />
 					</Suspense>
 				)}
 			</Tldraw>
@@ -314,30 +361,6 @@ function TlaEditorInner({ fileSlug, deepLinks }: TlaEditorProps) {
 	)
 }
 
-function SneakyFileUpdateHandler({ fileId }: { fileId: string }) {
-	const app = useMaybeApp()
-	const editor = useEditor()
-	useEffect(() => {
-		const onChange = throttle(
-			() => {
-				if (!app) return
-				app.onFileEdit(fileId)
-			},
-			// This is used to update the lastEditAt time in the database, and to let the local
-			// room know that an edit has been made.
-			// It doesn't need to be super fast or accurate so we can throttle it a lot
-			10_000
-		)
-		const unsub = editor.store.listen(onChange, { scope: 'document', source: 'user' })
-		return () => {
-			onChange.flush()
-			unsub()
-		}
-	}, [app, fileId, editor])
-
-	return null
-}
-
 function CustomDebugMenu({ showFairyFeatureFlags }: { showFairyFeatureFlags: boolean }) {
 	const app = useMaybeApp()
 	const openAndTrack = useOpenUrlAndTrack('unknown')
@@ -347,20 +370,103 @@ function CustomDebugMenu({ showFairyFeatureFlags }: { showFairyFeatureFlags: boo
 		<DefaultDebugMenu>
 			<A11yAudit />
 			{!isReadOnly && app && (
-				<TldrawUiMenuItem
-					id="user-manual"
-					label="File history"
-					readonlyOk
-					onSelect={() => {
-						const url = new URL(window.location.href)
-						url.pathname += '/history'
-						openAndTrack(url.toString())
-					}}
-				/>
+				<>
+					<TldrawUiMenuItem
+						id="user-manual"
+						label="File history"
+						readonlyOk
+						onSelect={() => {
+							const url = new URL(window.location.href)
+							url.pathname += '/history'
+							openAndTrack(url.toString())
+						}}
+					/>
+					{!isProductionEnv && (
+						<TldrawUiMenuItem
+							id="user-manual"
+							label="File history (pierre)"
+							readonlyOk
+							onSelect={() => {
+								const url = new URL(window.location.href)
+								url.pathname += '/pierre-history'
+								openAndTrack(url.toString())
+							}}
+						/>
+					)}
+				</>
 			)}
+
 			<DefaultDebugMenuContent
 				customFeatureFlags={showFairyFeatureFlags ? customFeatureFlags : undefined}
 			/>
 		</DefaultDebugMenu>
 	)
 }
+
+const FILE_STATE_UPDATE_INTERVAL = 10_000
+class FileStateUpdater {
+	disposables = new Set<() => void>()
+	constructor(
+		private readonly app: TldrawApp,
+		private readonly fileId: string,
+		editor: Editor
+	) {
+		this.disposables.add(
+			editor.store.listen(
+				() => {
+					this.didDocumentChange = true
+					this.update()
+				},
+				{ scope: 'document', source: 'user' }
+			)
+		)
+		const flush = () => {
+			this.update.flush()
+		}
+		window.addEventListener('beforeunload', flush)
+		this.disposables.add(() => {
+			window.removeEventListener('beforeunload', flush)
+		})
+
+		const sessionState$ = createSessionStateSnapshotSignal(editor.store)
+		let firstTime = true
+		this.disposables.add(
+			react('update session state', () => {
+				const state = sessionState$.get()
+				if (firstTime) {
+					firstTime = false
+					return
+				}
+				if (!state) return
+				this.nextSessionState = state
+				this.update()
+			})
+		)
+	}
+
+	private nextSessionState: TLSessionStateSnapshot | null = null
+	private didDocumentChange = false
+
+	private update = throttle(
+		() => {
+			if (!this.nextSessionState && !this.didDocumentChange) return
+			const state = this.nextSessionState
+			this.nextSessionState = null
+			const didChange = this.didDocumentChange
+			this.didDocumentChange = false
+			this.app.updateFileState(this.fileId, {
+				lastSessionState: state ? JSON.stringify(state) : undefined,
+				lastEditAt: didChange ? Date.now() : undefined,
+				lastVisitAt: Date.now(),
+			})
+		},
+		FILE_STATE_UPDATE_INTERVAL,
+		{ trailing: true, leading: false }
+	)
+
+	dispose() {
+		this.update.flush()
+		this.disposables.forEach((dispose) => dispose())
+		this.disposables.clear()
+	}
+}
diff --git a/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopLeftPanel.tsx b/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopLeftPanel.tsx
index ec7beb4035fe..e177d0b2019d 100644
--- a/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopLeftPanel.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopLeftPanel.tsx
@@ -1,4 +1,3 @@
-import { SignInButton } from '@clerk/clerk-react'
 import classNames from 'classnames'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { Link, useParams } from 'react-router-dom'
@@ -18,13 +17,14 @@ import {
 	TldrawUiMenuContextProvider,
 	TldrawUiMenuGroup,
 	ViewSubmenu,
+	useDialogs,
 	useEditor,
 	usePassThroughWheelEvents,
 	useValue,
 } from 'tldraw'
 import { useApp, useMaybeApp } from '../../hooks/useAppState'
 import { useCurrentFileId } from '../../hooks/useCurrentFileId'
-import { useIsFileOwner } from '../../hooks/useIsFileOwner'
+import { useHasFileAdminRights } from '../../hooks/useIsFileOwner'
 import { TLAppUiEventSource, useTldrawAppUiEvents } from '../../utils/app-ui-events'
 import { getIsCoarsePointer } from '../../utils/getIsCoarsePointer'
 import { defineMessages, useIntl, useMsg } from '../../utils/i18n'
@@ -32,6 +32,7 @@ import { TlaFileMenu } from '../TlaFileMenu/TlaFileMenu'
 import { TlaIcon } from '../TlaIcon/TlaIcon'
 import { TlaLogo } from '../TlaLogo/TlaLogo'
 import { sidebarMessages } from '../TlaSidebar/components/TlaSidebarFileLink'
+import { TlaSignInDialog } from '../dialogs/TlaSignInDialog'
 import {
 	CookieConsentMenuItem,
 	GiveUsFeedbackMenuItem,
@@ -89,7 +90,7 @@ export function TlaEditorTopLeftPanelAnonymous() {
 	return (
 		<>
 			<Link to="/" className={styles.topLeftOfflineLogo}>
-				<TlaLogo data-testid="tla-sidebar-logo-icon" />
+				<TlaLogo data-testid="tla-top-left-logo-icon" />
 			</Link>
 			{anonFileName && (
 				<>
@@ -161,7 +162,7 @@ export function TlaEditorTopLeftPanelSignedIn() {
 	const isEmbed = !!new URLSearchParams(window.location.search).get('embed')
 
 	const fileSlug = useParams<{ fileSlug: string }>().fileSlug ?? '_not_a_file_' // fall back to a string that will not match any file
-	const isOwner = useIsFileOwner(fileSlug)
+	const isOwner = useHasFileAdminRights(fileSlug)
 
 	const app = useApp()
 	const fileId = useCurrentFileId()!
@@ -385,16 +386,18 @@ function TlaFileNameEditorInput({
 
 function SignInMenuItem() {
 	const msg = useMsg(messages.signIn)
+	const { addDialog } = useDialogs()
+
 	return (
-		<SignInButton
-			mode="modal"
-			forceRedirectUrl={location.pathname + location.search}
-			signUpForceRedirectUrl={location.pathname + location.search}
+		<TldrawUiButton
+			type="menu"
+			data-testid="tla-sign-in-menu-button"
+			onClick={() => {
+				addDialog({ component: TlaSignInDialog })
+			}}
 		>
-			<TldrawUiButton type="menu" data-testid="tla-sign-in-menu-button">
-				<TldrawUiButtonLabel>{msg}</TldrawUiButtonLabel>
-				<TlaIcon icon="sign-in" />
-			</TldrawUiButton>
-		</SignInButton>
+			<TldrawUiButtonLabel>{msg}</TldrawUiButtonLabel>
+			<TlaIcon icon="sign-in" />
+		</TldrawUiButton>
 	)
 }
diff --git a/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopRightPanel.tsx b/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopRightPanel.tsx
index 616d508bb28e..c1c87e8905c5 100644
--- a/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopRightPanel.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopRightPanel.tsx
@@ -1,4 +1,3 @@
-import { SignInButton } from '@clerk/clerk-react'
 import {
 	PUBLISH_PREFIX,
 	READ_ONLY_LEGACY_PREFIX,
@@ -9,12 +8,19 @@ import {
 import classNames from 'classnames'
 import { useCallback, useRef } from 'react'
 import { useLocation, useNavigate, useParams } from 'react-router-dom'
-import { PeopleMenu, useEditor, usePassThroughWheelEvents, useTranslation } from 'tldraw'
+import {
+	PeopleMenu,
+	useDialogs,
+	useEditor,
+	usePassThroughWheelEvents,
+	useTranslation,
+} from 'tldraw'
 import { routes } from '../../../routeDefs'
 import { useMaybeApp } from '../../hooks/useAppState'
 import { useCurrentFileId } from '../../hooks/useCurrentFileId'
 import { useTldrawAppUiEvents } from '../../utils/app-ui-events'
 import { defineMessages, F, useMsg } from '../../utils/i18n'
+import { TlaSignInDialog } from '../dialogs/TlaSignInDialog'
 import { TlaCtaButton } from '../TlaCtaButton/TlaCtaButton'
 import { TlaFileShareMenu } from '../TlaFileShareMenu/TlaFileShareMenu'
 import { TlaIcon } from '../TlaIcon/TlaIcon'
@@ -36,30 +42,26 @@ export function TlaEditorTopRightPanel({
 	usePassThroughWheelEvents(ref)
 	const fileId = useCurrentFileId()
 	const trackEvent = useTldrawAppUiEvents()
+	const { addDialog } = useDialogs()
 
 	if (isAnonUser) {
 		return (
 			<div ref={ref} className={styles.topRightPanel}>
 				<PeopleMenu />
 				<SignedOutShareButton fileId={fileId} context={context} />
-				<SignInButton
-					mode="modal"
+				<TlaCtaButton
+					canvas
 					data-testid="tla-sign-in-button"
-					forceRedirectUrl={location.pathname + location.search}
-					signUpForceRedirectUrl={location.pathname + location.search}
+					onClick={() => {
+						trackEvent('sign-up-clicked', {
+							source: 'anon-landing-page',
+							ctaMessage: ctaString,
+						})
+						addDialog({ component: TlaSignInDialog })
+					}}
 				>
-					<TlaCtaButton
-						data-testid="tla-sign-up"
-						onClick={() =>
-							trackEvent('sign-up-clicked', {
-								source: 'anon-landing-page',
-								ctaMessage: ctaString,
-							})
-						}
-					>
-						<F {...ctaMessages.signInToShare} />
-					</TlaCtaButton>
-				</SignInButton>
+					<F {...ctaMessages.signInToShare} />
+				</TlaCtaButton>
 			</div>
 		)
 	}
@@ -71,6 +73,7 @@ export function TlaEditorTopRightPanel({
 			{context !== 'legacy' && (
 				<TlaFileShareMenu fileId={fileId!} source="file-header" context={context}>
 					<TlaCtaButton
+						canvas
 						data-testid="tla-share-button"
 						onClick={() => trackEvent('open-share-menu', { source: 'top-bar' })}
 					>
@@ -142,7 +145,7 @@ function LegacyImportButton() {
 	}, [app, editor, name, navigate, roomInfo, trackEvent])
 
 	return (
-		<TlaCtaButton data-testid="tla-import-button" onClick={handleClick}>
+		<TlaCtaButton canvas data-testid="tla-import-button" onClick={handleClick}>
 			<F defaultMessage="Copy to my files" />
 		</TlaCtaButton>
 	)
diff --git a/apps/dotcom/client/src/tla/components/TlaEditor/TlaHistorySnapshotEditor.tsx b/apps/dotcom/client/src/tla/components/TlaEditor/TlaHistorySnapshotEditor.tsx
index e7d61404f2e9..949178b237ef 100644
--- a/apps/dotcom/client/src/tla/components/TlaEditor/TlaHistorySnapshotEditor.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaEditor/TlaHistorySnapshotEditor.tsx
@@ -1,6 +1,6 @@
-import { getLicenseKey, ROOM_PREFIX } from '@tldraw/dotcom-shared'
-import { createContext, useCallback, useContext } from 'react'
-import { Editor, fetch, TLComponents, Tldraw, TLStoreSnapshot } from 'tldraw'
+import { getLicenseKey } from '@tldraw/dotcom-shared'
+import { useCallback, useMemo } from 'react'
+import { Editor, TLComponents, Tldraw, TLStoreSnapshot } from 'tldraw'
 import { ThemeUpdater } from '../../../components/ThemeUpdater/ThemeUpdater'
 import { useLegacyUrlParams } from '../../../hooks/useLegacyUrlParams'
 import { useHandleUiEvents } from '../../../utils/analytics'
@@ -18,81 +18,32 @@ import { SneakySetDocumentTitle } from './sneaky/SneakySetDocumentTitle'
 import { TlaEditorWrapper } from './TlaEditorWrapper'
 import { useFileEditorOverrides } from './useFileEditorOverrides'
 
-const TlaHistorySnapshotEditorContext = createContext<{
-	fileSlug: string
-	timestamp: string
-	isApp: boolean
-}>({
-	fileSlug: '',
-	timestamp: '',
-	isApp: false,
-})
-
-/** @internal */
-export const components: TLComponents = {
-	ErrorFallback: TlaEditorErrorFallback,
-	SharePanel: () => {
-		const { fileSlug, timestamp, isApp } = useContext(TlaHistorySnapshotEditorContext)
-
-		const restoreVersion = useCallback(async () => {
-			const sure = window.confirm('Are you sure?')
-			if (!sure) return
-
-			const res = await fetch(
-				isApp ? `/api/app/file/${fileSlug}/restore` : `/api/${ROOM_PREFIX}/${fileSlug}/restore`,
-				{
-					method: 'POST',
-					headers: {
-						'Content-Type': 'application/json',
-					},
-					body: JSON.stringify({ timestamp }),
-				}
-			)
-
-			if (!res.ok) {
-				window.alert('Something went wrong!')
-				return
-			}
-
-			window.alert('done')
-		}, [fileSlug, timestamp, isApp])
-
-		return (
-			<TlaCtaButton
-				style={{
-					pointerEvents: 'all',
-					margin: 6,
-				}}
-				onClick={restoreVersion}
-			>
-				<F defaultMessage="Restore version"></F>
-			</TlaCtaButton>
-		)
-	},
-}
-
 export function TlaHistorySnapshotEditor({
 	fileSlug,
 	snapshot,
-	timestamp,
-	isApp,
+	onRestore,
 }: {
 	fileSlug: string
 	snapshot: TLStoreSnapshot
-	timestamp: string
-	isApp: boolean
+	onRestore(): Promise<void>
 }) {
 	return (
-		<TlaHistorySnapshotEditorContext.Provider value={{ fileSlug, timestamp, isApp }}>
+		<>
 			<SneakySetDocumentTitle />
 			<ReadyWrapper key={fileSlug}>
-				<TlaEditorInner snapshot={snapshot} />
+				<TlaEditorInner snapshot={snapshot} onRestore={onRestore} />
 			</ReadyWrapper>
-		</TlaHistorySnapshotEditorContext.Provider>
+		</>
 	)
 }
 
-function TlaEditorInner({ snapshot }: { snapshot: TLStoreSnapshot }) {
+function TlaEditorInner({
+	snapshot,
+	onRestore,
+}: {
+	snapshot: TLStoreSnapshot
+	onRestore(): Promise<void>
+}) {
 	const app = useMaybeApp()
 
 	const setIsReady = useSetIsReady()
@@ -116,6 +67,35 @@ function TlaEditorInner({ snapshot }: { snapshot: TLStoreSnapshot }) {
 		[setIsReady]
 	)
 
+	const components = useMemo((): TLComponents => {
+		return {
+			ErrorFallback: TlaEditorErrorFallback,
+			SharePanel: () => (
+				<TlaCtaButton
+					canvas
+					style={{
+						pointerEvents: 'all',
+						margin: 6,
+					}}
+					onClick={() => {
+						const sure = window.confirm('Are you sure?')
+						if (!sure) return
+						onRestore()
+							.then(() => {
+								window.alert('done')
+							})
+							.catch((error) => {
+								window.alert('Something went wrong!')
+								console.error(error)
+							})
+					}}
+				>
+					<F defaultMessage="Restore version"></F>
+				</TlaCtaButton>
+			),
+		}
+	}, [onRestore])
+
 	return (
 		<TlaEditorWrapper>
 			<Tldraw
diff --git a/apps/dotcom/client/src/tla/components/TlaEditor/sneaky/SneakyFileDropHandler.tsx b/apps/dotcom/client/src/tla/components/TlaEditor/sneaky/SneakyFileDropHandler.tsx
index b3bd9cccbc44..d8c9c682550b 100644
--- a/apps/dotcom/client/src/tla/components/TlaEditor/sneaky/SneakyFileDropHandler.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaEditor/sneaky/SneakyFileDropHandler.tsx
@@ -4,6 +4,7 @@ import { useNavigate } from 'react-router-dom'
 import { defaultHandleExternalFileContent, useEditor, useToasts, useTranslation } from 'tldraw'
 import { routes } from '../../../../routeDefs'
 import { useMaybeApp } from '../../../hooks/useAppState'
+import { useCurrentFileId } from '../../../hooks/useCurrentFileId'
 
 export const SneakyTldrawFileDropHandler = memo(function SneakyTldrawFileDropHandler() {
 	const editor = useEditor()
@@ -12,6 +13,7 @@ export const SneakyTldrawFileDropHandler = memo(function SneakyTldrawFileDropHan
 	const toasts = useToasts()
 	const msg = useTranslation()
 	const navigate = useNavigate()
+	const fileId = useCurrentFileId()
 	useEffect(() => {
 		if (!auth) return
 		if (!app) return
@@ -19,13 +21,19 @@ export const SneakyTldrawFileDropHandler = memo(function SneakyTldrawFileDropHan
 			const { files } = content
 			const tldrawFiles = files.filter((file) => file.name.endsWith('.tldr'))
 			if (tldrawFiles.length > 0) {
-				await app.uploadTldrFiles(tldrawFiles, (fileId) => {
-					navigate(routes.tlaFile(fileId), { state: { mode: 'create' } })
-				})
+				const currentFile = fileId ? app.getFile(fileId) : null
+				const groupId = currentFile?.owningGroupId ?? undefined
+				await app.uploadTldrFiles(
+					tldrawFiles,
+					(fileId) => {
+						navigate(routes.tlaFile(fileId), { state: { mode: 'create' } })
+					},
+					groupId
+				)
 			} else {
 				await defaultHandleExternalFileContent(editor, content, { toasts, msg })
 			}
 		})
-	}, [editor, app, auth, toasts, msg, navigate])
+	}, [editor, app, auth, toasts, msg, navigate, fileId])
 	return null
 })
diff --git a/apps/dotcom/client/src/tla/components/TlaEditor/useExtraToolDragIcons.ts b/apps/dotcom/client/src/tla/components/TlaEditor/useExtraToolDragIcons.ts
index 4f5366c6e7de..78b5e825863f 100644
--- a/apps/dotcom/client/src/tla/components/TlaEditor/useExtraToolDragIcons.ts
+++ b/apps/dotcom/client/src/tla/components/TlaEditor/useExtraToolDragIcons.ts
@@ -1,11 +1,5 @@
 import { useMemo } from 'react'
-import {
-	DefaultSizeStyle,
-	onDragFromToolbarToCreateShape,
-	TLDrawShape,
-	TLUiOverrides,
-	VecModel,
-} from 'tldraw'
+import { DefaultSizeStyle, onDragFromToolbarToCreateShape, TLUiOverrides, VecModel } from 'tldraw'
 import { trackEvent } from '../../../utils/analytics'
 
 export function useExtraDragIconOverrides() {
@@ -16,7 +10,7 @@ export function useExtraDragIconOverrides() {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
 							const sizeStyle = editor.getStyleForNextShape(DefaultSizeStyle)
-							return editor.createShape<TLDrawShape>({
+							return editor.createShape({
 								id,
 								type: 'draw',
 								props: {
@@ -39,7 +33,7 @@ export function useExtraDragIconOverrides() {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
 							const sizeStyle = editor.getStyleForNextShape(DefaultSizeStyle)
-							return editor.createShape<TLDrawShape>({
+							return editor.createShape({
 								id,
 								type: 'draw',
 								props: {
@@ -62,7 +56,7 @@ export function useExtraDragIconOverrides() {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
 							const sizeStyle = editor.getStyleForNextShape(DefaultSizeStyle)
-							return editor.createShape<TLDrawShape>({
+							return editor.createShape({
 								id,
 								type: 'draw',
 								props: {
diff --git a/apps/dotcom/client/src/tla/components/TlaFileError/TlaFileError.tsx b/apps/dotcom/client/src/tla/components/TlaFileError/TlaFileError.tsx
index cb331d9773a4..34a0dec05029 100644
--- a/apps/dotcom/client/src/tla/components/TlaFileError/TlaFileError.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaFileError/TlaFileError.tsx
@@ -1,4 +1,3 @@
-import { SignInButton } from '@clerk/clerk-react'
 import { TLRemoteSyncError, TLSyncErrorCloseEventReason } from '@tldraw/sync-core'
 import { ReactElement, useEffect } from 'react'
 import { TldrawUiButton, useDialogs } from 'tldraw'
@@ -7,6 +6,7 @@ import { useSetIsReady } from '../../hooks/useIsReady'
 import { F } from '../../utils/i18n'
 import { TlaCtaButton } from '../TlaCtaButton/TlaCtaButton'
 import { SubmitFeedbackDialog } from '../dialogs/SubmitFeedbackDialog'
+import { TlaSignInDialog } from '../dialogs/TlaSignInDialog'
 import styles from './TlaFileError.module.css'
 
 function DefaultError() {
@@ -53,23 +53,7 @@ export function TlaFileError({ error }: { error: unknown }) {
 			)
 		}
 		case TLSyncErrorCloseEventReason.NOT_AUTHENTICATED: {
-			return (
-				<TlaFileErrorContent
-					header={<F defaultMessage="Sign in" />}
-					para1={<F defaultMessage="You need to sign in to view this file." />}
-					cta={
-						<SignInButton
-							mode="modal"
-							forceRedirectUrl={location.pathname + location.search}
-							signUpForceRedirectUrl={location.pathname + location.search}
-						>
-							<TlaCtaButton data-testid="tla-sign-up">
-								<F defaultMessage="Sign in" />
-							</TlaCtaButton>
-						</SignInButton>
-					}
-				/>
-			)
+			return <NotAuthenticatedError />
 		}
 		case TLSyncErrorCloseEventReason.FORBIDDEN: {
 			return (
@@ -83,7 +67,7 @@ export function TlaFileError({ error }: { error: unknown }) {
 			return (
 				<TlaFileErrorContent
 					header={<F defaultMessage="Rate limited" />}
-					para1={<F defaultMessage="Please slow down." />}
+					para1={<F defaultMessage="Too many requests. Please slow down." />}
 				/>
 			)
 		}
@@ -113,6 +97,24 @@ export function TlaFileError({ error }: { error: unknown }) {
 	}
 }
 
+function NotAuthenticatedError() {
+	const dialogs = useDialogs()
+	return (
+		<TlaFileErrorContent
+			header={<F defaultMessage="Sign in" />}
+			para1={<F defaultMessage="You need to sign in to view this file." />}
+			cta={
+				<TlaCtaButton
+					data-testid="tla-sign-in-button"
+					onClick={() => dialogs.addDialog({ component: TlaSignInDialog })}
+				>
+					<F defaultMessage="Sign in" />
+				</TlaCtaButton>
+			}
+		/>
+	)
+}
+
 function TlaFileErrorContent({
 	header,
 	para1,
diff --git a/apps/dotcom/client/src/tla/components/TlaFileMenu/TlaFileMenu.tsx b/apps/dotcom/client/src/tla/components/TlaFileMenu/TlaFileMenu.tsx
index 8186a5e472fd..1b232560982b 100644
--- a/apps/dotcom/client/src/tla/components/TlaFileMenu/TlaFileMenu.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaFileMenu/TlaFileMenu.tsx
@@ -1,10 +1,11 @@
 /* ---------------------- Menu ---------------------- */
 
 import { FILE_PREFIX, TlaFile } from '@tldraw/dotcom-shared'
-import { Fragment, ReactNode, useCallback } from 'react'
+import { Fragment, ReactNode, useCallback, useId } from 'react'
 import { useNavigate } from 'react-router-dom'
 import {
 	TLDRAW_FILE_EXTENSION,
+	TldrawUiButtonCheck,
 	TldrawUiDropdownMenuContent,
 	TldrawUiDropdownMenuRoot,
 	TldrawUiDropdownMenuTrigger,
@@ -17,20 +18,23 @@ import {
 	useDialogs,
 	useMaybeEditor,
 	useToasts,
+	useValue,
 } from 'tldraw'
 import { routes } from '../../../routeDefs'
 import { TldrawApp } from '../../app/TldrawApp'
 import { useApp } from '../../hooks/useAppState'
 import { useCurrentFileId } from '../../hooks/useCurrentFileId'
-import { useIsFileOwner } from '../../hooks/useIsFileOwner'
+import { useHasFlag } from '../../hooks/useHasFlag'
+import { useHasFileAdminRights } from '../../hooks/useIsFileOwner'
 import { useIsFilePinned } from '../../hooks/useIsFilePinned'
-import { useFileSidebarFocusContext } from '../../providers/FileInputFocusProvider'
 import { TLAppUiEventSource, useTldrawAppUiEvents } from '../../utils/app-ui-events'
 import { copyTextToClipboard } from '../../utils/copy'
 import { defineMessages, useMsg } from '../../utils/i18n'
+import { CreateGroupDialog } from '../dialogs/CreateGroupDialog'
+import { TlaDeleteFileDialog } from '../dialogs/TlaDeleteFileDialog'
 import { editorMessages } from '../TlaEditor/editor-messages'
 import { download } from '../TlaEditor/useFileEditorOverrides'
-import { TlaDeleteFileDialog } from '../dialogs/TlaDeleteFileDialog'
+import { TlaIcon } from '../TlaIcon/TlaIcon'
 
 const messages = defineMessages({
 	copied: { defaultMessage: 'Copied link' },
@@ -41,8 +45,9 @@ const messages = defineMessages({
 	forget: { defaultMessage: 'Forget' },
 	rename: { defaultMessage: 'Rename' },
 	copy: { defaultMessage: 'Copy' },
-	pin: { defaultMessage: 'Pin' },
-	unpin: { defaultMessage: 'Unpin' },
+	pin: { defaultMessage: 'Pin file' },
+	unpin: { defaultMessage: 'Unpin file' },
+	myFiles: { defaultMessage: 'My files' },
 })
 
 function getDuplicateName(file: TlaFile, app: TldrawApp) {
@@ -69,8 +74,9 @@ export function TlaFileMenu({
 	onRenameAction(): void
 	trigger: ReactNode
 }) {
+	const id = useId()
 	return (
-		<TldrawUiDropdownMenuRoot id={`file-menu-${fileId}-${source}`}>
+		<TldrawUiDropdownMenuRoot id={`file-menu-${fileId}-${source}-${id}`}>
 			<TldrawUiMenuContextProvider type="menu" sourceId="dialog">
 				<TldrawUiDropdownMenuTrigger>{trigger}</TldrawUiDropdownMenuTrigger>
 				<TldrawUiDropdownMenuContent side="bottom" align="start" alignOffset={0} sideOffset={0}>
@@ -107,9 +113,18 @@ export function FileItems({
 	const { addToast } = useToasts()
 	const trackEvent = useTldrawAppUiEvents()
 	const copiedMsg = useMsg(messages.copied)
-	const isOwner = useIsFileOwner(fileId)
+	const hasAdminRights = useHasFileAdminRights(fileId)
 	const isPinned = useIsFilePinned(fileId, groupId ?? '')
 	const isActive = useCurrentFileId() === fileId
+	const hasGroups = useHasFlag('groups_frontend')
+
+	const file = useValue('file', () => app.getFile(fileId), [app, fileId])
+
+	// Get all group memberships (including home group which we'll filter in UI)
+	const groupMemberships = useValue('groupMembers', () => app.getGroupMemberships(), [app])
+
+	// Filter out home group for the "Move to" menu
+	const nonHomeGroups = groupMemberships.filter((g) => g.groupId !== app.getHomeGroupId())
 
 	const handleCopyLinkClick = useCallback(() => {
 		const url = routes.tlaFile(fileId, { asUrl: true })
@@ -130,15 +145,15 @@ export function FileItems({
 		}
 	}, [app, fileId, groupId])
 
-	const focusCtx = useFileSidebarFocusContext()
-
 	const handleDuplicateClick = useCallback(async () => {
+		if (!groupId) return
 		const newFileId = uniqueId()
 		const file = app.getFile(fileId)
 		if (!file) return
 		trackEvent('duplicate-file', { source })
 		const res = await app.createFile({
 			fileId: newFileId,
+			groupId,
 			name: getDuplicateName(file, app),
 			createSource: `${FILE_PREFIX}/${fileId}`,
 		})
@@ -148,16 +163,23 @@ export function FileItems({
 			lastSessionState: prevState?.lastSessionState,
 		})
 		if (res.ok) {
-			focusCtx.shouldRenameNextNewFile = true
+			app.ensureFileVisibleInSidebar(newFileId)
+			app.sidebarState.update((prev) => ({
+				...prev,
+				renameState: { fileId: newFileId, groupId },
+			}))
 			navigate(routes.tlaFile(newFileId))
 		}
-	}, [app, fileId, focusCtx, navigate, trackEvent, source])
+	}, [app, fileId, groupId, navigate, trackEvent, source])
 
 	const handleDeleteClick = useCallback(() => {
+		if (!groupId) return
 		addDialog({
-			component: ({ onClose }) => <TlaDeleteFileDialog fileId={fileId} onClose={onClose} />,
+			component: ({ onClose }) => (
+				<TlaDeleteFileDialog groupId={groupId} fileId={fileId} onClose={onClose} />
+			),
 		})
-	}, [fileId, addDialog])
+	}, [fileId, addDialog, groupId])
 
 	const untitledProject = useMsg(editorMessages.untitledProject)
 	const handleDownloadClick = useCallback(async () => {
@@ -173,8 +195,9 @@ export function FileItems({
 	const duplicateMsg = useMsg(messages.duplicate)
 	const pinMsg = useMsg(messages.pin)
 	const unpinMsg = useMsg(messages.unpin)
-	const deleteOrForgetMsg = useMsg(isOwner ? messages.delete : messages.forget)
+	const deleteOrForgetMsg = useMsg(hasAdminRights ? messages.delete : messages.forget)
 	const downloadFile = useMsg(editorMessages.downloadFile)
+	const myFilesMsg = useMsg(messages.myFiles)
 
 	return (
 		<Fragment>
@@ -186,7 +209,7 @@ export function FileItems({
 					readonlyOk
 					onSelect={handleCopyLinkClick}
 				/>
-				{isOwner && (
+				{hasAdminRights && (
 					<TldrawUiMenuItem label={renameMsg} id="rename" readonlyOk onSelect={onRenameAction} />
 				)}
 				{/* todo: in published rooms, support duplication / forking */}
@@ -217,12 +240,88 @@ export function FileItems({
 				)}
 			</TldrawUiMenuGroup>
 			<TldrawUiMenuGroup id="file-delete">
-				<TldrawUiMenuItem
-					label={deleteOrForgetMsg}
-					id="delete"
-					readonlyOk
-					onSelect={handleDeleteClick}
-				/>
+				{hasGroups && (
+					<TldrawUiMenuSubmenu id="move-to-group" label={'Move to'} size="small">
+						<TldrawUiMenuGroup id="my-files">
+							<TldrawUiMenuItem
+								key="my-files"
+								label={myFilesMsg}
+								id="my-files"
+								iconLeft={
+									<TldrawUiButtonCheck
+										checked={
+											app.canUpdateFile(fileId)
+												? file?.owningGroupId === app.getHomeGroupId()
+												: (groupMemberships
+														.find((g) => g.groupId === app.getHomeGroupId())
+														?.groupFiles.some((g) => g.fileId === fileId) ?? false)
+										}
+									/>
+								}
+								readonlyOk
+								onSelect={() => {
+									app.z.mutate.moveFileToGroup({ fileId, groupId: app.getHomeGroupId() })
+								}}
+							/>
+						</TldrawUiMenuGroup>
+						{nonHomeGroups.length > 0 && (
+							<TldrawUiMenuGroup id="my-groups">
+								{nonHomeGroups.map((groupUser) => (
+									<TldrawUiMenuItem
+										key={groupUser.groupId}
+										label={groupUser.group.name}
+										id={`group-${groupUser.groupId}`}
+										iconLeft={
+											<TldrawUiButtonCheck
+												checked={
+													app.canUpdateFile(fileId)
+														? groupUser.group.id === file?.owningGroupId
+														: groupUser.groupFiles.some((g) => g.fileId === fileId)
+												}
+											/>
+										}
+										readonlyOk
+										onSelect={() => {
+											app.z.mutate.moveFileToGroup({ fileId, groupId: groupUser.groupId })
+											app.ensureSidebarGroupExpanded(groupUser.groupId)
+										}}
+									/>
+								))}
+							</TldrawUiMenuGroup>
+						)}
+						<TldrawUiMenuGroup id="create-new-group">
+							<TldrawUiMenuItem
+								label="New group"
+								id="create-new-group"
+								readonlyOk
+								icon={<TlaIcon icon="plus" />}
+								onSelect={() => {
+									addDialog({
+										component: ({ onClose }) => (
+											<CreateGroupDialog
+												onClose={onClose}
+												onCreate={async (name) => {
+													const id = uniqueId()
+													await app.z.mutate.createGroup({ id, name }).client
+													await app.z.mutate.moveFileToGroup({ fileId, groupId: id }).client
+													app.ensureSidebarGroupExpanded(id)
+												}}
+											/>
+										),
+									})
+								}}
+							/>
+						</TldrawUiMenuGroup>
+					</TldrawUiMenuSubmenu>
+				)}
+				{groupId && (
+					<TldrawUiMenuItem
+						label={deleteOrForgetMsg}
+						id="delete"
+						readonlyOk
+						onSelect={handleDeleteClick}
+					/>
+				)}
 			</TldrawUiMenuGroup>
 		</Fragment>
 	)
diff --git a/apps/dotcom/client/src/tla/components/TlaFileShareMenu/Tabs/TlaInviteTab.tsx b/apps/dotcom/client/src/tla/components/TlaFileShareMenu/Tabs/TlaInviteTab.tsx
index ea914e3af2b5..a21acbed8763 100644
--- a/apps/dotcom/client/src/tla/components/TlaFileShareMenu/Tabs/TlaInviteTab.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaFileShareMenu/Tabs/TlaInviteTab.tsx
@@ -4,7 +4,7 @@ import { useEditor, useValue } from 'tldraw'
 import { routes } from '../../../../routeDefs'
 import { useApp } from '../../../hooks/useAppState'
 import { useEditorDeepLink } from '../../../hooks/useDeepLink'
-import { useIsFileOwner } from '../../../hooks/useIsFileOwner'
+import { useHasFileAdminRights } from '../../../hooks/useIsFileOwner'
 import { useTldrawUser } from '../../../hooks/useUser'
 import { useTldrawAppUiEvents } from '../../../utils/app-ui-events'
 import { copyTextToClipboard } from '../../../utils/copy'
@@ -37,13 +37,13 @@ export function TlaInviteTab({ fileId }: { fileId: string }) {
 		[app, fileId]
 	)
 
-	const isOwner = useIsFileOwner(fileId)
+	const hasAdminRights = useHasFileAdminRights(fileId)
 	const url = useEditorDeepLink()
 
 	return (
 		<>
 			<TlaMenuSection>
-				{isOwner && (
+				{hasAdminRights && (
 					<TlaMenuControlGroup>
 						<TlaSharedToggle isShared={isShared} fileId={fileId} />
 						{isShared && <TlaSelectSharedLinkType fileId={fileId} />}
diff --git a/apps/dotcom/client/src/tla/components/TlaFileShareMenu/TlaFileShareMenu.tsx b/apps/dotcom/client/src/tla/components/TlaFileShareMenu/TlaFileShareMenu.tsx
index abd9895035f6..ed67ec0e8284 100644
--- a/apps/dotcom/client/src/tla/components/TlaFileShareMenu/TlaFileShareMenu.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaFileShareMenu/TlaFileShareMenu.tsx
@@ -7,7 +7,7 @@ import {
 	useValue,
 } from 'tldraw'
 import { useMaybeApp } from '../../hooks/useAppState'
-import { useIsFileOwner } from '../../hooks/useIsFileOwner'
+import { useHasFileAdminRights } from '../../hooks/useIsFileOwner'
 import { useTldrawAppUiEvents } from '../../utils/app-ui-events'
 import { F } from '../../utils/i18n'
 import { getLocalSessionState, updateLocalSessionState } from '../../utils/local-session-state'
@@ -44,7 +44,7 @@ export function TlaFileShareMenu({
 		[]
 	)
 
-	const isOwner = useIsFileOwner(fileId)
+	const hasAdminRights = useHasFileAdminRights(fileId)
 
 	const file = useValue('file', () => app?.getFile(fileId), [app])
 
@@ -61,12 +61,13 @@ export function TlaFileShareMenu({
 	const okTabs = {
 		// If the context is a guest file or published file, show the anon share file
 		'anon-share':
-			!isOwner && (context === 'file' || context === 'published-file' || context === 'legacy'),
+			!hasAdminRights &&
+			(context === 'file' || context === 'published-file' || context === 'legacy'),
 		export: true,
 		// Can the current user configure the file's sharing settings?
-		share: context === 'file' && fileId && file && isOwner,
+		share: context === 'file' && fileId && file && hasAdminRights,
 		// Can the current user configure the file's publishing settings?
-		publish: context === 'file' && fileId && file && isOwner,
+		publish: context === 'file' && fileId && file && hasAdminRights,
 	}
 
 	// If the user is not signed in and their local active tab is share, then show the anon share tab
diff --git a/apps/dotcom/client/src/tla/components/TlaIcon/TlaIcon.tsx b/apps/dotcom/client/src/tla/components/TlaIcon/TlaIcon.tsx
index 0eb2d87f9dfb..fac39e382ed5 100644
--- a/apps/dotcom/client/src/tla/components/TlaIcon/TlaIcon.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaIcon/TlaIcon.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import { HtmlHTMLAttributes, useLayoutEffect, useRef } from 'react'
+import { CSSProperties, HtmlHTMLAttributes, useLayoutEffect, useRef } from 'react'
 import styles from './icon.module.css'
 
 import mergedSpriteUrl from '../../../assets/0_merged_tla.svg'
@@ -14,12 +14,14 @@ export function TlaIcon({
 	invertIcon,
 	inline,
 	ariaLabel,
+	style,
 }: {
 	icon: string
 	className?: string
 	invertIcon?: boolean
 	inline?: boolean
 	ariaLabel?: string
+	style?: CSSProperties
 }) {
 	const ref = useRef<HTMLDivElement>(null)
 
@@ -52,6 +54,7 @@ export function TlaIcon({
 			style={{
 				mask: getMaskStyle(icon),
 				transform: invertIcon ? 'scale(-1, 1)' : undefined,
+				...style,
 			}}
 		/>
 	)
diff --git a/apps/dotcom/client/src/tla/components/TlaLogo/TlaLogo.tsx b/apps/dotcom/client/src/tla/components/TlaLogo/TlaLogo.tsx
index 0d9849b10d9d..57d8a7d6f27d 100644
--- a/apps/dotcom/client/src/tla/components/TlaLogo/TlaLogo.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaLogo/TlaLogo.tsx
@@ -13,7 +13,6 @@ export function TlaLogo(props: HTMLAttributes<HTMLDivElement>) {
 
 	return (
 		<span
-			data-testid="tla-sidebar-logo-icon"
 			role="img"
 			ref={ref}
 			{...props}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/TlaSidebar.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/TlaSidebar.tsx
index ec742657855c..fb9958346961 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/TlaSidebar.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/TlaSidebar.tsx
@@ -1,8 +1,6 @@
-import { memo, useCallback, useEffect, useRef } from 'react'
-import { preventDefault } from 'tldraw'
+import { memo, useCallback, useEffect } from 'react'
 import { useTldrFileDrop } from '../../hooks/useTldrFileDrop'
 import { useTldrawAppUiEvents } from '../../utils/app-ui-events'
-import { F } from '../../utils/i18n'
 import {
 	getIsSidebarOpen,
 	toggleSidebar,
@@ -14,6 +12,7 @@ import { TlaSidebarCreateFileButton } from './components/TlaSidebarCreateFileBut
 import { TlaSidebarDotDevLink } from './components/TlaSidebarDotDevLink'
 import { TlaSidebarHelpMenu } from './components/TlaSidebarHelpMenu'
 import { TlaSidebarRecentFiles } from './components/TlaSidebarRecentFiles'
+import { TlaSidebarRecentFilesNew } from './components/TlaSidebarRecentFilesNew'
 import { TlaUserSettingsMenu } from './components/TlaSidebarUserSettingsMenu'
 import { TlaSidebarWorkspaceLink } from './components/TlaSidebarWorkspaceLink'
 import styles from './sidebar.module.css'
@@ -21,7 +20,6 @@ import styles from './sidebar.module.css'
 export const TlaSidebar = memo(function TlaSidebar() {
 	const isSidebarOpen = useIsSidebarOpen()
 	const isSidebarOpenMobile = useIsSidebarOpenMobile()
-	const sidebarRef = useRef<HTMLDivElement>(null)
 	const trackEvent = useTldrawAppUiEvents()
 
 	useEffect(() => {
@@ -40,34 +38,34 @@ export const TlaSidebar = memo(function TlaSidebar() {
 		}
 	}, [trackEvent])
 
-	useEffect(() => {
-		const sidebarEl = sidebarRef.current
-		if (!sidebarEl) return
-
-		function handleWheel(e: WheelEvent) {
-			if (!sidebarEl) return
-			// Ctrl/Meta key indicates a pinch event (funny, eh?)
-			if (sidebarEl.contains(e.target as Node) && (e.ctrlKey || e.metaKey)) {
-				preventDefault(e)
-			}
-		}
-
-		sidebarEl.addEventListener('wheel', handleWheel, { passive: false })
-		return () => sidebarEl.removeEventListener('wheel', handleWheel)
-	}, [sidebarRef])
-
 	const handleOverlayClick = useCallback(() => {
 		updateLocalSessionState(() => ({ isSidebarOpenMobile: false }))
 	}, [])
 
-	const { onDrop, onDragOver, onDragEnter, onDragLeave, isDraggingOver } = useTldrFileDrop()
+	const { onDrop, onDragOver, onDragEnter, onDragLeave } = useTldrFileDrop()
+
+	const hasGroups = useHasFlag('groups_frontend')
+	const addDialog = useDialogs().addDialog
+	const app = useApp()
+
+	const handleCreateGroup = () => {
+		// Use dialog if flag is set or on mobile
+		addDialog({
+			component: ({ onClose }) => (
+				<CreateGroupDialog
+					onClose={onClose}
+					onCreate={(name) => {
+						const id = uniqueId()
+						app.z.mutate.createGroup({ id, name })
+						app.ensureSidebarGroupExpanded(id)
+					}}
+				/>
+			),
+		})
+	}
 
 	return (
-		<nav
-			ref={sidebarRef}
-			aria-hidden={!isSidebarOpen}
-			style={{ visibility: isSidebarOpen ? 'visible' : 'hidden' }}
-		>
+		<nav aria-hidden={!isSidebarOpen} style={{ visibility: isSidebarOpen ? 'visible' : 'hidden' }}>
 			<button
 				className={styles.sidebarOverlayMobile}
 				data-visiblemobile={isSidebarOpenMobile}
@@ -83,17 +81,24 @@ export const TlaSidebar = memo(function TlaSidebar() {
 				onDragEnter={onDragEnter}
 				onDragLeave={onDragLeave}
 			>
-				{isDraggingOver && (
-					<div className={styles.sidebarDragOverlay}>
-						<F defaultMessage="Upload .tldr files" />
-					</div>
-				)}
 				<div className={styles.sidebarTopRow}>
 					<TlaSidebarWorkspaceLink />
+					{hasGroups && (
+						<button
+							className={styles.sidebarCreateFileButton}
+							onClick={handleCreateGroup}
+							data-testid="tla-create-group"
+							style={{ marginRight: -8, color: 'var(--tla-color-text-1)' }}
+						>
+							<TlaIcon icon="folder-new" />
+						</button>
+					)}
 					<TlaSidebarCreateFileButton />
 				</div>
 				<div className={styles.sidebarContent}>
-					<TlaSidebarRecentFiles />
+					<div className={styles.sidebarContentInner}>
+						{hasGroups ? <NewSidebarLayout /> : <LegacySidebarLayout />}
+					</div>
 				</div>
 				<div className={styles.sidebarBottomArea}>
 					<TlaSidebarDotDevLink />
@@ -106,3 +111,21 @@ export const TlaSidebar = memo(function TlaSidebar() {
 		</nav>
 	)
 })
+
+function LegacySidebarLayout() {
+	return <TlaSidebarRecentFiles />
+}
+
+import { uniqueId, useDialogs } from 'tldraw'
+import { useApp } from '../../hooks/useAppState'
+import { useHasFlag } from '../../hooks/useHasFlag'
+import { CreateGroupDialog } from '../dialogs/CreateGroupDialog'
+import { TlaIcon } from '../TlaIcon/TlaIcon'
+
+function NewSidebarLayout() {
+	return (
+		<>
+			<TlaSidebarRecentFilesNew />
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/ReorderCursor.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/ReorderCursor.tsx
new file mode 100644
index 000000000000..7af38600cf16
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/ReorderCursor.tsx
@@ -0,0 +1,19 @@
+import { useValue } from 'tldraw'
+import { useApp } from '../../../hooks/useAppState'
+import styles from '../sidebar.module.css'
+
+export function ReorderCursor() {
+	const app = useApp()
+	const position = useValue(
+		'reorder cursor position',
+		() => {
+			const dragState = app.sidebarState.get().dragState
+			if (!dragState?.hasDragStarted) return null
+			return dragState?.operation?.reorder?.indicatorY ?? null
+		},
+		[app]
+	)
+	if (position == null) return null
+
+	return <div className={styles.dropCursorLine} style={{ top: Math.round(position) }} />
+}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarCreateFileButton.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarCreateFileButton.tsx
index ba203d5e2be0..44a6d995c998 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarCreateFileButton.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarCreateFileButton.tsx
@@ -3,7 +3,6 @@ import { useNavigate } from 'react-router-dom'
 import { tltime } from 'tldraw'
 import { routes } from '../../../../routeDefs'
 import { useApp } from '../../../hooks/useAppState'
-import { useFileSidebarFocusContext } from '../../../providers/FileInputFocusProvider'
 import { useTldrawAppUiEvents } from '../../../utils/app-ui-events'
 import { getIsCoarsePointer } from '../../../utils/getIsCoarsePointer'
 import { useMsg } from '../../../utils/i18n'
@@ -20,17 +19,19 @@ export function TlaSidebarCreateFileButton() {
 
 	const rCanCreate = useRef(true)
 
-	const focusCtx = useFileSidebarFocusContext()
-
 	const handleSidebarCreate = useCallback(async () => {
 		if (!rCanCreate.current) return
 		const res = await app.createFile()
 		if (res.ok) {
 			const isMobile = getIsCoarsePointer()
 			if (!isMobile) {
-				focusCtx.shouldRenameNextNewFile = true
+				app.sidebarState.update((prev) => ({
+					...prev,
+					renameState: { fileId: res.value.fileId, groupId: app.getHomeGroupId() },
+				}))
 			}
 			const { fileId } = res.value
+			app.ensureFileVisibleInSidebar(fileId)
 			navigate(routes.tlaFile(fileId))
 			trackEvent('create-file', { source: 'sidebar' })
 			rCanCreate.current = false
@@ -39,7 +40,7 @@ export function TlaSidebarCreateFileButton() {
 				toggleMobileSidebar(false)
 			}
 		}
-	}, [app, focusCtx, navigate, trackEvent])
+	}, [app, navigate, trackEvent])
 
 	return (
 		<button
@@ -48,7 +49,7 @@ export function TlaSidebarCreateFileButton() {
 			data-testid="tla-create-file"
 			aria-label={createTitle}
 		>
-			<TlaIcon icon="edit-strong" />
+			<TlaIcon icon="edit-strong" style={{ left: 1 }} />
 		</button>
 	)
 }
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarDotDevLink.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarDotDevLink.tsx
index e0e6ddc123b9..e5c2cb455164 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarDotDevLink.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarDotDevLink.tsx
@@ -1,5 +1,6 @@
 import classNames from 'classnames'
 import { TldrawUiIcon, useLocalStorageState } from 'tldraw'
+import { trackEvent } from '../../../../utils/analytics'
 import { F } from '../../../utils/i18n'
 import { ExternalLink } from '../../ExternalLink/ExternalLink'
 import styles from '../sidebar.module.css'
@@ -13,6 +14,10 @@ export function TlaSidebarDotDevLink() {
 			<ExternalLink
 				to="https://tldraw.dev?utm_source=dotcom&utm_medium=organic&utm_campaign=sidebar-link"
 				data-testid="tla-sidebar-dotdev-link"
+				eventName="sidebar-dotdev-link-clicked"
+				onClick={() => {
+					setShowDotDevLink(false)
+				}}
 			>
 				<F defaultMessage="Build with the tldraw SDK" />
 				<TldrawUiIcon icon="arrow-left" label="Build with the tldraw SDK" small />
@@ -22,7 +27,10 @@ export function TlaSidebarDotDevLink() {
 				data-testid="tla-sidebar-dotdev-dismiss-button"
 				aria-label="Dismiss"
 				className={classNames(styles.sidebarDotDevDismissButton, styles.hoverable)}
-				onClick={() => setShowDotDevLink(false)}
+				onClick={() => {
+					trackEvent('sidebar-dotdev-link-dismissed')
+					setShowDotDevLink(false)
+				}}
 			>
 				<TldrawUiIcon icon="cross-2" label="Hide" small />
 			</button>
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileLink.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileLink.tsx
index dc1e6ae6635a..643020507fb9 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileLink.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileLink.tsx
@@ -1,11 +1,12 @@
 import { TlaFile } from '@tldraw/dotcom-shared'
 import classNames from 'classnames'
 import { ContextMenu as _ContextMenu } from 'radix-ui'
-import { KeyboardEvent, MouseEvent, useCallback, useEffect, useRef, useState } from 'react'
+import { KeyboardEvent, MouseEvent, useCallback, useEffect, useRef } from 'react'
 import { Link, useNavigate, useParams } from 'react-router-dom'
 import {
 	TldrawUiMenuContextProvider,
 	TldrawUiTooltip,
+	isEqual,
 	preventDefault,
 	useMaybeEditor,
 	useMenuIsOpen,
@@ -13,8 +14,11 @@ import {
 } from 'tldraw'
 import { routes } from '../../../../routeDefs'
 import { useApp } from '../../../hooks/useAppState'
-import { useIsFileOwner } from '../../../hooks/useIsFileOwner'
-import { useFileSidebarFocusContext } from '../../../providers/FileInputFocusProvider'
+import { useDragTracking } from '../../../hooks/useDragTracking'
+import { useHasFlag } from '../../../hooks/useHasFlag'
+import { useIsDragging } from '../../../hooks/useIsDragging'
+import { useHasFileAdminRights } from '../../../hooks/useIsFileOwner'
+import { useIsFilePinned } from '../../../hooks/useIsFilePinned'
 import { useTldrawAppUiEvents } from '../../../utils/app-ui-events'
 import { getIsCoarsePointer } from '../../../utils/getIsCoarsePointer'
 import { F, defineMessages, useIntl } from '../../../utils/i18n'
@@ -24,24 +28,43 @@ import { TlaIcon } from '../../TlaIcon/TlaIcon'
 import styles from '../sidebar.module.css'
 import { TlaSidebarFileLinkMenu } from './TlaSidebarFileLinkMenu'
 import { TlaSidebarRenameInline } from './TlaSidebarRenameInline'
+import { pinIcon } from './pinIcon'
 import { RecentFile } from './sidebar-shared'
 
 const ACTIVE_FILE_LINK_ID = 'tla-active-file-link'
+let preventScrollOnNavigation = false
+
 function scrollActiveFileLinkIntoView() {
 	const el = document.getElementById(ACTIVE_FILE_LINK_ID)
 	if (el) {
+		// Check if we should prevent scrolling due to sidebar click
+		if (preventScrollOnNavigation) {
+			return
+		}
 		el.scrollIntoView({ behavior: 'smooth', block: 'nearest' })
 	}
 }
 
+export function setPreventScrollOnNavigation(value: boolean) {
+	preventScrollOnNavigation = value
+	if (value) {
+		// Clear the flag after a short delay to allow for immediate navigation
+		setTimeout(() => {
+			preventScrollOnNavigation = false
+		}, 100)
+	}
+}
+
 export function TlaSidebarFileLink({
 	item,
 	testId,
+	className,
 	groupId,
 }: {
 	item: RecentFile
 	testId: string
-	groupId: string | null
+	groupId: string
+	className?: string
 }) {
 	const app = useApp()
 	const intl = useIntl()
@@ -54,9 +77,16 @@ export function TlaSidebarFileLink({
 		if (isActive) {
 			scrollActiveFileLinkIntoView()
 		}
-	}, [isActive])
+	}, [isActive, fileId])
+
+	const isRenaming = useValue(
+		'shouldRename',
+		() => isEqual(app.sidebarState.get().renameState, { fileId, groupId }),
+		[fileId, app]
+	)
+
+	const isPinned = useIsFilePinned(fileId, groupId)
 
-	const [isRenaming, setIsRenaming] = useState(false)
 	const handleRenameAction = () => {
 		if (isMobile) {
 			const newName = prompt(intl.formatMessage(sidebarMessages.renameFile), fileName)?.trim()
@@ -64,7 +94,7 @@ export function TlaSidebarFileLink({
 				app.updateFile(fileId, { name: newName })
 			}
 		} else {
-			setIsRenaming(true)
+			app.sidebarState.update((prev) => ({ ...prev, renameState: { fileId, groupId } }))
 		}
 	}
 
@@ -77,12 +107,14 @@ export function TlaSidebarFileLink({
 					fileId={fileId}
 					groupId={groupId}
 					fileName={fileName}
+					isPinned={isPinned}
 					testId={testId}
 					isActive={isActive}
 					href={routes.tlaFile(fileId)}
-					onClose={() => setIsRenaming(false)}
+					onClose={() => app.sidebarState.update((prev) => ({ ...prev, renameState: null }))}
 					isRenaming={isRenaming}
 					handleRenameAction={handleRenameAction}
+					className={className}
 				/>
 			</_ContextMenu.Trigger>
 			<_ContextMenu.Content className="tlui-menu tlui-scrollable">
@@ -110,6 +142,7 @@ export const sidebarMessages = defineMessages({
 })
 
 export function TlaSidebarFileLinkInner({
+	isPinned,
 	testId,
 	fileId,
 	isActive,
@@ -119,8 +152,10 @@ export function TlaSidebarFileLinkInner({
 	handleRenameAction,
 	onClose,
 	groupId,
+	className,
 }: {
 	fileId: string
+	isPinned: boolean
 	testId: string | number
 	isActive: boolean
 	fileName: string
@@ -128,12 +163,12 @@ export function TlaSidebarFileLinkInner({
 	isRenaming: boolean
 	handleRenameAction(): void
 	onClose(): void
-	groupId: string | null
+	groupId: string
+	className?: string
 }) {
 	const trackEvent = useTldrawAppUiEvents()
 	const linkRef = useRef<HTMLAnchorElement | null>(null)
 	const app = useApp()
-	const focusCtx = useFileSidebarFocusContext()
 	const isSidebarOpenMobile = useIsSidebarOpenMobile()
 	const editor = useMaybeEditor()
 	const intl = useIntl()
@@ -141,14 +176,7 @@ export function TlaSidebarFileLinkInner({
 		editor,
 	])
 
-	useEffect(() => {
-		// on mount, trigger rename action if this is a new file.
-		if (isActive && focusCtx.shouldRenameNextNewFile) {
-			focusCtx.shouldRenameNextNewFile = false
-			handleRenameAction()
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [])
+	const { startDragTracking } = useDragTracking()
 
 	const handleKeyDown = (e: KeyboardEvent) => {
 		if (!isActive) return
@@ -161,30 +189,65 @@ export function TlaSidebarFileLinkInner({
 		if (!isActive || !linkRef.current) return
 		// Don't focus if any menus are open to prevent dismissing them
 		if (editor?.menus.hasAnyOpenMenus()) return
-		linkRef.current.focus()
+		linkRef.current.focus({ preventScroll: preventScrollOnNavigation })
 	}, [isActive, linkRef, editor])
 
 	const file = useValue('file', () => app.getFile(fileId), [fileId, app])
-	const isOwnFile = useIsFileOwner(fileId)
+	const hasAdminRights = useHasFileAdminRights(fileId)
+
+	const isDragging = useIsDragging(fileId)
+	// disable dragging on mobile
+	const isCoarsePointer = getIsCoarsePointer()
+
+	const wrapperRef = useRef<HTMLDivElement>(null)
+	const hasGroups = useHasFlag('groups_frontend')
+
 	if (!file) return null
 
 	if (isRenaming) {
-		return <TlaSidebarRenameInline source="sidebar" fileId={fileId} onClose={onClose} />
+		return (
+			<TlaSidebarRenameInline
+				source="sidebar"
+				fileId={fileId}
+				groupId={groupId}
+				onClose={onClose}
+			/>
+		)
 	}
 
 	return (
 		<div
-			className={classNames(styles.sidebarFileListItem, styles.hoverable)}
+			className={classNames(styles.sidebarFileListItem, styles.hoverable, className)}
 			data-enhanced-a11y-mode={enhancedA11yMode}
+			ref={wrapperRef}
 			data-active={isActive}
 			data-element="file-link"
 			data-testid={testId}
-			data-is-own-file={isOwnFile}
-			onDoubleClick={isOwnFile ? handleRenameAction : undefined}
+			data-is-own-file={hasAdminRights}
+			onDoubleClick={hasAdminRights ? handleRenameAction : undefined}
+			data-drop-target-id={`file:${fileId}`}
+			data-is-dragging={isDragging}
+			data-is-pinned={isPinned}
 			// We use this id to scroll the active file link into view when creating or deleting files.
 			id={isActive ? ACTIVE_FILE_LINK_ID : undefined}
 			role="listitem"
-			draggable={false}
+			draggable={!isCoarsePointer}
+			onDragStart={
+				isCoarsePointer
+					? undefined
+					: (event) => {
+							// Set native drag data for drag-to-new-tab functionality
+							const fileUrl = routes.tlaFile(fileId, { asUrl: true })
+							event.dataTransfer.effectAllowed = 'move'
+							event.dataTransfer.setData('text/uri-list', fileUrl)
+							startDragTracking({
+								groupId,
+								fileId,
+								clientX: event.clientX,
+								clientY: event.clientY,
+							})
+						}
+			}
 		>
 			<Link
 				ref={linkRef}
@@ -197,6 +260,9 @@ export function TlaSidebarFileLinkInner({
 					// unless the user is holding ctrl or cmd to open in a new tab
 					if (isActive && !(event.ctrlKey || event.metaKey)) {
 						preventDefault(event)
+					} else {
+						// Set flag to prevent scrolling when navigation occurs due to sidebar click
+						setPreventScrollOnNavigation(true)
 					}
 					if (isSidebarOpenMobile) {
 						toggleMobileSidebar(false)
@@ -208,6 +274,7 @@ export function TlaSidebarFileLinkInner({
 				draggable={false}
 			/>
 			<div className={styles.sidebarFileListItemContent}>
+				{isPinned && hasGroups && pinIcon}
 				<div
 					className={classNames(
 						styles.sidebarFileListItemLabel,
@@ -218,7 +285,7 @@ export function TlaSidebarFileLinkInner({
 				>
 					{fileName}
 				</div>
-				{!isOwnFile && <GuestBadge file={file} href={href} />}
+				{!hasAdminRights && <GuestBadge file={file} href={href} />}
 			</div>
 			<TlaSidebarFileLinkMenu
 				groupId={groupId}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileSection.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileSection.tsx
index faa43030d852..457a97326690 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileSection.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarFileSection.tsx
@@ -9,24 +9,46 @@ export function TlaSidebarFileSection({
 	iconLeft,
 	onePixelOfPaddingAtTheTop,
 	children,
+	className,
+	iconButton,
 }: {
 	title: ReactElement
 	iconLeft?: string
 	onePixelOfPaddingAtTheTop?: boolean
 	children: ReactNode
+	className?: string
+	iconButton?: {
+		icon: string
+		onClick(): void
+		title?: string
+	}
 }) {
 	const id = useUniqueSafeId()
 	return (
 		<div
-			className={classNames(styles.sidebarFileSectionWrapper, {
-				[styles.sidebarFileSectionTitlePadding]: onePixelOfPaddingAtTheTop,
-			})}
+			className={classNames(
+				styles.sidebarFileSectionWrapper,
+				{
+					[styles.sidebarFileSectionTitlePadding]: onePixelOfPaddingAtTheTop,
+				},
+				className
+			)}
 		>
 			<div className={classNames('tla-text_ui__medium', styles.sidebarFileSectionTitle)}>
 				{iconLeft ? <TlaIcon icon={iconLeft} /> : null}
-				<span id={id} role="heading" aria-level={2}>
+				<span id={id} className={styles.sidebarFileSectionTitleText} role="heading" aria-level={2}>
 					{title}
 				</span>
+				{iconButton && (
+					<button
+						className={styles.sidebarCreateFileButton}
+						onClick={iconButton.onClick}
+						title={iconButton.title}
+						type="button"
+					>
+						<TlaIcon icon={iconButton.icon} />
+					</button>
+				)}
 			</div>
 			<div className={styles.sidebarFileSection} role="list" aria-labelledby={id}>
 				{children}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarGroupItem.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarGroupItem.tsx
new file mode 100644
index 000000000000..03141097016b
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarGroupItem.tsx
@@ -0,0 +1,459 @@
+import { fileOpen } from 'browser-fs-access'
+import classNames from 'classnames'
+import { Collapsible, ContextMenu as _ContextMenu } from 'radix-ui'
+import { memo, useCallback, useEffect, useRef } from 'react'
+import { useNavigate } from 'react-router-dom'
+import {
+	TLDRAW_FILE_EXTENSION,
+	TldrawUiDropdownMenuContent,
+	TldrawUiDropdownMenuRoot,
+	TldrawUiDropdownMenuTrigger,
+	TldrawUiMenuContextProvider,
+	TldrawUiMenuGroup,
+	TldrawUiMenuItem,
+	tltime,
+	useDialogs,
+	useMenuIsOpen,
+	useValue,
+} from 'tldraw'
+import { routes } from '../../../../routeDefs'
+import { useApp } from '../../../hooks/useAppState'
+import { useDragTracking } from '../../../hooks/useDragTracking'
+import { useIsDragging } from '../../../hooks/useIsDragging'
+import { useTldrawAppUiEvents } from '../../../utils/app-ui-events'
+import { getIsCoarsePointer } from '../../../utils/getIsCoarsePointer'
+import { F, defineMessages, useMsg } from '../../../utils/i18n'
+import { TlaIcon } from '../../TlaIcon/TlaIcon'
+import { AddFileLinkDialog } from '../../dialogs/AddFileLinkDialog'
+import { GroupSettingsDialog } from '../../dialogs/GroupSettingsDialog'
+import styles from '../sidebar.module.css'
+import { TlaSidebarFileLink } from './TlaSidebarFileLink'
+import { messages } from './sidebar-shared'
+
+const groupMessages = defineMessages({
+	copyInviteLink: { defaultMessage: 'Copy invite link' },
+	settings: { defaultMessage: 'Settings' },
+	importFiles: { defaultMessage: 'Import file…' },
+	addLinkToSharedFile: { defaultMessage: 'Add file link…' },
+	copied: { defaultMessage: 'Copied invite link' },
+})
+
+function GroupEmptyState({ groupId, onCreateFile }: { groupId: string; onCreateFile(): void }) {
+	const app = useApp()
+	return (
+		<div className={styles.sidebarGroupItemEmpty}>
+			<F
+				{...messages.groupEmpty}
+				values={{
+					br: () => <br />,
+					create: (chunks) => (
+						<button className={styles.sidebarGroupItemButtonInline} onClick={onCreateFile}>
+							{chunks}
+						</button>
+					),
+					invite: (chunks) => (
+						<button
+							className={styles.sidebarGroupItemButtonInline}
+							onClick={() => app.copyGroupInvite(groupId)}
+						>
+							{chunks}
+						</button>
+					),
+				}}
+			/>
+		</div>
+	)
+}
+
+const GroupFileList = memo(function GroupFileList({
+	groupId,
+	onCreateFile,
+}: {
+	groupId: string
+	onCreateFile(): void
+}) {
+	const app = useApp()
+	const group = useValue('group', () => app.getGroupMembership(groupId), [app, groupId])
+	const files = useValue(
+		'group files',
+		() => {
+			const groupFiles = app.getGroupFilesSorted(groupId)
+			const pinned = groupFiles.filter((f) => !!app.getFileState(f.fileId)?.isPinned)
+			const unpinned = groupFiles.filter((f) => !app.getFileState(f.fileId)?.isPinned)
+			return pinned.concat(unpinned)
+		},
+		[app, groupId]
+	)
+	const expansionState = useValue(
+		'expansionState',
+		() => app.sidebarState.get().expandedGroups[groupId] ?? 'closed',
+		[app, groupId]
+	)
+
+	const isShowingAll = expansionState === 'expanded_show_more'
+
+	const handleShowMore = useCallback(() => {
+		app.sidebarState.update((prev) => ({
+			...prev,
+			expandedGroups: { ...prev.expandedGroups, [groupId]: 'expanded_show_more' },
+		}))
+	}, [app, groupId])
+
+	const handleShowLess = useCallback(() => {
+		app.sidebarState.update((prev) => ({
+			...prev,
+			expandedGroups: { ...prev.expandedGroups, [groupId]: 'expanded_show_less' },
+		}))
+	}, [app, groupId])
+
+	if (!group) return null
+
+	const numPinnedFiles = files.filter((f) => !!app.getFileState(f.fileId)?.isPinned).length
+
+	const MAX_FILES_TO_SHOW = numPinnedFiles + 4
+	const slop = 2
+	const isOverflowing = files.length > MAX_FILES_TO_SHOW + slop
+	const filesToShow = isOverflowing ? files.slice(0, MAX_FILES_TO_SHOW) : files
+	const hiddenFiles = isOverflowing ? files.slice(MAX_FILES_TO_SHOW) : []
+
+	if (filesToShow.length === 0)
+		return <GroupEmptyState groupId={groupId} onCreateFile={onCreateFile} />
+
+	return (
+		<Collapsible.Root open={isShowingAll}>
+			{filesToShow.map((item) => (
+				<TlaSidebarFileLink
+					groupId={groupId}
+					key={`group-file-${item.fileId}`}
+					className={styles.sidebarGroupItemFile}
+					item={item}
+					testId={`tla-group-file-${item.fileId}`}
+				/>
+			))}
+
+			{isOverflowing && (
+				<>
+					<Collapsible.Content className={styles.CollapsibleContent}>
+						{hiddenFiles.map((item) => (
+							<TlaSidebarFileLink
+								groupId={groupId}
+								key={`group-file-${item.fileId}`}
+								className={styles.sidebarGroupItemFile}
+								item={item}
+								testId={`tla-group-file-${item.fileId}`}
+							/>
+						))}
+					</Collapsible.Content>
+					<Collapsible.Trigger asChild>
+						{isShowingAll ? (
+							<button className={styles.showAllButton} onClick={handleShowLess}>
+								<F defaultMessage="Show less" />
+							</button>
+						) : (
+							<button className={styles.showAllButton} onClick={handleShowMore}>
+								<F defaultMessage="Show more" />
+							</button>
+						)}
+					</Collapsible.Trigger>
+				</>
+			)}
+		</Collapsible.Root>
+	)
+})
+
+function TlaSidebarGroupMenu({ groupId }: { groupId: string }) {
+	return (
+		<TldrawUiDropdownMenuRoot id={`group-menu-${groupId}-sidebar`}>
+			<TldrawUiMenuContextProvider type="menu" sourceId="dialog">
+				<TldrawUiDropdownMenuTrigger>
+					<button className={styles.sidebarGroupItemButton} title="More options" type="button">
+						<TlaIcon icon="dots-vertical-strong" />
+					</button>
+				</TldrawUiDropdownMenuTrigger>
+				<TldrawUiDropdownMenuContent side="bottom" align="start" alignOffset={0} sideOffset={0}>
+					<GroupMenuContent groupId={groupId} />
+				</TldrawUiDropdownMenuContent>
+			</TldrawUiMenuContextProvider>
+		</TldrawUiDropdownMenuRoot>
+	)
+}
+
+function GroupMenuContent({ groupId }: { groupId: string }) {
+	const app = useApp()
+	const { addDialog } = useDialogs()
+	const trackEvent = useTldrawAppUiEvents()
+	const navigate = useNavigate()
+	const copyInviteLinkMsg = useMsg(groupMessages.copyInviteLink)
+	const settingsMsg = useMsg(groupMessages.settings)
+	const importFilesMsg = useMsg(groupMessages.importFiles)
+	const addLinkToSharedFileMsg = useMsg(groupMessages.addLinkToSharedFile)
+
+	const handleCopyInviteLinkClick = useCallback(() => {
+		app.copyGroupInvite(groupId)
+	}, [app, groupId])
+
+	const handleSettingsClick = useCallback(() => {
+		addDialog({
+			component: ({ onClose }) => <GroupSettingsDialog groupId={groupId} onClose={onClose} />,
+		})
+		trackEvent('open-share-menu', { source: 'sidebar' })
+	}, [addDialog, groupId, trackEvent])
+
+	const handleImportFilesClick = useCallback(async () => {
+		trackEvent('import-tldr-file', { source: 'sidebar' })
+
+		try {
+			const tldrawFiles = await fileOpen({
+				extensions: [TLDRAW_FILE_EXTENSION],
+				multiple: true,
+				description: 'tldraw project',
+			})
+
+			app.uploadTldrFiles(
+				tldrawFiles,
+				(fileId) => {
+					navigate(routes.tlaFile(fileId), { state: { mode: 'create' } })
+				},
+				groupId
+			)
+		} catch {
+			// user cancelled
+			return
+		}
+	}, [trackEvent, app, navigate, groupId])
+
+	const handleAddLinkToSharedFileClick = useCallback(() => {
+		addDialog({
+			component: ({ onClose }) => <AddFileLinkDialog onClose={onClose} groupId={groupId} />,
+		})
+	}, [addDialog, groupId])
+
+	return (
+		<>
+			<TldrawUiMenuGroup id="group-actions">
+				<TldrawUiMenuItem
+					label={copyInviteLinkMsg}
+					id="copy-invite-link"
+					readonlyOk
+					onSelect={handleCopyInviteLinkClick}
+				/>
+			</TldrawUiMenuGroup>
+			<TldrawUiMenuGroup id="group-settings">
+				<TldrawUiMenuItem
+					label={settingsMsg}
+					id="settings"
+					readonlyOk
+					onSelect={handleSettingsClick}
+				/>
+			</TldrawUiMenuGroup>
+			<TldrawUiMenuGroup id="group-import-file-actions">
+				<TldrawUiMenuItem
+					label={importFilesMsg}
+					id="import-files"
+					readonlyOk
+					onSelect={handleImportFilesClick}
+				/>
+				<TldrawUiMenuItem
+					label={addLinkToSharedFileMsg}
+					id="add-link-to-shared-file"
+					readonlyOk
+					onSelect={handleAddLinkToSharedFileClick}
+				/>
+			</TldrawUiMenuGroup>
+		</>
+	)
+}
+
+const blankImg = document.createElement('img')
+blankImg.src = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='
+
+export function TlaSidebarGroupItem({ groupId, index }: { groupId: string; index: number }) {
+	const [menuIsOpen] = useMenuIsOpen(`group-menu-${groupId}-sidebar`)
+	const [contextMenuIsOpen] = useMenuIsOpen(`group-context-menu-${groupId}`)
+	const app = useApp()
+	const [_, handleContextMenuOpenChange] = useMenuIsOpen(`group-context-menu-${groupId}`)
+	const navigate = useNavigate()
+	const trackEvent = useTldrawAppUiEvents()
+	const rCanCreate = useRef(true)
+
+	const { startDragTracking } = useDragTracking()
+
+	const isDragging = useIsDragging(groupId)
+	// disable dragging on mobile
+	const isCoarsePointer = getIsCoarsePointer()
+
+	const expansionState = useValue(
+		'expansionState',
+		() => {
+			return app.sidebarState.get().expandedGroups[groupId] ?? 'closed'
+		},
+		[app, groupId]
+	)
+
+	const isExpanded = expansionState !== 'closed'
+
+	const isNoAnimation = useValue(
+		'isNoAnimation',
+		() => app.sidebarState.get().noAnimationGroups.includes(groupId),
+		[app, groupId]
+	)
+	useEffect(() => {
+		if (isNoAnimation) {
+			setTimeout(() => {
+				app.sidebarState.update((prev) => ({
+					...prev,
+					noAnimationGroups: prev.noAnimationGroups.filter((id) => id !== groupId),
+				}))
+			}, 350)
+		}
+	}, [isNoAnimation, app, groupId])
+
+	const setIsExpanded = useCallback(
+		(isExpanded: boolean) => {
+			if (isExpanded) {
+				app.sidebarState.update((prev) => ({
+					...prev,
+					expandedGroups: { ...prev.expandedGroups, [groupId]: 'expanded_show_less' },
+				}))
+				// Clear group file ordering when expanding to refresh the order (like recent files on page reload)
+				app.clearGroupFileOrdering(groupId)
+			} else {
+				app.sidebarState.update((prev) => ({
+					...prev,
+					expandedGroups: { ...prev.expandedGroups, [groupId]: 'closed' },
+				}))
+			}
+		},
+		[app, groupId]
+	)
+
+	const group = useValue('group', () => app.getGroupMembership(groupId), [app, groupId])
+
+	const handleCreateFile = useCallback(async () => {
+		if (!rCanCreate.current) return
+
+		const res = await app.createFile({ groupId })
+
+		if (res.ok) {
+			const isMobile = getIsCoarsePointer()
+			if (!isMobile) {
+				app.sidebarState.update((prev) => ({
+					...prev,
+					renameState: { fileId: res.value.fileId, groupId },
+				}))
+			}
+			app.ensureFileVisibleInSidebar(res.value.fileId)
+			navigate(routes.tlaFile(res.value.fileId))
+			setIsExpanded(true)
+			trackEvent('create-file', { source: 'sidebar' })
+			rCanCreate.current = false
+			tltime.setTimeout('can create again', () => (rCanCreate.current = true), 1000)
+		}
+	}, [app, groupId, navigate, trackEvent, setIsExpanded])
+
+	const isEmpty = useValue('isEmpty', () => app.getGroupFilesSorted(groupId).length === 0, [
+		app,
+		groupId,
+	])
+
+	const showDroppingState = useValue(
+		'showDroppingState',
+		() => {
+			const dragState = app.sidebarState.get().dragState
+			if (!dragState) return false
+			return (
+				dragState.type === 'file' &&
+				dragState.operation.move?.targetId === groupId &&
+				!dragState.operation.reorder
+			)
+		},
+		[app, groupId]
+	)
+
+	if (!group) return null
+
+	return (
+		<_ContextMenu.Root onOpenChange={handleContextMenuOpenChange} modal={false}>
+			<_ContextMenu.Trigger>
+				<Collapsible.Root
+					className={classNames(styles.sidebarGroupItem, {
+						[styles.dropping]: showDroppingState,
+					})}
+					open={isExpanded}
+					data-is-empty={isEmpty}
+					data-group-index={index}
+					data-menu-open={menuIsOpen || contextMenuIsOpen}
+					data-group-id={group.groupId}
+					data-drop-target-id={`group:${group.groupId}`}
+					data-no-animation={isNoAnimation}
+					data-is-dragging={isDragging}
+				>
+					<Collapsible.Trigger asChild>
+						<div
+							className={styles.sidebarGroupItemHeader}
+							aria-expanded={isExpanded}
+							role="button"
+							tabIndex={0}
+							onKeyDown={(e) => {
+								if (e.key === 'Enter') {
+									setIsExpanded(!isExpanded)
+								}
+							}}
+							style={{ cursor: 'default' }}
+							draggable={!isCoarsePointer}
+							onClick={() => setIsExpanded(!isExpanded)}
+							onDragStart={
+								isCoarsePointer
+									? undefined
+									: (event) => {
+											event.dataTransfer.effectAllowed = 'move'
+											event.dataTransfer.setData('text/plain', group.groupId)
+											event.dataTransfer.setDragImage(blankImg, 0, 0)
+											startDragTracking({
+												groupId: group.groupId,
+												clientX: event.clientX,
+												clientY: event.clientY,
+											})
+										}
+							}
+						>
+							<div
+								className={styles.sidebarGroupItemTitle}
+								style={{
+									marginLeft: isExpanded ? 0 : 0,
+									transition: 'margin-left 0.14s ease-in-out',
+								}}
+							>
+								<TlaIcon icon={isExpanded ? 'folder-open' : 'folder'} style={{ top: -1 }} />
+								{group.group.name}
+							</div>
+							<div
+								className={styles.sidebarGroupItemButtons}
+								onClick={(e) => e.stopPropagation()}
+								style={{ cursor: 'default' }}
+							>
+								<TlaSidebarGroupMenu groupId={groupId} />
+								<button
+									className={styles.sidebarGroupItemButton}
+									onClick={handleCreateFile}
+									title="New file"
+									type="button"
+								>
+									<TlaIcon icon="edit" />
+								</button>
+							</div>
+						</div>
+					</Collapsible.Trigger>
+					<Collapsible.Content className={styles.CollapsibleContent}>
+						<GroupFileList groupId={groupId} onCreateFile={handleCreateFile} />
+					</Collapsible.Content>
+				</Collapsible.Root>
+			</_ContextMenu.Trigger>
+			<_ContextMenu.Content className="tlui-menu tlui-scrollable">
+				<TldrawUiMenuContextProvider type="context-menu" sourceId="context-menu">
+					<GroupMenuContent groupId={groupId} />
+				</TldrawUiMenuContextProvider>
+			</_ContextMenu.Content>
+		</_ContextMenu.Root>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarInlineInput.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarInlineInput.tsx
new file mode 100644
index 000000000000..2c6ca3bfc52e
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarInlineInput.tsx
@@ -0,0 +1,76 @@
+import classNames from 'classnames'
+import { useCallback, useRef } from 'react'
+import { TldrawUiInput } from 'tldraw'
+import { useHasFlag } from '../../../hooks/useHasFlag'
+import styles from '../sidebar.module.css'
+import { pinIcon } from './pinIcon'
+
+export interface TlaSidebarInlineInputProps {
+	defaultValue?: string
+	placeholder?: string
+	onComplete(value: string): void
+	onCancel(): void
+	isPinned?: boolean
+	className?: string
+	wrapperClassName?: string
+	autoFocus?: boolean
+	'data-testid'?: string
+}
+
+export function TlaSidebarInlineInput({
+	defaultValue = '',
+	placeholder,
+	onComplete,
+	onCancel,
+	isPinned,
+	className,
+	wrapperClassName,
+	autoFocus = true,
+	'data-testid': dataTestId,
+}: TlaSidebarInlineInputProps) {
+	const ref = useRef<HTMLInputElement>(null)
+	const wasSaved = useRef(false)
+
+	const handleSave = useCallback(() => {
+		if (wasSaved.current) return
+		const elm = ref.current
+		if (!elm) return
+		const value = elm.value.slice(0, 200).trim()
+
+		if (value) {
+			wasSaved.current = true
+			onComplete(value)
+		} else {
+			onCancel()
+		}
+	}, [onComplete, onCancel])
+
+	const handleCancel = useCallback(() => {
+		wasSaved.current = true
+		onCancel()
+	}, [onCancel])
+
+	const hasGroups = useHasFlag('groups_frontend')
+
+	return (
+		<div className={classNames(styles.sidebarFileListItemRenameInputWrapper, wrapperClassName)}>
+			{isPinned && hasGroups && pinIcon}
+			<TldrawUiInput
+				ref={ref}
+				data-testid={dataTestId}
+				className={classNames(
+					styles.sidebarFileListItemRenameInput,
+					'tla-text_ui__regular',
+					className
+				)}
+				defaultValue={defaultValue}
+				placeholder={placeholder}
+				onComplete={handleSave}
+				onCancel={handleCancel}
+				onBlur={handleSave}
+				autoSelect
+				autoFocus={autoFocus}
+			/>
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFiles.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFiles.tsx
index eb6625a187e8..8869fdaad74a 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFiles.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFiles.tsx
@@ -13,7 +13,7 @@ export function TlaSidebarRecentFiles() {
 	const results = useValue(
 		'recent user files',
 		() => {
-			const recentFiles = app.getUserRecentFiles()
+			const recentFiles = app.getMyFiles()
 			if (!recentFiles) return null
 
 			const { today, yesterday, thisWeek, thisMonth } = getRelevantDates()
@@ -70,10 +70,10 @@ export function TlaSidebarRecentFiles() {
 				>
 					{results.pinnedFiles.map((item, i) => (
 						<TlaSidebarFileLink
+							groupId={app.getHomeGroupId()}
 							key={'file_link_pinned_' + item.fileId}
 							item={item}
 							testId={`tla-file-link-pinned-${i}`}
-							groupId={app.userId}
 						/>
 					))}
 				</TlaSidebarFileSection>
@@ -82,10 +82,10 @@ export function TlaSidebarRecentFiles() {
 				<TlaSidebarFileSection title={<F defaultMessage="Today" />}>
 					{results.todayFiles.map((item, i) => (
 						<TlaSidebarFileLink
+							groupId={app.getHomeGroupId()}
 							key={'file_link_today_' + item.fileId}
 							item={item}
 							testId={`tla-file-link-today-${i}`}
-							groupId={app.userId}
 						/>
 					))}
 				</TlaSidebarFileSection>
@@ -94,10 +94,10 @@ export function TlaSidebarRecentFiles() {
 				<TlaSidebarFileSection title={<F defaultMessage="Yesterday" />}>
 					{results.yesterdayFiles.map((item, i) => (
 						<TlaSidebarFileLink
+							groupId={app.getHomeGroupId()}
 							key={'file_link_yesterday_' + item.fileId}
 							item={item}
 							testId={`tla-file-link-yesterday-${i}`}
-							groupId={app.userId}
 						/>
 					))}
 				</TlaSidebarFileSection>
@@ -106,10 +106,10 @@ export function TlaSidebarRecentFiles() {
 				<TlaSidebarFileSection title={<F defaultMessage="This week" />}>
 					{results.thisWeekFiles.map((item, i) => (
 						<TlaSidebarFileLink
+							groupId={app.getHomeGroupId()}
 							key={'file_link_this-week_' + item.fileId}
 							item={item}
 							testId={`tla-file-link-this-week-${i}`}
-							groupId={app.userId}
 						/>
 					))}
 				</TlaSidebarFileSection>
@@ -118,10 +118,10 @@ export function TlaSidebarRecentFiles() {
 				<TlaSidebarFileSection title={<F defaultMessage="This month" />}>
 					{results.thisMonthFiles.map((item, i) => (
 						<TlaSidebarFileLink
+							groupId={app.getHomeGroupId()}
 							key={'file_link_this-month_' + item.fileId}
 							item={item}
 							testId={`tla-file-link-this-month-${i}`}
-							groupId={app.userId}
 						/>
 					))}
 				</TlaSidebarFileSection>
@@ -132,10 +132,10 @@ export function TlaSidebarRecentFiles() {
 						.sort((a, b) => b.date - a.date)
 						.map((item, i) => (
 							<TlaSidebarFileLink
+								groupId={app.getHomeGroupId()}
 								key={'file_link_older' + item.fileId}
 								item={item}
 								testId={`tla-file-link-older-${i}`}
-								groupId={app.userId}
 							/>
 						))}
 				</TlaSidebarFileSection>
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFilesNew.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFilesNew.tsx
new file mode 100644
index 000000000000..fdaaf5a37a7f
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRecentFilesNew.tsx
@@ -0,0 +1,126 @@
+import { Collapsible } from 'radix-ui'
+import { Fragment } from 'react'
+import { useValue } from 'tldraw'
+import { useApp } from '../../../hooks/useAppState'
+import { F } from '../../../utils/i18n'
+import styles from '../sidebar.module.css'
+import { ReorderCursor } from './ReorderCursor'
+import { TlaSidebarFileLink } from './TlaSidebarFileLink'
+import { TlaSidebarGroupItem } from './TlaSidebarGroupItem'
+
+export function TlaSidebarRecentFilesNew() {
+	const app = useApp()
+	// Demo flag to switch between inline input and dialog
+
+	const isShowingAll = useValue('isShowingAll', () => app.sidebarState.get().recentFilesShowMore, [
+		app,
+	])
+
+	const handleShowMore = () => {
+		app.sidebarState.update((prev) => ({ ...prev, recentFilesShowMore: true }))
+	}
+
+	const handleShowLess = () => {
+		app.sidebarState.update((prev) => ({ ...prev, recentFilesShowMore: false }))
+	}
+
+	// Get group memberships from the server
+	const groupMemberships = useValue('groupMemberships', () => app.getGroupMemberships(), [app])
+
+	const files = useValue('my files', () => app.getMyFiles(), [app])
+	const homeGroupId = app.getHomeGroupId()
+	const showMyFilesDropState = useValue(
+		'showMyFilesDropState',
+		() => {
+			const dragState = app.sidebarState.get().dragState
+			if (!dragState?.hasDragStarted) return false
+			return (
+				dragState.type === 'file' &&
+				dragState.operation.move?.targetId === homeGroupId &&
+				!dragState.operation.reorder
+			)
+		},
+		[app, homeGroupId]
+	)
+
+	if (!files) throw Error('Could not get files')
+	const numPinnedFiles = files.filter((f) => f.isPinned).length
+
+	const MAX_FILES_TO_SHOW = Math.max(
+		groupMemberships.length > 0 ? 6 : +Infinity,
+		numPinnedFiles + 4
+	)
+	const slop = 2
+	const isOverflowing = files.length > MAX_FILES_TO_SHOW + slop
+	const filesToShow = isOverflowing ? files.slice(0, MAX_FILES_TO_SHOW) : files
+	const hiddenFiles = isOverflowing ? files.slice(MAX_FILES_TO_SHOW) : []
+
+	return (
+		<Fragment>
+			<div
+				data-drop-target-id={homeGroupId}
+				className={showMyFilesDropState ? styles.dropping : ''}
+			>
+				<div
+					style={{ fontSize: 12, paddingLeft: 8, paddingTop: 12, color: 'var(--tla-color-text-3)' }}
+				>
+					<F defaultMessage="My files" />
+				</div>
+				<div style={{ height: 8 }}></div>
+				{filesToShow.length > 0 &&
+					filesToShow.map((item, i) => (
+						<TlaSidebarFileLink
+							groupId={homeGroupId}
+							key={'file_link_today_' + item.fileId}
+							item={item}
+							testId={`tla-file-link-today-${i}`}
+						/>
+					))}
+				{hiddenFiles.length > 0 && (
+					<Collapsible.Root open={isShowingAll}>
+						<Collapsible.Content className={styles.CollapsibleContent}>
+							{hiddenFiles.map((item, i) => (
+								<TlaSidebarFileLink
+									groupId={homeGroupId}
+									key={'file_link_today_' + item.fileId}
+									item={item}
+									testId={`tla-file-link-today-${i}`}
+								/>
+							))}
+						</Collapsible.Content>
+						<Collapsible.Trigger asChild>
+							{isOverflowing &&
+								(isShowingAll ? (
+									<button className={styles.showAllButton} onClick={handleShowLess}>
+										<F defaultMessage="Show less" />
+									</button>
+								) : (
+									<button className={styles.showAllButton} onClick={handleShowMore}>
+										<F defaultMessage="Show more" />
+									</button>
+								))}
+						</Collapsible.Trigger>
+					</Collapsible.Root>
+				)}
+			</div>
+			<div style={{ height: 12 }}></div>
+			{groupMemberships.map((group, i) =>
+				group.groupId === app.getHomeGroupId() ? null : (
+					// Include the array index in the key to force a remount when the order changes
+					// this prevents a bug where the collapsible open animation replays when react moves
+					// an open group item within the list. I guess the browser thinks it's a new dom node
+					// or whatever.
+					// If radix's Collapsible had 'opening' and 'closing' states instead of just 'open' and 'closed'
+					// we wouldn't need this.
+					<TlaSidebarGroupItem
+						key={`group-${group.group.id}-${i}`}
+						groupId={group.group.id}
+						index={i}
+					/>
+				)
+			)}
+			{/* Global drag cursor for group reordering */}
+			<ReorderCursor />
+		</Fragment>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRenameInline.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRenameInline.tsx
index 2c4c3c5bb26b..af4c4119e4d8 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRenameInline.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarRenameInline.tsx
@@ -1,53 +1,41 @@
-import classNames from 'classnames'
-import { useCallback, useRef } from 'react'
-import { TldrawUiInput } from 'tldraw'
+import { useCallback } from 'react'
 import { useApp } from '../../../hooks/useAppState'
+import { useIsFilePinned } from '../../../hooks/useIsFilePinned'
 import { TLAppUiEventSource, useTldrawAppUiEvents } from '../../../utils/app-ui-events'
-import styles from '../sidebar.module.css'
+import { TlaSidebarInlineInput } from './TlaSidebarInlineInput'
 
 export function TlaSidebarRenameInline({
 	fileId,
+	groupId,
 	onClose,
 	source,
 }: {
 	fileId: string
+	groupId: string
 	onClose(): void
 	source: TLAppUiEventSource
 }) {
 	const app = useApp()
-	const ref = useRef<HTMLInputElement>(null)
-	const wasSaved = useRef(false)
 	const trackEvent = useTldrawAppUiEvents()
+	const isPinned = useIsFilePinned(fileId, groupId)
 
-	const handleSave = useCallback(() => {
-		if (wasSaved.current) return
-		// rename the file
-		const elm = ref.current
-		if (!elm) return
-		const name = elm.value.slice(0, 312).trim()
-
-		if (name) {
+	const handleComplete = useCallback(
+		(name: string) => {
 			// Only update the name if there is a name there to update
 			app.updateFile(fileId, { name })
-			wasSaved.current = true
-		}
-		trackEvent('rename-file', { name, source })
-		onClose()
-	}, [app, fileId, onClose, trackEvent, source])
+			trackEvent('rename-file', { name, source })
+			onClose()
+		},
+		[app, fileId, onClose, trackEvent, source]
+	)
 
 	return (
-		<div className={styles.sidebarFileListItemRenameInputWrapper}>
-			<TldrawUiInput
-				ref={ref}
-				data-testid="tla-sidebar-rename-input"
-				className={classNames(styles.sidebarFileListItemRenameInput, 'tla-text_ui__regular')}
-				defaultValue={app.getFileName(fileId)}
-				onComplete={handleSave}
-				onCancel={onClose}
-				onBlur={handleSave}
-				autoSelect
-				autoFocus
-			/>
-		</div>
+		<TlaSidebarInlineInput
+			data-testid="tla-sidebar-rename-input"
+			defaultValue={app.getFileName(fileId)}
+			onComplete={handleComplete}
+			onCancel={onClose}
+			isPinned={isPinned}
+		/>
 	)
 }
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarWorkspaceLink.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarWorkspaceLink.tsx
index 3c4b1592e8a9..9dd4f7826e7f 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarWorkspaceLink.tsx
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarWorkspaceLink.tsx
@@ -4,7 +4,7 @@ import styles from '../sidebar.module.css'
 export function TlaSidebarWorkspaceLink() {
 	return (
 		<div className={styles.sidebarWorkspaceButton} data-testid="tla-sidebar-workspace-link">
-			<TlaLogo />
+			<TlaLogo data-testid="tla-sidebar-logo-icon" />
 		</div>
 	)
 }
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/pinIcon.tsx b/apps/dotcom/client/src/tla/components/TlaSidebar/components/pinIcon.tsx
new file mode 100644
index 000000000000..f84e0c679056
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/pinIcon.tsx
@@ -0,0 +1,36 @@
+export const pinIcon = (
+	<svg
+		style={{
+			position: 'relative',
+			top: '1.5px',
+			left: '0px',
+			flex: '0 0 auto',
+		}}
+		width="7"
+		height="12"
+		viewBox="0 0 7 12"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+	>
+		<line
+			x1="3.5"
+			y1="2.5"
+			x2="3.5"
+			y2="11.5"
+			stroke="var(--tla-color-text-3)"
+			strokeLinecap="round"
+		/>
+		<path
+			d="M1.41401 5.22285C1.50672 5.08364 1.66291 5 1.83017 5H5.15007C5.31647 5 5.47196 5.08277 5.56487 5.22081L6.91103 7.22081C7.13458 7.55294 6.89659 8 6.49624 8H0.498231C0.0989923 8 -0.139225 7.55514 0.0820717 7.22285L1.41401 5.22285Z"
+			fill="var(--tla-color-text-3)"
+		/>
+		<path
+			d="M1.79952 1H5.18129L5.61333 6.00328H1.38672L1.79952 1Z"
+			fill="var(--tla-color-text-3)"
+		/>
+		<path
+			d="M0.64999 0.621484C0.570933 0.305857 0.809629 0 1.13501 0H5.86503C6.19041 0 6.4291 0.305857 6.35005 0.621484L6.09957 1.62148C6.04385 1.84396 5.84391 2 5.61456 2H1.38548C1.15613 2 0.956189 1.84396 0.900464 1.62148L0.64999 0.621484Z"
+			fill="var(--tla-color-text-3)"
+		/>
+	</svg>
+)
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/components/sidebar-shared.ts b/apps/dotcom/client/src/tla/components/TlaSidebar/components/sidebar-shared.ts
index 6f498e5d107c..94b0769a89bc 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/components/sidebar-shared.ts
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/components/sidebar-shared.ts
@@ -3,6 +3,7 @@ import { defineMessages } from '../../../utils/i18n'
 export interface RecentFile {
 	fileId: string
 	date: number
+	isPinned: boolean
 }
 
 export const messages = defineMessages({
@@ -10,4 +11,8 @@ export const messages = defineMessages({
 	toggleSidebar: { defaultMessage: 'Toggle sidebar' },
 	accountMenu: { defaultMessage: 'Account menu' },
 	fileMenu: { defaultMessage: 'File menu' },
+	groupEmpty: {
+		defaultMessage:
+			'Drag files here, <create>create a file</create>, or <invite>copy invite link</invite> to get started.',
+	},
 })
diff --git a/apps/dotcom/client/src/tla/components/TlaSidebar/sidebar.module.css b/apps/dotcom/client/src/tla/components/TlaSidebar/sidebar.module.css
index ff53c9ed9e1a..b784c8939583 100644
--- a/apps/dotcom/client/src/tla/components/TlaSidebar/sidebar.module.css
+++ b/apps/dotcom/client/src/tla/components/TlaSidebar/sidebar.module.css
@@ -82,9 +82,10 @@
 	display: flex;
 	flex-direction: column;
 	flex: 1 1 auto;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding-bottom: 40px;
+	margin: 0px -12px;
+	padding: 2px 12px 40px 12px;
+	overflow-y: scroll;
+	overflow-x: visible;
 	-ms-overflow-style: none; /* IE and Edge */
 	scrollbar-width: none; /* Firefox */
 }
@@ -248,13 +249,13 @@
 	cursor: pointer;
 	position: relative;
 	top: 0.5px;
-	right: -10px;
+	right: -8px;
 	height: 40px;
 	width: 40px;
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	color: var(--tla-color-text-1);
+	color: inherit;
 	flex-shrink: 0;
 	padding: 0px;
 	z-index: 10;
@@ -339,6 +340,7 @@
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	color: var(--tla-color-text-1);
 }
 
 .sidebarUserSettingsIcon {
@@ -413,10 +415,11 @@
 /* ---------------- File link section --------------- */
 
 .sidebarFileSectionWrapper {
-	padding-top: 8px;
+	margin-top: 8px;
 }
 
 .sidebarFileSection {
+	position: relative;
 	background: var(--tla-color-sidebar);
 }
 
@@ -424,11 +427,10 @@
 	position: relative;
 	width: 100%;
 	height: 36px;
-	padding: 0px 8px 0px 8px;
+	padding: 0px 0px 0px 8px;
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	overflow: hidden;
 	gap: 4px;
 	font-weight: bold;
 	color: var(--tla-color-text-3);
@@ -441,7 +443,9 @@
 /* ------------------- File links ------------------- */
 
 .sidebarFileListItem {
-	background-color: var(--tla-color-sidebar);
+	background-color: transparent;
+	/* Chrome hack to enable the drag image to have a transparent background */
+	opacity: 0.999;
 	position: relative;
 	width: 100%;
 	display: flex;
@@ -457,9 +461,13 @@
 	outline-offset: -2px;
 }
 
+.sidebarFileListItem[data-is-dragging='true'] {
+	opacity: 0.5;
+	background: transparent;
+}
+
 .sidebarFileListItemContent {
 	flex: 1 1 auto;
-	overflow: hidden;
 	display: flex;
 	flex-direction: row;
 	align-items: center;
@@ -485,17 +493,32 @@
 .sidebarFileListItemRenameInputWrapper {
 	background-color: var(--tla-color-sidebar);
 	outline: 1px solid var(--tl-color-primary);
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	padding: 0px 8px 0px calc(8px + var(--tla-sidebar-group-item-padding-left, 0px));
 	outline-offset: -2px;
+	gap: 8px;
+	position: relative;
+}
+
+.sidebarFileListItemRenameInputWrapper::before {
+	content: '';
+	position: absolute;
+	bottom: 0px;
+	inset: 0px;
 	border-radius: 6px;
+	background-color: white;
+	border: 1px solid var(--tla-color-primary);
 }
 
-.sidebarFileListItemRenameInputWrapper > div {
+.sidebarFileListItemRenameInputWrapper div:global(.tlui-input__wrapper) {
 	height: 36px;
-	padding: 0px 8px 0px 8px;
 }
 
 .sidebarFileListItemRenameInput {
 	height: 36px;
+	align-self: flex-start;
 	flex: 1 1 auto;
 	white-space: nowrap;
 	overflow: hidden;
@@ -559,7 +582,8 @@
 		display: flex;
 	}
 	:global(.tla:has(.tl-container__focused:not(.tl-container__no-focus-ring)))
-		.sidebarFileListItemMenuTrigger {
+		.sidebarFileListItemMenuTrigger,
+	.sidebarFileListItem[data-is-dragging='true'] .sidebarFileListItemMenuTrigger {
 		visibility: visible;
 		display: flex;
 	}
@@ -710,3 +734,286 @@
 		background-color: var(--tla-color-hover-2);
 	}
 }
+
+/* ------------------- Show all button ------------------- */
+
+.showAllButton {
+	background: none;
+	border: none;
+	padding: 0px 8px 8px;
+	margin-top: 12px;
+	color: var(--tla-color-text-3);
+	font-size: 12px;
+	cursor: pointer;
+	text-decoration: none;
+	white-space: nowrap;
+	border-radius: 4px;
+	flex-shrink: 0;
+	text-align: left;
+	width: 100%;
+}
+
+.sidebarGroupItem .showAllButton {
+	padding-left: calc(8px + var(--tla-sidebar-group-item-padding-left));
+}
+
+.showAllButton:hover {
+	color: var(--tla-color-text-1);
+}
+
+.sidebarFileSectionTitleText {
+	flex: 1 1 auto;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* ------------------- Group Item ------------------- */
+
+.sidebarGroupItem {
+	position: relative;
+	overflow: visible;
+	width: 100%;
+	margin-bottom: 0px;
+	transition: margin-bottom 0.15s cubic-bezier(0.4, 0, 0.2, 1);
+	--tla-sidebar-group-item-padding-left: 8px;
+}
+.sidebarGroupItem .sidebarFileListItemContent {
+	padding-left: var(--tla-sidebar-group-item-padding-left);
+}
+.dropping {
+	position: relative;
+}
+
+.dropping::after {
+	content: '';
+	position: absolute;
+	inset: -2px;
+	border-radius: 6px;
+	border: 2px solid rgba(0, 122, 255, 0.7);
+	pointer-events: none;
+	visibility: visible;
+}
+
+.dropCursorLine {
+	height: 2px;
+	/* translateZ() is required to render at a consistent visual size */
+	transform: translateZ(0) translateY(-50%);
+	will-change: top;
+	background-color: rgba(0, 122, 255, 0.7);
+	border-radius: 1.5px;
+	width: calc(100% - 32px);
+	left: 16px;
+	z-index: 1000;
+	pointer-events: none;
+	position: fixed;
+}
+.sidebarGroupItem[data-state='open'] {
+	margin-bottom: 12px;
+}
+.sidebarGroupItem:has(.sidebarGroupItemHeader:hover)::after,
+.sidebarGroupItem[data-is-empty='true'][data-is-expanded='true'][data-group-index='0']::after,
+.sidebarGroupItem[data-menu-open='true']::after,
+.sidebarGroupItem[data-is-dragging='true']::after {
+	display: block;
+	content: '';
+	position: absolute;
+	top: -2px;
+	left: -4px;
+	right: -4px;
+	bottom: -2px;
+	border-radius: 4px;
+	background-color: var(--tla-color-drop-zone);
+	z-index: 0;
+	pointer-events: none;
+	visibility: visible;
+}
+
+.sidebarGroupItem[data-is-dragging='true'] {
+	opacity: 0.5;
+}
+
+.sidebarGroupItemHeader {
+	background: none;
+	border: none;
+	position: relative;
+	width: 100%;
+	height: 36px;
+	padding: 0px 8px 0px 8px;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: flex-start;
+	overflow: hidden;
+	gap: 8px;
+	cursor: pointer;
+	color: var(--tla-color-text-1);
+}
+
+@media (hover: hover) {
+	.sidebarGroupItemTitle:hover,
+	.sidebarGroupItem[data-is-dragging='true'] .sidebarGroupItemTitle {
+		color: var(--tla-color-text-1);
+	}
+}
+
+.sidebarGroupItemCaret {
+	color: var(--tla-color-text-3);
+	flex: 0 0 16px;
+	width: 16px;
+	height: 16px;
+}
+
+.sidebarGroupItemTitle {
+	display: flex;
+	gap: 8px;
+	align-items: center;
+	padding: 6px 10px 6px 0px;
+	flex: 0 1 auto;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	position: relative;
+	z-index: 1;
+	text-align: left;
+}
+
+.sidebarGroupItemContent {
+	display: flex;
+	flex-direction: column;
+	margin-bottom: 24px;
+}
+
+.sidebarGroupItemButtons {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	gap: 4px;
+	margin-left: auto;
+	opacity: 0;
+	transition: opacity 0.15s ease-in-out;
+}
+
+@media (hover: hover) {
+	.sidebarGroupItem:has(.sidebarGroupItemHeader:hover) .sidebarGroupItemButtons,
+	.sidebarGroupItem[data-menu-open='true'] .sidebarGroupItemButtons,
+	.sidebarGroupItem[data-is-dragging='true'] .sidebarGroupItemButtons {
+		opacity: 1;
+	}
+}
+
+@media (max-width: 767px) {
+	.sidebarGroupItemButtons {
+		opacity: 1;
+	}
+}
+
+.sidebarGroupEmptyStateIcon {
+	margin-left: 2px;
+	margin-right: 1px;
+	scale: 0.8;
+}
+
+.sidebarGroupItemButton {
+	background: none;
+	border: none;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 20px;
+	height: 20px;
+	border-radius: 4px;
+	color: var(--tla-color-text-3);
+	cursor: pointer;
+	position: relative;
+	z-index: 1;
+}
+
+.sidebarGroupItemButton::before {
+	position: absolute;
+	inset: -8px -8px -8px -2px;
+	content: '';
+	pointer-events: auto;
+}
+
+.sidebarGroupItemButton:hover {
+	color: var(--tla-color-text-1);
+}
+
+.sidebarGroupItemButton:focus-visible {
+	outline: 2px solid var(--tla-color-focus);
+	outline-offset: 2px;
+}
+
+.sidebarGroupCreateInput {
+	font-size: 12px !important;
+	line-height: 1.3;
+}
+
+.sidebarGroupCreateInputWrapper {
+	margin-bottom: 8px;
+}
+
+.CollapsibleContent {
+	overflow: hidden;
+}
+
+/* Only animate when not during group reordering */
+.CollapsibleContent[data-state='open'] {
+	animation: slideDown 250ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+.CollapsibleContent[data-state='closed'] {
+	animation: slideUp 250ms cubic-bezier(0.4, 0, 0.2, 1);
+}
+
+@keyframes slideDown {
+	from {
+		height: 0;
+	}
+	to {
+		height: var(--radix-collapsible-content-height);
+	}
+}
+
+@keyframes slideUp {
+	from {
+		height: var(--radix-collapsible-content-height);
+	}
+	to {
+		height: 0;
+	}
+}
+
+.sidebarGroupItemEmpty {
+	color: var(--tla-color-text-3);
+	font-size: 12px;
+	padding: 8px 8px 8px calc(8px + var(--tla-sidebar-group-item-padding-left));
+}
+
+.sidebarGroupItemButtonInline {
+	display: inline-flex;
+	color: var(--tla-color-text-2);
+	align-items: center;
+	justify-content: center;
+	border-radius: 4px;
+	cursor: pointer;
+	position: relative;
+	outline: none;
+	border: none;
+	background: none;
+	margin: 0px;
+	padding: 0px;
+	font-size: 12px;
+	line-height: 1.3;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.sidebarGroupItemButtonInline:hover {
+	color: var(--tla-color-text-1);
+}
+
+[data-no-animation='true'] * {
+	animation-duration: 0s !important;
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/AddFileLinkDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/AddFileLinkDialog.tsx
new file mode 100644
index 000000000000..4e981dead737
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/AddFileLinkDialog.tsx
@@ -0,0 +1,98 @@
+import { useState } from 'react'
+import {
+	TldrawUiButton,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogFooter,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+	TldrawUiInput,
+} from 'tldraw'
+import { useApp } from '../../hooks/useAppState'
+import { useTldrawAppUiEvents } from '../../utils/app-ui-events'
+import { defineMessages, F, useMsg } from '../../utils/i18n'
+import styles from './dialogs.module.css'
+
+const messages = defineMessages({
+	title: { defaultMessage: 'Add file link' },
+	label: { defaultMessage: 'File URL' },
+	placeholder: { defaultMessage: 'Paste tldraw file URL...' },
+	cancel: { defaultMessage: 'Cancel' },
+	add: { defaultMessage: 'Add link' },
+	invalidUrl: { defaultMessage: 'Invalid tldraw file URL' },
+})
+
+function extractFileIdFromUrl(url: string): string | null {
+	try {
+		const urlObj = new URL(url)
+		// Match /f/:fileId pattern
+		const match = urlObj.pathname.match(/^\/f\/([a-zA-Z0-9_-]+)/)
+		return match ? match[1] : null
+	} catch {
+		return null
+	}
+}
+
+export function AddFileLinkDialog({ onClose, groupId }: { onClose(): void; groupId: string }) {
+	const app = useApp()
+	const trackEvent = useTldrawAppUiEvents()
+	const [fileUrl, setFileUrl] = useState('')
+	const [error, setError] = useState(false)
+	const placeholderMsg = useMsg(messages.placeholder)
+
+	const handleAdd = async () => {
+		const fileId = extractFileIdFromUrl(fileUrl)
+		if (fileId) {
+			await app.addFileLinkToGroup(fileId, groupId)
+			trackEvent('add-file-link', { source: 'sidebar' })
+			onClose()
+		} else {
+			setError(true)
+		}
+	}
+
+	const handleValueChange = (value: string) => {
+		setFileUrl(value)
+		setError(false)
+	}
+
+	return (
+		<>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<F {...messages.title} />
+				</TldrawUiDialogTitle>
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody style={{ maxWidth: 350 }}>
+				<div style={{ marginBottom: 16 }}>
+					<label htmlFor="file-url" style={{ display: 'block', marginBottom: 8 }}>
+						<F {...messages.label} />
+					</label>
+					<TldrawUiInput
+						className={styles.dialogInput}
+						value={fileUrl}
+						onValueChange={handleValueChange}
+						onComplete={handleAdd}
+						onCancel={onClose}
+						placeholder={placeholderMsg}
+						autoFocus
+					/>
+					{error && (
+						<div style={{ color: 'var(--color-warn)', marginTop: 8, fontSize: 12 }}>
+							<F {...messages.invalidUrl} />
+						</div>
+					)}
+				</div>
+			</TldrawUiDialogBody>
+			<TldrawUiDialogFooter className="tlui-dialog__footer__actions">
+				<TldrawUiButton type="normal" onClick={onClose}>
+					<F {...messages.cancel} />
+				</TldrawUiButton>
+				<TldrawUiButton type="primary" onClick={handleAdd}>
+					<F {...messages.add} />
+				</TldrawUiButton>
+			</TldrawUiDialogFooter>
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/ConfirmDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/ConfirmDialog.tsx
new file mode 100644
index 000000000000..63d7534ab584
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/ConfirmDialog.tsx
@@ -0,0 +1,54 @@
+import { ReactNode } from 'react'
+import {
+	TldrawUiButton,
+	TldrawUiButtonLabel,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogFooter,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+} from 'tldraw'
+
+export function ConfirmDialog({
+	title,
+	description,
+	confirmLabel,
+	cancelLabel,
+	confirmType = 'primary',
+	onConfirm,
+	onClose,
+}: {
+	title: ReactNode
+	description: ReactNode
+	confirmLabel: ReactNode
+	cancelLabel: ReactNode
+	confirmType?: 'primary' | 'danger' | 'normal'
+	onConfirm(): void | Promise<void>
+	onClose(): void
+}) {
+	return (
+		<>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>{title}</TldrawUiDialogTitle>
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody style={{ maxWidth: 300 }}>
+				<p>{description}</p>
+			</TldrawUiDialogBody>
+			<TldrawUiDialogFooter className="tlui-dialog__footer__actions">
+				<TldrawUiButton type="normal" onClick={onClose}>
+					<TldrawUiButtonLabel>{cancelLabel}</TldrawUiButtonLabel>
+				</TldrawUiButton>
+				<TldrawUiButton
+					type={confirmType}
+					onClick={async () => {
+						await onConfirm()
+						onClose()
+					}}
+				>
+					<TldrawUiButtonLabel>{confirmLabel}</TldrawUiButtonLabel>
+				</TldrawUiButton>
+			</TldrawUiDialogFooter>
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/CreateGroupDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/CreateGroupDialog.tsx
new file mode 100644
index 000000000000..9dd9f79773b2
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/CreateGroupDialog.tsx
@@ -0,0 +1,73 @@
+import { useState } from 'react'
+import {
+	TldrawUiButton,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogFooter,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+	TldrawUiInput,
+} from 'tldraw'
+import { defineMessages, F, useMsg } from '../../utils/i18n'
+import styles from './dialogs.module.css'
+
+const messages = defineMessages({
+	title: { defaultMessage: 'Create group' },
+	name: { defaultMessage: 'Name' },
+	placeholder: { defaultMessage: 'Group name' },
+	cancel: { defaultMessage: 'Cancel' },
+	create: { defaultMessage: 'Create group' },
+})
+
+interface CreateGroupDialogProps {
+	onClose(): void
+	onCreate(name: string): void
+}
+
+export function CreateGroupDialog({ onClose, onCreate }: CreateGroupDialogProps) {
+	const [groupName, setGroupName] = useState('')
+	const placeholderMsg = useMsg(messages.placeholder)
+
+	const handleCreate = () => {
+		const trimmedName = groupName.trim()
+		if (trimmedName) {
+			onCreate(trimmedName)
+			onClose()
+		}
+	}
+
+	return (
+		<>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<F {...messages.title} />
+				</TldrawUiDialogTitle>
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody style={{ maxWidth: 350 }}>
+				<div style={{ marginBottom: 16 }}>
+					<label htmlFor="group-name" style={{ display: 'block', marginBottom: 8 }}>
+						<F {...messages.name} />
+					</label>
+					<TldrawUiInput
+						className={styles.dialogInput}
+						value={groupName}
+						onValueChange={setGroupName}
+						onComplete={handleCreate}
+						onCancel={onClose}
+						placeholder={placeholderMsg}
+						autoFocus
+					/>
+				</div>
+			</TldrawUiDialogBody>
+			<TldrawUiDialogFooter className="tlui-dialog__footer__actions">
+				<TldrawUiButton type="normal" onClick={onClose}>
+					<F {...messages.cancel} />
+				</TldrawUiButton>
+				<TldrawUiButton type="primary" onClick={handleCreate}>
+					<F {...messages.create} />
+				</TldrawUiButton>
+			</TldrawUiDialogFooter>
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/GroupSettingsDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/GroupSettingsDialog.tsx
new file mode 100644
index 000000000000..1b044f09ec0e
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/GroupSettingsDialog.tsx
@@ -0,0 +1,383 @@
+import { Tooltip as _Tooltip } from 'radix-ui'
+import { MouseEvent, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
+import {
+	TldrawUiButton,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+	TldrawUiInput,
+	TldrawUiTooltip,
+	useDialogs,
+	useValue,
+} from 'tldraw'
+import { routes } from '../../../routeDefs'
+import { useApp } from '../../hooks/useAppState'
+import { useCurrentFileId } from '../../hooks/useCurrentFileId'
+import { defineMessages, F, useMsg } from '../../utils/i18n'
+import { TlaButton } from '../TlaButton/TlaButton'
+import { TlaIcon } from '../TlaIcon/TlaIcon'
+import { ConfirmDialog } from './ConfirmDialog'
+import styles from './dialogs.module.css'
+
+const messages = defineMessages({
+	title: { defaultMessage: 'Group settings' },
+	name: { defaultMessage: 'Name' },
+	namePlaceholder: { defaultMessage: 'Group name' },
+	inviteMembers: { defaultMessage: 'Invite members' },
+	regenerateInviteLinkHelp: {
+		defaultMessage: 'Revoke this link and create a new one.',
+	},
+	copyInviteLink: { defaultMessage: 'Copy invite link' },
+	members: { defaultMessage: 'Members' },
+	owner: { defaultMessage: 'Owner' },
+	admin: { defaultMessage: 'Admin' },
+	you: { defaultMessage: 'you' },
+	dangerZone: { defaultMessage: 'Danger zone' },
+	leaveGroup: { defaultMessage: 'Leave group…' },
+	deleteGroup: { defaultMessage: 'Delete group…' },
+	save: { defaultMessage: 'Save' },
+	cancel: { defaultMessage: 'Cancel' },
+	confirmLeave: { defaultMessage: 'Are you sure you want to leave this group?' },
+	confirmDelete: {
+		defaultMessage: 'Are you sure you want to delete this group? This action cannot be undone.',
+	},
+	leaveAction: { defaultMessage: 'Leave group' },
+	deleteAction: { defaultMessage: 'Delete group' },
+})
+
+interface GroupSettingsDialogProps {
+	groupId: string
+	onClose(): void
+}
+
+export function GroupSettingsDialog({ groupId, onClose }: GroupSettingsDialogProps) {
+	const app = useApp()
+	const { addDialog } = useDialogs()
+	const [isRegenerating, setIsRegenerating] = useState(false)
+	const [copiedInviteLink, setCopiedInviteLink] = useState(false)
+	const [showRefreshSuccess, setShowRefreshSuccess] = useState(false)
+
+	const namePlaceholderMsg = useMsg(messages.namePlaceholder)
+	const ownerMsg = useMsg(messages.owner)
+	const adminMsg = useMsg(messages.admin)
+	const youMsg = useMsg(messages.you)
+
+	// Get group data
+	const groupMembership = useValue('groupMembership', () => app.getGroupMembership(groupId), [
+		app,
+		groupId,
+	])
+	const currentFileId = useCurrentFileId()
+	const navigate = useNavigate()
+
+	if (!groupMembership) return null
+	const group = groupMembership.group
+	const currentUser = groupMembership.groupMembers.find(
+		(member) => member.userId === app.getUser().id
+	)
+	const isOwner = currentUser?.role === 'owner'
+	const canDelete = isOwner
+	const canLeave =
+		!isOwner || groupMembership.groupMembers.filter((member) => member.role === 'owner').length > 1
+	const ownersCount = groupMembership.groupMembers.filter((m) => m.role === 'owner').length
+
+	const handleCopyInviteLink = async () => {
+		if (copiedInviteLink) return
+		app.copyGroupInvite(groupId, false)
+		setCopiedInviteLink(true)
+		setTimeout(() => setCopiedInviteLink(false), 1000)
+	}
+
+	const handleRegenerateInviteLink = async (e: MouseEvent<HTMLButtonElement>) => {
+		e.preventDefault()
+		setIsRegenerating(true)
+		try {
+			await app.z.mutate.regenerateGroupInviteSecret({ id: groupId }).server
+			setShowRefreshSuccess(true)
+			setTimeout(() => setShowRefreshSuccess(false), 1000)
+		} finally {
+			setIsRegenerating(false)
+		}
+	}
+
+	const handleLeaveGroup = async () => {
+		try {
+			await app.z.mutate.leaveGroup({ groupId }).client
+			onClose()
+		} catch (error) {
+			console.error('Error leaving group:', error)
+		}
+	}
+
+	const handleDeleteGroup = async () => {
+		try {
+			const isCurrentlyOnAFileInThisGroup =
+				currentFileId && app.getFile(currentFileId)?.owningGroupId === groupId
+			await app.z.mutate.deleteGroup({ id: groupId }).client
+			onClose()
+			if (isCurrentlyOnAFileInThisGroup) {
+				navigate('/')
+			}
+		} catch (error) {
+			console.error('Error deleting group:', error)
+		}
+	}
+
+	const openLeaveConfirmDialog = () => {
+		addDialog({
+			component: ({ onClose }) => (
+				<ConfirmDialog
+					title={<F {...messages.leaveAction} />}
+					description={<F {...messages.confirmLeave} />}
+					confirmLabel={<F {...messages.leaveAction} />}
+					cancelLabel={<F {...messages.cancel} />}
+					confirmType="danger"
+					onConfirm={handleLeaveGroup}
+					onClose={onClose}
+				/>
+			),
+		})
+	}
+
+	const openDeleteConfirmDialog = () => {
+		addDialog({
+			component: ({ onClose }) => (
+				<ConfirmDialog
+					title={<F {...messages.deleteAction} />}
+					description={<F {...messages.confirmDelete} />}
+					confirmLabel={<F {...messages.deleteAction} />}
+					cancelLabel={<F {...messages.cancel} />}
+					confirmType="danger"
+					onConfirm={handleDeleteGroup}
+					onClose={onClose}
+				/>
+			),
+		})
+	}
+
+	if (!group || !groupMembership) {
+		return null
+	}
+
+	const inviteUrl = group.inviteSecret ? routes.tlaInvite(group.inviteSecret, { asUrl: true }) : ''
+
+	return (
+		<_Tooltip.Provider>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<F {...messages.title} />
+				</TldrawUiDialogTitle>
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody className={styles.groupSettingsBody}>
+				{/* Name Section */}
+				<div className={styles.section}>
+					<div className={styles.sectionLabel}>
+						<F {...messages.name} />
+					</div>
+					<TldrawUiInput
+						className={styles.dialogInput}
+						defaultValue={group.name}
+						onValueChange={(value) => {
+							const name = value.trim()
+							if (name && name !== group.name) {
+								app.z.mutate.updateGroup({ id: groupId, name })
+							}
+						}}
+						placeholder={namePlaceholderMsg}
+					/>
+				</div>
+
+				{/* Invite Members Section */}
+				<div className={styles.section}>
+					<div className={styles.sectionLabel}>
+						<F {...messages.inviteMembers} />
+					</div>
+					<div className={`${styles.inviteInputContainer} tlui-input--disabled`}>
+						<input
+							className={`${styles.noPadding} tlui-input`}
+							value={inviteUrl}
+							readOnly
+							onBlur={() => {
+								window.getSelection()?.collapseToEnd()
+							}}
+							onMouseDown={(e) => {
+								e.preventDefault()
+								;(e.target as HTMLInputElement).select()
+							}}
+						/>
+						<TldrawUiTooltip content={<F {...messages.regenerateInviteLinkHelp} />}>
+							<TldrawUiButton
+								type="normal"
+								aria-label="Regenerate invite link"
+								onClick={handleRegenerateInviteLink}
+								disabled={isRegenerating}
+								style={{
+									transform: 'scale(0.9)',
+								}}
+							>
+								<TlaIcon
+									icon={showRefreshSuccess ? 'check' : 'refresh'}
+									className={showRefreshSuccess ? styles.disabledIcon : undefined}
+								/>
+							</TldrawUiButton>
+						</TldrawUiTooltip>
+					</div>
+					<TlaButton
+						iconRight={copiedInviteLink ? 'check' : 'copy'}
+						iconRightClassName={styles.copyInviteLinkIconRight}
+						variant="primary"
+						onClick={handleCopyInviteLink}
+					>
+						<F {...messages.copyInviteLink} />
+					</TlaButton>
+				</div>
+
+				{/* Members Section */}
+				<hr className={styles.divider} />
+				<div className={styles.section}>
+					<label className={styles.sectionLabelLarge}>
+						<F {...messages.members} />{' '}
+						<span className={styles.memberCount}>{
+							// eslint-disable-next-line react/jsx-no-literals
+							`(${groupMembership.groupMembers.length})`
+						}</span>
+					</label>
+					<div className={styles.membersList}>
+						{[...groupMembership.groupMembers]
+							.sort((a, b) => {
+								const currentId = app.getUser().id
+								if (a.userId === currentId && b.userId !== currentId) return -1
+								if (b.userId === currentId && a.userId !== currentId) return 1
+								return 0
+							})
+							.map((member) => (
+								<div key={member.userId} className={styles.memberItem}>
+									<div
+										className={styles.memberAvatar}
+										style={{
+											backgroundColor: member.userColor || '#ff6b35',
+										}}
+									>
+										{member.userName.charAt(0).toUpperCase()}
+									</div>
+									<span className={styles.memberName}>
+										{member.userName}
+										{member.userId === app.getUser().id ? ` (${youMsg})` : ''}
+									</span>
+									{isOwner && member.userId !== app.getUser().id ? (
+										<MemberRoleSelect
+											value={member.role}
+											disabled={member.role === 'owner' && ownersCount <= 1}
+											ownerLabel={ownerMsg}
+											adminLabel={adminMsg}
+											onChange={async (value) => {
+												if (value === member.role) return
+												if (member.role === 'owner' && value === 'admin' && ownersCount <= 1) return
+												try {
+													await app.z.mutate.setGroupMemberRole({
+														groupId,
+														targetUserId: member.userId,
+														role: value,
+													}).client
+												} catch (err) {
+													console.error('Failed to change member role', err)
+												}
+											}}
+										/>
+									) : (
+										<span className={styles.memberRole}>
+											{member.role === 'owner' ? ownerMsg : adminMsg}
+										</span>
+									)}
+									{/* {isOwner && member.userId !== app.getUser().id ? (
+									<TlaMenuSelect<'owner' | 'admin'>
+										label={member.role === 'owner' ? ownerMsg : adminMsg}
+										value={member.role}
+										disabled={member.role === 'owner' && ownersCount <= 1}
+										onChange={async (value) => {
+											if (value === member.role) return
+											if (member.role === 'owner' && value === 'admin' && ownersCount <= 1) {
+												return
+											}
+											try {
+												await app.z.mutate.group.setMemberRole({
+													groupId,
+													targetUserId: member.userId,
+													role: value,
+												})
+											} catch (err) {
+												console.error('Failed to change member role', err)
+											}
+										}}
+										options={[
+											{ value: 'admin', label: adminMsg },
+											{ value: 'owner', label: ownerMsg },
+										]}
+									/>
+								) : (
+									<span className={styles.memberRole}>
+										{member.role === 'owner' ? ownerMsg : adminMsg}
+									</span>
+								)} */}
+								</div>
+							))}
+					</div>
+				</div>
+
+				{/* Danger Zone */}
+				<hr className={styles.divider} />
+				<div>
+					<label className={styles.sectionLabelLarge}>
+						<F {...messages.dangerZone} />
+					</label>
+					<div className={styles.dangerZoneActions}>
+						{canLeave && (
+							<button className={styles.inlineButton} onClick={openLeaveConfirmDialog}>
+								<F {...messages.leaveGroup} />
+							</button>
+						)}
+						{canDelete && (
+							<button className={styles.inlineButton} onClick={openDeleteConfirmDialog}>
+								<F {...messages.deleteGroup} />
+							</button>
+						)}
+					</div>
+				</div>
+
+				{/* Confirmation handled via tldraw dialogs */}
+			</TldrawUiDialogBody>
+		</_Tooltip.Provider>
+	)
+}
+
+function MemberRoleSelect({
+	value,
+	onChange,
+	disabled,
+	ownerLabel,
+	adminLabel,
+}: {
+	value: 'owner' | 'admin'
+	onChange(v: 'owner' | 'admin'): void
+	disabled?: boolean
+	ownerLabel: string
+	adminLabel: string
+}) {
+	return (
+		<div className={styles.selectWrapper}>
+			<TlaIcon icon="chevron-down" className={styles.menuSelectChevron} />
+			<select
+				className={styles.select}
+				value={value}
+				disabled={disabled}
+				onChange={(e) => onChange(e.currentTarget.value as 'owner' | 'admin')}
+			>
+				<option value="owner">{ownerLabel}</option>
+				<option value="admin">{adminLabel}</option>
+			</select>
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/SubmitFeedbackDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/SubmitFeedbackDialog.tsx
index 1738f1bc0f18..d3dc588846b5 100644
--- a/apps/dotcom/client/src/tla/components/dialogs/SubmitFeedbackDialog.tsx
+++ b/apps/dotcom/client/src/tla/components/dialogs/SubmitFeedbackDialog.tsx
@@ -50,12 +50,18 @@ function SignedOutSubmitFeedbackDialog() {
 				</p>
 				<ul>
 					<li>
-						<ExternalLink to="https://discord.tldraw.com/?utm_source=dotcom&utm_medium=organic&utm_campaign=dotcom-feedback">
+						<ExternalLink
+							eventName="menu-feedback-discord-link-clicked"
+							to="https://discord.tldraw.com/?utm_source=dotcom&utm_medium=organic&utm_campaign=dotcom-feedback"
+						>
 							<F defaultMessage="Chat with us on Discord" />
 						</ExternalLink>
 					</li>
 					<li>
-						<ExternalLink to="https://github.com/tldraw/tldraw/issues">
+						<ExternalLink
+							eventName="menu-feedback-github-link-clicked"
+							to="https://github.com/tldraw/tldraw/issues"
+						>
 							<F defaultMessage="Submit an issue on GitHub" />
 						</ExternalLink>
 					</li>
@@ -125,14 +131,22 @@ function SignedInSubmitFeedbackDialog({ onClose }: { onClose(): void }) {
 						values={{
 							discord: (chunks) => {
 								return (
-									<ExternalLink to="https://discord.tldraw.com/?utm_source=dotcom&utm_medium=organic&utm_campaign=dotcom-feedback">
+									<ExternalLink
+										eventName="menu-feedback-discord-link-clicked"
+										to="https://discord.tldraw.com/?utm_source=dotcom&utm_medium=organic&utm_campaign=dotcom-feedback"
+									>
 										{chunks}
 									</ExternalLink>
 								)
 							},
 							github: (chunks) => {
 								return (
-									<ExternalLink to="https://github.com/tldraw/tldraw/issues">{chunks}</ExternalLink>
+									<ExternalLink
+										eventName="menu-feedback-github-link-clicked"
+										to="https://github.com/tldraw/tldraw/issues"
+									>
+										{chunks}
+									</ExternalLink>
 								)
 							},
 						}}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaCookieConsent.tsx b/apps/dotcom/client/src/tla/components/dialogs/TlaCookieConsent.tsx
index ed1be5e292fa..6d8ea68b8424 100644
--- a/apps/dotcom/client/src/tla/components/dialogs/TlaCookieConsent.tsx
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaCookieConsent.tsx
@@ -1,5 +1,6 @@
+import { fetch } from '@tldraw/utils'
 import classNames from 'classnames'
-import { memo, useCallback } from 'react'
+import { memo, useCallback, useEffect, useState } from 'react'
 import { useDialogs, useValue } from 'tldraw'
 import { useAnalyticsConsent } from '../../hooks/useAnalyticsConsent'
 import { F } from '../../utils/i18n'
@@ -8,6 +9,31 @@ import { TlaManageCookiesDialog } from './TlaManageCookiesDialog'
 
 const MANAGE_COOKIES_DIALOG = 'manageCookiesDialog'
 
+type ConsentCheckResult = 'requires-consent' | 'no-consent-needed'
+
+/**
+ * Checks if consent is required based on CloudFlare geolocation headers
+ * @returns Promise<'requires-consent' | 'no-consent-needed'> - 'requires-consent' if explicit consent is required, 'no-consent-needed' if confident it's not
+ */
+async function shouldRequireConsent(): Promise<ConsentCheckResult> {
+	try {
+		const response = await fetch('https://consent.tldraw.xyz')
+		if (response.ok) {
+			const data = await response.json()
+			// Worker returns { requires_consent: boolean, country_code: string }
+			if (typeof data.requires_consent === 'boolean') {
+				return data.requires_consent ? 'requires-consent' : 'no-consent-needed'
+			}
+		}
+	} catch (error) {
+		// Fetch failed or timed out - will default to requiring consent
+		console.warn('Consent check failed, defaulting to requiring consent:', error)
+	}
+
+	// Conservative default: require consent
+	return 'requires-consent'
+}
+
 export const TlaCookieConsent = memo(function TlaCookieConsent() {
 	const { addDialog, dialogs } = useDialogs()
 	const isManageCookiesDialogShown = useValue(
@@ -16,6 +42,21 @@ export const TlaCookieConsent = memo(function TlaCookieConsent() {
 		[dialogs]
 	)
 	const [consent, updateConsent] = useAnalyticsConsent()
+	const [requiresConsent, setRequiresConsent] = useState<ConsentCheckResult | null>(null)
+
+	// Check if consent is required based on user's location
+	useEffect(() => {
+		if (consent !== null) return
+
+		shouldRequireConsent().then((value: ConsentCheckResult) => {
+			setRequiresConsent(value)
+
+			// Only update consent if it's not required
+			if (value === 'no-consent-needed') {
+				updateConsent(true /* opted-in b/c region doesn't require explicit consent */)
+			}
+		})
+	}, [consent, updateConsent])
 
 	const handleAccept = useCallback(() => {
 		updateConsent(true)
@@ -32,10 +73,22 @@ export const TlaCookieConsent = memo(function TlaCookieConsent() {
 		})
 	}, [addDialog])
 
-	if (consent !== null || isManageCookiesDialogShown) return null
+	// Don't show banner if:
+	if (
+		// - User has already made a consent choice
+		consent !== null ||
+		// - We haven't determined if consent is required yet
+		requiresConsent === null ||
+		// - Consent is not required in user's region
+		requiresConsent === 'no-consent-needed'
+	)
+		return null
 
 	return (
-		<div className={styles.cookieConsentWrapper}>
+		<div
+			className={styles.cookieConsentWrapper}
+			style={{ opacity: isManageCookiesDialogShown ? 0 : 1 }} // If the manage cookies dialog is shown, hide the cookie consent banner but don't remove it or else the animation will replay when it reappears
+		>
 			<div className={styles.cookieConsent} data-testid="tla-cookie-consent">
 				<p className={styles.cookieText}>
 					<F defaultMessage="This site uses cookies to make the app work and to collect analytics." />
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaDeleteFileDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/TlaDeleteFileDialog.tsx
index 0f810ac68083..b9a31cdcb826 100644
--- a/apps/dotcom/client/src/tla/components/dialogs/TlaDeleteFileDialog.tsx
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaDeleteFileDialog.tsx
@@ -12,24 +12,32 @@ import {
 } from 'tldraw'
 import { routes } from '../../../routeDefs'
 import { useApp } from '../../hooks/useAppState'
-import { useIsFileOwner } from '../../hooks/useIsFileOwner'
+import { useHasFileAdminRights } from '../../hooks/useIsFileOwner'
 import { useTldrawAppUiEvents } from '../../utils/app-ui-events'
 import { F } from '../../utils/i18n'
 
-export function TlaDeleteFileDialog({ fileId, onClose }: { fileId: string; onClose(): void }) {
+export function TlaDeleteFileDialog({
+	fileId,
+	groupId,
+	onClose,
+}: {
+	fileId: string
+	groupId: string
+	onClose(): void
+}) {
 	const app = useApp()
 	const navigate = useNavigate()
 	const trackEvent = useTldrawAppUiEvents()
 	const auth = useAuth()
 
-	const isOwner = useIsFileOwner(fileId)
+	const isOwner = useHasFileAdminRights(fileId)
 
 	const handleDelete = useCallback(async () => {
 		const token = await auth.getToken()
 		if (!token) throw new Error('No token')
 		trackEvent('delete-file', { source: 'file-menu' })
-		await app.deleteOrForgetFile(fileId)
-		const recentFiles = app.getUserRecentFiles()
+		await app.deleteOrForgetFile(fileId, groupId)
+		const recentFiles = app.getMyFiles()
 		if (recentFiles.length === 0) {
 			const result = await app.createFile()
 			if (result.ok) {
@@ -39,7 +47,7 @@ export function TlaDeleteFileDialog({ fileId, onClose }: { fileId: string; onClo
 			navigate(routes.tlaFile(recentFiles[0].fileId))
 		}
 		onClose()
-	}, [auth, app, fileId, onClose, navigate, trackEvent])
+	}, [auth, app, fileId, groupId, onClose, navigate, trackEvent])
 
 	return (
 		<>
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaInviteDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/TlaInviteDialog.tsx
new file mode 100644
index 000000000000..b4addda04c13
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaInviteDialog.tsx
@@ -0,0 +1,81 @@
+import { GetInviteInfoResponseBody } from '@tldraw/dotcom-shared'
+import { useState } from 'react'
+import {
+	TldrawUiButton,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+} from 'tldraw'
+import { useMaybeApp } from '../../hooks/useAppState'
+import { defineMessages, F } from '../../utils/i18n'
+import { TlaCtaButton } from '../TlaCtaButton/TlaCtaButton'
+
+const messages = defineMessages({
+	inviteDialogTitle: {
+		defaultMessage: 'You have been invited to join group:',
+	},
+})
+
+export function TlaInviteDialog({
+	inviteInfo,
+	onClose,
+}: {
+	inviteInfo: Extract<GetInviteInfoResponseBody, { error: false }>
+	onClose(): void
+}) {
+	const app = useMaybeApp()
+	const [isAccepting, setIsAccepting] = useState(false)
+
+	return (
+		<>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<span />
+				</TldrawUiDialogTitle>
+				<div style={{ flex: 1 }} />
+				<TldrawUiDialogCloseButton />
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody
+				style={{
+					textAlign: 'center',
+					display: 'flex',
+					flexDirection: 'column',
+					alignItems: 'center',
+					gap: '16px',
+				}}
+			>
+				<img
+					width={36}
+					height={36}
+					src="/tldraw-white-on-black.svg"
+					loading="lazy"
+					role="presentation"
+				/>
+
+				<div style={{ fontSize: '16px' }}>
+					<F {...messages.inviteDialogTitle} /> {inviteInfo.groupName}
+				</div>
+
+				<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+					<TlaCtaButton
+						disabled={isAccepting}
+						onClick={async () => {
+							if (!app) return
+							setIsAccepting(true)
+							await app.acceptGroupInvite(inviteInfo.inviteSecret).finally(() => {
+								setIsAccepting(false)
+							})
+							onClose()
+						}}
+					>
+						<F defaultMessage="Accept and join group" />
+					</TlaCtaButton>
+					<TldrawUiButton type="normal" onClick={() => onClose()}>
+						<F defaultMessage="No thanks" />
+					</TldrawUiButton>
+				</div>
+			</TldrawUiDialogBody>
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaLegalAcceptance.tsx b/apps/dotcom/client/src/tla/components/dialogs/TlaLegalAcceptance.tsx
new file mode 100644
index 000000000000..91d285f44075
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaLegalAcceptance.tsx
@@ -0,0 +1,125 @@
+import { useUser } from '@clerk/clerk-react'
+import classNames from 'classnames'
+import { useCallback, useRef, useState } from 'react'
+import { TldrawUiDialogBody, TldrawUiDialogHeader, TldrawUiDialogTitle } from 'tldraw'
+import { useAnalyticsConsent } from '../../hooks/useAnalyticsConsent'
+import { F } from '../../utils/i18n'
+import { TlaMenuSwitch } from '../tla-menu/tla-menu'
+import { TlaCtaButton } from '../TlaCtaButton/TlaCtaButton'
+import { TlaLogo } from '../TlaLogo/TlaLogo'
+import styles from './auth.module.css'
+
+export function TlaLegalAcceptance({ onClose }: { onClose(): void }) {
+	const { user } = useUser()
+	const [currentConsent, updateAnalyticsConsent] = useAnalyticsConsent()
+	const [analyticsOptIn, setAnalyticsOptIn] = useState(currentConsent)
+	const initialAnalyticsOptIn = useRef(analyticsOptIn)
+	const showAnalyticsToggle = initialAnalyticsOptIn.current !== true
+
+	const [isSubmitting, setIsSubmitting] = useState(false)
+	const [error, setError] = useState<string | null>(null)
+
+	const handleContinue = useCallback(async () => {
+		if (isSubmitting) return
+
+		setIsSubmitting(true)
+		setError(null)
+
+		try {
+			if (!user) return
+
+			// Persist analytics choice before redirecting
+			if (analyticsOptIn !== null) {
+				updateAnalyticsConsent(analyticsOptIn)
+			}
+
+			// Store acceptance in user metadata
+			await user.update({
+				unsafeMetadata: {
+					...user.unsafeMetadata,
+					legal_accepted_at: new Date().toISOString(),
+				},
+			} as any)
+			await user.reload()
+
+			onClose()
+		} catch (_e: any) {
+			const e = _e as any
+			setError(
+				e?.errors?.[0]?.longMessage ||
+					e?.errors?.[0]?.message ||
+					e?.message ||
+					'Something went wrong'
+			)
+		} finally {
+			setIsSubmitting(false)
+		}
+	}, [isSubmitting, onClose, analyticsOptIn, updateAnalyticsConsent, user])
+
+	return (
+		<div className={styles.authContainer}>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<span />
+				</TldrawUiDialogTitle>
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody className={styles.authBody}>
+				<div className={styles.authLogoWrapper}>
+					<div className={styles.authLogo}>
+						<TlaLogo />
+					</div>
+				</div>
+
+				<p className={styles.authDescription}>
+					<F
+						defaultMessage="Before you start, please accept our <tos>terms of use</tos> and <privacy>privacy policy</privacy>."
+						values={{
+							tos: (chunks) => (
+								<a href="/tos.html" target="_blank" rel="noopener noreferrer">
+									{chunks}
+								</a>
+							),
+							privacy: (chunks) => (
+								<a href="/privacy.html" target="_blank" rel="noopener noreferrer">
+									{chunks}
+								</a>
+							),
+						}}
+					/>
+				</p>
+
+				{showAnalyticsToggle && (
+					<label className={styles.authCheckboxLabel}>
+						<span>
+							<F
+								defaultMessage="Allow <cookies>analytics</cookies> to help us improve tldraw."
+								values={{
+									cookies: (chunks) => (
+										<a href="/cookies.html" target="_blank" rel="noopener noreferrer">
+											{chunks}
+										</a>
+									),
+								}}
+							/>
+						</span>
+						<TlaMenuSwitch
+							id="tla-analytics-switch"
+							checked={!!analyticsOptIn}
+							onChange={(checked) => setAnalyticsOptIn(checked)}
+						/>
+					</label>
+				)}
+
+				{error && <div className={styles.authError}>{error}</div>}
+				<TlaCtaButton
+					data-testid="tla-accept-and-continue-button"
+					onClick={handleContinue}
+					disabled={isSubmitting}
+					className={classNames(styles.authCtaButton, styles.authTermsAcceptAndContinueButton)}
+				>
+					<F defaultMessage="Accept and continue" />
+				</TlaCtaButton>
+			</TldrawUiDialogBody>
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaManageCookiesDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/TlaManageCookiesDialog.tsx
index b8dac224e632..a6575641ace7 100644
--- a/apps/dotcom/client/src/tla/components/dialogs/TlaManageCookiesDialog.tsx
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaManageCookiesDialog.tsx
@@ -16,7 +16,7 @@ import {
 } from '../tla-menu/tla-menu'
 import styles from './dialogs.module.css'
 
-const COOKIE_POLICY_URL = 'https://tldraw.notion.site/cookie-policy'
+const COOKIE_POLICY_URL = '/cookies.html'
 
 export function TlaManageCookiesDialog() {
 	const [consent, updateConsent] = useAnalyticsConsent()
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaSignInDialog.todo.md b/apps/dotcom/client/src/tla/components/dialogs/TlaSignInDialog.todo.md
new file mode 100644
index 000000000000..76122b2e1ec9
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaSignInDialog.todo.md
@@ -0,0 +1,8 @@
+# TlaSignInDialog TODO
+
+- [x] Surface Clerk errors on the terms acceptance step so users see failures.
+- [x] Disable the “Accept and continue” action while the legal acceptance request is pending.
+- [x] Show analytics toggle unless the user was already opted in when the dialog mounted (allowing toggling during the session).
+- [x] Prevent duplicate email submissions by guarding the form’s submit handler and button state.
+- [x] Add resend cooldown/error handling so the verification step treats resend like other actions.
+- [x] Only show the terms step when Clerk reports `legal_accepted` as missing to avoid spurious sign-up updates.
diff --git a/apps/dotcom/client/src/tla/components/dialogs/TlaSignInDialog.tsx b/apps/dotcom/client/src/tla/components/dialogs/TlaSignInDialog.tsx
new file mode 100644
index 000000000000..4d1f440bdcc1
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/TlaSignInDialog.tsx
@@ -0,0 +1,508 @@
+import { useClerk, useSignIn } from '@clerk/clerk-react'
+import { GetInviteInfoResponseBody } from '@tldraw/dotcom-shared'
+import classNames from 'classnames'
+import { ChangeEvent, ReactNode, useCallback, useEffect, useState, type FormEvent } from 'react'
+import {
+	exhaustiveSwitchError,
+	TldrawUiDialogBody,
+	TldrawUiDialogCloseButton,
+	TldrawUiDialogHeader,
+	TldrawUiDialogTitle,
+} from 'tldraw'
+import { routes } from '../../../routeDefs'
+import { defineMessages, F, useMsg } from '../../utils/i18n'
+import { TlaCtaButton } from '../TlaCtaButton/TlaCtaButton'
+import { TlaLogo } from '../TlaLogo/TlaLogo'
+import styles from './auth.module.css'
+
+const messages = defineMessages({
+	enterEmailAddress: { defaultMessage: 'Enter your email address' },
+	inviteMessage: {
+		defaultMessage: 'You have been invited to join group:',
+	},
+})
+
+export function TlaSignInDialog({
+	onClose,
+	inviteInfo,
+	onInviteAccepted,
+}: {
+	onClose?(): void
+	inviteInfo?: Extract<GetInviteInfoResponseBody, { error: false }>
+	onInviteAccepted?(): void
+}) {
+	const [stage, setStage] = useState<'enterEmail' | 'enterCode'>('enterEmail')
+	const [identifier, setIdentifier] = useState('')
+	const [isSignUpFlow, setIsSignUpFlow] = useState(false)
+	const [emailAddressId, setEmailAddressId] = useState<string | undefined>(undefined)
+
+	let innerContent: ReactNode
+
+	switch (stage) {
+		case 'enterEmail':
+			innerContent = (
+				<TlaEnterEmailStep
+					onClose={onClose}
+					inviteInfo={inviteInfo}
+					onComplete={(identifier, isSignUp, emailId) => {
+						setIdentifier(identifier)
+						setIsSignUpFlow(isSignUp)
+						setEmailAddressId(emailId)
+						setStage('enterCode')
+					}}
+				/>
+			)
+			break
+		case 'enterCode':
+			innerContent = (
+				<TlaVerificationCodeStep
+					identifier={identifier}
+					isSignUpFlow={isSignUpFlow}
+					emailAddressId={emailAddressId}
+					onComplete={() => {
+						onInviteAccepted?.()
+						onClose?.()
+					}}
+					onClose={onClose}
+				/>
+			)
+			break
+		default:
+			throw exhaustiveSwitchError(stage)
+	}
+
+	return (
+		<div className={styles.authContainer}>
+			<TldrawUiDialogHeader>
+				<TldrawUiDialogTitle>
+					<span />
+				</TldrawUiDialogTitle>
+				{onClose && <TldrawUiDialogCloseButton />}
+			</TldrawUiDialogHeader>
+			<TldrawUiDialogBody className={styles.authDialogBody}>
+				<div className={styles.authBody}>{innerContent}</div>
+
+				{/* Clerk's CAPTCHA widget */}
+				<div id="clerk-captcha" className={styles.clerkCaptcha} />
+			</TldrawUiDialogBody>
+		</div>
+	)
+}
+
+function TlaEnterEmailStep({
+	onClose,
+	onComplete,
+	inviteInfo,
+}: {
+	onClose?(): void
+	onComplete(identifier: string, isSignUpFlow: boolean, emailAddressId?: string): void
+	inviteInfo?: Extract<GetInviteInfoResponseBody, { error: false }>
+}) {
+	const { signIn, isLoaded: isSignInLoaded } = useSignIn()
+	const { setActive, client } = useClerk()
+
+	const enterEmailAddressMsg = useMsg(messages.enterEmailAddress)
+
+	const [state, setState] = useState<{
+		identifier: string
+		isSubmitting: boolean
+		error: string | null
+	}>({
+		identifier: '',
+		isSubmitting: false,
+		error: null,
+	})
+
+	const handleGoogleSignIn = useCallback(async () => {
+		if (!isSignInLoaded || !signIn) return
+
+		try {
+			const redirectUrl = inviteInfo
+				? routes.tlaInvite(inviteInfo.inviteSecret, {
+						asUrl: true,
+						searchParams: { accept: 'true' },
+					})
+				: window.location.href
+
+			const result = await signIn.create({
+				strategy: 'oauth_google',
+				redirectUrl,
+			})
+
+			// Redirect to Google's OAuth page
+			const externalUrl = result.firstFactorVerification?.externalVerificationRedirectURL
+			if (externalUrl) {
+				window.location.href = externalUrl.toString()
+			}
+		} catch (err: any) {
+			console.error('Google sign-in error:', err)
+		}
+	}, [signIn, isSignInLoaded, inviteInfo])
+
+	const handleEmailSubmit = useCallback(
+		async (e: FormEvent) => {
+			e.preventDefault()
+			if (!isSignInLoaded || !signIn || !state.identifier || state.isSubmitting) return
+
+			setState((s) => ({ ...s, isSubmitting: true, error: null }))
+
+			try {
+				const res = await signIn.create({ identifier: state.identifier })
+				if (res.status === 'complete') {
+					await setActive({ session: res.createdSessionId })
+					onClose?.()
+					return
+				}
+				// Prepare email code and move to code stage
+				const emailCodeFactor = (res as any).supportedFirstFactors?.find(
+					(ff: any) => ff.strategy === 'email_code'
+				)
+				const id = emailCodeFactor?.emailAddressId as string | undefined
+				if (!id) {
+					setState((s) => ({
+						...s,
+						isSubmitting: false,
+						error: 'Email verification is not available for this account.',
+					}))
+					return
+				}
+				await signIn.prepareFirstFactor({ strategy: 'email_code', emailAddressId: id })
+				onComplete(state.identifier, false, id)
+			} catch (err: any) {
+				const apiErrors = err?.errors as Array<{
+					code?: string
+					message?: string
+					longMessage?: string
+				}>
+				const notFound = apiErrors?.find(
+					(e) =>
+						e.code === 'form_identifier_not_found' || e.code === 'invitation_account_not_exists'
+				)
+				if (notFound) {
+					try {
+						// Initialize sign up with the email before preparing verification
+						await client.signUp.create({ emailAddress: state.identifier })
+						// Always prepare & go to code first; legal acceptance handled after verification if required
+						await client.signUp.prepareEmailAddressVerification({ strategy: 'email_code' })
+						onComplete(state.identifier, true, undefined)
+					} catch (e: any) {
+						setState((s) => ({
+							...s,
+							isSubmitting: false,
+							error:
+								e?.errors?.[0]?.longMessage || e?.errors?.[0]?.message || 'Something went wrong',
+						}))
+					}
+				} else {
+					setState((s) => ({
+						...s,
+						isSubmitting: false,
+						error: apiErrors?.[0]?.longMessage || apiErrors?.[0]?.message || 'Something went wrong',
+					}))
+				}
+			}
+		},
+		[state, client.signUp, signIn, onClose, setActive, isSignInLoaded, onComplete]
+	)
+
+	return (
+		<>
+			<div className={styles.authLogoWrapper}>
+				<div className={styles.authLogo}>
+					<TlaLogo />
+				</div>
+			</div>
+			<div className={styles.authDescription}>
+				{inviteInfo ? (
+					<>
+						<F {...messages.inviteMessage} /> {inviteInfo.groupName}
+						<br />
+						<br />
+						<F defaultMessage="tldraw is a free online whiteboard. Create an account to save your files and work with your friends." />
+					</>
+				) : (
+					<>
+						<F defaultMessage="tldraw is a free online whiteboard. Create an account to save your files and work with your friends." />
+					</>
+				)}
+			</div>
+			<div className={styles.authGoogleButtonWrapper}>
+				<TlaCtaButton
+					data-testid="tla-google-sign-in-button"
+					className={styles.authCtaButton}
+					onClick={handleGoogleSignIn}
+				>
+					<img
+						src="https://img.clerk.com/static/google.svg"
+						alt="Google"
+						referrerPolicy="strict-origin-when-cross-origin"
+					/>
+					<F defaultMessage="Sign in with Google" />
+				</TlaCtaButton>
+			</div>
+
+			<div className={styles.authDivider}>
+				<span>
+					<F defaultMessage="or" />
+				</span>
+			</div>
+
+			<form onSubmit={handleEmailSubmit}>
+				<div className={styles.authField}>
+					<label htmlFor="tla-identifier" className={styles.authLabel}>
+						<F defaultMessage="Email address" />
+					</label>
+					<input
+						id="tla-identifier"
+						name="identifier"
+						type="email"
+						data-testid="tla-identifier-input"
+						value={state.identifier}
+						onChange={(e) => setState((s) => ({ ...s, identifier: e.target.value }))}
+						placeholder={enterEmailAddressMsg}
+						className={styles.authInput}
+						required
+						disabled={state.isSubmitting}
+					/>
+					{state.error && <div className={styles.authError}>{state.error}</div>}
+				</div>
+
+				<TlaCtaButton
+					data-testid="tla-continue-with-email-button"
+					className={classNames(styles.authContinueWithEmailButton, styles.authCtaButton)}
+					disabled={state.isSubmitting}
+					secondary
+					type="submit"
+				>
+					<F defaultMessage="Continue with email" />
+				</TlaCtaButton>
+
+				<p className={styles.authTermsOfUse}>
+					<a href="/tos.html" target="_blank" rel="noopener noreferrer">
+						<F defaultMessage="Terms of Use" />
+					</a>
+					{/* eslint-disable-next-line react/jsx-no-literals */}
+					{' · '}
+					<a href="/privacy.html" target="_blank" rel="noopener noreferrer">
+						<F defaultMessage="Privacy Policy" />
+					</a>
+				</p>
+			</form>
+		</>
+	)
+}
+
+function TlaVerificationCodeStep({
+	isSignUpFlow,
+	identifier,
+	emailAddressId,
+	onClose,
+	onComplete,
+}: {
+	isSignUpFlow: boolean
+	onClose?(): void
+	identifier: string
+	emailAddressId: string | undefined
+	onComplete(): void
+}) {
+	const [state, setState] = useState<{
+		code: string
+		isCodeFocused: boolean
+		isSubmitting: boolean
+		error: string | null
+	}>({
+		code: '',
+		isCodeFocused: false,
+		isSubmitting: false,
+		error: null,
+	})
+
+	const { setActive, client } = useClerk()
+	const [resendCooldown, setResendCooldown] = useState(0)
+	const [resendError, setResendError] = useState<string | null>(null)
+
+	useEffect(() => {
+		if (resendCooldown <= 0 || typeof window === 'undefined') return
+		const timer = window.setInterval(() => {
+			setResendCooldown((prev) => (prev <= 1 ? 0 : prev - 1))
+		}, 1000)
+		return () => window.clearInterval(timer)
+	}, [resendCooldown])
+
+	const handleCodeChange = useCallback(
+		(e: ChangeEvent<HTMLInputElement>) => {
+			const next = e.target.value.replace(/[^0-9]/g, '').slice(0, 6)
+			if (next.length > 6) return
+			if (state.isSubmitting) return
+
+			setState((s) => ({ ...s, error: '', code: next }))
+
+			// If the length is 6, we need to submit the code
+			if (next.length === 6) {
+				if (state.isSubmitting) return
+
+				setState((s) => ({ ...s, isSubmitting: true, error: null }))
+
+				if (isSignUpFlow) {
+					client.signUp
+						.attemptEmailAddressVerification({
+							code: next,
+						})
+						.then(async (s) => {
+							if (s.status === 'complete') {
+								await setActive({ session: s.createdSessionId })
+								onComplete()
+								return
+							}
+							setState((prev) => ({ ...prev, isSubmitting: false }))
+							onClose?.()
+						})
+						.catch((e) => {
+							const error = e?.errors?.[0]?.longMessage || e?.errors?.[0]?.message || 'Invalid code'
+							setState((s) => ({
+								...s,
+								code: '',
+								isSubmitting: false,
+								error,
+							}))
+						})
+					return
+				}
+
+				if (client.signIn) {
+					client.signIn
+						.attemptFirstFactor({
+							strategy: 'email_code',
+							code: next,
+						})
+						.then(async (r: any) => {
+							if (r.status === 'complete') {
+								await setActive({ session: r.createdSessionId })
+								onComplete()
+								return
+							}
+							setState((prev) => ({ ...prev, isSubmitting: false }))
+							onClose?.()
+						})
+						.catch((e) => {
+							const error = e?.errors?.[0]?.longMessage || e?.errors?.[0]?.message || 'Invalid code'
+							setState((s) => ({
+								...s,
+								code: '',
+								isSubmitting: false,
+								error,
+							}))
+						})
+				}
+			}
+		},
+		[state, client, isSignUpFlow, setActive, onComplete, onClose]
+	)
+
+	const handleResend = useCallback(async () => {
+		if (resendCooldown > 0 || state.isSubmitting) return
+		setResendError(null)
+		try {
+			if (isSignUpFlow) {
+				// Ensure email is set on signUp in case the client lost state
+				if (!(client.signUp as any)?.emailAddress && identifier) {
+					await client.signUp.update({ emailAddress: identifier } as any)
+				}
+				await client.signUp.prepareEmailAddressVerification({ strategy: 'email_code' })
+			} else if (client.signIn && emailAddressId) {
+				await client.signIn.prepareFirstFactor({
+					strategy: 'email_code',
+					emailAddressId,
+				})
+			}
+			setResendCooldown(30)
+		} catch (_e: any) {
+			const e = _e as any
+			setResendError(
+				e?.errors?.[0]?.longMessage || e?.errors?.[0]?.message || 'Unable to resend code'
+			)
+		}
+	}, [client, emailAddressId, identifier, isSignUpFlow, resendCooldown, state.isSubmitting])
+
+	return (
+		<>
+			<p className={styles.authDescription}>
+				<F defaultMessage="Check your email for a verification code." />
+			</p>
+
+			<div
+				className={styles.authVerificationWrapper}
+				onClick={() => {
+					const el = document.getElementById('tla-verification-code') as HTMLInputElement | null
+					el?.focus()
+				}}
+			>
+				<div className={styles.authOtpBoxes} aria-hidden>
+					{Array.from({ length: 6 }).map((_, i) => {
+						const isFilled = state.code[i]
+						const isFocused =
+							state.isCodeFocused && state.code.length < 6 && i === state.code.length
+
+						return (
+							<div
+								key={i}
+								className={classNames(styles.authOtpBox, {
+									[styles.authOtpBoxFilled]: isFilled,
+									[styles.authOtpBoxFocused]: isFocused,
+								})}
+							>
+								{isFilled || ''}
+								{isFocused ? <span className={styles.authOtpCaret} /> : null}
+							</div>
+						)
+					})}
+				</div>
+				<input
+					id="tla-verification-code"
+					data-testid="tla-verification-code-input"
+					type="text"
+					inputMode="numeric"
+					autoFocus
+					className={styles.authOtpHiddenInput}
+					value={state.code}
+					onChange={handleCodeChange}
+					onFocus={() => setState((s) => ({ ...s, isCodeFocused: true }))}
+					onBlur={() => setState((s) => ({ ...s, isCodeFocused: false }))}
+					disabled={state.isSubmitting}
+					maxLength={6}
+				/>
+			</div>
+
+			{state.error && <div className={styles.authError}>{state.error}</div>}
+			{resendError && <div className={styles.authError}>{resendError}</div>}
+
+			<div className={styles.authResendWrapper}>
+				<span className={styles.authResendText}>
+					<F
+						defaultMessage="Didn’t receive a code? <resend>Resend</resend>."
+						values={{
+							resend: (chunks) => (
+								<button
+									type="button"
+									data-testid="tla-resend-code-button"
+									onClick={handleResend}
+									className={styles.authResendButton}
+									disabled={resendCooldown > 0 || state.isSubmitting}
+								>
+									{resendCooldown > 0 ? (
+										<>
+											{/* eslint-disable-next-line react/jsx-no-literals */}
+											{chunks} ({resendCooldown})
+										</>
+									) : (
+										chunks
+									)}
+								</button>
+							),
+						}}
+					/>
+				</span>
+			</div>
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/auth.module.css b/apps/dotcom/client/src/tla/components/dialogs/auth.module.css
new file mode 100644
index 000000000000..ff9ac791343d
--- /dev/null
+++ b/apps/dotcom/client/src/tla/components/dialogs/auth.module.css
@@ -0,0 +1,331 @@
+/* Utility Classes */
+.sr-only {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	white-space: nowrap;
+	border-width: 0;
+}
+
+/* Auth Dialog Container */
+.authContainer {
+	width: 450px;
+	max-width: 95vw;
+	overflow-y: auto;
+}
+
+.authDialogBody {
+	padding: 0;
+}
+
+.authBody {
+	display: flex;
+	flex-direction: column;
+	padding: 8px 40px 36px 40px;
+	gap: 24px;
+}
+
+/* Logo */
+.authLogoWrapper {
+	display: flex;
+	justify-content: center;
+}
+
+.authLogo {
+	width: 128px;
+	height: 36px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 8px;
+}
+
+.authLogo span {
+	width: 100%;
+	height: 100%;
+}
+
+.authVerificationTitle {
+	text-align: center;
+	color: var(--tl-color-text-2);
+	font-size: 14px;
+	margin: 0;
+	line-height: 1.5;
+	text-wrap: balance;
+	font-weight: 600;
+}
+
+/* Description Text */
+.authDescription {
+	text-align: center;
+	color: var(--tl-color-text-2);
+	font-size: 14px;
+	margin: 0;
+	line-height: 1.5;
+	text-wrap: balance;
+}
+
+/* Cta button */
+.authCtaButton {
+	height: 40px;
+	width: 100%;
+	font-size: 14px;
+	font-weight: 500;
+}
+
+/* The google logo in the cta button on the sign in dialog */
+.authCtaButton img {
+	width: 22px;
+	height: 22px;
+	padding: 4px;
+	z-index: 2;
+	background-color: var(--tl-color-selected-contrast);
+	border-radius: 100%;
+}
+
+/* Divider */
+.authDivider {
+	display: flex;
+	align-items: center;
+	text-align: center;
+	color: var(--tl-color-text-3);
+	font-size: 14px;
+	margin: var(--tl-space-2) 0;
+}
+
+.authDivider::before,
+.authDivider::after {
+	content: '';
+	flex: 1;
+	border-bottom: 1px solid var(--tl-color-muted-1);
+}
+
+.authDivider span {
+	padding: 0 var(--tl-space-4);
+}
+
+/* Form Field */
+.authField {
+	display: flex;
+	flex-direction: column;
+	gap: var(--tl-space-3);
+}
+
+.authLabel {
+	font-size: 14px;
+	font-weight: 500;
+	color: var(--tl-color-text-1);
+}
+
+.authInput {
+	width: 100%;
+	padding: var(--tl-space-2) var(--tl-space-4);
+	background-color: var(--tl-color-muted-0);
+	border: 1px solid var(--tl-color-muted-2);
+	border-radius: var(--tl-radius-2);
+	font-size: 14px;
+	height: 40px;
+	color: var(--tl-color-text-0);
+}
+
+.authInput:focus {
+	outline: none;
+	border-color: var(--tl-color-focus);
+	background-color: var(--tl-color-background);
+}
+
+.authInput::placeholder {
+	color: var(--tl-color-text-3);
+}
+
+/* Error Message */
+.authError {
+	font-size: 12px;
+	color: var(--tl-color-danger);
+	margin-top: var(--tl-space-1);
+	text-align: center;
+	text-wrap: balance;
+	font-weight: 500;
+}
+
+.clerkCaptcha:not(:empty) {
+	padding: var(--tl-space-8);
+	margin-top: calc(-1 * var(--tl-space-8));
+}
+
+.authTermsOfUse {
+	font-size: 12px;
+	color: var(--tl-color-text-2);
+	margin-top: var(--tl-space-8);
+	text-align: center;
+	text-wrap: balance;
+	font-weight: 500;
+}
+
+/* Continue Button */
+/* .authContinueButton {
+	width: 100%;
+	position: relative;
+	padding: 0;
+	font-size: 14px;
+	font-weight: 500;
+	justify-content: center;
+	color: var(--tl-color-text-1);
+	background-color: var(--tl-color-muted-2);
+	border: 1px solid var(--tl-color-muted-1);
+	border-radius: var(--tl-radius-2);
+	transition: background-color 0.12s ease;
+	margin-top: 16px;
+} */
+
+.authContinueWithEmailButton {
+	margin-top: var(--tl-space-4);
+}
+
+.authButtonArrow {
+	margin-left: var(--tl-space-2);
+	font-size: 14px;
+}
+
+/* Checkbox */
+.authCheckboxLabel {
+	display: flex;
+	align-items: flex-start;
+	justify-content: center;
+	gap: var(--tl-space-4);
+	cursor: pointer;
+	font-size: 14px;
+	color: var(--tl-color-text-1);
+	line-height: 1.5;
+}
+
+.authCheckboxLabel a {
+	color: var(--tl-color-selected);
+}
+
+.authCheckbox {
+	width: 18px;
+	height: 18px;
+	min-width: 18px;
+	margin-top: 2px;
+	cursor: pointer;
+	accent-color: var(--tl-color-selected);
+}
+
+/* Verification Code */
+.authVerificationWrapper {
+	display: flex;
+	justify-content: center;
+	margin: var(--tl-space-4) 0;
+	position: relative;
+}
+
+.authVerificationInput {
+	display: none;
+}
+
+/* OTP boxes */
+.authOtpBoxes {
+	display: grid;
+	grid-template-columns: repeat(6, 40px);
+	gap: 8px;
+}
+
+.authOtpBox {
+	height: 48px;
+	width: 40px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border: 1px solid var(--tl-color-muted-2);
+	border-radius: var(--tl-radius-2);
+	font-size: 20px;
+	background: var(--tl-color-muted-0);
+}
+
+.authOtpBoxFocused {
+	border: 1px solid var(--tl-color-selected);
+}
+
+.authOtpBoxFilled {
+	background: var(--tl-color-background);
+}
+
+.authOtpCaret {
+	width: 1px;
+	height: 22px;
+	background: var(--tl-color-text-0);
+	display: inline-block;
+	animation: otpCaretBlink 1s step-start infinite;
+}
+
+@keyframes otpCaretBlink {
+	50% {
+		opacity: 0;
+	}
+}
+
+.authOtpHiddenInput {
+	position: absolute;
+	left: 0;
+	top: 0;
+	opacity: 0;
+	width: 100%;
+	height: 100%;
+	pointer-events: auto;
+}
+
+/* Resend Code */
+.authResendWrapper {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 14px;
+	margin-top: var(--tl-space-3);
+}
+
+.authResendText {
+	color: var(--tl-color-text-2);
+}
+
+.authResendButton {
+	background: none;
+	border: none;
+	color: var(--tl-color-selected);
+	cursor: pointer;
+	padding: 0;
+	font-size: 14px;
+	font-weight: 500;
+}
+
+.authResendButton:disabled {
+	color: var(--tl-color-text-3);
+	cursor: not-allowed;
+}
+
+/* Switch Mode */
+.authSwitchMode {
+	text-align: center;
+	font-size: 14px;
+	color: var(--tl-color-text-2);
+	margin-top: var(--tl-space-2);
+}
+
+.authSwitchModeButton {
+	background: none;
+	border: none;
+	color: var(--tl-color-selected);
+	text-decoration: underline;
+	cursor: pointer;
+	padding: 0;
+	font-size: 14px;
+	font-weight: 500;
+}
+
+.authTermsAcceptAndContinueButton {
+	margin-top: var(--tl-space-4);
+}
diff --git a/apps/dotcom/client/src/tla/components/dialogs/dialogs.module.css b/apps/dotcom/client/src/tla/components/dialogs/dialogs.module.css
index c098904a8c51..781cfb264527 100644
--- a/apps/dotcom/client/src/tla/components/dialogs/dialogs.module.css
+++ b/apps/dotcom/client/src/tla/components/dialogs/dialogs.module.css
@@ -25,6 +25,12 @@
 	max-height: 400px;
 }
 
+@supports (-webkit-touch-callout: none) {
+	.feedbackDialogTextArea {
+		font-size: 16px;
+	}
+}
+
 .feedbackDialogTextArea::placeholder {
 	color: var(--tl-color-text-3);
 }
@@ -146,3 +152,213 @@
 	z-index: var(--tl-layer-menus);
 	width: fit-content;
 }
+
+.noPadding {
+	padding: 0px;
+}
+
+.dialogInput {
+	border: 1px solid var(--tla-color-border);
+	border-radius: var(--tl-radius-2);
+	padding: 0px var(--tl-space-3);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+}
+
+.dialogInput:focus {
+	border: 1px solid var(--tla-color-primary);
+}
+
+.dialogFooter {
+	display: flex;
+	justify-content: flex-end;
+	flex-shrink: 0;
+}
+
+/* ----------------- Group Settings Dialog ---------------- */
+
+.groupSettingsBody {
+	max-width: 360px;
+	width: calc(100vw - 48px);
+}
+
+.section {
+	margin-bottom: 12px;
+	display: flex;
+	flex-direction: column;
+}
+
+.sectionLabel {
+	display: block;
+	margin-bottom: 8px;
+	font-weight: 500;
+}
+
+.sectionLabelLarge {
+	display: block;
+	margin-bottom: 12px;
+	font-weight: 500;
+}
+
+.inviteHeader {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.helpIcon {
+	width: 16px;
+	height: 16px;
+	color: #666;
+	cursor: help;
+}
+
+.disabledIcon {
+	width: 16px;
+	height: 16px;
+	color: #ccc;
+	cursor: not-allowed;
+}
+
+.inviteInputContainer {
+	display: flex;
+	align-items: center;
+	margin-bottom: 8px;
+	border: 1px solid var(--tla-color-border);
+	border-radius: var(--tl-radius-2);
+	padding: 0px 0px 0px var(--tl-space-3);
+	height: 40px;
+}
+
+.divider {
+	margin: 12px 0;
+	border: none;
+	border-top: 1px solid #e0e0e0;
+}
+
+.membersList {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.memberItem {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+	padding: 6px 0;
+}
+
+.memberAvatar {
+	width: 24px;
+	height: 24px;
+	border-radius: 50%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: white;
+	font-weight: bold;
+}
+
+.memberName {
+	flex: 1;
+}
+
+.memberRole {
+	color: var(--tla-color-text-3);
+	font-size: 12px;
+}
+
+.dangerZoneActions {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	gap: 8px;
+}
+
+.inlineButton {
+	background: none;
+	border: none;
+	cursor: pointer;
+	font-size: 12px;
+	font-weight: 500;
+	display: inline-block;
+	padding: 4px 0px;
+	color: var(--tla-color-text-1);
+}
+.inlineButton:hover {
+	text-decoration: underline;
+}
+
+.modalOverlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 1000;
+}
+
+.modalContent {
+	background-color: white;
+	padding: 24px;
+	border-radius: 8px;
+	max-width: 400px;
+	text-align: center;
+}
+
+.modalMessage {
+	margin-bottom: 16px;
+}
+
+.modalActions {
+	display: flex;
+	gap: 8px;
+	justify-content: center;
+}
+
+.selectWrapper {
+	display: flex;
+	position: relative;
+}
+
+.select {
+	display: inline-block;
+	appearance: none;
+	outline: none;
+	border: none;
+	padding: 4px 20px 4px 8px;
+	cursor: pointer;
+	position: relative;
+}
+
+.select:disabled {
+	cursor: default;
+}
+
+.selectWrapper:hover::after {
+	content: '';
+	pointer-events: none;
+	display: flex;
+	position: absolute;
+	inset: 0px -6px 0px 0px;
+	background-color: var(--tla-color-hover-2);
+	border-radius: var(--tl-radius-1);
+}
+
+.menuSelectChevron {
+	position: absolute !important;
+	right: 0 !important;
+	top: 50% !important;
+	transform: translateY(-50%) !important;
+}
+
+.copyInviteLinkIconRight {
+	right: 12.5px !important;
+}
diff --git a/apps/dotcom/client/src/tla/components/menu-items/menu-items.tsx b/apps/dotcom/client/src/tla/components/menu-items/menu-items.tsx
index 6fc72a8706af..566c6c05165f 100644
--- a/apps/dotcom/client/src/tla/components/menu-items/menu-items.tsx
+++ b/apps/dotcom/client/src/tla/components/menu-items/menu-items.tsx
@@ -15,6 +15,7 @@ import {
 } from 'tldraw'
 import { useOpenUrlAndTrack } from '../../../hooks/useOpenUrlAndTrack'
 import { routes } from '../../../routeDefs'
+import { signoutAnalytics } from '../../../utils/analytics'
 import { useMaybeApp } from '../../hooks/useAppState'
 import { useTldrawAppUiEvents } from '../../utils/app-ui-events'
 import { getCurrentEditor } from '../../utils/getCurrentEditor'
@@ -54,6 +55,7 @@ export function SignOutMenuItem() {
 	const label = useMsg(messages.signOut)
 
 	const handleSignout = useCallback(() => {
+		signoutAnalytics()
 		auth.signOut().then(clearLocalSessionState)
 		trackEvent('sign-out-clicked', { source: 'sidebar' })
 	}, [auth, trackEvent])
@@ -132,7 +134,8 @@ export function DotDevMenuItem() {
 			readonlyOk
 			onSelect={() => {
 				openAndTrack(
-					'https://tldraw.dev?utm_source=dotcom&utm_medium=organic&utm_campaign=sidebar-menu'
+					'https://tldraw.dev?utm_source=dotcom&utm_medium=organic&utm_campaign=sidebar-menu',
+					true
 				)
 			}}
 		/>
@@ -147,7 +150,7 @@ export function LegalSummaryMenuItem() {
 			label={useMsg(messages.legalSummary)}
 			readonlyOk
 			onSelect={() => {
-				openAndTrack('https://tldraw.notion.site/legal')
+				openAndTrack('/legal.html')
 			}}
 		/>
 	)
diff --git a/apps/dotcom/client/src/tla/components/tla-menu/tla-menu.tsx b/apps/dotcom/client/src/tla/components/tla-menu/tla-menu.tsx
index 99f9a557eb38..aae0b43537a2 100644
--- a/apps/dotcom/client/src/tla/components/tla-menu/tla-menu.tsx
+++ b/apps/dotcom/client/src/tla/components/tla-menu/tla-menu.tsx
@@ -145,7 +145,12 @@ export function TlaMenuSelect<T extends string>({
 	}, [isOpen])
 
 	return (
-		<div className={styles.menuSelectWrapper}>
+		<div
+			className={styles.menuSelectWrapper}
+			onClickCapture={(e) => {
+				e.stopPropagation()
+			}}
+		>
 			<_Select.Root
 				open={isOpen}
 				value={value}
diff --git a/apps/dotcom/client/src/tla/hooks/useAnalyticsConsent.tsx b/apps/dotcom/client/src/tla/hooks/useAnalyticsConsent.tsx
index d6307beb4e9a..8681e606ea29 100644
--- a/apps/dotcom/client/src/tla/hooks/useAnalyticsConsent.tsx
+++ b/apps/dotcom/client/src/tla/hooks/useAnalyticsConsent.tsx
@@ -36,6 +36,7 @@ export function useAnalyticsConsent() {
 				// Immediately configure analytics for signed-out users
 				configureAnalytics(newConsent, undefined)
 			}
+
 			trackEvent('consent_changed', { consent: newConsent })
 		},
 		[isSignedIn, user, app]
diff --git a/apps/dotcom/client/src/tla/hooks/useAppState.tsx b/apps/dotcom/client/src/tla/hooks/useAppState.tsx
index a68039f45ec8..64138fe9e182 100644
--- a/apps/dotcom/client/src/tla/hooks/useAppState.tsx
+++ b/apps/dotcom/client/src/tla/hooks/useAppState.tsx
@@ -1,5 +1,6 @@
 import { useAuth, useUser as useClerkUser } from '@clerk/clerk-react'
 import { ReactNode, createContext, useContext, useEffect, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
 import { assertExists, atom } from 'tldraw'
 import { TldrawApp } from '../app/TldrawApp'
 import { useTldrawAppUiEvents } from '../utils/app-ui-events'
@@ -23,6 +24,7 @@ export function AppStateProvider({ children }: { children: ReactNode }) {
 	if (!auth.isSignedIn || !user || !isLoaded) {
 		throw new Error('should have redirected in TlaRootProviders')
 	}
+	const navigate = useNavigate()
 
 	useEffect(() => {
 		let _app: TldrawApp
@@ -33,9 +35,6 @@ export function AppStateProvider({ children }: { children: ReactNode }) {
 			if (!token) throw new Error('no token')
 			TldrawApp.create({
 				userId: auth.userId,
-				fullName: user.fullName || '',
-				email: user.emailAddresses[0]?.emailAddress || '',
-				avatar: user.imageUrl || '',
 				getToken: async () => {
 					const token = await auth.getToken()
 					return token || undefined
@@ -44,6 +43,7 @@ export function AppStateProvider({ children }: { children: ReactNode }) {
 					isClientTooOld$.set(true)
 				},
 				trackEvent,
+				navigate,
 			}).then(({ app }) => {
 				if (didCancel) {
 					app.dispose()
diff --git a/apps/dotcom/client/src/tla/hooks/useDragTracking.ts b/apps/dotcom/client/src/tla/hooks/useDragTracking.ts
new file mode 100644
index 000000000000..9d997dd0ceb4
--- /dev/null
+++ b/apps/dotcom/client/src/tla/hooks/useDragTracking.ts
@@ -0,0 +1,391 @@
+import { DragFileOperation, DragGroupOperation, DragReorderOperation } from '@tldraw/dotcom-shared'
+import { getIndexAbove, getIndexBetween, IndexKey } from '@tldraw/utils'
+import assert from 'assert'
+import { useCallback, useEffect, useRef } from 'react'
+import { Vec } from 'tldraw'
+import { TldrawApp } from '../app/TldrawApp'
+import { useApp } from './useAppState'
+
+export interface DropTarget {
+	id: string
+	element: HTMLElement
+	rect: DOMRect
+}
+
+function detectDragOperations(
+	elements: DragElements,
+	mousePosition: { x: number; y: number },
+	dragType: 'file' | 'group',
+	dragId: string
+): DragFileOperation | DragGroupOperation {
+	if (dragType === 'file') {
+		return detectFileOperations(elements, mousePosition)
+	} else {
+		return detectGroupOperation(elements.groupItems ?? [], mousePosition, dragId)
+	}
+}
+
+function detectFileOperations(
+	elements: DragElements,
+	mousePosition: { x: number; y: number }
+): DragFileOperation {
+	const operations: DragFileOperation = {}
+
+	// Check for move operation - mouse over different group
+	const hoveredGroupId = findHoveredGroupId(elements, mousePosition)
+	const group =
+		hoveredGroupId === elements.myFiles.id
+			? elements.myFiles
+			: elements.groups.find((g) => g.id === hoveredGroupId)!
+	const isPinned = elements.draggedElement.getAttribute('data-is-pinned') === 'true'
+	const containsDraggedElement = group?.element.contains(elements.draggedElement)
+	if (hoveredGroupId && !containsDraggedElement) {
+		operations.move = { targetId: hoveredGroupId }
+	}
+
+	// Check for reorder operation
+
+	if (containsDraggedElement) {
+		const reorderOp = detectFileReorderOperation(
+			hoveredGroupId === elements.myFiles.id
+				? elements.myFiles
+				: elements.groups.find((g) => g.id === hoveredGroupId)!,
+			mousePosition
+		)
+		if (reorderOp) {
+			operations.reorder = reorderOp
+		} else if (isPinned) {
+			// unpin the file
+			operations.move = { targetId: hoveredGroupId! }
+		}
+	}
+
+	return operations
+}
+
+function detectGroupOperation(
+	groupItems: Array<{ id: string; element: HTMLElement }>,
+	mousePosition: { x: number; y: number },
+	draggedGroupId: string
+): DragGroupOperation {
+	if (groupItems.filter((g) => g.id !== draggedGroupId).length === 0) {
+		return {}
+	}
+
+	const startTop = groupItems[0].element.getBoundingClientRect().top
+
+	let insertBeforeId = null as null | string
+	let indicatorY = null as null | number
+	let prevBottom = startTop - REORDER_BOUNDARY_INDICATOR_OFFSET * 2
+
+	for (const target of groupItems) {
+		const rect = target.element.getBoundingClientRect()
+		const midY = rect.top + rect.height / 2
+		if (mousePosition.y < midY) {
+			insertBeforeId = target.id
+			indicatorY = (rect.top + prevBottom) / 2
+			break
+		}
+		prevBottom = rect.bottom
+	}
+
+	return {
+		reorder: {
+			insertBeforeId,
+			indicatorY: indicatorY ?? prevBottom + REORDER_BOUNDARY_INDICATOR_OFFSET,
+		},
+	}
+}
+
+function findHoveredGroupId(
+	elements: DragElements,
+	mousePosition: { x: number; y: number }
+): string | null {
+	// Find group or home group target that contains the mouse
+	if (isPointInRect(mousePosition, elements.myFiles.element.getBoundingClientRect())) {
+		return elements.myFiles.id
+	}
+
+	return (
+		elements.groups.find((target) => {
+			return isPointInRect(mousePosition, target.element.getBoundingClientRect())
+		})?.id ?? null
+	)
+}
+
+// This adds a little bit of an offset to the indicator
+// so it doesn't hug the top or bottom edge of the adjacent
+// item too closely if it's at the top or bottom of the list.
+const REORDER_BOUNDARY_INDICATOR_OFFSET = 2
+// This cuts off the reorder operation for pinned files if the mouse
+// strays too far above or below the pinned file section.
+const REORDER_PINNED_BOUNDARY_INDICATOR_THRESHOLD = 15
+
+function detectFileReorderOperation(
+	groupElements: GroupElements,
+	mousePosition: { x: number; y: number }
+): DragReorderOperation | null {
+	if (groupElements.pinnedFiles.length === 0 && !groupElements.topUnpinnedFile) {
+		// don't offer pinning if the group is empty
+		return null
+	}
+	const startTop = (
+		groupElements.pinnedFiles[0]?.element ?? groupElements.topUnpinnedFile!.element
+	).getBoundingClientRect().top
+	const endBottom =
+		groupElements.pinnedFiles[groupElements.pinnedFiles.length - 1]?.element.getBoundingClientRect()
+			.bottom ?? groupElements.topUnpinnedFile!.element.getBoundingClientRect().top
+
+	if (
+		mousePosition.y < startTop - REORDER_PINNED_BOUNDARY_INDICATOR_THRESHOLD ||
+		mousePosition.y > endBottom + REORDER_PINNED_BOUNDARY_INDICATOR_THRESHOLD
+	) {
+		return null
+	}
+
+	let insertBeforeId = null as null | string
+	let indicatorY = null as null | number
+	let prevBottom = startTop - REORDER_BOUNDARY_INDICATOR_OFFSET
+
+	for (const target of groupElements.pinnedFiles) {
+		const rect = target.element.getBoundingClientRect()
+		const midY = rect.top + rect.height / 2
+		if (mousePosition.y < midY) {
+			insertBeforeId = target.id
+			indicatorY = (rect.top + prevBottom) / 2
+			break
+		}
+		prevBottom = rect.bottom
+	}
+
+	return {
+		insertBeforeId,
+		indicatorY: indicatorY ?? prevBottom + REORDER_BOUNDARY_INDICATOR_OFFSET,
+	}
+}
+
+function isPointInRect(point: { x: number; y: number }, rect: DOMRect): boolean {
+	return (
+		point.x >= rect.left && point.x <= rect.right && point.y >= rect.top && point.y <= rect.bottom
+	)
+}
+
+async function executeFileOperations(
+	app: TldrawApp,
+	fileId: string,
+	groupId: string,
+	operation: DragFileOperation
+) {
+	if (operation.move || operation.reorder) {
+		app.z.mutate.handleFileDragOperation({
+			fileId,
+			groupId,
+			operation,
+		})
+
+		// Expand the target group if it's collapsed
+		if (operation.move) {
+			const targetGroupId = operation.move.targetId
+			const homeGroupId = app.getHomeGroupId()
+			if (targetGroupId !== homeGroupId) {
+				app.ensureSidebarGroupExpanded(targetGroupId)
+			}
+		}
+	}
+}
+
+async function executeGroupOperations(app: TldrawApp, groupId: string, operation: any) {
+	if (operation.reorder) {
+		const { insertBeforeId } = operation.reorder
+
+		// Get all group memberships sorted by current index
+		const allGroups = app.getGroupMemberships()
+		const sortedGroups = allGroups.filter((g) => g.groupId !== app.getHomeGroupId())
+
+		// Calculate the new index for the group
+		let newIndex: IndexKey
+
+		if (insertBeforeId === null) {
+			// Insert at end - get index above the last group
+			const lastGroup = sortedGroups[sortedGroups.length - 1]
+			newIndex = lastGroup?.index ? getIndexAbove(lastGroup.index) : ('a0' as IndexKey)
+		} else {
+			// Insert before specific group
+			const targetIdx = sortedGroups.findIndex((g) => g.groupId === insertBeforeId)
+			const afterGroup = sortedGroups[targetIdx]
+			const beforeGroup = sortedGroups[targetIdx - 1]
+			newIndex = getIndexBetween(beforeGroup?.index, afterGroup?.index)
+		}
+
+		await app.z.mutate.updateOwnGroupUser({ groupId, index: newIndex }).client
+	}
+}
+
+interface GroupElements {
+	id: string
+	element: HTMLElement
+	pinnedFiles: Array<{ id: string; element: HTMLElement }>
+	topUnpinnedFile: { id: string; element: HTMLElement } | null
+}
+interface DragElements {
+	draggedElement: HTMLElement
+	groupId: string
+	myFiles: GroupElements
+	groups: GroupElements[]
+	groupItems?: Array<{ id: string; element: HTMLElement }>
+}
+
+export function useDragTracking() {
+	const app = useApp()
+	const cleanupRef = useRef(null as null | ((cancel: boolean) => void))
+
+	const startDragTracking = useCallback(
+		({
+			groupId,
+			fileId,
+			clientX,
+			clientY,
+		}: {
+			groupId: string
+			fileId?: string
+			clientX: number
+			clientY: number
+		}) => {
+			const dragType = fileId ? 'file' : 'group'
+			const dragId = fileId ?? groupId
+			assert(!cleanupRef.current, 'Drag tracking already started')
+
+			// Query all drop target elements
+			const groupElements = document.querySelectorAll('[data-drop-target-id^="group:"]')
+			const homeGroupId = app.getHomeGroupId()
+			const myFilesElement = document.querySelector(`[data-drop-target-id="${homeGroupId}"]`)
+
+			assert(myFilesElement, 'myFilesElement not found')
+
+			function getGroupElements(id: string, element: HTMLElement) {
+				const topUnpinnedFile = element.querySelector('[data-is-pinned="false"]')
+				return {
+					id,
+					element,
+					pinnedFiles: [...element.querySelectorAll('[data-is-pinned="true"]')].map((element) => ({
+						id: element.getAttribute('data-drop-target-id')!.replace('file:', ''),
+						element: element as HTMLElement,
+					})),
+					topUnpinnedFile: topUnpinnedFile
+						? {
+								id: topUnpinnedFile.getAttribute('data-drop-target-id')!.replace('file:', ''),
+								element: topUnpinnedFile as HTMLElement,
+							}
+						: null,
+				}
+			}
+
+			const elements: DragElements = {
+				draggedElement: document.querySelector(
+					`[data-drop-target-id="${dragType}:${dragId}"]`
+				) as HTMLElement,
+				groupId,
+				myFiles: getGroupElements(app.getHomeGroupId(), myFilesElement as HTMLElement),
+				groups: [...groupElements].map((element) =>
+					getGroupElements(element.getAttribute('data-group-id')!, element as HTMLElement)
+				),
+				// For group dragging, collect all group item elements for reordering
+				groupItems:
+					dragType === 'group'
+						? [...groupElements].map((element) => ({
+								id: element.getAttribute('data-group-id')!,
+								element: element as HTMLElement,
+							}))
+						: undefined,
+			}
+			const mousePosition = { x: clientX, y: clientY }
+			const startMousePosition = { x: clientX, y: clientY }
+			let hasDragStarted = false
+
+			// Add global mouse move listener to track mouse position
+			const handleMouseMove = (e: MouseEvent) => {
+				mousePosition.x = e.clientX
+				mousePosition.y = e.clientY
+				if (Vec.Dist(startMousePosition, mousePosition) > 5) {
+					hasDragStarted = true
+				}
+			}
+
+			window.addEventListener('drag', handleMouseMove)
+			let animationFrame = 0
+
+			// Start the measurement loop
+			const onFrame = () => {
+				if (!cleanupRef.current) return
+
+				// Update bounding boxes for all drop targets
+				// Detect operations and update app state
+				const operation = detectDragOperations(elements, mousePosition, dragType, dragId)
+
+				// Update app state with detected operations
+				app.sidebarState.set({
+					...app.sidebarState.get(),
+					dragState: {
+						hasDragStarted,
+						type: dragType,
+						id: dragId,
+						operation,
+					},
+				})
+
+				// Schedule next frame
+				animationFrame = requestAnimationFrame(onFrame)
+			}
+
+			document.body.setAttribute('data-is-dragging', 'true')
+			const onDone = () => {
+				cleanupRef.current?.(false)
+			}
+			const onCancel = () => {
+				cleanupRef.current?.(true)
+			}
+			window.addEventListener('dragend', onDone)
+			window.addEventListener('pointerup', onDone)
+			window.addEventListener('blur', onDone)
+			window.addEventListener('keydown', onCancel)
+
+			cleanupRef.current = (cancel: boolean) => {
+				cleanupRef.current = null
+				cancelAnimationFrame(animationFrame)
+				window.removeEventListener('drag', handleMouseMove)
+				window.removeEventListener('dragend', onDone)
+				window.removeEventListener('pointerup', onDone)
+				window.removeEventListener('blur', onDone)
+				window.removeEventListener('keydown', onCancel)
+				document.body.removeAttribute('data-is-dragging')
+				const dragState = app.sidebarState.get().dragState
+				app.sidebarState.set({
+					...app.sidebarState.get(),
+					dragState: null,
+				})
+				if (!cancel) {
+					// Execute operations before clearing drag state
+					if (dragState && fileId) {
+						executeFileOperations(app, fileId, groupId, dragState.operation)
+					} else if (dragState && dragState.type === 'group') {
+						executeGroupOperations(app, dragState.id, dragState.operation)
+					}
+				}
+			}
+
+			onFrame()
+		},
+		[app]
+	)
+
+	// Cleanup on unmount
+	useEffect(() => {
+		return () => {
+			cleanupRef.current?.(true)
+		}
+	}, [])
+
+	return {
+		startDragTracking,
+	}
+}
diff --git a/apps/dotcom/client/src/tla/hooks/useHasFlag.tsx b/apps/dotcom/client/src/tla/hooks/useHasFlag.tsx
new file mode 100644
index 000000000000..7f490fe87977
--- /dev/null
+++ b/apps/dotcom/client/src/tla/hooks/useHasFlag.tsx
@@ -0,0 +1,11 @@
+import { TlaFlags } from '@tldraw/dotcom-shared'
+import { useValue } from 'tldraw'
+import { useApp } from '../hooks/useAppState'
+
+export function useHasFlag(...flags: TlaFlags[]) {
+	const app = useApp()
+	return useValue('hasFlag:' + flags.join(','), () => flags.every((flag) => app.hasFlag(flag)), [
+		app,
+		flags.join(','),
+	])
+}
diff --git a/apps/dotcom/client/src/tla/hooks/useInviteDetails.ts b/apps/dotcom/client/src/tla/hooks/useInviteDetails.ts
new file mode 100644
index 000000000000..bd25d5a332c1
--- /dev/null
+++ b/apps/dotcom/client/src/tla/hooks/useInviteDetails.ts
@@ -0,0 +1,36 @@
+import { GetInviteInfoResponseBody } from '@tldraw/dotcom-shared'
+import { useEffect, useState } from 'react'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { fetch } from 'tldraw'
+
+export function useInviteDetails() {
+	const location = useLocation()
+	const navigate = useNavigate()
+	const [inviteInfo, setInviteInfo] = useState<GetInviteInfoResponseBody | null>(null)
+
+	useEffect(() => {
+		const inviteSecret = location.state?.inviteSecret
+
+		if (inviteSecret) {
+			const fetchInviteInfo = async () => {
+				try {
+					const response = await fetch(`/api/app/invite/${inviteSecret}`)
+					const data: GetInviteInfoResponseBody = await response.json()
+					setInviteInfo(data)
+
+					// Clear inviteSecret from state after fetching so it doesn't persist across navigations
+					const newState = { ...location.state }
+					delete newState.inviteSecret
+					navigate(location.pathname, { replace: true, state: newState })
+				} catch (error) {
+					console.error('Failed to fetch invite info:', error)
+					setInviteInfo({ error: true, message: 'Failed to load invite details' })
+				}
+			}
+
+			fetchInviteInfo()
+		}
+	}, [location, navigate])
+
+	return inviteInfo
+}
diff --git a/apps/dotcom/client/src/tla/hooks/useIsDragging.tsx b/apps/dotcom/client/src/tla/hooks/useIsDragging.tsx
new file mode 100644
index 000000000000..2b97f2a58640
--- /dev/null
+++ b/apps/dotcom/client/src/tla/hooks/useIsDragging.tsx
@@ -0,0 +1,13 @@
+import { useValue } from 'tldraw'
+import { useApp } from './useAppState'
+
+export function useIsDragging(fileOrGroupId: string) {
+	const app = useApp()
+	return useValue(
+		'isDragging:' + fileOrGroupId,
+		() =>
+			app.sidebarState.get().dragState?.hasDragStarted &&
+			app.sidebarState.get().dragState?.id === fileOrGroupId,
+		[fileOrGroupId, app]
+	)
+}
diff --git a/apps/dotcom/client/src/tla/hooks/useIsFileOwner.tsx b/apps/dotcom/client/src/tla/hooks/useIsFileOwner.tsx
index 5d17b8ab5265..9b0e66872859 100644
--- a/apps/dotcom/client/src/tla/hooks/useIsFileOwner.tsx
+++ b/apps/dotcom/client/src/tla/hooks/useIsFileOwner.tsx
@@ -1,7 +1,7 @@
 import { useValue } from 'tldraw'
 import { useMaybeApp } from './useAppState'
 
-export function useIsFileOwner(fileId?: string): boolean {
+export function useHasFileAdminRights(fileId?: string): boolean {
 	const app = useMaybeApp()
 	return useValue(
 		'isOwner',
@@ -11,7 +11,7 @@ export function useIsFileOwner(fileId?: string): boolean {
 			const file = app?.getFile(fileId)
 			if (!file) return false
 			if (file.ownerId) return file.ownerId === app.userId
-			if (file.owningGroupId) return file.owningGroupId === app.getHomeGroupId()
+			if (file.owningGroupId) return !!app.getGroupMembership(file.owningGroupId)
 			return false
 		},
 		[app, fileId]
diff --git a/apps/dotcom/client/src/tla/hooks/useTldrFileDrop.ts b/apps/dotcom/client/src/tla/hooks/useTldrFileDrop.ts
index 5552b1b6f5b7..bd2d0cf0d102 100644
--- a/apps/dotcom/client/src/tla/hooks/useTldrFileDrop.ts
+++ b/apps/dotcom/client/src/tla/hooks/useTldrFileDrop.ts
@@ -1,5 +1,5 @@
 import { useAuth } from '@clerk/clerk-react'
-import { DragEvent, useCallback, useState } from 'react'
+import { DragEvent, useCallback } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { tlmenus } from 'tldraw'
 import { routes } from '../../routeDefs'
@@ -9,14 +9,10 @@ export function useTldrFileDrop() {
 	const app = useApp()
 	const navigate = useNavigate()
 
-	const [isDraggingOver, setIsDraggingOver] = useState(false)
-
 	const auth = useAuth()
 
 	const onDrop = useCallback(
 		async (e: DragEvent) => {
-			setIsDraggingOver(false)
-
 			const token = await auth.getToken()
 			if (!token) {
 				return
@@ -40,7 +36,6 @@ export function useTldrFileDrop() {
 	}, [])
 
 	const onDragEnter = useCallback(() => {
-		setIsDraggingOver(true)
 		tlmenus.hideOpenMenus()
 	}, [])
 
@@ -48,9 +43,8 @@ export function useTldrFileDrop() {
 		if (e.relatedTarget && e.currentTarget.contains(e.relatedTarget as any)) {
 			return
 		}
-		setIsDraggingOver(false)
 		tlmenus.showOpenMenus()
 	}, [])
 
-	return { onDrop, onDragOver, onDragEnter, onDragLeave, isDraggingOver }
+	return { onDrop, onDragOver, onDragEnter, onDragLeave }
 }
diff --git a/apps/dotcom/client/src/tla/layouts/TlaSidebarLayout/sidebar-layout.module.css b/apps/dotcom/client/src/tla/layouts/TlaSidebarLayout/sidebar-layout.module.css
index 2f8ef20c8c31..696db9b37424 100644
--- a/apps/dotcom/client/src/tla/layouts/TlaSidebarLayout/sidebar-layout.module.css
+++ b/apps/dotcom/client/src/tla/layouts/TlaSidebarLayout/sidebar-layout.module.css
@@ -69,6 +69,6 @@
 .toggleContainer {
 	position: absolute;
 	top: 4px;
-	margin-left: 2px;
+	margin-left: 4px;
 	z-index: 1;
 }
diff --git a/apps/dotcom/client/src/tla/pages/file-history-snapshot.tsx b/apps/dotcom/client/src/tla/pages/file-history-snapshot.tsx
index f039cee1e090..53ce8a37786d 100644
--- a/apps/dotcom/client/src/tla/pages/file-history-snapshot.tsx
+++ b/apps/dotcom/client/src/tla/pages/file-history-snapshot.tsx
@@ -73,8 +73,18 @@ export function Component({ error: _error }: { error?: unknown }) {
 					<TlaHistorySnapshotEditor
 						fileSlug={result.fileSlug}
 						snapshot={snapshot}
-						timestamp={ts}
-						isApp
+						onRestore={async () => {
+							const res = await fetch(`/api/app/file/${result.fileSlug}/restore`, {
+								method: 'POST',
+								headers: {
+									'Content-Type': 'application/json',
+								},
+								body: JSON.stringify({ timestamp: ts }),
+							})
+							if (!res.ok) {
+								throw new Error('Failed to restore version: ' + (await res.text()))
+							}
+						}}
 					/>
 				</TlaAnonLayout>
 			)}
diff --git a/apps/dotcom/client/src/tla/pages/file-history.tsx b/apps/dotcom/client/src/tla/pages/file-history.tsx
index 60c7df427f07..c33699c7b05a 100644
--- a/apps/dotcom/client/src/tla/pages/file-history.tsx
+++ b/apps/dotcom/client/src/tla/pages/file-history.tsx
@@ -88,7 +88,7 @@ export function Component({ error: _error }: { error?: unknown }) {
 			) : (
 				<TlaAnonLayout>
 					<BoardHistoryLog
-						data={allTimestamps}
+						data={allTimestamps.map((timestamp) => ({ timestamp, href: `./${timestamp}` }))}
 						hasMore={hasMore}
 						onLoadMore={handleLoadMore}
 						isLoading={isLoading}
diff --git a/apps/dotcom/client/src/tla/pages/file-pierre-history-snapshot.tsx b/apps/dotcom/client/src/tla/pages/file-pierre-history-snapshot.tsx
new file mode 100644
index 000000000000..ac54b58448d3
--- /dev/null
+++ b/apps/dotcom/client/src/tla/pages/file-pierre-history-snapshot.tsx
@@ -0,0 +1,92 @@
+import { captureException } from '@sentry/react'
+import { FILE_PREFIX } from '@tldraw/dotcom-shared'
+import { RoomSnapshot } from '@tldraw/sync-core'
+import { useEffect, useMemo } from 'react'
+import { useRouteError } from 'react-router-dom'
+import { TLStoreSnapshot, fetch } from 'tldraw'
+import { defineLoader } from '../../utils/defineLoader'
+import { TlaHistorySnapshotEditor } from '../components/TlaEditor/TlaHistorySnapshotEditor'
+import { TlaFileError } from '../components/TlaFileError/TlaFileError'
+import { useMaybeApp } from '../hooks/useAppState'
+import { TlaAnonLayout } from '../layouts/TlaAnonLayout/TlaAnonLayout'
+import { toggleSidebar } from '../utils/local-session-state'
+
+export function ErrorBoundary() {
+	const error = useRouteError()
+	useEffect(() => {
+		captureException(error)
+	}, [error])
+	return <Component error={error} />
+}
+
+const { loader, useData } = defineLoader(async (args) => {
+	const fileSlug = args.params.fileSlug
+	const commitHash = args.params.commitHash
+
+	if (!fileSlug || !commitHash) return null
+
+	const result = await fetch(`/api/${FILE_PREFIX}/${fileSlug}/pierre-history/${commitHash}`, {
+		headers: {},
+	})
+	if (!result.ok) return null
+	const data = (await result.json()) as RoomSnapshot
+
+	return { data, fileSlug, commitHash }
+})
+
+export { loader }
+
+export function Component({ error: _error }: { error?: unknown }) {
+	const userId = useMaybeApp()?.userId
+
+	const result = useData()
+
+	const snapshot = useMemo(() => {
+		if (!result) {
+			return null
+		}
+
+		return {
+			schema: result.data.schema,
+			store: Object.fromEntries(
+				result.data.documents.map((record) => [record.state.id, record.state])
+			),
+		} as TLStoreSnapshot
+	}, [result])
+
+	const error = _error || !result || !snapshot
+
+	useEffect(() => {
+		if (error && userId) {
+			// force sidebar open
+			toggleSidebar(true)
+		}
+	}, [error, userId])
+
+	return (
+		<>
+			{error ? (
+				<TlaFileError error={error} />
+			) : (
+				<TlaAnonLayout>
+					<TlaHistorySnapshotEditor
+						fileSlug={result.fileSlug}
+						snapshot={snapshot}
+						onRestore={async () => {
+							const res = await fetch(`/api/app/file/${result.fileSlug}/pierre-restore`, {
+								method: 'POST',
+								headers: {
+									'Content-Type': 'application/json',
+								},
+								body: JSON.stringify({ commitHash: result.commitHash }),
+							})
+							if (!res.ok) {
+								throw new Error('Failed to restore version: ' + (await res.text()))
+							}
+						}}
+					/>
+				</TlaAnonLayout>
+			)}
+		</>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/pages/file-pierre-history.tsx b/apps/dotcom/client/src/tla/pages/file-pierre-history.tsx
new file mode 100644
index 000000000000..1778c3181b85
--- /dev/null
+++ b/apps/dotcom/client/src/tla/pages/file-pierre-history.tsx
@@ -0,0 +1,98 @@
+import { captureException } from '@sentry/react'
+import { useEffect, useState } from 'react'
+import { useRouteError } from 'react-router-dom'
+import { BoardHistoryLog } from '../../components/BoardHistoryLog/BoardHistoryLog'
+import { defineLoader } from '../../utils/defineLoader'
+import { fetchPierreHistory } from '../../utils/fetchHistory'
+import { TlaFileError } from '../components/TlaFileError/TlaFileError'
+import { useMaybeApp } from '../hooks/useAppState'
+import { TlaAnonLayout } from '../layouts/TlaAnonLayout/TlaAnonLayout'
+import { toggleSidebar } from '../utils/local-session-state'
+
+interface PierreHistoryData {
+	entries: Array<{ timestamp: string; commitHash: string }>
+	nextCursor?: string | null
+}
+
+const { loader, useData } = defineLoader(async (args) => {
+	const fileSlug = args.params.fileSlug
+
+	if (!fileSlug) return null
+
+	const data = await fetchPierreHistory(fileSlug)
+	if (!data) return null
+
+	return { data, fileSlug } as { data: PierreHistoryData; fileSlug: string }
+})
+
+export { loader }
+
+export function ErrorBoundary() {
+	const error = useRouteError()
+	useEffect(() => {
+		captureException(error)
+	}, [error])
+	return <Component error={error} />
+}
+
+export function Component({ error: _error }: { error?: unknown }) {
+	const data = useData()
+	const [allEntries, setAllEntries] = useState<Array<{ timestamp: string; commitHash: string }>>(
+		data?.data.entries || []
+	)
+	const [nextCursor, setNextCursor] = useState<string | null>(data?.data?.nextCursor || null)
+	const [isLoading, setIsLoading] = useState(false)
+
+	const userId = useMaybeApp()?.userId
+
+	const error = _error || !data
+
+	useEffect(() => {
+		if (error && userId) {
+			// force sidebar open
+			toggleSidebar(true)
+		}
+	}, [error, userId])
+
+	const handleLoadMore = async () => {
+		if (!data?.fileSlug || isLoading) return
+
+		setIsLoading(true)
+		try {
+			const newData = await fetchPierreHistory(data.fileSlug, nextCursor)
+
+			if (newData) {
+				// Filter out any entries that already exist to prevent duplicates
+				const uniqueNewEntries = newData.entries.filter(
+					(entry) => !allEntries.some((e) => e.commitHash === entry.commitHash)
+				)
+				setAllEntries((prev) => [...prev, ...uniqueNewEntries])
+				setNextCursor(newData.nextCursor ?? null)
+			}
+		} catch (err) {
+			console.error('Failed to load more history:', err)
+		} finally {
+			setIsLoading(false)
+		}
+	}
+
+	return (
+		<div>
+			{error ? (
+				<TlaFileError error={error} />
+			) : (
+				<TlaAnonLayout>
+					<BoardHistoryLog
+						data={allEntries.map((record) => ({
+							timestamp: record.timestamp,
+							href: `./${record.commitHash}`,
+						}))}
+						hasMore={!!nextCursor}
+						onLoadMore={handleLoadMore}
+						isLoading={isLoading}
+					/>
+				</TlaAnonLayout>
+			)}
+		</div>
+	)
+}
diff --git a/apps/dotcom/client/src/tla/pages/file.tsx b/apps/dotcom/client/src/tla/pages/file.tsx
index b6002b3e3dae..8ed9a57e4db7 100644
--- a/apps/dotcom/client/src/tla/pages/file.tsx
+++ b/apps/dotcom/client/src/tla/pages/file.tsx
@@ -1,9 +1,12 @@
 import { captureException } from '@sentry/react'
 import { useEffect } from 'react'
 import { useParams, useRouteError } from 'react-router-dom'
+import { useDialogs } from 'tldraw'
 import { TlaEditor } from '../components/TlaEditor/TlaEditor'
 import { TlaFileError } from '../components/TlaFileError/TlaFileError'
+import { TlaInviteDialog } from '../components/dialogs/TlaInviteDialog'
 import { useMaybeApp } from '../hooks/useAppState'
+import { useInviteDetails } from '../hooks/useInviteDetails'
 import { ReadyWrapper } from '../hooks/useIsReady'
 import { TlaAnonLayout } from '../layouts/TlaAnonLayout/TlaAnonLayout'
 import { TlaSidebarLayout } from '../layouts/TlaSidebarLayout/TlaSidebarLayout'
@@ -20,7 +23,10 @@ export function ErrorBoundary() {
 export function Component({ error }: { error?: unknown }) {
 	const { fileSlug } = useParams<{ fileSlug: string }>()
 	if (!fileSlug) throw Error('File id not found')
-	const userId = useMaybeApp()?.userId
+	const app = useMaybeApp()
+	const userId = app?.userId
+	const inviteInfo = useInviteDetails()
+	const dialogs = useDialogs()
 
 	const errorElem = error ? <TlaFileError error={error} /> : null
 
@@ -31,6 +37,20 @@ export function Component({ error }: { error?: unknown }) {
 		}
 	}, [error, userId])
 
+	useEffect(() => {
+		if (inviteInfo && !inviteInfo.error && userId) {
+			dialogs.addDialog({
+				component: ({ onClose }) => <TlaInviteDialog inviteInfo={inviteInfo} onClose={onClose} />,
+			})
+		}
+	}, [inviteInfo, dialogs, userId])
+
+	useEffect(() => {
+		if (app && fileSlug) {
+			app.ensureFileVisibleInSidebar(fileSlug)
+		}
+	}, [app, fileSlug])
+
 	if (!userId) {
 		return (
 			// Override TlaEditor's internal ReadyWrapper. This prevents the anon layout chrome from rendering
diff --git a/apps/dotcom/client/src/tla/pages/invite.tsx b/apps/dotcom/client/src/tla/pages/invite.tsx
new file mode 100644
index 000000000000..f8942b4f71b4
--- /dev/null
+++ b/apps/dotcom/client/src/tla/pages/invite.tsx
@@ -0,0 +1,39 @@
+import { useEffect, useMemo } from 'react'
+import { Navigate, useParams, useSearchParams } from 'react-router-dom'
+import { DefaultSpinner } from 'tldraw'
+import { routes } from '../../routeDefs'
+import { useMaybeApp } from '../hooks/useAppState'
+
+export function Component() {
+	const { token } = useParams<{ token: string }>()
+	const [searchParams] = useSearchParams()
+	const app = useMaybeApp()
+	const isAccepting = searchParams.get('accept') === 'true'
+
+	// Memoize the state object to prevent Navigate from re-rendering infinitely
+	const navigateState = useMemo(() => ({ inviteSecret: token }), [token])
+
+	useEffect(() => {
+		if (app && isAccepting && token) {
+			app.acceptGroupInvite(token)
+		}
+	}, [isAccepting, app, token])
+
+	// allow the app to do the redirect
+	if (app && isAccepting && token)
+		return (
+			<div
+				style={{
+					position: 'fixed',
+					inset: 0,
+					display: 'flex',
+					justifyContent: 'center',
+					alignItems: 'center',
+				}}
+			>
+				<DefaultSpinner />
+			</div>
+		)
+
+	return <Navigate to={routes.tlaRoot()} state={navigateState} replace />
+}
diff --git a/apps/dotcom/client/src/tla/pages/legacy-history-snapshot.tsx b/apps/dotcom/client/src/tla/pages/legacy-history-snapshot.tsx
index 3d51df01712b..66aa72331d7a 100644
--- a/apps/dotcom/client/src/tla/pages/legacy-history-snapshot.tsx
+++ b/apps/dotcom/client/src/tla/pages/legacy-history-snapshot.tsx
@@ -73,8 +73,18 @@ export function Component({ error: _error }: { error?: unknown }) {
 					<TlaHistorySnapshotEditor
 						fileSlug={result.roomId}
 						snapshot={snapshot}
-						timestamp={ts}
-						isApp={false}
+						onRestore={async () => {
+							const res = await fetch(`/api/r/${result.roomId}/restore`, {
+								method: 'POST',
+								headers: {
+									'Content-Type': 'application/json',
+								},
+								body: JSON.stringify({ timestamp: ts }),
+							})
+							if (!res.ok) {
+								throw new Error('Failed to restore version: ' + (await res.text()))
+							}
+						}}
 					/>
 				</TlaAnonLayout>
 			)}
diff --git a/apps/dotcom/client/src/tla/pages/legacy-history.tsx b/apps/dotcom/client/src/tla/pages/legacy-history.tsx
index 50db7dbee76c..9ef5dccff606 100644
--- a/apps/dotcom/client/src/tla/pages/legacy-history.tsx
+++ b/apps/dotcom/client/src/tla/pages/legacy-history.tsx
@@ -62,7 +62,9 @@ export function Component({ error: _error }: { error?: unknown }) {
 				<TlaFileError error={error} />
 			) : (
 				<TlaAnonLayout>
-					<BoardHistoryLog data={data.data} />
+					<BoardHistoryLog
+						data={data.data.map((timestamp) => ({ timestamp, href: `./${timestamp}` }))}
+					/>
 				</TlaAnonLayout>
 			)}
 		</>
diff --git a/apps/dotcom/client/src/tla/pages/local.tsx b/apps/dotcom/client/src/tla/pages/local.tsx
index 64277b40f591..c7f2f77850c1 100644
--- a/apps/dotcom/client/src/tla/pages/local.tsx
+++ b/apps/dotcom/client/src/tla/pages/local.tsx
@@ -1,18 +1,21 @@
 import { useEffect } from 'react'
-import { useNavigate } from 'react-router-dom'
-import { assert, react } from 'tldraw'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { assert, react, useDialogs } from 'tldraw'
 import { LocalEditor } from '../../components/LocalEditor'
 import { routes } from '../../routeDefs'
 import { globalEditor } from '../../utils/globalEditor'
-import { components } from '../components/TlaEditor/TlaEditor'
+import { TlaSignInDialog } from '../components/dialogs/TlaSignInDialog'
 import { SneakyDarkModeSync } from '../components/TlaEditor/sneaky/SneakyDarkModeSync'
+import { components } from '../components/TlaEditor/TlaEditor'
 import { useMaybeApp } from '../hooks/useAppState'
+import { useInviteDetails } from '../hooks/useInviteDetails'
 import { TlaAnonLayout } from '../layouts/TlaAnonLayout/TlaAnonLayout'
 import { clearShouldSlurpFile, getShouldSlurpFile, setShouldSlurpFile } from '../utils/slurping'
 
 export function Component() {
 	const app = useMaybeApp()
 	const navigate = useNavigate()
+	const location = useLocation()
 
 	useEffect(() => {
 		const handleFileOperations = async () => {
@@ -22,8 +25,10 @@ export function Component() {
 				const res = await app.slurpFile()
 				if (res.ok) {
 					clearShouldSlurpFile()
+					app.ensureFileVisibleInSidebar(res.value.fileId)
 					navigate(routes.tlaFile(res.value.fileId), {
 						replace: true,
+						state: location.state,
 					})
 				} else {
 					// if the user has too many files we end up here.
@@ -33,7 +38,7 @@ export function Component() {
 				return
 			}
 
-			const recentFiles = app.getUserRecentFiles()
+			const recentFiles = app.getMyFiles()
 			if (recentFiles.length === 0) {
 				const result = await app.createFile()
 
@@ -41,18 +46,21 @@ export function Component() {
 				// result is only false if the user reached their file limit so
 				// we don't need to handle that case here since they have no files
 				if (result.ok) {
+					app.ensureFileVisibleInSidebar(result.value.fileId)
 					navigate(routes.tlaFile(result.value.fileId), {
 						replace: true,
+						state: location.state,
 					})
 				}
 				return
 			}
 
-			navigate(routes.tlaFile(recentFiles[0].fileId), { replace: true })
+			app.ensureFileVisibleInSidebar(recentFiles[0].fileId)
+			navigate(routes.tlaFile(recentFiles[0].fileId), { replace: true, state: location.state })
 		}
 
 		handleFileOperations()
-	}, [app, navigate])
+	}, [app, navigate, location])
 
 	if (!app) return <LocalTldraw />
 
@@ -61,6 +69,30 @@ export function Component() {
 }
 
 function LocalTldraw() {
+	const inviteInfo = useInviteDetails()
+	const dialogs = useDialogs()
+	const navigate = useNavigate()
+
+	useEffect(() => {
+		if (inviteInfo && !inviteInfo.error) {
+			// User is not signed in, show sign-in dialog with invite info
+			dialogs.addDialog({
+				component: ({ onClose }) => (
+					<TlaSignInDialog
+						inviteInfo={inviteInfo}
+						onClose={onClose}
+						onInviteAccepted={() => {
+							navigate(
+								routes.tlaInvite(inviteInfo.inviteSecret, { searchParams: { accept: 'true' } }),
+								{ replace: true }
+							)
+						}}
+					/>
+				),
+			})
+		}
+	}, [inviteInfo, dialogs, navigate])
+
 	return (
 		<TlaAnonLayout>
 			<LocalEditor
diff --git a/apps/dotcom/client/src/tla/providers/FileInputFocusProvider.tsx b/apps/dotcom/client/src/tla/providers/FileInputFocusProvider.tsx
deleted file mode 100644
index 8f48c02d1f2b..000000000000
--- a/apps/dotcom/client/src/tla/providers/FileInputFocusProvider.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React, { useContext, useRef } from 'react'
-
-const context = React.createContext({
-	shouldRenameNextNewFile: false,
-})
-
-export function useFileSidebarFocusContext() {
-	return useContext(context)
-}
-
-export function FileSidebarFocusContextProvider({ children }: { children: React.ReactNode }) {
-	const shouldRenameNextNewFileRef = useRef({ shouldRenameNextNewFile: false })
-
-	return <context.Provider value={shouldRenameNextNewFileRef.current}>{children}</context.Provider>
-}
diff --git a/apps/dotcom/client/src/tla/providers/TlaRootProviders.tsx b/apps/dotcom/client/src/tla/providers/TlaRootProviders.tsx
index 1d4b13806b1e..21091fbc6311 100644
--- a/apps/dotcom/client/src/tla/providers/TlaRootProviders.tsx
+++ b/apps/dotcom/client/src/tla/providers/TlaRootProviders.tsx
@@ -2,7 +2,7 @@ import { useAuth, useUser as useClerkUser } from '@clerk/clerk-react'
 import { getAssetUrlsByImport } from '@tldraw/assets/imports.vite'
 import classNames from 'classnames'
 import { Tooltip as _Tooltip } from 'radix-ui'
-import { ReactNode, useCallback, useEffect, useState } from 'react'
+import { ReactNode, useCallback, useEffect, useRef, useState } from 'react'
 import { Outlet } from 'react-router-dom'
 import {
 	ContainerProvider,
@@ -14,16 +14,20 @@ import {
 	TldrawUiA11yProvider,
 	TldrawUiContextProvider,
 	fetch,
+	runtime,
+	setRuntimeOverrides,
+	useDialogs,
 	useToasts,
 	useValue,
 } from 'tldraw'
 import translationsEnJson from '../../../public/tla/locales-compiled/en.json'
 import { ErrorPage } from '../../components/ErrorPage/ErrorPage'
-import { SignedInAnalytics, SignedOutAnalytics } from '../../utils/analytics'
+import { SignedInAnalytics, SignedOutAnalytics, trackEvent } from '../../utils/analytics'
 import { globalEditor } from '../../utils/globalEditor'
 import { MaybeForceUserRefresh } from '../components/MaybeForceUserRefresh/MaybeForceUserRefresh'
 import { components } from '../components/TlaEditor/TlaEditor'
 import { TlaCookieConsent } from '../components/dialogs/TlaCookieConsent'
+import { TlaLegalAcceptance } from '../components/dialogs/TlaLegalAcceptance'
 import { AppStateProvider, useMaybeApp } from '../hooks/useAppState'
 import { UserProvider } from '../hooks/useUser'
 import '../styles/tla.css'
@@ -33,10 +37,26 @@ import {
 	getLocalSessionState,
 	updateLocalSessionState,
 } from '../utils/local-session-state'
-import { FileSidebarFocusContextProvider } from './FileInputFocusProvider'
 
 const assetUrls = getAssetUrlsByImport()
 
+// Override watermark URLs globally for all dotcom editors
+function WatermarkOverride() {
+	useEffect(() => {
+		const originalOpenWindow = runtime.openWindow
+		setRuntimeOverrides({
+			openWindow(url: string, target: string, allowReferrer?: boolean) {
+				if (url.includes('utm_campaign=watermark')) {
+					url = url.replace('utm_source=sdk', 'utm_source=dotcom')
+					trackEvent('click-watermark', { url })
+				}
+				originalOpenWindow(url, target, allowReferrer)
+			},
+		})
+	}, [])
+	return null
+}
+
 export const appMessages = defineMessages({
 	oldBrowser: {
 		defaultMessage: 'Old browser detected. Please update your browser to use this app.',
@@ -81,12 +101,14 @@ export function Component() {
 							<ContainerProvider container={container}>
 								<InsideOfContainerContext>
 									<Outlet />
+									<LegalTermsAcceptance />
 								</InsideOfContainerContext>
 							</ContainerProvider>
 						)}
 					</SignedInProvider>
 				</MaybeForceUserRefresh>
 			</IntlWrapper>
+			<WatermarkOverride />
 		</div>
 	)
 }
@@ -103,7 +125,10 @@ function IntlWrapper({ children, locale }: { children: ReactNode; locale: string
 
 			const res = await fetch(`/tla/locales-compiled/${locale}.json`)
 			const messages = await res.json()
-			setMessages(messages)
+			setMessages({
+				...translationsEnJson,
+				...messages,
+			})
 		}
 		fetchMessages()
 	}, [locale])
@@ -214,19 +239,51 @@ function SignedInProvider({
 	}
 
 	return (
-		<FileSidebarFocusContextProvider>
-			<AppStateProvider>
-				<UserProvider>
-					<ThemeContainer onThemeChange={onThemeChange}>
-						<SignedInAnalytics />
-						{children}
-					</ThemeContainer>
-				</UserProvider>
-			</AppStateProvider>
-		</FileSidebarFocusContextProvider>
+		<AppStateProvider>
+			<UserProvider>
+				<ThemeContainer onThemeChange={onThemeChange}>
+					<SignedInAnalytics />
+					{children}
+				</ThemeContainer>
+			</UserProvider>
+		</AppStateProvider>
 	)
 }
 
+function LegalTermsAcceptance() {
+	const { user } = useClerkUser()
+	const { addDialog } = useDialogs()
+	const userRef = useRef(user)
+
+	// Keep the ref updated with the latest user
+	useEffect(() => {
+		userRef.current = user
+	}, [user])
+
+	useEffect(() => {
+		function maybeShowDialog() {
+			const currentUser = userRef.current
+			if (
+				currentUser &&
+				!currentUser.legalAcceptedAt && // Clerk's canonical metadata key (older accounts)
+				!currentUser.unsafeMetadata?.legal_accepted_at // our metadata key (newer accounts)
+			) {
+				addDialog({
+					component: TlaLegalAcceptance,
+					onClose: () => {
+						// If the user closes the dialog and it's not accepted, show it again
+						maybeShowDialog()
+					},
+				})
+			}
+		}
+
+		maybeShowDialog()
+	}, [addDialog, user?.id])
+
+	return null
+}
+
 function ThemeContainer({
 	children,
 	onThemeChange,
diff --git a/apps/dotcom/client/src/tla/styles/fairy.css b/apps/dotcom/client/src/tla/styles/fairy.css
index 2e1075a7b99b..1a0c4af73391 100644
--- a/apps/dotcom/client/src/tla/styles/fairy.css
+++ b/apps/dotcom/client/src/tla/styles/fairy.css
@@ -55,29 +55,6 @@
 	}
 }
 
-/* Fairy Home */
-
-.fairy-home {
-	position: fixed;
-	bottom: 48px;
-	right: 20px;
-	pointer-events: auto;
-	z-index: 1000;
-}
-
-.fairy-home__stack {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	pointer-events: auto;
-	height: 182px; /* 50px * 3 + 8px * 2 (gaps) + 16px (padding) */
-	overflow-y: auto;
-	background-color: var(--tl-color-panel);
-	padding: 8px;
-	border-radius: 8px;
-	border: 1px solid var(--tl-color-muted-2);
-}
-
 /* Fairy Row */
 
 .fairy-row {
@@ -94,30 +71,6 @@
 
 /* Fairy Square */
 
-.fairy-square {
-	width: 50px;
-	height: 50px;
-	border: 1px solid var(--tl-color-muted-2);
-	border-radius: 4px;
-	background-color: var(--tl-color-muted-1);
-	cursor: pointer;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	font-size: 24px;
-	pointer-events: auto;
-}
-
-.fairy-square:hover {
-	background-color: var(--tl-color-muted-2);
-}
-
-.fairy-square--selected {
-	background-color: var(--tl-color-primary);
-	border-color: var(--tl-color-primary);
-	color: var(--tl-color-panel-contrast);
-}
-
 .fairy-selected {
 	position: relative;
 }
@@ -173,6 +126,11 @@
 	);
 }
 
+.fairy-toggle-button[data-isactive='true']::before,
+.fairy-toggle-button[data-isactive='true']::after {
+	transform: scale(0.9);
+}
+
 /* Fairy Input */
 
 .fairy-input {
@@ -208,36 +166,10 @@
 	color: var(--tl-color-text-3);
 }
 
-.fairy-input__new-chat {
-	pointer-events: auto;
-	width: 16px;
-	height: 16px;
-	padding: 0;
-	background-color: var(--tl-color-primary);
-	color: var(--tl-color-panel-contrast);
-	border: none;
-	border-radius: 100%;
-	cursor: pointer;
-	font-size: 10px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-shrink: 0;
-}
-
-.fairy-input__new-chat:hover:not(:disabled) {
-	background-color: var(--tl-color-primary-hover);
-}
-
-.fairy-input__new-chat:disabled {
-	background-color: var(--tl-color-grid);
-	cursor: not-allowed;
-}
-
 .fairy-input__submit {
 	pointer-events: auto;
-	width: 32px;
-	height: 32px;
+	width: 30px;
+	height: 30px;
 	flex-shrink: 0;
 	padding: 10px;
 	margin: -10px;
@@ -254,7 +186,7 @@
 }
 
 .fairy-input__submit:hover:not(:disabled) {
-	background-color: var(--tl-color-muted-1);
+	background-color: var(--tl-color-hint);
 }
 
 .fairy-input__submit:disabled {
@@ -275,20 +207,61 @@
 	height: 100%;
 }
 
-/* Fairy Toggle Button */
-
 .fairy-toggle-button {
+	position: relative;
 	width: 40px !important;
 	height: 40px !important;
 	min-width: 40px !important;
 	min-height: 40px !important;
 }
 
+.fairy-button-project-indicator {
+	position: absolute;
+	top: 2px;
+	right: 2px;
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	border: 1.5px solid;
+	pointer-events: none;
+	z-index: 10;
+}
+
+.fairy-button-project-indicator--orchestrator {
+	background-color: transparent !important;
+	border-width: 2px;
+	width: 10px;
+	height: 10px;
+	top: 1px;
+	right: 1px;
+}
+
+/* Fairy HUD */
+
+.tla-fairy-hud {
+	position: fixed;
+	right: 6px;
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+	border-radius: var(--tl-radius-2);
+	box-shadow: var(--tl-shadow-1);
+	border-radius: var(--tl-radius-2);
+	gap: 0px;
+	z-index: var(--tl-layer-canvas-in-front);
+}
+
+.tla-fairy-hud-content {
+	display: flex;
+	flex-direction: row;
+	align-items: stretch;
+	gap: 0px;
+}
+
 /* Fairy HUD Container Scrollbar */
 
 * {
 	/* Prevent screen bouncing when you scroll up through the chat history */
-	/* Todo: Find a more precise class to apply this to */
 	overscroll-behavior-y: none;
 }
 
@@ -314,9 +287,9 @@
 
 .fairy-toolbar-header {
 	display: flex;
+	flex-direction: row;
 	align-items: center;
 	justify-content: start;
-	height: 32px;
 	border-bottom: 1px solid var(--tl-color-divider);
 	padding: 4px;
 	flex-shrink: 0;
@@ -324,47 +297,44 @@
 }
 
 .fairy-id-display {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	gap: 6px;
 	flex: 1;
 	font-size: 12px;
 	color: var(--tl-color-text-2);
+	padding: 0px 6px;
+	text-align: center;
+	margin-left: 16px;
 }
 
-.fairy-toolbar-stack-header {
+.fairy-spinner-container {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	height: 32px;
-	border-bottom: 1px solid var(--tl-color-divider);
-	padding: 4px;
-	flex-shrink: 0;
+	width: 16px;
+	height: 16px;
 }
 
-.fairy-toolbar-button {
-	width: 24px;
-	height: 24px;
-	font-size: 14px;
-	appearance: none;
-	border: 0;
-	border-radius: 4px;
-	cursor: pointer;
-	background: var(--tl-color-panel);
-	color: var(--tl-color-text);
+.fairy-toolbar-stack-header {
 	display: flex;
+	flex-direction: column;
 	align-items: center;
 	justify-content: center;
+	border-bottom: 1px solid var(--tl-color-divider);
+	flex-shrink: 0;
 }
 
-#fairy-toolbar-minimize-button {
-	flex-grow: 1;
-}
-
-.fairy-toolbar-button:hover:not(:disabled) {
-	background-color: var(--tl-color-muted-2);
+.fairy-toolbar-button {
+	font-size: 14px;
+	height: 32px;
+	margin: -4px;
 }
 
-.fairy-toolbar-button:disabled {
-	opacity: 0.3;
-	cursor: not-allowed;
+.fairy-toolbar-sidebar-button {
+	height: 32px;
+	font-size: 14px;
 }
 
 .fairy-new-button {
@@ -383,7 +353,7 @@
 }
 
 .fairy-new-button:hover:not(:disabled) {
-	background-color: var(--tl-color-muted-1);
+	background-color: var(--tl-color-hint);
 }
 
 .fairy-new-button:disabled {
@@ -398,15 +368,25 @@
 	flex-direction: column;
 	background-color: var(--tl-color-panel);
 	border-radius: var(--tl-radius-2);
-	box-shadow: var(--tl-shadow-1);
-	z-index: 1;
+	z-index: 0;
 }
 
-.tla-fairy-hud:has(.fairy-chat-panel) .fairy-buttons-container {
-	border-left: none;
+.fairy-chat-panel[data-panel-state='open'] + .fairy-buttons-container {
+	border-left: 1px solid var(--tl-color-divider);
 	border-radius: 0 var(--tl-radius-2) var(--tl-radius-2) 0;
 }
 
+.fairy-list-scrollable {
+	height: calc(48px * 3 + 11px); /* 4 fairies max visible */
+	overflow-y: auto;
+	scrollbar-width: none; /* Firefox */
+	-ms-overflow-style: none; /* IE and Edge */
+}
+
+.fairy-list-scrollable::-webkit-scrollbar {
+	display: none; /* Chrome, Safari, Opera */
+}
+
 /* Fairy Chat Panel */
 
 .fairy-chat-panel {
@@ -415,29 +395,46 @@
 	width: 350px;
 	height: 224px;
 	background-color: var(--tl-color-panel);
-	border-radius: var(--tl-radius-2) var(--tl-radius-2) 0 var(--tl-radius-2);
-	box-shadow: var(--tl-shadow-1);
+	border-radius: var(--tl-radius-2);
 	overflow: hidden;
 	pointer-events: auto;
 	z-index: 2;
 }
 
+/* Fairy Debug Dialog - Fixed width and height */
+.fairy-debug-dialog-wrapper {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	width: 100%;
+}
+
+/* Make the dialog content fixed size */
+.tlui-dialog__content:has(.fairy-debug-dialog-wrapper) {
+	width: 800px;
+	height: 600px;
+	max-width: 800px;
+	max-height: 600px;
+}
+
 /* Fairy Chat History */
 
 .fairy-chat-history {
 	flex: 1;
 	overflow-y: auto;
-	padding: 12px;
+	padding: 8px;
 	display: flex;
 	flex-direction: column;
-	gap: 12px;
+	gap: 6px;
 	min-height: 0;
 	height: 0;
 	scrollbar-width: 8px;
 	scrollbar-color: var(--tl-color-muted-1) transparent;
 }
 
-.fairy-chat-history * {
+.fairy-chat-history span:not(button *),
+.fairy-chat-history div:not(button *),
+.fairy-chat-history p:not(button *) {
 	user-select: text;
 	cursor: initial;
 }
@@ -460,6 +457,15 @@
 	flex-direction: column;
 	gap: 8px;
 	flex-shrink: 0;
+	padding-top: 4px;
+}
+
+.fairy-chat-history-section:not(:first-child) {
+	padding-top: 8px;
+}
+
+.fairy-chat-history-section:last-child:not(:only-child) {
+	min-height: calc(100% + 4px);
 }
 
 .fairy-chat-history-prompt-container {
@@ -473,9 +479,9 @@
 	background-color: var(--tl-color-panel);
 }
 
-.fairy-chat-history-prompt {
-	background-color: var(--tl-color-muted-1);
-	box-shadow: var(--tl-shadow-1);
+.fairy-chat-history-prompt,
+.fairy-chat-history-prompt-fairy {
+	background-color: var(--tl-color-low);
 	border-radius: 8px;
 	padding: 8px;
 	font-size: 12px;
@@ -487,6 +493,11 @@
 	scrollbar-color: var(--tl-color-text-3) transparent;
 }
 
+.fairy-chat-history-prompt-fairy {
+	color: var(--tl-color-text-3);
+	font-style: italic;
+}
+
 .fairy-chat-history-prompt::-webkit-scrollbar {
 	width: 6px;
 	background: transparent;
@@ -510,14 +521,13 @@
 .fairy-chat-history-group {
 	display: flex;
 	flex-direction: column;
-	gap: 8px;
+	gap: 6px;
 }
 
 .fairy-chat-history-group-toggle {
 	display: flex;
 	align-items: center;
 	gap: 6px;
-	padding: 2px 4px;
 	background-color: transparent;
 	border: none;
 	border-radius: 6px;
@@ -525,16 +535,12 @@
 	color: var(--tl-color-text-3);
 	cursor: pointer;
 	margin-left: -4px;
-}
-.fairy-chat-history-group-toggle button {
-	cursor: pointer;
+	text-align: left;
+	align-items: start;
 }
 
-.fairy-chat-history-group-toggle span {
-	cursor: pointer;
-}
 .fairy-chat-history-group-toggle:hover {
-	background-color: var(--tl-color-muted-2);
+	color: var(--tl-color-text-1);
 }
 
 .fairy-chat-history-group-toggle svg {
@@ -542,6 +548,15 @@
 	height: 14px;
 	color: var(--tl-color-text-3);
 	flex-shrink: 0;
+	cursor: pointer;
+}
+
+.fairy-chat-history-group-toggle:hover svg {
+	color: var(--tl-color-text-1);
+}
+
+.fairy-chat-history-group-toggle * {
+	cursor: pointer;
 }
 
 .fairy-chat-history-group-summary {
@@ -553,10 +568,17 @@
 	color: var(--tl-color-text-3);
 }
 
+.fairy-chat-history-group-toggle-and-items {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
 .fairy-chat-history-group-items {
 	display: flex;
 	flex-direction: column;
 	gap: 6px;
+	padding-left: 2px;
 }
 
 .fairy-chat-history-action-content {
@@ -568,7 +590,7 @@
 	display: flex;
 	flex-direction: row;
 	align-items: start;
-	gap: 4px;
+	gap: 6px;
 	font-size: 12px;
 	line-height: 1.5;
 	color: var(--tl-color-text-3);
@@ -578,10 +600,30 @@
 	color: var(--tl-color-text-1);
 }
 
+.fairy-chat-history-action-message ol,
+.fairy-chat-history-action-message ul {
+	margin-top: -28px;
+}
+
+.fairy-chat-history-action-message li {
+	margin-bottom: -14px;
+}
+
 .fairy-chat-history-action-icon svg {
 	width: 14px;
 	height: 14px;
 	color: var(--tl-color-text-3);
+	margin-top: 2px;
+}
+
+.fairy-chat-history-item-container {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+}
+
+.fairy-chat-history-item-container > .fairy-chat-history-action {
+	padding-left: 2px;
 }
 
 .fairy-chat-loading {
@@ -589,6 +631,8 @@
 	font-size: 12px;
 	text-align: center;
 	padding: 4px;
+	margin-left: 12px;
+	margin-bottom: 6px;
 }
 
 .fairy-chat-empty {
@@ -608,3 +652,868 @@
 	height: auto;
 	flex-shrink: 0;
 }
+
+.fairy-chat-empty-message {
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+/* Fairy Info View */
+
+.fairy-info-view {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	overflow: auto;
+}
+
+/* shared todo List Inline */
+
+.shared-todo-list-inline {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+	overflow: hidden;
+	height: 100%;
+}
+
+.shared-todo-list-header {
+	font-size: 12px;
+	font-weight: 500;
+	margin-bottom: 8px;
+	color: var(--tl-color-text-2);
+	padding-left: 4px;
+}
+
+.shared-todo-list-empty {
+	color: var(--tl-color-text-3);
+	font-size: 12px;
+	text-align: center;
+	padding: 20px;
+}
+
+.shared-todo-list-items {
+	display: flex;
+	flex-direction: column;
+	overflow-y: auto;
+	flex: 1;
+	padding: 8px;
+	scrollbar-width: 8px;
+	scrollbar-color: var(--tl-color-muted-1) transparent;
+}
+
+.shared-todo-list-items::-webkit-scrollbar {
+	width: 8px;
+}
+
+.shared-todo-list-items::-webkit-scrollbar-track {
+	background: transparent;
+}
+
+.shared-todo-list-items::-webkit-scrollbar-thumb {
+	background: var(--tl-color-muted-1);
+	border-radius: 4px;
+}
+
+.shared-todo-item {
+	position: relative;
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+	padding-left: 4px;
+	border-radius: 6px;
+	font-size: 12px;
+	line-height: 1.3;
+}
+
+.shared-todo-item-main {
+	display: flex;
+	align-items: flex-start;
+	gap: 8px;
+}
+
+.shared-todo-item-icon {
+	font-size: 10px;
+	width: 12px;
+	text-align: center;
+	flex-shrink: 0;
+	user-select: none;
+}
+
+.shared-todo-item-text {
+	flex: 1;
+	color: var(--tl-color-text-3);
+	user-select: none;
+	padding-bottom: 2px;
+}
+
+.shared-todo-item-delete {
+	appearance: none;
+	background: none;
+	border: none;
+	width: 16px;
+	height: 16px;
+	flex-shrink: 0;
+	padding: 0;
+	margin: 0;
+	margin-left: 4px;
+	cursor: pointer;
+	color: var(--tl-color-text-3);
+	font-size: 16px;
+	line-height: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.shared-todo-item-delete:hover {
+	color: var(--tl-color-text);
+}
+
+.shared-todo-item-drag {
+	appearance: none;
+	background: none;
+	border: none;
+	width: 16px;
+	height: 16px;
+	flex-shrink: 0;
+	padding: 0;
+	margin: 0;
+	margin-left: 4px;
+	cursor: grab;
+	color: var(--tl-color-text-3);
+	font-size: 14px;
+	line-height: 1;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.shared-todo-item-drag:hover {
+	color: var(--tl-color-text);
+}
+
+.shared-todo-item-drag:active {
+	cursor: grabbing;
+}
+
+.shared-todo-item-assign {
+	padding-left: 20px;
+	padding-bottom: 6px;
+	display: flex;
+	align-items: center;
+	gap: 6px;
+}
+
+.shared-todo-item-fairy-select {
+	font-size: 10px;
+	color: var(--tl-color-text-3);
+	background-color: transparent;
+	border: 1px solid var(--tl-color-muted-2);
+	border-radius: 4px;
+	padding: 2px 4px;
+	cursor: pointer;
+	font-family: inherit;
+	outline: none;
+}
+
+.shared-todo-item-fairy-select:hover {
+	color: var(--tl-color-text);
+	border-color: var(--tl-color-text-3);
+}
+
+.shared-todo-item-fairy-select:focus {
+	border-color: var(--tl-color-primary);
+}
+
+.shared-todo-item-help-button {
+	font-size: 10px;
+	color: var(--tl-color-text-3);
+	background-color: transparent;
+	border: 1px solid var(--tl-color-muted-2);
+	border-radius: 4px;
+	padding: 2px 6px;
+	cursor: pointer;
+	font-family: inherit;
+	white-space: nowrap;
+	font-weight: 500;
+}
+
+.shared-todo-item-help-button:hover {
+	color: var(--tl-color-text);
+	border-color: var(--tl-color-primary);
+	background-color: var(--tl-color-muted-1);
+}
+
+/* Status variants */
+
+.shared-todo-item--todo .shared-todo-item-icon {
+	color: var(--tl-color-text-3);
+}
+
+.shared-todo-item--in-progress .shared-todo-item-icon {
+	color: var(--tl-color-primary);
+}
+
+.shared-todo-item--in-progress .shared-todo-item-text {
+	font-weight: 500;
+	color: var(--tl-color-text);
+}
+
+.shared-todo-item--done .shared-todo-item-icon {
+	color: rgb(76, 200, 94);
+}
+
+.shared-todo-item--done .shared-todo-item-text {
+	color: var(--tl-color-text-2);
+	text-decoration: line-through;
+}
+
+.shared-todo-item-project-indicator {
+	position: absolute;
+	top: -2px;
+	left: -2px;
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	border: 2px solid var(--tl-color-panel);
+	pointer-events: none;
+	z-index: 1;
+}
+
+/* shared todo Input */
+
+.shared-todo-input {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	padding: 6px;
+	border-bottom: 1px solid var(--tl-color-divider);
+	flex-shrink: 0;
+}
+
+.shared-todo-input-field {
+	flex: 1;
+	padding: 6px 8px;
+	background-color: transparent;
+	border: 1px solid var(--tl-color-muted-2);
+	border-radius: 4px;
+	color: var(--tl-color-text);
+	font-size: 12px;
+	font-family: inherit;
+	outline: none;
+}
+
+.shared-todo-input-field::placeholder {
+	color: var(--tl-color-text-3);
+}
+
+.shared-todo-input-field:focus {
+	border-color: var(--tl-color-primary);
+}
+
+.shared-todo-input-submit {
+	flex-shrink: 0;
+	width: 32px;
+	height: 100%;
+	background-color: var(--tl-color-primary);
+	color: white;
+	border: none;
+	border-radius: 4px;
+	cursor: pointer;
+	padding: 0;
+	font-size: 18px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+
+.shared-todo-input-submit:hover:not(:disabled) {
+	background-color: var(--tl-color-focus);
+}
+
+.shared-todo-input-submit:disabled {
+	opacity: 0.3;
+	cursor: not-allowed;
+}
+
+.fairy-todo-unread-indicator {
+	position: absolute;
+	top: 4px;
+	right: 6px;
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	background-color: #ff8c00;
+	pointer-events: none;
+}
+
+/* Fairy config dialog */
+
+.fairy-config-input {
+	background-color: var(--tl-color-low);
+	padding: 8px;
+	border-radius: var(--tl-radius-2);
+	border: 1px solid var(--tl-color-muted-2);
+}
+
+.fairy-config-dialog select {
+	background-color: var(--tl-color-low);
+	padding: 9px 8px;
+	border-radius: var(--tl-radius-2);
+	border: 1px solid var(--tl-color-muted-2);
+	color: var(--tl-color-text);
+	font-size: 12px;
+	font-family: inherit;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+	outline: none;
+	appearance: none;
+	background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
+	background-repeat: no-repeat;
+	background-position: right 8px center;
+	background-size: 16px;
+	padding-right: 32px;
+}
+
+/* Fairy Group Chat */
+
+.fairy-group-chat {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	overflow: hidden;
+}
+
+.fairy-group-chat-leader-toggle-container {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	padding: 8px;
+	flex: 1;
+	min-height: 0;
+}
+
+.fairy-group-chat-leader-info {
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+	padding: 4px 0;
+	font-size: 11px;
+	color: var(--tl-color-text-3);
+}
+
+.fairy-group-chat-leader-info p {
+	margin: 0;
+	line-height: 1.4;
+}
+
+/* Fairy Group Chat Input */
+
+.fairy-group-chat-input {
+	pointer-events: auto;
+	position: relative;
+	display: flex;
+	align-items: start;
+	gap: 8px;
+	padding: 8px 8px 8px 12px;
+	border-top: 1px solid var(--tl-color-divider);
+	height: 41px;
+}
+
+.fairy-group-chat-input__wrapper {
+	flex: 1;
+	display: flex;
+	align-items: start;
+	min-height: 0;
+	height: 100%;
+}
+
+.fairy-group-chat-input__field {
+	pointer-events: auto;
+	border: none;
+	background: transparent;
+	color: var(--tl-color-text);
+	font-size: 12px;
+	font-family: inherit;
+	outline: none;
+	width: 100%;
+	height: 100%;
+	resize: none;
+	overflow-y: auto;
+	line-height: 1.5;
+	scrollbar-width: thin;
+	scrollbar-color: var(--tl-color-muted-1) transparent;
+}
+
+.fairy-group-chat-input__field::-webkit-scrollbar {
+	width: 6px;
+	background: transparent;
+}
+
+.fairy-group-chat-input__field::-webkit-scrollbar-track {
+	background: transparent;
+}
+
+.fairy-group-chat-input__field::-webkit-scrollbar-thumb {
+	background: var(--tl-color-muted-1);
+	border-radius: 3px;
+}
+
+.fairy-group-chat-input__field::placeholder {
+	color: var(--tl-color-text-3);
+}
+
+.fairy-group-chat-input__submit {
+	pointer-events: auto;
+	width: 30px;
+	height: 30px;
+	flex-shrink: 0;
+	padding: 0;
+	margin: 0;
+	background-color: transparent;
+	border: none;
+	border-radius: var(--tl-radius-2);
+	cursor: pointer;
+	font-size: 18px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-shrink: 0;
+	align-self: flex-start;
+	transition: background-color 0.1s ease;
+}
+
+.fairy-group-chat-input__submit:hover:not(:disabled) {
+	background-color: var(--tl-color-hint);
+}
+
+.fairy-group-chat-input__submit:disabled {
+	filter: grayscale(100%);
+	cursor: not-allowed;
+	opacity: 0.5;
+}
+
+/* In Canvas Todo */
+
+.in-canvas-todo-item-wrapper {
+	position: absolute;
+	transform: translate(0, 0) scale(var(--tl-scale));
+	transform-origin: 0% 0%;
+	padding: 6px; /* extra mouseover padding bc the todo item is small when unhovered */
+	pointer-events: auto;
+}
+
+.in-canvas-todo-item {
+	display: flex;
+	align-items: flex-start;
+	gap: 6px;
+	background-color: var(--tl-color-panel);
+	border-radius: 6px;
+	padding: 6px;
+	font-size: 12px;
+	line-height: 1.3;
+	box-shadow: var(--tl-shadow-1);
+	pointer-events: auto;
+	user-select: none;
+	width: auto;
+	overflow: hidden;
+	opacity: 0.67;
+	margin: -6px; /* offset mouseover padding to top left of todo item is in correct position */
+}
+
+.in-canvas-todo-item-delete {
+	position: relative;
+	appearance: none;
+	background: none;
+	border: none;
+	width: 16px;
+	height: 16px;
+	padding: 0;
+	margin: 0;
+	cursor: pointer;
+	color: var(--tl-color-text-3);
+	font-size: 16px;
+	line-height: 1;
+	pointer-events: auto;
+	display: none;
+	flex-shrink: 0;
+}
+
+.in-canvas-todo-item-icon {
+	appearance: none;
+	background: none;
+	border: none;
+	width: 24px;
+	height: 24px;
+	padding: 0px 0px;
+	margin: -3px;
+	margin-top: -3px;
+	color: var(--tl-color-text-3);
+	font-size: 10px;
+	line-height: 1;
+	pointer-events: auto;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.in-canvas-todo-list:not(.in-canvas-todo-list--dragging)
+	.in-canvas-todo-item-wrapper:hover
+	.in-canvas-todo-item {
+	opacity: 1;
+}
+
+.in-canvas-todo-list:not(.in-canvas-todo-list--dragging)
+	.in-canvas-todo-item-wrapper:hover
+	.in-canvas-todo-item-text {
+	display: block;
+}
+
+.in-canvas-todo-list:not(.in-canvas-todo-list--dragging)
+	.in-canvas-todo-item-wrapper:hover
+	.in-canvas-todo-item-delete {
+	display: block;
+}
+
+.in-canvas-todo-list:not(.in-canvas-todo-list--dragging)
+	.in-canvas-todo-item-wrapper:hover
+	.in-canvas-todo-item-delete:hover {
+	color: var(--tl-color-text);
+}
+
+.in-canvas-todo-item-text {
+	color: var(--tl-color-text-3);
+	width: 160px;
+	overflow-y: scroll;
+	padding-top: 2px;
+	word-wrap: break-word;
+	word-break: break-word;
+	white-space: normal;
+	pointer-events: auto;
+	scrollbar-width: 8px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	scrollbar-color: var(--tl-color-muted-1) transparent;
+	display: none;
+	flex-shrink: 0;
+}
+
+.in-canvas-todo-item-text::-webkit-scrollbar {
+	width: 8px;
+}
+
+.in-canvas-todo-item-text::-webkit-scrollbar-track {
+	background: transparent;
+}
+
+.in-canvas-todo-item-text::-webkit-scrollbar-thumb {
+	background: var(--tl-color-muted-1);
+	border-radius: 4px;
+}
+
+/* Status variants */
+
+.in-canvas-todo-item--todo .in-canvas-todo-item-icon {
+	color: var(--tl-color-text-3);
+}
+
+.in-canvas-todo-item--in-progress .in-canvas-todo-item-icon {
+	color: var(--tl-color-primary);
+}
+
+.in-canvas-todo-item--in-progress .in-canvas-todo-item-text {
+	font-weight: 500;
+	color: var(--tl-color-text);
+}
+
+.in-canvas-todo-item--done .in-canvas-todo-item-icon {
+	color: rgb(76, 200, 94);
+}
+
+.in-canvas-todo-item--done .in-canvas-todo-item-text {
+	color: var(--tl-color-text-2);
+	text-decoration: line-through;
+}
+
+.in-canvas-todo-item-project-indicator {
+	position: absolute;
+	top: -2px;
+	left: -2px;
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	border: 2px solid var(--tl-color-panel);
+	pointer-events: none;
+	z-index: 1;
+}
+
+/* Fairy Debug Dialog Styles */
+
+.fairy-debug-json-display {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	font-family: monospace;
+	font-size: 12px;
+	background: var(--color-low);
+	padding: 8px;
+	border-radius: 4px;
+}
+
+.fairy-debug-pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-break: break-word;
+}
+
+.fairy-debug-tabs {
+	display: flex;
+	flex-direction: row;
+	gap: 8px;
+	padding: 8px;
+}
+
+.fairy-debug-view-dropdown {
+	padding: 8px;
+	max-width: 200px;
+}
+
+.fairy-debug-dropdown {
+	z-index: var(--tl-layer-canvas-in-front) !important;
+}
+
+.fairy-debug-view-label {
+	display: block;
+	margin-bottom: 4px;
+}
+
+.fairy-debug-view-button {
+	width: 100%;
+}
+
+.fairy-debug-dialog-body {
+	flex: 1 1 0;
+	min-height: 0;
+	overflow: auto;
+}
+
+.fairy-debug-view-container {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
+.fairy-debug-container {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	font-family: monospace;
+	font-size: 12px;
+	background: var(--color-low);
+	padding: 8px;
+	border-radius: 4px;
+}
+
+.fairy-debug-header {
+	font-weight: bold;
+	color: var(--color-text-2);
+	margin-bottom: 4px;
+}
+
+.fairy-debug-empty {
+	color: var(--color-text-3);
+	font-style: italic;
+}
+
+.fairy-debug-item {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.fairy-debug-key-value {
+	display: flex;
+	gap: 8px;
+}
+
+.fairy-debug-label {
+	font-weight: bold;
+	color: var(--color-text-2);
+}
+
+.fairy-debug-config-container {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	font-family: monospace;
+	font-size: 12px;
+	background: var(--color-low);
+	padding: 8px;
+	border-radius: 4px;
+}
+
+.fairy-debug-projects-container {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	font-family: monospace;
+	font-size: 12px;
+}
+
+.fairy-debug-projects-header {
+	font-weight: bold;
+	color: var(--color-text-2);
+	margin-bottom: 4px;
+}
+
+.fairy-debug-projects-empty {
+	color: var(--color-text-3);
+	font-style: italic;
+}
+
+.fairy-debug-project-card {
+	background: var(--color-low);
+	padding: 8px;
+	border-radius: 4px;
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
+.fairy-debug-project-name {
+	font-weight: bold;
+	color: var(--color-text-2);
+}
+
+.fairy-debug-project-details {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.fairy-debug-project-todos-section {
+	margin-top: 8px;
+}
+
+.fairy-debug-project-todos-header {
+	font-weight: bold;
+	color: var(--color-text-2);
+	margin-bottom: 4px;
+}
+
+.fairy-debug-project-todos-empty {
+	color: var(--color-text-3);
+	font-style: italic;
+	font-size: 11px;
+}
+
+.fairy-debug-project-todos-list {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	background: var(--color-panel);
+	padding: 8px;
+	border-radius: 4px;
+}
+
+.fairy-debug-project-todo-item {
+	font-size: 11px;
+}
+
+.fairy-debug-project-separator {
+	margin: 8px 0;
+}
+
+.fairy-debug-shared-todos-container {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	font-family: monospace;
+	font-size: 12px;
+}
+
+.fairy-debug-shared-todos-header {
+	font-weight: bold;
+	color: var(--color-text-2);
+	margin-bottom: 4px;
+}
+
+.fairy-debug-shared-todos-empty {
+	color: var(--color-text-3);
+	font-style: italic;
+}
+
+.fairy-debug-shared-todo-item {
+	margin-bottom: 8px;
+}
+
+.fairy-debug-shared-todo-separator {
+	margin: 8px 0;
+}
+
+.home-debug-options-container {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	gap: 24px;
+	padding: 8px;
+}
+
+.fairy-debug-options-container {
+	display: flex;
+	flex-direction: row;
+	gap: 24px;
+	padding: 8px;
+}
+
+.fairy-debug-flags-container {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
+.fairy-debug-options-buttons {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	gap: 8px;
+}
+
+.fairy-debug-flags-checkboxes {
+	display: flex;
+	flex-direction: column;
+	/* gap: 8px; */
+}
+
+.fairy-debug-flags-button {
+	flex-shrink: 0;
+	width: auto;
+}
+
+.fairy-debug-flags-checkbox {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	cursor: pointer;
+	border-radius: 4px;
+}
+
+.fairy-debug-flags-checkbox:hover {
+	background: var(--color-hovered);
+}
+
+.fairy-debug-flags-checkbox input[type='checkbox'] {
+	cursor: pointer;
+	margin: 0;
+}
+
+.fairy-debug-flags-checkbox span {
+	/* font-size: 13px; */
+	color: var(--color-text);
+	user-select: none;
+}
diff --git a/apps/dotcom/client/src/tla/styles/tla.css b/apps/dotcom/client/src/tla/styles/tla.css
index c7b2cafa1a67..e00cf3702618 100644
--- a/apps/dotcom/client/src/tla/styles/tla.css
+++ b/apps/dotcom/client/src/tla/styles/tla.css
@@ -58,6 +58,7 @@
 	--tla-color-accent-2: hsl(28, 88%, 57%);
 	--tla-color-accent-3: hsl(135, 59%, 49%);
 	--tla-color-warning: hsl(0, 88%, 57%);
+	--tla-color-drop-zone: hsl(204, 16%, 4%, 2.5%);
 	/* Shadows */
 	/* --tla-shadow-primary-highlight: inset 0px 4px 2px -4px hsl(214, 94%, 94%),
 		inset 4px 4px 4px -6px hsl(214, 94%, 100%); */
@@ -101,6 +102,7 @@
 	--tla-color-accent-2: hsl(28, 88%, 47%);
 	--tla-color-accent-3: hsl(135, 59%, 39%);
 	--tla-color-warning: hsl(0, 95%, 65%);
+	--tla-color-drop-zone: hsl(204, 16%, 4%, 2.5%);
 	/* Shadows */
 	/* --tla-shadow-primary-highlight: inset 0px 1px 1px -1px hsl(214, 94%, 72%),
 		inset 4px 4px 4px -6px hsl(214, 94%, 80%); */
diff --git a/apps/dotcom/client/src/tla/utils/app-ui-events.tsx b/apps/dotcom/client/src/tla/utils/app-ui-events.tsx
index e223cb374a6c..856669344535 100644
--- a/apps/dotcom/client/src/tla/utils/app-ui-events.tsx
+++ b/apps/dotcom/client/src/tla/utils/app-ui-events.tsx
@@ -32,7 +32,6 @@ export interface TLAppUiEventMap {
 	'drop-tldr-file': null
 	'import-tldr-file': null
 	'change-user-name': null
-	'click-watermark': null
 	'open-share-menu': null
 	'change-share-menu-tab': { tab: TldrawAppSessionState['shareMenuActiveTab'] }
 	'copy-share-link': null
@@ -64,6 +63,8 @@ export interface TLAppUiEventMap {
 	'create-user': null
 	'room-size-warning-dialog-shown': null
 	'room-size-limit-dialog-shown': null
+	'accept-group-invite': null
+	'add-file-link': null
 }
 
 /** @public */
diff --git a/apps/dotcom/client/src/tla/utils/i18n.tsx b/apps/dotcom/client/src/tla/utils/i18n.tsx
index 0752350180f7..600059fcd944 100644
--- a/apps/dotcom/client/src/tla/utils/i18n.tsx
+++ b/apps/dotcom/client/src/tla/utils/i18n.tsx
@@ -58,9 +58,9 @@ export function F(props: ComponentPropsWithoutRef<typeof FormattedMessage>) {
 }
 
 // We programmatically define ID's for messages to make things easier for devs.
-export function defineMessages<T extends string, D extends MessageDescriptor>(
-	msgs: Record<T, D>
-): Record<T, D> {
+export function defineMessages<Messages extends Record<string, MessageDescriptor>>(
+	msgs: Messages
+): Messages {
 	for (const key in msgs) {
 		if (!msgs[key].id) {
 			msgs[key].id = fetchId(msgs[key])
diff --git a/apps/dotcom/client/src/tla/utils/slurping.tsx b/apps/dotcom/client/src/tla/utils/slurping.tsx
index 690d8f006120..cd2244201536 100644
--- a/apps/dotcom/client/src/tla/utils/slurping.tsx
+++ b/apps/dotcom/client/src/tla/utils/slurping.tsx
@@ -85,7 +85,7 @@ export class Slurper {
 	constructor(private opts: SlurperOpts & { slurpPersistenceKey: string }) {}
 
 	async slurp() {
-		if (!this.opts.editor.getDocumentSettings().meta.slurpPersistenceKey) {
+		if (this.opts.editor.store.query.records('shape').get().length === 0) {
 			// This is a one-time operation.
 			// So we need to wait a tick for react strict mode to finish
 			// doing its nasty business before we start the migration.
diff --git a/apps/dotcom/client/src/utils/analytics.tsx b/apps/dotcom/client/src/utils/analytics.tsx
index bcb97c5cce1d..19d2ff3454b9 100644
--- a/apps/dotcom/client/src/utils/analytics.tsx
+++ b/apps/dotcom/client/src/utils/analytics.tsx
@@ -143,7 +143,8 @@ function configurePosthog(options: AnalyticsOptions) {
 		api_host: 'https://analytics.tldraw.com/i',
 		ui_host: 'https://eu.i.posthog.com',
 		capture_pageview: false,
-		persistence: options.optedIn ? 'localStorage+cookie' : 'memory',
+		cookieless_mode: 'on_reject',
+		disable_surveys: true,
 		before_send: (payload) => {
 			if (!payload) return null
 			payload.properties.is_signed_in = !!options.user
@@ -170,7 +171,12 @@ function configurePosthog(options: AnalyticsOptions) {
 				: undefined,
 	}
 	if (!currentOptionsPosthog) {
+		// First time initialization only
 		posthog.init(POSTHOG_KEY, config)
+	} else {
+		// We need to call _before_ opt_in/opt_out to avoid interfering with
+		// their state management
+		posthog.set_config(config)
 	}
 
 	if (options.optedIn) {
@@ -181,12 +187,12 @@ function configurePosthog(options: AnalyticsOptions) {
 				analytics_consent: true,
 			})
 		}
+		posthog.opt_in_capturing()
 	} else if (currentOptionsPosthog?.optedIn) {
 		posthog.setPersonProperties({ analytics_consent: false })
-		posthog.reset()
+		posthog.opt_out_capturing()
 	}
 
-	posthog.set_config(config)
 	currentOptionsPosthog = options
 	eventBufferPosthog?.forEach((event) => posthog.capture(event.name, event.data))
 	eventBufferPosthog = null
@@ -207,6 +213,12 @@ function configureGA4(options: AnalyticsOptions) {
 			wait_for_update: 500,
 		})
 
+		// Set up conversion linker for cross-domain tracking with tldraw.dev
+		// Must be set before ReactGA.initialize() to ensure it's configured before gtag('config')
+		ReactGA.gtag('set', 'linker', {
+			domains: ['tldraw.dev'],
+		})
+
 		ReactGA.initialize(GA4_MEASUREMENT_ID, {
 			gtagOptions: {
 				send_page_view: false,
@@ -274,6 +286,15 @@ export function trackEvent(name: string, data?: { [key: string]: any }) {
 	if (name === '$pageview') {
 		getGA4()?.event('page_view', data)
 	}
+
+	// Track watermark clicks in GA4
+	if (name === 'click-watermark' && data?.url) {
+		if (getGA4()) {
+			ReactGA.gtag('event', 'click_tldraw_dev', {
+				link_url: data.url,
+			})
+		}
+	}
 }
 
 export function useHandleUiEvents() {
@@ -361,3 +382,8 @@ function useTrackPageViews() {
 		trackEvent('$pageview')
 	}, [location])
 }
+
+export function signoutAnalytics() {
+	if (shouldUsePosthog) posthog.reset()
+	if (shouldUseGA4) ReactGA.reset()
+}
diff --git a/apps/dotcom/client/src/utils/csp.ts b/apps/dotcom/client/src/utils/csp.ts
index fd58363830f2..128aa34a676e 100644
--- a/apps/dotcom/client/src/utils/csp.ts
+++ b/apps/dotcom/client/src/utils/csp.ts
@@ -14,6 +14,7 @@ export const cspDirectives: { [key: string]: string[] } = {
 		`https://*.ingest.sentry.io`,
 		`https://*.ingest.us.sentry.io`,
 		'https://*.analytics.google.com',
+		'https://analytics.google.com',
 		'https://www.google-analytics.com',
 		'https://*.googletagmanager.com',
 		'https://www.googletagmanager.com',
@@ -22,11 +23,13 @@ export const cspDirectives: { [key: string]: string[] } = {
 		'https://*.clerk.accounts.dev',
 		'https://clerk.tldraw.com',
 		'https://clerk.staging.tldraw.com',
+		'https://clerk-telemetry.com',
 		// zero
 		'https://*.zero.tldraw.com',
 		'https://zero.tldraw.com',
 		'http://localhost:4848',
 		'https://analytics.tldraw.com',
+		'https://consent.tldraw.xyz',
 		'https://stats.g.doubleclick.net',
 		'https://*.google-analytics.com',
 		'https://api.reo.dev',
diff --git a/apps/dotcom/client/src/utils/fetchHistory.ts b/apps/dotcom/client/src/utils/fetchHistory.ts
index 9909815594ca..c272eaad3e11 100644
--- a/apps/dotcom/client/src/utils/fetchHistory.ts
+++ b/apps/dotcom/client/src/utils/fetchHistory.ts
@@ -21,3 +21,27 @@ export async function fetchHistory(
 		return null
 	}
 }
+
+// Helper function to fetch Pierre history data
+export async function fetchPierreHistory(
+	fileSlug: string,
+	nextCursor?: string | null
+): Promise<{
+	entries: Array<{ timestamp: string; commitHash: string }>
+	nextCursor?: string | null
+} | null> {
+	try {
+		const url = nextCursor
+			? `/api/${FILE_PREFIX}/${fileSlug}/pierre-history?nextCursor=${nextCursor}`
+			: `/api/${FILE_PREFIX}/${fileSlug}/pierre-history`
+
+		const result = await fetch(url)
+
+		if (!result.ok) return null
+
+		return await result.json()
+	} catch (err) {
+		console.error('Failed to fetch Pierre history:', err)
+		return null
+	}
+}
diff --git a/apps/dotcom/client/src/utils/scratch-persistence-key.ts b/apps/dotcom/client/src/utils/scratch-persistence-key.ts
index b3bf08955bef..c16702baf60d 100644
--- a/apps/dotcom/client/src/utils/scratch-persistence-key.ts
+++ b/apps/dotcom/client/src/utils/scratch-persistence-key.ts
@@ -15,7 +15,7 @@ import { getFromLocalStorage, setInLocalStorage, uniqueId } from 'tldraw'
 const defaultDocumentKey = 'TLDRAW_DEFAULT_DOCUMENT_NAME_v2'
 
 export function getScratchPersistenceKey() {
-	return getFromLocalStorage(defaultDocumentKey) ?? 'tldraw_document_v3'
+	return getFromLocalStorage(defaultDocumentKey) ?? 'tldraw_document_v3_' + uniqueId()
 }
 
 setInLocalStorage(defaultDocumentKey, getScratchPersistenceKey())
diff --git a/apps/dotcom/client/src/utils/url.ts b/apps/dotcom/client/src/utils/url.ts
index 839eb9e893eb..05895bfeced6 100644
--- a/apps/dotcom/client/src/utils/url.ts
+++ b/apps/dotcom/client/src/utils/url.ts
@@ -1,3 +1,3 @@
-export function openUrl(url: string) {
-	window.open(url, '_blank')
+export function openUrl(url: string, allowReferrer?: boolean) {
+	return window.open(url, '_blank', allowReferrer ? 'noopener' : 'noopener noreferrer')
 }
diff --git a/apps/dotcom/client/version.ts b/apps/dotcom/client/version.ts
index 82ffd702e1c4..0c50ec2cee4e 100644
--- a/apps/dotcom/client/version.ts
+++ b/apps/dotcom/client/version.ts
@@ -1,9 +1,9 @@
 // This file is automatically generated by internal/scripts/refresh-assets.ts.
 // Do not edit manually. Or do, I'm a comment, not a cop.
 
-export const version = '4.1.1'
+export const version = '4.2.0'
 export const publishDates = {
 	major: '2025-09-18T14:39:22.803Z',
-	minor: '2025-10-15T12:30:12.428Z',
-	patch: '2025-10-15T13:45:13.201Z',
+	minor: '2025-11-19T11:53:58.692Z',
+	patch: '2025-11-19T11:53:58.692Z',
 }
diff --git a/apps/dotcom/fairy-worker/src/auth.ts b/apps/dotcom/fairy-worker/src/auth.ts
index 64bc6a3ed796..bc17ae647efc 100644
--- a/apps/dotcom/fairy-worker/src/auth.ts
+++ b/apps/dotcom/fairy-worker/src/auth.ts
@@ -63,12 +63,19 @@ export async function requireAdminAccess(env: Environment, auth: { userId: strin
 	if (!auth?.userId) {
 		throw new StatusError(403, 'Unauthorized')
 	}
-	const user = await getClerkClient(env).users.getUser(auth.userId)
-	if (
-		!user.primaryEmailAddress?.emailAddress.endsWith('@tldraw.com') ||
-		user.primaryEmailAddress?.verification?.status !== 'verified'
-	) {
+	const hasAdminStatus = await isAdmin(env, auth)
+	if (!hasAdminStatus) {
 		throw new StatusError(403, 'Unauthorized - @tldraw.com email required')
 	}
-	return user
+}
+
+export async function isAdmin(env: Environment, auth: { userId: string } | null) {
+	if (!auth?.userId) {
+		return false
+	}
+	const user = await getClerkClient(env).users.getUser(auth.userId)
+	return !!(
+		user.primaryEmailAddress?.emailAddress.endsWith('@tldraw.com') &&
+		user.primaryEmailAddress?.verification?.status === 'verified'
+	)
 }
diff --git a/apps/dotcom/fairy-worker/src/do/AgentDurableObject.ts b/apps/dotcom/fairy-worker/src/do/AgentDurableObject.ts
index 0d59222fa2f4..068a83c12add 100644
--- a/apps/dotcom/fairy-worker/src/do/AgentDurableObject.ts
+++ b/apps/dotcom/fairy-worker/src/do/AgentDurableObject.ts
@@ -1,13 +1,5 @@
+import { AgentAction, AgentPrompt, Streaming } from '@tldraw/fairy-shared'
 import { DurableObject } from 'cloudflare:workers'
-// import { AutoRouter, error } from 'itty-router'
-
-import {
-	AgentAction,
-	AgentActionUtilConstructor,
-	AgentPrompt,
-	PromptPartUtilConstructor,
-	Streaming,
-} from '@tldraw/fairy-shared'
 import { Environment } from '../environment'
 import { AgentService } from './AgentService'
 
@@ -24,8 +16,12 @@ export class AgentDurableObject extends DurableObject<Environment> {
 		const url = new URL(request.url)
 
 		// Handle the stream endpoint directly without router
-		if (url.pathname === '/stream' && request.method === 'POST') {
-			return this.stream(request)
+		if (url.pathname === '/stream-actions' && request.method === 'POST') {
+			return this.streamActions(request)
+		}
+
+		if (url.pathname === '/stream-text' && request.method === 'POST') {
+			return this.streamText(request)
 		}
 
 		// For other routes, you can still use the router or return 404
@@ -33,26 +29,62 @@ export class AgentDurableObject extends DurableObject<Environment> {
 	}
 
 	/**
-	 * Stream changes from the model.
+	 * Stream text from the model
 	 */
-	private async stream(request: Request): Promise<Response> {
+	private async streamText(request: Request): Promise<Response> {
 		const encoder = new TextEncoder()
 		const { readable, writable } = new TransformStream()
 		const writer = writable.getWriter()
 
-		const response: { changes: Streaming<AgentAction>[] } = { changes: [] }
-
+		const response: string[] = []
 		;(async () => {
 			try {
-				const { prompt, actions, parts } = (await request.json()) as {
-					prompt: AgentPrompt
-					actions: AgentActionUtilConstructor['type'][]
-					parts: PromptPartUtilConstructor['type'][]
+				const prompt = (await request.json()) as AgentPrompt
+
+				for await (const text of this.service.streamText(prompt)) {
+					response.push(text)
+					const data = `data: ${text}\n\n`
+					await writer.write(encoder.encode(data))
+					await writer.ready
 				}
+				await writer.close()
+			} catch (error: any) {
+				console.error('Stream text error:', error)
+				throw error
+			}
+		})()
+
+		return new Response(readable, {
+			headers: {
+				'Content-Type': 'text/event-stream',
+				'Cache-Control': 'no-cache, no-transform',
+				Connection: 'keep-alive',
+				'X-Accel-Buffering': 'no',
+				'Access-Control-Allow-Origin': '*',
+				'Access-Control-Allow-Methods': 'POST, OPTIONS',
+				'Access-Control-Allow-Headers': 'Content-Type',
+			},
+		})
+	}
+
+	/**
+	 * Stream actions from the model.
+	 */
+	private async streamActions(request: Request): Promise<Response> {
+		const encoder = new TextEncoder()
+		const { readable, writable } = new TransformStream()
+		const writer = writable.getWriter()
+
+		const response: { actions: Streaming<AgentAction>[] } = { actions: [] }
+
+		;(async () => {
+			try {
+				const prompt = (await request.json()) as AgentPrompt
 
-				for await (const change of this.service.stream(prompt, actions, parts)) {
-					response.changes.push(change)
-					const data = `data: ${JSON.stringify(change)}\n\n`
+				const isAdmin = request.headers.get('X-Is-Admin') === 'true'
+				for await (const action of this.service.streamActions(prompt, isAdmin)) {
+					response.actions.push(action)
+					const data = `data: ${JSON.stringify(action)}\n\n`
 					await writer.write(encoder.encode(data))
 					await writer.ready
 				}
diff --git a/apps/dotcom/fairy-worker/src/do/AgentService.ts b/apps/dotcom/fairy-worker/src/do/AgentService.ts
index 6013f34c78a5..6a1deeccd5ed 100644
--- a/apps/dotcom/fairy-worker/src/do/AgentService.ts
+++ b/apps/dotcom/fairy-worker/src/do/AgentService.ts
@@ -4,23 +4,21 @@ import {
 	GoogleGenerativeAIProvider,
 	GoogleGenerativeAIProviderOptions,
 } from '@ai-sdk/google'
-import { createOpenAI, OpenAIProvider } from '@ai-sdk/openai'
-import { LanguageModel, streamText } from 'ai'
-
+import { createOpenAI, OpenAIProvider, OpenAIResponsesProviderOptions } from '@ai-sdk/openai'
 import {
 	AgentAction,
-	AgentActionUtilConstructor,
 	AgentModelName,
 	AgentPrompt,
-	buildMessages,
-	buildSystemPrompt,
-	getAgentModelDefinition,
-	getModelName,
-	PromptPartUtilConstructor,
+	DebugPart,
 	Streaming,
 } from '@tldraw/fairy-shared'
+import { LanguageModel, ModelMessage, streamText, SystemModelMessage } from 'ai'
 import { Environment } from '../environment'
+import { buildMessages } from '../prompt/buildMessages'
+import { buildSystemPrompt, buildSystemPromptWithoutSchema } from '../prompt/buildSystemPrompt'
+import { getModelName } from '../prompt/getModelName'
 import { closeAndParseJson } from './closeAndParseJson'
+import { getAgentModelDefinition } from './models'
 
 export class AgentService {
 	openai: OpenAIProvider
@@ -39,47 +37,170 @@ export class AgentService {
 		return this[provider](modelDefinition.id)
 	}
 
-	async *stream(
+	async *streamActions(
 		prompt: AgentPrompt,
-		actions: AgentActionUtilConstructor['type'][],
-		parts: PromptPartUtilConstructor['type'][]
+		isAdmin = false
 	): AsyncGenerator<Streaming<AgentAction>> {
 		try {
 			const modelName = getModelName(prompt)
 			const model = this.getModel(modelName)
-			for await (const event of streamActions(model, prompt, actions, parts)) {
-				yield event
+			for await (const action of _streamActions(model, prompt, isAdmin)) {
+				yield action
 			}
 		} catch (error: any) {
 			console.error('Stream error:', error)
 			throw error
 		}
 	}
+
+	async *streamText(prompt: AgentPrompt): AsyncGenerator<string> {
+		try {
+			const modelName = getModelName(prompt)
+			const model = this.getModel(modelName)
+			for await (const text of _streamText(model, prompt)) {
+				yield text
+			}
+		} catch (error: any) {
+			console.error('Stream text error:', error)
+			throw error
+		}
+	}
 }
 
-async function* streamActions(
+// currently unused
+async function* _streamText(model: LanguageModel, prompt: AgentPrompt): AsyncGenerator<string> {
+	if (typeof model === 'string') {
+		throw new Error('Model is a string, not a LanguageModel')
+	}
+
+	// -1 means dynamic budget
+	// 128 is minimum for 2.5 pro - we're not sure if this is too low
+	const geminiThinkingBudget =
+		model.modelId === 'gemini-2.5-pro' || model.modelId === 'gemini-3-pro-preview' ? 256 : 0
+
+	const gptThinkingBudget = model.modelId === 'gpt-5.1' ? 'none' : 'minimal'
+
+	const messages = buildMessages(prompt)
+	const systemPrompt = buildSystemPrompt(prompt) || 'You are a helpful assistant.'
+
+	// Debug logging
+	const debugPart = prompt.debug
+	if (debugPart) {
+		if (debugPart.logSystemPrompt) {
+			const promptWithoutSchema = buildSystemPromptWithoutSchema(prompt)
+			console.warn('[DEBUG] System Prompt (without schema):\n', promptWithoutSchema)
+		}
+		if (debugPart.logMessages) {
+			const sanitizedMessages = sanitizeMessagesForLogging(messages)
+			console.warn('[DEBUG] Messages:\n', JSON.stringify(sanitizedMessages, null, 2))
+		}
+	}
+
+	try {
+		const result = streamText({
+			model,
+			system: systemPrompt,
+			messages,
+			maxOutputTokens: 8192,
+			temperature: 0,
+			providerOptions: {
+				anthropic: {
+					thinking: { type: 'disabled' },
+				} satisfies AnthropicProviderOptions,
+				google: {
+					thinkingConfig: { thinkingBudget: geminiThinkingBudget },
+				} satisfies GoogleGenerativeAIProviderOptions,
+				openai: {
+					reasoningEffort: gptThinkingBudget,
+				} satisfies OpenAIResponsesProviderOptions,
+			},
+			onError: (e) => {
+				console.error('Stream text error:', e)
+				throw e
+			},
+		})
+
+		for await (const text of result.textStream) {
+			yield text
+		}
+
+		// After streaming is complete, get usage information
+		await result.usage
+		// Note: Usage is tracked but not currently logged for text streams
+	} catch (error: any) {
+		console.error('streamEventsVercel error:', error)
+		throw error
+	}
+}
+
+// at time of recording, anthropic does not offer implicit caching like deepmind and openai do.
+// to cache, we set breakpoints in messages we send to the model. breakpoints cache all input up to and including that message. the cached hash of each block affected by the content of all previous blocks. the model checks back 20 blocks from the breakpoint looking for a match. because the hash depends on previous content, it will not find a match until it finds a block where all previous blocks are unchanged. if it goes more than 20 blocks with no match, it jumps backwards to the next earlier breakpoint.
+// we put one breakpoint at the end of the system prompt. we concatenate all system prompt parts instead of splitting them into individual messages to make sure they hit the minimum cache length (1024 tokens for sonnet 4.5). we can also do this because parts of the system prompt generally all change together in predictable ways.
+// if we put the chat history back at the beginning of the prompt parts, we could set a breakpoint at the end of chat history
+function buildFormattedSystemPromptWithAnthropicCacheBreakpoint(
+	systemPrompt: string
+): SystemModelMessage {
+	return {
+		role: 'system',
+		content: systemPrompt,
+		providerOptions: {
+			anthropic: { cacheControl: { type: 'ephemeral' } },
+		},
+	}
+}
+
+function buildFormattedSystemPrompt(systemPrompt: string): SystemModelMessage {
+	return {
+		role: 'system',
+		content: systemPrompt,
+	}
+}
+
+async function* _streamActions(
 	model: LanguageModel,
 	prompt: AgentPrompt,
-	actions: AgentActionUtilConstructor['type'][],
-	parts: PromptPartUtilConstructor['type'][]
+	isAdmin: boolean
 ): AsyncGenerator<Streaming<AgentAction>> {
 	if (typeof model === 'string') {
 		throw new Error('Model is a string, not a LanguageModel')
 	}
 
-	const geminiThinkingBudget = model.modelId === 'gemini-2.5-pro' ? 128 : 0
+	// -1 means dynamic budget
+	// 128 is minimum for 2.5 pro - we're not sure if this is too low
+	const geminiThinkingBudget =
+		model.modelId === 'gemini-2.5-pro' || model.modelId === 'gemini-3-pro-preview' ? 256 : 0
+
+	const gptThinkingBudget = model.modelId === 'gpt-5.1' ? 'none' : 'minimal'
+
+	const formattedSystemPrompt =
+		model.provider === 'anthropic.messages'
+			? buildFormattedSystemPromptWithAnthropicCacheBreakpoint(buildSystemPrompt(prompt))
+			: buildFormattedSystemPrompt(buildSystemPrompt(prompt))
+
+	const promptMessages = buildMessages(prompt)
 
-	const messages = buildMessages(prompt, parts)
-	const systemPrompt = buildSystemPrompt(prompt, actions, parts) || 'You are a helpful assistant.'
+	const messages: ModelMessage[] = [formattedSystemPrompt, ...promptMessages]
+
+	// Check for debug flags
+	const debugPart = prompt.debug as DebugPart | undefined
+	if (debugPart) {
+		if (debugPart.logSystemPrompt) {
+			const promptWithoutSchema = buildSystemPromptWithoutSchema(prompt)
+			console.warn('[DEBUG] System Prompt (without schema):\n', promptWithoutSchema)
+		}
+		if (debugPart.logMessages) {
+			const sanitizedMessages = sanitizeMessagesForLogging(promptMessages)
+			console.warn('[DEBUG] Messages:\n', JSON.stringify(sanitizedMessages, null, 2))
+		}
+	}
 
 	try {
 		messages.push({
 			role: 'assistant',
 			content: '{"actions": [{"_type":',
 		})
-		const { textStream } = streamText({
+		const result = streamText({
 			model,
-			system: systemPrompt,
 			messages,
 			maxOutputTokens: 8192,
 			temperature: 0,
@@ -90,6 +211,9 @@ async function* streamActions(
 				google: {
 					thinkingConfig: { thinkingBudget: geminiThinkingBudget },
 				} satisfies GoogleGenerativeAIProviderOptions,
+				openai: {
+					reasoningEffort: gptThinkingBudget,
+				} satisfies OpenAIResponsesProviderOptions,
 			},
 			onError: (e) => {
 				console.error('Stream text error:', e)
@@ -104,7 +228,7 @@ async function* streamActions(
 		let maybeIncompleteAction: AgentAction | null = null
 
 		let startTime = Date.now()
-		for await (const text of textStream) {
+		for await (const text of result.textStream) {
 			buffer += text
 
 			const partialObject = closeAndParseJson(buffer)
@@ -157,8 +281,49 @@ async function* streamActions(
 				time: Date.now() - startTime,
 			}
 		}
+
+		// After streaming is complete, get usage information and yield it (only for admins)
+		if (isAdmin) {
+			const usage = await result.usage
+			const providerMetadata = await result.providerMetadata
+
+			// Yield usage information as a special metadata action (only for @tldraw.com admins)
+			yield {
+				_type: '__usage__',
+				complete: true,
+				time: 0,
+				usage,
+				providerMetadata,
+			} as any
+		}
 	} catch (error: any) {
 		console.error('streamEventsVercel error:', error)
 		throw error
 	}
 }
+
+/**
+ * Sanitize messages for logging by replacing image content with "<image data removed>"
+ */
+function sanitizeMessagesForLogging(messages: any[]): any[] {
+	return messages.map((message) => {
+		if (!message.content || !Array.isArray(message.content)) {
+			return message
+		}
+
+		const sanitizedContent = message.content.map((item: any) => {
+			if (item.type === 'image') {
+				return {
+					...item,
+					image: '<image data removed>',
+				}
+			}
+			return item
+		})
+
+		return {
+			...message,
+			content: sanitizedContent,
+		}
+	})
+}
diff --git a/apps/dotcom/fairy-worker/src/do/models.ts b/apps/dotcom/fairy-worker/src/do/models.ts
new file mode 100644
index 000000000000..8e28b02bf07f
--- /dev/null
+++ b/apps/dotcom/fairy-worker/src/do/models.ts
@@ -0,0 +1,14 @@
+import { AGENT_MODEL_DEFINITIONS, AgentModelDefinition, AgentModelName } from '@tldraw/fairy-shared'
+
+/**
+ * Get the full information about a model from its name.
+ * @param modelName - The name of the model.
+ * @returns The full definition of the model.
+ */
+export function getAgentModelDefinition(modelName: AgentModelName): AgentModelDefinition {
+	const definition = AGENT_MODEL_DEFINITIONS[modelName]
+	if (!definition) {
+		throw new Error(`Model ${modelName} not found`)
+	}
+	return definition
+}
diff --git a/apps/dotcom/fairy-worker/src/prompt/buildMessages.ts b/apps/dotcom/fairy-worker/src/prompt/buildMessages.ts
new file mode 100644
index 000000000000..019fa01a9962
--- /dev/null
+++ b/apps/dotcom/fairy-worker/src/prompt/buildMessages.ts
@@ -0,0 +1,89 @@
+import {
+	AgentMessage,
+	AgentMessageContent,
+	AgentPrompt,
+	getPromptPartDefinition,
+	PROMPT_PART_DEFINITIONS,
+	PromptPart,
+} from '@tldraw/fairy-shared'
+import { ModelMessage, UserContent } from 'ai'
+
+export function buildMessages(prompt: AgentPrompt): ModelMessage[] {
+	const allMessages: AgentMessage[] = []
+
+	for (const part of Object.values(prompt)) {
+		const messages = buildMessagesFromPart(part)
+		allMessages.push(...messages)
+	}
+
+	allMessages.sort((a, b) => a.priority - b.priority)
+
+	return toModelMessages(allMessages)
+}
+
+function buildMessagesFromPart(part: PromptPart): AgentMessage[] {
+	const definition = getPromptPartDefinition(part.type)
+	if (!definition.buildMessages) return defaultBuildMessagesFromPart(part)
+	return definition.buildMessages(part)
+}
+
+function buildContentFromPart(part: PromptPart): string[] {
+	const definition = getPromptPartDefinition(part.type)
+	if (!definition.buildContent) return []
+	return definition.buildContent(part)
+}
+
+export function defaultBuildMessagesFromPart<T extends PromptPart>(part: T): AgentMessage[] {
+	const content = buildContentFromPart(part)
+	if (!content || content.length === 0) {
+		return []
+	}
+
+	const messageContent: AgentMessageContent[] = []
+	for (const item of content) {
+		if (typeof item === 'string' && item.startsWith('data:image/')) {
+			messageContent.push({
+				type: 'image',
+				image: item,
+			})
+		} else {
+			messageContent.push({
+				type: 'text',
+				text: item,
+			})
+		}
+	}
+
+	const definition = PROMPT_PART_DEFINITIONS.find((definition) => definition.type === part.type)
+	const priority = definition?.priority ?? 0
+
+	return [{ role: 'user', content: messageContent, priority }]
+}
+
+/**
+ * Convert AgentMessage[] to ModelMessage[] for the AI SDK
+ */
+function toModelMessages(agentMessages: AgentMessage[]): ModelMessage[] {
+	return agentMessages.map((tlMessage) => {
+		const content: UserContent = []
+
+		for (const contentItem of tlMessage.content) {
+			if (contentItem.type === 'image') {
+				content.push({
+					type: 'image',
+					image: contentItem.image!,
+				})
+			} else {
+				content.push({
+					type: 'text',
+					text: contentItem.text!,
+				})
+			}
+		}
+
+		return {
+			role: tlMessage.role,
+			content,
+		} as ModelMessage
+	})
+}
diff --git a/apps/dotcom/fairy-worker/src/prompt/buildSystemPrompt.ts b/apps/dotcom/fairy-worker/src/prompt/buildSystemPrompt.ts
new file mode 100644
index 000000000000..1ce7e760480b
--- /dev/null
+++ b/apps/dotcom/fairy-worker/src/prompt/buildSystemPrompt.ts
@@ -0,0 +1,590 @@
+import {
+	ActiveFairyModeDefinition,
+	AgentAction,
+	AgentPrompt,
+	FOCUSED_SHAPE_TYPES,
+	PromptPart,
+	buildResponseSchema,
+	getActiveFairyModeDefinition,
+} from '@tldraw/fairy-shared'
+
+/**
+ * Build a system prompt from all of the prompt parts.
+ *
+ * If you want to bypass the `PromptPartUtil` system, replace this function with
+ * one that returns a hardcoded value.
+ *
+ * @param prompt - The prompt to build a system prompt for.
+ * @returns The system prompt.
+ */
+export function buildSystemPrompt(prompt: AgentPrompt): string {
+	return _buildSystemPrompt(prompt, true)
+}
+
+/**
+ * Get the system prompt without the JSON schema appended.
+ * This is useful for debugging/logging purposes.
+ *
+ * @param prompt - The prompt to build a system prompt for.
+ * @returns The system prompt without the schema.
+ */
+export function buildSystemPromptWithoutSchema(prompt: AgentPrompt): string {
+	return _buildSystemPrompt(prompt, false)
+}
+
+function _buildSystemPrompt(prompt: AgentPrompt, withSchema: boolean): string {
+	const modePart = prompt.mode
+	if (!modePart) throw new Error('A mode part is always required.')
+	const { mode, work } = modePart
+	const modeDefinition = getActiveFairyModeDefinition(mode)
+	const availableActions = modeDefinition.actions(work)
+	const availableParts = modeDefinition.parts(work)
+	return getSystemPrompt(mode, availableActions, availableParts, withSchema)
+}
+
+function getSystemPrompt(
+	mode: ActiveFairyModeDefinition['type'],
+	actions: AgentAction['_type'][],
+	parts: PromptPart['type'][],
+	withSchema: boolean
+) {
+	const flags = getSystemPromptFlags(mode, actions, parts)
+
+	const prompt = normalizeNewlines(
+		buildIntroPromptSection(flags) +
+			`\n` +
+			buildRulesPromptSection(flags) +
+			`\n` +
+			buildModePromptSection(flags)
+	)
+
+	if (!withSchema) return prompt
+	return prompt + '\n' + buildSchemaPromptSection(actions)
+}
+
+// TODO figure out: do we need to remove flags so this can be cached, OR do we not need to because, assuming each mode has fixed actions and parts, a version will be cached for each mode? This applies to all system prompt sections.
+function buildIntroPromptSection(flags: SystemPromptFlags) {
+	return `You are an AI agent. You live inside an infinite canvas inside someone's computer. You like to help the user use a drawing / diagramming / whiteboarding program. You and the user are both located within an infinite canvas, a 2D space that can be demarcated using x,y coordinates${flags.hasOtherFairiesPart ? ". There may also be other agents working with you to help the user. They are your friends, and although you cannot see them, you'll be told where they are on the canvas. You are very collaborative and cooperative with your friends, and you'll always ask them for help when you need it." : ''}. You will be provided with a set of helpful information that includes a description of what the user would like you to do, along with the user's intent and the current state of the canvas${flags.hasScreenshotPart ? ', including an image, which is your view of the part of the canvas contained within your viewport' : ''}${flags.hasChatHistoryPart ? ". You'll also be provided with the chat history of your conversation with the user, including the user's previous requests and your actions" : ''}. Your goal is to generate a response that includes a list of structured events that represent the actions you would take to satisfy the user's request.
+
+${flags.hasPersonalityPart ? `You are very opinionated, and you choose to follow your opinions while still being helpful, even if it might bother the user slightly.` : ''}
+
+You respond with structured JSON data based on a predefined schema.
+
+## Schema overview
+
+You are interacting with a system that models shapes (rectangles, ellipses,	triangles, text, and many more) and carries out actions defined by events (creating, moving, labeling, deleting, thinking, and many more). Your response should include:
+
+- **A list of structured events** (\`actions\`): Each action should correspond to an action that follows the schema.
+
+For the full list of events, refer to the JSON schema.
+	`
+}
+
+function buildModePromptSection(flags: SystemPromptFlags) {
+	if (flags.isSoloing) {
+		return buildSoloingModePromptSection(flags)
+	}
+	if (flags.isWorking) {
+		return buildWorkingModePromptSection(flags)
+	}
+	if (flags.isOrchestrating) {
+		return buildOrchestratingModePromptSection(flags)
+	}
+	if (flags.isDuoOrchestrating) {
+		return buildDuoOrchestratingModePromptSection(flags)
+	}
+	throw new Error(`Unknown mode`)
+}
+
+function buildSoloingModePromptSection(_flags: SystemPromptFlags) {
+	return `What you should do now is plan how you're going to respond to the user's request. Depending on the request you should either respond to the user, start a task assigned to you, or create some tasks yourself and then start the first one. Starting the task will give you a new set of tools you can use to carry that task out.
+If you decide to create tasks:
+	- For simple requests, you can create a single task. Once you start the task you'll have access to a personal todo list, so you can plan out the specifics of the task then.
+	- Tasks should have the context required to complete them. Once you start you won't have access to the full context of the request.
+	- For more complex requests, you can create multiple tasks.
+	- When deciding on the bounds for a task, you must remember that when doing each task, you will be unable to see or work outside of the bounds of the task. So, if the output of 2 tasks should be overlapping, then the bounds of the tasks should overlap too.
+	- You will only be able to do one task at a time.
+	`
+}
+
+function buildWorkingModePromptSection(_flags: SystemPromptFlags) {
+	return `What you should do now is carry out the task you're assigned to. You have a set of tools you can use to carry out the task. You're only able to see within the bounds of the task; you cannot see the entire canvas. Once you've finished the task, mark it as done. You also have access to a personal todo list that you should use to plan out how to solve the task. Your personal todo list should represent how you plan to complete the task. There may be other agents, or the human, working in your same space. That's okay! Don't be alarmed if somethings appear in your view you didn't put there, just complete your task.
+	`
+}
+
+function buildOrchestratingModePromptSection(_flags: SystemPromptFlags) {
+	return `You are in charge of orchestrating a project. Here is how you should do that.
+- First, you must first start the project. This involes creating a brief project plan about where in the canvas the tasks will be situated, and which ones to do in parallel what order they're carried out in. The project plan is only visible to you and can contain anything you think will be helpful in your orchestration: notes on when to start certain tasks, things to look out for, etc. 
+- What makes a good project plan?
+	- The project plan should describe the high level tasks, and the order in which they should be carried out.
+	- Projects should be coherent. Agents are only able to see and work within the bounds of current task. Therefore, tasks should be positioned and sized in a way that allows them to be completed in a coherent way. If you're drawing a picture, the task to add a foreground should obviously overlap a task to, say, add an object to the foreground. The logic of what should go where should rule how you position and size tasks.
+	- However, if there are fully overlpaping tasks, they should not be worked on coherently. A moderate amount of overlap is super fine for concurrent tasks though.
+	- Later tasks can the work done in earlier tasks (but not the tasks themselves, agents can only see their own tasks), and this should be a part of your project plan. For example if you're making a flow chart, and you have a task to make steps 1-3, and then a task to make steps 4 and 5, you should also add a task to connect step 3 to 4 in whatever way is logical. This task should only be started once you've confirmed the first two have been completed satisfactorily.
+	- You may also make followup tasks to move elements around and layer them on top of each other. If you have two agents on your team, and you want one to work on a background and the other to work on a foreground, you can have those bounds not overlap at all, then have a followup task to move the foreground element on top of the background element (just make sure the bounds of that task encompasses both elements).
+	- The number of agents, the complexity of the project, and the individual skills and personalities of the agents should all factor into your plan, with the goal of completing the project as quickly as possible. You don't have to assign a task to every agent.
+	- Someone looking at the finished output should not be able to make out where one task ends and another begins. 
+- Once you've created the project plan. Create every task you've planned out, assigning them to the appropriate agents. This will not yet start the tasks.
+	- Tasks should not be too micromanage-y. Trust that your workers can figure out how to complete the task on their own.
+- Then, direct the agents to start their tasks in the order you've planned. You can do this by using the \`direct-to-start-project-task\` action. You should then use the \`await-tasks-completion\` action to wait for the first set of tasks to be completed. This will give you a notification when any of those tasks are completed, allowing you to review them.
+- When you review the tasks, you may find that you need add more tasks to fix or adjust things. This is okay; things sometimes don't go according to plan. You can direct agents to start tasks in any order, so feel free to add a new tasks to fix something that went wrong, await its completion, and only then continue with the plan.
+- Once you've confirmed the first set of tasks are completed satisfactorily, you can start the next set of tasks.
+- You will possibly need to spend some time near the end of the project to make sure each different task is integrated into the project as a whole. This will possibly require the creation of more tasks.
+	- For example, for charts and diagrams, make sure everything that should be connected is connected, and that everything is laid out nicely.
+	- For images and wireframes, make sure everything is laid out nicely with foreground elements generally being completely contained within background elements.
+	- Text should never overlap, the user won't be able to read it if so. You must refer to the screenshot to make sure text is not overlapping.
+- You cannot edit the canvas. As the recruits work on the project, the state is ever changing, so don't be surprised if states of different tasks or the canvas changes as you go.
+- Once the project is fully complete, end it. 
+`
+}
+
+function buildDuoOrchestratingModePromptSection(_flags: SystemPromptFlags) {
+	return `You are collaborating with one partner on a duo project. Here is how you should work together.
+- First, you must start the project. This involves creating a brief project plan about where in the canvas the tasks will be situated, and which ones you'll do versus which ones your partner will do, and in what order. The project plan is only visible to you and can contain anything you think will be helpful: notes on when to start certain tasks, things to look out for, etc.
+- What makes a good project plan?
+	- The project plan should describe the high level tasks, and how you and your partner will divide the work.
+	- You can assign tasks to your partner using the \`create-duo-task\` action, or you can take on tasks yourself using the \`start-duo-task\` action.
+	- Projects should be coherent. Both you and your partner can only see and work within the bounds of your current task. Therefore, tasks should be positioned and sized in a way that allows them to be completed coherently. If you're drawing a picture, the task to add a foreground should obviously overlap a task to, say, add an object to the foreground. The logic of what should go where should rule how you position and size tasks.
+	- However, if there are fully overlapping tasks, they should not be worked on concurrently. A moderate amount of overlap is fine for sequential tasks though.
+	- Later tasks can use the work done in earlier tasks (but not the tasks themselves, you can only see your own tasks), and this should be a part of your project plan. For example if you're making a flow chart, and you have a task to make steps 1-3, and then a task to make steps 4 and 5, you should also add a task to connect step 3 to 4 in whatever way is logical. This task should only be started once you've confirmed the first two have been completed satisfactorily.
+	- You may also make followup tasks to move elements around and layer them on top of each other. If you want your partner to work on a background and you to work on a foreground, you can have those bounds not overlap at all, then have a followup task to move the foreground element on top of the background element (just make sure the bounds of that task encompasses both elements).
+	- You have one partner to coordinate with. You can work on tasks yourself, assign them to your partner, or work together sequentially. The complexity of the project and both of your skills and personalities should factor into your plan.
+	- Someone looking at the finished output should not be able to make out where one task ends and another begins.
+- Once you've created the project plan, create the tasks you've planned out. You can assign them to your partner or take them on yourself.
+	- Tasks should not be too micromanage-y. Trust that your partner can figure out how to complete the task on their own.
+- Then, coordinate with your partner to start tasks. You can direct your partner to start a task using the \`direct-to-start-duo-task\` action, or start a task yourself using \`start-duo-task\`. Use the \`await-duo-tasks-completion\` action to wait for tasks to be completed. This will give you a notification when each task completes, allowing you to review them.
+- When you review the tasks, you may find that you need to add more tasks to fix or adjust things. This is okay; things sometimes don't go according to plan. You can direct your partner to start tasks or start them yourself in any order, so feel free to add new tasks to fix something that went wrong, await its completion, and only then continue with the plan.
+- Once you've confirmed the first set of tasks are completed satisfactorily, you can start the next set of tasks.
+- You will possibly need to spend some time near the end of the project to make sure each different task is integrated into the project as a whole. This will possibly require the creation of more tasks.
+	- For example, for charts and diagrams, make sure everything that should be connected is connected, and that everything is laid out nicely.
+	- For images and wireframes, make sure everything is laid out nicely with foreground elements generally being completely contained within background elements.
+	- Text should never overlap, the user won't be able to read it if so. You must refer to the screenshot to make sure text is not overlapping.
+- You can edit the canvas yourself when working on tasks, unlike in larger orchestrating projects where you only coordinate. As you and your partner work on the project, the state is ever changing, so don't be surprised if states of different tasks or the canvas changes as you go.
+- Once the project is fully complete, end it.
+`
+}
+
+function buildRulesPromptSection(flags: SystemPromptFlags) {
+	return `## Shapes
+
+${
+	flags.canEdit
+		? `Shapes can be:
+
+${FOCUSED_SHAPE_TYPES.map((type) => `- **${type.charAt(0).toUpperCase() + type.slice(1)} (\`${type}\`)**`).join('\n')}
+
+Each shape has:
+
+- \`_type\` (one of ${FOCUSED_SHAPE_TYPES.map((type) => `\`${type}\``).join(', ')})
+- \`x\`, \`y\` (numbers, coordinates, the TOP LEFT corner of the shape) (except for arrows and lines, which have \`x1\`, \`y1\`, \`x2\`, \`y2\`)
+- \`note\` (a description of the shape's purpose or intent) (invisible to the user)
+
+Shapes may also have different properties depending on their type:
+
+- \`w\` and \`h\` (for shapes)
+- \`color\` (optional, chosen from predefined colors)
+- \`fill\` (optional, for shapes)
+- \`text\` (optional, for text elements) (visible to the user)
+- ...and others
+
+### Arrow properties
+
+Arrows are different from shapes, in that they are lines that connect two shapes. They are different from the arrowshapes (arrow-up, arrow-down, arrow-left, arrow-right), which are two dimensional.
+
+Arrows have:
+- \`fromId\` (optional, the id of the shape that the arrow starts from)
+- \`toId\` (optional, the id of the shape that the arrow points to)
+
+### Arrow and line properties
+
+Arrows and lines are different from shapes, in that they are lines that they have two positions, not just one.
+
+Arrows and lines have:
+- \`x1\` (the x coordinate of the first point of the line)
+- \`y1\` (the y coordinate of the first point of the line)
+- \`x2\` (the x coordinate of the second point of the line)
+- \`y2\` (the y coordinate of the second point of the line)
+
+`
+		: `What you need to know about shapes is that they exist on the canvas and have x,y coordinates, as well as many different types, colors, and fills. There are also arrows that can connect two shapes. You can't create or edit them, but other agents can.
+`
+}
+
+## Event schema
+
+Refer to the JSON schema for the full list of available events, their properties, and their descriptions. You can only use events listed in the JSON schema, even if they are referred to within this system prompt. Use the schema as the source of truth on what is available. Make wise choices about which action types to use, but only use action types that are listed in the JSON schema.
+
+## Rules
+
+1. **Always return a valid JSON object conforming to the schema.**
+2. **Do not generate extra fields or omit required fields.**
+3. **Use meaningful \`intent\` descriptions for all actions.**
+${flags.canEdit ? '4. **Ensure each `shapeId` is unique and consistent across related events.**' : ''}
+
+## Useful notes
+
+### General tips about the canvas
+
+- The coordinate space is the same as on a website: 0,0 is the top left corner. The x-axis increases as you scroll to the right. The y-axis increases as you scroll down the canvas.
+- The x and y define the top left corner of the shape. The shape's origin is in its top left corner.
+
+${
+	flags.canEdit
+		? `### Tips for creating and updating shapes
+
+${
+	flags.hasMove
+		? `- When moving shapes:
+	- Always use the ` +
+			'`move`' +
+			` action to move a shape${flags.hasUpdate ? ', never the ' + '`update`' + ' action' : ''}.`
+		: ''
+}
+${
+	flags.hasUpdate
+		? `- When updating shapes:
+	- Only output a single shape for each shape being updated. We know what it should update from its shapeId.`
+		: ''
+}
+${
+	flags.hasCreate
+		? `- When creating shapes:
+	- If the shape you need is not available in the schema, use the pen to draw a custom shape. The pen can be helpful when you need more control over a shape's exact shape. This can be especially helpful when you need to create shapes that need to fit together precisely.
+	- Use the ` +
+			'`note`' +
+			` field to provide context for each shape. This will help you in the future to understand the purpose of each shape.
+	- Never create "unknown" type shapes, though you can move unknown shapes if you need to.
+	- When creating shapes that are meant to be contained within other shapes, always ensure the shapes properly fit inside of the containing or background shape. If there are overlaps, decide between making the inside shapes smaller or the outside shape bigger.`
+		: ''
+}
+${
+	flags.hasCreate
+		? `- When drawing arrows between shapes:
+	- Be sure to include the shapes' ids as fromId and toId.
+	- Always ensure they are properly connected with bindings.
+	- You can make the arrow curved by using the 'bend' property. The bend value (in pixels) determines how far the arrow's midpoint is displaced perpendicular to the straight line between its endpoints. To determine the correct sign:
+		- Calculate the arrow's direction vector: (dx = x2 - x1, dy = y2 - y1)
+		- The perpendicular direction (90° counterclockwise) is: (-dy, dx)
+		- Positive bend displaces the midpoint in the direction of (-dy, dx)
+		- Negative bend displaces the midpoint in the opposite direction: (dy, -dx)
+		- Examples:
+			- Arrow going RIGHT (dx > 0, dy = 0): positive bend curves DOWN, negative bend curves UP
+			- Arrow going LEFT (dx < 0, dy = 0): positive bend curves UP, negative bend curves DOWN
+			- Arrow going DOWN (dx = 0, dy > 0): positive bend curves RIGHT, negative bend curves LEFT
+			- Arrow going UP (dx = 0, dy < 0): positive bend curves LEFT, negative bend curves RIGHT
+		- Or simply: positive bend rotates the perpendicular 90° counterclockwise from the arrow's direction.
+		- When looking at the canvas, you might notice arrows that are bending the wrong way. To fix this, update that arrow shape's bend property to the inverse of the current bend property.
+	- Be sure not to create arrows twice—check for existing arrows that already connect the same shapes for the same purpose.
+	- Make sure your arrows are long enough to contain any labels you may add to them.
+- Labels and text
+	- Be careful with labels. Did the user ask for labels on their shapes? Did the user ask for a format where labels would be appropriate? If yes, add labels to shapes. If not, do not add labels to shapes. For example, a 'drawing of a cat' should not have the parts of the cat labelled; but a 'diagram of a cat' might have shapes labelled.
+	- When drawing a shape with a label, be sure that the text will fit inside of the label. Label text is generally 26 points tall and each character is about 18 pixels wide. There are 32 pixels of padding around the the text on each side. You need to leave room for the padding. Factor this padding into your calculations when determining if the text will fit as you wouldn't want a word to get cut off. When a shape has a text label, it has a minimum height of 100, even if you try to set it to something smaller.
+	- You may also specify the alignment of the label text within the shape.
+	- There are also standalone text shapes that you may encounter. You will be provided with the font size of the text shape, which measures the height of the text.
+	- When creating a text shape, you can specify the font size of the text shape if you like. The default size is 26 points tall with each character being about 18 pixels wide.
+	- By default, the width of text shapes will auto adjust based on the text content${flags.hasScreenshotPart ? '. Refer to your view of the canvas to see how much space is actually taken up by the text' : ''}.
+	- If you like, however, you can specify the width of the text shape by passing in the \`width\` property AND setting the \`wrap\` property to \`true\`.
+		- This will only work if you both specify a \`width\` AND set the \`wrap\` property to \`true\`.
+		- If you want the shape to follow the default, autosize behavior, do not include EITHER the \`width\` or \`wrap\` property.
+	- Text shapes can be aligned horizontally, either \`start\`, \`middle\`, or \`end\`. The default alignment is \`start\` if you do not specify an alignment.
+		- When creating and viewing text shapes, their text alignment will determine tha value of the shape's \`x\` property. For start, or left aligned text, the \`x\` property will be the left edge of the text, like all other shapes. However, for middle aligned text, the \`x\` property will be the center of the text, and for end aligned text, the \`x\` property will be the right edge of the text. So for example, if you want place some text on the to the left of another shape, you should set the text's alignment to \`end\`, and give it an \`x\` value that is just less than the shape's \`x\` value.
+		- It's important to note that middle and end-aligned text are the only things on the canvas that have their \`x\` property set to something other than the leftmost edge.
+	- If geometry shapes or note shapes have text, the shapes will become taller to accommodate the text. If you're adding lots of text, be sure that the shape is wide enough to fit it.
+	- Note shapes are 50x50. They're sticky notes and are only suitable for tiny sentences. Use a geometric shape or text shape if you need to write more.
+	- When drawing flow charts or other geometric shapes with labels, they should be at least 200 pixels on any side unless you have a good reason not to.
+- Colors
+	- When specifying a fill, you can use ` +
+			'`background`' +
+			` to make the shape the same color as the background${flags.hasScreenshotPart ? ", which you'll see in your viewport" : ''}. It will either be white or black, depending on the theme of the canvas.
+		- When making shapes that are white (or black when the user is in dark mode), instead of making the color ` +
+			'`white`' +
+			`, use ` +
+			'`background`' +
+			` as the fill and ` +
+			'`grey`' +
+			` as the color. This makes sure there is a border around the shape, making it easier to distinguish from the background.`
+		: ''
+}
+`
+		: ''
+}
+
+### Communicating with the user
+
+${flags.hasMessage ? '- If you want to communicate with the user, use the ' + '`message`' + ' action.' : ''}
+${
+	flags.hasReview
+		? `- Use the ` +
+			'`review`' +
+			` action to check your work.
+- When using the ` +
+			'`review`' +
+			` action, pass in ` +
+			'`x`, `y`, `w`, and `h`' +
+			` values to define the area of the canvas where you want to focus on for your review. The more specific the better, but make sure to leave some padding around the area.
+- Do not use the ` +
+			'`review`' +
+			` action to check your work for simple tasks like creating, updating or moving a single shape. Assume you got it right.
+- If you use the ` +
+			'`review`' +
+			` action and find you need to make changes, carry out the changes. You are allowed to call follow-up ` +
+			'`review`' +
+			` events after that too, but there is no need to schedule a review if the changes are simple or if there were no changes.`
+		: ''
+}
+${flags.hasThink && flags.hasMessage ? '- Your ' + '`think`' + ' events are not visible to the user, so your responses should never include only ' + '`think`' + ' events. Use a ' + '`message`' + ' action to communicate with the user.' : ''}
+- Don't offer to help the user. You can help them if you like, but you are not a helpful assistant.
+
+### Starting your work
+
+${
+	// 	flags.hasSharedTodo && flags.hasOtherFairiesPart && flags.hasAssignTodoItem
+	// 		? `#### Collaborating with other agents
+
+	// - You have access to a todo list that is shared between all agents in this document. You can freely add to and claim unclaimed tasks from this list.
+	// - You should always ask other agents to help out with a todo item. This will help you get work done faster. To do this, you can use the ` +
+	// 			'`assign-todo-item`' +
+	// 			` action, which will assign it to them and ask them to help out with it.
+	// - If you're asked to do something that doesn't already have a task on the shared todo list, you must break down the task into smaller tasks and add them to the shared todo list. Making tasks is cheap and should always be done unless the work the work is confined to an entity small enough that coordinating would do more harm than good.
+	// - Todo items also may have x and y coordinates associated with them. These coordinates designate whereabouts in the canvas the work should be done.
+	// 	- When making a todo item, specify coordinates if relevant, for example if the work is part of a larger task that should be done in a specific area of the canvas.
+	// 	- Todo items close together are probably related.
+	// - When working with other agents, you must use the shared todo list to coordinate your work. To add new items to the shared todo list, or claim them for yourself, you can update the shared todo list with the ` +
+	// 			'`update-shared-todo-list`' +
+	// 			` action. When creating new tasks with this action, make sure not to intially assign them all to yourself. This is because other agents may want to help out and claim some. Once you have created some tasks, use the ` +
+	// 			'`review`' +
+	// 			` action to check the shared todo list, after which you can claim tasks for yourself. Make sure to mark the tasks as "in-progress" when you claim them as well. Only claim a small amount of tasks at a time, and only claim tasks that you are confident you can complete.
+	// 	- ONLY claim tasks that you are confident you can complete, given the actions you have available to you.
+	// - Once you finish all your tasks, and mark them as done, make sure to use the ` +
+	// 			'`review`' +
+	// 			` action to check the shared todo list, after which you can claim more tasks.
+	// - Make sure to always get a full view of any in-progress work before starting to assist other agents or the human to make sure that you can match the style / layout / color schemes / etc. of the work.`
+	// 		: ''
+	''
+}
+
+${
+	flags.hasPersonalTodoList
+		? `- Use ` +
+			'`update-personal-todo-list`' +
+			` events liberally to keep an up to date list of your progress on the task at hand. When you are assigned a new task, use the action multiple times to sketch out your plan${flags.hasReview ? '. You can then use the ' + '`review`' + ' action to check the todo list' : ''}.
+		- Remember to always get started on the task after fleshing out a todo list.`
+		: ''
+}
+${flags.hasThink ? '- Use ' + '`think`' + ' events liberally to work through each step of your strategy.' : ''}
+${flags.hasScreenshotPart && (flags.hasBlurryShapesPart || flags.hasPeripheralShapesPart || flags.hasSelectedShapesPart) ? '- To "see" the canvas, combine the information you have from your view of the canvas with the description of the canvas shapes on the viewport.' : ''}
+${(flags.hasDistribute || flags.hasStack || flags.hasAlign || flags.hasPlace) && (flags.hasCreate || flags.hasUpdate || flags.hasMove) ? `- Carefully plan which action types to use. For example, the higher level events like ${[flags.hasDistribute && '`distribute`', flags.hasStack && '`stack`', flags.hasAlign && '`align`', flags.hasPlace && '`place`'].filter(Boolean).join(', ')} can at times be better than the lower level events like ${[flags.hasCreate && '`create`', flags.hasUpdate && '`update`', flags.hasMove && '`move`'].filter(Boolean).join(', ')} because they're more efficient and more accurate. If lower level control is needed, the lower level events are better because they give more precise and customizable control.` : ''}
+${flags.hasSelectedShapesPart ? "- If the user has selected shape(s) and they refer to 'this', or 'these' in their request, they are probably referring to their selected shapes." : ''}
+
+${
+	flags.hasUserViewportBoundsPart || flags.hasAgentViewportBoundsPart || flags.hasFlyToBounds
+		? `### Navigating the canvas
+
+${flags.hasUserViewportBoundsPart ? "- Don't go out of your way to work inside the user's view unless you need to." : ''}
+${flags.hasPeripheralShapesPart ? '- You will be provided with list of shapes that are outside of your viewport.' : ''}
+${
+	flags.hasFlyToBounds
+		? `- You can use the ` +
+			'`fly-to-bounds`' +
+			` action to change your viewport to see other areas of the canvas if needed. This will provide you with an updated view of the canvas. You can also use this to functionally zoom in or out. If you want to look at something that doesn't fit in your viewport, you can look at part of it with the ` +
+			'`fly-to-bounds`' +
+			` action.`
+		: ''
+}`
+		: ''
+}
+
+${
+	flags.hasReview
+		? `## Reviewing your work
+
+- Remember to review your work when making multiple changes so that you can see the results of your work. Otherwise, you're flying blind.
+${flags.hasFlyToBounds ? '- If you fly somewhere, you get the same updated information about the canvas as if you had used the ' + '`review`' + ' action, so no need to review right after flying.' : ''}
+${flags.hasScreenshotPart ? '- When reviewing your work, you should rely **most** on the image provided to find overlaps, assess quality, and ensure completeness.' : ''}
+- Some important things to check for while reviewing:
+	- Are arrows properly connected to the shapes they are pointing to?
+	- Are labels properly contained within their containing shapes?
+	- Are labels properly positioned?
+	- Are any shapes overlapping? If so, decide whether to move the shapes, labels, or both.
+	- Are shapes floating in the air that were intended to be touching other shapes?
+- In a finished drawing or diagram:
+	- There should be no overlaps between shapes or labels.
+	- Arrows should be connected to the shapes they are pointing to, unless they are intended to be disconnected.
+	- Arrows should not overlap with other shapes.
+	- The overall composition should be balanced, like a good photo or directed graph.
+- It's important to review text closely. Make sure:
+	- Words are not cut off due to text wrapping. If this is the case, consider making the shape wider so that it can contain the full text, and rearranging other shapes to make room for this if necessary. Alternatively, consider shortening the text so that it can fit, or removing a text label and replacing it with a floating text shape. Important: Changing the height of a shape does not help this issue, as the text will still wrap. It's the mismatched *width* of the shape and the text that causes this issue, so adjust one of them.${
+		flags.hasMove
+			? `
+	- If text looks misaligned, it's best to manually adjust its position with the ` +
+				'`move`' +
+				` action to put it in the right place.`
+			: ''
+	}
+	- If text overflows out of a container that it's supposed to be inside, consider making the container wider, or shortening or wrapping the text so that it can fit.
+	- Spacing is important. If there is supposed to be a gap between shapes, make sure there is a gap. It's very common for text shapes to have spacing issues, so review them strictly. It's kind to be strict and honest because we want to help each other do the best we possibly can.
+- REMEMBER: To be a good reviewer, come up with actionable steps to fix any issues you find, and carry those steps out.
+- IMPORTANT: If you made changes as part of a review, or if there is still work to do, schedule a follow-up review for tracking purposes.`
+		: ''
+}
+
+### Finishing your work
+
+- Complete the task to the best of your ability. Schedule further work as many times as you need to complete the task, but be realistic about what is possible with the shapes you have available.
+${flags.hasReview && flags.hasMessage ? "- If the task is finished to a reasonable degree, it's better to give the user a final message than to pointlessly re-review what is already reviewed." : ''}
+${flags.hasReview ? "- If there's still more work to do, you must " + '`review`' + " it. Otherwise it won't happen." : ''}
+${flags.hasMessage ? "- It's nice to speak to the user (with a " + '`message`' + " action) to let them know what you've done." : ''}
+
+${
+	flags.hasDataPart
+		? `### API data
+
+- When you call an API, you must end your actions in order to get response. Don't worry, you will be able to continue working after that.
+- If you want to call multiple APIs and the results of the API calls don't depend on each other, you can call them all at once before ending your response. This will help you get the results of the API calls faster.
+- If an API call fails, you should let the user know that it failed instead of trying again.`
+		: ''
+}
+	`
+}
+
+function buildSchemaPromptSection(actions: AgentAction['_type'][]) {
+	return `## JSON schema
+
+This is the JSON schema for the events you can return. You must conform to this schema. You must only return things in this format, otherwise your response will error. You must conform to this schema. Remember, do NOT wrap any response in a code block using \`\`\`json. Output ONLY the json itself
+
+${JSON.stringify(buildResponseSchema(actions), null, 2)}
+`
+}
+
+function getSystemPromptFlags(
+	mode: ActiveFairyModeDefinition['type'],
+	actions: AgentAction['_type'][],
+	parts: PromptPart['type'][]
+) {
+	return {
+		// Mode flags
+		isSoloing: mode === 'soloing',
+		isWorking:
+			mode === 'working-drone' || mode === 'working-solo' || mode === 'working-orchestrator',
+		isOrchestrating: mode === 'orchestrating-active',
+		isDuoOrchestrating: mode === 'duo-orchestrating-active',
+
+		// Communication
+		hasMessage: actions.includes('message'),
+
+		// Planning
+		hasThink: actions.includes('think'),
+		hasReview: actions.includes('review'),
+		hasFlyToBounds: actions.includes('fly-to-bounds'),
+		hasPersonalTodoList:
+			actions.includes('update-personal-todo-list') && parts.includes('personalTodoList'),
+
+		// Individual shapes
+		hasCreate: actions.includes('create'),
+		hasDelete: actions.includes('delete'),
+		hasUpdate: actions.includes('update'),
+		hasLabel: actions.includes('label'),
+		hasMove: actions.includes('move'),
+
+		// Groups of shapes
+		hasPlace: actions.includes('place'),
+		hasBringToFront: actions.includes('bring-to-front'),
+		hasSendToBack: actions.includes('send-to-back'),
+		hasRotate: actions.includes('rotate'),
+		hasResize: actions.includes('resize'),
+		hasAlign: actions.includes('align'),
+		hasDistribute: actions.includes('distribute'),
+		hasStack: actions.includes('stack'),
+
+		// Drawing
+		hasPen: actions.includes('pen'),
+
+		// Page navigation
+		hasChangePage: actions.includes('change-page'),
+		hasCreatePage: actions.includes('create-page'),
+
+		// Task management
+		hasCreateSoloTask: actions.includes('create-task'),
+		hasCreateProjectTask: actions.includes('create-project-task'),
+		hasStartTask: actions.includes('start-task'),
+		hasMarkTaskDone: actions.includes('mark-my-task-done'),
+		hasClaimTodoItem: actions.includes('claim-todo-item'),
+
+		// Project management
+		hasActivateFairy: actions.includes('activate-agent'),
+
+		// Internal (required)
+		hasUnknown: actions.includes('unknown'),
+
+		// Request
+		hasMessagesPart: parts.includes('messages'),
+		hasDataPart: parts.includes('data'),
+
+		// Viewport
+		hasScreenshotPart: parts.includes('screenshot'),
+		hasUserViewportBoundsPart: parts.includes('userViewportBounds'),
+		hasAgentViewportBoundsPart: parts.includes('agentViewportBounds'),
+
+		// Shapes
+		hasBlurryShapesPart: parts.includes('blurryShapes'),
+		hasPeripheralShapesPart: parts.includes('peripheralShapes'),
+		hasSelectedShapesPart: parts.includes('selectedShapes'),
+
+		// History
+		hasChatHistoryPart: parts.includes('chatHistory'),
+		hasUserActionHistoryPart: parts.includes('userActionHistory'),
+
+		// Tasks
+		hasSoloTasksPart: parts.includes('soloTasks'),
+		hasWorkingTasksPart: parts.includes('workingTasks'),
+
+		// Metadata
+		hasTimePart: parts.includes('time'),
+		hasPagesPart: parts.includes('pages'),
+		hasModePart: parts.includes('mode'),
+		hasDebugPart: parts.includes('debug'),
+
+		// Collaboration
+		hasOtherFairiesPart: parts.includes('otherFairies'),
+
+		// Project
+		hasCurrentProjectPart:
+			parts.includes('currentProjectDrone') || parts.includes('currentProjectOrchestrator'),
+
+		// assign todo item
+		hasAssignTodoItem: actions.includes('direct-to-start-project-task'),
+
+		// personality
+		hasPersonalityPart: parts.includes('personality'),
+
+		//orchestration
+		hasStartProject: actions.includes('start-project'),
+		isOrchestrator: actions.includes('end-project'),
+
+		canEdit:
+			actions.includes('update') ||
+			actions.includes('delete') ||
+			actions.includes('move') ||
+			actions.includes('label') ||
+			actions.includes('place') ||
+			actions.includes('bring-to-front') ||
+			actions.includes('send-to-back') ||
+			actions.includes('resize') ||
+			actions.includes('rotate') ||
+			actions.includes('align') ||
+			actions.includes('distribute') ||
+			actions.includes('stack'),
+	}
+}
+
+type SystemPromptFlags = ReturnType<typeof getSystemPromptFlags>
+
+function normalizeNewlines(text: string): string {
+	// Step 1: Replace 3+ consecutive newlines with exactly 2 newlines
+	let result = text.replace(/\n{3,}/g, '\n\n')
+
+	// Step 2: Replace 2 newlines with 1 newline between lines that both start with hyphen
+	// This keeps list items together without extra blank lines
+	result = result.replace(/(^|\n)(\s*-[^\n]*)\n\n(?=\s*-)/g, '$1$2\n')
+
+	return result
+}
diff --git a/apps/dotcom/fairy-worker/src/prompt/getModelName.ts b/apps/dotcom/fairy-worker/src/prompt/getModelName.ts
new file mode 100644
index 000000000000..31a761bff925
--- /dev/null
+++ b/apps/dotcom/fairy-worker/src/prompt/getModelName.ts
@@ -0,0 +1,19 @@
+import {
+	AgentModelName,
+	AgentPrompt,
+	DEFAULT_MODEL_NAME,
+	ModelNamePart,
+} from '@tldraw/fairy-shared'
+
+/**
+ * Get the selected model name from a prompt.
+ */
+export function getModelName(prompt: AgentPrompt): AgentModelName {
+	for (const part of Object.values(prompt)) {
+		if (part.type === 'modelName') {
+			return (part as ModelNamePart).name
+		}
+	}
+
+	return DEFAULT_MODEL_NAME
+}
diff --git a/apps/dotcom/fairy-worker/src/routes/stream.ts b/apps/dotcom/fairy-worker/src/routes/stream-actions.ts
similarity index 85%
rename from apps/dotcom/fairy-worker/src/routes/stream.ts
rename to apps/dotcom/fairy-worker/src/routes/stream-actions.ts
index 457ba9204de2..b460478a6f89 100644
--- a/apps/dotcom/fairy-worker/src/routes/stream.ts
+++ b/apps/dotcom/fairy-worker/src/routes/stream-actions.ts
@@ -1,7 +1,7 @@
 import { Environment } from '../environment'
 import { AuthenticatedRequest } from '../worker'
 
-export async function stream(request: AuthenticatedRequest, env: Environment) {
+export async function streamActionsHandler(request: AuthenticatedRequest, env: Environment) {
 	// Auth is already validated and attached by requireTldrawEmail middleware
 	const auth = request.auth
 
@@ -17,6 +17,7 @@ export async function stream(request: AuthenticatedRequest, env: Environment) {
 		method: 'POST',
 		headers: {
 			'Content-Type': 'application/json',
+			'X-Is-Admin': request.isAdmin.toString(),
 		},
 		body: bodyText, // Pass the string, not the consumed stream
 	})
diff --git a/apps/dotcom/fairy-worker/src/routes/stream-text.ts b/apps/dotcom/fairy-worker/src/routes/stream-text.ts
new file mode 100644
index 000000000000..3dd57a8ea7c3
--- /dev/null
+++ b/apps/dotcom/fairy-worker/src/routes/stream-text.ts
@@ -0,0 +1,29 @@
+import { Environment } from '../environment'
+import { AuthenticatedRequest } from '../worker'
+
+export async function streamTextHandler(request: AuthenticatedRequest, env: Environment) {
+	// Auth is already validated and attached by requireTldrawEmail middleware
+	const auth = request.auth
+
+	// Read the body once and convert to string
+	const bodyText = await request.text()
+
+	// Use the user's ID for the durable object routing
+	const id = env.AGENT_DURABLE_OBJECT.idFromName(auth.userId)
+	const DO = env.AGENT_DURABLE_OBJECT.get(id)
+
+	// Create a NEW request with /stream-text path
+	const url = new URL(request.url)
+	url.pathname = '/stream-text'
+
+	const response = await DO.fetch(url.toString(), {
+		method: 'POST',
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		body: bodyText,
+	})
+
+	// Return the response directly, don't wrap it again
+	return response
+}
diff --git a/apps/dotcom/fairy-worker/src/worker.ts b/apps/dotcom/fairy-worker/src/worker.ts
index 03f5726435ec..8e9549b0e08d 100644
--- a/apps/dotcom/fairy-worker/src/worker.ts
+++ b/apps/dotcom/fairy-worker/src/worker.ts
@@ -3,13 +3,15 @@
 import { createRouter, handleApiRequest, notFound } from '@tldraw/worker-shared'
 import { WorkerEntrypoint } from 'cloudflare:workers'
 import { cors, IRequest } from 'itty-router'
-import { getAuth, requireAdminAccess, SignedInAuth } from './auth'
+import { getAuth, isAdmin, requireAdminAccess, SignedInAuth } from './auth'
 import { Environment } from './environment'
-import { stream } from './routes/stream'
+import { streamActionsHandler } from './routes/stream-actions'
+import { streamTextHandler } from './routes/stream-text'
 
 // Extend IRequest to include auth
 export interface AuthenticatedRequest extends IRequest {
 	auth: SignedInAuth
+	isAdmin: boolean
 }
 
 const { preflight, corsify } = cors({
@@ -21,7 +23,8 @@ export default class extends WorkerEntrypoint<Environment> {
 		.all('*', preflight)
 		.all('*', blockUnknownOrigins)
 		.all('*', requireTldrawEmail)
-		.post('/stream', stream)
+		.post('/stream-actions', streamActionsHandler)
+		.post('/stream-text', streamTextHandler)
 		.all('*', notFound)
 
 	override async fetch(request: Request): Promise<Response> {
@@ -77,9 +80,18 @@ async function requireTldrawEmail(request: IRequest, env: Environment) {
 		if (!auth || 'userId' in auth === false || auth.userId === null) {
 			throw new Error('Unauthorized')
 		}
-		await requireAdminAccess(env, auth)
 		// Attach auth to request for downstream use
 		;(request as AuthenticatedRequest).auth = auth
+		const hasAdminStatus = await isAdmin(env, auth)
+
+		if (env.IS_LOCAL === 'true') {
+			;(request as AuthenticatedRequest).isAdmin = hasAdminStatus
+			return undefined
+		}
+
+		await requireAdminAccess(env, auth)
+		;(request as AuthenticatedRequest).isAdmin = hasAdminStatus
+
 		return undefined
 	} catch (error: any) {
 		console.error('Authentication failed:', error.message)
diff --git a/apps/dotcom/image-resize-worker/src/worker.ts b/apps/dotcom/image-resize-worker/src/worker.ts
index 54f3197b608c..fbe6fe0c25be 100644
--- a/apps/dotcom/image-resize-worker/src/worker.ts
+++ b/apps/dotcom/image-resize-worker/src/worker.ts
@@ -1,6 +1,12 @@
 import { APP_ASSET_UPLOAD_ENDPOINT } from '@tldraw/dotcom-shared'
 import { T } from '@tldraw/validate'
-import { createRouter, handleApiRequest, notFound, parseRequestQuery } from '@tldraw/worker-shared'
+import {
+	createRouter,
+	handleApiRequest,
+	isAllowedOrigin,
+	notFound,
+	parseRequestQuery,
+} from '@tldraw/worker-shared'
 import { WorkerEntrypoint } from 'cloudflare:workers'
 
 declare const fetch: typeof import('@cloudflare/workers-types').fetch
@@ -109,12 +115,7 @@ export default class Worker extends WorkerEntrypoint<Environment> {
 			return true
 		}
 
-		return (
-			origin.endsWith('.tldraw.com') ||
-			origin.endsWith('.tldraw.xyz') ||
-			origin.endsWith('.tldraw.dev') ||
-			origin.endsWith('.tldraw.workers.dev')
-		)
+		return isAllowedOrigin(origin)
 	}
 }
 
diff --git a/apps/dotcom/sync-worker/package.json b/apps/dotcom/sync-worker/package.json
index 2de909e198c5..1851d2b6d5ca 100644
--- a/apps/dotcom/sync-worker/package.json
+++ b/apps/dotcom/sync-worker/package.json
@@ -17,12 +17,13 @@
 		"test": "yarn run -T vitest --passWithNoTests",
 		"clean": "rm -rf .wrangler/state",
 		"test-coverage": "yarn run -T vitest run --coverage --passWithNoTests",
-		"check-bundle-size": "yarn run -T tsx ../../../internal/scripts/check-worker-bundle.ts --entry src/worker.ts --size-limit-bytes 1300000",
+		"check-bundle-size": "yarn run -T tsx ../../../internal/scripts/check-worker-bundle.ts --entry src/worker.ts --size-limit-bytes 1350000",
 		"reset-db": "./reset-db.sh",
 		"lint": "yarn run -T tsx ../../../internal/scripts/lint.ts"
 	},
 	"dependencies": {
 		"@clerk/backend": "^1.23.7",
+		"@pierre/storage": "^0.1.1",
 		"@rocicorp/zero": "0.19.2025050203",
 		"@supabase/auth-helpers-remix": "^0.2.6",
 		"@supabase/supabase-js": "^2.48.1",
diff --git a/apps/dotcom/sync-worker/src/TLDrawDurableObject.ts b/apps/dotcom/sync-worker/src/TLDrawDurableObject.ts
index a6be35a11ff5..6cdf87d37c56 100644
--- a/apps/dotcom/sync-worker/src/TLDrawDurableObject.ts
+++ b/apps/dotcom/sync-worker/src/TLDrawDurableObject.ts
@@ -1,6 +1,6 @@
 /// <reference no-default-lib="true"/>
-/// <reference types="@cloudflare/workers-types" />
 
+import { R2Bucket } from '@cloudflare/workers-types'
 import { SupabaseClient } from '@supabase/supabase-js'
 import {
 	APP_ASSET_UPLOAD_ENDPOINT,
@@ -14,6 +14,7 @@ import {
 	ROOM_PREFIX,
 	ROOM_SIZE_LIMIT_MB,
 	SNAPSHOT_PREFIX,
+	TLCustomServerEvent,
 	TlaFile,
 	type RoomOpenMode,
 } from '@tldraw/dotcom-shared'
@@ -45,6 +46,7 @@ import { getPublishedRoomSnapshot } from './routes/tla/getPublishedFile'
 import { generateSnapshotChunks } from './snapshotUtils'
 import { Analytics, DBLoadResult, Environment, TLServerEvent } from './types'
 import { EventData, writeDataPoint } from './utils/analytics'
+import { createPierreClient } from './utils/createPierreClient'
 import { createSupabaseClient } from './utils/createSupabaseClient'
 import { getRoomDurableObject } from './utils/durableObjects'
 import { isRateLimited } from './utils/rateLimit'
@@ -173,6 +175,7 @@ export class TLDrawDurableObject extends DurableObject {
 
 	// For persistence
 	supabaseClient: SupabaseClient | void
+	pierreClient: ReturnType<typeof createPierreClient>
 
 	// For analytics
 	measure: Analytics | undefined
@@ -201,6 +204,7 @@ export class TLDrawDurableObject extends DurableObject {
 		this.measure = env.MEASURE
 		this.sentry = createSentry(this.state, this.env)
 		this.supabaseClient = createSupabaseClient(env)
+		this.pierreClient = createPierreClient(env)
 
 		this.supabaseTable = env.TLDRAW_ENV === 'production' ? 'drawings' : 'drawings_staging'
 		this.r2 = {
@@ -250,6 +254,11 @@ export class TLDrawDurableObject extends DurableObject {
 			(req) => this.extractDocumentInfoFromRequest(req, ROOM_OPEN_MODE.READ_WRITE),
 			(req) => this.onRestore(req)
 		)
+		.post(
+			`/app/file/:roomId/pierre-restore`,
+			(req) => this.extractDocumentInfoFromRequest(req, ROOM_OPEN_MODE.READ_WRITE),
+			(req) => this.onRestore(req, true)
+		)
 		.all('*', () => new Response('Not found', { status: 404 }))
 
 	// eslint-disable-next-line no-restricted-syntax
@@ -297,23 +306,49 @@ export class TLDrawDurableObject extends DurableObject {
 	}
 
 	_isRestoring = false
-	async onRestore(req: IRequest) {
+	async onRestore(req: IRequest, isPierre: boolean = false) {
 		this._isRestoring = true
 		try {
+			if (isPierre && !this.documentInfo.isApp) {
+				return new Response('Pierre restore must be for an app file', { status: 400 })
+			}
 			if (this.documentInfo.isApp) {
 				await requireWriteAccessToFile(req, this.env, this.documentInfo.slug)
 			}
+			let dataText = ''
 			const roomId = this.documentInfo.slug
 			const roomKey = getR2KeyForRoom({ slug: roomId, isApp: this.documentInfo.isApp })
-			const timestamp = ((await req.json()) as any).timestamp
-			if (!timestamp) {
-				return new Response('Missing timestamp', { status: 400 })
-			}
-			const data = await this.r2.versionCache.get(`${roomKey}/${timestamp}`)
-			if (!data) {
-				return new Response('Version not found', { status: 400 })
+			if (isPierre) {
+				const commitHash = ((await req.json()) as any).commitHash
+				if (!commitHash) {
+					return new Response('Missing commit hash', { status: 400 })
+				}
+				const repo = await this.getPierreRepo()
+				if (!repo) {
+					return new Response('Pierre not available', { status: 503 })
+				}
+				const fileStream = await repo.getFileStream({
+					path: SNAPSHOT_FILE_NAME,
+					ref: commitHash,
+				})
+				dataText = await fileStream.text()
+				await repo.restoreCommit({
+					targetCommitSha: commitHash,
+					targetBranch: 'main',
+					author: PIERRE_AUTHOR,
+				})
+			} else {
+				const timestamp = ((await req.json()) as any).timestamp
+				if (!timestamp) {
+					return new Response('Missing timestamp', { status: 400 })
+				}
+				const data = await this.r2.versionCache.get(`${roomKey}/${timestamp}`)
+				if (!data) {
+					return new Response('Version not found', { status: 400 })
+				}
+				dataText = await data.text()
 			}
-			const dataText = await data.text()
+
 			await this.r2.rooms.put(roomKey, dataText)
 			const room = await this.getRoom()
 
@@ -330,17 +365,20 @@ export class TLDrawDurableObject extends DurableObject {
 	// this might return null if the file doesn't exist yet in the backend, or if it was deleted
 	_fileRecordCache: TlaFile | null = null
 	async getAppFileRecord(): Promise<TlaFile | null> {
+		const timer = this.timer()
 		try {
-			return await retry(
+			const result = await retry(
 				async () => {
 					if (this._fileRecordCache) {
 						return this._fileRecordCache
 					}
+
 					const result = await this.db
 						.selectFrom('file')
 						.where('id', '=', this.documentInfo.slug)
 						.selectAll()
 						.executeTakeFirst()
+
 					if (!result) {
 						throw new Error('File not found')
 					}
@@ -352,12 +390,18 @@ export class TLDrawDurableObject extends DurableObject {
 					waitDuration: 100,
 				}
 			)
+
+			timer.report('get_file_record')
+			return result
 		} catch (_e) {
+			timer.report('get_file_record_error')
 			return null
 		}
 	}
 
 	async onRequest(req: IRequest, openMode: RoomOpenMode) {
+		const requestTimer = this.timer()
+
 		// extract query params from request, should include instanceId
 		const url = new URL(req.url)
 		const params = Object.fromEntries(url.searchParams.entries())
@@ -381,7 +425,10 @@ export class TLDrawDurableObject extends DurableObject {
 			return closeSocket(TLSyncErrorCloseEventReason.NOT_FOUND)
 		}
 
+		const authTimer = this.timer()
 		const auth = await getAuth(req, this.env)
+		authTimer.report('on_request_auth')
+
 		if (this.documentInfo.isApp) {
 			openMode = ROOM_OPEN_MODE.READ_WRITE
 			const file = await this.getAppFileRecord()
@@ -398,6 +445,8 @@ export class TLDrawDurableObject extends DurableObject {
 				if (!auth && !file.shared) {
 					return closeSocket(TLSyncErrorCloseEventReason.NOT_AUTHENTICATED)
 				}
+
+				const rateLimitTimer = this.timer()
 				if (auth?.userId) {
 					const rateLimited = await isRateLimited(this.env, auth?.userId)
 					if (rateLimited) {
@@ -421,17 +470,22 @@ export class TLDrawDurableObject extends DurableObject {
 						return closeSocket(TLSyncErrorCloseEventReason.RATE_LIMITED)
 					}
 				}
+				rateLimitTimer.report('on_request_rate_limit')
+
 				// Check if user has owner access (directly or via group membership)
 				let hasOwnerAccess = false
 				if (file.ownerId && file.ownerId === auth?.userId) {
 					hasOwnerAccess = true
 				} else if (file.owningGroupId && auth?.userId) {
 					// Check if user is a member of the owning group
+					const groupCheckTimer = this.timer()
 					const groupMember = await this.db
 						.selectFrom('group_user')
 						.where('groupId', '=', file.owningGroupId)
 						.where('userId', '=', auth.userId)
 						.executeTakeFirst()
+					groupCheckTimer.report('on_request_group_check')
+
 					if (groupMember) {
 						hasOwnerAccess = true
 					}
@@ -452,7 +506,10 @@ export class TLDrawDurableObject extends DurableObject {
 		}
 
 		try {
+			const getRoomTimer = this.timer()
 			const room = await this.getRoom()
+			getRoomTimer.report('on_request_get_room')
+
 			// Don't connect if we're already at max connections
 			if (room.getNumActiveSessions() > MAX_CONNECTIONS) {
 				return closeSocket(TLSyncErrorCloseEventReason.ROOM_FULL)
@@ -484,6 +541,9 @@ export class TLDrawDurableObject extends DurableObject {
 				instanceId: sessionId,
 				localClientId: storeId,
 			})
+
+			requestTimer.report('on_request_total')
+
 			return new Response(null, { status: 101, webSocket: clientWebSocket })
 		} catch (e) {
 			if (e === ROOM_NOT_FOUND) {
@@ -503,6 +563,10 @@ export class TLDrawDurableObject extends DurableObject {
 
 	logEvent(event: TLServerEvent) {
 		switch (event.type) {
+			case 'persist_success': {
+				this.writeEvent(event.type, { doubles: [event.attempts] })
+				break
+			}
 			case 'room': {
 				// we would add user/connection ids here if we could
 				this.writeEvent(event.name, { blobs: [event.roomId] })
@@ -545,12 +609,18 @@ export class TLDrawDurableObject extends DurableObject {
 
 		let data: RoomSnapshot | string | null | undefined = undefined
 		const [prefix, id] = split
+		const fetchTimer = this.timer()
 		switch (prefix) {
 			case FILE_PREFIX: {
+				const awaitPersistTimer = this.timer()
 				await getRoomDurableObject(this.env, id).awaitPersist()
+				awaitPersistTimer.report('create_from_source_await_persist')
+
+				const r2FetchTimer = this.timer()
 				data = await this.r2.rooms
 					.get(getR2KeyForRoom({ slug: id, isApp: true }))
 					.then((r) => r?.text())
+				r2FetchTimer.report('create_from_source_r2_fetch')
 				break
 			}
 			case ROOM_PREFIX:
@@ -573,13 +643,19 @@ export class TLDrawDurableObject extends DurableObject {
 				data = new TLSyncRoom({ schema: createTLSchema() }).getSnapshot()
 				break
 		}
+		fetchTimer.report('create_from_source_fetch_total')
 
 		if (!data) {
 			return { type: 'room_not_found' as const }
 		}
+
 		const serialized = typeof data === 'string' ? data : JSON.stringify(data)
 		const snapshot = typeof data === 'string' ? JSON.parse(data) : data
+
+		const putTimer = this.timer()
 		const roomObject = await this.r2.rooms.put(this._fileRecordCache.id, serialized)
+		putTimer.report('create_from_source_r2_put')
+
 		return {
 			type: 'room_found' as const,
 			snapshot,
@@ -589,32 +665,51 @@ export class TLDrawDurableObject extends DurableObject {
 
 	// Load the room's drawing data. First we check the R2 bucket, then we fallback to supabase (legacy).
 	async loadFromDatabase(slug: string): Promise<DBLoadResult> {
+		const loadTimer = this.timer()
 		try {
 			const key = getR2KeyForRoom({ slug, isApp: this.documentInfo.isApp })
+
 			// when loading, prefer to fetch documents from the bucket
+			const r2FetchTimer = this.timer()
 			const roomFromBucket = await this.r2.rooms.get(key)
+			r2FetchTimer.report('db_load_r2_fetch')
+
 			if (roomFromBucket) {
+				const snapshot = (await roomFromBucket.json()) as RoomSnapshot
+				loadTimer.report('db_load_total')
+
 				return {
 					type: 'room_found',
-					snapshot: await roomFromBucket.json(),
+					snapshot,
 					roomSizeMB: roomFromBucket.size / MB,
 				}
 			}
+
 			if (this._fileRecordCache?.createSource) {
+				const createFromSourceTimer = this.timer()
 				const res = await this.handleFileCreateFromSource()
+
+				createFromSourceTimer.report('db_load_create_from_source')
+
 				if (res.type === 'room_found') {
 					// save it to the bucket so we don't try to create from source again
 					await this.r2.rooms.put(key, JSON.stringify(res.snapshot))
 				}
+
+				loadTimer.report('db_load_total')
+
 				return res
 			}
 
 			if (this.documentInfo.isApp) {
 				// finally check whether the file exists in the DB but not in R2 yet
 				const file = await this.getAppFileRecord()
+
+				loadTimer.report('db_load_total')
 				if (!file) {
 					return { type: 'room_not_found' }
 				}
+
 				return {
 					type: 'room_found',
 					snapshot: new TLSyncRoom({ schema: createTLSchema() }).getSnapshot(),
@@ -623,33 +718,57 @@ export class TLDrawDurableObject extends DurableObject {
 			}
 
 			// if we don't have a room in the bucket, try to load from supabase
-			if (!this.supabaseClient) return { type: 'room_not_found' }
+			if (!this.supabaseClient) {
+				return { type: 'room_not_found' }
+			}
+
+			const supabaseFetchTimer = this.timer()
 			const { data, error } = await this.supabaseClient
 				.from(this.supabaseTable)
 				.select('*')
 				.eq('slug', slug)
 
+			supabaseFetchTimer.report('db_load_supabase_fetch')
+
 			if (error) {
 				this.logEvent({ type: 'room', roomId: slug, name: 'failed_load_from_db' })
 
+				loadTimer.report('db_load_total')
+
 				console.error('failed to retrieve document', slug, error)
 				return { type: 'error', error: new Error(error.message) }
 			}
 			// if it didn't find a document, data will be an empty array
 			if (data.length === 0) {
+				loadTimer.report('db_load_total')
 				return { type: 'room_not_found' }
 			}
 
 			const roomFromSupabase = data[0] as PersistedRoomSnapshotForSupabase
+			loadTimer.report('db_load_total')
+
 			return { type: 'room_found', snapshot: roomFromSupabase.drawing, roomSizeMB: 0 }
 		} catch (error) {
 			this.logEvent({ type: 'room', roomId: slug, name: 'failed_load_from_db' })
 
+			loadTimer.report('db_load_total_error')
+
 			console.error('failed to fetch doc', slug, error)
 			return { type: 'error', error: error as Error }
 		}
 	}
 
+	timer() {
+		const start = Date.now()
+		return {
+			report: (name: string) => {
+				this.writeEvent(name, {
+					doubles: [Date.now() - start],
+				})
+			},
+		}
+	}
+
 	_lastPersistedClock: number | null = null
 
 	executionQueue = new ExecutionQueue()
@@ -721,43 +840,74 @@ export class TLDrawDurableObject extends DurableObject {
 		})
 	}
 
+	broadcastPersistenceEvent(event: TLCustomServerEvent) {
+		this._room?.then((r) => {
+			for (const session of r.getSessions()) {
+				r.sendCustomMessage(session.sessionId, event)
+			}
+		})
+	}
+	persistenceBad = false
+
 	// Save the room to r2
 	async persistToDatabase() {
-		try {
-			await this.executionQueue.push(async () => {
-				// check whether the worker was woken up to persist after having gone to sleep
-				if (!this._room) return
-				const slug = this.documentInfo.slug
-				const room = await this.getRoom()
-				const clock = room.getCurrentDocumentClock()
-				if (this._lastPersistedClock === clock) return
-				if (this._isRestoring) return
-
-				const snapshot = room.getCurrentSnapshot()
-				this.maybeAssociateFileAssets()
-
-				const key = getR2KeyForRoom({ slug: slug, isApp: this.documentInfo.isApp })
-				await this._uploadSnapshotToR2(room, snapshot, key)
-
-				this._lastPersistedClock = clock
-
-				// Update the updatedAt timestamp in the database
-				if (this.documentInfo.isApp) {
-					// don't await on this because otherwise
-					// if this logic is invoked during another db transaction
-					// (e.g. when publishing a file)
-					// that transaction will deadlock
-					this.db
-						.updateTable('file')
-						.set({ updatedAt: new Date().getTime() })
-						.where('id', '=', this.documentInfo.slug)
-						.execute()
-						.catch((e) => this.reportError(e))
-				}
+		await this.executionQueue
+			.push(async () => {
+				await retry(
+					async ({ attempt }) => {
+						if (attempt === PERSIST_RETRIES_NOTIFY_THRESHOLD && !this.persistenceBad) {
+							this.broadcastPersistenceEvent({ type: 'persistence_bad' })
+							this.persistenceBad = true
+						}
+						// check whether the worker was woken up to persist after having gone to sleep
+						if (!this._room) return
+						const slug = this.documentInfo.slug
+						const room = await this.getRoom()
+						const clock = room.getCurrentDocumentClock()
+						if (this._lastPersistedClock === clock) return
+						if (this._isRestoring) return
+
+						const snapshot = room.getCurrentSnapshot()
+						this.maybeAssociateFileAssets()
+
+						const key = getR2KeyForRoom({ slug: slug, isApp: this.documentInfo.isApp })
+						await this._uploadSnapshotToR2(room, snapshot, key)
+
+						this.logEvent({ type: 'persist_success', attempts: attempt })
+						this._lastPersistedClock = clock
+						if (this.persistenceBad) {
+							this.broadcastPersistenceEvent({ type: 'persistence_good' })
+							this.persistenceBad = false
+						}
+
+						// Update the updatedAt timestamp in the database
+						if (this.documentInfo.isApp) {
+							// don't await on this because otherwise
+							// if this logic is invoked during another db transaction
+							// (e.g. when publishing a file)
+							// that transaction will deadlock
+							this.db
+								.updateTable('file')
+								.set({ updatedAt: new Date().getTime() })
+								.where('id', '=', this.documentInfo.slug)
+								.execute()
+								.catch((e) => {
+									this.logEvent({
+										type: 'room',
+										roomId: this.documentInfo.slug,
+										name: 'failed_persist_to_db',
+									})
+									this.reportError(e)
+								})
+						}
+					},
+					{ attempts: PERSIST_RETRIES_MAX, waitDuration: 2000 }
+				)
+			})
+			.catch((e) => {
+				this.logEvent({ type: 'room', roomId: this.documentInfo.slug, name: 'fail_persist' })
+				this.reportError(e)
 			})
-		} catch (e) {
-			this.reportError(e)
-		}
 	}
 
 	private async _uploadSnapshotToR2(
@@ -775,6 +925,7 @@ export class TLDrawDurableObject extends DurableObject {
 		// Then upload to version cache
 		const versionKey = `${key}/${new Date().toISOString()}`
 		await this._uploadSnapshotToBucket(this.r2.versionCache, snapshot, versionKey)
+		await this.persistToPierre(versionKey)
 	}
 
 	private async _uploadSnapshotToBucket(bucket: R2Bucket, snapshot: RoomSnapshot, key: string) {
@@ -862,6 +1013,51 @@ export class TLDrawDurableObject extends DurableObject {
 		return null
 	}
 
+	private async getPierreRepo() {
+		if (
+			!this.pierreClient ||
+			!this.documentInfo.isApp ||
+			!this.env.TLDRAW_ENV ||
+			this.env.TLDRAW_ENV === 'production'
+		) {
+			return null
+		}
+		const repoId = `${this.env.TLDRAW_ENV}/snapshots/${this.documentInfo.slug}`
+		return (
+			(await this.pierreClient.findOne({ id: repoId })) ??
+			(await this.pierreClient.createRepo({ id: repoId }))
+		)
+	}
+
+	private async persistToPierre(key: string) {
+		try {
+			const repo = await this.getPierreRepo()
+			if (!repo) return
+
+			// Get the snapshot from R2 to create a readable stream
+			const r2Object = await this.r2.versionCache.get(key)
+			if (!r2Object) {
+				console.warn('Failed to get R2 object for Pierre upload:', key)
+				return
+			}
+
+			// Create commit with the snapshot
+			const timestamp = new Date().toISOString()
+			await repo
+				.createCommit({
+					targetBranch: 'main',
+					commitMessage: `Snapshot at ${timestamp}`,
+					author: PIERRE_AUTHOR,
+				})
+				.addFile(SNAPSHOT_FILE_NAME, r2Object.body)
+				.send()
+		} catch (error) {
+			// Log but don't fail the main persist operation
+			console.error('Failed to persist to Pierre:', error)
+			this.reportError(error)
+		}
+	}
+
 	private reportError(e: unknown) {
 		// eslint-disable-next-line @typescript-eslint/no-deprecated
 		this.sentry?.captureException(e)
@@ -1063,3 +1259,9 @@ async function listAllObjectKeys(bucket: R2Bucket, prefix: string): Promise<stri
 
 	return keys
 }
+
+const PERSIST_RETRIES_NOTIFY_THRESHOLD = 10
+const PERSIST_RETRIES_MAX = 100
+
+const SNAPSHOT_FILE_NAME = 'snapshot.json'
+const PIERRE_AUTHOR = { email: 'huppy@tldraw.com', name: 'huppy [bot]' }
diff --git a/apps/dotcom/sync-worker/src/TLPostgresReplicator.ts b/apps/dotcom/sync-worker/src/TLPostgresReplicator.ts
index d7e0e2e5b66c..73480226370c 100644
--- a/apps/dotcom/sync-worker/src/TLPostgresReplicator.ts
+++ b/apps/dotcom/sync-worker/src/TLPostgresReplicator.ts
@@ -28,7 +28,7 @@ import {
 import { getResumeType } from './replicator/getResumeType'
 import { pruneTopicSubscriptionsSql } from './replicator/pruneTopicSubscriptions'
 import { migrate } from './replicator/replicatorMigrations'
-import { ChangeV2, ReplicationEvent, relevantTables } from './replicator/replicatorTypes'
+import { ChangeV2, ReplicationEvent, replicatedTables } from './replicator/replicatorTypes'
 import {
 	Analytics,
 	Environment,
@@ -476,7 +476,7 @@ export class TLPostgresReplicator extends DurableObject<Environment> {
 
 	private parseChange(change: Wal2Json.Change): ChangeV2 | null {
 		const table = change.table as ReplicationEvent['table']
-		if (change.kind === 'truncate' || change.kind === 'message' || !(table in relevantTables)) {
+		if (change.kind === 'truncate' || change.kind === 'message' || !(table in replicatedTables)) {
 			return null
 		}
 
@@ -635,13 +635,17 @@ export class TLPostgresReplicator extends DurableObject<Environment> {
 		userId,
 		lsn,
 		topicSubscriptions,
+		guestFileIds,
 		bootId,
 	}: {
 		userId: string
 		lsn: string
 		topicSubscriptions: TopicSubscriptionTree
+		guestFileIds?: never
 		bootId: string
 	}): Promise<{ type: 'done'; sequenceId: string; sequenceNumber: number } | { type: 'reboot' }> {
+		if (guestFileIds) throw new Error('guestFileIds is no longer supported')
+
 		try {
 			while (!this.getCurrentLsn()) {
 				// this should only happen once per slot name change, which should never happen!
diff --git a/apps/dotcom/sync-worker/src/TLUserDurableObject.ts b/apps/dotcom/sync-worker/src/TLUserDurableObject.ts
index 77f82e217fc2..57b042683be8 100644
--- a/apps/dotcom/sync-worker/src/TLUserDurableObject.ts
+++ b/apps/dotcom/sync-worker/src/TLUserDurableObject.ts
@@ -3,7 +3,6 @@ import type { SchemaCRUD, SchemaQuery } from '@rocicorp/zero/out/zql/src/mutate/
 import {
 	DB,
 	MIN_Z_PROTOCOL_VERSION,
-	TlaFile,
 	TlaSchema,
 	TlaUserPartial,
 	ZClientSentMessage,
@@ -12,7 +11,11 @@ import {
 	createMutators,
 	schema,
 } from '@tldraw/dotcom-shared'
-import { TLSyncErrorCloseEventCode, TLSyncErrorCloseEventReason } from '@tldraw/sync-core'
+import {
+	JsonChunkAssembler,
+	TLSyncErrorCloseEventCode,
+	TLSyncErrorCloseEventReason,
+} from '@tldraw/sync-core'
 import { ExecutionQueue, IndexKey, assert, mapObjectMapValues, sleep } from '@tldraw/utils'
 import { createSentry } from '@tldraw/worker-shared'
 import { DurableObject } from 'cloudflare:workers'
@@ -23,10 +26,10 @@ import { Logger } from './Logger'
 import { UserDataSyncer, ZReplicationEvent } from './UserDataSyncer'
 import { Analytics, Environment, TLUserDurableObjectEvent, getUserDoSnapshotKey } from './types'
 import { EventData, writeDataPoint } from './utils/analytics'
-import { getRoomDurableObject } from './utils/durableObjects'
 import { isRateLimited } from './utils/rateLimit'
 import { retryOnConnectionFailure } from './utils/retryOnConnectionFailure'
-import { PerfHackHooks, ServerCRUD } from './zero/ServerCrud'
+import { getClerkClient } from './utils/tla/getAuth'
+import { ChangeAccumulator, ServerCRUD } from './zero/ServerCrud'
 import { ServerQuery } from './zero/ServerQuery'
 import { ZMutationError } from './zero/ZMutationError'
 
@@ -79,7 +82,68 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 	readonly router = Router()
 		.all('/app/:userId/*', async (req) => {
 			if (!this.userId) {
-				this.userId = req.params.userId
+				const id = (this.userId = req.params.userId)
+				const user = await this.db
+					.selectFrom('user')
+					.where('id', '=', id)
+					.select('id')
+					.executeTakeFirst()
+				if (!user) {
+					// auth is checked in the main worker, before it gets here, so the clerk
+					// user definitely exists at this point.
+					const clerk = getClerkClient(this.env)
+					const clerkUser = await clerk.users.getUser(id)
+					assert(clerkUser, 'Clerk user not found')
+					await this.env.USER_DO_SNAPSHOTS.delete(getUserDoSnapshotKey(this.env, id))
+					await this.db.transaction().execute(async (tx) => {
+						// check that user wasn't added by another request in between the auth check and the snapshot deletion
+						if (await tx.selectFrom('user').where('id', '=', id).select('id').executeTakeFirst()) {
+							return
+						}
+						const now = Date.now()
+						await tx
+							.insertInto('user')
+							.values({
+								id,
+								name: clerkUser.fullName ?? '',
+								email: clerkUser.emailAddresses[0].emailAddress,
+								avatar: clerkUser.imageUrl,
+								color: '___INIT___',
+								exportFormat: 'png',
+								exportTheme: 'light',
+								exportBackground: true,
+								exportPadding: true,
+								createdAt: now,
+								updatedAt: now,
+								flags: 'groups_backend',
+							})
+							.execute()
+						await tx
+							.insertInto('group')
+							.values({
+								id,
+								name: clerkUser.fullName ?? '',
+								createdAt: now,
+								updatedAt: now,
+								isDeleted: false,
+								inviteSecret: null,
+							})
+							.execute()
+						await tx
+							.insertInto('group_user')
+							.values({
+								userId: id,
+								groupId: id,
+								createdAt: now,
+								updatedAt: now,
+								role: 'owner',
+								index: 'a1' as IndexKey,
+								userName: clerkUser.fullName ?? '',
+								userColor: '',
+							})
+							.execute()
+					})
+				}
 			}
 			const rateLimited = await isRateLimited(this.env, this.userId!)
 			if (rateLimited) {
@@ -156,11 +220,11 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 	private makeCrud(
 		client: PoolClient,
 		signal: AbortSignal,
-		perfHackHooks: PerfHackHooks
+		changeAccumulator: ChangeAccumulator
 	): SchemaCRUD<TlaSchema> {
 		return mapObjectMapValues(
 			schema.tables,
-			(_, table) => new ServerCRUD(client, table, signal, perfHackHooks)
+			(_, table) => new ServerCRUD(client, table, signal, changeAccumulator)
 		)
 	}
 
@@ -235,13 +299,24 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 			return new Response(null, { status: 101, webSocket: clientWebSocket })
 		}
 
-		serverWebSocket.addEventListener('message', (e) =>
+		const assembler = new JsonChunkAssembler()
+		serverWebSocket.addEventListener('message', (e) => {
+			const res = assembler.handleMessage(e.data.toString())
+			if (!res) {
+				// not enough chunks yet
+				return
+			}
+			if ('error' in res) {
+				this.captureException(res.error, { source: 'serverWebSocket "message" event, bad chunk' })
+				return
+			}
+
 			this.messageQueue.push(() =>
-				this.handleSocketMessage(serverWebSocket, e.data.toString()).catch((e) =>
+				this.handleSocketMessage(serverWebSocket, res.stringified).catch((e) =>
 					this.captureException(e, { source: 'serverWebSocket "message" event' })
 				)
 			)
-		)
+		})
 		serverWebSocket.addEventListener('close', () => {
 			this.sockets.delete(serverWebSocket)
 		})
@@ -334,7 +409,11 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 		const client = await this.pool.connect()
 
 		try {
-			const newFiles = [] as TlaFile[]
+			const changeAccumulator: ChangeAccumulator = {
+				file: { added: [] },
+				user_fairies: { added: [], updated: [], removed: [] },
+				file_fairies: { added: [], updated: [], removed: [] },
+			}
 
 			await client.query('BEGIN')
 
@@ -345,7 +424,7 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 			await client.query('SELECT pg_advisory_xact_lock_shared(hashtext($1))', [this.userId])
 
 			const controller = new AbortController()
-			const mutate = this.makeCrud(client, controller.signal, { newFiles })
+			const mutate = this.makeCrud(client, controller.signal, changeAccumulator)
 			try {
 				// new
 				const mutators = createMutators(this.userId!)
@@ -396,11 +475,7 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 
 			await client.query('COMMIT')
 
-			for (const file of newFiles) {
-				// if this is a legacy guest file, add it to the cache
-				this.cache?.addGuestFile(file)
-				getRoomDurableObject(this.env, file.id).appFileRecordCreated(file)
-			}
+			await this.cache?.incorporateUnsyncedChanges(changeAccumulator)
 		} catch (e) {
 			await client.query('ROLLBACK')
 			throw e
@@ -495,7 +570,7 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 		}
 	}
 
-	async __test__prepareForTest(userId: string, legacy: boolean) {
+	async __test__prepareForTest(userId: string) {
 		if (this.env.IS_LOCAL !== 'true') {
 			return
 		}
@@ -510,73 +585,89 @@ export class TLUserDurableObject extends DurableObject<Environment> {
 			if (!user) {
 				console.error('User not found', userId)
 				return
-			} else {
-				await tx
-					.updateTable('user')
-					.set({
-						flags: legacy ? '' : 'groups_backend',
-						allowAnalyticsCookie: null,
-						enhancedA11yMode: null,
-						colorScheme: null,
-						locale: null,
-						exportBackground: true,
-						exportPadding: true,
-						exportFormat: 'png',
-						inputMode: null,
-					} satisfies Omit<TlaUserPartial, 'id'>)
-					.where('id', '=', userId)
-					.execute()
 			}
-			await tx.deleteFrom('file_state').where('userId', '=', userId).execute()
-			await tx.deleteFrom('file').where('ownerId', '=', userId).execute()
-			await tx.deleteFrom('file').where('owningGroupId', '=', userId).execute()
-			await tx.deleteFrom('group').where('id', '=', userId).execute()
-			if (!legacy) {
-				await tx
-					.insertInto('group')
-					.values({
-						id: userId,
-						name: '',
-						createdAt: Date.now(),
-						updatedAt: Date.now(),
-						isDeleted: false,
-						inviteSecret: null,
-					})
-					.onConflict((oc) => oc.doNothing())
-					.execute()
-				await tx
-					.insertInto('group_user')
-					.values({
-						userId: userId,
-						groupId: userId,
-						createdAt: Date.now(),
-						updatedAt: Date.now(),
-						role: 'owner',
-						index: 'a1' as IndexKey,
-						userColor: '',
-						userName: '',
-					})
-					.onConflict((oc) => oc.doNothing())
-					.execute()
+
+			await tx
+				.updateTable('user')
+				.set({
+					flags: 'groups_backend',
+					allowAnalyticsCookie: null,
+					enhancedA11yMode: null,
+					colorScheme: null,
+					locale: null,
+					exportBackground: true,
+					exportPadding: true,
+					exportFormat: 'png',
+					inputMode: null,
+				} satisfies Omit<TlaUserPartial, 'id'>)
+				.where('id', '=', userId)
+				.execute()
+
+			// Get all groups the user is a member of and delete them
+			// CASCADE will automatically delete group_user, group_file, and owned files
+			const userGroups = await tx
+				.selectFrom('group_user')
+				.where('userId', '=', userId)
+				.select('groupId')
+				.execute()
+			const groupIds = userGroups.map((g) => g.groupId)
+
+			if (groupIds.length > 0) {
+				await tx.deleteFrom('group').where('id', 'in', groupIds).execute()
 			}
+
+			// Re-create the home group
+			await tx
+				.insertInto('group')
+				.values({
+					id: userId,
+					name: '',
+					createdAt: Date.now(),
+					updatedAt: Date.now(),
+					isDeleted: false,
+					inviteSecret: null,
+				})
+				.onConflict((oc) => oc.doNothing())
+				.execute()
+			await tx
+				.insertInto('group_user')
+				.values({
+					userId: userId,
+					groupId: userId,
+					createdAt: Date.now(),
+					updatedAt: Date.now(),
+					role: 'owner',
+					index: 'a1' as IndexKey,
+					userColor: '',
+					userName: '',
+				})
+				.onConflict((oc) => oc.doNothing())
+				.execute()
 		})
 
 		await this.cache?.reboot({ delay: false, source: 'admin', hard: true })
 	}
 
 	async admin_migrateToGroups(userId: string, inviteSecret: string | null = null) {
+		console.error('admin_migrateToGroups', userId, inviteSecret)
 		this.userId ??= userId
 
+		this.log.debug('migrating to groups', userId, inviteSecret)
 		// Call the Postgres migration function
 		const result = await sql<{
 			files_migrated: number
 			pinned_files_migrated: number
 			flag_added: boolean
 		}>`SELECT * FROM migrate_user_to_groups(${userId}, ${inviteSecret})`.execute(this.db)
+		console.error('admin_migrateToGroups result', result.rows)
+
+		this.log.debug('migration result', result.rows[0])
 
-		// Reboot the user's cache to pick up the new data structure
+		await this.env.USER_DO_SNAPSHOTS.delete(getUserDoSnapshotKey(this.env, userId))
 		await this.cache?.reboot({ delay: false, source: 'admin', hard: true })
 
+		this.log.debug('migration complete, user rebooted')
+
 		return result.rows[0]
 	}
 
diff --git a/apps/dotcom/sync-worker/src/UserDataSyncer.ts b/apps/dotcom/sync-worker/src/UserDataSyncer.ts
index eb1cd9280a3f..514ddcf4aa11 100644
--- a/apps/dotcom/sync-worker/src/UserDataSyncer.ts
+++ b/apps/dotcom/sync-worker/src/UserDataSyncer.ts
@@ -3,16 +3,24 @@ import {
 	OptimisticAppStore,
 	TlaFile,
 	TlaFileState,
-	TlaRow,
+	TlaGroup,
+	TlaGroupFile,
+	TlaGroupUser,
 	TlaUser,
 	ZEvent,
 	ZRowUpdate,
 	ZServerSentPacket,
 	ZStoreData,
-	ZTable,
 } from '@tldraw/dotcom-shared'
 import { react, transact } from '@tldraw/state'
-import { ExecutionQueue, assert, promiseWithResolve, sleep, uniqueId } from '@tldraw/utils'
+import {
+	ExecutionQueue,
+	assert,
+	objectMapEntries,
+	promiseWithResolve,
+	sleep,
+	uniqueId,
+} from '@tldraw/utils'
 import { createSentry } from '@tldraw/worker-shared'
 import { CompiledQuery, Kysely, sql } from 'kysely'
 import throttle from 'lodash.throttle'
@@ -20,15 +28,17 @@ import { Logger } from './Logger'
 import { fetchEverythingSql } from './fetchEverythingSql.snap'
 import { parseResultRow } from './parseResultRow'
 import { TopicSubscriptionTree, getSubscriptionChanges } from './replicator/Subscription'
+import { ReplicatedRow, ReplicatedTable } from './replicator/replicatorTypes'
 import { Environment, TLUserDurableObjectEvent, getUserDoSnapshotKey } from './types'
 import { getReplicator, getStatsDurableObjct } from './utils/durableObjects'
 import { retryOnConnectionFailure } from './utils/retryOnConnectionFailure'
+import { ChangeAccumulator } from './zero/ServerCrud'
 type PromiseWithResolve = ReturnType<typeof promiseWithResolve>
 
 export interface ZRowUpdateEvent {
 	type: 'row_update'
-	row: TlaRow
-	table: ZTable
+	row: ReplicatedRow
+	table: ReplicatedTable
 	event: ZEvent
 }
 
@@ -79,7 +89,7 @@ type BootState =
 			lastSequenceNumber: number
 	  }
 
-const stateVersion = 3
+const stateVersion = 4
 interface StateSnapshot {
 	version: number
 	initialData: ZStoreData
@@ -107,6 +117,16 @@ interface LegacyZStoreDataV1 {
 	lsn: string
 }
 
+interface LegacyZStoreDataV3 {
+	file: TlaFile[]
+	file_state: TlaFileState[]
+	user: TlaUser[]
+	group: TlaGroup[]
+	group_user: TlaGroupUser[]
+	group_file: TlaGroupFile[]
+	lsn: string
+}
+
 function migrateStateSnapshot(snapshot: any) {
 	if (snapshot.version === 0) {
 		snapshot.version = 1
@@ -136,6 +156,22 @@ function migrateStateSnapshot(snapshot: any) {
 			group: [],
 			group_user: [],
 			group_file: [],
+		} satisfies LegacyZStoreDataV3
+	}
+
+	if (snapshot.version === 3) {
+		snapshot.version = 4
+		const data = snapshot.initialData as LegacyZStoreDataV3
+		snapshot.initialData = {
+			lsn: data.lsn,
+			user: data.user,
+			file: data.file,
+			file_state: data.file_state,
+			group: data.group,
+			group_user: data.group_user,
+			group_file: data.group_file,
+			user_fairies: [],
+			file_fairies: [],
 		} satisfies ZStoreData
 	}
 }
@@ -226,7 +262,7 @@ export class UserDataSyncer {
 			this.ctx.abort()
 			return
 		}
-		this.log.debug('rebooting', source)
+		this.log.debug('rebooting', source, 'hard:', hard, 'delay:', delay)
 		this.logEvent({ type: 'reboot', id: this.userId })
 		await this.queue.push(async () => {
 			if (delay) {
@@ -299,6 +335,8 @@ export class UserDataSyncer {
 			group: [],
 			group_user: [],
 			group_file: [],
+			user_fairies: [],
+			file_fairies: [],
 			lsn: '0/0',
 			mutationNumber: 0,
 		}
@@ -408,6 +446,7 @@ export class UserDataSyncer {
 				lastSequenceNumber: resumeData.lastSequenceNumber,
 			}))
 		) {
+			// TODO: investigate how this returns without group_user, or suck that 'group_user is not iterable'
 			const initialData = this.store.getCommittedData()!
 			const topicSubscriptions: TopicSubscriptionTree = {}
 			const groupFileIds = new Set()
@@ -484,7 +523,7 @@ export class UserDataSyncer {
 			) {
 				throw new Error(`Unhandled table: ${event.table}`)
 			}
-			this.store.updateCommittedData(event)
+			this.store.updateCommittedData(event as ZRowUpdate)
 			this.broadcast({
 				type: 'update',
 				update: {
@@ -610,24 +649,22 @@ export class UserDataSyncer {
 		})
 	}
 
-	async addGuestFile(fileOrId: string | TlaFile) {
-		assert('bootId' in this.state, 'bootId should be in state')
-		const bootId = this.state.bootId
-		const fileId = typeof fileOrId === 'string' ? fileOrId : fileOrId.id
-		if (this.store.getFullData()?.file.find((f) => f.id === fileId)) return
-		const file =
-			typeof fileOrId === 'string'
-				? await this.db.selectFrom('file').where('id', '=', fileOrId).selectAll().executeTakeFirst()
-				: fileOrId
-		if (!file) return
-		if (this.state.bootId !== bootId) return
-		const update: ZRowUpdate = {
-			event: 'insert',
-			row: file,
-			table: 'file',
+	async incorporateUnsyncedChanges(changes: ChangeAccumulator) {
+		const apply = (update: ZRowUpdate) => {
+			this.store.updateCommittedData(update)
+			this.broadcast({ type: 'update', update })
+		}
+		for (const [table, diff] of objectMapEntries(changes)) {
+			for (const newRow of diff?.added ?? []) {
+				apply({ event: 'insert', row: newRow, table })
+			}
+			for (const updatedRow of diff?.updated ?? []) {
+				apply({ event: 'update', row: updatedRow, table })
+			}
+			for (const removedRow of diff?.removed ?? []) {
+				apply({ event: 'delete', row: removedRow, table })
+			}
 		}
-		this.store.updateCommittedData(update)
-		this.broadcast({ type: 'update', update })
 	}
 
 	async removeGuestFile(id: string) {
diff --git a/apps/dotcom/sync-worker/src/adminRoutes.ts b/apps/dotcom/sync-worker/src/adminRoutes.ts
index a5d377d7169b..a35458cbffe1 100644
--- a/apps/dotcom/sync-worker/src/adminRoutes.ts
+++ b/apps/dotcom/sync-worker/src/adminRoutes.ts
@@ -1,7 +1,8 @@
 import { TlaFile } from '@tldraw/dotcom-shared'
-import { assert, sleep, uniqueId } from '@tldraw/utils'
+import { assert, retry, sleep, uniqueId } from '@tldraw/utils'
 import { createRouter } from '@tldraw/worker-shared'
 import { StatusError, json } from 'itty-router'
+import { sql } from 'kysely'
 import { createPostgresConnectionPool } from './postgres'
 import { returnFileSnapshot } from './routes/tla/getFileSnapshot'
 import { type Environment } from './types'
@@ -62,6 +63,81 @@ export const adminRoutes = createRouter<Environment>()
 		const result = await user.admin_migrateToGroups(userRow.id, uniqueId())
 		return json(result)
 	})
+	.get('/app/admin/unmigrated_users_count', async (_res, env) => {
+		const pg = createPostgresConnectionPool(env, '/app/admin/unmigrated_users_count')
+		return json({ count: await getNumUnmigratedUsers(pg) })
+	})
+	.get('/app/admin/migrate_users_batch', async (res, env) => {
+		let stopRequested = false
+
+		// Parse query parameters for batch configuration
+		const sleepMs = parseInt((res.query['sleepMs'] as string) || '100')
+
+		return new Response(
+			new ReadableStream({
+				async start(controller) {
+					try {
+						// Helper function to send progress events
+						const sendProgress = (step: string, message: string, details?: any) => {
+							const event = {
+								type: 'progress',
+								step,
+								message,
+								timestamp: Date.now(),
+								details,
+							}
+							controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify(event)}\n\n`))
+						}
+
+						const shouldStop = () => stopRequested
+
+						sendProgress('starting', 'Beginning batch user migration process...')
+
+						const hasMore = await startUserMigration(env, sendProgress, shouldStop, sleepMs)
+
+						// Send completion event
+						const completionEvent = {
+							type: 'complete',
+							step: 'finished',
+							message: stopRequested
+								? 'Batch migration stopped by user'
+								: 'Batch migration completed successfully',
+							timestamp: Date.now(),
+							hasMore,
+						}
+						controller.enqueue(
+							new TextEncoder().encode(`data: ${JSON.stringify(completionEvent)}\n\n`)
+						)
+					} catch (error) {
+						// Send error event
+						const errorEvent = {
+							type: 'error',
+							step: 'error',
+							message: error instanceof Error ? error.message : 'Unknown error occurred',
+							timestamp: Date.now(),
+							details: { error: error instanceof Error ? error.stack : String(error) },
+						}
+						controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify(errorEvent)}\n\n`))
+					} finally {
+						controller.close()
+					}
+				},
+				cancel() {
+					// Called when client closes the EventSource connection
+					stopRequested = true
+				},
+			}),
+			{
+				headers: {
+					'Content-Type': 'text/event-stream',
+					'Cache-Control': 'no-cache',
+					Connection: 'keep-alive',
+					'Access-Control-Allow-Origin': '*',
+					'Access-Control-Allow-Headers': 'Cache-Control',
+				},
+			}
+		)
+	})
 	.post('/app/admin/create_legacy_file', async (_res, env) => {
 		const slug = uniqueId()
 		await getRoomDurableObject(env, slug).__admin__createLegacyRoom(slug)
@@ -312,3 +388,138 @@ async function performUserDeletion(
 	const user = getUserDurableObject(env, userRow.id)
 	await user.admin_delete(userRow.id)
 }
+
+async function getNextUnmigratedUser(pg: ReturnType<typeof createPostgresConnectionPool>) {
+	return await pg
+		.selectFrom('user')
+		.where((eb) => eb.or([eb('flags', 'not like', '%groups_backend%'), eb('flags', 'is', null)]))
+		.select(['id', 'email', 'name'])
+		.limit(1)
+		.executeTakeFirst()
+}
+
+async function getNumUnmigratedUsers(pg: ReturnType<typeof createPostgresConnectionPool>) {
+	const res = await sql<{
+		count: number
+	}>`select count(*) from public.user where flags not like '%groups_backend%' or flags is null`.execute(
+		pg
+	)
+	return res.rows[0].count
+}
+async function getTotalUsers(pg: ReturnType<typeof createPostgresConnectionPool>) {
+	const res = await sql<{ count: number }>`select count(*) from public.user`.execute(pg)
+	return res.rows[0].count
+}
+
+async function startUserMigration(
+	env: Environment,
+	sendProgress: (step: string, message: string, details?: any) => void,
+	shouldStop: () => boolean,
+	sleepTime: number = 100
+): Promise<boolean> {
+	const batchSize = 50
+	const pg = createPostgresConnectionPool(env, '/app/admin/migrate_users_batch')
+
+	sendProgress('query', 'Fetching users without groups_backend flag...')
+
+	const usersToMigrate = await getNumUnmigratedUsers(pg)
+	const totalUsers = await getTotalUsers(pg)
+	let successCount = 0
+	let failureCount = 0
+
+	function getStats() {
+		return {
+			totalUsers,
+			usersToMigrate,
+			successCount,
+			failureCount,
+			progress: successCount / usersToMigrate,
+		}
+	}
+
+	sendProgress('query', `${usersToMigrate}/${totalUsers} users left to migrate`, getStats())
+
+	if (usersToMigrate === 0) {
+		sendProgress('complete', 'No users to migrate')
+		return false
+	}
+
+	const failures: Array<{ userId: string; email: string; error: string }> = []
+	let processedCount = 0
+
+	// Process users in batches
+	while (processedCount < batchSize) {
+		const userRow = await getNextUnmigratedUser(pg)
+		if (!userRow) {
+			break
+		}
+
+		// Check if we should stop
+		if (shouldStop()) {
+			sendProgress('stopped', 'Migration stopped by user', getStats())
+			break
+		}
+
+		sendProgress('migrating', `Migrating user ${userRow.email}`, {
+			userId: userRow.id,
+			email: userRow.email,
+			...getStats(),
+		})
+
+		try {
+			await retry(async () => {
+				const user = getUserDurableObject(env, userRow.id)
+
+				const result = await sql<{
+					files_migrated: number
+					pinned_files_migrated: number
+					flag_added: boolean
+				}>`SELECT * FROM migrate_user_to_groups(${userRow.id}, ${uniqueId()})`.execute(pg)
+				await user.admin_forceHardReboot(userRow.id)
+
+				successCount++
+				sendProgress('success', `Successfully migrated user ${userRow.email}`, {
+					userId: userRow.id,
+					email: userRow.email,
+					result: result.rows[0],
+					...getStats(),
+				})
+			})
+		} catch (error) {
+			failureCount++
+			const errorMessage = error instanceof Error ? error.message : String(error)
+			failures.push({
+				userId: userRow.id,
+				email: userRow.email,
+				error: errorMessage,
+			})
+
+			// Send failure event to client so it can be stored in the log
+			sendProgress('failure', `Failed to migrate ${userRow.email}`, {
+				userId: userRow.id,
+				email: userRow.email,
+				error: errorMessage,
+				...getStats(),
+			})
+
+			// Stop processing immediately after reporting the failure
+			sendProgress('summary', 'Migration stopped due to failure', {
+				failures: failures.length > 0 ? failures : undefined,
+			})
+			return false
+		}
+
+		processedCount++
+
+		// Brief pause between migrations to avoid overwhelming the system
+		await sleep(sleepTime)
+	}
+
+	sendProgress('summary', 'Migration batch complete', {
+		failures: failures.length > 0 ? failures : undefined,
+	})
+
+	// Check if there are more users to migrate
+	const remainingUsers = await getNumUnmigratedUsers(pg)
+	return remainingUsers > 0
+}
diff --git a/apps/dotcom/sync-worker/src/fetchEverythingSql.snap.ts b/apps/dotcom/sync-worker/src/fetchEverythingSql.snap.ts
index 2b0f7e898c94..e4ca467215c8 100644
--- a/apps/dotcom/sync-worker/src/fetchEverythingSql.snap.ts
+++ b/apps/dotcom/sync-worker/src/fetchEverythingSql.snap.ts
@@ -11,7 +11,9 @@ WITH
   all_group_users AS (SELECT ug.* FROM my_groups mg JOIN public."group_user" ug ON ug."groupId" = mg."id"),
   group_file_ownership AS (SELECT fg.* FROM my_groups mg JOIN public."group_file" fg ON fg."groupId" = mg."id"),
   group_files AS (SELECT f.* FROM group_file_ownership gfo JOIN public."file" f ON f.id = gfo."fileId"),
-  all_files AS (SELECT * from legacy_my_own_files UNION SELECT * from legacy_files_shared_with_me UNION SELECT * from group_files)
+  all_files AS (SELECT * from legacy_my_own_files UNION SELECT * from legacy_files_shared_with_me UNION SELECT * from group_files),
+  my_fairies AS (SELECT * FROM public."user_fairies" WHERE "userId" = $1),
+  file_fairies AS (SELECT * FROM public."file_fairies" WHERE "userId" = $1)
 SELECT
   'user' as "table",
   "allowAnalyticsCookie"::boolean as "0",
@@ -181,6 +183,62 @@ SELECT
   null::text as "23"
 FROM all_group_users
 UNION ALL
+SELECT
+  'user_fairies' as "table",
+  null::boolean as "0",
+  null::boolean as "1",
+  null::boolean as "2",
+  null::boolean as "3",
+  null::boolean as "4",
+  null::boolean as "5",
+  null::boolean as "6",
+  null::boolean as "7",
+  null::boolean as "8",
+  null::bigint as "9",
+  null::bigint as "10",
+  null::bigint as "11",
+  null::bigint as "12",
+  "fairies"::text as "13",
+  "userId"::text as "14",
+  null::text as "15",
+  null::text as "16",
+  null::text as "17",
+  null::text as "18",
+  null::text as "19",
+  null::text as "20",
+  null::text as "21",
+  null::text as "22",
+  null::text as "23"
+FROM my_fairies
+UNION ALL
+SELECT
+  'file_fairies' as "table",
+  null::boolean as "0",
+  null::boolean as "1",
+  null::boolean as "2",
+  null::boolean as "3",
+  null::boolean as "4",
+  null::boolean as "5",
+  null::boolean as "6",
+  null::boolean as "7",
+  null::boolean as "8",
+  null::bigint as "9",
+  null::bigint as "10",
+  null::bigint as "11",
+  null::bigint as "12",
+  "fairyState"::text as "13",
+  "fileId"::text as "14",
+  "userId"::text as "15",
+  null::text as "16",
+  null::text as "17",
+  null::text as "18",
+  null::text as "19",
+  null::text as "20",
+  null::text as "21",
+  null::text as "22",
+  null::text as "23"
+FROM file_fairies
+UNION ALL
 SELECT
   'user_mutation_number' as "table",
   null::boolean as "0",
@@ -319,6 +377,15 @@ export const columnNamesByAlias = {
 		'17': 'userId',
 		'18': 'userName',
 	},
+	user_fairies: {
+		'13': 'fairies',
+		'14': 'userId',
+	},
+	file_fairies: {
+		'13': 'fairyState',
+		'14': 'fileId',
+		'15': 'userId',
+	},
 	user_mutation_number: {
 		'9': 'mutationNumber',
 	},
diff --git a/apps/dotcom/sync-worker/src/fetchEverythingSql.test.ts b/apps/dotcom/sync-worker/src/fetchEverythingSql.test.ts
index 1e6851571fb9..b036061dee9b 100644
--- a/apps/dotcom/sync-worker/src/fetchEverythingSql.test.ts
+++ b/apps/dotcom/sync-worker/src/fetchEverythingSql.test.ts
@@ -79,6 +79,14 @@ const withs = [
 		expression:
 			'SELECT * from legacy_my_own_files UNION SELECT * from legacy_files_shared_with_me UNION SELECT * from group_files',
 	},
+	{
+		alias: 'my_fairies',
+		expression: 'SELECT * FROM public."user_fairies" WHERE "userId" = $1',
+	},
+	{
+		alias: 'file_fairies',
+		expression: 'SELECT * FROM public."file_fairies" WHERE "userId" = $1',
+	},
 ] as const satisfies WithClause[]
 
 type WithTable = (typeof withs)[number]['alias']
@@ -122,6 +130,16 @@ const selects: SelectClause[] = [
 		outputTableName: 'group_user',
 		columns: makeColumnStuff(schema.tables.group_user),
 	},
+	{
+		from: 'my_fairies',
+		outputTableName: 'user_fairies',
+		columns: makeColumnStuff(schema.tables.user_fairies),
+	},
+	{
+		from: 'file_fairies',
+		outputTableName: 'file_fairies',
+		columns: makeColumnStuff(schema.tables.file_fairies),
+	},
 	{
 		from: 'public."user_mutation_number"',
 		outputTableName: 'user_mutation_number',
diff --git a/apps/dotcom/sync-worker/src/replicator/ChangeCollator.ts b/apps/dotcom/sync-worker/src/replicator/ChangeCollator.ts
index d787242f9c39..89766c23d346 100644
--- a/apps/dotcom/sync-worker/src/replicator/ChangeCollator.ts
+++ b/apps/dotcom/sync-worker/src/replicator/ChangeCollator.ts
@@ -7,13 +7,19 @@ import {
 	TlaRow,
 	TlaUser,
 	TlaUserMutationNumber,
-	ZTable,
 } from '@tldraw/dotcom-shared'
 import { exhaustiveSwitchError } from '@tldraw/utils'
 import { DurableObject } from 'cloudflare:workers'
 import { ZReplicationChange } from '../UserDataSyncer'
 import { Subscription } from './Subscription'
-import { ChangeV2, ReplicationEvent, ReplicatorEffect, Topic } from './replicatorTypes'
+import {
+	ChangeV2,
+	ReplicatedRow,
+	ReplicatedTable,
+	ReplicationEvent,
+	ReplicatorEffect,
+	Topic,
+} from './replicatorTypes'
 
 /**
  * Interface for collecting and organizing database changes for delivery to users.
@@ -217,8 +223,8 @@ export class LiveChangeCollator implements ChangeCollator {
 					}
 				: {
 						type: 'row_update',
-						row: change.row,
-						table: table as ZTable,
+						row: change.row as ReplicatedRow,
+						table: table as ReplicatedTable,
 						event: command,
 					}
 
diff --git a/apps/dotcom/sync-worker/src/replicator/replicatorTypes.ts b/apps/dotcom/sync-worker/src/replicator/replicatorTypes.ts
index e12fa9251d4d..089c228c54d0 100644
--- a/apps/dotcom/sync-worker/src/replicator/replicatorTypes.ts
+++ b/apps/dotcom/sync-worker/src/replicator/replicatorTypes.ts
@@ -1,9 +1,9 @@
-import { TlaFile, TlaRow } from '@tldraw/dotcom-shared'
+import { TlaFile, TlaFileFairy, TlaRow, TlaUserFairy } from '@tldraw/dotcom-shared'
 import { stringEnum } from '@tldraw/utils'
 
 export type Topic = `user:${string}` | `file:${string}` | `group:${string}`
 
-export const relevantTables = stringEnum(
+export const replicatedTables = stringEnum(
 	'user',
 	'file',
 	'file_state',
@@ -12,10 +12,12 @@ export const relevantTables = stringEnum(
 	'group_user',
 	'group_file'
 )
+export type ReplicatedTable = keyof typeof replicatedTables
+export type ReplicatedRow = Exclude<TlaRow, TlaUserFairy | TlaFileFairy>
 
 export interface ReplicationEvent {
 	command: 'insert' | 'update' | 'delete'
-	table: keyof typeof relevantTables
+	table: keyof typeof replicatedTables
 }
 
 export interface ChangeV1 {
diff --git a/apps/dotcom/sync-worker/src/replicator/test-helpers.ts b/apps/dotcom/sync-worker/src/replicator/test-helpers.ts
index a284b435702a..3bee805d0be3 100644
--- a/apps/dotcom/sync-worker/src/replicator/test-helpers.ts
+++ b/apps/dotcom/sync-worker/src/replicator/test-helpers.ts
@@ -188,6 +188,7 @@ export function createMockUser(
 		createdAt: Date.now(),
 		updatedAt: Date.now(),
 		flags: '',
+		fairies: null,
 		locale: 'en',
 		animationSpeed: 1.0,
 		areKeyboardShortcutsEnabled: true,
diff --git a/apps/dotcom/sync-worker/src/routes/getPierreHistory.ts b/apps/dotcom/sync-worker/src/routes/getPierreHistory.ts
new file mode 100644
index 000000000000..729a6e7128bd
--- /dev/null
+++ b/apps/dotcom/sync-worker/src/routes/getPierreHistory.ts
@@ -0,0 +1,81 @@
+import { compact } from '@tldraw/utils'
+import { notFound } from '@tldraw/worker-shared'
+import { IRequest } from 'itty-router'
+import { Environment } from '../types'
+import { createPierreClient } from '../utils/createPierreClient'
+import { isRoomIdTooLong, roomIdIsTooLong } from '../utils/roomIdIsTooLong'
+import { requireWriteAccessToFile } from '../utils/tla/getAuth'
+import { isTestFile } from '../utils/tla/isTestFile'
+
+export async function getPierreHistory(
+	request: IRequest,
+	env: Environment,
+	isApp: boolean
+): Promise<Response> {
+	const roomId = request.params.roomId
+
+	if (!roomId) return notFound()
+	if (isRoomIdTooLong(roomId)) return roomIdIsTooLong()
+
+	if (isApp) {
+		await requireWriteAccessToFile(request, env, roomId)
+	}
+
+	if (isTestFile(roomId)) {
+		return new Response('Not found', { status: 404 })
+	}
+
+	const pierreClient = createPierreClient(env)
+	if (!pierreClient) {
+		return new Response('Pierre not available', { status: 503 })
+	}
+
+	try {
+		const envName = env.TLDRAW_ENV || 'development'
+		const repoId = `${envName}/snapshots/${roomId}`
+
+		const repo = await pierreClient.findOne({ id: repoId })
+		if (!repo) {
+			// No history yet
+			return new Response(
+				JSON.stringify({
+					entries: [],
+					nextCursor: null,
+				}),
+				{
+					headers: { 'content-type': 'application/json' },
+				}
+			)
+		}
+
+		// Get commits with pagination
+		const limit = 1000
+		const nextCursor = request.query?.nextCursor as string | undefined
+
+		const commitsResult = await repo.listCommits({ branch: 'main', limit, cursor: nextCursor })
+
+		// Extract timestamps from commit messages and return with commit hashes
+		// Commit messages have format: "Snapshot at {ISO timestamp}"
+		const entries: Array<{ timestamp: string; commitHash: string }> = compact(
+			commitsResult.commits.map((commit) => {
+				// Extract timestamp from commit message
+				const timestamp = commit.message.match(/Snapshot at (.+Z)/)?.[1]
+				return timestamp ? { timestamp, commitHash: commit.sha } : null
+			})
+		)
+
+		// Check if there are more commits
+
+		const response = {
+			entries,
+			nextCursor: commitsResult.nextCursor,
+		}
+
+		return new Response(JSON.stringify(response), {
+			headers: { 'content-type': 'application/json' },
+		})
+	} catch (error) {
+		console.error('Failed to fetch Pierre history:', error)
+		return new Response('Failed to fetch history', { status: 500 })
+	}
+}
diff --git a/apps/dotcom/sync-worker/src/routes/getPierreHistorySnapshot.ts b/apps/dotcom/sync-worker/src/routes/getPierreHistorySnapshot.ts
new file mode 100644
index 000000000000..8b00091f3847
--- /dev/null
+++ b/apps/dotcom/sync-worker/src/routes/getPierreHistorySnapshot.ts
@@ -0,0 +1,61 @@
+import { notFound } from '@tldraw/worker-shared'
+import { IRequest } from 'itty-router'
+import { Environment } from '../types'
+import { createPierreClient } from '../utils/createPierreClient'
+import { isRoomIdTooLong, roomIdIsTooLong } from '../utils/roomIdIsTooLong'
+import { requireWriteAccessToFile } from '../utils/tla/getAuth'
+import { isTestFile } from '../utils/tla/isTestFile'
+
+export async function getPierreHistorySnapshot(
+	request: IRequest,
+	env: Environment,
+	isApp: boolean
+): Promise<Response> {
+	const roomId = request.params.roomId
+
+	if (!roomId) return notFound()
+	if (isRoomIdTooLong(roomId)) return roomIdIsTooLong()
+
+	if (isApp) {
+		await requireWriteAccessToFile(request, env, roomId)
+	}
+
+	if (isTestFile(roomId)) {
+		return new Response('Not found', { status: 404 })
+	}
+
+	const commitHash = request.params.timestamp // This is actually the commit hash now
+	if (!commitHash) {
+		return new Response('Missing commit hash', { status: 400 })
+	}
+
+	const pierreClient = createPierreClient(env)
+	if (!pierreClient) {
+		return new Response('Pierre not available', { status: 503 })
+	}
+
+	try {
+		const envName = env.TLDRAW_ENV || 'development'
+		const repoId = `${envName}/snapshots/${roomId}`
+
+		const repo = await pierreClient.findOne({ id: repoId })
+		if (!repo) {
+			return new Response('Not found', { status: 404 })
+		}
+
+		// Get the file stream and return it
+		const fileStream = await repo.getFileStream({ path: 'snapshot.json', ref: commitHash })
+
+		// The content should be the snapshot JSON
+		return new Response(fileStream.body, {
+			headers: {
+				'content-type': 'application/json',
+				// cache forever
+				'Cache-Control': 'public, max-age=31536000, immutable',
+			},
+		})
+	} catch (error) {
+		console.error('Failed to fetch Pierre snapshot:', error)
+		return new Response('Failed to fetch snapshot', { status: 500 })
+	}
+}
diff --git a/apps/dotcom/sync-worker/src/routes/tla/acceptInvite.ts b/apps/dotcom/sync-worker/src/routes/tla/acceptInvite.ts
new file mode 100644
index 000000000000..513d6b8a9b2a
--- /dev/null
+++ b/apps/dotcom/sync-worker/src/routes/tla/acceptInvite.ts
@@ -0,0 +1,149 @@
+import { AcceptInviteResponseBody, userHasFlag } from '@tldraw/dotcom-shared'
+import { getIndexBelow, IndexKey } from '@tldraw/utils'
+import { IRequest } from 'itty-router'
+import { sql } from 'kysely'
+import { createPostgresConnectionPool } from '../../postgres'
+import { Environment } from '../../types'
+import { requireAuth } from '../../utils/tla/getAuth'
+
+export async function acceptInvite(request: IRequest, env: Environment): Promise<Response> {
+	const { token } = request.params
+	if (!token) {
+		return Response.json(
+			{ error: true, message: 'Invite token is required' } satisfies AcceptInviteResponseBody,
+			{ status: 400 }
+		)
+	}
+
+	const auth = await requireAuth(request, env)
+	const db = createPostgresConnectionPool(env, 'acceptInvite')
+
+	try {
+		return await db.transaction().execute(async (tx) => {
+			// First, validate the invite token and get group info
+			const group = await tx
+				.selectFrom('group')
+				.select(['id', 'name', 'isDeleted'])
+				.where('inviteSecret', '=', token)
+				.executeTakeFirst()
+
+			if (!group || group.isDeleted) {
+				return Response.json(
+					{
+						error: true,
+						message: 'Invalid or expired invite token',
+					} satisfies AcceptInviteResponseBody,
+					{ status: 404 }
+				)
+			}
+
+			// Check if user is already a member of this group (with row lock to prevent race conditions)
+			const existingMember = await tx
+				.selectFrom('group_user')
+				.select('userId')
+				.where('groupId', '=', group.id)
+				.where('userId', '=', auth.userId)
+				.executeTakeFirst()
+
+			if (existingMember) {
+				return Response.json({
+					error: false,
+					message: 'You are already a member of this group',
+					groupId: group.id,
+					groupName: group.name,
+					alreadyMember: true,
+				} satisfies AcceptInviteResponseBody)
+			}
+
+			// Get the user's information for the group_user record
+			const user = await tx
+				.selectFrom('user')
+				.select(['name', 'color', 'flags'])
+				.where('id', '=', auth.userId)
+				.executeTakeFirst()
+
+			if (!user) {
+				return Response.json(
+					{
+						error: true,
+						message: 'User not found',
+					} satisfies AcceptInviteResponseBody,
+					{ status: 404 }
+				)
+			}
+			if (!userHasFlag(user.flags, 'groups_backend')) {
+				return Response.json(
+					{
+						error: true,
+						message: 'User is not migrated to the groups model',
+					} satisfies AcceptInviteResponseBody,
+					{ status: 400 }
+				)
+			}
+
+			// Ensure user has groups_frontend flag when accepting invite
+			if (!userHasFlag(user.flags, 'groups_frontend')) {
+				const currentFlags = user.flags ? user.flags.split(/[,\s]+/).filter(Boolean) : []
+				const newFlags = [...currentFlags, 'groups_frontend'].join(',')
+				await tx
+					.updateTable('user')
+					.set({ flags: newFlags })
+					.where('id', '=', auth.userId)
+					.execute()
+			}
+
+			// Get the lowest index to place new group at the top
+			const lowestIndexGroup = await sql<{
+				index: string
+				// kysely doesn't support 'collate' in the query builder, so we have to use raw sql
+				// collate "C" makes it use straight up byte comparison instead of lexicographic comparison
+			}>`select index from group_user where "userId" = ${auth.userId} order by index collate "C" asc limit 1`.execute(
+				tx
+			)
+
+			// Use tldraw's fractional indexing to place new group at the top
+			let index: IndexKey
+			if (!lowestIndexGroup.rows[0]) {
+				// First group gets 'a1'
+				index = 'a1' as IndexKey
+			} else {
+				// Generate a new index below the current lowest (to place at top)
+				index = getIndexBelow(lowestIndexGroup.rows[0].index as IndexKey)
+			}
+
+			// Add user to the group
+			await tx
+				.insertInto('group_user')
+				.values({
+					groupId: group.id,
+					userId: auth.userId,
+					userColor: user.color || '#000000',
+					userName: user.name,
+					role: 'admin',
+					index,
+					createdAt: Date.now(),
+					updatedAt: Date.now(),
+				})
+				.execute()
+
+			return Response.json({
+				error: false,
+				message: 'Successfully joined the group',
+				groupId: group.id,
+				groupName: group.name,
+				success: true,
+			} satisfies AcceptInviteResponseBody)
+		})
+	} catch (error) {
+		console.error('Error accepting invite:', error)
+		return Response.json(
+			{
+				error: true,
+				message: 'Internal server error',
+			} satisfies AcceptInviteResponseBody,
+			{ status: 500 }
+		)
+	} finally {
+		await db.destroy()
+	}
+}
diff --git a/apps/dotcom/sync-worker/src/routes/tla/getInviteInfo.ts b/apps/dotcom/sync-worker/src/routes/tla/getInviteInfo.ts
new file mode 100644
index 000000000000..14ec6bda8439
--- /dev/null
+++ b/apps/dotcom/sync-worker/src/routes/tla/getInviteInfo.ts
@@ -0,0 +1,50 @@
+import { GetInviteInfoResponseBody } from '@tldraw/dotcom-shared'
+import { IRequest } from 'itty-router'
+import { createPostgresConnectionPool } from '../../postgres'
+import { Environment } from '../../types'
+
+export async function getInviteInfo(request: IRequest, env: Environment): Promise<Response> {
+	const { token } = request.params
+	if (!token) {
+		return Response.json({ error: true, message: 'Invite token is required' }, { status: 400 })
+	}
+
+	const db = createPostgresConnectionPool(env, 'getInviteInfo')
+
+	try {
+		const group = await db
+			.selectFrom('group')
+			.select(['id', 'name', 'isDeleted'])
+			.where('inviteSecret', '=', token)
+			.executeTakeFirst()
+
+		if (!group || group.isDeleted) {
+			return Response.json(
+				{
+					error: true,
+					message: 'Invalid or expired invite token',
+				} satisfies GetInviteInfoResponseBody,
+				{ status: 404 }
+			)
+		}
+
+		return Response.json({
+			error: false,
+			groupId: group.id,
+			groupName: group.name,
+			isValid: true,
+			inviteSecret: token,
+		} satisfies GetInviteInfoResponseBody)
+	} catch (error) {
+		console.error('Error getting invite info:', error)
+		return Response.json(
+			{
+				error: true,
+				message: 'Internal server error',
+			} satisfies GetInviteInfoResponseBody,
+			{ status: 500 }
+		)
+	} finally {
+		await db.destroy()
+	}
+}
diff --git a/apps/dotcom/sync-worker/src/testRoutes.ts b/apps/dotcom/sync-worker/src/testRoutes.ts
index 05b42a63984b..14aa860c6fe5 100644
--- a/apps/dotcom/sync-worker/src/testRoutes.ts
+++ b/apps/dotcom/sync-worker/src/testRoutes.ts
@@ -34,11 +34,7 @@ export const testRoutes = createRouter<Environment>()
 		return new Response('ok')
 	})
 	.post('/app/__test__/user/:userId/prepare-for-test', async (req, env) => {
-		const legacy = req.headers.get('x-legacy') === 'true'
-		await getUserDurableObject(env, req.params.userId).__test__prepareForTest(
-			req.params.userId,
-			legacy
-		)
+		await getUserDurableObject(env, req.params.userId).__test__prepareForTest(req.params.userId)
 		return new Response('ok')
 	})
 	.all('*', notFound)
diff --git a/apps/dotcom/sync-worker/src/types.ts b/apps/dotcom/sync-worker/src/types.ts
index 9837e60d3bec..5e9e63f73dec 100644
--- a/apps/dotcom/sync-worker/src/types.ts
+++ b/apps/dotcom/sync-worker/src/types.ts
@@ -66,6 +66,8 @@ export interface Environment {
 	ANALYTICS_API_URL: string | undefined
 	ANALYTICS_API_TOKEN: string | undefined
 
+	PIERRE_KEY: string | undefined
+
 	RATE_LIMITER: RateLimit
 
 	QUEUE: Queue<QueueMessage>
@@ -124,6 +126,10 @@ export type TLServerEvent =
 			messageType: string
 			messageLength: number
 	  }
+	| {
+			type: 'persist_success'
+			attempts: number
+	  }
 
 export type TLPostgresReplicatorRebootSource =
 	| 'constructor'
diff --git a/apps/dotcom/sync-worker/src/utils/createPierreClient.ts b/apps/dotcom/sync-worker/src/utils/createPierreClient.ts
new file mode 100644
index 000000000000..4a22f99fddee
--- /dev/null
+++ b/apps/dotcom/sync-worker/src/utils/createPierreClient.ts
@@ -0,0 +1,23 @@
+import { GitStorage } from '@pierre/storage'
+import { Environment } from '../types'
+
+export function createPierreClient(env: Environment): GitStorage | undefined {
+	// Only enable Pierre in non-production environments
+	if (env.TLDRAW_ENV === 'production') {
+		return undefined
+	}
+
+	if (!env.PIERRE_KEY) {
+		return undefined
+	}
+
+	try {
+		return new GitStorage({
+			name: 'tldraw',
+			key: env.PIERRE_KEY,
+		})
+	} catch (error) {
+		console.error('Failed to initialize Pierre client:', error)
+		return undefined
+	}
+}
diff --git a/apps/dotcom/sync-worker/src/worker.ts b/apps/dotcom/sync-worker/src/worker.ts
index 141b89fcc8ea..42b8bb3c573f 100644
--- a/apps/dotcom/sync-worker/src/worker.ts
+++ b/apps/dotcom/sync-worker/src/worker.ts
@@ -10,10 +10,12 @@ import {
 	schema,
 } from '@tldraw/dotcom-shared'
 import {
+	blockUnknownOrigins,
 	createRouter,
 	createSentry,
 	handleApiRequest,
 	handleUserAssetGet,
+	isAllowedOrigin,
 	notFound,
 } from '@tldraw/worker-shared'
 import { WorkerEntrypoint } from 'cloudflare:workers'
@@ -29,14 +31,18 @@ import { healthCheckRoutes } from './healthCheckRoutes'
 import { createPostgresConnectionPool, makePostgresConnector } from './postgres'
 import { createRoomSnapshot } from './routes/createRoomSnapshot'
 import { extractBookmarkMetadata } from './routes/extractBookmarkMetadata'
+import { getPierreHistory } from './routes/getPierreHistory'
+import { getPierreHistorySnapshot } from './routes/getPierreHistorySnapshot'
 import { getReadonlySlug } from './routes/getReadonlySlug'
 import { getRoomHistory } from './routes/getRoomHistory'
 import { getRoomHistorySnapshot } from './routes/getRoomHistorySnapshot'
 import { getRoomSnapshot } from './routes/getRoomSnapshot'
 import { joinExistingRoom } from './routes/joinExistingRoom'
 import { submitFeedback } from './routes/submitFeedback'
+import { acceptInvite } from './routes/tla/acceptInvite'
 import { createFiles } from './routes/tla/createFiles'
 import { forwardRoomRequest } from './routes/tla/forwardRoomRequest'
+import { getInviteInfo } from './routes/tla/getInviteInfo'
 import { getPublishedFile } from './routes/tla/getPublishedFile'
 import { upload } from './routes/tla/uploads'
 import { testRoutes } from './testRoutes'
@@ -79,11 +85,17 @@ const router = createRouter<Environment>()
 		getRoomHistorySnapshot(req, env, true)
 	)
 
+	.get(`/${FILE_PREFIX}/:roomId/pierre-history`, (req, env) => getPierreHistory(req, env, true))
+	.get(`/${FILE_PREFIX}/:roomId/pierre-history/:timestamp`, (req, env) =>
+		getPierreHistorySnapshot(req, env, true)
+	)
+
 	.get('/readonly-slug/:roomId', getReadonlySlug)
 	.get('/unfurl', extractBookmarkMetadata)
 	.post('/unfurl', extractBookmarkMetadata)
 	.post(`/${ROOM_PREFIX}/:roomId/restore`, forwardRoomRequest)
 	.post(`/app/file/:roomId/restore`, forwardRoomRequest)
+	.post(`/app/file/:roomId/pierre-restore`, forwardRoomRequest)
 	.get('/app/:userId/connect', async (req, env) => {
 		// forward req to the user durable object
 		const auth = await getAuth(req, env)
@@ -121,6 +133,8 @@ const router = createRouter<Environment>()
 		})
 	})
 	.post('/app/uploads/:objectName', upload)
+	.get('/app/invite/:token', getInviteInfo)
+	.post('/app/invite/:token/accept', acceptInvite)
 	.all('/app/__test__/*', testRoutes.fetch)
 	.get('/app/__debug-tail', (req, env) => {
 		if (isDebugLogging(env)) {
@@ -180,11 +194,14 @@ export default class Worker extends WorkerEntrypoint<Environment> {
 			request,
 			env: this.env,
 			ctx: this.ctx,
-			after: (response) => {
+			after: (response, request) => {
 				const setCookies = response.headers.getAll('set-cookie')
+				// Create a new Response with mutable headers before passing to corsify
+				// to avoid "Can't modify immutable headers" error
+				const mutableResponse = new Response(response.body, response)
 				// unfortunately corsify mishandles the set-cookie header, so
 				// we need to manually add it back in
-				const result = corsify(response)
+				const result = corsify(mutableResponse, request)
 				if ([...setCookies].length === 0) {
 					return result
 				}
@@ -226,41 +243,3 @@ export default class Worker extends WorkerEntrypoint<Environment> {
 		}
 	}
 }
-
-export function isAllowedOrigin(origin: string) {
-	if (!origin) return undefined
-	if (origin === 'http://localhost:3000') return origin
-	if (origin === 'http://localhost:5420') return origin
-	if (origin === 'https://meet.google.com') return origin
-	if (origin.endsWith('.tldraw.com')) return origin
-	if (origin.endsWith('.tldraw.dev')) return origin
-	if (origin.endsWith('.tldraw.club')) return origin
-	if (origin.endsWith('-tldraw.vercel.app')) return origin
-	return undefined
-}
-
-async function blockUnknownOrigins(request: Request, env: Environment) {
-	// allow requests for the same origin (new rewrite routing for SPA)
-	if (request.headers.get('sec-fetch-site') === 'same-origin') {
-		return undefined
-	}
-
-	if (new URL(request.url).pathname === '/auth/callback') {
-		// allow auth callback because we use the special cookie to verify
-		// the request
-		return undefined
-	}
-
-	const origin = request.headers.get('origin')
-
-	// if there's no origin, this cannot be a cross-origin request, so we allow it.
-	if (!origin) return undefined
-
-	if (env.IS_LOCAL !== 'true' && !isAllowedOrigin(origin)) {
-		console.error('Attempting to connect from an invalid origin:', origin, env, request)
-		return new Response('Not allowed', { status: 403 })
-	}
-
-	// origin doesn't match, so we can continue
-	return undefined
-}
diff --git a/apps/dotcom/sync-worker/src/zero/ServerCrud.ts b/apps/dotcom/sync-worker/src/zero/ServerCrud.ts
index a7178f459f9c..11b30c6365ec 100644
--- a/apps/dotcom/sync-worker/src/zero/ServerCrud.ts
+++ b/apps/dotcom/sync-worker/src/zero/ServerCrud.ts
@@ -1,6 +1,14 @@
 import { SchemaValue } from '@rocicorp/zero'
 import { TableCRUD } from '@rocicorp/zero/out/zql/src/mutate/custom'
-import { DB, TlaFile, TlaSchema, ZErrorCode } from '@tldraw/dotcom-shared'
+import {
+	DB,
+	TlaFile,
+	TlaRow,
+	TlaRowPartial,
+	TlaSchema,
+	ZErrorCode,
+	ZTable,
+} from '@tldraw/dotcom-shared'
 import { assert, omit } from '@tldraw/utils'
 import {
 	CompiledQuery,
@@ -14,16 +22,12 @@ import { PoolClient, QueryResult, QueryResultRow } from 'pg'
 import { ZMutationError } from './ZMutationError'
 const quote = (s: string) => JSON.stringify(s)
 
-/**
- * This perf hack allows us to get file data into the client more quickly.
- * For new files, we wake up that file's DO immediately after the file is created, rather
- * than waiting for the update to trickle through to the replicator.
- *
- * For files that are not owned by the user, we add the file to the user DO's store and
- * broadcast it to the client immediately so that it's ready to be used asap.
- */
-export interface PerfHackHooks {
-	newFiles: TlaFile[]
+export type ChangeAccumulator = {
+	[table in ZTable]?: {
+		added?: TlaRow[]
+		updated?: TlaRow[]
+		removed?: TlaRowPartial[]
+	}
 }
 
 // this is a kind of 'headless' kysely client that we use to compile queries
@@ -41,20 +45,55 @@ export class ServerCRUD implements TableCRUD<TlaSchema['tables'][keyof TlaSchema
 		private readonly client: PoolClient,
 		private readonly table: TlaSchema['tables'][keyof TlaSchema['tables']],
 		private readonly signal: AbortSignal,
-		private readonly perfHackHooks?: PerfHackHooks
+		private readonly changeAccumulator?: ChangeAccumulator
 	) {}
-	private async _onNewRow(data: any) {
-		if (!this.perfHackHooks) return
-		if (this.table.name === 'file_state') {
+	private async _trackAdded(data: any) {
+		if (!this.changeAccumulator) return
+
+		// Special case: when file_state is added, track the corresponding file
+		if (this.table.name === 'file_state' && this.changeAccumulator.file?.added) {
 			const res = await this.client.query<TlaFile>(
 				`select * from public.${quote('file')} where id = $1`,
 				[data.fileId]
 			)
 			assert(res.rowCount === 1, 'file not found')
-			this.perfHackHooks.newFiles.push(res.rows[0])
-		} else if (this.table.name === 'file') {
-			this.perfHackHooks.newFiles.push(data as TlaFile)
+			this.changeAccumulator.file.added.push(res.rows[0])
+		}
+
+		// Track the added row for this table
+		if (this.changeAccumulator[this.table.name]?.added) {
+			const res = await this.client.query(
+				`select * from public.${quote(this.table.name)} where ${this.table.primaryKey
+					.map((key, i) => `${quote(key)} = $${i + 1}`)
+					.join(' AND ')}`,
+				this.table.primaryKey.map((key) => data[key])
+			)
+			assert(res.rowCount === 1, 'row not found')
+			this.changeAccumulator[this.table.name]?.added!.push(res.rows[0])
+		}
+	}
+
+	private async _trackUpdated(data: any) {
+		if (!this.changeAccumulator?.[this.table.name]?.updated) return
+
+		const res = await this.client.query(
+			`select * from public.${quote(this.table.name)} where ${this.table.primaryKey
+				.map((key, i) => `${quote(key)} = $${i + 1}`)
+				.join(' AND ')}`,
+			this.table.primaryKey.map((key) => data[key])
+		)
+		assert(res.rowCount === 1, 'row not found')
+		this.changeAccumulator[this.table.name]?.updated!.push(res.rows[0])
+	}
+
+	private async _trackRemoved(data: any) {
+		if (!this.changeAccumulator?.[this.table.name]?.removed) return
+
+		const primaryKeyData: any = {}
+		for (const key of this.table.primaryKey) {
+			primaryKeyData[key] = data[key]
 		}
+		this.changeAccumulator[this.table.name]?.removed!.push(primaryKeyData)
 	}
 
 	private async _exec<T extends QueryResultRow>(query: {
@@ -85,14 +124,13 @@ export class ServerCRUD implements TableCRUD<TlaSchema['tables'][keyof TlaSchema
 		assert(!this.signal.aborted, 'CRUD usage outside of mutator scope')
 		assertRowIsValid(data, this.table)
 		await this._exec(db.insertInto(this.table.name).values(data))
-		await this._onNewRow(data)
+		await this._trackAdded(data)
 	}
 
 	async upsert(data: any) {
 		assert(!this.signal.aborted, 'CRUD usage outside of mutator scope')
 		assertRowIsValid(data, this.table)
 
-		// we only need this for the perf hack
 		const didExist = await this._doesExist(data)
 
 		await this._exec(
@@ -105,7 +143,9 @@ export class ServerCRUD implements TableCRUD<TlaSchema['tables'][keyof TlaSchema
 		)
 
 		if (!didExist) {
-			await this._onNewRow(data)
+			await this._trackAdded(data)
+		} else {
+			await this._trackUpdated(data)
 		}
 	}
 
@@ -113,6 +153,7 @@ export class ServerCRUD implements TableCRUD<TlaSchema['tables'][keyof TlaSchema
 		assert(!this.signal.aborted, 'CRUD usage outside of mutator scope')
 		assertRowIsValid(data, this.table)
 		await this._exec(this._wherePrimaryKey(db.deleteFrom(this.table.name), data))
+		await this._trackRemoved(data)
 	}
 
 	async update(data: any) {
@@ -134,6 +175,7 @@ export class ServerCRUD implements TableCRUD<TlaSchema['tables'][keyof TlaSchema
 				throw new ZMutationError(ZErrorCode.bad_request, `update failed, no matching rows`)
 			}
 		}
+		await this._trackUpdated(data)
 	}
 }
 
diff --git a/apps/dotcom/zero-cache/migrations/023_groups.sql b/apps/dotcom/zero-cache/migrations/023_groups.sql
index 5b967b0eb1f5..b224c0915e54 100644
--- a/apps/dotcom/zero-cache/migrations/023_groups.sql
+++ b/apps/dotcom/zero-cache/migrations/023_groups.sql
@@ -275,6 +275,46 @@ BEFORE UPDATE ON public."group_file"
 FOR EACH ROW
 EXECUTE FUNCTION update_group_file_timestamp();
 
+-- Create a function to sync home group name with user name on update
+-- When a user's name is updated, update the corresponding home group's name
+CREATE OR REPLACE FUNCTION update_home_group_name() RETURNS TRIGGER AS $$
+BEGIN
+  -- Update the group name where the group id matches the user id (home group)
+  UPDATE "group"
+  SET "name" = NEW.name
+  WHERE "id" = NEW.id;
+  
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Create a trigger to sync home group name when user name is updated
+CREATE TRIGGER "update_home_group_name_trigger"
+AFTER UPDATE OF "name" ON public."user"
+FOR EACH ROW
+WHEN (OLD."name" IS DISTINCT FROM NEW."name")
+EXECUTE FUNCTION update_home_group_name();
+
+-- Create a function to initialize group name from user name on group creation
+-- When a group is created with an id matching a user id, set the group name to the user's name
+CREATE OR REPLACE FUNCTION initialize_home_group_name() RETURNS TRIGGER AS $$
+BEGIN
+  -- If there's a user with the same id as the group, update the group name to match
+  UPDATE "group"
+  SET "name" = u."name"
+  FROM public."user" u
+  WHERE u."id" = NEW."id" AND "group"."id" = NEW."id";
+  
+  RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Create a trigger to initialize group name from user name on group creation
+CREATE TRIGGER "initialize_home_group_name_trigger"
+AFTER INSERT ON public."group"
+FOR EACH ROW
+EXECUTE FUNCTION initialize_home_group_name();
+
 -- Create a function to validate group_file associations
 CREATE OR REPLACE FUNCTION validate_group_file_association() RETURNS TRIGGER AS $$
 BEGIN
@@ -346,7 +386,7 @@ BEGIN
 
     -- Check if user already has groups flag
     SELECT flags INTO v_current_flags FROM public."user" WHERE id = target_user_id;
-    IF v_current_flags LIKE '%groups%' THEN
+    IF v_current_flags LIKE '%groups_backend%' THEN
       RAISE NOTICE 'User % already has groups flag, skipping migration', target_user_id;
       RETURN QUERY SELECT 0, 0, FALSE;
       RETURN;
@@ -364,11 +404,13 @@ BEGIN
 
     -- Create a home group for the user
     INSERT INTO public."group" ("id", "name", "createdAt", "updatedAt", "isDeleted", "inviteSecret")
-    VALUES (target_user_id, target_user_id, v_now, v_now, FALSE, invite_secret);
+    VALUES (target_user_id, target_user_id, v_now, v_now, FALSE, invite_secret)
+    ON CONFLICT DO NOTHING;
 
     -- Make the user a member of the home group
     INSERT INTO public."group_user" ("userId", "groupId", "createdAt", "updatedAt", "role", "index", "userName", "userColor")
-    VALUES (target_user_id, target_user_id, v_now, v_now, 'owner', 'a1', '', '');
+    VALUES (target_user_id, target_user_id, v_now, v_now, 'owner', 'a1', '', '')
+    ON CONFLICT DO NOTHING;
 
     -- For any files owned by the user, change the owningGroupId to the home group and set the ownerId to null
     UPDATE public."file"
@@ -380,7 +422,8 @@ BEGIN
     INSERT INTO public."group_file" ("fileId", "groupId", "createdAt", "updatedAt")
     SELECT fs."fileId", target_user_id, COALESCE(fs."firstVisitAt", f."createdAt", v_now), COALESCE(fs."lastEditAt", fs."firstVisitAt", f."updatedAt", f."createdAt", v_now)
     FROM public."file_state" fs JOIN public."file" f ON fs."fileId" = f."id"
-    WHERE fs."userId" = target_user_id;
+    WHERE fs."userId" = target_user_id
+    ON CONFLICT DO NOTHING;
 
     -- Update indexes for the group_file entries
     UPDATE public."group_file" gf
@@ -393,7 +436,7 @@ BEGIN
     ) AS fs
     WHERE gf."fileId" = fs."fileId" AND gf."groupId" = target_user_id;
 
-    -- Add 'groups' flag to user
+    -- Add 'groups_backend' flag to user
     IF v_current_flags IS NULL OR v_current_flags = '' THEN
         UPDATE public."user" SET flags = 'groups_backend' WHERE id = target_user_id;
     ELSE
diff --git a/apps/dotcom/zero-cache/migrations/024_add_fairies.sql b/apps/dotcom/zero-cache/migrations/024_add_fairies.sql
new file mode 100644
index 000000000000..f19ac82e8b61
--- /dev/null
+++ b/apps/dotcom/zero-cache/migrations/024_add_fairies.sql
@@ -0,0 +1,15 @@
+
+CREATE TABLE user_fairies (
+  "userId" VARCHAR PRIMARY KEY,
+  "fairies" VARCHAR,
+  CONSTRAINT user_fairies_user_id_fkey FOREIGN KEY ("userId") REFERENCES public."user"("id") ON DELETE CASCADE
+);
+
+CREATE TABLE file_fairies (
+  "fileId" VARCHAR,
+  "userId" VARCHAR,
+  "fairyState" VARCHAR,
+  PRIMARY KEY ("fileId", "userId"),
+  CONSTRAINT file_fairies_file_id_fkey FOREIGN KEY ("fileId") REFERENCES public."file"("id") ON DELETE CASCADE,
+  CONSTRAINT file_fairies_user_id_fkey FOREIGN KEY ("userId") REFERENCES public."user"("id") ON DELETE CASCADE
+);
diff --git a/apps/examples/e2e/tests/export-snapshots.spec.tsx b/apps/examples/e2e/tests/export-snapshots.spec.tsx
index 59aebe1f5968..78ec9bf501e7 100644
--- a/apps/examples/e2e/tests/export-snapshots.spec.tsx
+++ b/apps/examples/e2e/tests/export-snapshots.spec.tsx
@@ -13,7 +13,6 @@ import {
 	TLAsset,
 	TLBindingCreate,
 	TLShapePartial,
-	TLTextShape,
 	degreesToRadians,
 	mapObjectMapValues,
 	mockUniqueId,
@@ -1007,7 +1006,7 @@ test.describe('Export snapshots', () => {
 							.deleteShapes(editor.getSelectedShapeIds())
 
 						const titleId = tldrawApi.createShapeId()
-						editor.createShape<TLTextShape>({
+						editor.createShape({
 							id: titleId,
 							type: 'text',
 							x: 0,
@@ -1019,7 +1018,7 @@ test.describe('Export snapshots', () => {
 
 						for (const [rowName, testCases] of Object.entries(snapshot)) {
 							const rowTitleId = tldrawApi.createShapeId()
-							editor.createShape<TLTextShape>({
+							editor.createShape({
 								id: rowTitleId,
 								type: 'text',
 								x: 0,
@@ -1034,7 +1033,7 @@ test.describe('Export snapshots', () => {
 								testCases
 							)) {
 								const testCaseTitleId = tldrawApi.createShapeId()
-								editor.createShape<TLTextShape>({
+								editor.createShape({
 									id: testCaseTitleId,
 									type: 'text',
 									x,
diff --git a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-Mobile-Chrome-linux.png b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-Mobile-Chrome-linux.png
index 41cc0cdb746b..c8b123ca2ad2 100644
Binary files a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-Mobile-Chrome-linux.png and b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-Mobile-Chrome-linux.png differ
diff --git a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-chromium-linux.png b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-chromium-linux.png
index 41cc0cdb746b..c8b123ca2ad2 100644
Binary files a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-chromium-linux.png and b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-dark-1-chromium-linux.png differ
diff --git a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-Mobile-Chrome-linux.png b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-Mobile-Chrome-linux.png
index f0e108478e3e..07e588b22396 100644
Binary files a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-Mobile-Chrome-linux.png and b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-Mobile-Chrome-linux.png differ
diff --git a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-chromium-linux.png b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-chromium-linux.png
index f0e108478e3e..07e588b22396 100644
Binary files a/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-chromium-linux.png and b/apps/examples/e2e/tests/export-snapshots.spec.tsx-snapshots/Export-snapshots-Fills-light-1-chromium-linux.png differ
diff --git a/apps/examples/e2e/tests/test-kbds.spec.ts b/apps/examples/e2e/tests/test-kbds.spec.ts
index 9153167df9c9..82e895b36e8e 100644
--- a/apps/examples/e2e/tests/test-kbds.spec.ts
+++ b/apps/examples/e2e/tests/test-kbds.spec.ts
@@ -818,4 +818,26 @@ test.describe('Shape Navigation', () => {
 			isInInnerFrame: true,
 		})
 	})
+
+	test('Tab navigation does not happen when alt key is pressed', async ({ isMobile }) => {
+		if (isMobile) return // can't test this on mobile
+
+		// Create multiple shapes
+		await page.keyboard.press('r')
+		await page.mouse.click(100, 100)
+		await page.keyboard.press('r')
+		await page.mouse.click(250, 100)
+		await page.keyboard.press('r')
+		await page.mouse.click(400, 100)
+		await page.keyboard.press('v')
+
+		// Click on the first shape to select it
+		await page.mouse.click(100, 100)
+
+		await page.keyboard.press('Alt+Tab')
+		expect(await page.evaluate(() => editor.getOnlySelectedShape())).toMatchObject({
+			x: 0,
+			y: 0,
+		})
+	})
 })
diff --git a/apps/examples/e2e/tests/test-text.spec.ts b/apps/examples/e2e/tests/test-text.spec.ts
index 7ce6202e76d6..3ed3164f0658 100644
--- a/apps/examples/e2e/tests/test-text.spec.ts
+++ b/apps/examples/e2e/tests/test-text.spec.ts
@@ -253,7 +253,7 @@ test.describe('text measurement', () => {
 	test('for auto-font-sizing shapes, should do normal font size for text that does not have long words', async () => {
 		const shape = await page.evaluate(() => {
 			const id = 'shape:testShape' as TLShapeId
-			editor.createShapes<TLNoteShape>([
+			editor.createShapes([
 				{
 					id,
 					type: 'note',
@@ -275,7 +275,7 @@ test.describe('text measurement', () => {
 	test('for auto-font-sizing shapes, should auto-size text that have slightly long words', async () => {
 		const shape = await page.evaluate(() => {
 			const id = 'shape:testShape' as TLShapeId
-			editor.createShapes<TLNoteShape>([
+			editor.createShapes([
 				{
 					id,
 					type: 'note',
@@ -297,7 +297,7 @@ test.describe('text measurement', () => {
 	test('for auto-font-sizing shapes, should auto-size text that have long words', async () => {
 		const shape = await page.evaluate(() => {
 			const id = 'shape:testShape' as TLShapeId
-			editor.createShapes<TLNoteShape>([
+			editor.createShapes([
 				{
 					id,
 					type: 'note',
@@ -319,7 +319,7 @@ test.describe('text measurement', () => {
 	test('for auto-font-sizing shapes, should wrap text that has words that are way too long', async () => {
 		const shape = await page.evaluate(() => {
 			const id = 'shape:testShape' as TLShapeId
-			editor.createShapes<TLNoteShape>([
+			editor.createShapes([
 				{
 					id,
 					type: 'note',
@@ -369,7 +369,7 @@ test.describe('text measurement', () => {
 
 		await page.evaluate(() => {
 			const id = 'shape:testShape' as TLShapeId
-			editor.createShapes<TLNoteShape>([
+			editor.createShapes([
 				{
 					id,
 					type: 'note',
diff --git a/apps/examples/src/examples/add-tool-to-toolbar/sticker-tool-util.tsx b/apps/examples/src/examples/add-tool-to-toolbar/sticker-tool-util.tsx
index 0f98b5d4d83e..38e2cfd9e7c3 100644
--- a/apps/examples/src/examples/add-tool-to-toolbar/sticker-tool-util.tsx
+++ b/apps/examples/src/examples/add-tool-to-toolbar/sticker-tool-util.tsx
@@ -1,4 +1,4 @@
-import { StateNode, TLTextShape, toRichText } from 'tldraw'
+import { StateNode, toRichText } from 'tldraw'
 
 // Check out the custom tool example for a more detailed explanation of the tool class.
 
@@ -12,7 +12,7 @@ export class StickerTool extends StateNode {
 
 	override onPointerDown() {
 		const { currentPagePoint } = this.editor.inputs
-		this.editor.createShape<TLTextShape>({
+		this.editor.createShape({
 			type: 'text',
 			x: currentPagePoint.x - OFFSET,
 			y: currentPagePoint.y - OFFSET,
diff --git a/apps/examples/src/examples/after-create-update-shape/AfterCreateUpdateShapeExample.tsx b/apps/examples/src/examples/after-create-update-shape/AfterCreateUpdateShapeExample.tsx
index 6b4eaccaca58..67927fd7b001 100644
--- a/apps/examples/src/examples/after-create-update-shape/AfterCreateUpdateShapeExample.tsx
+++ b/apps/examples/src/examples/after-create-update-shape/AfterCreateUpdateShapeExample.tsx
@@ -1,5 +1,7 @@
 import { Editor, TLShape, TLShapeId, Tldraw, createShapeId, toRichText } from 'tldraw'
 
+type ShapeWithColor = Extract<TLShape, { props: { color: string } }>
+
 // this function takes a shape ID, and if that shape is red, sets all other red shapes on the same
 // page to black.
 function ensureOnlyOneRedShape(editor: Editor, shapeId: TLShapeId) {
@@ -13,7 +15,10 @@ function ensureOnlyOneRedShape(editor: Editor, shapeId: TLShapeId) {
 	// find any other red shapes on the same page:
 	const otherRedShapesOnPage = Array.from(editor.getPageShapeIds(pageId))
 		.map((id) => editor.getShape(id)!)
-		.filter((otherShape) => otherShape.id !== shape.id && isRedShape(otherShape))
+		.filter(
+			(otherShape): otherShape is ShapeWithColor =>
+				otherShape.id !== shape.id && isRedShape(otherShape)
+		)
 
 	// set the color of all those shapes to black:
 	editor.updateShapes(
diff --git a/apps/examples/src/examples/after-delete-shape/AfterDeleteShapeExample.tsx b/apps/examples/src/examples/after-delete-shape/AfterDeleteShapeExample.tsx
index 4392d6a9256e..b503789bab0c 100644
--- a/apps/examples/src/examples/after-delete-shape/AfterDeleteShapeExample.tsx
+++ b/apps/examples/src/examples/after-delete-shape/AfterDeleteShapeExample.tsx
@@ -51,7 +51,7 @@ function createDemoShapes(editor: Editor) {
 		},
 		...[50, 180, 310].map((x) => ({
 			id: createShapeId(),
-			type: 'geo',
+			type: 'geo' as const,
 			parentId: frameId,
 			x,
 			y: 120,
diff --git a/apps/examples/src/examples/ag-grid-shape/DataGridExample.tsx b/apps/examples/src/examples/ag-grid-shape/DataGridExample.tsx
index 02fcdb4074ed..b7961ea40ca9 100644
--- a/apps/examples/src/examples/ag-grid-shape/DataGridExample.tsx
+++ b/apps/examples/src/examples/ag-grid-shape/DataGridExample.tsx
@@ -1,17 +1,23 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 import { AgGridReact } from 'ag-grid-react'
-import { BaseBoxShapeUtil, TLBaseShape, Tldraw, createShapeId, useDelaySvgExport } from 'tldraw'
+import { BaseBoxShapeUtil, TLShape, Tldraw, createShapeId, useDelaySvgExport } from 'tldraw'
 
 import 'ag-grid-community/styles/ag-grid.css'
 import 'ag-grid-community/styles/ag-theme-quartz.css'
 import 'tldraw/tldraw.css'
 
-type AgGridShape = TLBaseShape<
-	'ag-grid',
-	{ w: number; h: number; rowData: any[]; columnDefs: any[] }
->
+const AG_GRID_TYPE = 'ag-grid'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[AG_GRID_TYPE]: { w: number; h: number; rowData: any[]; columnDefs: any[] }
+	}
+}
+
+type AgGridShape = TLShape<typeof AG_GRID_TYPE>
+
 class AgGridShapeUtil extends BaseBoxShapeUtil<AgGridShape> {
-	static override type = 'ag-grid'
+	static override type = AG_GRID_TYPE
 
 	override canScroll(): boolean {
 		return true
@@ -66,9 +72,9 @@ export default function DataGridExample() {
 					const agGridShapeId = createShapeId('ag-grid')
 
 					if (!editor.getShape(agGridShapeId)) {
-						editor.createShape<AgGridShape>({
+						editor.createShape({
 							id: agGridShapeId,
-							type: 'ag-grid',
+							type: AG_GRID_TYPE,
 							props: {
 								w: 400,
 								h: 300,
diff --git a/apps/examples/src/examples/api/APIExample.tsx b/apps/examples/src/examples/api/APIExample.tsx
index a0b857bad63e..f171a223923e 100644
--- a/apps/examples/src/examples/api/APIExample.tsx
+++ b/apps/examples/src/examples/api/APIExample.tsx
@@ -20,7 +20,7 @@ export default function APIExample() {
 		const id = createShapeId('hello')
 
 		// Create a shape
-		editor.createShapes<TLGeoShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'geo',
@@ -41,7 +41,7 @@ export default function APIExample() {
 		const shape = editor.getShape<TLGeoShape>(id)!
 
 		// Update the shape
-		editor.updateShape<TLGeoShape>({
+		editor.updateShape({
 			id,
 			type: 'geo',
 			props: {
@@ -57,7 +57,7 @@ export default function APIExample() {
 		editor.zoomToFit()
 
 		// Select the shape
-		editor.select(id) 
+		editor.select(id)
 	}
 
 	return (
@@ -93,20 +93,20 @@ const InsideOfEditorContext = () => {
 	return null
 }
 
-/* 
-Introduction: 
+/*
+Introduction:
 
-This example shows how to use the tldraw editor instance to make changes 
-to the canvas. The editor instance is tldraw's "god object". You can use 
-the app to do just about everything that's possible in tldraw. Internally, 
-the canvas component and all shapes, tools, and UI components use this instance 
-to send events, observe changes, and perform actions. 
+This example shows how to use the tldraw editor instance to make changes
+to the canvas. The editor instance is tldraw's "god object". You can use
+the app to do just about everything that's possible in tldraw. Internally,
+the canvas component and all shapes, tools, and UI components use this instance
+to send events, observe changes, and perform actions.
 
 There are two main ways to use the editor:
 
-[1] 
+[1]
 The tldraw component shares its editor instance via its onMount callback prop.
-When you define a function for the onMount callback, it receives the editor 
+When you define a function for the onMount callback, it receives the editor
 instance as an argument. You can use this to manipulate the canvas.
 
 
diff --git a/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-tool.tsx b/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-tool.tsx
index d97b02a0801f..6f7355cf676d 100644
--- a/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-tool.tsx
+++ b/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-tool.tsx
@@ -2,14 +2,14 @@ import { BaseBoxShapeTool } from 'tldraw'
 export class PlayingCardTool extends BaseBoxShapeTool {
 	static override id = 'PlayingCard'
 	static override initial = 'idle'
-	override shapeType = 'PlayingCard'
+	override shapeType = 'PlayingCard' as const
 }
 
 /*
 This file contains our custom tool. The tool is a StateNode with the `id` "PlayingCard".
 
 We get a lot of functionality for free by extending the BaseBoxShapeTool. but we can
-handle events in our own way by overriding methods like onDoubleClick. For an example 
-of a tool with more custom functionality, check out the screenshot-tool example. 
+handle events in our own way by overriding methods like onDoubleClick. For an example
+of a tool with more custom functionality, check out the screenshot-tool example.
 
 */
diff --git a/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-util.tsx b/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-util.tsx
index bdfe38b7313a..9ce4f656c3b0 100644
--- a/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-util.tsx
+++ b/apps/examples/src/examples/bounds-snapping-shape/PlayingCardShape/playing-card-util.tsx
@@ -5,36 +5,42 @@ import {
 	RecordProps,
 	Rectangle2d,
 	T,
-	TLBaseShape,
+	TLShape,
 } from 'tldraw'
 
 // There's a guide at the bottom of this file!
 
+const PLAYING_CARD_TYPE = 'PlayingCard'
+
 // [1]
-type IPlayingCard = TLBaseShape<
-	'PlayingCard',
-	{
-		w: number
-		h: number
-		suit: string
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[PLAYING_CARD_TYPE]: {
+			w: number
+			h: number
+			suit: string
+		}
 	}
->
+}
+
+// [2]
+export type IPlayingCard = TLShape<typeof PLAYING_CARD_TYPE>
 
 export class PlayingCardUtil extends BaseBoxShapeUtil<IPlayingCard> {
-	// [2]
-	static override type = 'PlayingCard' as const
+	// [3]
+	static override type = PLAYING_CARD_TYPE
 	static override props: RecordProps<IPlayingCard> = {
 		w: T.number,
 		h: T.number,
 		suit: T.string,
 	}
 
-	// [3]
+	// [4]
 	override isAspectRatioLocked(_shape: IPlayingCard) {
 		return true
 	}
 
-	// [4]
+	// [5]
 	getDefaultProps(): IPlayingCard['props'] {
 		const cardSuitsArray: string[] = ['♠️', '♣️', '♥️', '♦️']
 		const randomSuit = cardSuitsArray[Math.floor(Math.random() * cardSuitsArray.length)]
@@ -45,7 +51,7 @@ export class PlayingCardUtil extends BaseBoxShapeUtil<IPlayingCard> {
 		}
 	}
 
-	// [5]
+	// [6]
 	override getBoundsSnapGeometry(shape: IPlayingCard): BoundsSnapGeometry {
 		return {
 			points: new Rectangle2d({
@@ -93,48 +99,51 @@ export class PlayingCardUtil extends BaseBoxShapeUtil<IPlayingCard> {
 		)
 	}
 
-	// [7]
+	// [8]
 	indicator(shape: IPlayingCard) {
 		return <rect width={shape.props.w} height={shape.props.h} />
 	}
 }
 
-/* 
-This is a utility class for the PlayingCard shape. This is where you define the shape's behavior, 
+/*
+This is a utility class for the PlayingCard shape. This is where you define the shape's behavior,
 how it renders (its component and indicator), and how it handles different events. The most relevant
-part of the code to custom snapping can be found in [6].
+part of the code to custom snapping can be found in [7].
 
 [1]
-This is where we define the shape's type for Typescript. We can extend the TLBaseShape type,
-providing a unique string to identify the shape and the shape's props. We only need height
-and width for this shape.
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties. For this shape, we define width (w), height (h),
+and suit as the shape's properties.
 
 [2]
+Define the shape type using TLShape with the shape's type as a type argument.
+
+[3]
 We define the shape's type and props for the editor. We can use tldraw's validator library to
-make sure that the store always has shape data we can trust. In this case, we define the width 
+make sure that the store always has shape data we can trust. In this case, we define the width
 and height properties as numbers and assign a validator from tldraw's library to them.
 
-[3]
+[4]
 We're going to lock the aspect ratio of this shape.
 
-[4]
+[5]
 getDefaultProps determines what our shape looks like when click-creating one. In this case, we
 want the shape to be 270x370 pixels and generate a suit for the card at random.
 
-[5]
+[6]
 This is the important part for custom snapping. We define the getBoundsSnapGeometry method. This
 method returns the geometry that the shape will snap to. In this case, we want the shape to snap
 to a rectangle in the top left that contains the suit of the card. We can use the Rectangle2d helper
 again here and set it to the same width and height as the span containing the suit which is defined
-in [6].
+in [7].
 
-[6]
+[7]
 We define the component method. This controls what the shape looks like and it returns JSX. It
 generates a random suit for the card and returns a div with the suit in the center and a span with
 the suit in the top left. The HTMLContainer component is a helpful wrapper that the tldraw library
 exports, it's a div that comes with a css class.
 
-[7]
+[8]
 The indicator is the blue box that appears around the shape when it's selected. We're just returning
 a rectangle with the same width and height as the shape here.
 
diff --git a/apps/examples/src/examples/create-arrow/CreateArrowExample.tsx b/apps/examples/src/examples/create-arrow/CreateArrowExample.tsx
index 9e5a39350e51..2d4699300abf 100644
--- a/apps/examples/src/examples/create-arrow/CreateArrowExample.tsx
+++ b/apps/examples/src/examples/create-arrow/CreateArrowExample.tsx
@@ -1,4 +1,4 @@
-import { createShapeId, Editor, TLArrowBinding, TLArrowShape, Tldraw, TLShapeId, Vec } from 'tldraw'
+import { createShapeId, Editor, TLArrowBinding, Tldraw, TLShapeId, Vec } from 'tldraw'
 import 'tldraw/tldraw.css'
 
 // There's a guide at the bottom of this file!
@@ -101,7 +101,7 @@ function createArrowBetweenShapes(
 	const arrowId = createShapeId()
 	editor.run(() => {
 		editor.markHistoryStoppingPoint('creating_arrow')
-		editor.createShape<TLArrowShape>({
+		editor.createShape({
 			id: arrowId,
 			type: 'arrow',
 			// [2]
@@ -120,7 +120,7 @@ function createArrowBetweenShapes(
 			},
 		})
 
-		editor.createBindings<TLArrowBinding>([
+		editor.createBindings([
 			{
 				fromId: arrowId,
 				toId: startShapeId,
@@ -152,7 +152,7 @@ Introduction:
 
 This example shows how to create an arrow between two shapes.
 
-[1] 
+[1]
 The normalized anchor is the position inside the shape that the arrow connects to, where 0 0 is the
 top left corner and 1 1 is the bottom right. `isPrecise` needs to be enabled for this position to be
 used, otherwise it targets the center of the shape.
diff --git a/apps/examples/src/examples/cubic-bezier-shape/CubicBezierShape.tsx b/apps/examples/src/examples/cubic-bezier-shape/CubicBezierShape.tsx
new file mode 100644
index 000000000000..c0404e766825
--- /dev/null
+++ b/apps/examples/src/examples/cubic-bezier-shape/CubicBezierShape.tsx
@@ -0,0 +1,392 @@
+import {
+	BoundsSnapGeometry,
+	CubicBezier2d,
+	Geometry2d,
+	getIndicesAbove,
+	HandleSnapGeometry,
+	HTMLContainer,
+	RecordProps,
+	ShapeUtil,
+	TLHandle,
+	TLHandleDragInfo,
+	TLResizeInfo,
+	TLShape,
+	Vec,
+	VecLike,
+	vecModelValidator,
+	ZERO_INDEX_KEY,
+} from 'tldraw'
+
+const BEZIER_CURVE_TYPE = 'bezier-curve'
+
+// [1]
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[BEZIER_CURVE_TYPE]: { start: VecLike; cp1: VecLike; cp2: VecLike; end: VecLike }
+	}
+}
+
+// [2]
+export type MyBezierCurveShape = TLShape<typeof BEZIER_CURVE_TYPE>
+
+// [3]
+export class BezierCurveShapeUtil extends ShapeUtil<MyBezierCurveShape> {
+	static override type = BEZIER_CURVE_TYPE
+	static override props: RecordProps<MyBezierCurveShape> = {
+		start: vecModelValidator,
+		cp1: vecModelValidator,
+		cp2: vecModelValidator,
+		end: vecModelValidator,
+	}
+
+	private isMetaKeyOnTranslateStart = false
+	private didHitCurveOnTranslateStart = false
+
+	override getDefaultProps(): MyBezierCurveShape['props'] {
+		return {
+			start: { x: 0, y: 0 },
+			cp1: { x: 0, y: 140 },
+			cp2: { x: 350, y: 300 },
+			end: { x: 400, y: 110 },
+		}
+	}
+
+	override canEdit(): boolean {
+		return true
+	}
+
+	// [4]
+	getGeometry(shape: MyBezierCurveShape): Geometry2d {
+		return new CubicBezier2d({
+			start: new Vec(shape.props.start.x, shape.props.start.y),
+			cp1: new Vec(shape.props.cp1.x, shape.props.cp1.y),
+			cp2: new Vec(shape.props.cp2.x, shape.props.cp2.y),
+			end: new Vec(shape.props.end.x, shape.props.end.y),
+		})
+	}
+
+	override hideSelectionBoundsBg(shape: MyBezierCurveShape): boolean {
+		return this.editor.getEditingShapeId() === shape.id
+	}
+
+	override hideSelectionBoundsFg(shape: MyBezierCurveShape): boolean {
+		return this.editor.getEditingShapeId() === shape.id
+	}
+
+	override hideResizeHandles(shape: MyBezierCurveShape): boolean {
+		return this.editor.getEditingShapeId() === shape.id
+	}
+
+	override onResize(shape: MyBezierCurveShape, info: TLResizeInfo<MyBezierCurveShape>) {
+		const { scaleX, scaleY } = info
+		return {
+			props: {
+				start: { x: shape.props.start.x * scaleX, y: shape.props.start.y * scaleY },
+				cp1: { x: shape.props.cp1.x * scaleX, y: shape.props.cp1.y * scaleY },
+				cp2: { x: shape.props.cp2.x * scaleX, y: shape.props.cp2.y * scaleY },
+				end: { x: shape.props.end.x * scaleX, y: shape.props.end.y * scaleY },
+			},
+		}
+	}
+
+	override getBoundsSnapGeometry(shape: MyBezierCurveShape): BoundsSnapGeometry {
+		return {
+			points: [shape.props.start, shape.props.end],
+		}
+	}
+
+	override toSvg(shape: MyBezierCurveShape) {
+		const path = this.getGeometry(shape).getSvgPathData(true)
+		return <path d={path} stroke="black" fill="transparent" strokeWidth={2} />
+	}
+
+	// [5]
+	override getHandles(shape: MyBezierCurveShape): TLHandle[] {
+		const indices = [ZERO_INDEX_KEY, ...getIndicesAbove(ZERO_INDEX_KEY, 3)]
+
+		let handles: TLHandle[] = [
+			{
+				id: 'start',
+				type: 'vertex',
+				x: shape.props.start.x,
+				y: shape.props.start.y,
+				index: indices[0],
+				snapType: 'align',
+			},
+			{
+				id: 'cp1',
+				type: 'vertex',
+				x: shape.props.cp1.x,
+				y: shape.props.cp1.y,
+				index: indices[1],
+				snapType: 'align',
+			},
+			{
+				id: 'cp2',
+				type: 'vertex',
+				x: shape.props.cp2.x,
+				y: shape.props.cp2.y,
+				index: indices[2],
+				snapType: 'align',
+			},
+			{
+				id: 'end',
+				type: 'vertex',
+				x: shape.props.end.x,
+				y: shape.props.end.y,
+				index: indices[3],
+				snapType: 'align',
+			},
+		]
+
+		if (Vec.Equals(shape.props.cp1, shape.props.start)) {
+			handles = handles.filter((handle) => handle.id !== 'cp1')
+		}
+
+		if (Vec.Equals(shape.props.cp2, shape.props.end)) {
+			handles = handles.filter((handle) => handle.id !== 'cp2')
+		}
+
+		return handles
+	}
+
+	// [6]
+	override getHandleSnapGeometry(shape: MyBezierCurveShape): HandleSnapGeometry {
+		return {
+			points: [shape.props.start, shape.props.end],
+			getSelfSnapPoints: (handle) => {
+				if (handle.id === 'cp1' || handle.id === 'cp2') {
+					return [shape.props.start, shape.props.end]
+				}
+
+				return handle.id === 'end' ? [shape.props.start] : [shape.props.end]
+			},
+		}
+	}
+
+	// [7]
+	override onHandleDrag(shape: MyBezierCurveShape, info: TLHandleDragInfo<MyBezierCurveShape>) {
+		const { handle } = info
+		const { id, x, y } = handle
+
+		let props = {}
+		let newProps: any = {}
+
+		// if you hold command or control key whilst dragging over a start or end handle,
+		// move the associated control point to the new positions
+		if (this.editor.inputs.metaKey) {
+			switch (id) {
+				case 'start': {
+					return {
+						...shape,
+						props: {
+							...shape.props,
+							cp1: { x, y },
+						},
+					}
+				}
+				case 'end': {
+					return {
+						...shape,
+						props: {
+							...shape.props,
+							cp2: { x, y },
+						},
+					}
+				}
+			}
+		}
+
+		// move the handles
+		switch (id) {
+			case 'start': {
+				const delta = Vec.Sub(handle, shape.props.start)
+
+				newProps = {
+					start: { x, y },
+					cp1: { x: shape.props.cp1.x + delta.x, y: shape.props.cp1.y + delta.y },
+				}
+				break
+			}
+			case 'end': {
+				const delta = Vec.Sub(handle, shape.props.end)
+
+				newProps = {
+					end: { x, y },
+					cp2: { x: shape.props.cp2.x + delta.x, y: shape.props.cp2.y + delta.y },
+				}
+				break
+			}
+			default: {
+				newProps = {
+					[id]: { x, y },
+				}
+				break
+			}
+		}
+
+		props = {
+			...shape.props,
+			...newProps,
+		}
+
+		return {
+			...shape,
+			props,
+		}
+	}
+
+	// [8]
+	override onTranslateStart(shape: MyBezierCurveShape) {
+		// only bend if we start translating with the command or control key pressed
+		// this avoids bending the curve midway through a translation where the user accidentally
+		// holds the command or control key
+		this.isMetaKeyOnTranslateStart = this.editor.inputs.metaKey
+
+		// we should bend the curve if we hit the curve but not the start or end handles,
+		const handles = this.getHandles(shape)
+		const startAndEndHandles = handles.filter(
+			(handle) => handle.id === 'start' || handle.id === 'end'
+		)
+		if (!startAndEndHandles.length) return
+
+		const hitStartOrEndHandle = startAndEndHandles.some((handle) => {
+			const threshold = 8 / this.editor.getZoomLevel()
+			const pageTransform = this.editor.getShapePageTransform(shape)
+			const handleInPageSpace = pageTransform.applyToPoint(handle)
+
+			if (Vec.Dist(handleInPageSpace, this.editor.inputs.currentPagePoint) < threshold) {
+				return true
+			}
+			return false
+		})
+
+		const hitCurve = this.editor.isPointInShape(shape, this.editor.inputs.currentPagePoint, {
+			margin: 10 / this.editor.getZoomLevel(),
+		})
+
+		this.didHitCurveOnTranslateStart = hitCurve && !hitStartOrEndHandle
+	}
+
+	override onTranslate(initial: MyBezierCurveShape, current: MyBezierCurveShape) {
+		// bend the curve
+		if (this.isMetaKeyOnTranslateStart && this.didHitCurveOnTranslateStart) {
+			const delta = Vec.Sub(current, initial)
+			const offsetX = Math.round(delta.x)
+			const offsetY = Math.round(delta.y)
+
+			return {
+				...initial,
+				props: {
+					...initial.props,
+					cp1: { x: initial.props.cp1.x + offsetX, y: initial.props.cp1.y + offsetY },
+					cp2: { x: initial.props.cp2.x + offsetX, y: initial.props.cp2.y + offsetY },
+				},
+			}
+		}
+
+		return
+	}
+
+	// [9]
+	component(shape: MyBezierCurveShape) {
+		const path = this.getGeometry(shape).getSvgPathData(true)
+		const { start, end, cp1, cp2 } = shape.props
+
+		const zoomLevel = this.editor.getZoomLevel()
+
+		return (
+			<HTMLContainer>
+				<svg className="tl-svg-container">
+					<path d={path} stroke="black" fill="transparent" />
+					<>
+						{this.shouldShowControlLines(shape) && (
+							<>
+								<line
+									x1={start.x}
+									y1={start.y}
+									x2={cp1.x}
+									y2={cp1.y}
+									stroke="black"
+									strokeWidth={1 / zoomLevel}
+									strokeDasharray={`${6 / zoomLevel} ${6 / zoomLevel}`}
+									opacity={0.5}
+								/>
+								<line
+									x1={end.x}
+									y1={end.y}
+									x2={cp2.x}
+									y2={cp2.y}
+									stroke="black"
+									strokeWidth={1 / zoomLevel}
+									strokeDasharray={`${6 / zoomLevel} ${6 / zoomLevel}`}
+									opacity={0.5}
+								/>
+							</>
+						)}
+					</>
+				</svg>
+			</HTMLContainer>
+		)
+	}
+
+	indicator(shape: MyBezierCurveShape) {
+		const path = this.getGeometry(shape).getSvgPathData(true)
+		return <path d={path} />
+	}
+
+	private shouldShowControlLines(shape: MyBezierCurveShape) {
+		const selectedShape = this.editor.getOnlySelectedShape() === shape
+		if (!selectedShape) return false
+
+		return this.editor.isInAny(
+			'select.editing_shape',
+			'select.pointing_handle',
+			'select.dragging_handle'
+		)
+	}
+}
+
+/*
+This is our custom cubic bezier curve shape. A cubic bezier curve is defined by four points: start, end, and two control points (cp1, cp2).
+
+[1]
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties. For this shape, we define four points (start, cp1, cp2, end)
+that define the curve.
+
+[2]
+Define the shape type using TLShape with the shape's type as a type argument.
+
+[3]
+The BezierCurveShapeUtil extends ShapeUtil to define all behavior for our custom shape. We specify
+the static 'type' and 'props' with validators.
+
+[4]
+The getGeometry method returns a CubicBezier2d geometry used for hit-testing, bounds calculations,
+and rendering.
+
+[5]
+Define four interactive handles: start, end, cp1, and cp2. Each has an id, type, position, and index.
+Control point handles are hidden when they're at the same position as their associated endpoints (collapsed).
+
+[6]
+Custom handle snapping via getHandleSnapGeometry: control points (cp1, cp2) can snap to start/end points.
+The snap system automatically handles screen-space thresholds (consistent across zoom levels) and visual
+snap indicators. When a control point is snapped to an endpoint, it effectively "collapses" the curve at
+that end, creating a sharp corner.
+
+[7]
+Handle drag behaviors:
+- Meta key + drag start/end handles repositions the associated control point (cp1 or cp2)
+- Dragging start/end handles moves the associated control point to maintain curve shape
+- Dragging cp1/cp2 directly moves only that control point
+
+[8]
+Translation with curve bending: Hold meta key while dragging the curve (not handles) to bend it
+by moving both control points together. This is detected on translate start to avoid accidental bending.
+
+[9]
+Visual feedback: Display dashed lines from start→cp1 and end→cp2 when the shape is selected
+and actively being edited or translated.
+*/
diff --git a/apps/examples/src/examples/cubic-bezier-shape/CubicBezierShapeExample.tsx b/apps/examples/src/examples/cubic-bezier-shape/CubicBezierShapeExample.tsx
new file mode 100644
index 000000000000..cb6c2e188965
--- /dev/null
+++ b/apps/examples/src/examples/cubic-bezier-shape/CubicBezierShapeExample.tsx
@@ -0,0 +1,167 @@
+import { StateNode, TLAnyShapeUtilConstructor, Tldraw, TLPointerEventInfo } from 'tldraw'
+import { BezierCurveShapeUtil } from './CubicBezierShape'
+import { CustomHandles } from './CustomHandles'
+import { SneakyUndoRedoWhileEditing } from './SneakyUndoRedoWhileEditing'
+
+const customShapes: TLAnyShapeUtilConstructor[] = [BezierCurveShapeUtil]
+
+export default function BezierCurveShapeExample() {
+	return (
+		<div className="tldraw__editor">
+			<Tldraw
+				// [9]
+				components={{
+					Handles: CustomHandles,
+				}}
+				shapeUtils={customShapes}
+				onMount={(editor) => {
+					editor.user.updateUserPreferences({ isSnapMode: true })
+
+					const viewportPageBounds = editor.getViewportPageBounds()
+					const centerX = viewportPageBounds.center.x
+					const centerY = viewportPageBounds.center.y
+
+					editor.createShape({
+						type: 'bezier-curve',
+						x: centerX - 200,
+						y: centerY - 150,
+					})
+
+					// [10]
+					// Get state nodes with proper type safety
+					const pointingHandleState = editor.getStateDescendant<StateNode>('select.pointing_handle')
+					const editingShapeState = editor.getStateDescendant<StateNode>('select.editing_shape')
+
+					if (!pointingHandleState) {
+						throw new Error('SelectTool pointing_handle state not found')
+					}
+					if (!editingShapeState) {
+						throw new Error('SelectTool editing_shape state not found')
+					}
+
+					// store original handlers with proper binding
+					const originalHandlers = {
+						pointingHandle: {
+							onPointerMove: pointingHandleState.onPointerMove?.bind(pointingHandleState),
+							onPointerUp: pointingHandleState.onPointerUp?.bind(pointingHandleState),
+						},
+						editingShape: {
+							onPointerDown: editingShapeState.onPointerDown?.bind(editingShapeState),
+							onPointerMove: editingShapeState.onPointerMove?.bind(editingShapeState),
+						},
+					}
+
+					// clicking on start or end point should not go to select.idle
+					pointingHandleState.onPointerUp = (info: TLPointerEventInfo & { target: 'handle' }) => {
+						if (!info.shape) return
+
+						if (
+							info.accelKey &&
+							editor.isShapeOfType(info.shape, 'bezier-curve') &&
+							info.target === 'handle'
+						) {
+							switch (info.handle.id) {
+								case 'cp1': {
+									editor.updateShape({
+										id: info.shape.id,
+										type: 'bezier-curve',
+										props: {
+											cp1: { x: info.shape.props.start.x, y: info.shape.props.start.y },
+										},
+									})
+
+									editor.setEditingShape(info.shape.id)
+									return
+								}
+								case 'cp2': {
+									editor.updateShape({
+										id: info.shape.id,
+										type: 'bezier-curve',
+										props: {
+											cp2: { x: info.shape.props.end.x, y: info.shape.props.end.y },
+										},
+									})
+
+									editor.setEditingShape(info.shape.id)
+									return
+								}
+							}
+						}
+
+						if (editor.isShapeOfType(info.shape, 'bezier-curve') && info.target === 'handle') {
+							editor.setEditingShape(info.shape.id)
+							return
+						}
+
+						originalHandlers.pointingHandle.onPointerUp?.(info)
+					}
+
+					// return to editing state after dragging a handle
+					pointingHandleState.onPointerMove = (info: TLPointerEventInfo) => {
+						if (!info.shape) return
+
+						if (editor.isShapeOfType(info.shape, 'bezier-curve')) {
+							editor.updateInstanceState({ isToolLocked: true })
+							editor.setCurrentTool('select.dragging_handle', {
+								...info,
+								onInteractionEnd: () => {
+									editor.setEditingShape(info.shape.id)
+								},
+							})
+							return
+						}
+
+						originalHandlers.pointingHandle.onPointerMove?.(info)
+					}
+
+					// allow translating in editing state
+					editingShapeState.onPointerMove = (info: TLPointerEventInfo) => {
+						if (editor.inputs.isDragging) {
+							const editingShape = editor.getEditingShape()
+							if (editingShape && editor.isShapeOfType(editingShape, 'bezier-curve')) {
+								editor.updateInstanceState({ isToolLocked: true })
+
+								editor.setCurrentTool('select.translating', {
+									...info,
+									target: 'shape',
+									shape: editingShape,
+									onInteractionEnd: () => {
+										editor.setEditingShape(editingShape.id)
+									},
+								})
+								return
+							}
+						}
+
+						originalHandlers.editingShape.onPointerMove?.(info)
+					}
+				}}
+			>
+				{/* 11 */}
+				<SneakyUndoRedoWhileEditing />
+			</Tldraw>
+		</div>
+	)
+}
+
+/*
+Introduction:
+This example demonstrates how to create a cubic bezier curve shape with interactive handles.
+
+[9]
+Use custom ControlHandles component to show handles for bezier curves when editing, translating, or
+dragging handles.
+
+[10]
+Override state node methods to enable three custom interactions:
+1. Meta + click on cp1/cp2 handles collapses them to their associated start/end points
+2. After dragging any handle, stay in editing mode (instead of returning to select.idle)
+3. Allow translating the curve while in editing mode by detecting drag and transitioning to select.translating
+
+[11]
+Add a sneaky undo/redo while editing. This is a hack to allow undo/redo while editing a shape.
+It's not a perfect solution, but it's a workaround for the fact that tldraw doesn't support
+undo/redo while editing a shape. Sometimes you gotta hack it.
+
+These overrides maintain the editing context, allowing fluid adjustments without losing handle visibility.
+*/
diff --git a/apps/examples/src/examples/cubic-bezier-shape/CustomHandles.tsx b/apps/examples/src/examples/cubic-bezier-shape/CustomHandles.tsx
new file mode 100644
index 000000000000..a92132de613c
--- /dev/null
+++ b/apps/examples/src/examples/cubic-bezier-shape/CustomHandles.tsx
@@ -0,0 +1,40 @@
+import { TLHandlesProps, useEditor, useValue } from 'tldraw'
+
+export function CustomHandles({ children }: TLHandlesProps) {
+	const editor = useEditor()
+
+	const shouldDisplayDefaultHandles = useValue(
+		'shouldDisplayDefaultHandles',
+		() => {
+			// bezier curve handles
+			const onlySelectedShape = editor.getOnlySelectedShape()
+			if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'bezier-curve')) {
+				return editor.isInAny(
+					'select.editing_shape',
+					'select.pointing_handle',
+					'select.dragging_handle'
+				)
+			}
+
+			// default handle behavior
+			if (editor.isInAny('select.idle', 'select.pointing_handle', 'select.pointing_shape')) {
+				return true
+			}
+			if (editor.isInAny('select.editing_shape')) {
+				const onlySelectedShape = editor.getOnlySelectedShape()
+				if (!onlySelectedShape) return false
+				return onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'note')
+			}
+			return false
+		},
+		[editor]
+	)
+
+	if (!shouldDisplayDefaultHandles) return null
+
+	return (
+		<svg className="tl-user-handles tl-overlays__item" aria-hidden="true">
+			{children}
+		</svg>
+	)
+}
diff --git a/apps/examples/src/examples/cubic-bezier-shape/README.md b/apps/examples/src/examples/cubic-bezier-shape/README.md
new file mode 100644
index 000000000000..bb6001c835ba
--- /dev/null
+++ b/apps/examples/src/examples/cubic-bezier-shape/README.md
@@ -0,0 +1,15 @@
+---
+title: Cubic bezier curve shape
+component: ./CubicBezierShapeExample.tsx
+category: shapes/tools
+priority: 1
+keywords: [shape, util, handles, geometry, pen]
+---
+
+A custom shape with interactive bezier curve editing.
+
+---
+
+This example demonstrates how to create a cubic bezier curve shape with draggable control handles. It includes a custom pen tool for entering edit mode and shows how to customize handle behavior and snapping.
+
+The shape features four handles (start, end, and two control points) that can be dragged to adjust the curve. Control points snap to the start and end positions, and moving the endpoints automatically shifts their associated control points to maintain smooth editing.
diff --git a/apps/examples/src/examples/cubic-bezier-shape/SneakyUndoRedoWhileEditing.tsx b/apps/examples/src/examples/cubic-bezier-shape/SneakyUndoRedoWhileEditing.tsx
new file mode 100644
index 000000000000..cd586108fdd8
--- /dev/null
+++ b/apps/examples/src/examples/cubic-bezier-shape/SneakyUndoRedoWhileEditing.tsx
@@ -0,0 +1,30 @@
+import { useEffect } from 'react'
+import { useEditor } from 'tldraw'
+
+export function SneakyUndoRedoWhileEditing() {
+	const editor = useEditor()
+
+	useEffect(() => {
+		function handleKeydown(e: KeyboardEvent) {
+			if (e.key === 'z' && (e.metaKey || e.ctrlKey)) {
+				const editingShape = editor.getEditingShape()
+				if (!editingShape) return
+
+				if (e.shiftKey) {
+					editor.redo()
+					editor.setEditingShape(editingShape)
+				} else {
+					editor.undo()
+					editor.setEditingShape(editingShape)
+				}
+			}
+		}
+
+		window.addEventListener('keydown', handleKeydown)
+		return () => {
+			window.removeEventListener('keydown', handleKeydown)
+		}
+	}, [editor])
+
+	return null
+}
diff --git a/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeTool.tsx b/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeTool.tsx
index 5f6074e9880b..0baeae9fdc21 100644
--- a/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeTool.tsx
+++ b/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeTool.tsx
@@ -1,5 +1,4 @@
 import { StateNode, TLEventHandlers } from 'tldraw'
-import { CircleClipShape } from './CircleClipShapeUtil'
 
 export class CircleClipShapeTool extends StateNode {
 	static override id = 'circle-clip'
@@ -12,7 +11,7 @@ export class CircleClipShapeTool extends StateNode {
 		if (info.target === 'canvas') {
 			const { originPagePoint } = this.editor.inputs
 
-			this.editor.createShape<CircleClipShape>({
+			this.editor.createShape({
 				type: 'circle-clip',
 				x: originPagePoint.x - 100,
 				y: originPagePoint.y - 100,
diff --git a/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeUtil.tsx b/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeUtil.tsx
index 33fb62eff9c8..29dfffcb5df1 100644
--- a/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeUtil.tsx
+++ b/apps/examples/src/examples/custom-clipping-shape/CircleClipShapeUtil.tsx
@@ -5,7 +5,6 @@ import {
 	RecordProps,
 	SVGContainer,
 	T,
-	TLBaseShape,
 	TLResizeInfo,
 	TLShape,
 	Vec,
@@ -14,18 +13,23 @@ import {
 	toDomPrecision,
 } from 'tldraw'
 
-export type CircleClipShape = TLBaseShape<
-	'circle-clip',
-	{
-		w: number
-		h: number
+const CIRCLE_CLIP_TYPE = 'circle-clip'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[CIRCLE_CLIP_TYPE]: {
+			w: number
+			h: number
+		}
 	}
->
+}
+
+export type CircleClipShape = TLShape<typeof CIRCLE_CLIP_TYPE>
 
 export const isClippingEnabled$ = atom('isClippingEnabled', true)
 
 export class CircleClipShapeUtil extends BaseBoxShapeUtil<CircleClipShape> {
-	static override type = 'circle-clip' as const
+	static override type = CIRCLE_CLIP_TYPE
 	static override props: RecordProps<CircleClipShape> = {
 		w: T.number,
 		h: T.number,
diff --git a/apps/examples/src/examples/custom-clipping-shape/CustomClippingExample.tsx b/apps/examples/src/examples/custom-clipping-shape/CustomClippingExample.tsx
index 30d52d337e9d..4dc7f78b1dcf 100644
--- a/apps/examples/src/examples/custom-clipping-shape/CustomClippingExample.tsx
+++ b/apps/examples/src/examples/custom-clipping-shape/CustomClippingExample.tsx
@@ -16,7 +16,7 @@ import {
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 import { CircleClipShapeTool } from './CircleClipShapeTool'
-import { CircleClipShape, CircleClipShapeUtil, isClippingEnabled$ } from './CircleClipShapeUtil'
+import { CircleClipShapeUtil, isClippingEnabled$ } from './CircleClipShapeUtil'
 import './CustomClipping.css'
 
 // There's a guide at the bottom of this file!
@@ -99,7 +99,7 @@ export default function CustomClippingExample() {
 					editor.setCurrentTool('select')
 
 					const clipShapeId = createShapeId()
-					editor.createShape<CircleClipShape>({
+					editor.createShape({
 						id: clipShapeId,
 						type: 'circle-clip',
 						x: 200,
@@ -147,32 +147,32 @@ export default function CustomClippingExample() {
 /*
 Introduction:
 
-This example demonstrates the extensible clipping system in tldraw, showing how to create custom shapes 
-that can clip their children with any polygon geometry. The clipping system uses two key methods: 
+This example demonstrates the extensible clipping system in tldraw, showing how to create custom shapes
+that can clip their children with any polygon geometry. The clipping system uses two key methods:
 `getClipPath` to define the clip boundary and `shouldClipChild` to control which children get clipped.
 
-[1] 
-We define arrays to hold our custom shape util and tool. It's important to do this outside of any React 
+[1]
+We define arrays to hold our custom shape util and tool. It's important to do this outside of any React
 component so that these arrays don't get redefined on every render.
 
 [2]
-Here we define UI overrides to add our custom circle clip tool to the toolbar. The `tools` override 
+Here we define UI overrides to add our custom circle clip tool to the toolbar. The `tools` override
 allows us to add new tools with custom icons, labels, and keyboard shortcuts.
 
 [3]
-The ToggleClippingButton component demonstrates how to create global state management for clipping. 
+The ToggleClippingButton component demonstrates how to create global state management for clipping.
 It uses the `isClippingEnabled$` atom to toggle clipping on/off for all circle clip shapes.
 
 [4]
-The CustomToolbar component shows how to integrate custom tools into the main toolbar. We use 
+The CustomToolbar component shows how to integrate custom tools into the main toolbar. We use
 `useIsToolSelected` to highlight the active tool and `TldrawUiMenuItem` to render the tool button.
 
 [5]
-We define custom components to override the default toolbar and add our toggle button in front of 
+We define custom components to override the default toolbar and add our toggle button in front of
 the canvas. The `components` prop allows us to customize various parts of the tldraw UI.
 
 [6]
-This is where we render the Tldraw component with our custom shape utils, tools, components, and 
+This is where we render the Tldraw component with our custom shape utils, tools, components, and
 overrides. The onMount callback sets up the initial demo content.
 
 For more details on the clipping implementation, see CircleClipShapeUtil.tsx and CircleClipShapeTool.tsx.
diff --git a/apps/examples/src/examples/custom-config/CardShape/CardShapeTool.tsx b/apps/examples/src/examples/custom-config/CardShape/CardShapeTool.tsx
index b361784ad82b..c88c3c032933 100644
--- a/apps/examples/src/examples/custom-config/CardShape/CardShapeTool.tsx
+++ b/apps/examples/src/examples/custom-config/CardShape/CardShapeTool.tsx
@@ -2,7 +2,7 @@ import { BaseBoxShapeTool, TLClickEventInfo } from 'tldraw'
 export class CardShapeTool extends BaseBoxShapeTool {
 	static override id = 'card'
 	static override initial = 'idle'
-	override shapeType = 'card'
+	override shapeType = 'card' as const
 
 	override onDoubleClick(_info: TLClickEventInfo) {
 		// you can handle events in handlers like this one;
@@ -14,7 +14,7 @@ export class CardShapeTool extends BaseBoxShapeTool {
 This file contains our custom tool. The tool is a StateNode with the `id` "card".
 
 We get a lot of functionality for free by extending the BaseBoxShapeTool. but we can
-handle events in out own way by overriding methods like onDoubleClick. For an example 
-of a tool with more custom functionality, check out the screenshot-tool example. 
+handle events in out own way by overriding methods like onDoubleClick. For an example
+of a tool with more custom functionality, check out the screenshot-tool example.
 
 */
diff --git a/apps/examples/src/examples/custom-config/CardShape/CardShapeUtil.tsx b/apps/examples/src/examples/custom-config/CardShape/CardShapeUtil.tsx
index 41bfb2c0992e..50e6bf4d0d3c 100644
--- a/apps/examples/src/examples/custom-config/CardShape/CardShapeUtil.tsx
+++ b/apps/examples/src/examples/custom-config/CardShape/CardShapeUtil.tsx
@@ -3,19 +3,31 @@ import {
 	HTMLContainer,
 	Rectangle2d,
 	ShapeUtil,
+	TLDefaultColorStyle,
 	TLResizeInfo,
+	TLShape,
 	getColorValue,
 	getDefaultColorTheme,
 	resizeBox,
 } from 'tldraw'
 import { cardShapeMigrations } from './card-shape-migrations'
 import { cardShapeProps } from './card-shape-props'
-import { ICardShape } from './card-shape-types'
+
+const CARD_TYPE = 'card'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[CARD_TYPE]: { w: number; h: number; color: TLDefaultColorStyle }
+	}
+}
+
+// A type for our custom card shape
+export type ICardShape = TLShape<typeof CARD_TYPE>
 
 // There's a guide at the bottom of this file!
 
 export class CardShapeUtil extends ShapeUtil<ICardShape> {
-	static override type = 'card' as const
+	static override type = CARD_TYPE
 	// [1]
 	static override props = cardShapeProps
 	// [2]
@@ -92,8 +104,8 @@ export class CardShapeUtil extends ShapeUtil<ICardShape> {
 		return resizeBox(shape, info)
 	}
 }
-/* 
-A utility class for the card shape. This is where you define the shape's behavior, 
+/*
+A utility class for the card shape. This is where you define the shape's behavior,
 how it renders (its component and indicator), and how it handles different events.
 
 [1]
@@ -105,21 +117,21 @@ Migrations for upgrading shapes (optional)
 Check out card-shape-migrations.ts for more info.
 
 [3]
-Letting the editor know if the shape's aspect ratio is locked, and whether it 
-can be resized or bound to other shapes. 
+Letting the editor know if the shape's aspect ratio is locked, and whether it
+can be resized or bound to other shapes.
 
 [4]
 The default props the shape will be rendered with when click-creating one.
 
 [5]
 We use this to calculate the shape's geometry for hit-testing, bindings and
-doing other geometric calculations. 
+doing other geometric calculations.
 
 [6]
-Render method — the React component that will be rendered for the shape. It takes the 
-shape as an argument. HTMLContainer is just a div that's being used to wrap our text 
+Render method — the React component that will be rendered for the shape. It takes the
+shape as an argument. HTMLContainer is just a div that's being used to wrap our text
 and button. We can get the shape's bounds using our own getGeometry method.
-	
+
 - [a] Check it out! We can do normal React stuff here like using setState.
    Annoying: eslint sometimes thinks this is a class component, but it's not.
 
@@ -130,6 +142,6 @@ and button. We can get the shape's bounds using our own getGeometry method.
 Indicator — used when hovering over a shape or when it's selected; must return only SVG elements here
 
 [8]
-Resize handler — called when the shape is resized. Sometimes you'll want to do some 
+Resize handler — called when the shape is resized. Sometimes you'll want to do some
 custom logic here, but for our purposes, this is fine.
 */
diff --git a/apps/examples/src/examples/custom-config/CardShape/card-shape-props.ts b/apps/examples/src/examples/custom-config/CardShape/card-shape-props.ts
index 9f078653b6c9..64dca74839b3 100644
--- a/apps/examples/src/examples/custom-config/CardShape/card-shape-props.ts
+++ b/apps/examples/src/examples/custom-config/CardShape/card-shape-props.ts
@@ -1,5 +1,5 @@
 import { DefaultColorStyle, RecordProps, T } from 'tldraw'
-import { ICardShape } from './card-shape-types'
+import { ICardShape } from './CardShapeUtil'
 
 // Validation for our custom card shape's props, using one of tldraw's default styles
 export const cardShapeProps: RecordProps<ICardShape> = {
diff --git a/apps/examples/src/examples/custom-config/CardShape/card-shape-types.ts b/apps/examples/src/examples/custom-config/CardShape/card-shape-types.ts
deleted file mode 100644
index ea9eee54d572..000000000000
--- a/apps/examples/src/examples/custom-config/CardShape/card-shape-types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { TLBaseShape, TLDefaultColorStyle } from 'tldraw'
-
-// A type for our custom card shape
-export type ICardShape = TLBaseShape<
-	'card',
-	{
-		w: number
-		h: number
-		color: TLDefaultColorStyle
-	}
->
diff --git a/apps/examples/src/examples/custom-error-capture/CustomErrorCaptureExample.tsx b/apps/examples/src/examples/custom-error-capture/CustomErrorCaptureExample.tsx
index b26b2ed370da..f22bb55e7540 100644
--- a/apps/examples/src/examples/custom-error-capture/CustomErrorCaptureExample.tsx
+++ b/apps/examples/src/examples/custom-error-capture/CustomErrorCaptureExample.tsx
@@ -35,6 +35,7 @@ const components: TLEditorComponents = {
 				onClick={() => {
 					// [6]
 					editor.createShape({
+						// @ts-expect-error
 						type: 'does-not-exist',
 					})
 				}}
diff --git a/apps/examples/src/examples/custom-paste/CustomPasteExample.tsx b/apps/examples/src/examples/custom-paste/CustomPasteExample.tsx
index 70b04580e7d4..3210485f132b 100644
--- a/apps/examples/src/examples/custom-paste/CustomPasteExample.tsx
+++ b/apps/examples/src/examples/custom-paste/CustomPasteExample.tsx
@@ -53,7 +53,7 @@ function handleCustomTldrawPaste(editor: Editor, { content, point }: TLTldrawExt
 	// free space to the right of the frame to put this one.
 	editor.putContentOntoCurrentPage(content, { select: true })
 	const newlyPastedFrame = editor.getOnlySelectedShape()
-	if (!newlyPastedFrame || !editor.isShapeOfType<TLFrameShape>(newlyPastedFrame, 'frame')) return
+	if (!newlyPastedFrame || !editor.isShapeOfType(newlyPastedFrame, 'frame')) return
 
 	const siblingIds = editor.getSortedChildIdsForParent(newlyPastedFrame.parentId)
 	const pastedBounds = editor.getShapePageBounds(newlyPastedFrame.id)!
diff --git a/apps/examples/src/examples/custom-relative-snapping/CustomRelativeSnappingExample.tsx b/apps/examples/src/examples/custom-relative-snapping/CustomRelativeSnappingExample.tsx
new file mode 100644
index 000000000000..587a3689f4c3
--- /dev/null
+++ b/apps/examples/src/examples/custom-relative-snapping/CustomRelativeSnappingExample.tsx
@@ -0,0 +1,259 @@
+import {
+	Edge2d,
+	Geometry2d,
+	Group2d,
+	HTMLContainer,
+	RecordProps,
+	ShapeUtil,
+	TLHandle,
+	TLHandleDragInfo,
+	TLShape,
+	Tldraw,
+	Vec,
+	VecLike,
+	ZERO_INDEX_KEY,
+	getIndicesAbove,
+	vecModelValidator,
+} from 'tldraw'
+import 'tldraw/tldraw.css'
+
+const Y_SHAPE_TYPE = 'y-shape'
+
+// [1]
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[Y_SHAPE_TYPE]: {
+			center: VecLike
+			armTop: VecLike
+			armLeft: VecLike
+			armRight: VecLike
+		}
+	}
+}
+
+// [2]
+type YShape = TLShape<typeof Y_SHAPE_TYPE>
+
+// [3]
+class YShapeUtil extends ShapeUtil<YShape> {
+	static override type = Y_SHAPE_TYPE
+	static override props: RecordProps<YShape> = {
+		center: vecModelValidator,
+		armTop: vecModelValidator,
+		armLeft: vecModelValidator,
+		armRight: vecModelValidator,
+	}
+
+	override getDefaultProps(): YShape['props'] {
+		return {
+			center: { x: 100, y: 100 },
+			armTop: { x: 100, y: 180 },
+			armLeft: { x: 30, y: 20 },
+			armRight: { x: 170, y: 20 },
+		}
+	}
+
+	override canEdit(): boolean {
+		return true
+	}
+
+	override hideSelectionBoundsBg(): boolean {
+		return true
+	}
+
+	override hideSelectionBoundsFg(): boolean {
+		return true
+	}
+
+	override hideResizeHandles(): boolean {
+		return true
+	}
+
+	override hideRotateHandle(): boolean {
+		return true
+	}
+
+	// [4]
+	getGeometry(shape: YShape): Geometry2d {
+		const { center, armTop, armLeft, armRight } = shape.props
+		const c = Vec.From(center)
+		const t = Vec.From(armTop)
+		const l = Vec.From(armLeft)
+		const r = Vec.From(armRight)
+
+		return new Group2d({
+			children: [
+				new Edge2d({ start: c, end: t }),
+				new Edge2d({ start: c, end: l }),
+				new Edge2d({ start: c, end: r }),
+			],
+		})
+	}
+
+	// [5]
+	override getHandles(shape: YShape): TLHandle[] {
+		const indices = [ZERO_INDEX_KEY, ...getIndicesAbove(ZERO_INDEX_KEY, 3)]
+
+		return [
+			{
+				id: 'center',
+				type: 'vertex',
+				x: shape.props.center.x,
+				y: shape.props.center.y,
+				index: indices[0],
+			},
+			{
+				id: 'armTop',
+				type: 'vertex',
+				x: shape.props.armTop.x,
+				y: shape.props.armTop.y,
+				index: indices[1],
+				// [6]
+				snapReferenceHandleId: 'center',
+			},
+			{
+				id: 'armLeft',
+				type: 'vertex',
+				x: shape.props.armLeft.x,
+				y: shape.props.armLeft.y,
+				index: indices[2],
+				// [7]
+				snapReferenceHandleId: 'center',
+			},
+			{
+				id: 'armRight',
+				type: 'vertex',
+				x: shape.props.armRight.x,
+				y: shape.props.armRight.y,
+				index: indices[3],
+				// [8]
+				snapReferenceHandleId: 'center',
+			},
+		]
+	}
+
+	override onHandleDrag(shape: YShape, info: TLHandleDragInfo<YShape>) {
+		const { handle } = info
+		return {
+			...shape,
+			props: {
+				...shape.props,
+				[handle.id]: { x: handle.x, y: handle.y },
+			},
+		}
+	}
+
+	// [9]
+	component(shape: YShape) {
+		const { center, armTop, armLeft, armRight } = shape.props
+
+		return (
+			<HTMLContainer>
+				<svg className="tl-svg-container">
+					<line
+						x1={center.x}
+						y1={center.y}
+						x2={armTop.x}
+						y2={armTop.y}
+						stroke="black"
+						strokeWidth={2}
+					/>
+					<line
+						x1={center.x}
+						y1={center.y}
+						x2={armLeft.x}
+						y2={armLeft.y}
+						stroke="black"
+						strokeWidth={2}
+					/>
+					<line
+						x1={center.x}
+						y1={center.y}
+						x2={armRight.x}
+						y2={armRight.y}
+						stroke="black"
+						strokeWidth={2}
+					/>
+				</svg>
+			</HTMLContainer>
+		)
+	}
+
+	indicator(shape: YShape) {
+		const { center, armTop, armLeft, armRight } = shape.props
+		return (
+			<>
+				<line x1={center.x} y1={center.y} x2={armTop.x} y2={armTop.y} />
+				<line x1={center.x} y1={center.y} x2={armLeft.x} y2={armLeft.y} />
+				<line x1={center.x} y1={center.y} x2={armRight.x} y2={armRight.y} />
+			</>
+		)
+	}
+}
+
+const customShapes = [YShapeUtil]
+
+export default function CustomRelativeSnappingYShapeExample() {
+	return (
+		<div className="tldraw__editor">
+			<Tldraw
+				shapeUtils={customShapes}
+				onMount={(editor) => {
+					const viewportPageBounds = editor.getViewportPageBounds()
+					const centerX = viewportPageBounds.center.x
+					const centerY = viewportPageBounds.center.y
+
+					editor.createShape({
+						type: Y_SHAPE_TYPE,
+						x: centerX - 100,
+						y: centerY - 100,
+					})
+
+					const shapeId = editor.getCurrentPageShapeIds().values().next().value
+					if (shapeId) {
+						editor.select(shapeId)
+					}
+				}}
+			/>
+		</div>
+	)
+}
+
+/*
+This example demonstrates the `snapReferenceHandleId` property using a Y-shaped connector.
+
+The shape has three arms radiating from a center junction point:
+- center (junction point)
+- armTop (top arm endpoint)
+- armLeft (bottom-left arm endpoint)
+- armRight (bottom-right arm endpoint)
+
+[1]
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape type with four points representing a Y-shaped connector.
+
+[2]
+Define the shape type using TLShape with the shape's type as a type argument.
+
+[3]
+The shape util with validators for each point.
+
+[4]
+Use Group2d geometry containing three line segments from center to each arm.
+
+[5]
+Four handles in array order: [center, armTop, armLeft, armRight]
+
+[6]
+With `snapReferenceHandleId: 'center'`, when you shift+drag armTop, it will snap to the center point.
+
+[7]
+Similarly, armLeft would snap relative to the center point.
+
+[8]
+And armRight would snap to the center point.
+
+[9]
+The component method defines how our shape renders.
+
+*/
diff --git a/apps/examples/src/examples/custom-relative-snapping/README.md b/apps/examples/src/examples/custom-relative-snapping/README.md
new file mode 100644
index 000000000000..f77f6ec8175c
--- /dev/null
+++ b/apps/examples/src/examples/custom-relative-snapping/README.md
@@ -0,0 +1,13 @@
+---
+title: Custom handle snap reference
+component: ./CustomRelativeSnappingExample.tsx
+category: shapes/tools
+priority: 2
+keywords: [handles, snapping, snap reference]
+---
+
+An example demonstrating `snapReferenceHandleId` for control point angle snapping.
+
+---
+
+This example shows how to use the `snapReferenceHandleId` property to control which handle serves as the reference point for shift-modifier angle snapping.
diff --git a/apps/examples/src/examples/custom-renderer/CustomRenderer.tsx b/apps/examples/src/examples/custom-renderer/CustomRenderer.tsx
index 5143cc7ecc0e..8069034d3112 100644
--- a/apps/examples/src/examples/custom-renderer/CustomRenderer.tsx
+++ b/apps/examples/src/examples/custom-renderer/CustomRenderer.tsx
@@ -1,5 +1,5 @@
 import { useLayoutEffect, useRef } from 'react'
-import { TLDrawShape, TLGeoShape, getColorValue, getDefaultColorTheme, useEditor } from 'tldraw'
+import { getColorValue, getDefaultColorTheme, useEditor } from 'tldraw'
 
 export function CustomRenderer() {
 	const editor = useEditor()
@@ -58,7 +58,7 @@ export function CustomRenderer() {
 				const transform = editor.getShapePageTransform(shape.id)
 				ctx.transform(transform.a, transform.b, transform.c, transform.d, transform.e, transform.f)
 
-				if (editor.isShapeOfType<TLDrawShape>(shape, 'draw')) {
+				if (editor.isShapeOfType(shape, 'draw')) {
 					// Draw a freehand shape
 					for (const segment of shape.props.segments) {
 						ctx.moveTo(segment.points[0].x, segment.points[0].y)
@@ -77,7 +77,7 @@ export function CustomRenderer() {
 						ctx.fillStyle = getColorValue(theme, shape.props.color, 'semi')
 						ctx.fill()
 					}
-				} else if (editor.isShapeOfType<TLGeoShape>(shape, 'geo')) {
+				} else if (editor.isShapeOfType(shape, 'geo')) {
 					// Draw a geo shape
 					const bounds = editor.getShapeGeometry(shape).bounds
 					ctx.strokeStyle = getColorValue(theme, shape.props.color, 'solid')
diff --git a/apps/examples/src/examples/custom-shape/CustomShapeExample.tsx b/apps/examples/src/examples/custom-shape/CustomShapeExample.tsx
index 0e4984194847..0a53cd82d336 100644
--- a/apps/examples/src/examples/custom-shape/CustomShapeExample.tsx
+++ b/apps/examples/src/examples/custom-shape/CustomShapeExample.tsx
@@ -5,8 +5,8 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	T,
-	TLBaseShape,
 	TLResizeInfo,
+	TLShape,
 	Tldraw,
 	resizeBox,
 } from 'tldraw'
@@ -14,20 +14,22 @@ import 'tldraw/tldraw.css'
 
 // There's a guide at the bottom of this file!
 
+const MY_CUSTOM_SHAPE_TYPE = 'my-custom-shape'
+
 // [1]
-type ICustomShape = TLBaseShape<
-	'my-custom-shape',
-	{
-		w: number
-		h: number
-		text: string
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_CUSTOM_SHAPE_TYPE]: { w: number; h: number; text: string }
 	}
->
+}
 
 // [2]
+type ICustomShape = TLShape<typeof MY_CUSTOM_SHAPE_TYPE>
+
+// [3]
 export class MyShapeUtil extends ShapeUtil<ICustomShape> {
 	// [a]
-	static override type = 'my-custom-shape' as const
+	static override type = MY_CUSTOM_SHAPE_TYPE
 	static override props: RecordProps<ICustomShape> = {
 		w: T.number,
 		h: T.number,
@@ -79,7 +81,7 @@ export class MyShapeUtil extends ShapeUtil<ICustomShape> {
 	}
 }
 
-// [3]
+// [4]
 const customShape = [MyShapeUtil]
 
 export default function CustomShapeExample() {
@@ -88,7 +90,7 @@ export default function CustomShapeExample() {
 			<Tldraw
 				shapeUtils={customShape}
 				onMount={(editor) => {
-					editor.createShape({ type: 'my-custom-shape', x: 100, y: 100 })
+					editor.createShape({ type: MY_CUSTOM_SHAPE_TYPE, x: 100, y: 100 })
 				}}
 			/>
 		</div>
@@ -99,29 +101,32 @@ export default function CustomShapeExample() {
 Introduction:
 
 You can create custom shapes in tldraw by creating a shape util and passing it to the Tldraw component.
-In this example, we'll create a custom shape that is a simple rectangle with some text inside of it. 
+In this example, we'll create a custom shape that is a simple rectangle with some text inside of it.
+
+[1]
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties. For this shape, we define width (w), height (h),
+and text as the shape's properties.
 
-[1] 
-Define the shape type. This is a type that extend the `TLBaseShape` generic and defines the shape's 
-props. We need to pass in a unique string literal for the shape's type and an object that defines the
-shape's props.
+[2]
+Define the shape type using TLShape with the shape's type as a type argument.
 
-[2] 
+[3]
 This is our shape util. In tldraw shape utils are classes that define how a shape behaves and renders.
-We can extend the ShapeUtil class and provide the shape type as a generic. If we extended the 
+We can extend the ShapeUtil class and provide the shape type as a generic. If we extended the
 BaseBoxShapeUtil class instead, we wouldn't have define methods such as `getGeometry` and `onResize`.
 
 	[a]
 	This is where we define out shape's props and type for the editor. It's important to use the same
-	string for the type as we did in [1]. We need to define the shape's props using tldraw's validator 
+	string for the type as we did in [2]. We need to define the shape's props using tldraw's validator
 	library. The validator will help make sure the store always has shape data we can trust.
 
 	[b]
 	This is a method that returns the default props for our shape.
 
 	[c]
-	Some handy methods for controlling different shape behaviour. You don't have to define these, and 
-	they're only shown here so you know they exist. Check out the editable shape example to learn more 
+	Some handy methods for controlling different shape behaviour. You don't have to define these, and
+	they're only shown here so you know they exist. Check out the editable shape example to learn more
 	about creating an editable shape.
 
 	[d]
@@ -142,10 +147,10 @@ BaseBoxShapeUtil class instead, we wouldn't have define methods such as `getGeom
 	The indicator is the blue outline around a selected shape. We're just returning a rectangle with the
 	same width and height as the shape here. You can return any valid JSX here.
 
-[3]
+[4]
 This is where we render the Tldraw component with our custom shape. We're passing in our custom shape
-util as an array to the shapeUtils prop. We're also using the onMount callback to create a shape on 
-the canvas. If you want to learn how to add a tool for your shape, check out the custom config example. 
+util as an array to the shapeUtils prop. We're also using the onMount callback to create a shape on
+the canvas. If you want to learn how to add a tool for your shape, check out the custom config example.
 If you want to learn how to programmatically control the canvas, check out the Editor API examples.
 
 */
diff --git a/apps/examples/src/examples/custom-tool/CustomToolExample.tsx b/apps/examples/src/examples/custom-tool/CustomToolExample.tsx
index a3f2ead57040..b39a06096973 100644
--- a/apps/examples/src/examples/custom-tool/CustomToolExample.tsx
+++ b/apps/examples/src/examples/custom-tool/CustomToolExample.tsx
@@ -1,4 +1,4 @@
-import { StateNode, TLTextShape, Tldraw, toRichText } from 'tldraw'
+import { StateNode, Tldraw, toRichText } from 'tldraw'
 import 'tldraw/tldraw.css'
 
 // There's a guide at the bottom of this file!
@@ -17,7 +17,7 @@ class StickerTool extends StateNode {
 	// [b]
 	override onPointerDown() {
 		const { currentPagePoint } = this.editor.inputs
-		this.editor.createShape<TLTextShape>({
+		this.editor.createShape({
 			type: 'text',
 			x: currentPagePoint.x - OFFSET,
 			y: currentPagePoint.y - OFFSET,
@@ -40,7 +40,7 @@ export default function CustomToolExample() {
 				hideUi
 				// Put some helpful text on the canvas
 				onMount={(editor) => {
-					editor.createShape<TLTextShape>({
+					editor.createShape({
 						type: 'text',
 						x: 100,
 						y: 100,
@@ -52,13 +52,13 @@ export default function CustomToolExample() {
 	)
 }
 
-/* 
+/*
 Introduction:
 
-Tools are nodes in tldraw's state machine. They are responsible for handling user input. 
+Tools are nodes in tldraw's state machine. They are responsible for handling user input.
 You can create custom tools by extending the `StateNode` class and overriding its methods.
-In this example we make a very simple sticker tool that adds a heart emoji to the canvas 
-when you click. 
+In this example we make a very simple sticker tool that adds a heart emoji to the canvas
+when you click.
 
 [1]
 We extend the `StateNode` class to create a new tool called `StickerTool`. We set its id
@@ -68,14 +68,14 @@ with child states, check out the screenshot tool or minimal examples.
 
 	[a] The onEnter method is called when the tool is activated. We use it to set the cursor
 		to a crosshair.
-	
+
 	[b] The onPointerDown method is called when the user clicks on the canvas. We use it to
 		create a new shape at the click location. We can get the click location from the
 		editor's inputs.
 
 [2]
 We pass our custom tool to the Tldraw component using the `tools` prop. We also set the
-initial state to our custom tool. We hide the ui and add some helpful text to the canvas 
-using the `onMount` prop. This is not necessary for the tool to work but it helps make the 
+initial state to our custom tool. We hide the ui and add some helpful text to the canvas
+using the `onMount` prop. This is not necessary for the tool to work but it helps make the
 example more visually clear.
 */
diff --git a/apps/examples/src/examples/drag-and-drop-tray/DragAndDropTrayExample.tsx b/apps/examples/src/examples/drag-and-drop-tray/DragAndDropTrayExample.tsx
index 3aefe804cfca..0fae8b5f0207 100644
--- a/apps/examples/src/examples/drag-and-drop-tray/DragAndDropTrayExample.tsx
+++ b/apps/examples/src/examples/drag-and-drop-tray/DragAndDropTrayExample.tsx
@@ -102,10 +102,9 @@ const DragAndDropTray = () => {
 					editor.markHistoryStoppingPoint('create shape from tray')
 
 					editor.createShape({
-						type: current.item.shapeType,
+						...current.item.shapeBase,
 						x: pagePoint.x - 50, // center on cursor at 100x100
 						y: pagePoint.y - 50,
-						props: current.item.shapeProps,
 					})
 
 					dragState.set({
diff --git a/apps/examples/src/examples/drag-and-drop-tray/trayitems.ts b/apps/examples/src/examples/drag-and-drop-tray/trayitems.ts
index f70dd4a28ef1..0889bc439ab8 100644
--- a/apps/examples/src/examples/drag-and-drop-tray/trayitems.ts
+++ b/apps/examples/src/examples/drag-and-drop-tray/trayitems.ts
@@ -1,63 +1,77 @@
 import { TLShape, toRichText } from 'tldraw'
 
 // [1]
-export interface TrayItem<T extends TLShape = TLShape> {
-	id: string
-	emoji: string
-	label: string
-	shapeType: T['type']
-	shapeProps: Partial<T['props']>
-}
+export type TrayItem<T extends TLShape = TLShape> = T extends T
+	? {
+			id: string
+			emoji: string
+			label: string
+			shapeBase: {
+				type: T['type']
+				props: Partial<T['props']>
+			}
+		}
+	: never
 
 export const TRAY_ITEMS: TrayItem<TLShape>[] = [
 	{
 		id: 'snowman',
 		emoji: '⛄',
 		label: 'Snowman',
-		shapeType: 'geo',
-		shapeProps: {
-			richText: toRichText('⛄'),
-			size: 'm',
+		shapeBase: {
+			type: 'geo',
+			props: {
+				richText: toRichText('⛄'),
+				size: 'm',
+			},
 		},
 	},
 	{
 		id: 'ice-cream',
 		emoji: '🍦',
 		label: 'Ice Cream',
-		shapeType: 'geo',
-		shapeProps: {
-			richText: toRichText('🍦'),
-			size: 'm',
+		shapeBase: {
+			type: 'geo',
+			props: {
+				richText: toRichText('🍦'),
+				size: 'm',
+			},
 		},
 	},
 	{
 		id: 'smiley',
 		emoji: '😊',
 		label: 'Smiley',
-		shapeType: 'geo',
-		shapeProps: {
-			richText: toRichText('😊'),
-			size: 'm',
+		shapeBase: {
+			type: 'geo',
+			props: {
+				richText: toRichText('😊'),
+				size: 'm',
+			},
 		},
 	},
 	{
 		id: 'star',
 		emoji: '⭐',
 		label: 'Star',
-		shapeType: 'geo',
-		shapeProps: {
-			richText: toRichText('⭐'),
-			size: 'm',
+		shapeBase: {
+			type: 'geo',
+			props: {
+				richText: toRichText('⭐'),
+				size: 'm',
+			},
 		},
 	},
 	{
 		id: 'heart',
 		emoji: '❤️',
 		label: 'Heart',
-		shapeType: 'geo',
-		shapeProps: {
-			richText: toRichText('❤️'),
-			size: 'm',
+		shapeBase: {
+			type: 'geo',
+			props: {
+				richText: toRichText('❤️'),
+				size: 'm',
+			},
 		},
 	},
 ]
diff --git a/apps/examples/src/examples/drag-and-drop/DragAndDropExample.tsx b/apps/examples/src/examples/drag-and-drop/DragAndDropExample.tsx
index d04c5c117320..122ab2c44004 100644
--- a/apps/examples/src/examples/drag-and-drop/DragAndDropExample.tsx
+++ b/apps/examples/src/examples/drag-and-drop/DragAndDropExample.tsx
@@ -4,21 +4,31 @@ import {
 	HTMLContainer,
 	Rectangle2d,
 	ShapeUtil,
-	TLBaseShape,
 	TLDragShapesOutInfo,
 	TLShape,
 	Tldraw,
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
+const MY_GRID_SHAPE_TYPE = 'my-grid-shape'
+const MY_COUNTER_SHAPE_TYPE = 'my-counter-shape'
+
 // [1]
-type MyGridShape = TLBaseShape<'my-grid-shape', Record<string, never>>
-type MyCounterShape = TLBaseShape<'my-counter-shape', Record<string, never>>
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_GRID_SHAPE_TYPE]: Record<string, never>
+		[MY_COUNTER_SHAPE_TYPE]: Record<string, never>
+	}
+}
 
 // [2]
+type MyGridShape = TLShape<typeof MY_GRID_SHAPE_TYPE>
+type MyCounterShape = TLShape<typeof MY_COUNTER_SHAPE_TYPE>
+
+// [3]
 const SLOT_SIZE = 100
 class MyCounterShapeUtil extends ShapeUtil<MyCounterShape> {
-	static override type = 'my-counter-shape' as const
+	static override type = MY_COUNTER_SHAPE_TYPE
 
 	override canResize() {
 		return false
@@ -52,9 +62,9 @@ class MyCounterShapeUtil extends ShapeUtil<MyCounterShape> {
 	}
 }
 
-// [3]
+// [4]
 class MyGridShapeUtil extends ShapeUtil<MyGridShape> {
-	static override type = 'my-grid-shape' as const
+	static override type = MY_GRID_SHAPE_TYPE
 
 	getDefaultProps(): MyGridShape['props'] {
 		return {}
@@ -139,21 +149,25 @@ export default function DragAndDropExample() {
 
 /*
 [1]
-Define custom shape types using TLBaseShape. Each shape type needs a unique identifier and can have custom 
-properties. Here we use Record<string, never> since our shapes don't need any custom properties. These are 
-very basic custom shapes: see the custom shape examples for more complex examples.
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties. Here we use Record<string, never> since our shapes
+don't need any custom properties. These are very basic custom shapes: see the custom shape examples for
+more complex examples.
 
 [2]
-Create a ShapeUtil for the counter shape. This defines how the shape behaves and renders. We disable resizing 
-and use Circle2d geometry for collision detection. The component renders as a red circle using HTMLContainer.
+Define the shape types using TLShape with each shape's type as a type argument.
 
 [3]
-Create a ShapeUtil for the grid shape. This creates a rectangular grid that can accept dropped shapes. We use 
+Create a ShapeUtil for the counter shape. This defines how the shape behaves and renders. We disable resizing
+and use Circle2d geometry for collision detection. The component renders as a red circle using HTMLContainer.
+
+[4]
+Create a ShapeUtil for the grid shape. This creates a rectangular grid that can accept dropped shapes. We use
 Rectangle2d geometry and render it with CSS grid lines using background gradients.
 
 [5]
 Override onDragShapesIn to handle when shapes are dragged into the grid. We filter for counter shapes that
-aren't already children of this grid, then reparent them to become children. This makes them move with the grid. 
+aren't already children of this grid, then reparent them to become children. This makes them move with the grid.
 
 [6]
 Override onDragShapesOut to handle when shapes are dragged out of the grid. If they're not being dragged to
diff --git a/apps/examples/src/examples/dynamic-tools/DynamicToolsExample.tsx b/apps/examples/src/examples/dynamic-tools/DynamicToolsExample.tsx
new file mode 100644
index 000000000000..37591ab1a7a2
--- /dev/null
+++ b/apps/examples/src/examples/dynamic-tools/DynamicToolsExample.tsx
@@ -0,0 +1,171 @@
+import { useMemo, useState } from 'react'
+import {
+	DefaultToolbar,
+	DefaultToolbarContent,
+	Editor,
+	StateNode,
+	TLComponents,
+	TLTextShape,
+	TLUiAssetUrlOverrides,
+	TLUiOverrides,
+	Tldraw,
+	TldrawUiButton,
+	TldrawUiMenuItem,
+	toRichText,
+	useIsToolSelected,
+	useTools,
+} from 'tldraw'
+import 'tldraw/tldraw.css'
+import './dynamic-tools.css'
+
+// There's a guide at the bottom of this file!
+
+const OFFSET = 12
+
+// [1]
+class HeartTool extends StateNode {
+	static override id = 'heart'
+
+	override onEnter() {
+		this.editor.setCursor({ type: 'cross', rotation: 0 })
+	}
+
+	override onPointerDown() {
+		const { currentPagePoint } = this.editor.inputs
+		this.editor.createShape<TLTextShape>({
+			type: 'text',
+			x: currentPagePoint.x - OFFSET,
+			y: currentPagePoint.y - OFFSET,
+			props: { richText: toRichText('❤️') },
+		})
+	}
+}
+
+// [2]
+const uiOverrides: TLUiOverrides = {
+	tools(editor, tools) {
+		// Create a tool item in the ui's context.
+		tools.heart = {
+			id: 'heart',
+			icon: 'heart-icon',
+			label: 'Heart',
+			kbd: 'r',
+			onSelect: () => {
+				editor.setCurrentTool('heart')
+			},
+		}
+		return tools
+	},
+}
+
+// [3]
+export const customAssetUrls: TLUiAssetUrlOverrides = {
+	icons: {
+		'heart-icon': '/heart-icon.svg',
+	},
+}
+
+// [4]
+export default function DynamicToolsExample() {
+	const [editor, setEditor] = useState<Editor | null>(null)
+	const [isHeartToolEnabled, setIsHeartToolEnabled] = useState(false)
+
+	// [5]
+	const components: TLComponents = useMemo(
+		() => ({
+			Toolbar: (props) => {
+				const tools = useTools()
+				const isHeartSelected = useIsToolSelected(tools['heart'])
+
+				return (
+					<DefaultToolbar {...props}>
+						{isHeartToolEnabled && (
+							<TldrawUiMenuItem {...tools['heart']} isSelected={isHeartSelected} />
+						)}
+						<DefaultToolbarContent />
+					</DefaultToolbar>
+				)
+			},
+			InFrontOfTheCanvas: () => {
+				const toggleHeartTool = () => {
+					if (!editor) return
+					if (isHeartToolEnabled) {
+						// [6]
+						editor.removeTool(HeartTool)
+						// Switch to select tool if we're currently on the heart tool
+						if (editor.getCurrentToolId() === 'heart') {
+							editor.setCurrentTool('select')
+						}
+					} else {
+						// [7]
+						editor.setTool(HeartTool)
+					}
+					setIsHeartToolEnabled(!isHeartToolEnabled)
+				}
+
+				return (
+					<div className="toggle-button-container">
+						<TldrawUiButton onClick={toggleHeartTool} type="normal">
+							{isHeartToolEnabled ? '💔 Remove Heart Tool' : '💖 Add Heart Tool'}
+						</TldrawUiButton>
+					</div>
+				)
+			},
+		}),
+		[editor, isHeartToolEnabled]
+	)
+
+	return (
+		<div className="tldraw__editor">
+			<Tldraw
+				overrides={uiOverrides}
+				components={components}
+				onMount={(editor) => setEditor(editor)}
+				// pass in our custom asset urls
+				assetUrls={customAssetUrls}
+			/>
+		</div>
+	)
+}
+
+/*
+Introduction:
+
+This example demonstrates how to use the `setTool` and `removeTool` methods to dynamically
+add and remove tools from the editor's state chart after initialization. When the tool is
+added, it also appears in the toolbar dynamically. This is useful when you need to 
+conditionally enable or disable tools based on runtime conditions like user permissions, 
+feature flags, or application state.
+
+[1]
+We define a simple HeartTool that extends StateNode. It creates a heart emoji sticker 
+when you click on the canvas. This tool is NOT passed to the Tldraw component initially - 
+it will be added dynamically using setTool.
+
+[2]
+We define UI overrides to add the heart tool to the UI context. This makes it available
+for the toolbar component to reference, even if the tool hasn't been added to the state
+chart yet.
+
+[3]
+We override the Toolbar component to conditionally show the heart tool. The tool only
+appears in the toolbar when it exists in the state chart (isHeartToolEnabled is true).
+This creates a nice dynamic behavior where the toolbar updates when you add/remove the tool.
+
+[4]
+We pass the overrides and components to the Tldraw component. The toggle button will
+appear on top of the canvas, and clicking it will add/remove the heart tool dynamically.
+When added, the tool appears in the toolbar and can be used immediately.
+
+[5]
+We define the components object. We override the Toolbar component to conditionally show the heart tool. The tool only
+appears in the toolbar when it exists in the state chart (isHeartToolEnabled is true).
+This creates a nice dynamic behavior where the toolbar updates when you add/remove the tool.
+
+[6]
+We remove the heart tool from the state chart if it exists, and adds it back if it doesn't.
+
+[7]
+We add the heart tool to the state chart if it doesn't exist.
+
+*/
diff --git a/apps/examples/src/examples/dynamic-tools/README.md b/apps/examples/src/examples/dynamic-tools/README.md
new file mode 100644
index 000000000000..bb3ddaadbb21
--- /dev/null
+++ b/apps/examples/src/examples/dynamic-tools/README.md
@@ -0,0 +1,13 @@
+---
+title: Dynamic tools with setTool and removeTool
+component: ./DynamicToolsExample.tsx
+category: editor-api
+priority: 2
+keywords: [setTool, removeTool, dynamic, tools, state chart, toolbar]
+---
+
+Dynamically add and remove tools from the editor and toolbar after initialization.
+
+---
+
+The `setTool` and `removeTool` methods allow you to add and remove tools from the editor's state chart on demand, after the editor has been initialized. This example shows how to dynamically add a tool that appears in the toolbar when added and disappears when removed. This is useful when you need to conditionally enable or disable tools based on user permissions, feature flags, or other runtime conditions.
diff --git a/apps/examples/src/examples/dynamic-tools/dynamic-tools.css b/apps/examples/src/examples/dynamic-tools/dynamic-tools.css
new file mode 100644
index 000000000000..477408f86112
--- /dev/null
+++ b/apps/examples/src/examples/dynamic-tools/dynamic-tools.css
@@ -0,0 +1,11 @@
+.toggle-button-container {
+	position: absolute;
+	top: 16px;
+	left: 50%;
+	transform: translateX(-50%);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	gap: 8px;
+	pointer-events: auto;
+}
diff --git a/apps/examples/src/examples/easter-egg-styles/EasterEggStylesExample.tsx b/apps/examples/src/examples/easter-egg-styles/EasterEggStylesExample.tsx
new file mode 100644
index 000000000000..de8adc86da59
--- /dev/null
+++ b/apps/examples/src/examples/easter-egg-styles/EasterEggStylesExample.tsx
@@ -0,0 +1,82 @@
+import { Editor, Tldraw, toRichText } from 'tldraw'
+import 'tldraw/tldraw.css'
+
+export default function EasterEggStylesExample() {
+	return (
+		<div className="tldraw__editor">
+			<Tldraw
+				onMount={(editor: Editor) => {
+					editor.createShapes([
+						{
+							type: 'geo',
+							x: 0,
+							y: 0,
+							props: {
+								geo: 'rectangle',
+								w: 250,
+								h: 250,
+								color: 'blue',
+								fill: 'fill', // Easter egg: Fill style (keyboard shortcut: Option+F)
+								richText: toRichText('Fill\n(Option+F)'),
+							},
+						},
+						{
+							type: 'geo',
+							x: 300,
+							y: 0,
+							props: {
+								geo: 'rectangle',
+								w: 250,
+								h: 250,
+								color: 'blue',
+								fill: 'lined-fill', // Easter egg: Lined fill style (keyboard shortcut: Option+Shift+F)
+								richText: toRichText('Lined fill\n(Option+Shift+F)'),
+							},
+						},
+						{
+							type: 'geo',
+							x: 600,
+							y: 0,
+							props: {
+								geo: 'rectangle',
+								w: 250,
+								h: 250,
+								color: 'white', // Easter egg: White color (keyboard shortcut: Option+T)
+								fill: 'fill',
+								richText: toRichText('White \n(Option+T)'),
+							},
+						},
+						{
+							type: 'geo',
+							x: 900,
+							y: 0,
+							props: {
+								geo: 'rectangle',
+								w: 250,
+								h: 250,
+								color: 'blue',
+								richText: toRichText('Label color'),
+								labelColor: 'red', // Separate label color
+							},
+						},
+						{
+							type: 'geo',
+							x: 1200,
+							y: 0,
+							props: {
+								geo: 'rectangle',
+								w: 250,
+								h: 250,
+								color: 'blue',
+								scale: 2.5,
+								richText: toRichText('Scale'), // Scale (available via the Dynamic size preference)
+							},
+						},
+					])
+
+					editor.zoomToFit()
+				}}
+			/>
+		</div>
+	)
+}
diff --git a/apps/examples/src/examples/easter-egg-styles/README.md b/apps/examples/src/examples/easter-egg-styles/README.md
new file mode 100644
index 000000000000..149d729464fb
--- /dev/null
+++ b/apps/examples/src/examples/easter-egg-styles/README.md
@@ -0,0 +1,21 @@
+---
+title: Easter egg styles
+component: ./EasterEggStylesExample.tsx
+category: editor-api
+priority: 5
+keywords: [easter egg, white color, fill styles, labelColor, hidden features]
+---
+
+Use tldraw's collection of easter egg styles programmatically.
+
+---
+
+tldraw includes several "easter egg" styles that aren't visible in the default UI but can be accessed through keyboard shortcuts or set programmatically. These styles include:
+
+- **White** (`Option+T`): A white color option for shapes
+- **Fill** (`Option+F`) - An alternative solid fill variant
+- **Lined fill** (`Option+Shift+F`) - A lined fill pattern variant
+- **Label color** - A separate color property for text labels on shapes, independent from the shape's main color
+- **Scale** - A scale property for shapes, independent from the shape's size, available via the **Dynamic size** preference
+
+This example programmatically creates shapes demonstrating each of these easter egg styles. While these styles aren't publicly exposed in the default UI, they can be useful for specific use cases or when you need more control over styling.
diff --git a/apps/examples/src/examples/editable-shape/EditableShapeUtil.tsx b/apps/examples/src/examples/editable-shape/EditableShapeUtil.tsx
index 089166d8139b..78d83fcaa94e 100644
--- a/apps/examples/src/examples/editable-shape/EditableShapeUtil.tsx
+++ b/apps/examples/src/examples/editable-shape/EditableShapeUtil.tsx
@@ -1,20 +1,25 @@
-import { BaseBoxShapeUtil, HTMLContainer, RecordProps, T, TLBaseShape } from 'tldraw'
+import { BaseBoxShapeUtil, HTMLContainer, RecordProps, T, TLShape } from 'tldraw'
 
 // There's a guide at the bottom of this file!
 
-const ANIMAL_EMOJIS = ['🐶', '🐱', '🐨', '🐮', '🐴']
+const MY_EDITABLE_SHAPE_TYPE = 'my-editable-shape'
 
-type IMyEditableShape = TLBaseShape<
-	'my-editable-shape',
-	{
-		w: number
-		h: number
-		animal: number
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_EDITABLE_SHAPE_TYPE]: {
+			w: number
+			h: number
+			animal: number
+		}
 	}
->
+}
+
+const ANIMAL_EMOJIS = ['🐶', '🐱', '🐨', '🐮', '🐴']
+
+export type IMyEditableShape = TLShape<typeof MY_EDITABLE_SHAPE_TYPE>
 
 export class EditableShapeUtil extends BaseBoxShapeUtil<IMyEditableShape> {
-	static override type = 'my-editable-shape' as const
+	static override type = MY_EDITABLE_SHAPE_TYPE
 	static override props: RecordProps<IMyEditableShape> = {
 		w: T.number,
 		h: T.number,
@@ -89,28 +94,28 @@ export class EditableShapeUtil extends BaseBoxShapeUtil<IMyEditableShape> {
 	}
 }
 
-/* 
+/*
 
-This is our shape util, which defines how our shape renders and behaves. For 
+This is our shape util, which defines how our shape renders and behaves. For
 more information on the shape util, check out the custom shape example.
 
 [1]
 We override the canEdit method to allow the shape to enter the editing state.
 
 [2]
-We want to conditionally render the component based on whether it is being 
+We want to conditionally render the component based on whether it is being
 edited or not.
 
 	[a] We can check whether our shape is being edited by comparing the
 		editing shape id to the shape's id.
-	
+
 	[b] We want to allow pointer events when the shape is being edited,
 		and stop event propagation on pointer down. Check out the interactive
 		shape example for more information on this.
 
 	[c] We render a button to change the animal emoji when the shape is being
-		edited. 
-		
+		edited.
+
 	[e]	We also render a message when the shape is not being edited.
 
 [3]
diff --git a/apps/examples/src/examples/error-boundary/ErrorBoundaryExample.tsx b/apps/examples/src/examples/error-boundary/ErrorBoundaryExample.tsx
index 06b2862b5d25..3efcda5a07e1 100644
--- a/apps/examples/src/examples/error-boundary/ErrorBoundaryExample.tsx
+++ b/apps/examples/src/examples/error-boundary/ErrorBoundaryExample.tsx
@@ -1,6 +1,6 @@
 import { Tldraw } from 'tldraw'
 import 'tldraw/tldraw.css'
-import { ErrorShape, ErrorShapeUtil } from './ErrorShape'
+import { ErrorShapeUtil } from './ErrorShape'
 
 // There's a guide at the bottom of this file!
 
@@ -18,18 +18,18 @@ export default function ErrorBoundaryExample() {
 				}}
 				onMount={(editor) => {
 					// [3]
-					editor.createShape<ErrorShape>({ type: 'error' })
+					editor.createShape({ type: 'error' })
 				}}
 			/>
 		</div>
 	)
 }
 
-/* 
+/*
 This example shows how to customize the error fallback that appears when a shape throws an error. We
 simulate this scenario by creating a shape that always throws an error when it renders.
 
-[1] 
+[1]
 This is the custom shape that always throws an error when it renders. Check out ErrorShape.ts to see
 how it works.
 
@@ -37,6 +37,6 @@ how it works.
 Pass in the custom error fallback component.
 
 [3]
-When the app starts, create our error shape so that we can see the custom error fallback. 
+When the app starts, create our error shape so that we can see the custom error fallback.
 
 */
diff --git a/apps/examples/src/examples/error-boundary/ErrorShape.ts b/apps/examples/src/examples/error-boundary/ErrorShape.ts
index acf17e8d858e..6e9dfb465cab 100644
--- a/apps/examples/src/examples/error-boundary/ErrorShape.ts
+++ b/apps/examples/src/examples/error-boundary/ErrorShape.ts
@@ -1,9 +1,17 @@
-import { BaseBoxShapeUtil, TLBaseShape } from 'tldraw'
+import { BaseBoxShapeUtil, TLShape } from 'tldraw'
 
-export type ErrorShape = TLBaseShape<'error', { w: number; h: number }>
+const ERROR_TYPE = 'error'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[ERROR_TYPE]: { w: number; h: number }
+	}
+}
+
+export type ErrorShape = TLShape<typeof ERROR_TYPE>
 
 export class ErrorShapeUtil extends BaseBoxShapeUtil<ErrorShape> {
-	static override type = 'error' as const
+	static override type = ERROR_TYPE
 	getDefaultProps() {
 		return { w: 100, h: 100 }
 	}
diff --git a/apps/examples/src/examples/exam-marking/ExamScoreLabel.tsx b/apps/examples/src/examples/exam-marking/ExamScoreLabel.tsx
index 4609a43b3532..68a58bddc958 100644
--- a/apps/examples/src/examples/exam-marking/ExamScoreLabel.tsx
+++ b/apps/examples/src/examples/exam-marking/ExamScoreLabel.tsx
@@ -1,5 +1,4 @@
 import { useEditor, useValue } from 'tldraw'
-import { IExamMarkShape } from './add-mark-util'
 
 // [1]
 export function ExamScoreLabel() {
@@ -10,7 +9,7 @@ export function ExamScoreLabel() {
 		() => {
 			let score = 0
 			for (const shape of editor.getCurrentPageShapes()) {
-				if (!editor.isShapeOfType<IExamMarkShape>(shape, 'exam-mark')) continue
+				if (!editor.isShapeOfType(shape, 'exam-mark')) continue
 				score += shape.props.score
 			}
 			return score
diff --git a/apps/examples/src/examples/exam-marking/add-mark-tool.tsx b/apps/examples/src/examples/exam-marking/add-mark-tool.tsx
index e2d55b6d9b6b..74a1fd93ad91 100644
--- a/apps/examples/src/examples/exam-marking/add-mark-tool.tsx
+++ b/apps/examples/src/examples/exam-marking/add-mark-tool.tsx
@@ -1,5 +1,5 @@
 import { StateNode } from 'tldraw'
-import { EXAM_MARK_HEIGHT, EXAM_MARK_WIDTH, IExamMarkShape } from './add-mark-util'
+import { EXAM_MARK_HEIGHT, EXAM_MARK_WIDTH } from './add-mark-util'
 
 // Check out the custom tool example for a more detailed explanation of the StateNode class.
 
@@ -11,7 +11,7 @@ export class MarkingTool extends StateNode {
 	}
 
 	override onPointerUp() {
-		this.editor.createShape<IExamMarkShape>({
+		this.editor.createShape({
 			type: 'exam-mark',
 			x: this.editor.inputs.currentPagePoint.x - EXAM_MARK_WIDTH / 2,
 			y: this.editor.inputs.currentPagePoint.y - EXAM_MARK_HEIGHT / 2,
diff --git a/apps/examples/src/examples/exam-marking/add-mark-util.tsx b/apps/examples/src/examples/exam-marking/add-mark-util.tsx
index e8c6e7fc461c..bd52b91fe6eb 100644
--- a/apps/examples/src/examples/exam-marking/add-mark-util.tsx
+++ b/apps/examples/src/examples/exam-marking/add-mark-util.tsx
@@ -1,22 +1,27 @@
 import { useEffect, useRef, useState } from 'react'
-import { HTMLContainer, RecordProps, Rectangle2d, ShapeUtil, T, TLBaseShape } from 'tldraw'
+import { HTMLContainer, RecordProps, Rectangle2d, ShapeUtil, T, TLShape } from 'tldraw'
 
 export const EXAM_MARK_WIDTH = 80
 export const EXAM_MARK_HEIGHT = 40
 
-export type IExamMarkShape = TLBaseShape<
-	'exam-mark',
-	{
-		score: number
+const EXAM_MARK_TYPE = 'exam-mark'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[EXAM_MARK_TYPE]: {
+			score: number
+		}
 	}
->
+}
+
+export type IExamMarkShape = TLShape<typeof EXAM_MARK_TYPE>
 
 export const examMarkShapeDefaultProps: IExamMarkShape['props'] = {
 	score: 0,
 }
 
 export class ExamMarkUtil extends ShapeUtil<IExamMarkShape> {
-	static override type = 'exam-mark' as const
+	static override type = EXAM_MARK_TYPE
 	static override props: RecordProps<IExamMarkShape> = {
 		score: T.number,
 	}
@@ -63,7 +68,7 @@ export class ExamMarkUtil extends ShapeUtil<IExamMarkShape> {
 			if (!isNaN(num)) {
 				this.editor.updateShape({
 					id: shape.id,
-					type: 'exam-mark',
+					type: EXAM_MARK_TYPE,
 					props: {
 						score: num,
 					},
@@ -131,16 +136,16 @@ export class ExamMarkUtil extends ShapeUtil<IExamMarkShape> {
 	}
 }
 
-/* 
+/*
 A utility class for the exam mark shape. This is where you define the shape's behavior, how it renders (its component and indicator), and how it handles different events. For more details on how to create a custom shape utility, check out the `custom-config` example.
 
 [1] We allow this component to be editable. This gives us some behavior for free, namely double clicking the shape will start editing the shape, which we can access using `editor.getEditingShapeId()`. With this, we can focus the input when the shape is double clicked. See [1][a] and [1][c] for more details.
 
-[2] Render method — the React component that will be rendered for the shape. It takes the shape as an argument. HTMLContainer is just a div that's being used to wrap the input. 
+[2] Render method — the React component that will be rendered for the shape. It takes the shape as an argument. HTMLContainer is just a div that's being used to wrap the input.
 
  - [a] To control behavior, we need to know if the shape is being edited. We can access this using `editor.getEditingShapeId()`.
 
- - [b] The important part of this shape utility is how it handles the score input. We know we want the ExamScoreLabel component to be able to access the score of the shape, so we want the score to be a prop for the shape. 
+ - [b] The important part of this shape utility is how it handles the score input. We know we want the ExamScoreLabel component to be able to access the score of the shape, so we want the score to be a prop for the shape.
  Annoying: eslint sometimes thinks this is a class component, but it's not.
 
  - [c] When the shape is mounted, we set it to be in editing mode.
diff --git a/apps/examples/src/examples/exam-marking/pdf-editor/PdfEditor.tsx b/apps/examples/src/examples/exam-marking/pdf-editor/PdfEditor.tsx
index 5be6a152d497..2f663392eafe 100644
--- a/apps/examples/src/examples/exam-marking/pdf-editor/PdfEditor.tsx
+++ b/apps/examples/src/examples/exam-marking/pdf-editor/PdfEditor.tsx
@@ -15,7 +15,7 @@ import {
 	useEditor,
 } from 'tldraw'
 import { MarkingTool } from '../add-mark-tool'
-import { EXAM_MARK_HEIGHT, EXAM_MARK_WIDTH, ExamMarkUtil, IExamMarkShape } from '../add-mark-util'
+import { EXAM_MARK_HEIGHT, EXAM_MARK_WIDTH, ExamMarkUtil } from '../add-mark-util'
 import { ExamScoreLabel } from '../ExamScoreLabel'
 import { components, uiOverrides } from '../ui-overrides'
 import { ExportPdfButton } from './ExportPdfButton'
@@ -28,7 +28,7 @@ export function PdfEditor({ pdf }: { pdf: Pdf }) {
 	const pdfEditorComponents = useMemo<TLComponents>(
 		() => ({
 			PageMenu: null,
-			InFrontOfTheCanvas: () => <PageOverlayScreen pdf={pdf} />,
+			Overlays: () => <PageOverlayScreen pdf={pdf} />,
 			SharePanel: () => (
 				<div
 					style={{
@@ -61,7 +61,7 @@ export function PdfEditor({ pdf }: { pdf: Pdf }) {
 				if (!selectIdleState) throw Error('SelectTool Idle state not found')
 
 				function customDoubleClickOnCanvasHandler(_info: TLClickEventInfo) {
-					editor.createShape<IExamMarkShape>({
+					editor.createShape({
 						type: 'exam-mark',
 						x: editor.inputs.currentPagePoint.x - EXAM_MARK_WIDTH / 2,
 						y: editor.inputs.currentPagePoint.y - EXAM_MARK_HEIGHT / 2,
@@ -133,8 +133,8 @@ export function PdfEditor({ pdf }: { pdf: Pdf }) {
 					const indexes = getIndicesBetween(undefined, lowestIndex, shapes.length)
 					editor.updateShapes(
 						shapes.map((shape, i) => ({
+							...shape,
 							id: shape.id,
-							type: shape.type,
 							isLocked: shape.isLocked,
 							index: indexes[i],
 						}))
@@ -189,14 +189,11 @@ const PageOverlayScreen = track(function PageOverlayScreen({ pdf }: { pdf: Pdf }
 	const editor = useEditor()
 
 	const viewportPageBounds = editor.getViewportPageBounds()
-	const viewportScreenBounds = editor.getViewportScreenBounds()
 
 	const relevantPageBounds = pdf.pages
 		.map((page) => {
 			if (!viewportPageBounds.collides(page.bounds)) return null
-			const topLeft = editor.pageToViewport(page.bounds)
-			const bottomRight = editor.pageToViewport({ x: page.bounds.maxX, y: page.bounds.maxY })
-			return new Box(topLeft.x, topLeft.y, bottomRight.x - topLeft.x, bottomRight.y - topLeft.y)
+			return page.bounds
 		})
 		.filter((bounds): bounds is Box => bounds !== null)
 
@@ -204,7 +201,7 @@ const PageOverlayScreen = track(function PageOverlayScreen({ pdf }: { pdf: Pdf }
 		return `M ${bounds.x} ${bounds.y} L ${bounds.maxX} ${bounds.y} L ${bounds.maxX} ${bounds.maxY} L ${bounds.x} ${bounds.maxY} Z`
 	}
 
-	const viewportPath = `M 0 0 L ${viewportScreenBounds.w} 0 L ${viewportScreenBounds.w} ${viewportScreenBounds.h} L 0 ${viewportScreenBounds.h} Z`
+	const viewportPath = `M ${viewportPageBounds.x} ${viewportPageBounds.y} L ${viewportPageBounds.maxX} ${viewportPageBounds.y} L ${viewportPageBounds.maxX} ${viewportPageBounds.maxY} L ${viewportPageBounds.x} ${viewportPageBounds.maxY} Z`
 
 	return (
 		<>
diff --git a/apps/examples/src/examples/exam-marking/pdf-editor/pdf-editor.css b/apps/examples/src/examples/exam-marking/pdf-editor/pdf-editor.css
index 2336928bc486..1d69e792fbc7 100644
--- a/apps/examples/src/examples/exam-marking/pdf-editor/pdf-editor.css
+++ b/apps/examples/src/examples/exam-marking/pdf-editor/pdf-editor.css
@@ -34,29 +34,28 @@
 
 .PdfEditor .PageOverlayScreen-screen {
 	pointer-events: none;
-	fill: var(--color-background);
+	fill: var(--tl-color-background);
 	fill-opacity: 0.8;
 	stroke: none;
 }
 .PdfEditor .PageOverlayScreen-outline {
 	position: absolute;
 	pointer-events: none;
-	/* border: 1px solid var(--color-overlay); */
-	box-shadow: var(--shadow-2);
+	box-shadow: var(--tl-shadow-2);
 }
 .PdfEditor .ExportPdfButton {
 	font: inherit;
-	background: var(--color-primary);
+	background: var(--tl-color-primary);
 	border: none;
-	color: var(--color-selected-contrast);
+	color: var(--tl-color-selected-contrast);
 	font-size: 1rem;
 	padding: 0.5rem 1rem;
 	border-radius: 6px;
 	margin: 6px;
 	margin-bottom: 0;
 	pointer-events: all;
-	z-index: var(--layer-panels);
-	border: 2px solid var(--color-background);
+	z-index: var(--tl-layer-panels);
+	border: 2px solid var(--tl-color-background);
 	cursor: pointer;
 }
 .PdfEditor .ExportPdfButton:hover {
diff --git a/apps/examples/src/examples/external-content-sources/ExternalContentSourcesExample.tsx b/apps/examples/src/examples/external-content-sources/ExternalContentSourcesExample.tsx
index 16c21f6f3f74..28f8146ca8d6 100644
--- a/apps/examples/src/examples/external-content-sources/ExternalContentSourcesExample.tsx
+++ b/apps/examples/src/examples/external-content-sources/ExternalContentSourcesExample.tsx
@@ -4,30 +4,30 @@ import {
 	defaultHandleExternalTextContent,
 	Editor,
 	HTMLContainer,
-	TLBaseShape,
 	Tldraw,
+	TLShape,
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
+const DANGEROUS_HTML_TYPE = 'dangerous-html'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[DANGEROUS_HTML_TYPE]: { w: number; h: number; html: string }
+	}
+}
+
 // There's a guide at the bottom of this page!
 
 // [1]
-export type IDangerousHtmlShape = TLBaseShape<
-	'html',
-	{
-		w: number
-		h: number
-		html: string
-	}
->
+export type IDangerousHtmlShape = TLShape<typeof DANGEROUS_HTML_TYPE>
 
 // [2]
 class DangerousHtmlExample extends BaseBoxShapeUtil<IDangerousHtmlShape> {
-	static override type = 'html' as const
+	static override type = DANGEROUS_HTML_TYPE
 
 	override getDefaultProps() {
 		return {
-			type: 'html',
 			w: 500,
 			h: 300,
 			html: '<div>hello</div>',
@@ -61,7 +61,7 @@ export default function ExternalContentSourcesExample() {
 				const center = content.point ?? editor.getViewportPageBounds().center
 
 				editor.createShape({
-					type: 'html',
+					type: 'dangerous-html',
 					x: center.x - 250,
 					y: center.y - 150,
 					props: {
@@ -82,7 +82,7 @@ export default function ExternalContentSourcesExample() {
 	)
 }
 
-/* 
+/*
 Introduction:
 This example shows how to handle content pasted from external sources, this could be
 embeds, files, svgs, text, images, or urls. In this case we will handle text/html content.
@@ -96,11 +96,11 @@ This is our shape util. It's a class that extends BaseBoxShapeUtil. For a more d
 example of how to create a custom shape, see the custom config example.
 
 [3]
-We use the onMount prop to get access to the editor instance via 
-the handleMount callback (check out the API example for a more detailed look at this). Then we 
-call the registerExternalContentHandler method, we could choose to handle embeds, files, svgs, 
+We use the onMount prop to get access to the editor instance via
+the handleMount callback (check out the API example for a more detailed look at this). Then we
+call the registerExternalContentHandler method, we could choose to handle embeds, files, svgs,
 text, images, or urls. For this example we will handle text/html content. The handler is called
-with the point where the user pasted the content and an array of sources. We will find and 
+with the point where the user pasted the content and an array of sources. We will find and
 return the html source, then create a new shape with that html content.
 
 */
diff --git a/apps/examples/src/examples/image-annotator/ImageAnnotationEditor.tsx b/apps/examples/src/examples/image-annotator/ImageAnnotationEditor.tsx
index 7057bd5f3441..98ad830918e1 100644
--- a/apps/examples/src/examples/image-annotator/ImageAnnotationEditor.tsx
+++ b/apps/examples/src/examples/image-annotator/ImageAnnotationEditor.tsx
@@ -52,7 +52,7 @@ export function ImageAnnotationEditor({
 			},
 		])
 		const shapeId = createShapeId()
-		editor.createShape<TLImageShape>({
+		editor.createShape({
 			id: shapeId,
 			type: 'image',
 			x: 0,
diff --git a/apps/examples/src/examples/interaction-end-callback/InteractionEndExample.tsx b/apps/examples/src/examples/interaction-end-callback/InteractionEndExample.tsx
new file mode 100644
index 000000000000..c6c0861c17ab
--- /dev/null
+++ b/apps/examples/src/examples/interaction-end-callback/InteractionEndExample.tsx
@@ -0,0 +1,68 @@
+import { StateNode, TLPointerEventInfo, Tldraw, createShapeId } from 'tldraw'
+import 'tldraw/tldraw.css'
+
+// [1]
+class QuickShapeTool extends StateNode {
+	static override id = 'quick-shape'
+
+	override onEnter() {
+		this.editor.setCursor({ type: 'cross', rotation: 0 })
+	}
+
+	override onPointerDown(info: TLPointerEventInfo) {
+		const { currentPagePoint } = this.editor.inputs
+		const shapeId = createShapeId()
+
+		this.editor.createShape({
+			id: shapeId,
+			type: 'geo',
+			x: currentPagePoint.x - 50,
+			y: currentPagePoint.y - 50,
+			props: { w: 100, h: 100, fill: 'solid' },
+		})
+
+		this.editor.setSelectedShapes([shapeId])
+
+		// [2]
+		this.editor.setCurrentTool('select.translating', {
+			...info,
+			target: 'shape',
+			shape: this.editor.getShape(shapeId),
+			isCreating: true,
+			// [3]
+			onInteractionEnd: () => {
+				// Change fill to semi-transparent after dragging
+				this.editor.updateShape({
+					id: shapeId,
+					type: 'geo',
+					props: { fill: 'pattern' },
+				})
+				// Return to our custom tool
+				this.editor.setCurrentTool('quick-shape')
+			},
+		})
+	}
+}
+
+export default function InteractionEndExample() {
+	return (
+		<div className="tldraw__editor">
+			<Tldraw tools={[QuickShapeTool]} initialState="quick-shape" hideUi />
+		</div>
+	)
+}
+
+/*
+[1]
+Create a simple tool that creates shapes on click. This demonstrates using
+onInteractionEnd to control what happens after the user drags the new shape.
+
+[2]
+After creating the shape, transition to the translating state so the user can
+immediately position it.
+
+[3]
+Pass a function as onInteractionEnd to execute custom logic when dragging ends.
+Here we change the shape's fill style and return to our custom tool. You can also
+pass a string like 'quick-shape' or 'select.idle' to simply transition to that tool.
+*/
diff --git a/apps/examples/src/examples/interaction-end-callback/README.md b/apps/examples/src/examples/interaction-end-callback/README.md
new file mode 100644
index 000000000000..b59937eee048
--- /dev/null
+++ b/apps/examples/src/examples/interaction-end-callback/README.md
@@ -0,0 +1,15 @@
+---
+title: Interaction end callback
+component: ./InteractionEndExample.tsx
+category: editor-api
+priority: 4
+keywords: [callback, interaction, drag, resize, rotate, tool]
+---
+
+Control behavior after dragging, resizing, or rotating shapes.
+
+---
+
+When programmatically starting interactions like translating, resizing, or rotating, you can use the `onInteractionEnd` option to control what happens when the interaction completes. Pass a string to transition to a specific tool, or a function to execute custom logic.
+
+In this example, we set the fill of a shape after we finish translating to be patterned.
diff --git a/apps/examples/src/examples/interactive-shape/my-interactive-shape-util.tsx b/apps/examples/src/examples/interactive-shape/my-interactive-shape-util.tsx
index ec3ecc750ff9..1df51e951351 100644
--- a/apps/examples/src/examples/interactive-shape/my-interactive-shape-util.tsx
+++ b/apps/examples/src/examples/interactive-shape/my-interactive-shape-util.tsx
@@ -1,19 +1,19 @@
-import { BaseBoxShapeUtil, HTMLContainer, RecordProps, T, TLBaseShape } from 'tldraw'
+import { BaseBoxShapeUtil, HTMLContainer, RecordProps, T, TLShape } from 'tldraw'
 
 // There's a guide at the bottom of this file!
 
-type IMyInteractiveShape = TLBaseShape<
-	'my-interactive-shape',
-	{
-		w: number
-		h: number
-		checked: boolean
-		text: string
+const MY_INTERACTIVE_SHAPE_TYPE = 'my-interactive-shape'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_INTERACTIVE_SHAPE_TYPE]: { w: number; h: number; checked: boolean; text: string }
 	}
->
+}
+
+export type IMyInteractiveShape = TLShape<typeof MY_INTERACTIVE_SHAPE_TYPE>
 
 export class myInteractiveShape extends BaseBoxShapeUtil<IMyInteractiveShape> {
-	static override type = 'my-interactive-shape' as const
+	static override type = MY_INTERACTIVE_SHAPE_TYPE
 	static override props: RecordProps<IMyInteractiveShape> = {
 		w: T.number,
 		h: T.number,
@@ -48,9 +48,9 @@ export class myInteractiveShape extends BaseBoxShapeUtil<IMyInteractiveShape> {
 					type="checkbox"
 					checked={shape.props.checked}
 					onChange={() =>
-						this.editor.updateShape<IMyInteractiveShape>({
+						this.editor.updateShape({
 							id: shape.id,
-							type: 'my-interactive-shape',
+							type: MY_INTERACTIVE_SHAPE_TYPE,
 							props: { checked: !shape.props.checked },
 						})
 					}
@@ -65,9 +65,9 @@ export class myInteractiveShape extends BaseBoxShapeUtil<IMyInteractiveShape> {
 					readOnly={shape.props.checked}
 					value={shape.props.text}
 					onChange={(e) =>
-						this.editor.updateShape<IMyInteractiveShape>({
+						this.editor.updateShape({
 							id: shape.id,
-							type: 'my-interactive-shape',
+							type: MY_INTERACTIVE_SHAPE_TYPE,
 							props: { text: e.currentTarget.value },
 						})
 					}
@@ -98,7 +98,7 @@ export class myInteractiveShape extends BaseBoxShapeUtil<IMyInteractiveShape> {
 	}
 }
 
-/* 
+/*
 This is a custom shape, for a more in-depth look at how to create a custom shape,
 see our custom shape example.
 
@@ -107,12 +107,12 @@ This is where we describe how our shape will render
 
 	[a] We need to set pointer-events to all so that we can interact with our shape. This CSS property is
 	set to "none" off by default. We need to manually opt-in to accepting pointer events by setting it to
-	'all' or 'auto'. 
+	'all' or 'auto'.
 
 	[b] We need to stop event propagation so that the editor doesn't select the shape
 		when we click on the checkbox. The 'canvas container' forwards events that it receives
 		on to the editor, so stopping propagation here prevents the event from reaching the canvas.
-	
+
 	[c] If the shape is not checked, we stop event propagation so that the editor doesn't
 		select the shape when we click on the input. If the shape is checked then we allow that event to
 		propagate to the canvas and then get sent to the editor, triggering clicks or drags as usual.
diff --git a/apps/examples/src/examples/layout-bindings/LayoutExample.tsx b/apps/examples/src/examples/layout-bindings/LayoutExample.tsx
index 8e41d19c35e0..e18abf03d800 100644
--- a/apps/examples/src/examples/layout-bindings/LayoutExample.tsx
+++ b/apps/examples/src/examples/layout-bindings/LayoutExample.tsx
@@ -10,8 +10,8 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	T,
-	TLBaseBinding,
-	TLBaseShape,
+	TLBinding,
+	TLShape,
 	Tldraw,
 	Vec,
 	clamp,
@@ -21,14 +21,24 @@ import {
 import 'tldraw/tldraw.css'
 import snapShot from './snapshot.json'
 
+const CONTAINER_TYPE = 'container'
+const ELEMENT_TYPE = 'element'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[CONTAINER_TYPE]: { height: number; width: number }
+		[ELEMENT_TYPE]: { color: string }
+	}
+}
+
 // The container shapes that can contain element shapes
 
 const CONTAINER_PADDING = 24
 
-type ContainerShape = TLBaseShape<'element', { height: number; width: number }>
+type ContainerShape = TLShape<typeof CONTAINER_TYPE>
 
 class ContainerShapeUtil extends ShapeUtil<ContainerShape> {
-	static override type = 'container' as const
+	static override type = CONTAINER_TYPE
 	static override props: RecordProps<ContainerShape> = { height: T.number, width: T.number }
 
 	override getDefaultProps() {
@@ -47,7 +57,7 @@ class ContainerShapeUtil extends ShapeUtil<ContainerShape> {
 		toShapeType: string
 		bindingType: string
 	}) {
-		return fromShapeType === 'container' && toShapeType === 'element' && bindingType === 'layout'
+		return fromShapeType === 'container' && toShapeType === 'element' && bindingType === LAYOUT_TYPE
 	}
 	override canEdit() {
 		return false
@@ -89,10 +99,10 @@ class ContainerShapeUtil extends ShapeUtil<ContainerShape> {
 
 // The element shapes that can be placed inside the container shapes
 
-type ElementShape = TLBaseShape<'element', { color: string }>
+type ElementShape = TLShape<typeof ELEMENT_TYPE>
 
 class ElementShapeUtil extends ShapeUtil<ElementShape> {
-	static override type = 'element' as const
+	static override type = ELEMENT_TYPE
 	static override props: RecordProps<ElementShape> = {
 		color: T.string,
 	}
@@ -112,7 +122,7 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 		toShapeType: string
 		bindingType: string
 	}) {
-		return fromShapeType === 'container' && toShapeType === 'element' && bindingType === 'layout'
+		return fromShapeType === 'container' && toShapeType === 'element' && bindingType === LAYOUT_TYPE
 	}
 	override canEdit() {
 		return false
@@ -148,14 +158,14 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 		return this.editor.getShapeAtPoint(pageAnchor, {
 			hitInside: true,
 			filter: (otherShape) =>
-				this.editor.canBindShapes({ fromShape: otherShape, toShape: shape, binding: 'layout' }),
+				this.editor.canBindShapes({ fromShape: otherShape, toShape: shape, binding: LAYOUT_TYPE }),
 		}) as ContainerShape | undefined
 	}
 
 	getBindingIndexForPosition(shape: ElementShape, container: ContainerShape, pageAnchor: Vec) {
 		// All the layout bindings from the container
 		const allBindings = this.editor
-			.getBindingsFromShape<LayoutBinding>(container, 'layout')
+			.getBindingsFromShape(container, LAYOUT_TYPE)
 			.sort((a, b) => (a.props.index > b.props.index ? 1 : -1))
 
 		// Those bindings that don't involve the element
@@ -188,7 +198,7 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 	override onTranslateStart(shape: ElementShape) {
 		// Update all the layout bindings for this shape to be placeholders
 		this.editor.updateBindings(
-			this.editor.getBindingsToShape<LayoutBinding>(shape, 'layout').map((binding) => ({
+			this.editor.getBindingsToShape(shape, LAYOUT_TYPE).map((binding) => ({
 				...binding,
 				props: { ...binding.props, placeholder: true },
 			}))
@@ -204,7 +214,7 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 
 		if (!targetContainer) {
 			// Delete all the bindings to the element
-			const bindings = this.editor.getBindingsToShape<LayoutBinding>(shape, 'layout')
+			const bindings = this.editor.getBindingsToShape(shape, LAYOUT_TYPE)
 			this.editor.deleteBindings(bindings)
 			return
 		}
@@ -214,13 +224,13 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 
 		// Is there an existing binding already between the container and the shape?
 		const existingBinding = this.editor
-			.getBindingsFromShape<LayoutBinding>(targetContainer, 'layout')
+			.getBindingsFromShape(targetContainer, LAYOUT_TYPE)
 			.find((b) => b.toId === shape.id)
 
 		if (existingBinding) {
 			// If a binding already exists, update it
 			if (existingBinding.props.index === index) return
-			this.editor.updateBinding<LayoutBinding>({
+			this.editor.updateBinding({
 				...existingBinding,
 				props: {
 					...existingBinding.props,
@@ -230,9 +240,9 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 			})
 		} else {
 			// ...otherwise, create a new one
-			this.editor.createBinding<LayoutBinding>({
+			this.editor.createBinding({
 				id: createBindingId(),
-				type: 'layout',
+				type: LAYOUT_TYPE,
 				fromId: targetContainer.id,
 				toId: shape.id,
 				props: {
@@ -257,12 +267,12 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 		const index = this.getBindingIndexForPosition(shape, targetContainer, pageAnchor)
 
 		// delete all the previous bindings for this shape
-		this.editor.deleteBindings(this.editor.getBindingsToShape<LayoutBinding>(shape, 'layout'))
+		this.editor.deleteBindings(this.editor.getBindingsToShape(shape, LAYOUT_TYPE))
 
 		// ...and then create a new one
-		this.editor.createBinding<LayoutBinding>({
+		this.editor.createBinding({
 			id: createBindingId(),
-			type: 'layout',
+			type: LAYOUT_TYPE,
 			fromId: targetContainer.id,
 			toId: shape.id,
 			props: {
@@ -275,16 +285,21 @@ class ElementShapeUtil extends ShapeUtil<ElementShape> {
 
 // The binding between the element shapes and the container shapes
 
-type LayoutBinding = TLBaseBinding<
-	'layout',
-	{
-		index: IndexKey
-		placeholder: boolean
+const LAYOUT_TYPE = 'layout'
+
+declare module 'tldraw' {
+	export interface TLGlobalBindingPropsMap {
+		[LAYOUT_TYPE]: {
+			index: IndexKey
+			placeholder: boolean
+		}
 	}
->
+}
+
+type LayoutBinding = TLBinding<typeof LAYOUT_TYPE>
 
 class LayoutBindingUtil extends BindingUtil<LayoutBinding> {
-	static override type = 'layout' as const
+	static override type = LAYOUT_TYPE
 
 	override getDefaultProps() {
 		return {
@@ -319,7 +334,7 @@ class LayoutBindingUtil extends BindingUtil<LayoutBinding> {
 		if (!container) return
 
 		const bindings = this.editor
-			.getBindingsFromShape<LayoutBinding>(container, 'layout')
+			.getBindingsFromShape(container, LAYOUT_TYPE)
 			.sort((a, b) => (a.props.index > b.props.index ? 1 : -1))
 		if (bindings.length === 0) return
 
diff --git a/apps/examples/src/examples/only-editor/MiniBoxShape.tsx b/apps/examples/src/examples/only-editor/MiniBoxShape.tsx
index c4565a1abc97..112fce60fd4b 100644
--- a/apps/examples/src/examples/only-editor/MiniBoxShape.tsx
+++ b/apps/examples/src/examples/only-editor/MiniBoxShape.tsx
@@ -1,14 +1,23 @@
-import { BaseBoxShapeUtil, HTMLContainer, TLBaseShape } from 'tldraw'
+import { BaseBoxShapeUtil, HTMLContainer, TLShape } from 'tldraw'
 
 // There's a guide at the bottom of this page!
 
+const BOX_TYPE = 'box'
+
 // [1]
-export type MiniBoxShape = TLBaseShape<'box', { w: number; h: number; color: string }>
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[BOX_TYPE]: { w: number; h: number; color: string }
+	}
+}
 
 // [2]
+export type MiniBoxShape = TLShape<typeof BOX_TYPE>
+
+// [3]
 export class MiniBoxShapeUtil extends BaseBoxShapeUtil<MiniBoxShape> {
 	//[a]
-	static override type = 'box'
+	static override type = BOX_TYPE
 	//[b]
 	override getDefaultProps(): MiniBoxShape['props'] {
 		return { w: 100, h: 100, color: '#efefef' }
@@ -35,21 +44,25 @@ export class MiniBoxShapeUtil extends BaseBoxShapeUtil<MiniBoxShape> {
 	}
 }
 
-/* 
+/*
 This is our shape util, in tldraw all shapes extend the shape util class. In this
 example we're extending the built-in BaseBoxShapeUtil class. This class provides
-the functionality for our shape. 
+the functionality for our shape.
 
 [1]
-The type for our shape, we can extend the built-in TLBaseShape generic to create ours.
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties. For this shape, we define width (w), height (h),
+and color as the shape's properties.
 
 [2]
-The shape util itself. 
-	[a] The type of shape this util is for, this should be the same as the first argument
-		to the TLBaseShape generic.
+Define the shape type using TLShape with the shape's type as a type argument.
+
+[3]
+The shape util itself.
+	[a] The type of shape this util is for, this should match the shape type we defined in [2].
 	[b] The default props for our shape. These will be used when creating a new shape.
-	[c] The component for our shape. This returns JSX and is what will be rendered on the 
+	[c] The component for our shape. This returns JSX and is what will be rendered on the
 		canvas. The HtmlContainer component is a div that provides some useful styles.
-	[d] The indicator for our shape, this also returns JSX. This is what will be rendered 
+	[d] The indicator for our shape, this also returns JSX. This is what will be rendered
 		on the canvas when the shape is selected.
 */
diff --git a/apps/examples/src/examples/only-editor/MiniSelectTool.ts b/apps/examples/src/examples/only-editor/MiniSelectTool.ts
index beb25102a799..d72e9bdb3996 100644
--- a/apps/examples/src/examples/only-editor/MiniSelectTool.ts
+++ b/apps/examples/src/examples/only-editor/MiniSelectTool.ts
@@ -1,10 +1,4 @@
-import {
-	StateNode,
-	TLClickEventInfo,
-	TLPointerEventInfo,
-	TLUnknownShape,
-	createShapeId,
-} from 'tldraw'
+import { StateNode, TLClickEventInfo, TLPointerEventInfo, TLShape, createShapeId } from 'tldraw'
 // There's a guide at the bottom of this file!
 
 //[1]
@@ -111,9 +105,9 @@ class PointingState extends StateNode {
 class DraggingState extends StateNode {
 	static override id = 'dragging'
 	//[a]
-	private initialDraggingShapes = [] as TLUnknownShape[]
+	private initialDraggingShapes: TLShape[] = []
 	//[b]
-	override onEnter(info: { shapes: TLUnknownShape[] }) {
+	override onEnter(info: { shapes: TLShape[] }) {
 		this.initialDraggingShapes = info.shapes
 	}
 	//[c]
@@ -139,12 +133,12 @@ class DraggingState extends StateNode {
 
 /*
 This is where we implement our select tool. In tldraw, tools are part of the
-tldraw state chart. Check out the docs for more info: 
+tldraw state chart. Check out the docs for more info:
 https://tldraw.dev/docs/editor#State-Chart
 
 
-Our state node [1] has three children: idle [2], pointing [3], and dragging [4]. 
-Only one child state can be "active" at a time. The parent state's initial active 
+Our state node [1] has three children: idle [2], pointing [3], and dragging [4].
+Only one child state can be "active" at a time. The parent state's initial active
 state is "idle". Certain events received by the child states will cause the parent
 state to transition to another child state, making that state active instead.
 
@@ -152,29 +146,29 @@ Note that when `transition()` is called, the parent state will call the new
 active state(s)'s `onEnter` method with the second argument passed to the
 transition method. This is useful for passing data between states.
 
-[1] 
-This is where we define our state node by extending the StateNode class. We 
+[1]
+This is where we define our state node by extending the StateNode class. We
 give it an id, a list of children states, and its initial active state.
 
 [2]
 The idle state is the tool's default state. This is where most of the action is.
 We have some handy methods available to help us handle events:
-	
+
 	[a] onPointerDown
 		The user clicked on something, let's figure out what it was. We can
 		access the editor via this.editor, and then use it to check if we hit
 		a shape. If we did then we call the onPointerDown method again with the
-		shape as the target, select the shape and transition to the pointing state. 
+		shape as the target, select the shape and transition to the pointing state.
 		Otherwise we deselect everything.
-	
+
 	[b] onDoubleClick
 		The user double clicked on something, let's do the same thing as above.
 		If we hit a shape then we call the onDoubleClick method again with the
 		shape as the target, and delete the shape. Otherwise we create a new shape.
 
 [3]
-The pointing state is something of a transitionary state. Its job is to transition 
-to the dragging state when the user starts dragging, or go back to the idle state 
+The pointing state is something of a transitionary state. Its job is to transition
+to the dragging state when the user starts dragging, or go back to the idle state
 on pointer up.
 
 	[a] onPointerUp
diff --git a/apps/examples/src/examples/pdf-editor/PdfEditor.tsx b/apps/examples/src/examples/pdf-editor/PdfEditor.tsx
index 62045d4cea29..3f483c5bcf08 100644
--- a/apps/examples/src/examples/pdf-editor/PdfEditor.tsx
+++ b/apps/examples/src/examples/pdf-editor/PdfEditor.tsx
@@ -24,7 +24,7 @@ export function PdfEditor({ pdf }: { pdf: Pdf }) {
 	const components = useMemo<TLComponents>(
 		() => ({
 			PageMenu: null,
-			InFrontOfTheCanvas: () => <PageOverlayScreen pdf={pdf} />,
+			Overlays: () => <PageOverlayScreen pdf={pdf} />,
 			SharePanel: () => <ExportPdfButton pdf={pdf} />,
 		}),
 		[pdf]
@@ -95,8 +95,8 @@ export function PdfEditor({ pdf }: { pdf: Pdf }) {
 					const indexes = getIndicesBetween(undefined, lowestIndex, shapes.length)
 					editor.updateShapes(
 						shapes.map((shape, i) => ({
+							...shape,
 							id: shape.id,
-							type: shape.type,
 							isLocked: shape.isLocked,
 							index: indexes[i],
 						}))
@@ -147,14 +147,11 @@ const PageOverlayScreen = track(function PageOverlayScreen({ pdf }: { pdf: Pdf }
 	const editor = useEditor()
 
 	const viewportPageBounds = editor.getViewportPageBounds()
-	const viewportScreenBounds = editor.getViewportScreenBounds()
 
 	const relevantPageBounds = pdf.pages
 		.map((page) => {
 			if (!viewportPageBounds.collides(page.bounds)) return null
-			const topLeft = editor.pageToViewport(page.bounds)
-			const bottomRight = editor.pageToViewport({ x: page.bounds.maxX, y: page.bounds.maxY })
-			return new Box(topLeft.x, topLeft.y, bottomRight.x - topLeft.x, bottomRight.y - topLeft.y)
+			return page.bounds
 		})
 		.filter((bounds): bounds is Box => bounds !== null)
 
@@ -162,7 +159,7 @@ const PageOverlayScreen = track(function PageOverlayScreen({ pdf }: { pdf: Pdf }
 		return `M ${bounds.x} ${bounds.y} L ${bounds.maxX} ${bounds.y} L ${bounds.maxX} ${bounds.maxY} L ${bounds.x} ${bounds.maxY} Z`
 	}
 
-	const viewportPath = `M 0 0 L ${viewportScreenBounds.w} 0 L ${viewportScreenBounds.w} ${viewportScreenBounds.h} L 0 ${viewportScreenBounds.h} Z`
+	const viewportPath = `M ${viewportPageBounds.x} ${viewportPageBounds.y} L ${viewportPageBounds.maxX} ${viewportPageBounds.y} L ${viewportPageBounds.maxX} ${viewportPageBounds.maxY} L ${viewportPageBounds.x} ${viewportPageBounds.maxY} Z`
 
 	return (
 		<>
diff --git a/apps/examples/src/examples/pdf-editor/pdf-editor.css b/apps/examples/src/examples/pdf-editor/pdf-editor.css
index f9ae52a1262a..1d69e792fbc7 100644
--- a/apps/examples/src/examples/pdf-editor/pdf-editor.css
+++ b/apps/examples/src/examples/pdf-editor/pdf-editor.css
@@ -41,7 +41,6 @@
 .PdfEditor .PageOverlayScreen-outline {
 	position: absolute;
 	pointer-events: none;
-	/* border: 1px solid var(--tl-color-overlay); */
 	box-shadow: var(--tl-shadow-2);
 }
 .PdfEditor .ExportPdfButton {
diff --git a/apps/examples/src/examples/permissions-2/PermissionsExample2.tsx b/apps/examples/src/examples/permissions-2/PermissionsExample2.tsx
index aed759e97c2b..ef53b7b5a505 100644
--- a/apps/examples/src/examples/permissions-2/PermissionsExample2.tsx
+++ b/apps/examples/src/examples/permissions-2/PermissionsExample2.tsx
@@ -81,7 +81,7 @@ export default function PermissionsExample() {
 
 					// [5]
 					// Create the constrained rectangle
-					editor.createShape<TLGeoShape>({
+					editor.createShape({
 						type: 'geo',
 						x: 250,
 						y: 200,
diff --git a/apps/examples/src/examples/permissions/PermissionsExample.tsx b/apps/examples/src/examples/permissions/PermissionsExample.tsx
index 2e1247730f0f..2174e76a6800 100644
--- a/apps/examples/src/examples/permissions/PermissionsExample.tsx
+++ b/apps/examples/src/examples/permissions/PermissionsExample.tsx
@@ -56,7 +56,7 @@ export default function PermissionsExample() {
 
 					// [5]
 					// Create the constrained rectangle
-					editor.createShape<TLGeoShape>({
+					editor.createShape({
 						type: 'geo',
 						x: 250,
 						y: 200,
diff --git a/apps/examples/src/examples/pin-bindings/PinExample.tsx b/apps/examples/src/examples/pin-bindings/PinExample.tsx
index a6fd5f0459eb..99d765ead55c 100644
--- a/apps/examples/src/examples/pin-bindings/PinExample.tsx
+++ b/apps/examples/src/examples/pin-bindings/PinExample.tsx
@@ -10,11 +10,12 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	StateNode,
-	TLBaseBinding,
-	TLBaseShape,
+	TLBinding,
 	TLEditorComponents,
 	TLPointerEventInfo,
+	TLShape,
 	TLShapeId,
+	TLShapePartial,
 	TLShapeUtilCanBindOpts,
 	TLUiComponents,
 	TLUiOverrides,
@@ -30,13 +31,20 @@ import {
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
-type PinShape = TLBaseShape<'pin', {}>
+const PIN_TYPE = 'pin'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[PIN_TYPE]: Record<string, never>
+	}
+}
+
+type PinShape = TLShape<typeof PIN_TYPE>
 
 const offsetX = -16
 const offsetY = -26
 class PinShapeUtil extends ShapeUtil<PinShape> {
-	static override type = 'pin' as const
+	static override type = PIN_TYPE
 	static override props: RecordProps<PinShape> = {}
 
 	override getDefaultProps() {
@@ -44,9 +52,9 @@ class PinShapeUtil extends ShapeUtil<PinShape> {
 	}
 
 	override canBind({ toShapeType, bindingType }: TLShapeUtilCanBindOpts<PinShape>) {
-		if (bindingType === 'pin') {
+		if (bindingType === PIN_TYPE) {
 			// pins cannot bind to other pins!
-			return toShapeType !== 'pin'
+			return toShapeType !== PIN_TYPE
 		}
 		// Allow pins to participate in other bindings, e.g. arrows
 		return true
@@ -96,7 +104,7 @@ class PinShapeUtil extends ShapeUtil<PinShape> {
 	}
 
 	override onTranslateStart(shape: PinShape) {
-		const bindings = this.editor.getBindingsFromShape(shape, 'pin')
+		const bindings = this.editor.getBindingsFromShape(shape, PIN_TYPE)
 		this.editor.deleteBindings(bindings)
 	}
 
@@ -107,7 +115,7 @@ class PinShapeUtil extends ShapeUtil<PinShape> {
 			.getShapesAtPoint(pageAnchor, { hitInside: true })
 			.filter(
 				(shape) =>
-					this.editor.canBindShapes({ fromShape: pin, toShape: shape, binding: 'pin' }) &&
+					this.editor.canBindShapes({ fromShape: pin, toShape: shape, binding: PIN_TYPE }) &&
 					shape.parentId === pin.parentId &&
 					shape.index < pin.index
 			)
@@ -122,7 +130,7 @@ class PinShapeUtil extends ShapeUtil<PinShape> {
 			}
 
 			this.editor.createBinding({
-				type: 'pin',
+				type: PIN_TYPE,
 				fromId: pin.id,
 				toId: target.id,
 				props: {
@@ -133,14 +141,18 @@ class PinShapeUtil extends ShapeUtil<PinShape> {
 	}
 }
 
-type PinBinding = TLBaseBinding<
-	'pin',
-	{
-		anchor: VecModel
+declare module 'tldraw' {
+	export interface TLGlobalBindingPropsMap {
+		[PIN_TYPE]: {
+			anchor: VecModel
+		}
 	}
->
+}
+
+type PinBinding = TLBinding<typeof PIN_TYPE>
+
 class PinBindingUtil extends BindingUtil<PinBinding> {
-	static override type = 'pin' as const
+	static override type = PIN_TYPE
 
 	override getDefaultProps() {
 		return {
@@ -177,7 +189,7 @@ class PinBindingUtil extends BindingUtil<PinBinding> {
 			if (allShapes.has(shapeId)) continue
 			allShapes.add(shapeId)
 
-			const bindings = this.editor.getBindingsToShape<PinBinding>(shape, 'pin')
+			const bindings = this.editor.getBindingsToShape(shape, PIN_TYPE)
 			for (const binding of bindings) {
 				if (allShapes.has(binding.fromId)) continue
 				allShapes.add(binding.fromId)
@@ -188,7 +200,7 @@ class PinBindingUtil extends BindingUtil<PinBinding> {
 				const pinPosition = this.editor.getShapePageTransform(pin).applyToPoint({ x: 0, y: 0 })
 				initialPositions.set(pin.id, pinPosition)
 
-				for (const binding of this.editor.getBindingsFromShape<PinBinding>(pin.id, 'pin')) {
+				for (const binding of this.editor.getBindingsFromShape(pin.id, PIN_TYPE)) {
 					const shapeBounds = this.editor.getShapeGeometry(binding.toId)!.bounds
 					const shapeAnchor = {
 						x: lerp(shapeBounds.minX, shapeBounds.maxX, binding.props.anchor.x),
@@ -240,15 +252,15 @@ class PinBindingUtil extends BindingUtil<PinBinding> {
 			}
 		}
 
-		const updates = []
+		const updates: TLShapePartial[] = []
 		for (const [shapeId, position] of currentPositions) {
 			const delta = Vec.Sub(position, initialPositions.get(shapeId)!)
 			if (delta.len2() <= 0.01) continue
 
 			const newPosition = this.editor.getPointInParentSpace(shapeId, position)
 			updates.push({
+				...this.editor.getShape(shapeId)!,
 				id: shapeId,
-				type: this.editor.getShape(shapeId)!.type,
 				x: newPosition.x,
 				y: newPosition.y,
 			})
@@ -273,7 +285,7 @@ class PinBindingUtil extends BindingUtil<PinBinding> {
 }
 
 class PinTool extends StateNode {
-	static override id = 'pin'
+	static override id = PIN_TYPE
 
 	override onEnter() {
 		this.editor.setCursor({ type: 'cross', rotation: 0 })
@@ -285,7 +297,7 @@ class PinTool extends StateNode {
 		this.editor.markHistoryStoppingPoint()
 		this.editor.createShape({
 			id: pinId,
-			type: 'pin',
+			type: PIN_TYPE,
 			x: currentPagePoint.x,
 			y: currentPagePoint.y,
 		})
diff --git a/apps/examples/src/examples/popup-shape/PopupShapeUtil.tsx b/apps/examples/src/examples/popup-shape/PopupShapeUtil.tsx
index ac42a75c6e0e..bcf5d2f5c896 100644
--- a/apps/examples/src/examples/popup-shape/PopupShapeUtil.tsx
+++ b/apps/examples/src/examples/popup-shape/PopupShapeUtil.tsx
@@ -1,18 +1,19 @@
 /* eslint-disable react-hooks/rules-of-hooks */
 import { useEffect, useRef, useState } from 'react'
-import { BaseBoxShapeUtil, HTMLContainer, RecordProps, T, TLBaseShape } from 'tldraw'
+import { BaseBoxShapeUtil, HTMLContainer, RecordProps, T, TLShape } from 'tldraw'
 
-type IMyPopupShape = TLBaseShape<
-	'my-popup-shape',
-	{
-		w: number
-		h: number
-		animal: number
+const MY_POPUP_SHAPE_TYPE = 'my-popup-shape'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_POPUP_SHAPE_TYPE]: { w: number; h: number; animal: number }
 	}
->
+}
+
+export type IMyPopupShape = TLShape<typeof MY_POPUP_SHAPE_TYPE>
 
 export class PopupShapeUtil extends BaseBoxShapeUtil<IMyPopupShape> {
-	static override type = 'my-popup-shape' as const
+	static override type = MY_POPUP_SHAPE_TYPE
 	static override props: RecordProps<IMyPopupShape> = {
 		w: T.number,
 		h: T.number,
diff --git a/apps/examples/src/examples/prevent-shape-change/PreventShapeChangeExample.tsx b/apps/examples/src/examples/prevent-shape-change/PreventShapeChangeExample.tsx
index c183dd009229..136d403876f9 100644
--- a/apps/examples/src/examples/prevent-shape-change/PreventShapeChangeExample.tsx
+++ b/apps/examples/src/examples/prevent-shape-change/PreventShapeChangeExample.tsx
@@ -1,4 +1,4 @@
-import { TLGeoShape, Tldraw, toRichText } from 'tldraw'
+import { Tldraw, toRichText } from 'tldraw'
 import 'tldraw/tldraw.css'
 
 // There's a guide at the bottom of this page!
@@ -8,7 +8,7 @@ export default function PreventMoveExample() {
 		<div className="tldraw__editor">
 			<Tldraw
 				onMount={(editor) => {
-					editor.createShape<TLGeoShape>({
+					editor.createShape({
 						type: 'geo',
 						x: 100,
 						y: 100,
@@ -22,8 +22,8 @@ export default function PreventMoveExample() {
 					// [1]
 					editor.sideEffects.registerBeforeChangeHandler('shape', (prev, next) => {
 						if (
-							editor.isShapeOfType<TLGeoShape>(prev, 'geo') &&
-							editor.isShapeOfType<TLGeoShape>(next, 'geo') &&
+							editor.isShapeOfType(prev, 'geo') &&
+							editor.isShapeOfType(next, 'geo') &&
 							next.props.geo === 'rectangle'
 						) {
 							if (
diff --git a/apps/examples/src/examples/selection-color-condition/SelectionColorConditionExample.tsx b/apps/examples/src/examples/selection-color-condition/SelectionColorConditionExample.tsx
index e306683beada..98a162c184ea 100644
--- a/apps/examples/src/examples/selection-color-condition/SelectionColorConditionExample.tsx
+++ b/apps/examples/src/examples/selection-color-condition/SelectionColorConditionExample.tsx
@@ -1,4 +1,4 @@
-import { TLGeoShape, Tldraw, react } from 'tldraw'
+import { Tldraw, react } from 'tldraw'
 import 'tldraw/tldraw.css'
 
 // There's a guide at the bottom of this file!
@@ -25,8 +25,7 @@ export default function SelectionColorConditionExample() {
 						const allAreRectangles =
 							selectedShapes.length > 0 &&
 							selectedShapes.every(
-								(shape) =>
-									editor.isShapeOfType<TLGeoShape>(shape, 'geo') && shape.props.geo === 'rectangle'
+								(shape) => editor.isShapeOfType(shape, 'geo') && shape.props.geo === 'rectangle'
 							)
 
 						// [4]
@@ -39,13 +38,13 @@ export default function SelectionColorConditionExample() {
 
 					// [5]
 					editor
-						.createShapes<TLGeoShape>([
+						.createShapes([
 							{ type: 'geo', x: 0, y: 0 },
 							{ type: 'geo', x: 120, y: 0 },
 						])
 						.selectAll()
 						.zoomToSelection()
-						.createShape<TLGeoShape>({ type: 'geo', x: 60, y: 120, props: { geo: 'ellipse' } })
+						.createShape({ type: 'geo', x: 60, y: 120, props: { geo: 'ellipse' } })
 
 					return stopListening
 				}}
diff --git a/apps/examples/src/examples/shape-with-custom-styles/ShapeWithCustomStylesExample.tsx b/apps/examples/src/examples/shape-with-custom-styles/ShapeWithCustomStylesExample.tsx
index 0ca0d4c9e680..9efb50239e76 100644
--- a/apps/examples/src/examples/shape-with-custom-styles/ShapeWithCustomStylesExample.tsx
+++ b/apps/examples/src/examples/shape-with-custom-styles/ShapeWithCustomStylesExample.tsx
@@ -5,13 +5,25 @@ import {
 	HTMLContainer,
 	StyleProp,
 	T,
-	TLBaseShape,
 	Tldraw,
+	TLShape,
 	useEditor,
 	useRelevantStyles,
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
+const MY_SHAPE_WITH_CUSTOM_STYLES_TYPE = 'myshapewithcustomstyles'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_SHAPE_WITH_CUSTOM_STYLES_TYPE]: {
+			w: number
+			h: number
+			rating: MyRatingStyle
+		}
+	}
+}
+
 // [1]
 const myRatingStyle = StyleProp.defineEnum('example:rating', {
 	defaultValue: 1,
@@ -21,17 +33,10 @@ const myRatingStyle = StyleProp.defineEnum('example:rating', {
 // [2]
 type MyRatingStyle = T.TypeOf<typeof myRatingStyle>
 
-type IMyShape = TLBaseShape<
-	'myshape',
-	{
-		w: number
-		h: number
-		rating: MyRatingStyle
-	}
->
+type IMyShape = TLShape<typeof MY_SHAPE_WITH_CUSTOM_STYLES_TYPE>
 
 class MyShapeUtil extends BaseBoxShapeUtil<IMyShape> {
-	static override type = 'myshape' as const
+	static override type = MY_SHAPE_WITH_CUSTOM_STYLES_TYPE
 
 	// [3]
 	static override props = {
@@ -115,18 +120,23 @@ export default function ShapeWithTldrawStylesExample() {
 					StylePanel: CustomStylePanel,
 				}}
 				onMount={(editor) => {
-					editor.createShape({ type: 'myshape', x: 100, y: 100 })
+					editor.createShape({ type: 'myshapewithcustomstyles', x: 100, y: 100 })
 					editor.selectAll()
-					editor.createShape({ type: 'myshape', x: 450, y: 250, props: { rating: 5 } })
+					editor.createShape({
+						type: 'myshapewithcustomstyles',
+						x: 450,
+						y: 250,
+						props: { rating: 5 },
+					})
 				}}
 			/>
 		</div>
 	)
 }
 
-/* 
+/*
 
-This file shows a custom shape that uses a user-created styles 
+This file shows a custom shape that uses a user-created styles
 
 For more on custom shapes, see our Custom Shape example.
 
@@ -143,8 +153,8 @@ We pass the style to the shape's props.
 
 [4]
 Since this property uses one a style, whatever value we put here in the
-shape's default props will be overwritten by the editor's current value 
-for that style, which will either be the default value or the most 
+shape's default props will be overwritten by the editor's current value
+for that style, which will either be the default value or the most
 recent value the user has set. This is special behavior just for styles.
 
 [5]
@@ -163,6 +173,6 @@ We pass the custom shape util and custom components in as props.
 [8]
 And for this example, we create two shapes: the first does not specify a
 rating, so it will use the editor's current style value (in this example,
-this will be the style's default value of 4). The second specifies a 
+this will be the style's default value of 4). The second specifies a
 rating of 5, so it will use that value.
 */
diff --git a/apps/examples/src/examples/shape-with-geometry/ShapeWithGeometry.tsx b/apps/examples/src/examples/shape-with-geometry/ShapeWithGeometry.tsx
index 8dfd4e1ce829..050e509bcc81 100644
--- a/apps/examples/src/examples/shape-with-geometry/ShapeWithGeometry.tsx
+++ b/apps/examples/src/examples/shape-with-geometry/ShapeWithGeometry.tsx
@@ -5,8 +5,8 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	T,
-	TLBaseShape,
 	TLResizeInfo,
+	TLShape,
 	Tldraw,
 	Vec,
 	resizeBox,
@@ -14,15 +14,23 @@ import {
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
+const HOUSE_TYPE = 'house'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[HOUSE_TYPE]: HouseShapeProps
+	}
+}
+
 const houseShapeProps = {
 	w: T.number,
 	h: T.number,
 }
 
 type HouseShapeProps = RecordPropsType<typeof houseShapeProps>
-type HouseShape = TLBaseShape<'house', HouseShapeProps>
+type HouseShape = TLShape<typeof HOUSE_TYPE>
 class HouseShapeUtil extends ShapeUtil<HouseShape> {
-	static override type = 'house' as const
+	static override type = HOUSE_TYPE
 	static override props = houseShapeProps
 
 	override canResize() {
@@ -130,19 +138,19 @@ export default function ShapeWithGeometryExample() {
 
 /*
 Introduction:
-This file demonstrates how to create a shape with custom geometry in tldraw. The 
-shape we're creating is a simple house shape with a door. The HouseShapeUtil class 
+This file demonstrates how to create a shape with custom geometry in tldraw. The
+shape we're creating is a simple house shape with a door. The HouseShapeUtil class
 defines the behavior and appearance of our custom house shape.
 
 [1]
 The getGeometry method defines the geometric representation of our shape. This geometry
-is used for hit-testing, intersection checking and other geometric calculations. We use 
-Polygon2d for the house body and Rectangle2d for the door. These are combined into a 
+is used for hit-testing, intersection checking and other geometric calculations. We use
+Polygon2d for the house body and Rectangle2d for the door. These are combined into a
 Group2d to form the complete house geometry.
 
 [2]
-The component method determines how our shape is rendered. We create SVG paths for 
-both the house body and the door, combining them into a single path element. This 
+The component method determines how our shape is rendered. We create SVG paths for
+both the house body and the door, combining them into a single path element. This
 method is called when the shape needs to be drawn on the canvas. The tl-svg-container
 class contains some helpful styles for rendering the svg correctly.
 
@@ -150,8 +158,8 @@ class contains some helpful styles for rendering the svg correctly.
 The indicator method renders the same path as a thin blue line when the shape is selected.
 
 [4]
-The getHouseVertices function calculates the vertices for both the house body and the door 
-based on the shape's dimensions. This is used by both the geometry and rendering methods 
+The getHouseVertices function calculates the vertices for both the house body and the door
+based on the shape's dimensions. This is used by both the geometry and rendering methods
 to ensure consistency in the shape's appearance.
 
 */
diff --git a/apps/examples/src/examples/shape-with-migrations/ShapeWithMigrationsExample.tsx b/apps/examples/src/examples/shape-with-migrations/ShapeWithMigrationsExample.tsx
index 7bccca0eb4c4..58b64a10d57a 100644
--- a/apps/examples/src/examples/shape-with-migrations/ShapeWithMigrationsExample.tsx
+++ b/apps/examples/src/examples/shape-with-migrations/ShapeWithMigrationsExample.tsx
@@ -2,8 +2,8 @@ import {
 	BaseBoxShapeUtil,
 	HTMLContainer,
 	T,
-	TLBaseShape,
 	TLResizeInfo,
+	TLShape,
 	TLStoreSnapshot,
 	Tldraw,
 	createShapePropsMigrationIds,
@@ -13,21 +13,22 @@ import {
 import 'tldraw/tldraw.css'
 import snapshot from './snapshot.json'
 
-// There's a guide at the bottom of this file!
+const MY_SHAPE_WITH_MIGRATIONS_TYPE = 'myshapewithmigrations' as const
 
-export type IMyShape = TLBaseShape<
-	'myshape',
-	{
-		w: number
-		h: number
-		color: string
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_SHAPE_WITH_MIGRATIONS_TYPE]: { w: number; h: number; color: string }
 	}
->
+}
+
+// There's a guide at the bottom of this file!
+
+export type IMyShape = TLShape<typeof MY_SHAPE_WITH_MIGRATIONS_TYPE>
 
 // [1]
 const versions = createShapePropsMigrationIds(
 	// this must match the shape type in the shape definition
-	'myshape',
+	MY_SHAPE_WITH_MIGRATIONS_TYPE,
 	{
 		AddColor: 1,
 	}
@@ -50,7 +51,7 @@ export const cardShapeMigrations = createShapePropsMigrationSequence({
 })
 
 export class MigratedShapeUtil extends BaseBoxShapeUtil<IMyShape> {
-	static override type = 'myshape' as const
+	static override type = MY_SHAPE_WITH_MIGRATIONS_TYPE
 
 	static override props = {
 		w: T.number,
@@ -105,11 +106,11 @@ export default function ShapeWithMigrationsExample() {
 	)
 }
 
-/* 
+/*
 Introduction:
 
 Sometimes you'll want to update the way a shape works in your application without breaking older
-versions of the shape that a user may have stored or persisted in memory. 
+versions of the shape that a user may have stored or persisted in memory.
 
 This example shows how you can use our migrations system to upgrade (or downgrade) user's data
 between different versions. Most of the code above is general "custom shape" code—see our custom
@@ -137,7 +138,7 @@ snapshot's `schema`). When the editor loads a snapshot, it compares its current
 snapshot's schema to determine which migrations to apply to each record.
 
 In this example, we have a snapshot (snapshot.json) that we created in version 0, however our shape
-now has a 'color' prop that was added in version 1. 
+now has a 'color' prop that was added in version 1.
 
 The snapshot looks something like this:
 
@@ -163,7 +164,7 @@ The snapshot looks something like this:
 }
 ```
 
-Note that the shape in the snapshot doesn't have a 'color' prop. 
+Note that the shape in the snapshot doesn't have a 'color' prop.
 
 Note also that the schema's version for this shape is 0.
 
diff --git a/apps/examples/src/examples/shape-with-migrations/snapshot.json b/apps/examples/src/examples/shape-with-migrations/snapshot.json
index e570a1e4d37a..4c812f419303 100644
--- a/apps/examples/src/examples/shape-with-migrations/snapshot.json
+++ b/apps/examples/src/examples/shape-with-migrations/snapshot.json
@@ -22,7 +22,7 @@
 			"opacity": 1,
 			"meta": {},
 			"id": "shape:BqG5uIAa9ig2-ukfnxwBX",
-			"type": "myshape",
+			"type": "myshapewithmigrations",
 			"parentId": "page:page",
 			"index": "a1",
 			"props": {
@@ -77,7 +77,7 @@
 					"embed": 4,
 					"image": 3,
 					"video": 2,
-					"myshape": 0
+					"myshapewithmigrations": 0
 				}
 			},
 			"instance_presence": {
diff --git a/apps/examples/src/examples/shape-with-tldraw-styles/ShapeWithTldrawStylesExample.tsx b/apps/examples/src/examples/shape-with-tldraw-styles/ShapeWithTldrawStylesExample.tsx
index 7e33518140ee..bd5b4dfdecad 100644
--- a/apps/examples/src/examples/shape-with-tldraw-styles/ShapeWithTldrawStylesExample.tsx
+++ b/apps/examples/src/examples/shape-with-tldraw-styles/ShapeWithTldrawStylesExample.tsx
@@ -5,14 +5,27 @@ import {
 	getColorValue,
 	HTMLContainer,
 	T,
-	TLBaseShape,
 	TLDefaultColorStyle,
 	TLDefaultSizeStyle,
 	Tldraw,
+	TLShape,
 	useDefaultColorTheme,
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
+const MY_SHAPE_WITH_TLDRAW_STYLES_TYPE = 'myshapewithtldrawstyles' as const
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_SHAPE_WITH_TLDRAW_STYLES_TYPE]: {
+			w: number
+			h: number
+			size: TLDefaultSizeStyle
+			color: TLDefaultColorStyle
+		}
+	}
+}
+
 // There's a guide at the bottom of this file!
 
 const FONT_SIZES: Record<TLDefaultSizeStyle, number> = {
@@ -22,19 +35,10 @@ const FONT_SIZES: Record<TLDefaultSizeStyle, number> = {
 	xl: 48,
 }
 
-type IMyShape = TLBaseShape<
-	'myshape',
-	{
-		w: number
-		h: number
-		// [1]
-		size: TLDefaultSizeStyle
-		color: TLDefaultColorStyle
-	}
->
+type IMyShape = TLShape<typeof MY_SHAPE_WITH_TLDRAW_STYLES_TYPE>
 
 class MyShapeUtil extends BaseBoxShapeUtil<IMyShape> {
-	static override type = 'myshape' as const
+	static override type = MY_SHAPE_WITH_TLDRAW_STYLES_TYPE
 
 	// [2]
 	static override props = {
@@ -88,16 +92,16 @@ export default function ShapeWithTldrawStylesExample() {
 			<Tldraw
 				shapeUtils={customShapeUtils}
 				onMount={(editor) => {
-					editor.createShape({ type: 'myshape', x: 100, y: 100 })
+					editor.createShape({ type: 'myshapewithtldrawstyles', x: 100, y: 100 })
 				}}
 			/>
 		</div>
 	)
 }
 
-/* 
+/*
 
-This file shows a custom shape that uses tldraw's default styles. 
+This file shows a custom shape that uses tldraw's default styles.
 For more on custom shapes, see our Custom Shape example.
 
 [1]
diff --git a/apps/examples/src/examples/size-from-dom/SizeFromDomExample.tsx b/apps/examples/src/examples/size-from-dom/SizeFromDomExample.tsx
index 29395270fe19..b33f2f93e903 100644
--- a/apps/examples/src/examples/size-from-dom/SizeFromDomExample.tsx
+++ b/apps/examples/src/examples/size-from-dom/SizeFromDomExample.tsx
@@ -7,22 +7,31 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	T,
-	TLBaseShape,
 	Tldraw,
+	TLShape,
 	TLShapeId,
 	useEditor,
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 import { contents } from './contents'
 
+const DYNAMIC_SIZE_TYPE = 'dynamic-size'
+
+// [1]
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[DYNAMIC_SIZE_TYPE]: { contents: string[] }
+	}
+}
+
 // There's a guide at the bottom of this file!
 
 const SHAPE_WIDTH_PX = 150
 
-// [1]
-type DynamicSizeShape = TLBaseShape<'dynamic-size', { contents: string[] }>
-
 // [2]
+type DynamicSizeShape = TLShape<typeof DYNAMIC_SIZE_TYPE>
+
+// [3]
 const ShapeSizes = new EditorAtom('shape sizes', (editor) => {
 	const map = new AtomMap<TLShapeId, { width: number; height: number }>('shape sizes')
 
@@ -34,7 +43,7 @@ const ShapeSizes = new EditorAtom('shape sizes', (editor) => {
 	return map
 })
 
-// [3]
+// [4]
 function useDynamicShapeSize(shape: DynamicSizeShape) {
 	const ref = useRef<HTMLDivElement>(null)
 	const editor = useEditor()
@@ -72,10 +81,10 @@ function useDynamicShapeSize(shape: DynamicSizeShape) {
 	return ref
 }
 
-// [4]
+// [5]
 export class DynamicSizeShapeUtil extends ShapeUtil<DynamicSizeShape> {
 	// [a]
-	static override type = 'dynamic-size' as const
+	static override type = DYNAMIC_SIZE_TYPE
 	static override props: RecordProps<DynamicSizeShape> = {
 		contents: T.arrayOf(T.string),
 	}
@@ -158,7 +167,7 @@ export class DynamicSizeShapeUtil extends ShapeUtil<DynamicSizeShape> {
 	}
 }
 
-// [5]
+// [6]
 const shapeUtils = [DynamicSizeShapeUtil]
 
 export default function SizeFromDomExample() {
@@ -170,8 +179,8 @@ export default function SizeFromDomExample() {
 					editor.selectAll()
 					editor.deleteShapes(editor.getSelectedShapeIds())
 
-					editor.createShape<DynamicSizeShape>({
-						type: 'dynamic-size',
+					editor.createShape({
+						type: DYNAMIC_SIZE_TYPE,
 						x: 100,
 						y: 100,
 					})
@@ -191,51 +200,55 @@ shape props. It showcases two potentially reusable utilities: ShapeSizes and use
 can be adapted for other shapes that need DOM-driven sizing.
 
 [1]
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties.
+
+[2]
 Define the shape type. This shape only stores content data - its size is determined dynamically by
 measuring the DOM element that renders the content.
 
-[2] 
+[3]
 ShapeSizes is a global EditorAtom that stores size information for shapes by their ID. This is the key
 piece that makes DOM-driven sizing work:
-	
+
 	[a] We register a cleanup handler to remove size data when shapes are deleted, preventing memory leaks.
 
-[3]
+[4]
 useDynamicShapeSize is a reusable hook that measures DOM elements and updates the shape size data:
 
 	[a] We measure the actual DOM dimensions using offsetWidth/offsetHeight
-	
+
 	[b] We store these dimensions in our global ShapeSizes atom. The atom will trigger re-renders of
 	    components that depend on this data when the size changes.
-	
+
 	[c] We measure immediately on every render to ensure we have current size data
-	
+
 	[d] We use ResizeObserver to watch for size changes and update accordingly. This is what makes
 	    the shape truly dynamic - it will update whenever the DOM content changes size.
 
-[4]
+[5]
 The shape util defines how our dynamic-size shape behaves:
 
 	[a] Standard shape type and props definition. Note we only store content, not size.
-	
+
 	[b] Default props with some sample content
 
 	[c] Prevent the shape from being culled when it's outside the viewport, which would break our measurements
-	
+
 	[d] Shape behavior: not editable, not resizable (since size comes from DOM), aspect ratio locked
-	
+
 	[e] getGeometry uses the size from our ShapeSizes atom. This is where the DOM-measured size gets
 	    used by the editor for hit-testing, selection bounds, etc.
-	
+
 	[f] The component renders the content and uses our hook to measure it:
-	
+
 		[i] We animate the text content to demonstrate the dynamic sizing in action
-		
+
 		[ii] The ref from useDynamicShapeSize is attached to the DOM element we want to measure
-	
+
 	[g] Standard indicator for selection outline
 
-[5]
+[6]
 Standard setup - pass our custom shape util to Tldraw and create an instance on mount.
 
 Reusability:
diff --git a/apps/examples/src/examples/slides/SlideShapeTool.tsx b/apps/examples/src/examples/slides/SlideShapeTool.tsx
index 530f21956950..3751d53075f1 100644
--- a/apps/examples/src/examples/slides/SlideShapeTool.tsx
+++ b/apps/examples/src/examples/slides/SlideShapeTool.tsx
@@ -3,5 +3,5 @@ import { BaseBoxShapeTool } from 'tldraw'
 export class SlideShapeTool extends BaseBoxShapeTool {
 	static override id = 'slide'
 	static override initial = 'idle'
-	override shapeType = 'slide'
+	override shapeType = 'slide' as const
 }
diff --git a/apps/examples/src/examples/slides/SlideShapeUtil.tsx b/apps/examples/src/examples/slides/SlideShapeUtil.tsx
index 1050ccb5f561..97472794212d 100644
--- a/apps/examples/src/examples/slides/SlideShapeUtil.tsx
+++ b/apps/examples/src/examples/slides/SlideShapeUtil.tsx
@@ -6,24 +6,29 @@ import {
 	SVGContainer,
 	ShapeUtil,
 	T,
-	TLBaseShape,
 	TLResizeInfo,
+	TLShape,
 	getPerfectDashProps,
 	resizeBox,
 	useValue,
 } from 'tldraw'
 import { moveToSlide, useSlides } from './useSlides'
 
-export type SlideShape = TLBaseShape<
-	'slide',
-	{
-		w: number
-		h: number
+const SLIDE_TYPE = 'slide'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[SLIDE_TYPE]: {
+			w: number
+			h: number
+		}
 	}
->
+}
+
+export type SlideShape = TLShape<typeof SLIDE_TYPE>
 
 export class SlideShapeUtil extends ShapeUtil<SlideShape> {
-	static override type = 'slide' as const
+	static override type = SLIDE_TYPE
 	static override props: RecordProps<SlideShape> = {
 		w: T.number,
 		h: T.number,
diff --git a/apps/examples/src/examples/slideshow/SlideShowExample.tsx b/apps/examples/src/examples/slideshow/SlideShowExample.tsx
index 296a732a736f..69eb15e371fb 100644
--- a/apps/examples/src/examples/slideshow/SlideShowExample.tsx
+++ b/apps/examples/src/examples/slideshow/SlideShowExample.tsx
@@ -66,7 +66,7 @@ function InsideSlidesContext() {
 						name = `Slide ${slide.index + 1}`
 					}
 
-					editor.updateShape<TLFrameShape>({
+					editor.updateShape({
 						id: shapeId,
 						type: 'frame',
 						x: slide.index * (SLIDE_SIZE.w + SLIDE_MARGIN),
@@ -75,7 +75,7 @@ function InsideSlidesContext() {
 						},
 					})
 				} else {
-					editor.createShape<TLFrameShape>({
+					editor.createShape({
 						id: shapeId,
 						parentId: editor.getCurrentPageId(),
 						type: 'frame',
@@ -91,7 +91,7 @@ function InsideSlidesContext() {
 			}
 		})
 
-		const unsubs = [] as (() => void)[]
+		const unsubs: (() => void)[] = []
 
 		unsubs.push(
 			editor.sideEffects.registerBeforeChangeHandler('shape', (prev, next) => {
diff --git a/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleTool.tsx b/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleTool.tsx
index 06c6e9778555..e8cf0d1d15b8 100644
--- a/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleTool.tsx
+++ b/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleTool.tsx
@@ -3,13 +3,13 @@ import { BaseBoxShapeTool } from 'tldraw'
 export class SpeechBubbleTool extends BaseBoxShapeTool {
 	static override id = 'speech-bubble'
 	static override initial = 'idle'
-	override shapeType = 'speech-bubble'
+	override shapeType = 'speech-bubble' as const
 }
 
 /*
 This file contains our speech bubble tool. The tool is a StateNode with the `id` "speech-bubble".
 
 We get a lot of functionality for free by extending the BaseBoxShapeTool. For an example of a tool
-with more custom functionality, check out the screenshot-tool example. 
+with more custom functionality, check out the screenshot-tool example.
 
 */
diff --git a/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleUtil.tsx b/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleUtil.tsx
index 6b3f5d402381..ea1afad3d003 100644
--- a/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleUtil.tsx
+++ b/apps/examples/src/examples/speech-bubble/SpeechBubble/SpeechBubbleUtil.tsx
@@ -13,10 +13,10 @@ import {
 	ShapeUtil,
 	T,
 	TEXT_PROPS,
-	TLBaseShape,
 	TLHandle,
 	TLHandleDragInfo,
 	TLResizeInfo,
+	TLShape,
 	Vec,
 	ZERO_INDEX_KEY,
 	getColorValue,
@@ -27,6 +27,15 @@ import {
 } from 'tldraw'
 import { getSpeechBubbleVertices, getTailIntersectionPoint } from './helpers'
 
+const SPEECH_BUBBLE_TYPE = 'speech-bubble'
+
+// [1]
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[SPEECH_BUBBLE_TYPE]: SpeechBubbleShapeProps
+	}
+}
+
 // Copied from tldraw/tldraw
 export const STROKE_SIZES = {
 	s: 2,
@@ -37,8 +46,6 @@ export const STROKE_SIZES = {
 
 // There's a guide at the bottom of this file!
 
-// [1]
-
 export const speechBubbleShapeProps = {
 	w: T.number,
 	h: T.number,
@@ -53,12 +60,13 @@ export const speechBubbleShapeProps = {
 }
 
 export type SpeechBubbleShapeProps = RecordPropsType<typeof speechBubbleShapeProps>
-export type SpeechBubbleShape = TLBaseShape<'speech-bubble', SpeechBubbleShapeProps>
+// [2]
+export type SpeechBubbleShape = TLShape<typeof SPEECH_BUBBLE_TYPE>
 
 export class SpeechBubbleUtil extends ShapeUtil<SpeechBubbleShape> {
-	static override type = 'speech-bubble' as const
+	static override type = SPEECH_BUBBLE_TYPE
 
-	// [2]
+	// [3]
 	static override props = speechBubbleShapeProps
 
 	override isAspectRatioLocked(_shape: SpeechBubbleShape) {
@@ -73,7 +81,7 @@ export class SpeechBubbleUtil extends ShapeUtil<SpeechBubbleShape> {
 		return true
 	}
 
-	// [3]
+	// [4]
 	getDefaultProps(): SpeechBubbleShapeProps {
 		return {
 			w: 200,
@@ -102,7 +110,7 @@ export class SpeechBubbleUtil extends ShapeUtil<SpeechBubbleShape> {
 		return body
 	}
 
-	// [4]
+	// [5]
 	override getHandles(shape: SpeechBubbleShape): TLHandle[] {
 		const { tail, w } = shape.props
 
@@ -136,7 +144,7 @@ export class SpeechBubbleUtil extends ShapeUtil<SpeechBubbleShape> {
 		return this.getGrowY(next, next.props.growY)
 	}
 
-	// [5]
+	// [6]
 	override onBeforeUpdate(prev: SpeechBubbleShape, shape: SpeechBubbleShape) {
 		const { w, tail } = shape.props
 		const fullHeight = this.getHeight(shape)
@@ -263,31 +271,36 @@ export class SpeechBubbleUtil extends ShapeUtil<SpeechBubbleShape> {
 /*
 Introduction: This file contains our custom shape util. The shape util is a class that defines how
 our shape behaves. Most of the logic for how the speech bubble shape works is in the onBeforeUpdate
-handler [5]. Since this shape has a handle, we need to do some special stuff to make sure it updates
+handler [6]. Since this shape has a handle, we need to do some special stuff to make sure it updates
 the way we want it to.
 
 [1]
-Here is where we define the shape's type. For the tail we can use the `VecModel` type from `tldraw`.
+First, we need to extend TLGlobalShapePropsMap to add our shape's props to the global type system.
+This tells TypeScript about the shape's properties. For this shape, we define width (w), height (h),
+size, color, font, alignment, text, and tail (using VecModel) as the shape's properties.
 
 [2]
+Define the shape type using TLShape with the shape's type as a type argument.
+
+[3]
 This is where we define the shape's props and a type validator for each key. tldraw exports a
 bunch of handy validators for us to use. Props you define here will determine which style options
 show up in the style menu, e.g. we define 'size' and 'color' props, but we could add 'dash', 'fill'
 or any other of the default props.
 
-[3]
+[4]
 Here is where we set the default props for our shape, this will determine how the shape looks
 when we click-create it. You'll notice we don't store the tail's absolute position though, instead
 we record its relative position. This is because we can also drag-create shapes. If we store the
 tail's position absolutely it won't scale properly when drag-creating. Throughout the rest of the
 util we'll need to convert the tail's relative position to an absolute position and vice versa.
 
-[4]
+[5]
 `getHandles` tells tldraw how to turn our shape into a list of handles that'll show up when it's
 selected. We only have one handle, the tail, which simplifies things for us a bit. In
 `onHandleDrag`, we tell tldraw how our shape should be updated when the handle is dragged.
 
-[5]
+[6]
 This is the last method that fires after a shape has been changed, we can use it to make sure
 the tail stays the right length and position. Check out helpers.tsx to get into some of the more
 specific geometry stuff.
diff --git a/apps/examples/src/examples/sticker-bindings/StickerExample.tsx b/apps/examples/src/examples/sticker-bindings/StickerExample.tsx
index 7d7f4f92acf1..692e4d092bd2 100644
--- a/apps/examples/src/examples/sticker-bindings/StickerExample.tsx
+++ b/apps/examples/src/examples/sticker-bindings/StickerExample.tsx
@@ -9,9 +9,9 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	StateNode,
-	TLBaseBinding,
-	TLBaseShape,
+	TLBinding,
 	TLPointerEventInfo,
+	TLShape,
 	TLUiComponents,
 	TLUiOverrides,
 	Tldraw,
@@ -25,13 +25,20 @@ import {
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type
-type StickerShape = TLBaseShape<'sticker', {}>
+const STICKER_TYPE = 'sticker'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[STICKER_TYPE]: Record<string, never>
+	}
+}
+
+type StickerShape = TLShape<typeof STICKER_TYPE>
 
 const offsetX = -16
 const offsetY = -26
 class StickerShapeUtil extends ShapeUtil<StickerShape> {
-	static override type = 'sticker' as const
+	static override type = STICKER_TYPE
 	static override props: RecordProps<StickerShape> = {}
 
 	override getDefaultProps() {
@@ -90,7 +97,7 @@ class StickerShapeUtil extends ShapeUtil<StickerShape> {
 	}
 
 	override onTranslateStart(shape: StickerShape) {
-		const bindings = this.editor.getBindingsFromShape(shape, 'sticker')
+		const bindings = this.editor.getBindingsFromShape(shape, STICKER_TYPE)
 		this.editor.deleteBindings(bindings)
 	}
 
@@ -100,7 +107,7 @@ class StickerShapeUtil extends ShapeUtil<StickerShape> {
 			hitInside: true,
 			filter: (shape) =>
 				shape.id !== sticker.id &&
-				this.editor.canBindShapes({ fromShape: sticker, toShape: shape, binding: 'sticker' }),
+				this.editor.canBindShapes({ fromShape: sticker, toShape: shape, binding: STICKER_TYPE }),
 		})
 
 		if (!target) return
@@ -114,7 +121,7 @@ class StickerShapeUtil extends ShapeUtil<StickerShape> {
 		}
 
 		this.editor.createBinding({
-			type: 'sticker',
+			type: STICKER_TYPE,
 			fromId: sticker.id,
 			toId: target.id,
 			props: {
@@ -124,14 +131,18 @@ class StickerShapeUtil extends ShapeUtil<StickerShape> {
 	}
 }
 
-type StickerBinding = TLBaseBinding<
-	'sticker',
-	{
-		anchor: VecModel
+declare module 'tldraw' {
+	export interface TLGlobalBindingPropsMap {
+		[STICKER_TYPE]: {
+			anchor: VecModel
+		}
 	}
->
+}
+
+type StickerBinding = TLBinding<typeof STICKER_TYPE>
+
 class StickerBindingUtil extends BindingUtil<StickerBinding> {
-	static override type = 'sticker' as const
+	static override type = STICKER_TYPE
 
 	override getDefaultProps() {
 		return {
@@ -160,7 +171,7 @@ class StickerBindingUtil extends BindingUtil<StickerBinding> {
 
 		this.editor.updateShape({
 			id: sticker.id,
-			type: 'sticker',
+			type: STICKER_TYPE,
 			x: stickerParentAnchor.x,
 			y: stickerParentAnchor.y,
 		})
@@ -185,7 +196,7 @@ class StickerTool extends StateNode {
 		this.editor.markHistoryStoppingPoint()
 		this.editor.createShape({
 			id: stickerId,
-			type: 'sticker',
+			type: STICKER_TYPE,
 			x: currentPagePoint.x,
 			y: currentPagePoint.y,
 		})
diff --git a/apps/examples/src/examples/sync-custom-shape/CounterShape.tsx b/apps/examples/src/examples/sync-custom-shape/CounterShape.tsx
index 58a040f43477..5b8570728836 100644
--- a/apps/examples/src/examples/sync-custom-shape/CounterShape.tsx
+++ b/apps/examples/src/examples/sync-custom-shape/CounterShape.tsx
@@ -1,10 +1,18 @@
 import { MouseEvent } from 'react'
-import { BaseBoxShapeTool, BaseBoxShapeUtil, HTMLContainer, T, TLBaseShape } from 'tldraw'
+import { BaseBoxShapeTool, BaseBoxShapeUtil, HTMLContainer, T, TLShape } from 'tldraw'
 
-type CounterShape = TLBaseShape<'counter', { w: number; h: number; count: number }>
+const COUNTER_TYPE = 'counter'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[COUNTER_TYPE]: { w: number; h: number; count: number }
+	}
+}
+
+export type CounterShape = TLShape<typeof COUNTER_TYPE>
 
 export class CounterShapeUtil extends BaseBoxShapeUtil<CounterShape> {
-	static override type = 'counter' as const
+	static override type = COUNTER_TYPE
 	static override props = {
 		w: T.positiveNumber,
 		h: T.positiveNumber,
@@ -24,7 +32,7 @@ export class CounterShapeUtil extends BaseBoxShapeUtil<CounterShape> {
 			event.stopPropagation()
 			this.editor.updateShape({
 				id: shape.id,
-				type: 'counter',
+				type: COUNTER_TYPE,
 				props: { count: shape.props.count + change },
 			})
 		}
@@ -58,5 +66,5 @@ export class CounterShapeUtil extends BaseBoxShapeUtil<CounterShape> {
 
 export class CounterShapeTool extends BaseBoxShapeTool {
 	static override id = 'counter'
-	override shapeType = 'counter'
+	override shapeType = 'counter' as const
 }
diff --git a/apps/examples/src/examples/toSvg-method-example/CustomShapeToSvgExample.tsx b/apps/examples/src/examples/toSvg-method-example/CustomShapeToSvgExample.tsx
index cb415239db43..9e305f23ec34 100644
--- a/apps/examples/src/examples/toSvg-method-example/CustomShapeToSvgExample.tsx
+++ b/apps/examples/src/examples/toSvg-method-example/CustomShapeToSvgExample.tsx
@@ -7,26 +7,28 @@ import {
 	ShapeUtil,
 	SvgExportContext,
 	T,
-	TLBaseShape,
 	Tldraw,
+	TLShape,
 } from 'tldraw'
 import 'tldraw/tldraw.css'
 
-// There's a guide at the bottom of this file!
+const MY_CUSTOM_SHAPE_TO_SVG_TYPE = 'my-custom-shape-to-svg'
 
-type ICustomShape = TLBaseShape<
-	'my-custom-shape',
-	{
-		w: number
-		h: number
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[MY_CUSTOM_SHAPE_TO_SVG_TYPE]: { w: number; h: number }
 	}
->
+}
+
+// There's a guide at the bottom of this file!
+
+type ICustomShape = TLShape<typeof MY_CUSTOM_SHAPE_TO_SVG_TYPE>
 
 const LIGHT_FILL = '#ff8888'
 const DARK_FILL = '#ffcccc'
 
 export class MyShapeUtil extends ShapeUtil<ICustomShape> {
-	static override type = 'my-custom-shape' as const
+	static override type = MY_CUSTOM_SHAPE_TO_SVG_TYPE
 	static override props: RecordProps<ICustomShape> = {
 		w: T.number,
 		h: T.number,
@@ -115,7 +117,7 @@ export default function CustomShapeToSvgExample() {
 			<Tldraw
 				shapeUtils={customShape}
 				onMount={(editor) => {
-					editor.createShape({ type: 'my-custom-shape', x: 100, y: 100 })
+					editor.createShape({ type: MY_CUSTOM_SHAPE_TO_SVG_TYPE, x: 100, y: 100 })
 				}}
 			/>
 		</div>
diff --git a/apps/examples/src/examples/tool-with-child-states/ToolWithChildStatesExample.tsx b/apps/examples/src/examples/tool-with-child-states/ToolWithChildStatesExample.tsx
index 2b5af649e283..6ba4f302bdab 100644
--- a/apps/examples/src/examples/tool-with-child-states/ToolWithChildStatesExample.tsx
+++ b/apps/examples/src/examples/tool-with-child-states/ToolWithChildStatesExample.tsx
@@ -49,7 +49,7 @@ class Idle extends StateNode {
 			}
 			case 'shape': {
 				if (editor.inputs.shiftKey) {
-					editor.updateShape<TLTextShape>({
+					editor.updateShape({
 						id: info.shape.id,
 						type: 'text',
 						props: { richText: toRichText('👻 boo!') },
@@ -78,7 +78,7 @@ class Idle extends StateNode {
 					return
 				}
 				const { currentPagePoint } = editor.inputs
-				editor.createShape<TLTextShape>({
+				editor.createShape({
 					type: 'text',
 					x: currentPagePoint.x + OFFSET,
 					y: currentPagePoint.y + OFFSET,
@@ -132,7 +132,7 @@ class Dragging extends StateNode {
 		if (info.shape) {
 			this.shape = info.shape
 		} else {
-			this.editor.createShape<TLTextShape>(newShape)
+			this.editor.createShape(newShape)
 			this.shape = { ...newShape }
 		}
 	}
@@ -147,7 +147,7 @@ class Dragging extends StateNode {
 		const { originPagePoint, currentPagePoint } = this.editor.inputs
 		const distance = originPagePoint.dist(currentPagePoint)
 		if (shape) {
-			this.editor.updateShape<TLTextShape>({
+			this.editor.updateShape({
 				id: shape.id,
 				type: 'text',
 				props: {
@@ -172,7 +172,7 @@ export default function ToolWithChildStatesExample() {
 				hideUi
 				// Put some helpful text on the canvas
 				onMount={(editor) => {
-					editor.createShape<TLTextShape>({
+					editor.createShape({
 						type: 'text',
 						x: 50,
 						y: 50,
@@ -190,12 +190,12 @@ export default function ToolWithChildStatesExample() {
 	)
 }
 
-/* 
+/*
 Introduction:
 
-Tools are nodes in tldraw's state machine. They are responsible for handling user input. 
-You can create custom tools by extending the `StateNode` class and overriding its 
-methods. In this example we expand on the sticker tool from the custom tool example to 
+Tools are nodes in tldraw's state machine. They are responsible for handling user input.
+You can create custom tools by extending the `StateNode` class and overriding its
+methods. In this example we expand on the sticker tool from the custom tool example to
 show how to create a tool that can handle more complex interactions by using child states.
 
 [1]
@@ -207,22 +207,22 @@ child states.
 
 [2]
 This is our Idle state. It is the initial state of the tool. It's job is to figure out
-what the user is trying to do and transition to the appropriate state. When transitioning 
-between states we can use the second argument to pass data to the new state. It has three 
+what the user is trying to do and transition to the appropriate state. When transitioning
+between states we can use the second argument to pass data to the new state. It has three
 methods:
 
-	[a] `onEnter` 
-	When entering any state, the `onEnter` method is called. In this case, we set the cursor to 
+	[a] `onEnter`
+	When entering any state, the `onEnter` method is called. In this case, we set the cursor to
 	a crosshair.
 
 	[b] `onPointerDown`
 	This method is called when the user presses the mouse button. The target parameter is always
-	the canvas, so we can use an editor method to check if we're over a shape, and call the 
+	the canvas, so we can use an editor method to check if we're over a shape, and call the
 	method again with the shape as the target. If we are over a shape, we transition to the
-	`pointing` state with the shape in the info object. If we're over a shape and holding the 
-	shift key, we update the shape's text. If we're over the canvas, we transition to the 
+	`pointing` state with the shape in the info object. If we're over a shape and holding the
+	shift key, we update the shape's text. If we're over the canvas, we transition to the
 	`pointing` state with a null shape in the info object.
-	
+
 	[c] `onDoubleClick`
 	This method is called when the user double clicks the mouse button. We're using some similar
 	logic here to check if we're over a shape, and if we are, we delete it. If we're over the canvas,
@@ -243,18 +243,18 @@ at, and transition to the dragging state if the user starts dragging. It has thr
 	the `dragging` state and pass the shape we're pointing at.
 
 [4]
-This is our `Dragging` state. It's responsible for creating and updating the shape that the user is 
+This is our `Dragging` state. It's responsible for creating and updating the shape that the user is
 dragging.
 
 	[a] `onEnter`
-	When entering this state, we create a new shape if we're not dragging an existing one. If we are, 
+	When entering this state, we create a new shape if we're not dragging an existing one. If we are,
 	we store the shape we're dragging.
 
 	[b] `onPointerUp`
 	This method is called when the user releases the mouse button. We transition to the `idle` state.
 
 	[c] `onPointerMove`
-	This method is called when the user moves the mouse. We use the distance between the origin and 
+	This method is called when the user moves the mouse. We use the distance between the origin and
 	current mouse position to cycle through an array of emojis and update the shape's text.
 
 [5]
diff --git a/apps/examples/src/misc/end-to-end.tsx b/apps/examples/src/misc/end-to-end.tsx
index dcc7fafaf586..d84bbac589e7 100644
--- a/apps/examples/src/misc/end-to-end.tsx
+++ b/apps/examples/src/misc/end-to-end.tsx
@@ -2,9 +2,7 @@ import { getLicenseKey } from '@tldraw/dotcom-shared'
 import { useEffect, useLayoutEffect } from 'react'
 import {
 	BaseBoxShapeUtil,
-	TLArrowShape,
-	TLBaseShape,
-	TLGeoShape,
+	TLShape,
 	Tldraw,
 	createShapeId,
 	exportAs,
@@ -19,9 +17,17 @@ import { EndToEndApi } from './EndToEndApi'
 ;(window as any).__tldraw_ui_event = { id: 'NOTHING_YET' }
 ;(window as any).__tldraw_editor_events = []
 
-type HtmlCssShape = TLBaseShape<'html', { html: string; css: string; w: number; h: number }>
+const HTML_TYPE = 'html' as const
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[HTML_TYPE]: { html: string; css: string; w: number; h: number }
+	}
+}
+
+export type HtmlCssShape = TLShape<typeof HTML_TYPE>
 class HtmlCssShapeUtil extends BaseBoxShapeUtil<HtmlCssShape> {
-	static override type = 'html'
+	static override type = HTML_TYPE
 
 	override getDefaultProps(): { html: string; css: string; w: number; h: number } {
 		return { w: 100, h: 100, html: '', css: '' }
@@ -137,7 +143,7 @@ function SneakyExportButton() {
 			markAllArrowBindings: () => {
 				const markRadius = 3
 				for (const shape of editor.getCurrentPageShapes()) {
-					if (!editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) continue
+					if (!editor.isShapeOfType(shape, 'arrow')) continue
 
 					const info = getArrowInfo(editor, shape)
 					if (!info) continue
@@ -146,7 +152,7 @@ function SneakyExportButton() {
 
 					if (info.bindings.start) {
 						const pagePoint = transform.applyToPoint(info.start.handle)
-						editor.createShape<TLGeoShape>({
+						editor.createShape({
 							type: 'geo',
 							x: pagePoint.x - markRadius,
 							y: pagePoint.y - markRadius,
@@ -164,7 +170,7 @@ function SneakyExportButton() {
 
 					if (info.bindings.end) {
 						const pagePoint = transform.applyToPoint(info.end.handle)
-						editor.createShape<TLGeoShape>({
+						editor.createShape({
 							type: 'geo',
 							x: pagePoint.x - markRadius,
 							y: pagePoint.y - markRadius,
diff --git a/assets/translations/es.json b/assets/translations/es.json
index ad9c97fde810..541768d6d9ad 100644
--- a/assets/translations/es.json
+++ b/assets/translations/es.json
@@ -454,7 +454,7 @@
 	"tool.rectangle": "Rectángulo",
 	"tool.replace-media": "Sustituir contenido multimedia",
 	"tool.rhombus": "Rombo",
-	"tool.rich-text-bold": "Atrevido",
+	"tool.rich-text-bold": "Negrita",
 	"tool.rich-text-bulletList": "Lista con viñetas",
 	"tool.rich-text-code": "Código",
 	"tool.rich-text-header": "Encabezamiento",
diff --git a/assets/translations/ja.json b/assets/translations/ja.json
index ce2221c3ec45..05bb89b9d34c 100644
--- a/assets/translations/ja.json
+++ b/assets/translations/ja.json
@@ -86,7 +86,7 @@
 	"action.remove-frame": "フレームを削除",
 	"action.rename": "名前を変更",
 	"action.rotate-ccw": "反時計回りに回転",
-	"action.rotate-cw": "時計回りに回転 ",
+	"action.rotate-cw": "時計回りに回転",
 	"action.save-copy": "コピーを保存",
 	"action.select-all": "すべて選択",
 	"action.select-none": "選択を解除",
@@ -254,7 +254,7 @@
 	"geo-style.cloud": "くも",
 	"geo-style.diamond": "菱形",
 	"geo-style.ellipse": "楕円形",
-	"geo-style.heart": "心臓",
+	"geo-style.heart": "ハート",
 	"geo-style.hexagon": "六角形",
 	"geo-style.octagon": "八角形",
 	"geo-style.oval": "楕円",
@@ -433,7 +433,7 @@
 	"tool.flip-vert": "垂直方向に反転",
 	"tool.frame": "フレーム",
 	"tool.hand": "手",
-	"tool.heart": "心臓",
+	"tool.heart": "ハート",
 	"tool.hexagon": "六角形",
 	"tool.highlight": "ハイライト",
 	"tool.image-crop": "画像をクロップ",
@@ -446,7 +446,7 @@
 	"tool.media-alt-text": "代替テキスト",
 	"tool.media-alt-text-confirm": "確定",
 	"tool.media-alt-text-desc": "説明を記入してください...",
-	"tool.note": "ふせん",
+	"tool.note": "付箋",
 	"tool.octagon": "八角形",
 	"tool.oval": "楕円",
 	"tool.pentagon": "五角形",
diff --git a/assets/translations/main.json b/assets/translations/main.json
index 6ad3a565fb5f..1cb6168969c1 100644
--- a/assets/translations/main.json
+++ b/assets/translations/main.json
@@ -150,6 +150,7 @@
 	"fill-style.solid": "Solid",
 	"fill-style.pattern": "Pattern",
 	"fill-style.fill": "Fill",
+	"fill-style.lined-fill": "Lined fill",
 	"dash-style.dashed": "Dashed",
 	"dash-style.dotted": "Dotted",
 	"dash-style.draw": "Draw",
diff --git a/internal/config/vitest/setup.ts b/internal/config/vitest/setup.ts
index 750de49a434e..56e6f6d4b563 100644
--- a/internal/config/vitest/setup.ts
+++ b/internal/config/vitest/setup.ts
@@ -50,6 +50,14 @@ if (typeof HTMLImageElement !== 'undefined') {
 	}
 }
 
+// CSS.supports polyfill for tests that use color spaces (e.g., highlight shapes)
+if (typeof CSS === 'undefined') {
+	;(global as any).CSS = {}
+}
+if (typeof CSS.supports === 'undefined') {
+	CSS.supports = () => false
+}
+
 function convertNumbersInObject(obj: any, roundToNearest: number): any {
 	if (!obj) return obj
 	if (Array.isArray(obj)) {
diff --git a/internal/scripts/deploy-analytics.ts b/internal/scripts/deploy-analytics.ts
new file mode 100644
index 000000000000..03b5439e85e7
--- /dev/null
+++ b/internal/scripts/deploy-analytics.ts
@@ -0,0 +1,109 @@
+import assert from 'assert'
+import { readFileSync } from 'fs'
+import path, { join } from 'path'
+import toml from 'toml'
+import {
+	createGithubDeployment,
+	getDeployInfo,
+	setWranglerPreviewConfig,
+	wranglerDeploy,
+} from './lib/deploy'
+import { Discord } from './lib/discord'
+import { REPO_ROOT } from './lib/file'
+import { makeEnv } from './lib/makeEnv'
+import { nicelog } from './lib/nicelog'
+
+const workerDir = path.relative(process.cwd(), path.resolve(REPO_ROOT, './apps/analytics-worker'))
+
+// Do not use `process.env` directly in this script. Add your variable to `makeEnv` and use it via
+// `env` instead. This makes sure that all required env vars are present.
+const env = makeEnv([
+	'CLOUDFLARE_ACCOUNT_ID',
+	'CLOUDFLARE_API_TOKEN',
+	'DISCORD_DEPLOY_WEBHOOK_URL',
+	'RELEASE_COMMIT_HASH',
+	'TLDRAW_ENV',
+	'GH_TOKEN',
+])
+
+const discord = new Discord({
+	webhookUrl: env.DISCORD_DEPLOY_WEBHOOK_URL,
+	shouldNotify: env.TLDRAW_ENV === 'production',
+	totalSteps: 2,
+	messagePrefix: '[ANALYTICS]',
+})
+
+const { previewId, sha } = getDeployInfo()
+
+async function main() {
+	assert(
+		env.TLDRAW_ENV === 'staging' || env.TLDRAW_ENV === 'production' || env.TLDRAW_ENV === 'preview',
+		'TLDRAW_ENV must be staging or production or preview'
+	)
+
+	await discord.message(`--- **${env.TLDRAW_ENV} analytics worker deploy pre-flight** ---`)
+
+	await discord.step('cloudflare deploy dry run', async () => {
+		await deployAnalyticsWorker({ dryRun: true })
+	})
+
+	// --- point of no return! do the deploy for real --- //
+
+	await discord.message(`--- **pre-flight complete, starting real analytics worker deploy** ---`)
+
+	await discord.step('deploying analytics worker to cloudflare', async () => {
+		await deployAnalyticsWorker({ dryRun: false })
+	})
+
+	// Get the worker name from wrangler.toml
+	const wranglerConfig = toml.parse(readFileSync(join(workerDir, 'wrangler.toml')).toString())
+	const workerName = wranglerConfig?.env?.[env.TLDRAW_ENV]?.name || wranglerConfig?.name
+	if (!workerName) {
+		throw new Error('Could not find worker name in wrangler.toml')
+	}
+
+	// Analytics worker uses default workers.dev domain
+	const deploymentUrl = `https://${workerName}.${env.CLOUDFLARE_ACCOUNT_ID}.workers.dev`
+
+	nicelog('Creating deployment for', deploymentUrl)
+	await createGithubDeployment(env, {
+		app: 'analytics-worker',
+		deploymentUrl,
+		sha,
+	})
+
+	await discord.message(`**Deploy complete!**`)
+}
+
+let didUpdateAnalyticsWorker = false
+async function deployAnalyticsWorker({ dryRun }: { dryRun: boolean }) {
+	const workerId = `${previewId ?? env.TLDRAW_ENV}-tldraw-consent`
+	if (previewId && !didUpdateAnalyticsWorker) {
+		await setWranglerPreviewConfig(workerDir, {
+			name: workerId,
+			customDomain: `${previewId}-consent.tldraw.xyz`,
+		})
+		didUpdateAnalyticsWorker = true
+	}
+
+	await wranglerDeploy({
+		location: workerDir,
+		dryRun,
+		env: env.TLDRAW_ENV,
+		vars: {
+			WORKER_NAME: workerId,
+			TLDRAW_ENV: env.TLDRAW_ENV,
+		},
+	})
+}
+
+main().catch(async (err) => {
+	// don't notify discord on preview builds
+	if (env.TLDRAW_ENV !== 'preview') {
+		await discord.message(`${Discord.AT_TEAM_MENTION} Deploy failed: ${err.stack}`, {
+			always: true,
+		})
+	}
+	console.error(err)
+	process.exit(1)
+})
diff --git a/internal/scripts/deploy-dotcom.ts b/internal/scripts/deploy-dotcom.ts
index ab539bfda68f..7d43bcecb97d 100644
--- a/internal/scripts/deploy-dotcom.ts
+++ b/internal/scripts/deploy-dotcom.ts
@@ -96,6 +96,9 @@ const env = makeEnv([
 const deployZero = env.DEPLOY_ZERO === 'false' ? false : (env.DEPLOY_ZERO as 'flyio' | 'sst')
 const flyioAppName = deployZero === 'flyio' ? `${previewId}-zero-cache` : undefined
 
+// pierre is not in production yet, so get the key directly from process.env
+const pierreKey = process.env.PIERRE_KEY ?? ''
+
 const clerkJWKSUrl =
 	env.TLDRAW_ENV === 'production'
 		? 'https://clerk.tldraw.com/.well-known/jwks.json'
@@ -104,7 +107,8 @@ const clerkJWKSUrl =
 const discord = new Discord({
 	webhookUrl: env.DISCORD_DEPLOY_WEBHOOK_URL,
 	shouldNotify: env.TLDRAW_ENV === 'production',
-	totalSteps: 8,
+	totalSteps: previewId ? 10 : 9,
+	messagePrefix: '[DOTCOM]',
 })
 
 const sentryReleaseName = `${env.TLDRAW_ENV}-${previewId ? previewId + '-' : ''}-${sha}`
@@ -333,6 +337,7 @@ async function deployTlsyncWorker({ dryRun }: { dryRun: boolean }) {
 			SUPABASE_KEY: env.SUPABASE_LITE_ANON_KEY,
 			SENTRY_DSN: env.WORKER_SENTRY_DSN,
 			TLDRAW_ENV: env.TLDRAW_ENV,
+			PIERRE_KEY: pierreKey,
 			ASSET_UPLOAD_ORIGIN: env.ASSET_UPLOAD,
 			WORKER_NAME: workerId,
 			CLERK_SECRET_KEY: env.CLERK_SECRET_KEY,
diff --git a/internal/scripts/extract-draft-changelog.tsx b/internal/scripts/extract-draft-changelog.tsx
index bb3bbe392e18..ba732efa8405 100644
--- a/internal/scripts/extract-draft-changelog.tsx
+++ b/internal/scripts/extract-draft-changelog.tsx
@@ -140,6 +140,8 @@ export async function extractChangelog(startRef: string, endRef: string): Promis
 
 		// Remove the Change type section and all checkboxes
 		restOfMessage = restOfMessage
+			// remove cursor summary
+			.replace(/<!-- CURSOR_SUMMARY -->(.|\s)*/gm, '')
 			// remove Change type section
 			.replace(/### Change type[\s\n]*/g, '')
 			// remove checkboxes
diff --git a/internal/scripts/lib/deploy.ts b/internal/scripts/lib/deploy.ts
index 5323a561657b..afb18f8245e3 100644
--- a/internal/scripts/lib/deploy.ts
+++ b/internal/scripts/lib/deploy.ts
@@ -186,12 +186,13 @@ ${serviceBinding ? `services = [ {binding = "${serviceBinding.binding}", service
 
 	const path = join(location, 'wrangler.toml')
 	let data = readFileSync(path).toString()
-	if (data.includes('\n[env.preview]\n')) {
-		if (!data.includes(envPreviewSection)) {
-			data = data.replace('\n[env.preview]\n', envPreviewSection)
-		} else {
-			// it was already added?
-		}
+
+	// Replace the entire [env.preview] section including all its properties
+	// Match from [env.preview] to the next section or end of file
+	const previewSectionRegex = /\n\[env\.preview\]\n(?:[^[](?:[^\n]*\n)*)?/
+
+	if (previewSectionRegex.test(data)) {
+		data = data.replace(previewSectionRegex, envPreviewSection)
 	} else {
 		data += envPreviewSection
 	}
diff --git a/internal/scripts/lib/discord.ts b/internal/scripts/lib/discord.ts
index ea9da00bcbc5..8f72993d4067 100644
--- a/internal/scripts/lib/discord.ts
+++ b/internal/scripts/lib/discord.ts
@@ -12,16 +12,23 @@ function sanitizeVariables(errorOutput: string): string {
 export class Discord {
 	static AT_TEAM_MENTION = '<@&959380625100513310>'
 
-	constructor(opts: { webhookUrl: string; shouldNotify: boolean; totalSteps?: number }) {
+	constructor(opts: {
+		webhookUrl: string
+		shouldNotify: boolean
+		totalSteps?: number
+		messagePrefix?: string
+	}) {
 		this.webhookUrl = opts.webhookUrl
 		this.shouldNotify = opts.shouldNotify
 		this.totalSteps = opts.totalSteps ?? 0
+		this.messagePrefix = opts.messagePrefix ?? ''
 	}
 
 	webhookUrl: string
 	shouldNotify: boolean
 	totalSteps: number
 	currentStep = 0
+	messagePrefix: string
 
 	private async send(method: string, url: string, body: unknown): Promise<any> {
 		const response = await fetch(`${this.webhookUrl}${url}`, {
@@ -44,12 +51,18 @@ export class Discord {
 			}
 		}
 
-		const message = await this.send('POST', '?wait=true', { content: sanitizeVariables(content) })
+		const prefixedContent = this.messagePrefix ? `${this.messagePrefix} ${content}` : content
+		const message = await this.send('POST', '?wait=true', {
+			content: sanitizeVariables(prefixedContent),
+		})
 
 		return {
 			edit: async (newContent: string) => {
+				const prefixedNewContent = this.messagePrefix
+					? `${this.messagePrefix} ${newContent}`
+					: newContent
 				await this.send('PATCH', `/messages/${message.id}`, {
-					content: sanitizeVariables(newContent),
+					content: sanitizeVariables(prefixedNewContent),
 				})
 			},
 		}
diff --git a/internal/scripts/publish-new.ts b/internal/scripts/publish-new.ts
index 34f6f2f56f25..4654a272c417 100644
--- a/internal/scripts/publish-new.ts
+++ b/internal/scripts/publish-new.ts
@@ -119,9 +119,8 @@ async function main() {
 	const { major, minor } = parse(nextVersion)!
 	const branchName = `v${major}.${minor}.x`
 	// create and push a new tag to the release branch
-	await exec('git', ['tag', '-f', gitTag])
-	await exec('git', ['push', 'origin', `${gitTag}:refs/heads/${branchName}`])
-	await exec('git', ['push', 'origin', 'tag', gitTag, '-f'])
+	await exec('git', ['tag', '-a', gitTag, '-m', gitTag, '-f'])
+	await exec('git', ['push', 'origin', `HEAD:refs/heads/${branchName}`, '--follow-tags'])
 	await publishProductionDocsAndExamplesAndBemo()
 
 	// convert draft release to published release
diff --git a/internal/scripts/publish-patch.ts b/internal/scripts/publish-patch.ts
index b8ebd44e07fb..00fbc77c9b0d 100644
--- a/internal/scripts/publish-patch.ts
+++ b/internal/scripts/publish-patch.ts
@@ -69,7 +69,7 @@ async function main() {
 
 	// create and push a new tag
 	await exec('git', ['commit', '-m', `${tag} [skip ci]`])
-	await exec('git', ['tag', '-f', tag])
+	await exec('git', ['tag', '-a', tag, '-m', tag, '-f'])
 	await exec('git', ['push', '--follow-tags'])
 
 	// Generate changelog and create GitHub release
diff --git a/internal/scripts/trigger-dotcom-hotfix.ts b/internal/scripts/trigger-dotcom-hotfix.ts
index 3577a77d08d2..28c6c6ea7f3f 100644
--- a/internal/scripts/trigger-dotcom-hotfix.ts
+++ b/internal/scripts/trigger-dotcom-hotfix.ts
@@ -28,7 +28,7 @@ async function main() {
 
 	const discord = new Discord({
 		webhookUrl: env.DISCORD_DEPLOY_WEBHOOK_URL,
-		totalSteps: 3,
+		totalSteps: 4,
 		shouldNotify: true,
 	})
 	await discord.message(`🚀 Triggering dotcom hotfix for PR #${pr.number}...`)
@@ -50,13 +50,26 @@ async function main() {
 
 	await discord.step('Creating hotfix PR and waiting for checks to pass', async () => {
 		const prTitle = `[HOTFIX] ${pr.title}`
+
+		// Extract API changes section from original PR if present
+		const apiChangesHeader = '### API changes'
+		let apiChangesSection = ''
+		if (pr.body?.includes(apiChangesHeader)) {
+			const bodyAfterHeader = pr.body.split(apiChangesHeader)[1]
+			// Extract until next ### header or end of body
+			const nextHeaderIndex = bodyAfterHeader.indexOf('\n###')
+			apiChangesSection =
+				nextHeaderIndex > -1 ? bodyAfterHeader.slice(0, nextHeaderIndex) : bodyAfterHeader
+			apiChangesSection = `\n\n${apiChangesHeader}\n${apiChangesSection.trim()}\n`
+		}
+
 		const prBody = `This is an automated hotfix PR for dotcom deployment.
 
 **Original PR:** [#${pr.number}](https://github.com/tldraw/tldraw/pull/${pr.number})
 **Original Title:** ${pr.title}
 **Original Author:** @${pr.user?.login}
 
-This PR cherry-picks the changes from the original PR to the hotfixes branch for immediate dotcom deployment.
+This PR cherry-picks the changes from the original PR to the hotfixes branch for immediate dotcom deployment.${apiChangesSection}
 
 /cc @${pr.user?.login}`
 
@@ -72,10 +85,22 @@ This PR cherry-picks the changes from the original PR to the hotfixes branch for
 		nicelog(`Created hotfix PR: ${hotfixBranchName} -> hotfixes`)
 		nicelog(`Waiting for PR #${createdPr.data.number} to be ready for merge...`)
 
+		// Maximum wait time: 15 minutes total (action timeout is 20 mins, we need buffer for Discord notification)
+		const maxWaitTimeMs = 15 * 60 * 1000
+		const startTime = Date.now()
+
 		// Wait for 5 minutes initially, then check every 15 seconds (our checks take at least 5 mins)
 		await new Promise((resolve) => setTimeout(resolve, 5 * 60 * 1000))
 
 		while (true) {
+			// Check if we've exceeded the timeout
+			const elapsedTime = Date.now() - startTime
+			if (elapsedTime >= maxWaitTimeMs) {
+				nicelog(`Timeout: PR #${createdPr.data.number} checks did not complete in time`)
+				throw new Error(
+					`Hotfix PR #${createdPr.data.number} checks timed out after ${Math.round(elapsedTime / 60000)} minutes. Please check the PR manually: https://github.com/tldraw/tldraw/pull/${createdPr.data.number}`
+				)
+			}
 			const prStatus = await getPrDetailsByNumber(octokit, createdPr.data.number)
 
 			nicelog(`PR #${createdPr.data.number} mergeable_state: ${prStatus.mergeable_state}`)
@@ -111,6 +136,10 @@ Original Author: @${pr.user?.login}`,
 			}
 		}
 	})
+
+	await discord.step('Checks have passed, deploy will start soon', async () => {
+		// This step just provides user feedback after successful merge
+	})
 }
 
 main().catch(async (e: Error) => {
diff --git a/lerna.json b/lerna.json
index e9f4963c51d7..65d5f26aabdb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -3,5 +3,5 @@
 	"packages": [
 		"packages/*"
 	],
-	"version": "4.1.1"
+	"version": "4.2.0"
 }
diff --git a/package.json b/package.json
index 18b6580ad930..eb3c69634cba 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,8 @@
 		"e2e-dotcom-x10": "lazy e2e-x10 --filter='apps/dotcom/*'",
 		"i18n-check": "i18n-check",
 		"i18n-upload-strings": "tsx internal/scripts/i18n-upload-strings.ts",
-		"i18n-download-strings": "tsx internal/scripts/i18n-download-strings.ts"
+		"i18n-download-strings": "tsx internal/scripts/i18n-download-strings.ts",
+		"add-framer-rewrites": "tsx apps/docs/scripts/add-framer-rewrites.ts"
 	},
 	"engines": {
 		"npm": ">=7.0.0",
diff --git a/packages/assets/package.json b/packages/assets/package.json
index f41edf3b438b..54e4484f339e 100644
--- a/packages/assets/package.json
+++ b/packages/assets/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/assets",
 	"description": "tldraw infinite canvas SDK (assets).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/create-tldraw/package.json b/packages/create-tldraw/package.json
index 1786df73d471..764148ab51cd 100644
--- a/packages/create-tldraw/package.json
+++ b/packages/create-tldraw/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "create-tldraw",
 	"description": "tldraw infinite canvas SDK (create cli).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/create-tldraw/src/templates.ts b/packages/create-tldraw/src/templates.ts
index b9c0ec577d2d..7956825eb88c 100644
--- a/packages/create-tldraw/src/templates.ts
+++ b/packages/create-tldraw/src/templates.ts
@@ -23,6 +23,13 @@ export const TEMPLATES: Template[] = [
 		order: 2,
 		repo: 'tldraw/tldraw-sync-cloudflare',
 	},
+	{
+		name: 'Multiplayer',
+		description: 'Real-time multiplayer with a self-hosted backend.',
+		shortDescription: 'Real-time multiplayer.',
+		order: 2,
+		repo: 'tldraw/tldraw-sync-rivet',
+	},
 	{
 		name: 'Agent',
 		description: 'Work on the canvas with an AI agent.',
diff --git a/packages/dotcom-shared/src/OptimisticAppStore.ts b/packages/dotcom-shared/src/OptimisticAppStore.ts
index bb14053f07bd..fe785bd4ebef 100644
--- a/packages/dotcom-shared/src/OptimisticAppStore.ts
+++ b/packages/dotcom-shared/src/OptimisticAppStore.ts
@@ -113,7 +113,6 @@ export class OptimisticAppStore {
 			case 'insert':
 				return { ...prev, [table]: [...rows.filter((r) => !matchExisting(r)), row] }
 			case 'update':
-				assert(rows.some(matchExisting), 'row not found ' + table + ' ' + JSON.stringify(row))
 				return {
 					...prev,
 					[table]: rows.map((existing) => {
diff --git a/packages/dotcom-shared/src/constants.ts b/packages/dotcom-shared/src/constants.ts
index f7b43b1092f1..9aee9456aa28 100644
--- a/packages/dotcom-shared/src/constants.ts
+++ b/packages/dotcom-shared/src/constants.ts
@@ -1,3 +1,4 @@
 export const MAX_NUMBER_OF_FILES = 200
+export const MAX_NUMBER_OF_GROUPS = 20
 
 export const ROOM_SIZE_LIMIT_MB = 25
diff --git a/packages/dotcom-shared/src/license.ts b/packages/dotcom-shared/src/license.ts
index 411fb42f50d1..e3d2c4f2be5c 100644
--- a/packages/dotcom-shared/src/license.ts
+++ b/packages/dotcom-shared/src/license.ts
@@ -1,4 +1,4 @@
 const getLicenseKey = () =>
 	process.env.TLDRAW_LICENSE ||
-	'tldraw-tldraw-2026-07-10/WyJES1F3eDE5TCIsWyIqLnRsZHJhdy5jb20iXSw5LCIyMDI2LTA3LTEwIl0.ESLyxHZvYuMQYvHuiXqWlmVT6Gkq7vZcs1HeSXpsttYSGmqMgfilSIsrw6hEw53PzrqBMwIjjcmcvPl9Iil/nw'
+	'tldraw-tldraw-2026-07-10/WyIyU3h6ZzhTZyIsWyIqLnRsZHJhdy5jb20iLCIqLnRsZHJhdy5kZXYiLCIqLnRsZHJhdy5jbHViIiwiKi50bGRyYXcud29ya2Vycy5kZXYiXSw5LCIyMDI2LTA3LTEwIl0.+21jrvz5ZFmIvvA/DusCcnFV6Ab1iQQYR+INTqw/i/MmZe/5I/lhdLtqm9nprkQ1MfWL2PeyBmQui1+rjoQS1w'
 export default getLicenseKey
diff --git a/packages/dotcom-shared/src/mutators.ts b/packages/dotcom-shared/src/mutators.ts
index f632dd41b6e6..4eb0ef397400 100644
--- a/packages/dotcom-shared/src/mutators.ts
+++ b/packages/dotcom-shared/src/mutators.ts
@@ -1,19 +1,56 @@
 import type { CustomMutatorDefs } from '@rocicorp/zero'
 import type { Transaction } from '@rocicorp/zero/out/zql/src/mutate/custom'
-import { assert, getIndexBelow, IndexKey, sortByMaybeIndex, uniqueId } from '@tldraw/utils'
-import { MAX_NUMBER_OF_FILES } from './constants'
+import {
+	assert,
+	getIndexAbove,
+	getIndexBelow,
+	getIndexBetween,
+	IndexKey,
+	sortByIndex,
+	sortByMaybeIndex,
+	uniqueId,
+} from '@tldraw/utils'
+import { MAX_NUMBER_OF_FILES, MAX_NUMBER_OF_GROUPS } from './constants'
 import {
 	immutableColumns,
 	TlaFile,
 	TlaFilePartial,
 	TlaFileState,
 	TlaFileStatePartial,
+	TlaFlags,
 	TlaSchema,
 	TlaUser,
 	TlaUserPartial,
 } from './tlaSchema'
 import { ZErrorCode } from './types'
 
+/**
+ * Parse a flags string into an array of individual flags.
+ * Supports flags separated by commas, spaces, or both.
+ * @param flags - The flags string to parse (e.g., "flag1,flag2" or "flag1 flag2")
+ * @returns Array of individual flag strings
+ */
+export function parseFlags(flags: string | null | undefined): string[] {
+	return flags?.split(/[,\s]+/).filter(Boolean) ?? []
+}
+
+/**
+ * Check if a flags string contains a specific flag.
+ * @param flags - The flags string to check
+ * @param flag - The flag to look for
+ * @returns true if the flag is present
+ */
+export function userHasFlag(flags: string | null | undefined, flag: TlaFlags): boolean {
+	return parseFlags(flags).includes(flag)
+}
+
+async function assertUserHasFlag(tx: Transaction<TlaSchema>, userId: string, flag: TlaFlags) {
+	const user = await tx.query.user.where('id', '=', userId).one().run()
+	assert(user, ZErrorCode.bad_request)
+	const flags = parseFlags(user.flags)
+	assert(flags.includes(flag), ZErrorCode.forbidden)
+}
+
 function disallowImmutableMutations<
 	S extends TlaFilePartial | TlaFileStatePartial | TlaUserPartial,
 >(data: S, immutableColumns: Set<keyof S>) {
@@ -26,7 +63,7 @@ export type TlaMutators = ReturnType<typeof createMutators>
 
 async function isGroupsMigrated(tx: Transaction<TlaSchema>, userId: string): Promise<boolean> {
 	const user = await tx.query.user.where('id', '=', userId).one().run()
-	return user?.flags?.includes('groups_backend') ?? false
+	return userHasFlag(user?.flags, 'groups_backend')
 }
 
 function ensureSensibleTimestamp(time: number) {
@@ -81,6 +118,31 @@ async function assertUserIsGroupMember(
 	assert(groupUser, ZErrorCode.forbidden)
 }
 
+async function assertUserIsGroupAdminOrOwner(
+	tx: Transaction<TlaSchema>,
+	userId: string,
+	groupId: string
+) {
+	if (userId === groupId) return
+	const groupUser = await tx.query.group_user
+		.where('userId', '=', userId)
+		.where('groupId', '=', groupId)
+		.one()
+		.run()
+	assert(groupUser?.role === 'admin' || groupUser?.role === 'owner', ZErrorCode.forbidden)
+}
+
+async function assertUserIsGroupOwner(tx: Transaction<TlaSchema>, userId: string, groupId: string) {
+	if (userId === groupId) return
+	const groupUser = await tx.query.group_user
+		.where('userId', '=', userId)
+		.where('groupId', '=', groupId)
+		.where('role', '=', 'owner')
+		.one()
+		.run()
+	assert(groupUser, ZErrorCode.forbidden)
+}
+
 function assertValidId(id: string) {
 	assert(id.match(/^[a-zA-Z0-9_-]+$/), ZErrorCode.bad_request)
 	assert(id.length <= 32, ZErrorCode.bad_request)
@@ -155,6 +217,31 @@ export function createMutators(userId: string) {
 				disallowImmutableMutations(user, immutableColumns.user)
 				await tx.mutate.user.update(user)
 			},
+			updateFairyConfig: async (tx, { id, properties }: { id: string; properties: object }) => {
+				const current = await tx.query.user_fairies.where('userId', '=', userId).one().run()
+				const currentConfig = JSON.parse(current?.fairies || '{}')
+				await tx.mutate.user_fairies.upsert({
+					userId,
+					fairies: JSON.stringify({
+						...currentConfig,
+						[id]: {
+							...currentConfig[id],
+							...properties,
+						},
+					}),
+				})
+			},
+			deleteFairyConfig: async (tx, { id }: { id: string }) => {
+				const current = await tx.query.user_fairies.where('userId', '=', userId).one().run()
+				const currentConfig = JSON.parse(current?.fairies || '{}')
+				await tx.mutate.user_fairies.upsert({
+					userId,
+					fairies: JSON.stringify({ ...currentConfig, [id]: undefined }),
+				})
+			},
+			deleteAllFairyConfigs: async (tx) => {
+				await tx.mutate.user_fairies.upsert({ userId, fairies: '{}' })
+			},
 		},
 		file: {
 			/** @deprecated */
@@ -232,8 +319,12 @@ export function createMutators(userId: string) {
 
 				await tx.mutate.file_state.upsert(fileState)
 			},
+			updateFairies: async (tx, { fileId, fairyState }: { fileId: string; fairyState: string }) => {
+				await tx.mutate.file_fairies.upsert({ fileId, userId, fairyState })
+			},
 		},
 
+		/** @deprecated */
 		init: async (tx, { user, time }: { user: TlaUser; time: number }) => {
 			assert(user.id === userId, ZErrorCode.forbidden)
 			time = ensureSensibleTimestamp(time)
@@ -433,7 +524,7 @@ export function createMutators(userId: string) {
 				return
 			}
 
-			await assertUserIsGroupMember(tx, userId, groupId)
+			await assertUserIsGroupAdminOrOwner(tx, userId, groupId)
 			const file = await tx.query.file.where('id', '=', fileId).one().run()
 			assert(file, ZErrorCode.bad_request)
 
@@ -445,6 +536,7 @@ export function createMutators(userId: string) {
 		},
 		onEnterFile: async (tx, { fileId, time }: { fileId: string; time: number }) => {
 			assert(fileId, ZErrorCode.bad_request)
+			time = ensureSensibleTimestamp(time)
 
 			// Verify the user has permission to access this file
 			if (tx.location === 'server') {
@@ -471,6 +563,316 @@ export function createMutators(userId: string) {
 				}
 			}
 		},
+		createGroup: async (tx, { id, name }: { id: string; name: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			assertValidId(id)
+			await tx.mutate.group.insert({
+				id,
+				name,
+				inviteSecret: tx.location === 'server' ? uniqueId() : null,
+				isDeleted: false,
+				createdAt: Date.now(),
+				updatedAt: Date.now(),
+			})
+			// Get user's existing groups to determine position for new group
+			const existingGroups = await tx.query.group_user.where('userId', '=', userId).run()
+			assert(existingGroups.length < MAX_NUMBER_OF_GROUPS, ZErrorCode.max_groups_reached)
+
+			// Use tldraw's fractional indexing to place new group at the top
+			let index: IndexKey
+			if (existingGroups.length === 0) {
+				// First group gets 'a1'
+				index = 'a1' as IndexKey
+			} else {
+				// Find the highest index and place above it using proper fractional indexing
+				const sortedGroups = existingGroups.sort(sortByIndex)
+				const lowest = sortedGroups[0]?.index as IndexKey | undefined
+				// Generate a new index above the current highest
+				index = getIndexBelow(lowest)
+			}
+
+			await tx.mutate.group_user.insert({
+				userId,
+				groupId: id,
+				// these are set by the trigger
+				userName: '',
+				userColor: '#000000',
+				role: 'owner',
+				createdAt: Date.now(),
+				updatedAt: Date.now(),
+				index,
+			})
+		},
+		updateGroup: async (tx, { id, name }: { id: string; name: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			assert(id, ZErrorCode.bad_request)
+			assert(name && name.trim(), ZErrorCode.bad_request)
+			await assertUserIsGroupOwner(tx, userId, id)
+
+			await tx.mutate.group.update({ id, name: name.trim() })
+		},
+		regenerateGroupInviteSecret: async (tx, { id }: { id: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			assert(id, ZErrorCode.bad_request)
+
+			await assertUserIsGroupAdminOrOwner(tx, userId, id)
+
+			if (tx.location === 'server') {
+				await tx.mutate.group.update({ id, inviteSecret: uniqueId() })
+			}
+		},
+		setGroupMemberRole: async (
+			tx,
+			{
+				groupId,
+				targetUserId,
+				role,
+			}: { groupId: string; targetUserId: string; role: 'admin' | 'owner' }
+		) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			await assertUserIsGroupOwner(tx, userId, groupId)
+			assert(groupId, ZErrorCode.bad_request)
+			assert(targetUserId, ZErrorCode.bad_request)
+			assert(role === 'admin' || role === 'owner', ZErrorCode.bad_request)
+
+			// Target must be a member
+			const targetMembership = await tx.query.group_user
+				.where('userId', '=', targetUserId)
+				.where('groupId', '=', groupId)
+				.one()
+				.run()
+			assert(targetMembership, ZErrorCode.bad_request)
+
+			if (targetMembership.role === role) return
+
+			// Prevent demoting the last remaining owner
+			if (targetMembership.role === 'owner' && role === 'admin') {
+				const owners = await tx.query.group_user
+					.where('groupId', '=', groupId)
+					.where('role', '=', 'owner')
+					.run()
+				assert(owners.length > 1, ZErrorCode.forbidden)
+			}
+
+			await tx.mutate.group_user.update({ userId: targetUserId, groupId, role })
+		},
+		leaveGroup: async (tx, { groupId }: { groupId: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			const owners = await tx.query.group_user
+				.where('groupId', '=', groupId)
+				.where('role', '=', 'owner')
+				.run()
+			const isOnlyOwner = owners.length === 1 && owners[0].userId === userId
+			// Prevent the last owner from leaving - they must delete the group instead
+			// This ensures groups always have at least one owner for administrative purposes
+			assert(!isOnlyOwner, ZErrorCode.forbidden)
+			await tx.mutate.group_user.delete({ userId, groupId })
+		},
+		deleteGroup: async (tx, { id }: { id: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			await assertUserIsGroupOwner(tx, userId, id)
+
+			// Delete all group files
+			const groupFiles = await tx.query.group_file.where('groupId', '=', id).run()
+			for (const groupFile of groupFiles) {
+				await tx.mutate.group_file.delete({ fileId: groupFile.fileId, groupId: id })
+			}
+
+			// Mark all files owned by this group as deleted
+			const files = await tx.query.file.where('owningGroupId', '=', id).run()
+			for (const file of files) {
+				await tx.mutate.file.update({ id: file.id, isDeleted: true })
+			}
+
+			await tx.mutate.group.update({ id: id, isDeleted: true })
+			// TODO: test that this works on the client and that the groups and group_users are removed
+			// from the user's durable object state.
+			// ALSO TODO: add special case for isDeleted becoming false in user data syncer to trigger a hard reboot
+			if (tx.location !== 'server') {
+				await tx.mutate.group_user.delete({ userId, groupId: id })
+			}
+		},
+		moveFileToGroup: async (tx, { fileId, groupId }: { fileId: string; groupId: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			assert(fileId, ZErrorCode.bad_request)
+			assert(groupId, ZErrorCode.bad_request)
+
+			const file = await tx.query.file.where('id', '=', fileId).one().run()
+			assert(file, ZErrorCode.bad_request)
+
+			// No-op if file is already in the target group
+			if (file.owningGroupId === groupId) {
+				return
+			}
+
+			// Check if user has permission to move this file:
+			// 1. User owns the file directly, OR
+			// 2. User is a member of the group that currently owns the file
+			const hasFromGroupAccess = await tx.query.group_user
+				.where('userId', '=', userId)
+				.where('groupId', '=', file.owningGroupId!)
+				.one()
+				.run()
+
+			assert(hasFromGroupAccess, ZErrorCode.forbidden)
+
+			// User must also be a member of the target group
+			const hasToGroupAccess = await tx.query.group_user
+				.where('userId', '=', userId)
+				.where('groupId', '=', groupId)
+				.one()
+				.run()
+			assert(hasToGroupAccess, ZErrorCode.forbidden)
+
+			// Remove file from current group association if it exists
+			if (file.owningGroupId) {
+				await tx.mutate.group_file.delete({ fileId, groupId: file.owningGroupId })
+			}
+
+			// Transfer file ownership from user to group
+			await tx.mutate.file.update({
+				id: fileId,
+				owningGroupId: groupId,
+				updatedAt: Date.now(),
+			})
+			await tx.mutate.group_file.insert({
+				fileId,
+				groupId,
+				createdAt: Date.now(),
+				updatedAt: Date.now(),
+				index: null,
+			})
+		},
+		addFileLinkToGroup: async (tx, { fileId, groupId }: { fileId: string; groupId: string }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			assert(fileId, ZErrorCode.bad_request)
+			assert(groupId, ZErrorCode.bad_request)
+
+			// User must be a member of the target group
+			await assertUserIsGroupMember(tx, userId, groupId)
+
+			// On server, verify the user has access to this file (owns it, is member of owning group, or it's shared)
+			if (tx.location === 'server') {
+				const file = await tx.query.file.where('id', '=', fileId).one().run()
+				assert(file, ZErrorCode.bad_request)
+				await assertUserCanAccessFile(tx, userId, file)
+			}
+
+			// Check if file link already exists
+			const existing = await tx.query.group_file
+				.where('fileId', '=', fileId)
+				.where('groupId', '=', groupId)
+				.one()
+				.run()
+
+			if (existing) {
+				// Already exists, no-op
+				return
+			}
+
+			// Create the file link
+			await tx.mutate.group_file.insert({
+				fileId,
+				groupId,
+				createdAt: Date.now(),
+				updatedAt: Date.now(),
+				index: null,
+			})
+		},
+		updateOwnGroupUser: async (tx, { groupId, index }: { groupId: string; index: IndexKey }) => {
+			await assertUserHasFlag(tx, userId, 'groups_backend')
+			await assertUserIsGroupMember(tx, userId, groupId)
+			await tx.mutate.group_user.update({ userId, groupId, index })
+		},
+		handleFileDragOperation: async (
+			tx,
+			{
+				fileId,
+				groupId,
+				operation,
+			}: { fileId: string; groupId: string; operation: DragFileOperation }
+		) => {
+			// TODO: auth
+			const file = await tx.query.file.where('id', '=', fileId).one().run()
+			if (!file) return
+			const finalGroupId = operation.move?.targetId ?? groupId
+			const isFileLink = file.owningGroupId !== groupId
+
+			// Execute move operation first (if any)
+			if (finalGroupId !== groupId) {
+				// Move to specific group
+				if (isFileLink) {
+					await tx.mutate.group_file.delete({ fileId, groupId })
+					const existing = await tx.query.group_file
+						.where('fileId', '=', fileId)
+						.where('groupId', '=', finalGroupId)
+						.one()
+						.run()
+					if (!existing) {
+						await tx.mutate.group_file.insert({
+							fileId,
+							groupId: finalGroupId,
+							createdAt: Date.now(),
+							updatedAt: Date.now(),
+						})
+					}
+				} else {
+					await mutators.moveFileToGroup(tx, { fileId, groupId: finalGroupId })
+				}
+			}
+
+			if (operation.reorder && operation.reorder.insertBeforeId !== fileId) {
+				const { insertBeforeId } = operation.reorder
+				let nextIndex = 'a0' as IndexKey
+				if (insertBeforeId === null) {
+					// insert at end
+					const lastPinnedFile = (
+						await tx.query.group_file.where('groupId', '=', finalGroupId).run()
+					)
+						.filter((f) => f.index !== null)
+						.sort(sortByMaybeIndex)
+						.pop()
+					if (lastPinnedFile) {
+						nextIndex = getIndexAbove(lastPinnedFile.index)
+					}
+				} else {
+					// insert before specific file
+					const files = (await tx.query.group_file.where('groupId', '=', finalGroupId).run())
+						.filter((f) => f.index !== null)
+						.sort(sortByMaybeIndex)
+					const targetIdx = files.findIndex((f) => f.fileId === insertBeforeId)
+					const afterIndex = files[targetIdx]?.index
+					const beforeIndex = files[targetIdx - 1]?.index
+
+					nextIndex = getIndexBetween(beforeIndex, afterIndex)
+				}
+				await tx.mutate.group_file.update({
+					fileId,
+					groupId: finalGroupId,
+					index: nextIndex,
+				})
+			} else if (!operation.reorder) {
+				await tx.mutate.group_file.update({
+					fileId,
+					groupId: finalGroupId,
+					index: null,
+					updatedAt: Date.now(),
+				})
+			}
+		},
 	} as const satisfies CustomMutatorDefs<TlaSchema>
 	return mutators
 }
+
+export interface DragReorderOperation {
+	insertBeforeId: string | null // file ID to insert before, null for end
+	indicatorY: number
+}
+
+export interface DragFileOperation {
+	move?: { targetId: string }
+	reorder?: DragReorderOperation
+}
+export interface DragGroupOperation {
+	reorder?: DragReorderOperation
+}
diff --git a/packages/dotcom-shared/src/tlaSchema.ts b/packages/dotcom-shared/src/tlaSchema.ts
index a0c64e0de09e..0ea7bc2e1a97 100644
--- a/packages/dotcom-shared/src/tlaSchema.ts
+++ b/packages/dotcom-shared/src/tlaSchema.ts
@@ -116,6 +116,21 @@ export const group_file = table('group_file')
 	})
 	.primaryKey('fileId', 'groupId')
 
+export const user_fairies = table('user_fairies')
+	.columns({
+		userId: string(),
+		fairies: string(),
+	})
+	.primaryKey('userId')
+
+export const file_fairies = table('file_fairies')
+	.columns({
+		fileId: string(),
+		userId: string(),
+		fairyState: string(),
+	})
+	.primaryKey('fileId', 'userId')
+
 const fileRelationships = relationships(file, ({ one, many }) => ({
 	owner: one({
 		sourceField: ['ownerId'],
@@ -227,7 +242,33 @@ export type TlaGroupFilePartial = Partial<TlaGroupFile> & {
 	groupId: TlaGroupFile['groupId']
 }
 
-export type TlaRow = TlaFile | TlaFileState | TlaUser | TlaGroup | TlaGroupUser | TlaGroupFile
+export type TlaUserFairyPartial = Partial<TlaUserFairy> & {
+	userId: TlaUserFairy['userId']
+}
+
+export type TlaFileFairyPartial = Partial<TlaFileFairy> & {
+	fileId: TlaFileFairy['fileId']
+	userId: TlaFileFairy['userId']
+}
+
+export type TlaRow =
+	| TlaFile
+	| TlaFileState
+	| TlaUser
+	| TlaGroup
+	| TlaGroupUser
+	| TlaGroupFile
+	| TlaUserFairy
+	| TlaFileFairy
+export type TlaRowPartial =
+	| TlaFilePartial
+	| TlaFileStatePartial
+	| TlaUserPartial
+	| TlaGroupPartial
+	| TlaGroupUserPartial
+	| TlaGroupFilePartial
+	| TlaUserFairyPartial
+	| TlaFileFairyPartial
 export interface TlaUserMutationNumber {
 	userId: string
 	mutationNumber: number
@@ -267,12 +308,14 @@ export interface DB {
 	group: TlaGroup
 	group_user: TlaGroupUser
 	group_file: TlaGroupFile
+	user_fairies: TlaUserFairy
+	file_fairies: TlaFileFairy
 	user_mutation_number: TlaUserMutationNumber
 	asset: TlaAsset
 }
 
 export const schema = createSchema({
-	tables: [user, file, file_state, group, group_user, group_file],
+	tables: [user, file, file_state, group, group_user, group_file, user_fairies, file_fairies],
 	relationships: [
 		fileRelationships,
 		fileStateRelationships,
@@ -289,6 +332,8 @@ export type TlaFileState = Row<typeof schema.tables.file_state>
 export type TlaGroup = Row<typeof schema.tables.group>
 export type TlaGroupUser = Row<typeof schema.tables.group_user>
 export type TlaGroupFile = Row<typeof schema.tables.group_file>
+export type TlaUserFairy = Row<typeof schema.tables.user_fairies>
+export type TlaFileFairy = Row<typeof schema.tables.file_fairies>
 
 interface AuthData {
 	sub: string | null
@@ -379,5 +424,5 @@ export const permissions = definePermissions<AuthData, TlaSchema>(schema, () =>
 	} satisfies PermissionsConfig<AuthData, TlaSchema>
 })
 
-export const TlaFlags = stringEnum('groups_backend')
+export const TlaFlags = stringEnum('groups_backend', 'groups_frontend')
 export type TlaFlags = keyof typeof TlaFlags
diff --git a/packages/dotcom-shared/src/types.ts b/packages/dotcom-shared/src/types.ts
index 1f6909a42fc6..f14bc9544507 100644
--- a/packages/dotcom-shared/src/types.ts
+++ b/packages/dotcom-shared/src/types.ts
@@ -2,18 +2,15 @@ import { stringEnum } from '@tldraw/utils'
 import type { SerializedSchema, SerializedStore, TLRecord } from 'tldraw'
 import {
 	TlaFile,
-	TlaFilePartial,
+	TlaFileFairy,
 	TlaFileState,
-	TlaFileStatePartial,
 	TlaGroup,
 	TlaGroupFile,
-	TlaGroupFilePartial,
-	TlaGroupPartial,
 	TlaGroupUser,
-	TlaGroupUserPartial,
 	TlaRow,
+	TlaRowPartial,
 	TlaUser,
-	TlaUserPartial,
+	TlaUserFairy,
 } from './tlaSchema'
 
 export interface Snapshot {
@@ -127,6 +124,8 @@ export interface ZStoreData {
 	group: TlaGroup[]
 	group_user: TlaGroupUser[]
 	group_file: TlaGroupFile[]
+	user_fairies: TlaUserFairy[]
+	file_fairies: TlaFileFairy[]
 	lsn: string
 }
 
@@ -139,18 +138,20 @@ export interface ZRowInsert {
 }
 
 export interface ZRowDeleteOrUpdate {
-	row:
-		| TlaFilePartial
-		| TlaFileStatePartial
-		| TlaUserPartial
-		| TlaGroupPartial
-		| TlaGroupUserPartial
-		| TlaGroupFilePartial
+	row: TlaRowPartial
 	table: ZTable
 	event: 'update' | 'delete'
 }
 
-export type ZTable = 'file' | 'file_state' | 'user' | 'group' | 'group_user' | 'group_file'
+export type ZTable =
+	| 'file'
+	| 'file_state'
+	| 'user'
+	| 'group'
+	| 'group_user'
+	| 'group_file'
+	| 'user_fairies'
+	| 'file_fairies'
 
 export type ZEvent = 'insert' | 'update' | 'delete'
 
@@ -163,14 +164,15 @@ export const ZErrorCode = stringEnum(
 	'forbidden',
 	'bad_request',
 	'rate_limit_exceeded',
+	'max_groups_reached',
 	'max_files_reached'
 )
 export type ZErrorCode = keyof typeof ZErrorCode
 
 // increment this to force clients to reload
 // e.g. if we make backwards-incompatible changes to the schema
-export const Z_PROTOCOL_VERSION = 2
-export const MIN_Z_PROTOCOL_VERSION = 2
+export const Z_PROTOCOL_VERSION = 3
+export const MIN_Z_PROTOCOL_VERSION = 3
 
 export type ZServerSentPacket =
 	| {
@@ -223,3 +225,5 @@ export interface SubmitFeedbackRequestBody {
 }
 
 export const MAX_PROBLEM_DESCRIPTION_LENGTH = 2000
+
+export type TLCustomServerEvent = { type: 'persistence_good' } | { type: 'persistence_bad' }
diff --git a/packages/editor/api-report.api.md b/packages/editor/api-report.api.md
index d445f4b79d82..73559161b149 100644
--- a/packages/editor/api-report.api.md
+++ b/packages/editor/api-report.api.md
@@ -13,6 +13,7 @@ import { Editor as Editor_2 } from '@tiptap/core';
 import { EditorProviderProps as EditorProviderProps_2 } from '@tiptap/react';
 import EventEmitter from 'eventemitter3';
 import { ExoticComponent } from 'react';
+import { ExtractShapeByProps } from '@tldraw/tlschema';
 import { ForwardRefExoticComponent } from 'react';
 import { HistoryEntry } from '@tldraw/store';
 import { IndexKey } from '@tldraw/utils';
@@ -54,6 +55,7 @@ import { TLBindingId } from '@tldraw/tlschema';
 import { TLBindingUpdate } from '@tldraw/tlschema';
 import { TLBookmarkAsset } from '@tldraw/tlschema';
 import { TLCamera } from '@tldraw/tlschema';
+import { TLCreateShapePartial } from '@tldraw/tlschema';
 import { TLCursor } from '@tldraw/tlschema';
 import { TLCursorType } from '@tldraw/tlschema';
 import { TLDefaultDashStyle } from '@tldraw/tlschema';
@@ -143,7 +145,7 @@ export abstract class BaseBoxShapeTool extends StateNode {
     // (undocumented)
     onCreate?(_shape: null | TLShape): null | void;
     // (undocumented)
-    abstract shapeType: string;
+    abstract shapeType: TLBaseBoxShape['type'];
 }
 
 // @public (undocumented)
@@ -159,23 +161,23 @@ export abstract class BaseBoxShapeUtil<Shape extends TLBaseBoxShape> extends Sha
 }
 
 // @public
-export interface BindingOnChangeOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnChangeOptions<Binding extends TLBinding = TLBinding> {
     bindingAfter: Binding;
     bindingBefore: Binding;
 }
 
 // @public
-export interface BindingOnCreateOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnCreateOptions<Binding extends TLBinding = TLBinding> {
     binding: Binding;
 }
 
 // @public
-export interface BindingOnDeleteOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnDeleteOptions<Binding extends TLBinding = TLBinding> {
     binding: Binding;
 }
 
 // @public
-export interface BindingOnShapeChangeOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnShapeChangeOptions<Binding extends TLBinding = TLBinding> {
     binding: Binding;
     reason: 'ancestry' | 'self';
     shapeAfter: TLShape;
@@ -183,19 +185,19 @@ export interface BindingOnShapeChangeOptions<Binding extends TLUnknownBinding> {
 }
 
 // @public
-export interface BindingOnShapeDeleteOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnShapeDeleteOptions<Binding extends TLBinding = TLBinding> {
     binding: Binding;
     shape: TLShape;
 }
 
 // @public
-export interface BindingOnShapeIsolateOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnShapeIsolateOptions<Binding extends TLBinding = TLBinding> {
     binding: Binding;
     removedShape: TLShape;
 }
 
 // @public (undocumented)
-export abstract class BindingUtil<Binding extends TLUnknownBinding = TLUnknownBinding> {
+export abstract class BindingUtil<Binding extends TLBinding = TLBinding> {
     constructor(editor: Editor);
     // (undocumented)
     editor: Editor;
@@ -809,7 +811,7 @@ export class Editor extends EventEmitter<TLEventMap> {
     bail(): this;
     bailToMark(id: string): this;
     bindingUtils: {
-        readonly [K in string]?: BindingUtil<TLUnknownBinding>;
+        readonly [K in string]?: BindingUtil<TLBinding>;
     };
     blur({ blurContainer }?: {
         blurContainer?: boolean | undefined;
@@ -832,8 +834,8 @@ export class Editor extends EventEmitter<TLEventMap> {
     }): boolean;
     cancel(): this;
     cancelDoubleClick(): void;
-    canCreateShape<T extends TLUnknownShape>(shape: OptionalKeys<TLShapePartial<T>, 'id'> | T['id']): boolean;
-    canCreateShapes<T extends TLUnknownShape>(shapes: (OptionalKeys<TLShapePartial<T>, 'id'> | T['id'])[]): boolean;
+    canCreateShape(shape: OptionalKeys<TLShapePartial<TLShape>, 'id'> | TLShape['id']): boolean;
+    canCreateShapes(shapes: (OptionalKeys<TLShapePartial<TLShape>, 'id'> | TLShape['id'])[]): boolean;
     // @internal (undocumented)
     capturedPointerId: null | number;
     centerOnPoint(point: VecLike, opts?: TLCameraMoveOptions): this;
@@ -859,7 +861,7 @@ export class Editor extends EventEmitter<TLEventMap> {
         extras: {
             activeStateNode: string;
             collaboratorCount: number;
-            editingShape: TLUnknownShape | undefined;
+            editingShape: TLShape | undefined;
             inputs: {
                 buttons: Set<number>;
                 keys: Set<string>;
@@ -1014,6 +1016,19 @@ export class Editor extends EventEmitter<TLEventMap> {
                 typeName: "shape";
                 x: number;
                 y: number;
+            } | {
+                id: TLShapeId;
+                index: IndexKey;
+                isLocked: boolean;
+                meta: JsonObject;
+                opacity: TLOpacityType;
+                parentId: TLParentId;
+                props: any;
+                rotation: number;
+                type: "my-custom-shape";
+                typeName: "shape";
+                x: number;
+                y: number;
             } | {
                 id: TLShapeId;
                 index: IndexKey;
@@ -1036,7 +1051,7 @@ export class Editor extends EventEmitter<TLEventMap> {
                 parentId: TLParentId;
                 props: any;
                 rotation: number;
-                type: "text";
+                type: "test-shape";
                 typeName: "shape";
                 x: number;
                 y: number;
@@ -1049,7 +1064,7 @@ export class Editor extends EventEmitter<TLEventMap> {
                 parentId: TLParentId;
                 props: any;
                 rotation: number;
-                type: "video";
+                type: "text";
                 typeName: "shape";
                 x: number;
                 y: number;
@@ -1062,7 +1077,7 @@ export class Editor extends EventEmitter<TLEventMap> {
                 parentId: TLParentId;
                 props: any;
                 rotation: number;
-                type: string;
+                type: "video";
                 typeName: "shape";
                 x: number;
                 y: number;
@@ -1090,8 +1105,8 @@ export class Editor extends EventEmitter<TLEventMap> {
         };
     };
     createPage(page: Partial<TLPage>): this;
-    createShape<T extends TLUnknownShape>(shape: OptionalKeys<TLShapePartial<T>, 'id'>): this;
-    createShapes<T extends TLUnknownShape>(shapes: OptionalKeys<TLShapePartial<T>, 'id'>[]): this;
+    createShape<TShape extends TLShape>(shape: TLCreateShapePartial<TShape>): this;
+    createShapes<TShape extends TLShape = TLShape>(shapes: TLCreateShapePartial<TShape>[]): this;
     createTemporaryAssetPreview(assetId: TLAssetId, file: File): string | undefined;
     // (undocumented)
     _decayCameraStateTimeout(elapsed: number): void;
@@ -1146,15 +1161,29 @@ export class Editor extends EventEmitter<TLEventMap> {
     getAssets(): (TLBookmarkAsset | TLImageAsset | TLVideoAsset)[];
     getBaseZoom(): number;
     getBinding(id: TLBindingId): TLBinding | undefined;
-    getBindingsFromShape<Binding extends TLUnknownBinding = TLBinding>(shape: TLShape | TLShapeId, type: Binding['type']): Binding[];
-    getBindingsInvolvingShape<Binding extends TLUnknownBinding = TLBinding>(shape: TLShape | TLShapeId, type?: Binding['type']): Binding[];
-    getBindingsToShape<Binding extends TLUnknownBinding = TLBinding>(shape: TLShape | TLShapeId, type: Binding['type']): Binding[];
-    getBindingUtil<S extends TLUnknownBinding>(binding: {
+    getBindingsFromShape<K extends TLBinding['type']>(shape: TLShape | TLShapeId, type: K): Extract<TLBinding, {
+        type: K;
+    }>[];
+    // (undocumented)
+    getBindingsFromShape<Binding extends TLBinding = TLBinding>(shape: TLShape | TLShapeId, type: Binding['type']): Binding[];
+    getBindingsInvolvingShape<K extends TLBinding['type']>(shape: TLShape | TLShapeId, type: K): Extract<TLBinding, {
+        type: K;
+    }>[];
+    // (undocumented)
+    getBindingsInvolvingShape<Binding extends TLBinding = TLBinding>(shape: TLShape | TLShapeId, type?: Binding['type']): Binding[];
+    getBindingsToShape<K extends TLBinding['type']>(shape: TLShape | TLShapeId, type: K): Extract<TLBinding, {
+        type: K;
+    }>[];
+    // (undocumented)
+    getBindingsToShape<Binding extends TLBinding = TLBinding>(shape: TLShape | TLShapeId, type: Binding['type']): Binding[];
+    getBindingUtil<K extends TLBinding['type']>(type: K): BindingUtil<Extract<TLBinding, {
+        type: K;
+    }>>;
+    // (undocumented)
+    getBindingUtil<S extends TLBinding>(binding: {
         type: S['type'];
     } | S): BindingUtil<S>;
     // (undocumented)
-    getBindingUtil<S extends TLUnknownBinding>(type: S['type']): BindingUtil<S>;
-    // (undocumented)
     getBindingUtil<T extends BindingUtil>(type: T extends BindingUtil<infer R> ? R['type'] : string): T;
     getCamera(): TLCamera;
     getCameraOptions(): TLCameraOptions;
@@ -1253,9 +1282,11 @@ export class Editor extends EventEmitter<TLEventMap> {
     getShapesSharedRotation(shapeIds: TLShapeId[]): number;
     // (undocumented)
     getShapeStyleIfExists<T>(shape: TLShape, style: StyleProp<T>): T | undefined;
-    getShapeUtil<S extends TLUnknownShape>(shape: S | TLShapePartial<S>): ShapeUtil<S>;
+    getShapeUtil<K extends TLShape['type']>(type: K): ShapeUtil<Extract<TLShape, {
+        type: K;
+    }>>;
     // (undocumented)
-    getShapeUtil<S extends TLUnknownShape>(type: S['type']): ShapeUtil<S>;
+    getShapeUtil<S extends TLShape>(shape: S | S['type'] | TLShapePartial<S>): ShapeUtil<S>;
     // (undocumented)
     getShapeUtil<T extends ShapeUtil>(type: T extends ShapeUtil<infer R> ? R['type'] : string): T;
     getSharedOpacity(): SharedStyle<number>;
@@ -1295,9 +1326,9 @@ export class Editor extends EventEmitter<TLEventMap> {
     hasAncestor(shape: TLShape | TLShapeId | undefined, ancestorId: TLShapeId): boolean;
     // (undocumented)
     hasExternalAssetHandler(type: TLExternalAsset['type']): boolean;
-    hasShapeUtil<S extends TLUnknownShape>(shape: S | TLShapePartial<S>): boolean;
+    hasShapeUtil(shape: TLShape | TLShapePartial<TLShape>): boolean;
     // (undocumented)
-    hasShapeUtil<S extends TLUnknownShape>(type: S['type']): boolean;
+    hasShapeUtil(type: TLShape['type']): boolean;
     // (undocumented)
     hasShapeUtil<T extends ShapeUtil>(type: T extends ShapeUtil<infer R> ? R['type'] : string): boolean;
     protected readonly history: HistoryManager<TLRecord>;
@@ -1337,9 +1368,15 @@ export class Editor extends EventEmitter<TLEventMap> {
     // (undocumented)
     isShapeHidden(shapeOrId: TLShape | TLShapeId): boolean;
     isShapeInPage(shape: TLShape | TLShapeId, pageId?: TLPageId): boolean;
-    isShapeOfType<T extends TLUnknownShape>(shape: TLUnknownShape, type: T['type']): shape is T;
+    isShapeOfType<K extends TLShape['type']>(shape: TLShape, type: K): shape is Extract<TLShape, {
+        type: K;
+    }>;
+    // (undocumented)
+    isShapeOfType<T extends TLShape>(shape: TLShape, type: T['type']): shape is Extract<TLShape, {
+        type: T['type'];
+    }>;
     // (undocumented)
-    isShapeOfType<T extends TLUnknownShape>(shapeId: TLUnknownShape['id'], type: T['type']): shapeId is T['id'];
+    isShapeOfType<T extends TLShape = TLShape>(shapeId: TLShapeId, type: T['type']): boolean;
     isShapeOrAncestorLocked(shape?: TLShape | TLShapeId): boolean;
     loadSnapshot(snapshot: Partial<TLEditorSnapshot> | TLStoreSnapshot, opts?: TLLoadSnapshotOptions): this;
     markEventAsHandled(e: {
@@ -1385,7 +1422,7 @@ export class Editor extends EventEmitter<TLEventMap> {
     registerExternalContentHandler<T extends TLExternalContent<E>['type'], E>(type: T, handler: ((info: T extends TLExternalContent<E>['type'] ? Extract<TLExternalContent<E>, {
         type: T;
     }> : TLExternalContent<E>) => void) | null): this;
-    removeTool(Tool: TLStateNodeConstructor): void;
+    removeTool(Tool: TLStateNodeConstructor, parent?: StateNode): void;
     renamePage(page: TLPage | TLPageId, name: string): this;
     reparentShapes(shapes: TLShape[] | TLShapeId[], parentId: TLParentId, insertIndex?: IndexKey): this;
     replaceExternalContent<E>(info: TLExternalContent<E>, opts?: {
@@ -1445,9 +1482,9 @@ export class Editor extends EventEmitter<TLEventMap> {
     _setShiftKeyTimeout(): void;
     setStyleForNextShapes<T>(style: StyleProp<T>, value: T, historyOptions?: TLHistoryBatchOptions): this;
     setStyleForSelectedShapes<S extends StyleProp<any>>(style: S, value: StylePropValue<S>): this;
-    setTool(Tool: TLStateNodeConstructor): void;
+    setTool(Tool: TLStateNodeConstructor, parent?: StateNode): void;
     shapeUtils: {
-        readonly [K in string]?: ShapeUtil<TLUnknownShape>;
+        readonly [K in string]?: ShapeUtil<TLShape>;
     };
     readonly sideEffects: StoreSideEffects<TLRecord>;
     slideCamera(opts?: {
@@ -1509,8 +1546,8 @@ export class Editor extends EventEmitter<TLEventMap> {
     _updateInstanceState(partial: Partial<Omit<TLInstance, 'currentPageId'>>, opts?: TLHistoryBatchOptions): void;
     updatePage(partial: RequiredKeys<Partial<TLPage>, 'id'>): this;
     updatePointer(options?: TLUpdatePointerOptions): this;
-    updateShape<T extends TLUnknownShape>(partial: null | TLShapePartial<T> | undefined): this;
-    updateShapes<T extends TLUnknownShape>(partials: (null | TLShapePartial<T> | undefined)[]): this;
+    updateShape<T extends TLShape = TLShape>(partial: null | TLShapePartial<T> | undefined): this;
+    updateShapes<T extends TLShape>(partials: (null | TLShapePartial<T> | undefined)[]): this;
     // @internal (undocumented)
     _updateShapes(_partials: (null | TLShapePartial | undefined)[]): void;
     updateViewportScreenBounds(screenBounds: Box | HTMLElement, center?: boolean): this;
@@ -2307,8 +2344,8 @@ export function normalizeWheel(event: React.WheelEvent<HTMLElement> | WheelEvent
     z: number;
 };
 
-// @public (undocumented)
-export function openWindow(url: string, target?: string): void;
+// @public
+export function openWindow(url: string, target?: string, allowReferrer?: boolean): void;
 
 // @internal (undocumented)
 export function OptionalErrorBoundary({ children, fallback, ...props }: Omit<TLErrorBoundaryProps, 'fallback'> & {
@@ -2517,7 +2554,7 @@ export function rotateSelectionHandle(handle: SelectionHandle, rotation: number)
 // @public (undocumented)
 export const runtime: {
     hardReset(): void;
-    openWindow(url: string, target: string): void;
+    openWindow(url: string, target: string, allowReferrer?: boolean): void;
     refreshPage(): void;
 };
 
@@ -2580,7 +2617,7 @@ export function setRuntimeOverrides(input: Partial<typeof runtime>): void;
 export function setUserPreferences(user: TLUserPreferences): void;
 
 // @public (undocumented)
-export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
+export abstract class ShapeUtil<Shape extends TLShape = TLShape> {
     constructor(editor: Editor);
     // @internal
     backgroundComponent?(shape: Shape): any;
@@ -2935,7 +2972,7 @@ export type TLAnyBindingUtilConstructor = TLBindingUtilConstructor<any>;
 export type TLAnyShapeUtilConstructor = TLShapeUtilConstructor<any>;
 
 // @public (undocumented)
-export type TLBaseBoxShape = TLBaseShape<string, {
+export type TLBaseBoxShape = ExtractShapeByProps<{
     h: number;
     w: number;
 }>;
@@ -2965,7 +3002,7 @@ export interface TLBaseExternalContent {
 }
 
 // @public (undocumented)
-export interface TLBindingUtilConstructor<T extends TLUnknownBinding, U extends BindingUtil<T> = BindingUtil<T>> {
+export interface TLBindingUtilConstructor<T extends TLBinding, U extends BindingUtil<T> = BindingUtil<T>> {
     // (undocumented)
     new (editor: Editor): U;
     migrations?: TLPropsMigrations;
@@ -4102,10 +4139,10 @@ export interface TLShapeUtilCanBeLaidOutOpts {
 }
 
 // @public
-export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLUnknownShape> {
+export interface TLShapeUtilCanBindOpts<Shape extends TLShape = TLShape> {
     bindingType: string;
-    fromShapeType: string;
-    toShapeType: string;
+    fromShapeType: TLShape['type'];
+    toShapeType: TLShape['type'];
 }
 
 // @public (undocumented)
@@ -4117,7 +4154,7 @@ export interface TLShapeUtilCanvasSvgDef {
 }
 
 // @public (undocumented)
-export interface TLShapeUtilConstructor<T extends TLUnknownShape, U extends ShapeUtil<T> = ShapeUtil<T>> {
+export interface TLShapeUtilConstructor<T extends TLShape, U extends ShapeUtil<T> = ShapeUtil<T>> {
     // (undocumented)
     new (editor: Editor): U;
     // (undocumented)
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 9f94e9f1bc8d..94bd721e8918 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/editor",
 	"description": "tldraw infinite canvas SDK (editor).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx b/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx
index 680a17aeda47..8f40a5d12ee4 100644
--- a/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx
+++ b/packages/editor/src/lib/components/default-components/DefaultCanvas.tsx
@@ -172,17 +172,17 @@ export function DefaultCanvas({ className }: TLCanvasComponentProps) {
 						<LiveCollaborators />
 					</div>
 				</div>
-				<div
-					className="tl-canvas__in-front"
-					onPointerDown={editor.markEventAsHandled}
-					onPointerUp={editor.markEventAsHandled}
-					onTouchStart={editor.markEventAsHandled}
-					onTouchEnd={editor.markEventAsHandled}
-				>
-					<InFrontOfTheCanvasWrapper />
-				</div>
 				<MovingCameraHitTestBlocker />
 			</div>
+			<div
+				className="tl-canvas__in-front"
+				onPointerDown={editor.markEventAsHandled}
+				onPointerUp={editor.markEventAsHandled}
+				onTouchStart={editor.markEventAsHandled}
+				onTouchEnd={editor.markEventAsHandled}
+			>
+				<InFrontOfTheCanvasWrapper />
+			</div>
 			<MenuClickCapture />
 		</>
 	)
diff --git a/packages/editor/src/lib/editor/Editor.test.ts b/packages/editor/src/lib/editor/Editor.test.ts
index fd378c68c374..dd4d70c0c745 100644
--- a/packages/editor/src/lib/editor/Editor.test.ts
+++ b/packages/editor/src/lib/editor/Editor.test.ts
@@ -6,24 +6,25 @@ import {
 	Rectangle2d,
 	ShapeUtil,
 	T,
-	TLBaseShape,
+	TLShape,
 	createShapeId,
 	createTLStore,
 } from '../..'
 import { Editor } from './Editor'
+import { StateNode } from './tools/StateNode'
 
-type ICustomShape = TLBaseShape<
-	'my-custom-shape',
-	{
-		w: number
-		h: number
-		text: string | undefined
-		isFilled: boolean
+const MY_CUSTOM_SHAPE_TYPE = 'my-custom-shape'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[MY_CUSTOM_SHAPE_TYPE]: { w: number; h: number; text: string | undefined; isFilled: boolean }
 	}
->
+}
+
+type ICustomShape = TLShape<typeof MY_CUSTOM_SHAPE_TYPE>
 
 class CustomShape extends ShapeUtil<ICustomShape> {
-	static override type = 'my-custom-shape' as const
+	static override type = MY_CUSTOM_SHAPE_TYPE
 	static override props: RecordProps<ICustomShape> = {
 		w: T.number,
 		h: T.number,
@@ -923,3 +924,270 @@ describe('replaceExternalContent', () => {
 		expect(mockHandler).toHaveBeenCalledWith(info)
 	})
 })
+
+describe('setTool', () => {
+	class CustomToolA extends StateNode {
+		static override id = 'custom-tool-a'
+	}
+
+	class CustomToolB extends StateNode {
+		static override id = 'custom-tool-b'
+	}
+
+	class CustomToolC extends StateNode {
+		static override id = 'custom-tool-c'
+	}
+
+	class ParentTool extends StateNode {
+		static override id = 'parent-tool'
+		static override initial = 'child-tool-1'
+		static override children() {
+			return [ChildTool1]
+		}
+	}
+
+	class ChildTool1 extends StateNode {
+		static override id = 'child-tool-1'
+	}
+
+	class ChildTool2 extends StateNode {
+		static override id = 'child-tool-2'
+	}
+
+	let toolEditor: Editor
+
+	beforeEach(() => {
+		toolEditor = new Editor({
+			shapeUtils: [],
+			bindingUtils: [],
+			tools: [CustomToolA, ParentTool],
+			store: createTLStore({ shapeUtils: [], bindingUtils: [] }),
+			getContainer: () => document.body,
+		})
+	})
+
+	it('should add a tool to the root state', () => {
+		// Initially CustomToolB should not exist
+		expect(toolEditor.root.children!['custom-tool-b']).toBeUndefined()
+
+		// Add CustomToolB
+		toolEditor.setTool(CustomToolB)
+
+		// CustomToolB should now exist in root
+		expect(toolEditor.root.children!['custom-tool-b']).toBeDefined()
+		expect(toolEditor.root.children!['custom-tool-b']).toBeInstanceOf(CustomToolB)
+	})
+
+	it('should add a tool to a specific parent state', () => {
+		const parentTool = toolEditor.root.children!['parent-tool'] as ParentTool
+
+		// Initially should only have child-tool-1
+		expect(Object.keys(parentTool.children!)).toHaveLength(1)
+		expect(parentTool.children!['child-tool-1']).toBeDefined()
+		expect(parentTool.children!['child-tool-2']).toBeUndefined()
+
+		// Add ChildTool2 to ParentTool
+		toolEditor.setTool(ChildTool2, parentTool)
+
+		// Should now have both children
+		expect(Object.keys(parentTool.children!)).toHaveLength(2)
+		expect(parentTool.children!['child-tool-1']).toBeDefined()
+		expect(parentTool.children!['child-tool-2']).toBeDefined()
+		expect(parentTool.children!['child-tool-2']).toBeInstanceOf(ChildTool2)
+	})
+
+	it('should throw an error when trying to override an existing tool', () => {
+		// CustomToolA is already in the root (added in beforeEach)
+		expect(toolEditor.root.children!['custom-tool-a']).toBeDefined()
+
+		// Should throw error when trying to add another tool with the same ID
+		expect(() => {
+			toolEditor.setTool(CustomToolA)
+		}).toThrow('Can\'t override tool with id "custom-tool-a"')
+	})
+
+	it('should allow transitioning to a newly added tool', () => {
+		// Add CustomToolB
+		toolEditor.setTool(CustomToolB)
+
+		// Should be able to transition to the new tool
+		expect(() => {
+			toolEditor.setCurrentTool('custom-tool-b')
+		}).not.toThrow()
+
+		// Should now be on the new tool
+		expect(toolEditor.getCurrentToolId()).toBe('custom-tool-b')
+	})
+
+	it('should create the tool with the correct editor and parent', () => {
+		// Add CustomToolB to root
+		toolEditor.setTool(CustomToolB)
+
+		const customToolB = toolEditor.root.children!['custom-tool-b'] as CustomToolB
+
+		expect(customToolB.editor).toBe(toolEditor)
+		expect(customToolB.parent).toBe(toolEditor.root)
+	})
+
+	it('should maintain existing tools when adding new ones', () => {
+		const originalTool = toolEditor.root.children!['custom-tool-a']
+
+		// Add CustomToolB
+		toolEditor.setTool(CustomToolB)
+
+		// Original tool should still exist
+		expect(toolEditor.root.children!['custom-tool-a']).toBe(originalTool)
+		expect(toolEditor.root.children!['custom-tool-a']).toBeInstanceOf(CustomToolA)
+	})
+
+	it('should allow adding multiple tools', () => {
+		// Add multiple tools
+		toolEditor.setTool(CustomToolB)
+		toolEditor.setTool(CustomToolC)
+
+		// All tools should exist
+		expect(toolEditor.root.children!['custom-tool-a']).toBeDefined()
+		expect(toolEditor.root.children!['custom-tool-b']).toBeDefined()
+		expect(toolEditor.root.children!['custom-tool-c']).toBeDefined()
+		expect(toolEditor.root.children!['custom-tool-b']).toBeInstanceOf(CustomToolB)
+		expect(toolEditor.root.children!['custom-tool-c']).toBeInstanceOf(CustomToolC)
+	})
+})
+
+describe('removeTool', () => {
+	class CustomToolA extends StateNode {
+		static override id = 'custom-tool-a'
+	}
+
+	class CustomToolB extends StateNode {
+		static override id = 'custom-tool-b'
+	}
+
+	class CustomToolC extends StateNode {
+		static override id = 'custom-tool-c'
+	}
+
+	class ParentTool extends StateNode {
+		static override id = 'parent-tool'
+		static override initial = 'child-tool-1'
+		static override children() {
+			return [ChildTool1, ChildTool2]
+		}
+	}
+
+	class ChildTool1 extends StateNode {
+		static override id = 'child-tool-1'
+	}
+
+	class ChildTool2 extends StateNode {
+		static override id = 'child-tool-2'
+	}
+
+	let toolEditor: Editor
+
+	beforeEach(() => {
+		toolEditor = new Editor({
+			shapeUtils: [],
+			bindingUtils: [],
+			tools: [CustomToolA, CustomToolB, CustomToolC, ParentTool],
+			store: createTLStore({ shapeUtils: [], bindingUtils: [] }),
+			getContainer: () => document.body,
+		})
+	})
+
+	it('should remove a tool from the root state', () => {
+		// CustomToolB should exist initially
+		expect(toolEditor.root.children!['custom-tool-b']).toBeDefined()
+
+		// Remove CustomToolB
+		toolEditor.removeTool(CustomToolB)
+
+		// CustomToolB should no longer exist
+		expect(toolEditor.root.children!['custom-tool-b']).toBeUndefined()
+	})
+
+	it('should remove a tool from a specific parent state', () => {
+		const parentTool = toolEditor.root.children!['parent-tool'] as ParentTool
+
+		// Initially should have both children
+		expect(Object.keys(parentTool.children!)).toHaveLength(2)
+		expect(parentTool.children!['child-tool-1']).toBeDefined()
+		expect(parentTool.children!['child-tool-2']).toBeDefined()
+
+		// Remove ChildTool2 from ParentTool
+		toolEditor.removeTool(ChildTool2, parentTool)
+
+		// Should now only have child-tool-1
+		expect(Object.keys(parentTool.children!)).toHaveLength(1)
+		expect(parentTool.children!['child-tool-1']).toBeDefined()
+		expect(parentTool.children!['child-tool-2']).toBeUndefined()
+	})
+
+	it('should not throw an error when trying to remove a non-existent tool', () => {
+		// First remove CustomToolB
+		toolEditor.removeTool(CustomToolB)
+		expect(toolEditor.root.children!['custom-tool-b']).toBeUndefined()
+
+		// Trying to remove it again should not throw
+		expect(() => {
+			toolEditor.removeTool(CustomToolB)
+		}).not.toThrow()
+	})
+
+	it('should maintain other tools when removing one', () => {
+		const originalToolA = toolEditor.root.children!['custom-tool-a']
+		const originalToolC = toolEditor.root.children!['custom-tool-c']
+
+		// Remove CustomToolB
+		toolEditor.removeTool(CustomToolB)
+
+		// Other tools should still exist
+		expect(toolEditor.root.children!['custom-tool-a']).toBe(originalToolA)
+		expect(toolEditor.root.children!['custom-tool-c']).toBe(originalToolC)
+		expect(toolEditor.root.children!['custom-tool-a']).toBeInstanceOf(CustomToolA)
+		expect(toolEditor.root.children!['custom-tool-c']).toBeInstanceOf(CustomToolC)
+	})
+
+	it('should not be able to transition to a removed tool', () => {
+		// Remove CustomToolB
+		toolEditor.removeTool(CustomToolB)
+
+		// Should throw when trying to transition to removed tool
+		expect(() => {
+			toolEditor.setCurrentTool('custom-tool-b')
+		}).toThrow()
+	})
+
+	it('should allow removing multiple tools', () => {
+		// Remove multiple tools
+		toolEditor.removeTool(CustomToolB)
+		toolEditor.removeTool(CustomToolC)
+
+		// Removed tools should not exist
+		expect(toolEditor.root.children!['custom-tool-b']).toBeUndefined()
+		expect(toolEditor.root.children!['custom-tool-c']).toBeUndefined()
+
+		// Other tools should still exist
+		expect(toolEditor.root.children!['custom-tool-a']).toBeDefined()
+		expect(toolEditor.root.children!['parent-tool']).toBeDefined()
+	})
+
+	it('should allow re-adding a tool after removing it', () => {
+		// Remove CustomToolB
+		toolEditor.removeTool(CustomToolB)
+		expect(toolEditor.root.children!['custom-tool-b']).toBeUndefined()
+
+		// Re-add CustomToolB
+		toolEditor.setTool(CustomToolB)
+
+		// CustomToolB should exist again
+		expect(toolEditor.root.children!['custom-tool-b']).toBeDefined()
+		expect(toolEditor.root.children!['custom-tool-b']).toBeInstanceOf(CustomToolB)
+
+		// Should be able to transition to it
+		expect(() => {
+			toolEditor.setCurrentTool('custom-tool-b')
+		}).not.toThrow()
+		expect(toolEditor.getCurrentToolId()).toBe('custom-tool-b')
+	})
+})
diff --git a/packages/editor/src/lib/editor/Editor.ts b/packages/editor/src/lib/editor/Editor.ts
index ee6309256ba8..e5b515464d59 100644
--- a/packages/editor/src/lib/editor/Editor.ts
+++ b/packages/editor/src/lib/editor/Editor.ts
@@ -21,7 +21,6 @@ import {
 	PageRecordType,
 	StyleProp,
 	StylePropValue,
-	TLArrowShape,
 	TLAsset,
 	TLAssetId,
 	TLAssetPartial,
@@ -30,12 +29,12 @@ import {
 	TLBindingId,
 	TLBindingUpdate,
 	TLCamera,
+	TLCreateShapePartial,
 	TLCursor,
 	TLCursorType,
 	TLDOCUMENT_ID,
 	TLDocument,
 	TLFrameShape,
-	TLGeoShape,
 	TLGroupShape,
 	TLHandle,
 	TLINSTANCE_ID,
@@ -43,7 +42,6 @@ import {
 	TLInstance,
 	TLInstancePageState,
 	TLInstancePresence,
-	TLNoteShape,
 	TLPOINTER_ID,
 	TLPage,
 	TLPageId,
@@ -54,8 +52,6 @@ import {
 	TLShapePartial,
 	TLStore,
 	TLStoreSnapshot,
-	TLUnknownBinding,
-	TLUnknownShape,
 	TLVideoAsset,
 	createBindingId,
 	createShapeId,
@@ -447,7 +443,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		let deletedBindings = new Map<TLBindingId, BindingOnDeleteOptions<any>>()
 		const deletedShapeIds = new Set<TLShapeId>()
 		const invalidParents = new Set<TLShapeId>()
-		let invalidBindingTypes = new Set<string>()
+		let invalidBindingTypes = new Set<TLBinding['type']>()
 		this.disposables.add(
 			this.sideEffects.registerOperationCompleteHandler(() => {
 				// this needs to be cleared here because further effects may delete more shapes
@@ -710,7 +706,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 							if (filtered.length > 0) {
 								const commonGroupAncestor = this.findCommonAncestor(
 									compact(filtered.map((id) => this.getShape(id))),
-									(shape) => this.isShapeOfType<TLGroupShape>(shape, 'group')
+									(shape) => this.isShapeOfType(shape, 'group')
 								)
 
 								if (commonGroupAncestor) {
@@ -842,14 +838,16 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * after the editor has already been initialized.
 	 *
 	 * @param Tool - The tool to set.
+	 * @param parent - The parent state node to set the tool on.
 	 *
 	 * @public
 	 */
-	setTool(Tool: TLStateNodeConstructor) {
-		if (hasOwnProperty(this.root.children!, Tool.id)) {
+	setTool(Tool: TLStateNodeConstructor, parent?: StateNode) {
+		parent ??= this.root
+		if (hasOwnProperty(parent.children!, Tool.id)) {
 			throw Error(`Can't override tool with id "${Tool.id}"`)
 		}
-		this.root.children![Tool.id] = new Tool(this, this.root)
+		parent.children![Tool.id] = new Tool(this, parent)
 	}
 
 	/**
@@ -857,12 +855,14 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * after the editor has already been initialized.
 	 *
 	 * @param Tool - The tool to delete.
+	 * @param parent - The parent state node to remove the tool from.
 	 *
 	 * @public
 	 */
-	removeTool(Tool: TLStateNodeConstructor) {
-		if (hasOwnProperty(this.root.children!, Tool.id)) {
-			delete this.root.children![Tool.id]
+	removeTool(Tool: TLStateNodeConstructor, parent?: StateNode) {
+		parent ??= this.root
+		if (hasOwnProperty(parent.children!, Tool.id)) {
+			delete parent.children![Tool.id]
 		}
 	}
 
@@ -978,7 +978,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	shapeUtils: { readonly [K in string]?: ShapeUtil<TLUnknownShape> }
+	shapeUtils: { readonly [K in string]?: ShapeUtil<TLShape> }
 
 	styleProps: { [key: string]: Map<StyleProp<any>, string> }
 
@@ -997,8 +997,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	getShapeUtil<S extends TLUnknownShape>(shape: S | TLShapePartial<S>): ShapeUtil<S>
-	getShapeUtil<S extends TLUnknownShape>(type: S['type']): ShapeUtil<S>
+	getShapeUtil<K extends TLShape['type']>(type: K): ShapeUtil<Extract<TLShape, { type: K }>>
+	getShapeUtil<S extends TLShape>(shape: S | TLShapePartial<S> | S['type']): ShapeUtil<S>
 	getShapeUtil<T extends ShapeUtil>(type: T extends ShapeUtil<infer R> ? R['type'] : string): T
 	getShapeUtil(arg: string | { type: string }) {
 		const type = typeof arg === 'string' ? arg : arg.type
@@ -1012,8 +1012,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @param shape - A shape, shape partial, or shape type.
 	 */
-	hasShapeUtil<S extends TLUnknownShape>(shape: S | TLShapePartial<S>): boolean
-	hasShapeUtil<S extends TLUnknownShape>(type: S['type']): boolean
+	hasShapeUtil(shape: TLShape | TLShapePartial<TLShape>): boolean
+	hasShapeUtil(type: TLShape['type']): boolean
 	hasShapeUtil<T extends ShapeUtil>(
 		type: T extends ShapeUtil<infer R> ? R['type'] : string
 	): boolean
@@ -1028,7 +1028,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	bindingUtils: { readonly [K in string]?: BindingUtil<TLUnknownBinding> }
+	bindingUtils: { readonly [K in string]?: BindingUtil<TLBinding> }
 
 	/**
 	 * Get a binding util from a binding itself.
@@ -1045,8 +1045,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	getBindingUtil<S extends TLUnknownBinding>(binding: S | { type: S['type'] }): BindingUtil<S>
-	getBindingUtil<S extends TLUnknownBinding>(type: S['type']): BindingUtil<S>
+	getBindingUtil<K extends TLBinding['type']>(type: K): BindingUtil<Extract<TLBinding, { type: K }>>
+	getBindingUtil<S extends TLBinding>(binding: S | { type: S['type'] }): BindingUtil<S>
 	getBindingUtil<T extends BindingUtil>(
 		type: T extends BindingUtil<infer R> ? R['type'] : string
 	): T
@@ -2216,7 +2216,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 				throw Error(`Editor.setFocusedGroup: Shape with id ${id} does not exist`)
 			}
 
-			if (!this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+			if (!this.isShapeOfType(shape, 'group')) {
 				throw Error(
 					`Editor.setFocusedGroup: Cannot set focused group to shape of type ${shape.type}`
 				)
@@ -2244,7 +2244,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		if (focusedGroup) {
 			// If we have a focused layer, look for an ancestor of the focused shape that is a group
 			const match = this.findShapeAncestor(focusedGroup, (shape) =>
-				this.isShapeOfType<TLGroupShape>(shape, 'group')
+				this.isShapeOfType(shape, 'group')
 			)
 			// If we have an ancestor that can become a focused layer, set it as the focused layer
 			this.setFocusedGroup(match?.id ?? null)
@@ -5123,10 +5123,10 @@ export class Editor extends EventEmitter<TLEventMap> {
 
 			// Check labels first
 			if (
-				this.isShapeOfType<TLFrameShape>(shape, 'frame') ||
-				((this.isShapeOfType<TLNoteShape>(shape, 'note') ||
-					this.isShapeOfType<TLArrowShape>(shape, 'arrow') ||
-					(this.isShapeOfType<TLGeoShape>(shape, 'geo') && shape.props.fill === 'none')) &&
+				this.isShapeOfType(shape, 'frame') ||
+				((this.isShapeOfType(shape, 'note') ||
+					this.isShapeOfType(shape, 'arrow') ||
+					(this.isShapeOfType(shape, 'geo') && shape.props.fill === 'none')) &&
 					this.getShapeUtil(shape).getText(shape)?.trim())
 			) {
 				for (const childGeometry of (geometry as Group2d).children) {
@@ -5136,7 +5136,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 				}
 			}
 
-			if (this.isShapeOfType<TLFrameShape>(shape, 'frame')) {
+			if (this.isShapeOfType(shape, 'frame')) {
 				// On the rare case that we've hit a frame (not its label), test again hitInside to be forced true;
 				// this prevents clicks from passing through the body of a frame to shapes behind it.
 
@@ -5417,7 +5417,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @example
 	 * ```ts
-	 * const isArrowShape = isShapeOfType<TLArrowShape>(someShape, 'arrow')
+	 * const isArrowShape = isShapeOfType(someShape, 'arrow')
 	 * ```
 	 *
 	 * @param util - the TLShapeUtil constructor to test against
@@ -5425,15 +5425,16 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	isShapeOfType<T extends TLUnknownShape>(shape: TLUnknownShape, type: T['type']): shape is T
-	isShapeOfType<T extends TLUnknownShape>(
-		shapeId: TLUnknownShape['id'],
-		type: T['type']
-	): shapeId is T['id']
-	isShapeOfType<T extends TLUnknownShape>(
-		arg: TLUnknownShape | TLUnknownShape['id'],
+	isShapeOfType<K extends TLShape['type']>(
+		shape: TLShape,
+		type: K
+	): shape is Extract<TLShape, { type: K }>
+	isShapeOfType<T extends TLShape>(
+		shape: TLShape,
 		type: T['type']
-	) {
+	): shape is Extract<TLShape, { type: T['type'] }>
+	isShapeOfType<T extends TLShape = TLShape>(shapeId: TLShapeId, type: T['type']): boolean
+	isShapeOfType(arg: TLShape | TLShapeId, type: TLShape['type']) {
 		const shape = typeof arg === 'string' ? this.getShape(arg) : arg
 		if (!shape) return false
 		return shape.type === type
@@ -5829,7 +5830,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 
 		while (node) {
 			if (
-				this.isShapeOfType<TLGroupShape>(node, 'group') &&
+				this.isShapeOfType(node, 'group') &&
 				focusedGroup?.id !== node.id &&
 				!this.hasAncestor(focusedGroup, node.id) &&
 				(filter?.(node) ?? true)
@@ -5871,7 +5872,15 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * Get all bindings of a certain type _from_ a particular shape. These are the bindings whose
 	 * `fromId` matched the shape's ID.
 	 */
-	getBindingsFromShape<Binding extends TLUnknownBinding = TLBinding>(
+	getBindingsFromShape<K extends TLBinding['type']>(
+		shape: TLShape | TLShapeId,
+		type: K
+	): Extract<TLBinding, { type: K }>[]
+	getBindingsFromShape<Binding extends TLBinding = TLBinding>(
+		shape: TLShape | TLShapeId,
+		type: Binding['type']
+	): Binding[]
+	getBindingsFromShape<Binding extends TLBinding = TLBinding>(
 		shape: TLShape | TLShapeId,
 		type: Binding['type']
 	): Binding[] {
@@ -5885,7 +5894,15 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * Get all bindings of a certain type _to_ a particular shape. These are the bindings whose
 	 * `toId` matches the shape's ID.
 	 */
-	getBindingsToShape<Binding extends TLUnknownBinding = TLBinding>(
+	getBindingsToShape<K extends TLBinding['type']>(
+		shape: TLShape | TLShapeId,
+		type: K
+	): Extract<TLBinding, { type: K }>[]
+	getBindingsToShape<Binding extends TLBinding = TLBinding>(
+		shape: TLShape | TLShapeId,
+		type: Binding['type']
+	): Binding[]
+	getBindingsToShape<Binding extends TLBinding = TLBinding>(
 		shape: TLShape | TLShapeId,
 		type: Binding['type']
 	): Binding[] {
@@ -5899,7 +5916,15 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * Get all bindings involving a particular shape. This includes bindings where the shape is the
 	 * `fromId` or `toId`. If a type is provided, only bindings of that type are returned.
 	 */
-	getBindingsInvolvingShape<Binding extends TLUnknownBinding = TLBinding>(
+	getBindingsInvolvingShape<K extends TLBinding['type']>(
+		shape: TLShape | TLShapeId,
+		type: K
+	): Extract<TLBinding, { type: K }>[]
+	getBindingsInvolvingShape<Binding extends TLBinding = TLBinding>(
+		shape: TLShape | TLShapeId,
+		type?: Binding['type']
+	): Binding[]
+	getBindingsInvolvingShape<Binding extends TLBinding = TLBinding>(
 		shape: TLShape | TLShapeId,
 		type?: Binding['type']
 	): Binding[] {
@@ -5921,7 +5946,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			if (!fromShape || !toShape) continue
 			if (!this.canBindShapes({ fromShape, toShape, binding: partial })) continue
 
-			const util = this.getBindingUtil<TLUnknownBinding>(partial.type)
+			const util = this.getBindingUtil(partial.type)
 			const defaultProps = util.getDefaultProps()
 			const binding = this.store.schema.types.binding.create({
 				...partial,
@@ -6026,7 +6051,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		const toShapeType = typeof toShape === 'string' ? toShape : toShape.type
 		const bindingType = typeof binding === 'string' ? binding : binding.type
 
-		const canBindOpts = { fromShapeType, toShapeType, bindingType }
+		const canBindOpts = { fromShapeType, toShapeType, bindingType } as const
 
 		if (fromShapeType === toShapeType) {
 			return this.getShapeUtil(fromShapeType).canBind(canBindOpts)
@@ -6567,7 +6592,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		const shapesToFlipFirstPass = compact(ids.map((id) => this.getShape(id)))
 
 		for (const shape of shapesToFlipFirstPass) {
-			if (this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+			if (this.isShapeOfType(shape, 'group')) {
 				const childrenOfGroups = compact(
 					this.getSortedChildIdsForParent(shape.id).map((id) => this.getShape(id))
 				)
@@ -7688,9 +7713,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	canCreateShape<T extends TLUnknownShape>(
-		shape: OptionalKeys<TLShapePartial<T>, 'id'> | T['id']
-	): boolean {
+	canCreateShape(shape: OptionalKeys<TLShapePartial<TLShape>, 'id'> | TLShape['id']): boolean {
 		return this.canCreateShapes([shape])
 	}
 
@@ -7701,8 +7724,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	canCreateShapes<T extends TLUnknownShape>(
-		shapes: (T['id'] | OptionalKeys<TLShapePartial<T>, 'id'>)[]
+	canCreateShapes(
+		shapes: (TLShape['id'] | OptionalKeys<TLShapePartial<TLShape>, 'id'>)[]
 	): boolean {
 		return shapes.length + this.getCurrentPageShapeIds().size <= this.options.maxShapesPerPage
 	}
@@ -7720,7 +7743,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	createShape<T extends TLUnknownShape>(shape: OptionalKeys<TLShapePartial<T>, 'id'>): this {
+	createShape<TShape extends TLShape>(shape: TLCreateShapePartial<TShape>): this {
 		this.createShapes([shape])
 		return this
 	}
@@ -7738,7 +7761,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	createShapes<T extends TLUnknownShape>(shapes: OptionalKeys<TLShapePartial<T>, 'id'>[]): this {
+	createShapes<TShape extends TLShape = TLShape>(shapes: TLCreateShapePartial<TShape>[]): this {
 		if (!Array.isArray(shapes)) {
 			throw Error('Editor.createShapes: must provide an array of shapes or shape partials')
 		}
@@ -8119,7 +8142,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		const highestIndex = shapesWithRootParent[shapesWithRootParent.length - 1]?.index
 
 		this.run(() => {
-			this.createShapes<TLGroupShape>([
+			this.createShapes([
 				{
 					id: groupId,
 					type: 'group',
@@ -8189,7 +8212,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		const groups: TLGroupShape[] = []
 
 		shapesToUngroup.forEach((shape) => {
-			if (this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+			if (this.isShapeOfType(shape, 'group')) {
 				groups.push(shape)
 			} else {
 				idsToSelect.add(shape.id)
@@ -8235,7 +8258,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	updateShape<T extends TLUnknownShape>(partial: TLShapePartial<T> | null | undefined) {
+	updateShape<T extends TLShape = TLShape>(partial: TLShapePartial<T> | null | undefined) {
 		this.updateShapes([partial])
 		return this
 	}
@@ -8252,7 +8275,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 *
 	 * @public
 	 */
-	updateShapes<T extends TLUnknownShape>(partials: (TLShapePartial<T> | null | undefined)[]) {
+	updateShapes<T extends TLShape>(partials: (TLShapePartial<T> | null | undefined)[]) {
 		const compactedPartials: TLShapePartial<T>[] = Array(partials.length)
 
 		for (let i = 0, n = partials.length; i < n; i++) {
@@ -8404,7 +8427,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 	 * @internal
 	 */
 	private _extractSharedStyles(shape: TLShape, sharedStyleMap: SharedStyleMap) {
-		if (this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+		if (this.isShapeOfType(shape, 'group')) {
 			// For groups, ignore the styles of the group shape and instead include the styles of the
 			// group's children. These are the shapes that would have their styles changed if the
 			// user called `setStyle` on the current selection.
@@ -8524,7 +8547,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 				// For groups, ignore the opacity of the group shape and instead include
 				// the opacity of the group's children. These are the shapes that would have
 				// their opacity changed if the user called `setOpacity` on the current selection.
-				if (this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+				if (this.isShapeOfType(shape, 'group')) {
 					for (const childId of this.getSortedChildIdsForParent(shape.id)) {
 						addShape(childId)
 					}
@@ -8585,7 +8608,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			// We can have many deep levels of grouped shape
 			// Making a recursive function to look through all the levels
 			const addShapeById = (shape: TLShape) => {
-				if (this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+				if (this.isShapeOfType(shape, 'group')) {
 					const childIds = this.getSortedChildIdsForParent(shape)
 					for (const childId of childIds) {
 						addShapeById(this.getShape(childId)!)
@@ -8669,7 +8692,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 			// We can have many deep levels of grouped shape
 			// Making a recursive function to look through all the levels
 			const addShapeById = (shape: TLShape) => {
-				if (this.isShapeOfType<TLGroupShape>(shape, 'group')) {
+				if (this.isShapeOfType(shape, 'group')) {
 					const childIds = this.getSortedChildIdsForParent(shape.id)
 					for (const childId of childIds) {
 						addShapeById(this.getShape(childId)!)
@@ -9094,7 +9117,7 @@ export class Editor extends EventEmitter<TLEventMap> {
 		for (const shape of this.getSelectedShapes()) {
 			if (lowestDepth === 0) break
 
-			const isFrame = this.isShapeOfType<TLFrameShape>(shape, 'frame')
+			const isFrame = this.isShapeOfType(shape, 'frame')
 			const ancestors = this.getShapeAncestors(shape)
 			if (isFrame) ancestors.push(shape)
 
@@ -9133,8 +9156,8 @@ export class Editor extends EventEmitter<TLEventMap> {
 					if (rootShapeIds.length === 1) {
 						const rootShape = shapes.find((s) => s.id === rootShapeIds[0])!
 						if (
-							this.isShapeOfType<TLFrameShape>(parent, 'frame') &&
-							this.isShapeOfType<TLFrameShape>(rootShape, 'frame') &&
+							this.isShapeOfType(parent, 'frame') &&
+							this.isShapeOfType(rootShape, 'frame') &&
 							rootShape.props.w === parent?.props.w &&
 							rootShape.props.h === parent?.props.h
 						) {
@@ -9309,11 +9332,11 @@ export class Editor extends EventEmitter<TLEventMap> {
 				const onlyRoot = rootShapes[0] as TLFrameShape
 				// If the old bounds are in the viewport...
 				// todo: replace frame references with shapes that can accept children
-				if (this.isShapeOfType<TLFrameShape>(onlyRoot, 'frame')) {
+				if (this.isShapeOfType(onlyRoot, 'frame')) {
 					while (
 						this.getShapesAtPoint(point).some(
 							(shape) =>
-								this.isShapeOfType<TLFrameShape>(shape, 'frame') &&
+								this.isShapeOfType(shape, 'frame') &&
 								shape.props.w === onlyRoot.props.w &&
 								shape.props.h === onlyRoot.props.h
 						)
@@ -10726,7 +10749,10 @@ function alertMaxShapes(editor: Editor, pageId = editor.getCurrentPageId()) {
 
 function applyPartialToRecordWithProps<
 	T extends UnknownRecord & { type: string; props: object; meta: object },
->(prev: T, partial?: Partial<T> & { props?: Partial<T['props']> }): T {
+>(
+	prev: T,
+	partial?: T extends T ? Omit<Partial<T>, 'props'> & { props?: Partial<T['props']> } : never
+): T {
 	if (!partial) return prev
 	let next = null as null | T
 	const entries = Object.entries(partial)
diff --git a/packages/editor/src/lib/editor/bindings/BindingUtil.ts b/packages/editor/src/lib/editor/bindings/BindingUtil.ts
index 46411f9ee132..55df5e7d11d0 100644
--- a/packages/editor/src/lib/editor/bindings/BindingUtil.ts
+++ b/packages/editor/src/lib/editor/bindings/BindingUtil.ts
@@ -1,9 +1,15 @@
-import { RecordProps, TLPropsMigrations, TLShape, TLUnknownBinding } from '@tldraw/tlschema'
+import {
+	RecordProps,
+	TLBinding,
+	TLPropsMigrations,
+	TLShape,
+	TLUnknownBinding,
+} from '@tldraw/tlschema'
 import { Editor } from '../Editor'
 
 /** @public */
 export interface TLBindingUtilConstructor<
-	T extends TLUnknownBinding,
+	T extends TLBinding,
 	U extends BindingUtil<T> = BindingUtil<T>,
 > {
 	new (editor: Editor): U
@@ -20,7 +26,7 @@ export interface TLBindingUtilConstructor<
  *
  * @public
  */
-export interface BindingOnCreateOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnCreateOptions<Binding extends TLBinding = TLBinding> {
 	/** The binding being created. */
 	binding: Binding
 }
@@ -31,7 +37,7 @@ export interface BindingOnCreateOptions<Binding extends TLUnknownBinding> {
  *
  * @public
  */
-export interface BindingOnChangeOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnChangeOptions<Binding extends TLBinding = TLBinding> {
 	/** The binding record before the change is made. */
 	bindingBefore: Binding
 	/** The binding record after the change is made. */
@@ -44,7 +50,7 @@ export interface BindingOnChangeOptions<Binding extends TLUnknownBinding> {
  *
  * @public
  */
-export interface BindingOnDeleteOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnDeleteOptions<Binding extends TLBinding = TLBinding> {
 	/** The binding being deleted. */
 	binding: Binding
 }
@@ -55,7 +61,7 @@ export interface BindingOnDeleteOptions<Binding extends TLUnknownBinding> {
  *
  * @public
  */
-export interface BindingOnShapeChangeOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnShapeChangeOptions<Binding extends TLBinding = TLBinding> {
 	/** The binding record linking these two shapes. */
 	binding: Binding
 	/** The shape record before the change is made. */
@@ -95,7 +101,7 @@ export interface BindingOnShapeChangeOptions<Binding extends TLUnknownBinding> {
  *
  * @public
  */
-export interface BindingOnShapeIsolateOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnShapeIsolateOptions<Binding extends TLBinding = TLBinding> {
 	/** The binding record that refers to the shape in question. */
 	binding: Binding
 	/**
@@ -114,7 +120,7 @@ export interface BindingOnShapeIsolateOptions<Binding extends TLUnknownBinding>
  *
  * @public
  */
-export interface BindingOnShapeDeleteOptions<Binding extends TLUnknownBinding> {
+export interface BindingOnShapeDeleteOptions<Binding extends TLBinding = TLBinding> {
 	/** The binding record that refers to the shape in question. */
 	binding: Binding
 	/** The shape that is about to be deleted. */
@@ -122,7 +128,7 @@ export interface BindingOnShapeDeleteOptions<Binding extends TLUnknownBinding> {
 }
 
 /** @public */
-export abstract class BindingUtil<Binding extends TLUnknownBinding = TLUnknownBinding> {
+export abstract class BindingUtil<Binding extends TLBinding = TLBinding> {
 	constructor(public editor: Editor) {}
 	static props?: RecordProps<TLUnknownBinding>
 	static migrations?: TLPropsMigrations
diff --git a/packages/editor/src/lib/editor/derivations/bindingsIndex.ts b/packages/editor/src/lib/editor/derivations/bindingsIndex.ts
index 82950b6ec8d7..c145d8cc838e 100644
--- a/packages/editor/src/lib/editor/derivations/bindingsIndex.ts
+++ b/packages/editor/src/lib/editor/derivations/bindingsIndex.ts
@@ -1,11 +1,11 @@
 import { Computed, RESET_VALUE, computed, isUninitialized } from '@tldraw/state'
-import { TLArrowBinding, TLBinding, TLShapeId, TLUnknownBinding } from '@tldraw/tlschema'
+import { TLBinding, TLShapeId } from '@tldraw/tlschema'
 import { objectMapValues } from '@tldraw/utils'
 import { Editor } from '../Editor'
 
 type TLBindingsIndex = Map<TLShapeId, TLBinding[]>
 
-function fromScratch(bindingsQuery: Computed<(TLArrowBinding | TLUnknownBinding)[], unknown>) {
+function fromScratch(bindingsQuery: Computed<TLBinding[], unknown>) {
 	const allBindings = bindingsQuery.get() as TLBinding[]
 
 	const shapesToBindings: TLBindingsIndex = new Map()
diff --git a/packages/editor/src/lib/editor/managers/FontManager/FontManager.test.ts b/packages/editor/src/lib/editor/managers/FontManager/FontManager.test.ts
index bfe830e7a26d..dd8308a4a731 100644
--- a/packages/editor/src/lib/editor/managers/FontManager/FontManager.test.ts
+++ b/packages/editor/src/lib/editor/managers/FontManager/FontManager.test.ts
@@ -1,4 +1,5 @@
-import { TLShape, TLShapeId, createShapeId } from '@tldraw/tlschema'
+import { TLParentId, TLShape, TLShapeId, createShapeId, toRichText } from '@tldraw/tlschema'
+import { IndexKey } from '@tldraw/utils'
 import { Mock, Mocked, vi } from 'vitest'
 import { Editor } from '../../Editor'
 import { FontManager, TLFontFace } from './FontManager'
@@ -41,12 +42,21 @@ describe('FontManager', () => {
 		x: 0,
 		y: 0,
 		rotation: 0,
-		index: 'a1' as any,
-		parentId: 'page:page' as any,
+		index: 'a1' as IndexKey,
+		parentId: 'page:page' as TLParentId,
 		opacity: 1,
 		isLocked: false,
 		meta: {},
-		props: {},
+		props: {
+			color: 'black',
+			size: 'xl',
+			font: 'serif',
+			textAlign: 'middle',
+			w: 100,
+			richText: toRichText('❤️'),
+			scale: 2,
+			autoSize: true,
+		},
 		typeName: 'shape' as const,
 	})
 
diff --git a/packages/editor/src/lib/editor/managers/SnapManager/SnapManager.ts b/packages/editor/src/lib/editor/managers/SnapManager/SnapManager.ts
index 78570b494be9..f35a95bfcad6 100644
--- a/packages/editor/src/lib/editor/managers/SnapManager/SnapManager.ts
+++ b/packages/editor/src/lib/editor/managers/SnapManager/SnapManager.ts
@@ -1,5 +1,5 @@
 import { EMPTY_ARRAY, atom, computed } from '@tldraw/state'
-import { TLFrameShape, TLGroupShape, TLParentId, TLShapeId, isShapeId } from '@tldraw/tlschema'
+import { TLParentId, TLShapeId, isShapeId } from '@tldraw/tlschema'
 import { Vec, VecLike } from '../../../primitives/Vec'
 import type { Editor } from '../../Editor'
 import { BoundsSnaps } from './BoundsSnaps'
@@ -72,7 +72,7 @@ export class SnapManager {
 		const collectSnappableShapesFromParent = (parentId: TLParentId) => {
 			if (isShapeId(parentId)) {
 				const parent = editor.getShape(parentId)
-				if (parent && editor.isShapeOfType<TLFrameShape>(parent, 'frame')) {
+				if (parent && editor.isShapeOfType(parent, 'frame')) {
 					snappableShapes.add(parentId)
 				}
 			}
@@ -89,7 +89,7 @@ export class SnapManager {
 				const pageBounds = editor.getShapePageBounds(childId)
 				if (!(pageBounds && renderingBounds.includes(pageBounds))) continue
 				// Snap to children of groups but not group itself
-				if (editor.isShapeOfType<TLGroupShape>(childShape, 'group')) {
+				if (editor.isShapeOfType(childShape, 'group')) {
 					collectSnappableShapesFromParent(childId)
 					continue
 				}
diff --git a/packages/editor/src/lib/editor/shapes/BaseBoxShapeUtil.tsx b/packages/editor/src/lib/editor/shapes/BaseBoxShapeUtil.tsx
index eb477dac0c2d..5a1fc2ef76f7 100644
--- a/packages/editor/src/lib/editor/shapes/BaseBoxShapeUtil.tsx
+++ b/packages/editor/src/lib/editor/shapes/BaseBoxShapeUtil.tsx
@@ -1,4 +1,4 @@
-import { TLBaseShape } from '@tldraw/tlschema'
+import { ExtractShapeByProps } from '@tldraw/tlschema'
 import { lerp } from '@tldraw/utils'
 import { Geometry2d } from '../../primitives/geometry/Geometry2d'
 import { Rectangle2d } from '../../primitives/geometry/Rectangle2d'
@@ -7,7 +7,7 @@ import { ShapeUtil, TLResizeInfo } from './ShapeUtil'
 import { resizeBox } from './shared/resizeBox'
 
 /** @public */
-export type TLBaseBoxShape = TLBaseShape<string, { w: number; h: number }>
+export type TLBaseBoxShape = ExtractShapeByProps<{ w: number; h: number }>
 
 /** @public */
 export abstract class BaseBoxShapeUtil<Shape extends TLBaseBoxShape> extends ShapeUtil<Shape> {
diff --git a/packages/editor/src/lib/editor/shapes/ShapeUtil.ts b/packages/editor/src/lib/editor/shapes/ShapeUtil.ts
index 09576f0a581a..147d9a959f9b 100644
--- a/packages/editor/src/lib/editor/shapes/ShapeUtil.ts
+++ b/packages/editor/src/lib/editor/shapes/ShapeUtil.ts
@@ -26,10 +26,7 @@ import { TLClickEventInfo } from '../types/event-types'
 import { TLResizeHandle } from '../types/selection-types'
 
 /** @public */
-export interface TLShapeUtilConstructor<
-	T extends TLUnknownShape,
-	U extends ShapeUtil<T> = ShapeUtil<T>,
-> {
+export interface TLShapeUtilConstructor<T extends TLShape, U extends ShapeUtil<T> = ShapeUtil<T>> {
 	new (editor: Editor): U
 	type: T['type']
 	props?: RecordProps<T>
@@ -42,11 +39,11 @@ export interface TLShapeUtilConstructor<
  *
  * @public
  */
-export interface TLShapeUtilCanBindOpts<Shape extends TLUnknownShape = TLUnknownShape> {
+export interface TLShapeUtilCanBindOpts<Shape extends TLShape = TLShape> {
 	/** The type of shape referenced by the `fromId` of the binding. */
-	fromShapeType: string
+	fromShapeType: TLShape['type']
 	/** The type of shape referenced by the `toId` of the binding. */
-	toShapeType: string
+	toShapeType: TLShape['type']
 	/** The type of binding. */
 	bindingType: string
 }
@@ -79,7 +76,7 @@ export interface TLShapeUtilCanvasSvgDef {
 }
 
 /** @public */
-export abstract class ShapeUtil<Shape extends TLUnknownShape = TLUnknownShape> {
+export abstract class ShapeUtil<Shape extends TLShape = TLShape> {
 	/** Configure this shape utils {@link ShapeUtil.options | `options`}. */
 	static configure<T extends TLShapeUtilConstructor<any, any>>(
 		this: T,
diff --git a/packages/editor/src/lib/editor/shapes/group/GroupShapeUtil.tsx b/packages/editor/src/lib/editor/shapes/group/GroupShapeUtil.tsx
index 3c444d1325fa..ea64ccb7034d 100644
--- a/packages/editor/src/lib/editor/shapes/group/GroupShapeUtil.tsx
+++ b/packages/editor/src/lib/editor/shapes/group/GroupShapeUtil.tsx
@@ -55,9 +55,7 @@ export class GroupShapeUtil extends ShapeUtil<TLGroupShape> {
 		const isHintingOtherGroup =
 			hintingShapeIds.length > 0 &&
 			hintingShapeIds.some(
-				(id) =>
-					id !== shape.id &&
-					this.editor.isShapeOfType<TLGroupShape>(this.editor.getShape(id)!, 'group')
+				(id) => id !== shape.id && this.editor.isShapeOfType(this.editor.getShape(id)!, 'group')
 			)
 
 		const isFocused = this.editor.getCurrentPageState().focusedGroupId !== shape.id
diff --git a/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts
index 35d9856a1f90..08e12973c7f0 100644
--- a/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts
+++ b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/BaseBoxShapeTool.ts
@@ -1,4 +1,5 @@
 import { TLShape } from '@tldraw/tlschema'
+import { TLBaseBoxShape } from '../../shapes/BaseBoxShapeUtil'
 import { StateNode, TLStateNodeConstructor } from '../StateNode'
 import { Idle } from './children/Idle'
 import { Pointing } from './children/Pointing'
@@ -11,7 +12,7 @@ export abstract class BaseBoxShapeTool extends StateNode {
 		return [Idle, Pointing]
 	}
 
-	abstract override shapeType: string
+	abstract override shapeType: TLBaseBoxShape['type']
 
 	onCreate?(_shape: TLShape | null): void | null
 }
diff --git a/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts
index 6fabe65d2782..8b9d5fe3add8 100644
--- a/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts
+++ b/packages/editor/src/lib/editor/tools/BaseBoxShapeTool/children/Pointing.ts
@@ -23,7 +23,7 @@ export class Pointing extends StateNode {
 			const newPoint = maybeSnapToGrid(originPagePoint, editor)
 
 			// Allow this to trigger the max shapes reached alert
-			this.editor.createShapes<TLBaseBoxShape>([
+			this.editor.createShapes([
 				{
 					id,
 					type: shapeType,
@@ -88,7 +88,7 @@ export class Pointing extends StateNode {
 
 		// Allow this to trigger the max shapes reached alert
 		// todo: add scale here when dynamic size is enabled (is this still needed?)
-		this.editor.createShapes<TLBaseBoxShape>([
+		this.editor.createShapes([
 			{
 				id,
 				type: shapeType,
@@ -127,7 +127,7 @@ export class Pointing extends StateNode {
 			;(next as TLBaseBoxShape & { props: { scale: number } }).props.scale = scale
 		}
 
-		this.editor.updateShape<TLBaseBoxShape>(next)
+		this.editor.updateShape(next)
 
 		this.editor.setSelectedShapes([id])
 
diff --git a/packages/editor/src/lib/exports/getSvgJsx.test.ts b/packages/editor/src/lib/exports/getSvgJsx.test.ts
index ce0da21c0a35..40cfe591ced6 100644
--- a/packages/editor/src/lib/exports/getSvgJsx.test.ts
+++ b/packages/editor/src/lib/exports/getSvgJsx.test.ts
@@ -1,30 +1,21 @@
-import {
-	Geometry2d,
-	RecordProps,
-	Rectangle2d,
-	ShapeUtil,
-	T,
-	TLBaseShape,
-	createShapeId,
-} from '../..'
+import { Geometry2d, RecordProps, Rectangle2d, ShapeUtil, T, TLShape, createShapeId } from '../..'
 import { createTLStore } from '../config/createTLStore'
 import { Editor } from '../editor/Editor'
 import { Box } from '../primitives/Box'
 import { getExportDefaultBounds } from './getSvgJsx'
 
-type ITestShape = TLBaseShape<
-	'test-shape',
-	{
-		w: number
-		h: number
-		x: number
-		y: number
-		isContainer?: boolean
+const TEST_SHAPE_TYPE = 'test-shape'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[TEST_SHAPE_TYPE]: { w: number; h: number; x: number; y: number; isContainer?: boolean }
 	}
->
+}
+
+type ITestShape = TLShape<typeof TEST_SHAPE_TYPE>
 
 class TestShape extends ShapeUtil<ITestShape> {
-	static override type = 'test-shape' as const
+	static override type = TEST_SHAPE_TYPE
 	static override props: RecordProps<ITestShape> = {
 		w: T.number,
 		h: T.number,
diff --git a/packages/editor/src/lib/exports/getSvgJsx.tsx b/packages/editor/src/lib/exports/getSvgJsx.tsx
index 6a47dbe3417e..1e2184aff0f4 100644
--- a/packages/editor/src/lib/exports/getSvgJsx.tsx
+++ b/packages/editor/src/lib/exports/getSvgJsx.tsx
@@ -1,7 +1,6 @@
 import { useAtom, useValue } from '@tldraw/state-react'
 import {
 	TLFrameShape,
-	TLGroupShape,
 	TLShape,
 	TLShapeId,
 	getColorValue,
@@ -58,9 +57,7 @@ export function getSvgJsx(editor: Editor, ids: TLShapeId[], opts: TLImageExportO
 
 	// --- Common bounding box of all shapes
 	const singleFrameShapeId =
-		ids.length === 1 && editor.isShapeOfType<TLFrameShape>(editor.getShape(ids[0])!, 'frame')
-			? ids[0]
-			: null
+		ids.length === 1 && editor.isShapeOfType(editor.getShape(ids[0])!, 'frame') ? ids[0] : null
 
 	let bbox: null | Box = null
 	if (opts.bounds) {
@@ -272,7 +269,7 @@ function SvgExport({
 
 					const shape = editor.getShape(id)!
 
-					if (editor.isShapeOfType<TLGroupShape>(shape, 'group')) return []
+					if (editor.isShapeOfType(shape, 'group')) return []
 
 					const elements = []
 					const util = editor.getShapeUtil(shape)
diff --git a/packages/editor/src/lib/hooks/useCanvasEvents.ts b/packages/editor/src/lib/hooks/useCanvasEvents.ts
index f6d4c82bd8e9..2f0a8c027020 100644
--- a/packages/editor/src/lib/hooks/useCanvasEvents.ts
+++ b/packages/editor/src/lib/hooks/useCanvasEvents.ts
@@ -8,6 +8,7 @@ import { useEditor } from './useEditor'
 
 export function useCanvasEvents() {
 	const editor = useEditor()
+	const ownerDocument = editor.getContainer().ownerDocument
 	const currentTool = useValue('current tool', () => editor.getCurrentTool(), [editor])
 
 	const events = useMemo(
@@ -180,11 +181,11 @@ export function useCanvasEvents() {
 			}
 		}
 
-		document.body.addEventListener('pointermove', onPointerMove)
+		ownerDocument.body.addEventListener('pointermove', onPointerMove)
 		return () => {
-			document.body.removeEventListener('pointermove', onPointerMove)
+			ownerDocument.body.removeEventListener('pointermove', onPointerMove)
 		}
-	}, [editor, currentTool])
+	}, [editor, currentTool, ownerDocument])
 
 	return events
 }
diff --git a/packages/editor/src/lib/license/LicenseManager.ts b/packages/editor/src/lib/license/LicenseManager.ts
index 0443b4a23a87..0080f3f21f7d 100644
--- a/packages/editor/src/lib/license/LicenseManager.ts
+++ b/packages/editor/src/lib/license/LicenseManager.ts
@@ -180,6 +180,7 @@ export class LicenseManager {
 						: 'unknown'
 			url.searchParams.set('sku', sku)
 		}
+		url.searchParams.set('url', window.location.href)
 		if (process.env.NODE_ENV) {
 			url.searchParams.set('environment', process.env.NODE_ENV)
 		}
diff --git a/packages/editor/src/lib/license/Watermark.tsx b/packages/editor/src/lib/license/Watermark.tsx
index 18e30d774e76..760c31414d03 100644
--- a/packages/editor/src/lib/license/Watermark.tsx
+++ b/packages/editor/src/lib/license/Watermark.tsx
@@ -48,8 +48,7 @@ const UnlicensedWatermark = memo(function UnlicensedWatermark({
 	const ref = useRef<HTMLDivElement>(null)
 	usePassThroughWheelEvents(ref)
 
-	const url =
-		'https://tldraw.dev/pricing?utm_source=dotcom&utm_medium=organic&utm_campaign=watermark'
+	const url = 'https://tldraw.dev/pricing?utm_source=sdk&utm_medium=organic&utm_campaign=watermark'
 
 	return (
 		<div
@@ -70,7 +69,9 @@ const UnlicensedWatermark = memo(function UnlicensedWatermark({
 					preventDefault(e)
 				}}
 				title="The tldraw SDK requires a license key to work in production. You can get a free 100-day trial license at tldraw.dev/pricing."
-				onClick={() => runtime.openWindow(url, '_blank')}
+				onClick={() => {
+					runtime.openWindow(url, '_blank', true)
+				}} // allow referrer
 			>
 				Get a license for production
 			</button>
@@ -96,7 +97,7 @@ const WatermarkInner = memo(function WatermarkInner({
 	usePassThroughWheelEvents(ref)
 
 	const maskCss = `url('${src}') center 100% / 100% no-repeat`
-	const url = 'https://tldraw.dev/?utm_source=dotcom&utm_medium=organic&utm_campaign=watermark'
+	const url = 'https://tldraw.dev/?utm_source=sdk&utm_medium=organic&utm_campaign=watermark'
 
 	if (isUnlicensed) {
 		return <UnlicensedWatermark isDebugMode={isDebugMode} isMobile={isMobile} />
@@ -120,7 +121,9 @@ const WatermarkInner = memo(function WatermarkInner({
 					preventDefault(e)
 				}}
 				title="Build infinite canvas applications with the tldraw SDK. Learn more at https://tldraw.dev."
-				onClick={() => runtime.openWindow(url, '_blank')}
+				onClick={() => {
+					runtime.openWindow(url, '_blank')
+				}}
 				style={{ mask: maskCss, WebkitMask: maskCss }}
 			/>
 		</div>
diff --git a/packages/editor/src/lib/utils/reparenting.ts b/packages/editor/src/lib/utils/reparenting.ts
index 4fbb29a1bfd0..aa00482972b5 100644
--- a/packages/editor/src/lib/utils/reparenting.ts
+++ b/packages/editor/src/lib/utils/reparenting.ts
@@ -95,8 +95,8 @@ export function kickoutOccludedShapes(
 		if (remainingShapesToReparent.size > 0) {
 			// The remaining shapes are going to be reparented to the old parent's containing group, if there was one, or else to the page
 			const newParentId =
-				editor.findShapeAncestor(prevParent, (s) => editor.isShapeOfType<TLGroupShape>(s, 'group'))
-					?.id ?? editor.getCurrentPageId()
+				editor.findShapeAncestor(prevParent, (s) => editor.isShapeOfType(s, 'group'))?.id ??
+				editor.getCurrentPageId()
 
 			remainingShapesToReparent.forEach((shape) => {
 				if (!parentsToNewChildren[newParentId]) {
@@ -211,7 +211,7 @@ export function getDroppedShapesToNewParents(
 
 	for (const shape of shapes) {
 		const parent = editor.getShapeParent(shape)
-		if (parent && editor.isShapeOfType<TLGroupShape>(parent, 'group')) {
+		if (parent && editor.isShapeOfType(parent, 'group')) {
 			if (!movingGroups.has(parent)) {
 				movingGroups.add(parent)
 			}
@@ -248,7 +248,7 @@ export function getDroppedShapesToNewParents(
 	parentCheck: for (let i = potentialParentShapes.length - 1; i >= 0; i--) {
 		const parentShape = potentialParentShapes[i]
 		const parentShapeContainingGroupId = editor.findShapeAncestor(parentShape, (s) =>
-			editor.isShapeOfType<TLGroupShape>(s, 'group')
+			editor.isShapeOfType(s, 'group')
 		)?.id
 
 		const parentGeometry = editor.getShapeGeometry(parentShape)
@@ -274,7 +274,7 @@ export function getDroppedShapesToNewParents(
 			if (!shapeGroupIds.has(shape.id)) {
 				shapeGroupIds.set(
 					shape.id,
-					editor.findShapeAncestor(shape, (s) => editor.isShapeOfType<TLGroupShape>(s, 'group'))?.id
+					editor.findShapeAncestor(shape, (s) => editor.isShapeOfType(s, 'group'))?.id
 				)
 			}
 
diff --git a/packages/editor/src/lib/utils/runtime.ts b/packages/editor/src/lib/utils/runtime.ts
index ca325fea7758..d37abf40169b 100644
--- a/packages/editor/src/lib/utils/runtime.ts
+++ b/packages/editor/src/lib/utils/runtime.ts
@@ -1,11 +1,11 @@
 /** @public */
 export const runtime: {
-	openWindow(url: string, target: string): void
+	openWindow(url: string, target: string, allowReferrer?: boolean): void
 	refreshPage(): void
 	hardReset(): void
 } = {
-	openWindow(url, target) {
-		window.open(url, target, 'noopener noreferrer')
+	openWindow(url, target, allowReferrer = false) {
+		return window.open(url, target, allowReferrer ? 'noopener' : 'noopener noreferrer')
 	},
 	refreshPage() {
 		window.location.reload()
diff --git a/packages/editor/src/lib/utils/window-open.ts b/packages/editor/src/lib/utils/window-open.ts
index 7b3007069e13..fe8bc813b1c6 100644
--- a/packages/editor/src/lib/utils/window-open.ts
+++ b/packages/editor/src/lib/utils/window-open.ts
@@ -1,6 +1,16 @@
 import { runtime } from './runtime'
 
-/** @public */
-export function openWindow(url: string, target = '_blank') {
-	runtime.openWindow(url, target)
+/**
+ * Open a new window with the given URL and target. Prefer this to the window.open function, as it
+ * will work more reliably in embedded scenarios, such as our VS Code extension. See the runtime
+ * object in tldraw/editor for more details.
+ *
+ * @param url - The URL to open.
+ * @param target - The target window to open the URL in.
+ * @param allowReferrer - Whether to allow the referrer to be sent to the new window.
+ * @returns The new window object.
+ * @public
+ */
+export function openWindow(url: string, target = '_blank', allowReferrer?: boolean) {
+	return runtime.openWindow(url, target, allowReferrer)
 }
diff --git a/packages/editor/src/version.ts b/packages/editor/src/version.ts
index 82ffd702e1c4..0c50ec2cee4e 100644
--- a/packages/editor/src/version.ts
+++ b/packages/editor/src/version.ts
@@ -1,9 +1,9 @@
 // This file is automatically generated by internal/scripts/refresh-assets.ts.
 // Do not edit manually. Or do, I'm a comment, not a cop.
 
-export const version = '4.1.1'
+export const version = '4.2.0'
 export const publishDates = {
 	major: '2025-09-18T14:39:22.803Z',
-	minor: '2025-10-15T12:30:12.428Z',
-	patch: '2025-10-15T13:45:13.201Z',
+	minor: '2025-11-19T11:53:58.692Z',
+	patch: '2025-11-19T11:53:58.692Z',
 }
diff --git a/packages/fairy-shared/src/actions/AddDetailActionUtil.ts b/packages/fairy-shared/src/actions/AddDetailActionUtil.ts
deleted file mode 100644
index d9507717d3e0..000000000000
--- a/packages/fairy-shared/src/actions/AddDetailActionUtil.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import z from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const AddDetailAction = z
-	.object({
-		_type: z.literal('add-detail'),
-		intent: z.string(),
-	})
-	.meta({
-		title: 'Add Detail',
-		description: 'The fairy plans further work so that it can add detail to its work.',
-	})
-
-type AddDetailAction = z.infer<typeof AddDetailAction>
-
-export class AddDetailActionUtil extends AgentActionUtil<AddDetailAction> {
-	static override type = 'add-detail' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('add-detail')) {
-			return null
-		}
-		return AddDetailAction
-	}
-
-	override getInfo(action: Streaming<AddDetailAction>) {
-		// const label = 'Adding detail'
-		const text = action.intent?.startsWith('#') ? `\n\n${action.intent}` : action.intent
-		// const description = `**${label}:** ${text ?? ''}`
-		const description = `${text ?? ''}`
-
-		return {
-			icon: 'pencil' as const,
-			description,
-		}
-	}
-
-	override applyAction(action: Streaming<AddDetailAction>) {
-		if (!action.complete) return
-		if (!this.agent) return
-		this.agent.schedule('Add detail to the canvas.')
-	}
-}
diff --git a/packages/fairy-shared/src/actions/AgentActionUtil.ts b/packages/fairy-shared/src/actions/AgentActionUtil.ts
deleted file mode 100644
index cec473cc3621..000000000000
--- a/packages/fairy-shared/src/actions/AgentActionUtil.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { Editor } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { PromptPartUtilConstructor } from '../parts/PromptPartUtil'
-import { AgentActionInfo } from '../types/AgentActionInfo'
-import { BaseAgentAction } from '../types/BaseAgentAction'
-import { Streaming } from '../types/Streaming'
-import { TldrawFairyAgent } from '../types/TldrawFairyAgent'
-
-export abstract class AgentActionUtil<T extends BaseAgentAction = BaseAgentAction> {
-	static type: string
-
-	protected agent?: TldrawFairyAgent
-	protected editor?: Editor
-
-	constructor(agent?: TldrawFairyAgent) {
-		this.agent = agent
-		this.editor = agent?.editor
-	}
-
-	/**
-	 * Get a schema to use for the model's response.
-	 * @param actions - The list of action types to include
-	 * @returns The schema, or null to not use a schema
-	 */
-	getSchema(_actions: AgentActionUtilConstructor['type'][]): z.ZodType<T> | null {
-		return null
-	}
-
-	/**
-	 * Get information about the action to display within the chat history UI.
-	 * Return null to not show anything.
-	 * Defaults to the stringified action if not set.
-	 */
-	getInfo(_action: Streaming<T>): Partial<AgentActionInfo> | null {
-		return {}
-	}
-
-	/**
-	 * Transforms the action before saving it to chat history.
-	 * Useful for sanitizing or correcting actions.
-	 * @returns The transformed action, or null to reject the action
-	 */
-	sanitizeAction(action: Streaming<T>, _helpers: AgentHelpers): Streaming<T> | null {
-		return action
-	}
-
-	/**
-	 * Apply the action to the editor.
-	 * Any changes that happen during this function will be displayed as a diff.
-	 * @returns An optional object containing a promise and/or coordinates to move the fairy to
-	 */
-	applyAction(_action: Streaming<T>, _helpers: AgentHelpers): Promise<void> | void {
-		// Do nothing by default
-	}
-
-	/**
-	 * Whether the action gets saved to history.
-	 */
-	savesToHistory(): boolean {
-		return true
-	}
-
-	/**
-	 * Build a system message that gets concatenated with the other system messages.
-	 * @returns The system message, or null to not add anything to the system message.
-	 */
-	buildSystemPrompt(
-		_actions: AgentActionUtilConstructor['type'][],
-		_parts: PromptPartUtilConstructor['type'][]
-	): string | null {
-		return null
-	}
-}
-
-export interface AgentActionUtilConstructor<T extends BaseAgentAction = BaseAgentAction> {
-	new (agent: TldrawFairyAgent, editor: Editor): AgentActionUtil<T>
-	type: T['_type']
-}
diff --git a/packages/fairy-shared/src/actions/AgentActionUtils.ts b/packages/fairy-shared/src/actions/AgentActionUtils.ts
deleted file mode 100644
index 700e4a972d14..000000000000
--- a/packages/fairy-shared/src/actions/AgentActionUtils.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import z from 'zod'
-import { AddDetailActionUtil } from '../actions/AddDetailActionUtil'
-import { AgentActionUtil, AgentActionUtilConstructor } from '../actions/AgentActionUtil'
-import { AlignActionUtil } from '../actions/AlignActionUtil'
-import { BringToFrontActionUtil } from '../actions/BringToFrontActionUtil'
-import { ClearActionUtil } from '../actions/ClearActionUtil'
-import { CountryInfoActionUtil } from '../actions/CountryInfoActionUtil'
-import { CountShapesActionUtil } from '../actions/CountShapesActionUtil'
-import { CreateActionUtil } from '../actions/CreateActionUtil'
-import { DeleteActionUtil } from '../actions/DeleteActionUtil'
-import { DistributeActionUtil } from '../actions/DistributeActionUtil'
-import { FlyToBoundsActionUtil } from '../actions/FlyToBoundsActionUtil'
-import { LabelActionUtil } from '../actions/LabelActionUtil'
-import { MessageActionUtil } from '../actions/MessageActionUtil'
-import { MoveActionUtil } from '../actions/MoveActionUtil'
-import { NoteToSelfActionUtil } from '../actions/NoteToSelfActionUtil'
-import { PenActionUtil } from '../actions/PenActionUtil'
-import { PlaceActionUtil } from '../actions/PlaceActionUtil'
-import { RandomWikipediaArticleActionUtil } from '../actions/RandomWikipediaArticleActionUtil'
-import { ResizeActionUtil } from '../actions/ResizeActionUtil'
-import { ReviewActionUtil } from '../actions/ReviewActionUtil'
-import { RotateActionUtil } from '../actions/RotateActionUtil'
-import { SendToBackActionUtil } from '../actions/SendToBackActionUtil'
-import { StackActionUtil } from '../actions/StackActionUtil'
-import { ThinkActionUtil } from '../actions/ThinkActionUtil'
-import { TodoListActionUtil } from '../actions/TodoListActionUtil'
-import { UnknownActionUtil } from '../actions/UnknownActionUtil'
-import { UpdateActionUtil } from '../actions/UpdateActionUtil'
-import { AgentAction } from '../types/AgentAction'
-import { BaseAgentAction } from '../types/BaseAgentAction'
-import { TldrawFairyAgent } from '../types/TldrawFairyAgent'
-
-/**
- * Agent actions determine what actions the agent can take.
- *
- * To prevent the agent from doing an action, remove it from the list.
- * To let the agent do more, either change one of the existing actions, or add your own.
- */
-export const AGENT_ACTION_UTILS = [
-	// Communication
-	MessageActionUtil,
-
-	// Planning
-	ThinkActionUtil,
-	ReviewActionUtil,
-	AddDetailActionUtil,
-	TodoListActionUtil,
-	FlyToBoundsActionUtil,
-	NoteToSelfActionUtil,
-
-	// Individual shapes
-	CreateActionUtil,
-	DeleteActionUtil,
-	UpdateActionUtil,
-	LabelActionUtil,
-	MoveActionUtil,
-
-	// Groups of shapes
-	PlaceActionUtil,
-	BringToFrontActionUtil,
-	SendToBackActionUtil,
-	RotateActionUtil,
-	ResizeActionUtil,
-	AlignActionUtil,
-	DistributeActionUtil,
-	StackActionUtil,
-	ClearActionUtil,
-
-	// Drawing
-	PenActionUtil,
-
-	// External APIs
-	RandomWikipediaArticleActionUtil,
-	CountryInfoActionUtil,
-	CountShapesActionUtil,
-
-	// Internal (required)
-	UnknownActionUtil,
-] satisfies AgentActionUtilConstructor<BaseAgentAction>[]
-
-/**
- * Get an object containing all agent action utils.
- */
-export function getAgentActionUtilsRecord(agent?: TldrawFairyAgent) {
-	const object = {} as Record<AgentAction['_type'], AgentActionUtil<AgentAction>>
-	for (const util of AGENT_ACTION_UTILS) {
-		object[util.type] = new util(agent)
-	}
-	return object
-}
-
-/**
- * Get an object containing only the specified agent action utils.
- */
-export function getAgentActionUtilsRecordByTypes(
-	types: AgentActionUtilConstructor['type'][],
-	agent?: TldrawFairyAgent
-) {
-	const object = {} as Record<AgentAction['_type'], AgentActionUtil<AgentAction>>
-	const typeSet = new Set(types)
-	for (const util of AGENT_ACTION_UTILS) {
-		if (typeSet.has(util.type)) {
-			object[util.type] = new util(agent)
-		}
-	}
-	return object
-}
-
-/**
- * Build the JSON schema for the agent's response format.
- */
-export function buildResponseSchema(actions: AgentActionUtilConstructor['type'][]) {
-	const actionUtils = getAgentActionUtilsRecordByTypes(actions)
-	const actionSchemas = Object.values(actionUtils)
-		.map((util) => util.getSchema(actions))
-		.filter((schema) => schema !== null)
-	const actionSchema = z.union(actionSchemas)
-	const schema = z.object({
-		actions: z.array(actionSchema),
-	})
-
-	return z.toJSONSchema(schema, { reused: 'ref' })
-}
diff --git a/packages/fairy-shared/src/actions/ClearActionUtil.ts b/packages/fairy-shared/src/actions/ClearActionUtil.ts
deleted file mode 100644
index ba75825c6520..000000000000
--- a/packages/fairy-shared/src/actions/ClearActionUtil.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import z from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const ClearAction = z
-	.object({
-		// All agent actions must have a _type field
-		// We use an underscore to encourage the model to put this field first
-		_type: z.literal('clear'),
-	})
-	.meta({
-		// Give the action a title and description to tell the model what this action does
-		title: 'Clear',
-		description: 'The agent deletes all shapes on the canvas.',
-	})
-
-type ClearAction = z.infer<typeof ClearAction>
-
-export class ClearActionUtil extends AgentActionUtil<ClearAction> {
-	static override type = 'clear' as const
-
-	/**
-	 * Tell the model what the action's schema is
-	 */
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('clear')) {
-			return null
-		}
-		return ClearAction
-	}
-
-	/**
-	 * Tell the model how to display this action in the chat history UI
-	 */
-	override getInfo() {
-		return {
-			icon: 'trash' as const,
-			description: 'Cleared the canvas',
-		}
-	}
-
-	/**
-	 * Tell the model how to apply the action
-	 */
-	override applyAction(action: Streaming<ClearAction>) {
-		// Don't do anything if the action hasn't finished streaming
-		if (!action.complete) return
-
-		// Delete all shapes on the page
-		if (!this.agent) return
-		const { editor } = this.agent
-
-		const allShapes = editor.getCurrentPageShapes()
-		editor.deleteShapes(allShapes)
-	}
-}
diff --git a/packages/fairy-shared/src/actions/CountShapesActionUtil.ts b/packages/fairy-shared/src/actions/CountShapesActionUtil.ts
deleted file mode 100644
index 3e216b8904a1..000000000000
--- a/packages/fairy-shared/src/actions/CountShapesActionUtil.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const CountShapesAction = z
-	.object({
-		_type: z.literal('count'),
-		expression: z.string(),
-	})
-	.meta({
-		title: 'Count',
-		description:
-			'The fairy requests to count the number of shapes in the canvas. The answer will be provided to the AI in a follow-up request.',
-	})
-
-type CountShapesAction = z.infer<typeof CountShapesAction>
-
-export class CountShapesActionUtil extends AgentActionUtil<CountShapesAction> {
-	static override type = 'count' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('count')) {
-			return null
-		}
-		return CountShapesAction
-	}
-
-	override getInfo(action: Streaming<CountShapesAction>) {
-		const description = action.complete ? 'Counted shapes' : 'Counting shapes'
-		return {
-			icon: 'search' as const,
-			description,
-		}
-	}
-
-	override applyAction(action: Streaming<CountShapesAction>, helpers: AgentHelpers) {
-		if (!action.complete) return
-		const { agent, editor } = helpers
-
-		// Add the shape count to the next request
-		agent.schedule({
-			data: [`Number of shapes on the canvas: ${editor.getCurrentPageShapes().length}`],
-		})
-	}
-}
diff --git a/packages/fairy-shared/src/actions/CountryInfoActionUtil.ts b/packages/fairy-shared/src/actions/CountryInfoActionUtil.ts
deleted file mode 100644
index 72b689010dd7..000000000000
--- a/packages/fairy-shared/src/actions/CountryInfoActionUtil.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { JsonValue } from '@tldraw/utils'
-import z from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const CountryInfoAction = z
-	.object({
-		_type: z.literal('countryInfo'),
-		code: z.string(),
-	})
-	.meta({
-		title: 'Country info',
-		description:
-			'The fairy gets information about a country by providing its country code, eg: "de" for Germany.',
-	})
-
-type CountryInfoAction = z.infer<typeof CountryInfoAction>
-
-export class CountryInfoActionUtil extends AgentActionUtil<CountryInfoAction> {
-	static override type = 'countryInfo' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('countryInfo')) {
-			return null
-		}
-		return CountryInfoAction
-	}
-
-	override getInfo(action: Streaming<CountryInfoAction>) {
-		const description = action.complete ? 'Searched for country info' : 'Searching for country info'
-		return {
-			icon: 'search' as const,
-			description,
-		}
-	}
-
-	override async applyAction(action: Streaming<CountryInfoAction>) {
-		// Wait until the action has finished streaming
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const info = await fetchCountryInfo(action.code)
-		this.agent!.schedule({ data: [info] })
-	}
-}
-
-export async function fetchCountryInfo(code: string) {
-	const response = await fetch(`https://restcountries.com/v3.1/alpha/${code}`)
-
-	if (!response.ok) {
-		throw new Error(`Country API returned status ${response.status}, ${response.statusText}`)
-	}
-
-	const json = await response.json()
-	if (Array.isArray(json)) {
-		return json[0] as JsonValue
-	}
-	return json as JsonValue
-}
diff --git a/packages/fairy-shared/src/actions/DeleteActionUtil.ts b/packages/fairy-shared/src/actions/DeleteActionUtil.ts
deleted file mode 100644
index d2fec17db272..000000000000
--- a/packages/fairy-shared/src/actions/DeleteActionUtil.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-// import { BaseAgentAction } from '../types/BaseAgentAction'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const DeleteAction = z
-	.object({
-		_type: z.literal('delete'),
-		intent: z.string(),
-		shapeId: z.string(),
-	})
-	.meta({ title: 'Delete', description: 'The fairy deletes a shape.' })
-
-type DeleteAction = z.infer<typeof DeleteAction>
-
-export class DeleteActionUtil extends AgentActionUtil<DeleteAction> {
-	static override type = 'delete' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('delete')) {
-			return null
-		}
-		return DeleteAction
-	}
-
-	override getInfo(action: Streaming<DeleteAction>) {
-		return {
-			icon: 'trash' as const,
-			description: action.intent ?? '',
-			//canGroup: (other: Streaming<BaseAgentAction>) => other._type === 'delete',
-		}
-	}
-
-	override sanitizeAction(action: Streaming<DeleteAction>, helpers: AgentHelpers) {
-		if (!action.complete) return action
-
-		const shapeId = helpers.ensureShapeIdExists(action.shapeId)
-		if (!shapeId) return null
-
-		action.shapeId = shapeId
-		return action
-	}
-
-	override applyAction(action: Streaming<DeleteAction>) {
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const shape = this.agent.editor.getShape(`shape:${action.shapeId}` as TLShapeId)
-		if (!shape) return
-
-		this.agent.editor.deleteShape(`shape:${action.shapeId}` as TLShapeId)
-		this.agent.moveToPosition({ x: shape.x, y: shape.y })
-	}
-}
diff --git a/packages/fairy-shared/src/actions/FlyToBoundsActionUtil.ts b/packages/fairy-shared/src/actions/FlyToBoundsActionUtil.ts
deleted file mode 100644
index cd12feccea39..000000000000
--- a/packages/fairy-shared/src/actions/FlyToBoundsActionUtil.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { DEFAULT_FAIRY_VISION } from '../constants'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const FlyToBoundsAction = z
-	.object({
-		_type: z.literal('flyToBounds'),
-		intent: z.string(),
-		x: z.number(),
-		y: z.number(),
-		w: z.number(),
-		h: z.number(),
-	})
-	.meta({
-		title: 'Fly To Bounds',
-		description:
-			'The fairy flies to the specified bounds of the canvas to navigate to other areas of the canvas if needed.',
-	})
-
-type FlyToBoundsAction = z.infer<typeof FlyToBoundsAction>
-
-export class FlyToBoundsActionUtil extends AgentActionUtil<FlyToBoundsAction> {
-	static override type = 'flyToBounds' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('flyToBounds')) {
-			return null
-		}
-		return FlyToBoundsAction
-	}
-
-	override getInfo(action: Streaming<FlyToBoundsAction>) {
-		// const label = action.complete ? 'Fly To Bounds' : 'Flying to bounds'
-		const text = action.intent?.startsWith('#') ? `\n\n${action.intent}` : action.intent
-		return {
-			icon: 'eye' as const,
-			description: `${text ?? ''}`,
-		}
-	}
-
-	override applyAction(action: Streaming<FlyToBoundsAction>, helpers: AgentHelpers) {
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const bounds = helpers.removeOffsetFromBox({
-			x: action.x,
-			y: action.y,
-			w: Math.min(action.w, DEFAULT_FAIRY_VISION.x),
-			h: Math.min(action.h, DEFAULT_FAIRY_VISION.y),
-		})
-
-		this.agent.moveToBounds(bounds)
-
-		this.agent.schedule({
-			bounds,
-			messages: [`Just flew to new area with the intent: ${action.intent}`],
-		})
-	}
-}
diff --git a/packages/fairy-shared/src/actions/LabelActionUtil.ts b/packages/fairy-shared/src/actions/LabelActionUtil.ts
deleted file mode 100644
index fd151ebe9abf..000000000000
--- a/packages/fairy-shared/src/actions/LabelActionUtil.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { TLShapeId, toRichText } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const LabelAction = z
-	.object({
-		_type: z.literal('label'),
-		intent: z.string(),
-		shapeId: z.string(),
-		text: z.string(),
-	})
-	.meta({ title: 'Label', description: "The fairy changes a shape's text." })
-
-type ILabelEvent = z.infer<typeof LabelAction>
-
-export class LabelActionUtil extends AgentActionUtil<ILabelEvent> {
-	static override type = 'label' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('label')) {
-			return null
-		}
-		return LabelAction
-	}
-
-	override getInfo(action: Streaming<ILabelEvent>) {
-		return {
-			icon: 'pencil' as const,
-			description: action.intent ?? '',
-		}
-	}
-
-	override sanitizeAction(action: Streaming<ILabelEvent>, helpers: AgentHelpers) {
-		if (!action.complete) return action
-
-		const shapeId = helpers.ensureShapeIdExists(action.shapeId)
-		if (!shapeId) return null
-
-		action.shapeId = shapeId
-		return action
-	}
-
-	override applyAction(action: Streaming<ILabelEvent>) {
-		if (!action.complete) return
-		if (!this.agent) return
-		const { editor } = this.agent
-
-		const shapeId = `shape:${action.shapeId}` as TLShapeId
-		const shape = editor.getShape(shapeId)
-		if (!shape) return
-		editor.updateShape({
-			id: shapeId,
-			type: shape.type,
-			props: { richText: toRichText(action.text ?? '') },
-		})
-
-		this.agent.moveToPosition({
-			x: shape.x,
-			y: shape.y,
-		})
-	}
-}
diff --git a/packages/fairy-shared/src/actions/MessageActionUtil.ts b/packages/fairy-shared/src/actions/MessageActionUtil.ts
deleted file mode 100644
index e4dc23a66fe2..000000000000
--- a/packages/fairy-shared/src/actions/MessageActionUtil.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import z from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const MessageAction = z
-	.object({
-		_type: z.literal('message'),
-		text: z.string(),
-	})
-	.meta({ title: 'Message', description: 'The fairy sends a message to the user.' })
-
-type MessageAction = z.infer<typeof MessageAction>
-
-export class MessageActionUtil extends AgentActionUtil<MessageAction> {
-	static override type = 'message' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('message')) {
-			return null
-		}
-		return MessageAction
-	}
-
-	override getInfo(action: Streaming<MessageAction>) {
-		return {
-			description: action.text ?? '',
-			canGroup: () => false,
-			pose: 'thinking' as const,
-		}
-	}
-}
diff --git a/packages/fairy-shared/src/actions/NoteToSelfActionUtil.ts b/packages/fairy-shared/src/actions/NoteToSelfActionUtil.ts
deleted file mode 100644
index aff7907328c1..000000000000
--- a/packages/fairy-shared/src/actions/NoteToSelfActionUtil.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import z from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const NoteToSelfAction = z
-	.object({
-		_type: z.literal('noteToSelf'),
-		note: z.string(),
-		intent: z.string(),
-	})
-	.meta({
-		title: 'Note To Self',
-		description: 'The fairy leaves a note for itself to remember something next time.',
-	})
-
-type NoteToSelfAction = z.infer<typeof NoteToSelfAction>
-
-export class NoteToSelfActionUtil extends AgentActionUtil<NoteToSelfAction> {
-	static override type = 'noteToSelf' as const
-
-	override getInfo(action: Streaming<NoteToSelfAction>) {
-		// const label = action.complete ? 'Note To Self' : 'Noting to self'
-		return {
-			icon: null,
-			// description: `**${label}**: ${action.intent ?? ''}`,
-			description: `${action.intent ?? ''}`,
-			pose: 'thinking' as const,
-		}
-	}
-
-	override applyAction(action: Streaming<NoteToSelfAction>) {
-		if (!action.complete) return
-		if (!this.agent) return
-
-		this.agent!.schedule({ data: [action.note] })
-	}
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('noteToSelf')) {
-			return null
-		}
-		return NoteToSelfAction
-	}
-}
diff --git a/packages/fairy-shared/src/actions/RandomWikipediaArticleActionUtil.ts b/packages/fairy-shared/src/actions/RandomWikipediaArticleActionUtil.ts
deleted file mode 100644
index 5241d1231a2c..000000000000
--- a/packages/fairy-shared/src/actions/RandomWikipediaArticleActionUtil.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const RandomWikipediaArticleAction = z
-	.object({
-		_type: z.literal('getInspiration'),
-	})
-	.meta({
-		title: 'Get inspiration',
-		description: 'The fairy gets inspiration from a random Wikipedia article.',
-	})
-
-type RandomWikipediaArticleAction = z.infer<typeof RandomWikipediaArticleAction>
-
-export class RandomWikipediaArticleActionUtil extends AgentActionUtil<RandomWikipediaArticleAction> {
-	static override type = 'getInspiration' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('getInspiration')) {
-			return null
-		}
-		return RandomWikipediaArticleAction
-	}
-
-	override getInfo(action: Streaming<RandomWikipediaArticleAction>) {
-		const description = action.complete
-			? 'Got random Wikipedia article'
-			: 'Getting random Wikipedia article'
-		return {
-			icon: 'search' as const,
-			description,
-		}
-	}
-
-	override async applyAction(
-		action: Streaming<RandomWikipediaArticleAction>,
-		_helpers: AgentHelpers
-	) {
-		// Wait until the action has finished streaming
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const article = await fetchRandomWikipediaArticle()
-		this.agent.schedule({ data: [article] })
-	}
-}
-
-export async function fetchRandomWikipediaArticle() {
-	const response = await fetch('https://en.wikipedia.org/api/rest_v1/page/random/summary', {
-		headers: { 'User-Agent': 'tldraw' },
-	})
-
-	if (!response.ok) {
-		throw new Error(`Wikipedia API returned status ${response.status}, ${response.statusText}`)
-	}
-
-	const data: WikipediaApiResponse = await response.json()
-	return {
-		title: data.title,
-		extract: data.extract,
-		url: data.content_urls.desktop.page,
-		pageId: data.pageid,
-	}
-}
-
-interface WikipediaApiResponse {
-	type: string
-	title: string
-	displaytitle: string
-	namespace: {
-		id: number
-		text: string
-	}
-	wikibase_item: string
-	titles: {
-		canonical: string
-		normalized: string
-		display: string
-	}
-	pageid: number
-	thumbnail?: {
-		source: string
-		width: number
-		height: number
-	}
-	originalimage?: {
-		source: string
-		width: number
-		height: number
-	}
-	lang: string
-	dir: string
-	revision: string
-	tid: string
-	timestamp: string
-	description: string
-	description_source: string
-	content_urls: {
-		desktop: {
-			page: string
-			revisions: string
-			edit: string
-			talk: string
-		}
-		mobile: {
-			page: string
-			revisions: string
-			edit: string
-			talk: string
-		}
-	}
-	extract: string
-	extract_html: string
-}
diff --git a/packages/fairy-shared/src/actions/ReviewActionUtil.ts b/packages/fairy-shared/src/actions/ReviewActionUtil.ts
deleted file mode 100644
index 010e71a11fd7..000000000000
--- a/packages/fairy-shared/src/actions/ReviewActionUtil.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Box } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { AreaContextItem } from '../types/ContextItem'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const ReviewAction = z
-	.object({
-		_type: z.literal('review'),
-		intent: z.string(),
-		x: z.number(),
-		y: z.number(),
-		w: z.number(),
-		h: z.number(),
-	})
-	.meta({
-		title: 'Review',
-		description:
-			'The fairy schedules further work or a review so that it can look at the results of its work so far and take further action, such as reviewing what it has done or taking further steps that would benefit from seeing the results of its work so far.',
-	})
-
-type ReviewAction = z.infer<typeof ReviewAction>
-
-export class ReviewActionUtil extends AgentActionUtil<ReviewAction> {
-	static override type = 'review' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('review')) {
-			return null
-		}
-		return ReviewAction
-	}
-
-	override getInfo(action: Streaming<ReviewAction>) {
-		// const label = action.complete ? 'Review' : 'Reviewing'
-		const text = action.intent?.startsWith('#') ? `\n\n${action.intent}` : action.intent
-		// const description = `**${label}:** ${text ?? ''}`
-		const description = `${text ?? ''}`
-
-		return {
-			icon: 'search' as const,
-			description,
-			pose: 'thinking' as const,
-		}
-	}
-
-	override applyAction(action: Streaming<ReviewAction>, helpers: AgentHelpers) {
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const reviewBounds = helpers.removeOffsetFromBox({
-			x: action.x,
-			y: action.y,
-			w: action.w,
-			h: action.h,
-		})
-
-		const contextArea: AreaContextItem = {
-			type: 'area',
-			bounds: reviewBounds,
-			source: 'agent',
-		}
-
-		// If the review area is outside the already-scheduled bounds, expand the bounds to include it
-		const scheduledRequest = this.agent.$scheduledRequest.get()
-		const bounds = scheduledRequest
-			? Box.From(scheduledRequest.bounds).union(reviewBounds)
-			: reviewBounds
-
-		// Schedule the review
-		this.agent.schedule({
-			bounds,
-			message: getReviewMessage(action.intent),
-			contextItems: [contextArea],
-		})
-
-		const fairy = this.agent.$fairy.get()
-		if (!fairy) return
-		if (!action.complete) {
-			this.agent.$fairy.set({ ...fairy, pose: 'thinking' })
-		} else {
-			this.agent.$fairy.set({ ...fairy, pose: 'idle' })
-		}
-	}
-}
-
-function getReviewMessage(intent: string) {
-	return `Examine the actions that you (the agent) took since the most recent user message, with the intent: "${intent}". What's next?
-
-- Are you awaiting a response from the user? If so, there's no need to do or say anything.
-- Is there still more work to do? If so, continue it.
-- Is the task supposed to be complete? If so, it's time to review the results of that. Did you do what the user asked for? Did the plan work? Think through your findings and pay close attention to the image, because that's what you can see right now. If you make any corrections, let the user know what you did and why. If no corrections are needed, there's no need to say anything.
-- Make sure to reference your last actions (denoted by [ACTION]) in order to see if you completed the task. Assume each action you see in the chat history completed successfully.`
-}
diff --git a/packages/fairy-shared/src/actions/StackActionUtil.ts b/packages/fairy-shared/src/actions/StackActionUtil.ts
deleted file mode 100644
index 7514fb4d25e7..000000000000
--- a/packages/fairy-shared/src/actions/StackActionUtil.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { TLShapeId } from '@tldraw/editor'
-import z from 'zod'
-import { AgentHelpers } from '../AgentHelpers'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const StackAction = z
-	.object({
-		_type: z.literal('stack'),
-		direction: z.enum(['vertical', 'horizontal']),
-		gap: z.number(),
-		intent: z.string(),
-		shapeIds: z.array(z.string()),
-	})
-	.meta({
-		title: 'Stack',
-		description:
-			"The fairy stacks shapes horizontally or vertically. Note that this doesn't align shapes, it only stacks them along one axis.",
-	})
-
-type IAgentStackEvent = z.infer<typeof StackAction>
-
-export class StackActionUtil extends AgentActionUtil<IAgentStackEvent> {
-	static override type = 'stack' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('stack')) {
-			return null
-		}
-		return StackAction
-	}
-
-	override getInfo(action: Streaming<IAgentStackEvent>) {
-		return {
-			icon: 'cursor' as const,
-			description: action.intent ?? '',
-		}
-	}
-
-	override sanitizeAction(action: Streaming<IAgentStackEvent>, helpers: AgentHelpers) {
-		if (!action.complete) return action
-
-		action.shapeIds = helpers.ensureShapeIdsExist(action.shapeIds)
-
-		return action
-	}
-
-	override applyAction(action: Streaming<IAgentStackEvent>) {
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const shapeIds = action.shapeIds.map((id) => `shape:${id}` as TLShapeId)
-		this.agent.editor.stackShapes(shapeIds, action.direction, Math.min(action.gap, 1))
-
-		const bounds = this.agent.editor.getShapesPageBounds(shapeIds)
-
-		if (!bounds) {
-			return
-		}
-
-		this.agent.moveToPosition(bounds.center)
-	}
-}
diff --git a/packages/fairy-shared/src/actions/ThinkActionUtil.ts b/packages/fairy-shared/src/actions/ThinkActionUtil.ts
deleted file mode 100644
index 456aab899ae6..000000000000
--- a/packages/fairy-shared/src/actions/ThinkActionUtil.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import z from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const ThinkAction = z
-	.object({
-		_type: z.literal('think'),
-		text: z.string(),
-	})
-	.meta({ title: 'Think', description: 'The fairy describes its intent or reasoning.' })
-
-type ThinkAction = z.infer<typeof ThinkAction>
-
-export class ThinkActionUtil extends AgentActionUtil<ThinkAction> {
-	static override type = 'think' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('think')) {
-			return null
-		}
-		return ThinkAction
-	}
-
-	override getInfo(action: Streaming<ThinkAction>) {
-		const time = Math.floor(action.time / 1000)
-		let summary = `Thought for ${time} seconds`
-		if (time === 0) summary = 'Thought for less than a second'
-		if (time === 1) summary = 'Thought for 1 second'
-
-		return {
-			icon: 'brain' as const,
-			description: action.text ?? (action.complete ? 'Thinking...' : null),
-			summary,
-			pose: 'thinking' as const,
-		}
-	}
-}
diff --git a/packages/fairy-shared/src/actions/TodoListActionUtil.ts b/packages/fairy-shared/src/actions/TodoListActionUtil.ts
deleted file mode 100644
index e17ac01b804a..000000000000
--- a/packages/fairy-shared/src/actions/TodoListActionUtil.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { z } from 'zod'
-import { Streaming } from '../types/Streaming'
-import { AgentActionUtil, AgentActionUtilConstructor } from './AgentActionUtil'
-
-const TodoListAction = z
-	.object({
-		_type: z.literal('update-todo-list'),
-		id: z.number(),
-		status: z.enum(['todo', 'in-progress', 'done']),
-		text: z.string(),
-	})
-	.meta({
-		title: 'Update Todo List',
-		description: 'The fairy updates a current todo list item or creates a new one',
-	})
-
-type TodoListAction = z.infer<typeof TodoListAction>
-
-export class TodoListActionUtil extends AgentActionUtil<TodoListAction> {
-	static override type = 'update-todo-list' as const
-
-	override getSchema(actions: AgentActionUtilConstructor['type'][]) {
-		if (!actions.includes('update-todo-list')) {
-			return null
-		}
-		return TodoListAction
-	}
-
-	override getInfo() {
-		// Don't show todo actions in the chat history because we show them in the dedicated todo list UI
-		return {
-			pose: 'thinking' as const,
-		}
-	}
-
-	override applyAction(action: Streaming<TodoListAction>) {
-		if (!action.complete) return
-		if (!this.agent) return
-
-		const todoItem = {
-			id: action.id,
-			status: action.status,
-			text: action.text,
-		}
-
-		this.agent.$todoList.update((todoItems) => {
-			const index = todoItems.findIndex((item) => item.id === action.id)
-			if (index !== -1) {
-				return [...todoItems.slice(0, index), todoItem, ...todoItems.slice(index + 1)]
-			} else {
-				return [...todoItems, todoItem]
-			}
-		})
-	}
-}
diff --git a/packages/fairy-shared/src/constants.ts b/packages/fairy-shared/src/constants.ts
index af832480c40a..71931e452cdf 100644
--- a/packages/fairy-shared/src/constants.ts
+++ b/packages/fairy-shared/src/constants.ts
@@ -1,4 +1,6 @@
-export const DEFAULT_FAIRY_VISION = {
-	x: 1920,
-	y: 1080,
+import { VecModel } from 'tldraw'
+
+export const FAIRY_VISION_DIMENSIONS: VecModel = {
+	x: 1000,
+	y: 1000,
 }
diff --git a/packages/fairy-shared/src/default-utils.ts b/packages/fairy-shared/src/default-utils.ts
deleted file mode 100644
index 7a379d7e7090..000000000000
--- a/packages/fairy-shared/src/default-utils.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { AddDetailActionUtil } from './actions/AddDetailActionUtil'
-import { AlignActionUtil } from './actions/AlignActionUtil'
-import { BringToFrontActionUtil } from './actions/BringToFrontActionUtil'
-import { ClearActionUtil } from './actions/ClearActionUtil'
-import { CreateActionUtil } from './actions/CreateActionUtil'
-import { DeleteActionUtil } from './actions/DeleteActionUtil'
-import { DistributeActionUtil } from './actions/DistributeActionUtil'
-import { FlyToBoundsActionUtil } from './actions/FlyToBoundsActionUtil'
-import { LabelActionUtil } from './actions/LabelActionUtil'
-import { MessageActionUtil } from './actions/MessageActionUtil'
-import { MoveActionUtil } from './actions/MoveActionUtil'
-import { NoteToSelfActionUtil } from './actions/NoteToSelfActionUtil'
-import { PenActionUtil } from './actions/PenActionUtil'
-import { PlaceActionUtil } from './actions/PlaceActionUtil'
-import { ResizeActionUtil } from './actions/ResizeActionUtil'
-import { ReviewActionUtil } from './actions/ReviewActionUtil'
-import { RotateActionUtil } from './actions/RotateActionUtil'
-import { SendToBackActionUtil } from './actions/SendToBackActionUtil'
-import { StackActionUtil } from './actions/StackActionUtil'
-import { ThinkActionUtil } from './actions/ThinkActionUtil'
-import { TodoListActionUtil } from './actions/TodoListActionUtil'
-import { UnknownActionUtil } from './actions/UnknownActionUtil'
-import { UpdateActionUtil } from './actions/UpdateActionUtil'
-
-import { BlurryShapesPartUtil } from './parts/BlurryShapesPartUtil'
-import { ChatHistoryPartUtil } from './parts/ChatHistoryPartUtil'
-import { ContextItemsPartUtil } from './parts/ContextItemsPartUtil'
-import { DataPartUtil } from './parts/DataPartUtil'
-import { MessagesPartUtil } from './parts/MessagesPartUtil'
-import { ModelNamePartUtil } from './parts/ModelNamePartUtil'
-import { PeripheralShapesPartUtil } from './parts/PeripheralShapesPartUtil'
-import { ScreenshotPartUtil } from './parts/ScreenshotPartUtil'
-import { SelectedShapesPartUtil } from './parts/SelectedShapesPartUtil'
-import { SystemPromptPartUtil } from './parts/SystemPromptPartUtil'
-import { TimePartUtil } from './parts/TimePartUtil'
-import { TodoListPartUtil } from './parts/TodoListPartUtil'
-import { UserActionHistoryPartUtil } from './parts/UserActionHistoryPartUtil'
-import { ViewportBoundsPartUtil } from './parts/ViewportBoundsPartUtil'
-
-export const DEFAULT_FAIRY_ACTIONS = [
-	// Communication
-	MessageActionUtil,
-
-	// Planning
-	ThinkActionUtil,
-	ReviewActionUtil,
-	AddDetailActionUtil,
-	TodoListActionUtil,
-	FlyToBoundsActionUtil,
-	NoteToSelfActionUtil,
-
-	// Individual shapes
-	CreateActionUtil,
-	DeleteActionUtil,
-	UpdateActionUtil,
-	LabelActionUtil,
-	MoveActionUtil,
-
-	// Groups of shapes
-	PlaceActionUtil,
-	BringToFrontActionUtil,
-	SendToBackActionUtil,
-	RotateActionUtil,
-	ResizeActionUtil,
-	AlignActionUtil,
-	DistributeActionUtil,
-	StackActionUtil,
-	ClearActionUtil,
-
-	// Drawing
-	PenActionUtil,
-
-	// Internal (required)
-	UnknownActionUtil,
-].map((ActionUtil) => ActionUtil.type)
-
-export const DEFAULT_FAIRY_PROMPT_PARTS = [
-	// Model
-	SystemPromptPartUtil,
-	ModelNamePartUtil,
-
-	// Request
-	MessagesPartUtil,
-	DataPartUtil,
-	ContextItemsPartUtil,
-
-	// Viewport
-	ScreenshotPartUtil,
-	ViewportBoundsPartUtil,
-
-	// Shapes
-	BlurryShapesPartUtil,
-	PeripheralShapesPartUtil,
-	SelectedShapesPartUtil,
-
-	// History
-	ChatHistoryPartUtil,
-	UserActionHistoryPartUtil,
-	TodoListPartUtil,
-
-	// Metadata
-	TimePartUtil,
-].map((PromptPartUtil) => PromptPartUtil.type)
diff --git a/packages/fairy-shared/src/format/BlurryShape.ts b/packages/fairy-shared/src/format/BlurryShape.ts
index 0511d1821b5c..60adfa44b616 100644
--- a/packages/fairy-shared/src/format/BlurryShape.ts
+++ b/packages/fairy-shared/src/format/BlurryShape.ts
@@ -1,11 +1,14 @@
-import { FocusedShape } from './FocusedShape'
+import z from 'zod'
+import { FocusedShapeTypeSchema } from './FocusedShape'
 
-export interface BlurryShape {
-	shapeId: string
-	text?: string
-	type: FocusedShape['_type']
-	x: number
-	y: number
-	w: number
-	h: number
-}
+export const BlurryShapeSchema = z.object({
+	shapeId: z.string(),
+	text: z.string().optional(),
+	type: FocusedShapeTypeSchema,
+	x: z.number(),
+	y: z.number(),
+	w: z.number(),
+	h: z.number(),
+})
+
+export type BlurryShape = z.infer<typeof BlurryShapeSchema>
diff --git a/packages/fairy-shared/src/format/SimpleColor.ts b/packages/fairy-shared/src/format/FocusColor.ts
similarity index 58%
rename from packages/fairy-shared/src/format/SimpleColor.ts
rename to packages/fairy-shared/src/format/FocusColor.ts
index 6d45cf9fbc5d..32aa576c21e4 100644
--- a/packages/fairy-shared/src/format/SimpleColor.ts
+++ b/packages/fairy-shared/src/format/FocusColor.ts
@@ -1,6 +1,6 @@
 import z from 'zod'
 
-export const SimpleColor = z.enum([
+export const FocusColorSchema = z.enum([
 	'red',
 	'light-red',
 	'green',
@@ -16,11 +16,11 @@ export const SimpleColor = z.enum([
 	'white',
 ])
 
-export type ISimpleColor = z.infer<typeof SimpleColor>
+export type FocusColor = z.infer<typeof FocusColorSchema>
 
-export function asColor(color: string): ISimpleColor {
-	if (SimpleColor.safeParse(color).success) {
-		return color as ISimpleColor
+export function asColor(color: string): FocusColor {
+	if (FocusColorSchema.safeParse(color).success) {
+		return color as FocusColor
 	}
 
 	switch (color) {
diff --git a/packages/fairy-shared/src/format/FocusFill.ts b/packages/fairy-shared/src/format/FocusFill.ts
new file mode 100644
index 000000000000..6d49a7b29a54
--- /dev/null
+++ b/packages/fairy-shared/src/format/FocusFill.ts
@@ -0,0 +1,31 @@
+import { TLDefaultFillStyle } from '@tldraw/editor'
+import z from 'zod'
+
+export const FocusFillSchema = z.enum(['none', 'tint', 'background', 'solid', 'pattern'])
+
+export type FocusFill = z.infer<typeof FocusFillSchema>
+
+const FOCUS_TO_TLDRAW_FILLS: Record<FocusFill, TLDefaultFillStyle> = {
+	none: 'none',
+	solid: 'lined-fill',
+	background: 'semi',
+	tint: 'solid',
+	pattern: 'pattern',
+}
+
+const TLDRAW_TO_FOCUS_FILLS: Record<TLDefaultFillStyle, FocusFill> = {
+	none: 'none',
+	fill: 'solid',
+	'lined-fill': 'solid',
+	semi: 'background',
+	solid: 'tint',
+	pattern: 'pattern',
+}
+
+export function convertFocusFillToTldrawFill(fill: FocusFill): TLDefaultFillStyle {
+	return FOCUS_TO_TLDRAW_FILLS[fill]
+}
+
+export function convertTldrawFillToFocusFill(fill: TLDefaultFillStyle): FocusFill {
+	return TLDRAW_TO_FOCUS_FILLS[fill]
+}
diff --git a/packages/fairy-shared/src/format/SimpleFontSize.ts b/packages/fairy-shared/src/format/FocusFontSize.ts
similarity index 83%
rename from packages/fairy-shared/src/format/SimpleFontSize.ts
rename to packages/fairy-shared/src/format/FocusFontSize.ts
index eeb3f3b7afe9..2fffc383c1af 100644
--- a/packages/fairy-shared/src/format/SimpleFontSize.ts
+++ b/packages/fairy-shared/src/format/FocusFontSize.ts
@@ -1,14 +1,14 @@
 import { FONT_SIZES } from 'tldraw'
-import { z } from 'zod'
+import z from 'zod'
 
-export const SimpleFontSize = z.number()
+export const FocusFontSizeSchema = z.number()
 
 /**
  * Calculates the closest predefined font size and scale combination to achieve a target font size
  * @param targetFontSize - The desired font size in pixels
  * @returns An object containing the closest predefined font size key and the scale factor
  */
-export function convertSimpleFontSizeToTldrawFontSizeAndScale(targetFontSize: number) {
+export function convertFocusFontSizeToTldrawFontSize(targetFontSize: number) {
 	const fontSizeEntries = Object.entries(FONT_SIZES)
 	let closestSize = fontSizeEntries[0]
 	let minDifference = Math.abs(targetFontSize - closestSize[1])
@@ -34,7 +34,7 @@ export function convertSimpleFontSizeToTldrawFontSizeAndScale(targetFontSize: nu
  * @param scale - The tldraw scale
  * @returns The simple font size
  */
-export function convertTldrawFontSizeAndScaleToSimpleFontSize(
+export function convertTldrawFontSizeToFocusFontSize(
 	textSize: keyof typeof FONT_SIZES,
 	scale: number
 ) {
diff --git a/packages/fairy-shared/src/format/FocusedShape.ts b/packages/fairy-shared/src/format/FocusedShape.ts
index 9920976716b2..ad9265f5e68c 100644
--- a/packages/fairy-shared/src/format/FocusedShape.ts
+++ b/packages/fairy-shared/src/format/FocusedShape.ts
@@ -1,30 +1,54 @@
 import { z } from 'zod'
-import { SimpleColor } from './SimpleColor'
-import { SimpleFillSchema } from './SimpleFill'
-import { SimpleFontSize } from './SimpleFontSize'
-import { SimpleGeoShapeTypeSchema } from './SimpleGeoShapeType'
+import { FocusColorSchema } from './FocusColor'
+import { FocusFillSchema } from './FocusFill'
+import { FocusFontSizeSchema } from './FocusFontSize'
+
+const FocusedLabelSchema = z.string()
+
+export const FocusedGeoTypeSchema = z.enum([
+	'rectangle',
+	'ellipse',
+	'triangle',
+	'diamond',
+	'hexagon',
+	'pill',
+	'cloud',
+	'x-box',
+	'check-box',
+	'heart',
+	'pentagon',
+	'octagon',
+	'star',
+	'parallelogram-right',
+	'parallelogram-left',
+	'trapezoid',
+	'fat-arrow-right',
+	'fat-arrow-left',
+	'fat-arrow-up',
+	'fat-arrow-down',
+])
 
-const SimpleLabel = z.string()
+export type FocusedGeoType = z.infer<typeof FocusedGeoTypeSchema>
 
-export const FocusedGeoShape = z.object({
-	_type: SimpleGeoShapeTypeSchema,
-	color: SimpleColor,
-	fill: SimpleFillSchema,
+export const FocusedGeoShapeSchema = z.object({
+	_type: FocusedGeoTypeSchema,
+	color: FocusColorSchema,
+	fill: FocusFillSchema,
 	h: z.number(),
 	note: z.string(),
 	shapeId: z.string(),
-	text: SimpleLabel.optional(),
+	text: FocusedLabelSchema.optional(),
 	textAlign: z.enum(['start', 'middle', 'end']).optional(),
 	w: z.number(),
 	x: z.number(),
 	y: z.number(),
 })
 
-export type FocusedGeoShape = z.infer<typeof FocusedGeoShape>
+export type FocusedGeoShape = z.infer<typeof FocusedGeoShapeSchema>
 
-const FocusedLineShape = z.object({
+export const FocusedLineShapeSchema = z.object({
 	_type: z.literal('line'),
-	color: SimpleColor,
+	color: FocusColorSchema,
 	note: z.string(),
 	shapeId: z.string(),
 	x1: z.number(),
@@ -33,21 +57,21 @@ const FocusedLineShape = z.object({
 	y2: z.number(),
 })
 
-export type FocusedLineShape = z.infer<typeof FocusedLineShape>
+export type FocusedLineShape = z.infer<typeof FocusedLineShapeSchema>
 
-const FocusedNoteShape = z.object({
+export const FocusedNoteShapeSchema = z.object({
 	_type: z.literal('note'),
-	color: SimpleColor,
+	color: FocusColorSchema,
 	note: z.string(),
 	shapeId: z.string(),
-	text: SimpleLabel.optional(),
+	text: FocusedLabelSchema.optional(),
 	x: z.number(),
 	y: z.number(),
 })
 
-export type FocusedNoteShape = z.infer<typeof FocusedNoteShape>
+export type FocusedNoteShape = z.infer<typeof FocusedNoteShapeSchema>
 
-const FocusedTextAnchor = z.enum([
+export const FocusedTextAnchorSchema = z.enum([
 	'bottom-center',
 	'bottom-left',
 	'bottom-right',
@@ -59,17 +83,17 @@ const FocusedTextAnchor = z.enum([
 	'top-right',
 ])
 
-export type FocusedTextAnchor = z.infer<typeof FocusedTextAnchor>
+export type FocusedTextAnchor = z.infer<typeof FocusedTextAnchorSchema>
 
-const FocusedTextShape = z
+const FocusedTextShapeSchema = z
 	.object({
 		_type: z.literal('text'),
-		anchor: FocusedTextAnchor,
-		color: SimpleColor,
-		fontSize: SimpleFontSize.optional(),
+		anchor: FocusedTextAnchorSchema,
+		color: FocusColorSchema,
+		fontSize: FocusFontSizeSchema.optional(),
 		note: z.string(),
 		shapeId: z.string(),
-		text: SimpleLabel,
+		text: FocusedLabelSchema,
 		width: z.number().optional(),
 		wrap: z.boolean().optional(),
 		x: z.number(),
@@ -81,11 +105,11 @@ const FocusedTextShape = z
 			'A text shape is a shape that contains text. The `anchor` property indicates how the text shape is positioned and aligned. For example, the "top-left" anchor means the text shape\'s x and y coordinates are the top left corner of the text shape, and the text gets left aligned. A shape with the "bottom-center" anchor means the text shape\'s x and y coordinates are the bottom center of the text shape, and the text gets center aligned on the horizontal axis. If `wrap` is set to true, the text will automatically wrap text to the next line if it exceeds the width of the shape (there is no need to add manual line breaks for word wrapping if `wrap` is enabled).',
 	})
 
-export type FocusedTextShape = z.infer<typeof FocusedTextShape>
+export type FocusedTextShape = z.infer<typeof FocusedTextShapeSchema>
 
-const FocusedArrowShape = z.object({
+export const FocusedArrowShapeSchema = z.object({
 	_type: z.literal('arrow'),
-	color: SimpleColor,
+	color: FocusColorSchema,
 	fromId: z.string().nullable(),
 	note: z.string(),
 	shapeId: z.string(),
@@ -98,13 +122,13 @@ const FocusedArrowShape = z.object({
 	bend: z.number().optional(),
 })
 
-export type FocusedArrowShape = z.infer<typeof FocusedArrowShape>
+export type FocusedArrowShape = z.infer<typeof FocusedArrowShapeSchema>
 
-const FocusedDrawShape = z
+const FocusedDrawShapeSchema = z
 	.object({
 		_type: z.literal('draw'),
-		color: SimpleColor,
-		fill: SimpleFillSchema.optional(),
+		color: FocusColorSchema,
+		fill: FocusFillSchema.optional(),
 		note: z.string(),
 		shapeId: z.string(),
 	})
@@ -114,9 +138,9 @@ const FocusedDrawShape = z
 			'A draw shape is a freeform shape that was drawn by the pen tool. IMPORTANT: Do not create draw shapes with the "create" action. To create new draw shapes, the AI must use the pen event because it gives more control.',
 	})
 
-export type FocusedDrawShape = z.infer<typeof FocusedDrawShape>
+export type FocusedDrawShape = z.infer<typeof FocusedDrawShapeSchema>
 
-const FocusedUnknownShape = z
+const FocusedUnknownShapeSchema = z
 	.object({
 		_type: z.literal('unknown'),
 		note: z.string(),
@@ -131,28 +155,30 @@ const FocusedUnknownShape = z
 			"A special shape that is not represented by one of the canvas's core shape types. The AI cannot create these shapes, but it *can* interact with them. eg: The AI can move these shapes. The `subType` property contains the internal name of the shape's type.",
 	})
 
-export type FocusedUnknownShape = z.infer<typeof FocusedUnknownShape>
+export type FocusedUnknownShape = z.infer<typeof FocusedUnknownShapeSchema>
 
-const FOCUSED_SHAPES = [
-	FocusedDrawShape,
-	FocusedGeoShape,
-	FocusedLineShape,
-	FocusedTextShape,
-	FocusedArrowShape,
-	FocusedNoteShape,
-	FocusedUnknownShape,
+const FOCUSED_SHAPES_SCHEMAS = [
+	FocusedDrawShapeSchema,
+	FocusedGeoShapeSchema,
+	FocusedLineShapeSchema,
+	FocusedTextShapeSchema,
+	FocusedArrowShapeSchema,
+	FocusedNoteShapeSchema,
+	FocusedUnknownShapeSchema,
 ] as const
-export const FocusedShapeSchema = z.union(FOCUSED_SHAPES)
-
+export const FocusedShapeSchema = z.union(FOCUSED_SHAPES_SCHEMAS)
+export const FocusedShapePartialSchema = z.union(
+	FOCUSED_SHAPES_SCHEMAS.map((schema) => schema.partial())
+)
 export type FocusedShape = z.infer<typeof FocusedShapeSchema>
-
+export type FocusedShapePartial = z.infer<typeof FocusedShapePartialSchema>
 /**
  * Extract all shape type names from the schema
  */
-export function getFocusedShapeSchemaNames() {
+function getFocusedShapeTypes() {
 	const typeNames: FocusedShape['_type'][] = []
 
-	for (const shapeSchema of FOCUSED_SHAPES) {
+	for (const shapeSchema of FOCUSED_SHAPES_SCHEMAS) {
 		const typeField = shapeSchema.shape._type
 
 		if (typeField) {
@@ -169,3 +195,7 @@ export function getFocusedShapeSchemaNames() {
 
 	return typeNames
 }
+
+export const FOCUSED_SHAPE_TYPES = getFocusedShapeTypes()
+export const FocusedShapeTypeSchema = z.union(FOCUSED_SHAPE_TYPES.map((name) => z.literal(name)))
+export type FocusedShapeType = z.infer<typeof FocusedShapeTypeSchema>
diff --git a/packages/fairy-shared/src/format/OtherFairy.ts b/packages/fairy-shared/src/format/OtherFairy.ts
new file mode 100644
index 000000000000..96a9837356eb
--- /dev/null
+++ b/packages/fairy-shared/src/format/OtherFairy.ts
@@ -0,0 +1,19 @@
+import z from 'zod'
+import { BoxModelSchema } from './PeripheralCluster'
+
+export const VecModelSchema = z.object({
+	x: z.number(),
+	y: z.number(),
+})
+
+export const OtherFairySchema = z.object({
+	id: z.string(),
+	name: z.string(),
+	position: VecModelSchema,
+	isGenerating: z.boolean(),
+	bounds: BoxModelSchema.nullable(),
+	personality: z.string(),
+	currentProjectId: z.string().nullable(),
+})
+
+export type OtherFairy = z.infer<typeof OtherFairySchema>
diff --git a/packages/fairy-shared/src/format/PeripheralCluster.ts b/packages/fairy-shared/src/format/PeripheralCluster.ts
new file mode 100644
index 000000000000..5105c1689485
--- /dev/null
+++ b/packages/fairy-shared/src/format/PeripheralCluster.ts
@@ -0,0 +1,15 @@
+import z from 'zod'
+
+export const BoxModelSchema = z.object({
+	x: z.number(),
+	y: z.number(),
+	w: z.number(),
+	h: z.number(),
+})
+
+export const PeripheralClusterSchema = z.object({
+	bounds: BoxModelSchema,
+	numberOfShapes: z.number(),
+})
+
+export type PeripheralCluster = z.infer<typeof PeripheralClusterSchema>
diff --git a/packages/fairy-shared/src/format/PeripheralShapesCluster.ts b/packages/fairy-shared/src/format/PeripheralShapesCluster.ts
deleted file mode 100644
index 57b8eb94c2ec..000000000000
--- a/packages/fairy-shared/src/format/PeripheralShapesCluster.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { BoxModel } from '@tldraw/editor'
-
-export interface PeripheralShapeCluster {
-	bounds: BoxModel
-	numberOfShapes: number
-}
diff --git a/packages/fairy-shared/src/format/SimpleFill.ts b/packages/fairy-shared/src/format/SimpleFill.ts
deleted file mode 100644
index 6b21a7d4851d..000000000000
--- a/packages/fairy-shared/src/format/SimpleFill.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { TLDefaultFillStyle } from '@tldraw/editor'
-import z from 'zod'
-
-export const SimpleFillSchema = z.enum(['none', 'tint', 'background', 'solid', 'pattern'])
-
-export type SimpleFill = z.infer<typeof SimpleFillSchema>
-
-const SIMPLE_TO_SHAPE_FILLS: Record<SimpleFill, TLDefaultFillStyle> = {
-	none: 'none',
-	solid: 'fill',
-	background: 'semi',
-	tint: 'solid',
-	pattern: 'pattern',
-}
-
-const SHAPE_TO_SIMPLE_FILLS: Record<TLDefaultFillStyle, SimpleFill> = {
-	none: 'none',
-	fill: 'solid',
-	semi: 'background',
-	solid: 'tint',
-	pattern: 'pattern',
-}
-
-export function convertSimpleFillToTldrawFill(fill: SimpleFill): TLDefaultFillStyle {
-	return SIMPLE_TO_SHAPE_FILLS[fill]
-}
-
-export function convertTldrawFillToSimpleFill(fill: TLDefaultFillStyle): SimpleFill {
-	return SHAPE_TO_SIMPLE_FILLS[fill]
-}
diff --git a/packages/fairy-shared/src/format/SimpleGeoShapeType.ts b/packages/fairy-shared/src/format/SimpleGeoShapeType.ts
deleted file mode 100644
index 33906a476c59..000000000000
--- a/packages/fairy-shared/src/format/SimpleGeoShapeType.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { z } from 'zod'
-
-export const SimpleGeoShapeTypeSchema = z.enum([
-	'rectangle',
-	'ellipse',
-	'triangle',
-	'diamond',
-	'hexagon',
-	'pill',
-	'cloud',
-	'x-box',
-	'check-box',
-	'heart',
-	'pentagon',
-	'octagon',
-	'star',
-	'parallelogram-right',
-	'parallelogram-left',
-	'trapezoid',
-	'fat-arrow-right',
-	'fat-arrow-left',
-	'fat-arrow-up',
-	'fat-arrow-down',
-])
-
-export type SimpleGeoShapeType = z.infer<typeof SimpleGeoShapeTypeSchema>
diff --git a/packages/fairy-shared/src/format/convertFocusedShapeToTldrawShape.ts b/packages/fairy-shared/src/format/convertFocusedShapeToTldrawShape.ts
index 5d5ded2efc72..4240f77d140f 100644
--- a/packages/fairy-shared/src/format/convertFocusedShapeToTldrawShape.ts
+++ b/packages/fairy-shared/src/format/convertFocusedShapeToTldrawShape.ts
@@ -17,21 +17,21 @@ import {
 	VecLike,
 } from '@tldraw/editor'
 import { FONT_SIZES } from 'tldraw'
+import { getDummyBounds } from './convertTldrawShapeToFocusedShape'
+import { asColor } from './FocusColor'
 import {
 	FocusedArrowShape,
 	FocusedDrawShape,
 	FocusedGeoShape,
+	FocusedGeoType,
 	FocusedLineShape,
 	FocusedNoteShape,
 	FocusedShape,
 	FocusedTextShape,
 	FocusedUnknownShape,
 } from './FocusedShape'
-import { asColor } from './SimpleColor'
-import { convertSimpleFillToTldrawFill } from './SimpleFill'
-import { convertSimpleFontSizeToTldrawFontSizeAndScale } from './SimpleFontSize'
-import { SimpleGeoShapeType } from './SimpleGeoShapeType'
-import { getDummyBounds } from './convertTldrawShapeToFocusedShape'
+import { convertFocusFillToTldrawFill } from './FocusFill'
+import { convertFocusFontSizeToTldrawFontSize } from './FocusFontSize'
 
 /**
  * Convert a FocusedShape to a shape object to a tldraw shape using defaultShape for fallback values
@@ -97,18 +97,16 @@ export function convertSimpleTypeToTldrawType(
 	type: FocusedShape['_type']
 ): TLGeoShapeGeoStyle | TLDefaultShape['type'] | 'unknown' {
 	if (type in SIMPLE_TO_GEO_TYPES) {
-		return convertSimpleGeoTypeToTldrawGeoGeoType(type as SimpleGeoShapeType) as TLGeoShapeGeoStyle
+		return convertSimpleGeoTypeToTldrawGeoGeoType(type as FocusedGeoType) as TLGeoShapeGeoStyle
 	}
 	return type as TLDefaultShape['type'] | 'unknown'
 }
 
-export function convertSimpleGeoTypeToTldrawGeoGeoType(
-	type: SimpleGeoShapeType
-): TLGeoShapeGeoStyle {
+export function convertSimpleGeoTypeToTldrawGeoGeoType(type: FocusedGeoType): TLGeoShapeGeoStyle {
 	return SIMPLE_TO_GEO_TYPES[type]
 }
 
-export const SIMPLE_TO_GEO_TYPES: Record<SimpleGeoShapeType, TLGeoShapeGeoStyle> = {
+export const SIMPLE_TO_GEO_TYPES: Record<FocusedGeoType, TLGeoShapeGeoStyle> = {
 	rectangle: 'rectangle',
 	ellipse: 'ellipse',
 	triangle: 'triangle',
@@ -145,7 +143,7 @@ function convertTextShapeToTldrawShape(
 
 	if (focusedShape.fontSize) {
 		const { textSize: calculatedTextSize, scale: calculatedScale } =
-			convertSimpleFontSizeToTldrawFontSizeAndScale(focusedShape.fontSize)
+			convertFocusFontSizeToTldrawFontSize(focusedShape.fontSize)
 		textSize = calculatedTextSize
 		scale = calculatedScale
 	} else if (defaultTextShape.props?.size) {
@@ -465,11 +463,11 @@ function convertGeoShapeToTldrawShape(
 	// Handle fill properly - simpleShape takes priority
 	let fill
 	if (focusedShape.fill !== undefined) {
-		fill = convertSimpleFillToTldrawFill(focusedShape.fill)
+		fill = convertFocusFillToTldrawFill(focusedShape.fill)
 	} else if (defaultGeoShape.props?.fill) {
 		fill = defaultGeoShape.props.fill
 	} else {
-		fill = convertSimpleFillToTldrawFill('none')
+		fill = convertFocusFillToTldrawFill('none')
 	}
 
 	return {
@@ -570,11 +568,11 @@ function convertDrawShapeToTldrawShape(
 	// Handle fill properly - simpleShape takes priority
 	let fill
 	if (focusedShape.fill !== undefined) {
-		fill = convertSimpleFillToTldrawFill(focusedShape.fill)
+		fill = convertFocusFillToTldrawFill(focusedShape.fill)
 	} else if (defaultDrawShape.props?.fill) {
 		fill = defaultDrawShape.props.fill
 	} else {
-		fill = convertSimpleFillToTldrawFill('none')
+		fill = convertFocusFillToTldrawFill('none')
 	}
 
 	const segments = defaultDrawShape.props?.segments ?? []
@@ -595,6 +593,7 @@ function convertDrawShapeToTldrawShape(
 			isLocked: defaultDrawShape.isLocked ?? false,
 			opacity: defaultDrawShape.opacity ?? 1,
 			props: {
+				...editor.getShapeUtil('draw').getDefaultProps(),
 				color: asColor(focusedShape.color ?? defaultDrawShape.props?.color ?? 'black'),
 				fill,
 			},
@@ -624,7 +623,7 @@ function convertUnknownShapeToTldrawShape(
 			parentId: defaultShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultShape.isLocked ?? false,
 			opacity: defaultShape.opacity ?? 1,
-			props: defaultShape.props ?? {},
+			props: defaultShape.props ?? ({} as any),
 			meta: {
 				note: focusedShape.note ?? defaultShape.meta?.note ?? '',
 			},
diff --git a/packages/fairy-shared/src/format/convertTldrawShapeToBlurryShape.ts b/packages/fairy-shared/src/format/convertTldrawShapeToBlurryShape.ts
index 1c1e880709ab..f2631ca08731 100644
--- a/packages/fairy-shared/src/format/convertTldrawShapeToBlurryShape.ts
+++ b/packages/fairy-shared/src/format/convertTldrawShapeToBlurryShape.ts
@@ -2,7 +2,7 @@ import { Editor, TLShape } from '@tldraw/editor'
 import { BlurryShape } from './BlurryShape'
 import {
 	convertTldrawIdToSimpleId,
-	convertTldrawShapeToSimpleType,
+	convertTldrawShapeToFocusedType,
 } from './convertTldrawShapeToFocusedShape'
 import { FocusedShape } from './FocusedShape'
 
@@ -19,7 +19,7 @@ export function convertTldrawShapeToBlurryShape(
 	const util = editor.getShapeUtil(shape)
 	const text = util.getText(shape)
 
-	const shapeType = convertTldrawShapeToSimpleType(shape)
+	const shapeType = convertTldrawShapeToFocusedType(shape)
 
 	return {
 		x: Math.round(bounds.x),
diff --git a/packages/fairy-shared/src/format/convertTldrawShapeToFocusedShape.ts b/packages/fairy-shared/src/format/convertTldrawShapeToFocusedShape.ts
index abad51fc4d51..882cba5a5651 100644
--- a/packages/fairy-shared/src/format/convertTldrawShapeToFocusedShape.ts
+++ b/packages/fairy-shared/src/format/convertTldrawShapeToFocusedShape.ts
@@ -15,10 +15,13 @@ import {
 	TLTextShape,
 	Vec,
 } from '@tldraw/editor'
+import { convertTldrawFillToFocusFill } from './FocusFill'
+import { convertTldrawFontSizeToFocusFontSize } from './FocusFontSize'
 import {
 	FocusedArrowShape,
 	FocusedDrawShape,
 	FocusedGeoShape,
+	FocusedGeoType,
 	FocusedLineShape,
 	FocusedNoteShape,
 	FocusedShape,
@@ -26,12 +29,9 @@ import {
 	FocusedTextShape,
 	FocusedUnknownShape,
 } from './FocusedShape'
-import { convertTldrawFillToSimpleFill } from './SimpleFill'
-import { convertTldrawFontSizeAndScaleToSimpleFontSize } from './SimpleFontSize'
-import { SimpleGeoShapeType } from './SimpleGeoShapeType'
 
 /**
- * Convert a tldraw shape to a simple shape
+ * Convert a tldraw shape to a focused shape
  */
 export function convertTldrawShapeToFocusedShape(editor: Editor, shape: TLShape): FocusedShape {
 	switch (shape.type) {
@@ -52,7 +52,7 @@ export function convertTldrawShapeToFocusedShape(editor: Editor, shape: TLShape)
 	}
 }
 
-export function convertTldrawShapeToSimpleType(shape: TLShape): FocusedShape['_type'] {
+export function convertTldrawShapeToFocusedType(shape: TLShape): FocusedShape['_type'] {
 	switch (shape.type) {
 		case 'geo': {
 			const geoShape = shape as TLGeoShape
@@ -69,7 +69,7 @@ export function convertTldrawShapeToSimpleType(shape: TLShape): FocusedShape['_t
 	}
 }
 
-const GEO_TO_SIMPLE_TYPES: Record<TLGeoShapeGeoStyle, SimpleGeoShapeType> = {
+const GEO_TO_SIMPLE_TYPES: Record<TLGeoShapeGeoStyle, FocusedGeoType> = {
 	rectangle: 'rectangle',
 	ellipse: 'ellipse',
 	triangle: 'triangle',
@@ -100,7 +100,7 @@ function convertDrawShapeToFocused(editor: Editor, shape: TLDrawShape): FocusedD
 	return {
 		_type: 'draw',
 		color: shape.props.color,
-		fill: convertTldrawFillToSimpleFill(shape.props.fill),
+		fill: convertTldrawFillToFocusFill(shape.props.fill),
 		note: (shape.meta.note as string) ?? '',
 		shapeId: convertTldrawIdToSimpleId(shape.id),
 	}
@@ -139,7 +139,7 @@ function convertTextShapeToFocused(editor: Editor, shape: TLTextShape): FocusedT
 		_type: 'text',
 		anchor,
 		color: shape.props.color,
-		fontSize: convertTldrawFontSizeAndScaleToSimpleFontSize(textSize, shape.props.scale),
+		fontSize: convertTldrawFontSizeToFocusFontSize(textSize, shape.props.scale),
 		note: (shape.meta.note as string) ?? '',
 		shapeId: convertTldrawIdToSimpleId(shape.id),
 		text: text,
@@ -173,7 +173,7 @@ function convertGeoShapeToFocused(editor: Editor, shape: TLGeoShape): FocusedGeo
 	return {
 		_type: GEO_TO_SIMPLE_TYPES[shape.props.geo],
 		color: shape.props.color,
-		fill: convertTldrawFillToSimpleFill(shape.props.fill),
+		fill: convertTldrawFillToFocusFill(shape.props.fill),
 		h: shape.props.h,
 		note: (shape.meta.note as string) ?? '',
 		shapeId: convertTldrawIdToSimpleId(shape.id),
@@ -269,10 +269,8 @@ export function getDummyBounds(editor: Editor, shape: TLShape): Box {
 			() => {
 				const dummyId = createShapeId()
 				editor.createShape({
+					...shape,
 					id: dummyId,
-					type: shape.type,
-					props: shape.props,
-					meta: shape.meta,
 				})
 				dummyBounds = editor.getShapePageBounds(dummyId)
 			},
diff --git a/packages/fairy-shared/src/format/convertTldrawShapesToPeripheralShapes.ts b/packages/fairy-shared/src/format/convertTldrawShapesToPeripheralShapes.ts
index de9cca1728b9..ceba54d61474 100644
--- a/packages/fairy-shared/src/format/convertTldrawShapesToPeripheralShapes.ts
+++ b/packages/fairy-shared/src/format/convertTldrawShapesToPeripheralShapes.ts
@@ -1,11 +1,11 @@
 import { Box, Editor, TLShape } from '@tldraw/editor'
-import { PeripheralShapeCluster } from './PeripheralShapesCluster'
+import { PeripheralCluster } from './PeripheralCluster'
 
 export function convertTldrawShapesToPeripheralShapes(
 	editor: Editor,
 	shapes: TLShape[],
 	{ padding = 0 }: { padding?: number } = {}
-): PeripheralShapeCluster[] {
+): PeripheralCluster[] {
 	if (shapes.length === 0) return []
 	const groups: { shapes: TLShape[]; bounds: Box; numberOfShapes: number }[] = []
 
diff --git a/packages/fairy-shared/src/index.ts b/packages/fairy-shared/src/index.ts
index 3f8733e9452f..f80a5e8b5ee1 100644
--- a/packages/fairy-shared/src/index.ts
+++ b/packages/fairy-shared/src/index.ts
@@ -1,65 +1,19 @@
 /* eslint-disable local/no-export-star */
 
-// Actions
-export * from './actions/AddDetailActionUtil'
-export * from './actions/AgentActionUtil'
-export * from './actions/AlignActionUtil'
-export * from './actions/BringToFrontActionUtil'
-export * from './actions/ClearActionUtil'
-export * from './actions/CountryInfoActionUtil'
-export * from './actions/CountShapesActionUtil'
-export * from './actions/CreateActionUtil'
-export * from './actions/DeleteActionUtil'
-export * from './actions/DistributeActionUtil'
-export * from './actions/FlyToBoundsActionUtil'
-export * from './actions/LabelActionUtil'
-export * from './actions/MessageActionUtil'
-export * from './actions/MoveActionUtil'
-export * from './actions/NoteToSelfActionUtil'
-export * from './actions/PenActionUtil'
-export * from './actions/PlaceActionUtil'
-export * from './actions/RandomWikipediaArticleActionUtil'
-export * from './actions/ResizeActionUtil'
-export * from './actions/ReviewActionUtil'
-export * from './actions/RotateActionUtil'
-export * from './actions/SendToBackActionUtil'
-export * from './actions/StackActionUtil'
-export * from './actions/ThinkActionUtil'
-export * from './actions/TodoListActionUtil'
-export * from './actions/UnknownActionUtil'
-export * from './actions/UpdateActionUtil'
-
-// Parts
-export * from './parts/BlurryShapesPartUtil'
-export * from './parts/ChatHistoryPartUtil'
-export * from './parts/ContextItemsPartUtil'
-export * from './parts/DataPartUtil'
-export * from './parts/MessagesPartUtil'
-export * from './parts/ModelNamePartUtil'
-export * from './parts/PeripheralShapesPartUtil'
-export * from './parts/PromptPartUtil'
-export * from './parts/ScreenshotPartUtil'
-export * from './parts/SelectedShapesPartUtil'
-export * from './parts/SystemPromptPartUtil'
-export * from './parts/TimePartUtil'
-export * from './parts/TodoListPartUtil'
-export * from './parts/UserActionHistoryPartUtil'
-export * from './parts/ViewportBoundsPartUtil'
-
 // Format
 export type * from './format/BlurryShape'
 export * from './format/convertFocusedShapeToTldrawShape'
 export * from './format/convertTldrawShapesToPeripheralShapes'
 export * from './format/convertTldrawShapeToBlurryShape'
 export * from './format/convertTldrawShapeToFocusedShape'
+export * from './format/FocusColor'
 export * from './format/FocusedShape'
-export type * from './format/PeripheralShapesCluster'
-export * from './format/SimpleColor'
-export * from './format/SimpleFill'
-export * from './format/SimpleFontSize'
-export * from './format/SimpleGeoShapeType'
+export * from './format/FocusFill'
+export * from './format/FocusFontSize'
 
 // Types (these are type-only exports)
+export type * from './format/OtherFairy'
+export type * from './format/PeripheralCluster'
 export type * from './types/AgentAction'
 export type * from './types/AgentActionInfo'
 export type * from './types/AgentInput'
@@ -70,31 +24,32 @@ export type * from './types/BaseAgentAction'
 export type * from './types/BasePromptPart'
 export type * from './types/ChatHistoryItem'
 export type * from './types/ContextItem'
-export type * from './types/FairyEntity'
+export type * from './types/FairyConfig'
+export type * from './types/FairyProject'
+export type * from './types/FairyTask'
+export type * from './types/FairyWaitCondition'
+export type * from './types/FairyWork'
+export type * from './types/PersistedFairyConfig'
+export type * from './types/PersistedFairyState'
 export type * from './types/PromptPart'
 export type * from './types/Streaming'
-export type * from './types/TldrawFairyAgent'
-export type * from './types/TodoItem'
 export type * from './types/WikipediaArticle'
 
+// Schemas and definitions
+export * from './schema/AgentActionSchemas'
+export * from './schema/buildResponseSchema'
+export * from './schema/PromptPartDefinitions'
+export * from './schema/PromptPartRegistry'
+export * from './types/FairyEntity'
+export * from './types/FairyOutfit'
 export * from './types/FairyPose'
-
-// Utils and Helpers
-export * from './actions/AgentActionUtils'
-export * from './AgentHelpers'
-export * from './parts/PromptPartUtils'
-
-// Models
-export * from './models'
-
-// Prompt
-export * from './prompt/buildMessages'
-export * from './prompt/buildSystemPrompt'
-export * from './prompt/getModelName'
+export * from './types/FairyVariant'
 
 // Constants / Defaults
 export * from './constants'
-export * from './default-utils'
+export * from './models'
+export * from './schema/FairyModeDefinition'
+export * from './schema/FairySchema'
 
 // Icons
 export * from './icons/AgentIcon'
diff --git a/packages/fairy-shared/src/models.ts b/packages/fairy-shared/src/models.ts
index 611b63c555db..beddda30f187 100644
--- a/packages/fairy-shared/src/models.ts
+++ b/packages/fairy-shared/src/models.ts
@@ -1,6 +1,5 @@
-export const DEFAULT_MODEL_NAME = 'claude-4.5-sonnet'
+export const DEFAULT_MODEL_NAME = 'claude-4.5-sonnet' // 'gemini-3-pro-preview'
 
-export type AgentModelName = keyof typeof AGENT_MODEL_DEFINITIONS
 export type AgentModelProvider = 'openai' | 'anthropic' | 'google'
 
 export interface AgentModelDefinition {
@@ -12,74 +11,58 @@ export interface AgentModelDefinition {
 	thinking?: boolean
 }
 
-/**
- * Get the full information about a model from its name.
- * @param modelName - The name of the model.
- * @returns The full definition of the model.
- */
-export function getAgentModelDefinition(modelName: AgentModelName): AgentModelDefinition {
-	const definition = AGENT_MODEL_DEFINITIONS[modelName]
-	if (!definition) {
-		throw new Error(`Model ${modelName} not found`)
-	}
-	return definition
-}
-
 export const AGENT_MODEL_DEFINITIONS = {
-	// Strongly recommended
+	'gemini-3-pro-preview': {
+		name: 'gemini-3-pro-preview',
+		id: 'gemini-3-pro-preview',
+		provider: 'google',
+	},
+
 	'claude-4.5-sonnet': {
 		name: 'claude-4.5-sonnet',
 		id: 'claude-sonnet-4-5',
 		provider: 'anthropic',
 	},
 
-	// Recommended
-	'claude-4-sonnet': {
-		name: 'claude-4-sonnet',
-		id: 'claude-sonnet-4-0',
-		provider: 'anthropic',
+	'gpt-5.1': {
+		name: 'gpt-5.1',
+		id: 'gpt-5.1',
+		provider: 'openai',
 	},
+} as const
 
-	// Recommended
-	'claude-3.5-sonnet': {
-		name: 'claude-3.5-sonnet',
-		id: 'claude-3-5-sonnet-latest',
-		provider: 'anthropic',
-	},
-
-	// Recommended
-	// 'gemini-2.5-flash': {
-	// 	name: 'gemini-2.5-flash',
-	// 	id: 'gemini-2.5-flash',
-	// 	provider: 'google',
-	// },
-
-	// Not recommended
-	// 'gemini-2.5-pro': {
-	// 	name: 'gemini-2.5-pro',
-	// 	id: 'gemini-2.5-pro',
-	// 	provider: 'google',
-	// 	thinking: true,
-	// },
+export type AgentModelName = keyof typeof AGENT_MODEL_DEFINITIONS
 
-	// Not recommended
-	// 'gpt-5': {
-	// 	name: 'gpt-5',
-	// 	id: 'gpt-5-2025-08-07',
-	// 	provider: 'openai',
-	// },
+export const TIER_THRESHOLD = 200_000
 
-	// Mildly recommended
-	// 'gpt-4.1': {
-	// 	name: 'gpt-4.1',
-	// 	id: 'gpt-4.1-2025-04-14',
-	// 	provider: 'openai',
-	// },
+export interface ModelPricing {
+	inputPrice: number
+	cachedInputPrice: number | null // null means caching not supported
+	outputPrice: number
+}
 
-	// Mildly recommended
-	// 'gpt-4o': {
-	// 	name: 'gpt-4o',
-	// 	id: 'gpt-4o',
-	// 	provider: 'openai',
-	// },
-} as const
+/**
+ * Get pricing for a specific model based on prompt token count.
+ * Some models have tiered pricing based on prompt size.
+ * @param modelName - The model name
+ * @param promptTokens - The number of prompt tokens for this request
+ * @returns Pricing per million tokens: { inputPrice, cachedInputPrice, outputPrice }
+ */
+export function getModelPricing(modelName: AgentModelName, promptTokens: number): ModelPricing {
+	switch (modelName) {
+		case 'gemini-3-pro-preview':
+			if (promptTokens <= TIER_THRESHOLD) {
+				return { inputPrice: 2, cachedInputPrice: 0.2, outputPrice: 12 }
+			} else {
+				return { inputPrice: 4, cachedInputPrice: 0.4, outputPrice: 18 }
+			}
+		case 'claude-4.5-sonnet':
+			if (promptTokens <= TIER_THRESHOLD) {
+				return { inputPrice: 3, cachedInputPrice: null, outputPrice: 15 }
+			} else {
+				return { inputPrice: 6, cachedInputPrice: null, outputPrice: 22.5 }
+			}
+		case 'gpt-5.1':
+			return { inputPrice: 1.25, cachedInputPrice: 0.125, outputPrice: 10 }
+	}
+}
diff --git a/packages/fairy-shared/src/parts/BlurryShapesPartUtil.ts b/packages/fairy-shared/src/parts/BlurryShapesPartUtil.ts
deleted file mode 100644
index 71822247f7b3..000000000000
--- a/packages/fairy-shared/src/parts/BlurryShapesPartUtil.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Box } from '@tldraw/editor'
-import { AgentHelpers } from '../AgentHelpers'
-import { BlurryShape } from '../format/BlurryShape'
-import { convertTldrawShapeToBlurryShape } from '../format/convertTldrawShapeToBlurryShape'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface BlurryShapesPart extends BasePromptPart<'blurryShapes'> {
-	shapes: BlurryShape[] | null
-}
-
-export class BlurryShapesPartUtil extends PromptPartUtil<BlurryShapesPart> {
-	static override type = 'blurryShapes' as const
-
-	override getPriority() {
-		return 70
-	}
-
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): BlurryShapesPart {
-		if (!this.agent || !parts.includes('blurryShapes')) {
-			return { type: 'blurryShapes', shapes: null }
-		}
-		const { editor } = this.agent
-
-		const shapes = editor.getCurrentPageShapesSorted()
-		const contextBoundsBox = Box.From(request.bounds)
-
-		// Get all shapes within the agent's viewport
-		const shapesInBounds = shapes.filter((shape) => {
-			if (!editor) return false
-			const bounds = editor.getShapeMaskedPageBounds(shape)
-			if (!bounds) return false
-			return contextBoundsBox.includes(bounds)
-		})
-
-		// Convert the shapes to the blurry shape format
-		const blurryShapes = shapesInBounds
-			.map((shape) => {
-				if (!editor) return null
-				return convertTldrawShapeToBlurryShape(editor, shape)
-			})
-			.filter((s) => s !== null)
-
-		// Apply the offset and round the blurry shapes
-		const normalizedBlurryShapes = blurryShapes.map((shape) => {
-			const bounds = helpers.roundBox(
-				helpers.applyOffsetToBox({
-					x: shape.x,
-					y: shape.y,
-					w: shape.w,
-					h: shape.h,
-				})
-			)
-			return { ...shape, x: bounds.x, y: bounds.y, w: bounds.w, h: bounds.h }
-		})
-
-		return {
-			type: 'blurryShapes',
-			shapes: normalizedBlurryShapes,
-		}
-	}
-
-	override buildContent({ shapes }: BlurryShapesPart): string[] {
-		if (!shapes || shapes.length === 0) return ['There are no shapes in your view at the moment.']
-
-		return [`These are the shapes you can currently see:`, JSON.stringify(shapes)]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/ChatHistoryPartUtil.ts b/packages/fairy-shared/src/parts/ChatHistoryPartUtil.ts
deleted file mode 100644
index 08ef515b1121..000000000000
--- a/packages/fairy-shared/src/parts/ChatHistoryPartUtil.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { structuredClone } from '@tldraw/utils'
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentMessage, AgentMessageContent } from '../types/AgentMessage'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { ChatHistoryItem } from '../types/ChatHistoryItem'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface ChatHistoryPart extends BasePromptPart<'chatHistory'> {
-	items: ChatHistoryItem[] | null
-}
-
-export class ChatHistoryPartUtil extends PromptPartUtil<ChatHistoryPart> {
-	static override type = 'chatHistory' as const
-
-	override getPriority() {
-		return Infinity // history should appear first in the prompt (low priority)
-	}
-
-	override async getPart(
-		_request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	) {
-		if (!this.agent || !parts.includes('chatHistory')) {
-			return { type: 'chatHistory' as const, items: null }
-		}
-
-		const items = structuredClone(this.agent.$chatHistory.get())
-
-		for (const historyItem of items) {
-			if (historyItem.type !== 'prompt') continue
-
-			// Offset and round the context items of each history item
-			const contextItems = historyItem.contextItems.map((contextItem) => {
-				const offsetContextItem = helpers.applyOffsetToContextItem(contextItem)
-				return helpers.roundContextItem(offsetContextItem)
-			})
-
-			historyItem.contextItems = contextItems
-		}
-
-		return {
-			type: 'chatHistory' as const,
-			items,
-		}
-	}
-
-	override buildMessages({ items }: ChatHistoryPart): AgentMessage[] {
-		if (!items) return []
-
-		const messages: AgentMessage[] = []
-		const priority = this.getPriority()
-
-		// If the last message is from the user, skip it
-		const lastIndex = items.length - 1
-		let end = items.length
-		if (end > 0 && items[lastIndex].type === 'prompt') {
-			end = lastIndex
-		}
-
-		for (let i = 0; i < end; i++) {
-			const item = items[i]
-			const message = this.buildHistoryItemMessage(item, priority)
-			if (message) messages.push(message)
-		}
-
-		return messages
-	}
-
-	private buildHistoryItemMessage(item: ChatHistoryItem, priority: number): AgentMessage | null {
-		switch (item.type) {
-			case 'prompt': {
-				const content: AgentMessageContent[] = []
-
-				if (item.message.trim() !== '') {
-					content.push({
-						type: 'text',
-						text: item.message,
-					})
-				}
-
-				if (item.contextItems.length > 0) {
-					for (const contextItem of item.contextItems) {
-						switch (contextItem.type) {
-							case 'shape': {
-								const simpleShape = contextItem.shape
-								content.push({
-									type: 'text',
-									text: `[CONTEXT]: ${JSON.stringify(simpleShape)}`,
-								})
-								break
-							}
-							case 'shapes': {
-								const simpleShapes = contextItem.shapes
-								content.push({
-									type: 'text',
-									text: `[CONTEXT]: ${JSON.stringify(simpleShapes)}`,
-								})
-								break
-							}
-							default: {
-								content.push({
-									type: 'text',
-									text: `[CONTEXT]: ${JSON.stringify(contextItem)}`,
-								})
-								break
-							}
-						}
-					}
-				}
-
-				if (content.length === 0) {
-					return null
-				}
-
-				return {
-					role: 'user',
-					content,
-					priority,
-				}
-			}
-			case 'continuation': {
-				if (item.data.length === 0) {
-					return null
-				}
-				const text = `[DATA RETRIEVED]: ${JSON.stringify(item.data)}`
-				return {
-					role: 'assistant',
-					content: [{ type: 'text', text }],
-					priority,
-				}
-			}
-			case 'action': {
-				const { action } = item
-				let text: string
-				switch (action._type) {
-					case 'message': {
-						text = action.text || '<message data lost>'
-						break
-					}
-					case 'think': {
-						text = '[THOUGHT]: ' + (action.text || '<thought data lost>')
-						break
-					}
-					default: {
-						const { complete: _complete, time: _time, ...rawAction } = action || {}
-						text = '[ACTION]: ' + JSON.stringify(rawAction)
-						break
-					}
-				}
-				return {
-					role: 'assistant',
-					content: [{ type: 'text', text }],
-					priority,
-				}
-			}
-		}
-	}
-}
diff --git a/packages/fairy-shared/src/parts/ContextItemsPartUtil.ts b/packages/fairy-shared/src/parts/ContextItemsPartUtil.ts
deleted file mode 100644
index 74820627055e..000000000000
--- a/packages/fairy-shared/src/parts/ContextItemsPartUtil.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { ContextItem } from '../types/ContextItem'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface ContextItemsPart extends BasePromptPart<'contextItems'> {
-	items: ContextItem[]
-	requestType: AgentRequest['type']
-}
-
-export class ContextItemsPartUtil extends PromptPartUtil<ContextItemsPart> {
-	static override type = 'contextItems' as const
-
-	override getPriority() {
-		return 60 // context items in middle (low priority)
-	}
-
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): ContextItemsPart {
-		if (!parts.includes('contextItems')) {
-			return {
-				type: 'contextItems',
-				items: [],
-				requestType: request.type,
-			}
-		}
-
-		const items = request.contextItems.map((contextItem) => {
-			const offsetContextItem = helpers.applyOffsetToContextItem(contextItem)
-			return helpers.roundContextItem(offsetContextItem)
-		})
-
-		return {
-			type: 'contextItems',
-			items,
-			requestType: request.type,
-		}
-	}
-
-	override buildContent({ items, requestType }: ContextItemsPart): string[] {
-		const messages: string[] = []
-
-		const shapeItems = items.filter((item) => item.type === 'shape')
-		const shapesItems = items.filter((item) => item.type === 'shapes')
-		const areaItems = items.filter((item) => item.type === 'area')
-		const pointItems = items.filter((item) => item.type === 'point')
-
-		// Handle area context items
-		if (areaItems.length > 0) {
-			const isScheduled = requestType === 'schedule'
-			const areas = areaItems.map((item) => item.bounds)
-			messages.push(
-				isScheduled
-					? 'You are currently reviewing your work, and you have decided to focus your view on the following area. Make sure to focus your task here.'
-					: 'The user has specifically brought your attention to the following areas in this request. The user might refer to them as the "area(s)" or perhaps "here" or "there", but either way, it\'s implied that you should focus on these areas in both your reasoning and actions. Make sure to focus your task on these areas:'
-			)
-			for (const area of areas) {
-				messages.push(JSON.stringify(area))
-			}
-		}
-
-		// Handle point context items
-		if (pointItems.length > 0) {
-			const points = pointItems.map((item) => item.point)
-			messages.push(
-				'The user has specifically brought your attention to the following points in this request. The user might refer to them as the "point(s)" or perhaps "here" or "there", but either way, it\'s implied that you should focus on these points in both your reasoning and actions. Make sure to focus your task on these points:'
-			)
-			for (const point of points) {
-				messages.push(JSON.stringify(point))
-			}
-		}
-
-		// Handle individual shape context items
-		if (shapeItems.length > 0) {
-			const shapes = shapeItems.map((item) => item.shape)
-			messages.push(
-				`The user has specifically brought your attention to these ${shapes.length} shapes individually in this request. Make sure to focus your task on these shapes where applicable:`
-			)
-			for (const shape of shapes) {
-				messages.push(JSON.stringify(shape))
-			}
-		}
-
-		// Handle groups of shapes context items
-		for (const contextItem of shapesItems) {
-			const shapes = contextItem.shapes
-			if (shapes.length > 0) {
-				messages.push(
-					`The user has specifically brought your attention to the following group of ${shapes.length} shapes in this request. Make sure to focus your task on these shapes where applicable:`
-				)
-				messages.push(shapes.map((shape) => JSON.stringify(shape)).join('\n'))
-			}
-		}
-
-		return messages
-	}
-}
diff --git a/packages/fairy-shared/src/parts/DataPartUtil.ts b/packages/fairy-shared/src/parts/DataPartUtil.ts
deleted file mode 100644
index 346c994e0828..000000000000
--- a/packages/fairy-shared/src/parts/DataPartUtil.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { JsonValue } from '@tldraw/utils'
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-interface DataPart extends BasePromptPart<'data'> {
-	data: JsonValue[]
-}
-
-/**
- * This prompt part collects up data retrieved by agent actions in the previous request.
- */
-export class DataPartUtil extends PromptPartUtil<DataPart> {
-	static override type = 'data' as const
-
-	override getPriority() {
-		return -200 // API data should come right before the user message but after most other parts
-	}
-
-	override async getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): Promise<DataPart> {
-		if (!parts.includes('data')) {
-			return {
-				type: 'data',
-				data: [],
-			}
-		}
-
-		const { data } = request
-
-		const values = await Promise.all(
-			data.map(async (item) => {
-				try {
-					return await item
-				} catch (error) {
-					console.error('Error retrieving data:', error)
-					// Tell the agent that something went wrong
-					return 'An error occurred while retrieving some data.'
-				}
-			})
-		)
-
-		return {
-			type: 'data',
-			data: values,
-		}
-	}
-
-	override buildContent({ data }: DataPart) {
-		if (data.length === 0) return []
-
-		const formattedData = data.map((item) => {
-			return `${JSON.stringify(item)}`
-		})
-
-		return ["Here's the data you requested:", ...formattedData]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/MessagesPartUtil.ts b/packages/fairy-shared/src/parts/MessagesPartUtil.ts
deleted file mode 100644
index d26ec041f264..000000000000
--- a/packages/fairy-shared/src/parts/MessagesPartUtil.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface MessagesPart extends BasePromptPart<'messages'> {
-	messages: string[]
-	requestType: AgentRequest['type']
-}
-
-export class MessagesPartUtil extends PromptPartUtil<MessagesPart> {
-	static override type = 'messages' as const
-
-	override getPriority() {
-		return -Infinity // user message should be last (highest priority)
-	}
-
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): MessagesPart {
-		if (!parts.includes('messages')) {
-			return {
-				type: 'messages',
-				messages: [],
-				requestType: request.type,
-			}
-		}
-
-		const { messages, type } = request
-		return {
-			type: 'messages',
-			messages,
-			requestType: type,
-		}
-	}
-
-	override buildContent({ messages, requestType }: MessagesPart) {
-		let responsePart: string[] = []
-		switch (requestType) {
-			case 'user':
-				responsePart = getUserPrompt(messages)
-				break
-			case 'schedule':
-				responsePart = getSchedulePrompt(messages)
-				break
-			case 'todo':
-				responsePart = getTodoPrompt(messages)
-				break
-		}
-
-		return responsePart
-	}
-}
-
-function getUserPrompt(message: string[]) {
-	return [
-		`Using the events provided in the response schema, here's what I want you to do:`,
-		...message,
-	]
-}
-
-function getSchedulePrompt(message: string[]) {
-	return [
-		"Using the events provided in the response schema, here's what you should do:",
-		...message,
-	]
-}
-
-function getTodoPrompt(message: string[]) {
-	return [
-		'There are still outstanding todo items. Please continue. For your reference, the most recent message I gave you was this:',
-		...message,
-	]
-}
diff --git a/packages/fairy-shared/src/parts/ModelNamePartUtil.ts b/packages/fairy-shared/src/parts/ModelNamePartUtil.ts
deleted file mode 100644
index 3bcd08ad7003..000000000000
--- a/packages/fairy-shared/src/parts/ModelNamePartUtil.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentModelName } from '../models'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface ModelNamePart extends BasePromptPart<'modelName'> {
-	name: AgentModelName
-}
-
-export class ModelNamePartUtil extends PromptPartUtil<ModelNamePart> {
-	static override type = 'modelName' as const
-
-	/**
-	 * Get the specified model name for the request.
-	 */
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): ModelNamePart {
-		if (!parts.includes('modelName')) {
-			return {
-				type: 'modelName',
-				name: request.modelName,
-			}
-		}
-
-		return {
-			type: 'modelName',
-			name: request.modelName,
-		}
-	}
-
-	/**
-	 * Use the specified model name for this request.
-	 */
-	override getModelName(part: ModelNamePart) {
-		return part.name
-	}
-}
diff --git a/packages/fairy-shared/src/parts/PeripheralShapesPartUtil.ts b/packages/fairy-shared/src/parts/PeripheralShapesPartUtil.ts
deleted file mode 100644
index c18c640d3194..000000000000
--- a/packages/fairy-shared/src/parts/PeripheralShapesPartUtil.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Box } from '@tldraw/editor'
-import { AgentHelpers } from '../AgentHelpers'
-import { convertTldrawShapesToPeripheralShapes } from '../format/convertTldrawShapesToPeripheralShapes'
-import { PeripheralShapeCluster } from '../format/PeripheralShapesCluster'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface PeripheralShapesPart extends BasePromptPart<'peripheralShapes'> {
-	clusters: PeripheralShapeCluster[] | null
-}
-
-export class PeripheralShapesPartUtil extends PromptPartUtil<PeripheralShapesPart> {
-	static override type = 'peripheralShapes' as const
-
-	override getPriority() {
-		return 65 // peripheral content after viewport shapes (low priority)
-	}
-
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): PeripheralShapesPart {
-		if (!this.agent || !parts.includes('peripheralShapes')) {
-			return { type: 'peripheralShapes', clusters: null }
-		}
-		const { editor } = this.agent
-
-		const shapes = editor.getCurrentPageShapesSorted()
-		const contextBounds = request.bounds
-
-		const contextBoundsBox = Box.From(contextBounds)
-
-		// Get all shapes that are outside the context bounds (these are what we want to peripheralize)
-		const shapesOutsideViewport = shapes.filter((shape) => {
-			if (!editor) return false
-			const bounds = editor.getShapeMaskedPageBounds(shape)
-			if (!bounds) return
-			if (contextBoundsBox.includes(bounds)) return
-			return true
-		})
-
-		// Convert the shapes to peripheral shape cluster format
-		const clusters = convertTldrawShapesToPeripheralShapes(editor, shapesOutsideViewport, {
-			padding: 75,
-		})
-
-		// Apply the offset and round the clusters
-		const normalizedClusters = clusters.map((cluster) => {
-			const offsetBounds = helpers.applyOffsetToBox(cluster.bounds)
-			return {
-				numberOfShapes: cluster.numberOfShapes,
-				bounds: helpers.roundBox(offsetBounds),
-			}
-		})
-
-		return {
-			type: 'peripheralShapes',
-			clusters: normalizedClusters,
-		}
-	}
-
-	override buildContent({ clusters }: PeripheralShapesPart): string[] {
-		if (!clusters || clusters.length === 0) {
-			return []
-		}
-
-		return [
-			"There are some groups of shapes in your peripheral vision, outside the your main view. You can't make out their details or content. If you want to see their content, you need to get closer. The groups are as follows",
-			JSON.stringify(clusters),
-		]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/PromptPartUtil.ts b/packages/fairy-shared/src/parts/PromptPartUtil.ts
deleted file mode 100644
index 2edbb7cc863f..000000000000
--- a/packages/fairy-shared/src/parts/PromptPartUtil.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Editor } from '@tldraw/editor'
-import { AgentActionUtilConstructor } from '../actions/AgentActionUtil'
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentModelName } from '../models'
-import { AgentMessage, AgentMessageContent } from '../types/AgentMessage'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { TldrawFairyAgent } from '../types/TldrawFairyAgent'
-
-export abstract class PromptPartUtil<T extends BasePromptPart = BasePromptPart> {
-	static type: string
-
-	protected agent?: TldrawFairyAgent
-	protected editor?: Editor
-
-	constructor(agent?: TldrawFairyAgent) {
-		this.agent = agent
-		this.editor = agent?.editor
-	}
-
-	/**
-	 * Get some data to add to the prompt.
-	 * @returns The prompt part.
-	 */
-	abstract getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): Promise<T> | T
-
-	/**
-	 * Get priority for this prompt part to determine its position in the prompt.
-	 * Lower numbers have higher priority.
-	 *
-	 * This function gets used by the default `buildMessages` function.
-	 * @returns The priority.
-	 */
-	getPriority(_part: T): number {
-		return 0
-	}
-
-	/**
-	 * Get the name of the model to use for this generation.
-	 * @returns The model name, or null to not use a model name.
-	 */
-	getModelName(_part: T): AgentModelName | null {
-		// TODO: This should be extended to return some kind of priority or method for selecting which model to use if there are multiple prompt parts overriding this. Right now, in getModelName.ts, we just return the first model name that is not null.
-		return null
-	}
-
-	/**
-	 * Build an array of text or image content for this prompt part.
-	 *
-	 * This function gets used by the default `buildMessages` function.
-	 * @returns An array of text or image content.
-	 */
-	buildContent(_part: T): string[] {
-		return []
-	}
-
-	/**
-	 * Build an array of messages to send to the model.
-	 * Note: Overriding this function can bypass the `buildContent` and `getPriority` functions.
-	 *
-	 * @returns An array of messages.
-	 */
-	buildMessages(part: T): AgentMessage[] {
-		const content = this.buildContent(part)
-		if (!content || content.length === 0) {
-			return []
-		}
-
-		const messageContent: AgentMessageContent[] = []
-		for (const item of content) {
-			if (typeof item === 'string' && item.startsWith('data:image/')) {
-				messageContent.push({
-					type: 'image',
-					image: item,
-				})
-			} else {
-				messageContent.push({
-					type: 'text',
-					text: item,
-				})
-			}
-		}
-
-		return [{ role: 'user', content: messageContent, priority: this.getPriority(part) }]
-	}
-
-	/**
-	 * Build a system message that gets concatenated with the other system messages.
-	 * @returns The system message, or null to not add anything to the system message.
-	 */
-	buildSystemPrompt(
-		_part: T,
-		_actions: AgentActionUtilConstructor['type'][],
-		_parts: PromptPartUtilConstructor['type'][]
-	): string | null {
-		return null
-	}
-}
-
-export interface PromptPartUtilConstructor<T extends BasePromptPart = BasePromptPart> {
-	new (): PromptPartUtil<T>
-	type: T['type']
-}
diff --git a/packages/fairy-shared/src/parts/PromptPartUtils.ts b/packages/fairy-shared/src/parts/PromptPartUtils.ts
deleted file mode 100644
index 526ba4e7f39d..000000000000
--- a/packages/fairy-shared/src/parts/PromptPartUtils.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPart } from '../types/PromptPart'
-import { TldrawFairyAgent } from '../types/TldrawFairyAgent'
-import { BlurryShapesPartUtil } from './BlurryShapesPartUtil'
-import { ChatHistoryPartUtil } from './ChatHistoryPartUtil'
-import { ContextItemsPartUtil } from './ContextItemsPartUtil'
-import { DataPartUtil } from './DataPartUtil'
-import { MessagesPartUtil } from './MessagesPartUtil'
-import { ModelNamePartUtil } from './ModelNamePartUtil'
-import { PeripheralShapesPartUtil } from './PeripheralShapesPartUtil'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-import { ScreenshotPartUtil } from './ScreenshotPartUtil'
-import { SelectedShapesPartUtil } from './SelectedShapesPartUtil'
-import { SystemPromptPartUtil } from './SystemPromptPartUtil'
-import { TimePartUtil } from './TimePartUtil'
-import { TodoListPartUtil } from './TodoListPartUtil'
-import { UserActionHistoryPartUtil } from './UserActionHistoryPartUtil'
-import { ViewportBoundsPartUtil } from './ViewportBoundsPartUtil'
-
-/**
- * Prompt parts determine what information will be sent to the model.
- *
- * To stop sending something to the model, remove it from the list.
- * To send something new to the model, either change one of the existing parts, or add your own.
- */
-export const PROMPT_PART_UTILS = [
-	// Model
-	SystemPromptPartUtil,
-	ModelNamePartUtil,
-
-	// Request
-	MessagesPartUtil,
-	DataPartUtil,
-	ContextItemsPartUtil,
-
-	// Viewport
-	ScreenshotPartUtil,
-	ViewportBoundsPartUtil,
-
-	// Shapes
-	BlurryShapesPartUtil,
-	PeripheralShapesPartUtil,
-	SelectedShapesPartUtil,
-
-	// History
-	ChatHistoryPartUtil,
-	UserActionHistoryPartUtil,
-	TodoListPartUtil,
-
-	// Metadata
-	TimePartUtil,
-] satisfies PromptPartUtilConstructor<BasePromptPart>[]
-
-/**
- * Get an object containing all prompt part utils.
- */
-export function getPromptPartUtilsRecord(agent?: TldrawFairyAgent) {
-	const object = {} as Record<PromptPart['type'], PromptPartUtil<PromptPart>>
-	for (const util of PROMPT_PART_UTILS) {
-		object[util.type] = new util(agent)
-	}
-	return object
-}
-
-/**
- * Get an object containing only the specified prompt part utils.
- */
-export function getPromptPartUtilsRecordByTypes(
-	types: PromptPartUtilConstructor['type'][],
-	agent?: TldrawFairyAgent
-) {
-	const object = {} as Record<PromptPart['type'], PromptPartUtil<PromptPart>>
-	const typeSet = new Set(types)
-	for (const util of PROMPT_PART_UTILS) {
-		if (typeSet.has(util.type)) {
-			object[util.type] = new util(agent)
-		}
-	}
-	return object
-}
diff --git a/packages/fairy-shared/src/parts/ScreenshotPartUtil.ts b/packages/fairy-shared/src/parts/ScreenshotPartUtil.ts
deleted file mode 100644
index 7d25ffec182d..000000000000
--- a/packages/fairy-shared/src/parts/ScreenshotPartUtil.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Box } from '@tldraw/editor'
-import { FileHelpers } from '@tldraw/utils'
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface ScreenshotPart extends BasePromptPart<'screenshot'> {
-	screenshot: string | null
-}
-
-export class ScreenshotPartUtil extends PromptPartUtil<ScreenshotPart> {
-	static override type = 'screenshot' as const
-
-	override getPriority() {
-		return 40 // screenshot after text content (medium priority)
-	}
-
-	override async getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): Promise<ScreenshotPart> {
-		if (!this.agent || !parts.includes('screenshot')) {
-			return { type: 'screenshot', screenshot: null }
-		}
-		const { editor } = this.agent
-
-		const contextBounds = request.bounds
-
-		const contextBoundsBox = Box.From(contextBounds)
-
-		const shapes = editor.getCurrentPageShapesSorted().filter((shape) => {
-			if (!editor) return false
-			const bounds = editor.getShapeMaskedPageBounds(shape)
-			if (!bounds) return false
-			return contextBoundsBox.includes(bounds)
-		})
-
-		if (shapes.length === 0) {
-			return { type: 'screenshot', screenshot: null }
-		}
-
-		const largestDimension = Math.max(request.bounds.w, request.bounds.h)
-		const scale = largestDimension > 8000 ? 8000 / largestDimension : 1
-
-		const result = await editor.toImage(shapes, {
-			format: 'jpeg',
-			background: true,
-			bounds: Box.From(request.bounds),
-			padding: 0,
-			pixelRatio: 1,
-			scale,
-		})
-
-		return {
-			type: 'screenshot',
-			screenshot: await FileHelpers.blobToDataUrl(result.blob),
-		}
-	}
-
-	override buildContent({ screenshot }: ScreenshotPart) {
-		if (!screenshot) return []
-
-		return [
-			'Here is the part of the canvas that you can currently see at this moment. It is not a reference image.',
-			screenshot,
-		]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/SelectedShapesPartUtil.ts b/packages/fairy-shared/src/parts/SelectedShapesPartUtil.ts
deleted file mode 100644
index 735872169422..000000000000
--- a/packages/fairy-shared/src/parts/SelectedShapesPartUtil.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { structuredClone } from '@tldraw/utils'
-import { AgentHelpers } from '../AgentHelpers'
-import { convertTldrawShapeToFocusedShape } from '../format/convertTldrawShapeToFocusedShape'
-import { FocusedShape } from '../format/FocusedShape'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface SelectedShapesPart extends BasePromptPart<'selectedShapes'> {
-	shapes: FocusedShape[] | null
-}
-
-export class SelectedShapesPartUtil extends PromptPartUtil<SelectedShapesPart> {
-	static override type = 'selectedShapes' as const
-
-	override getPriority() {
-		return 55 // selected shapes after context items (low priority)
-	}
-
-	override getPart(
-		_request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): SelectedShapesPart {
-		if (!this.agent || !parts.includes('selectedShapes')) {
-			return { type: 'selectedShapes', shapes: null }
-		}
-		const { editor } = this.agent
-
-		const userSelectedShapes = editor.getSelectedShapes().map((v) => structuredClone(v)) ?? []
-
-		const simpleShapes: FocusedShape[] = []
-		for (const shape of userSelectedShapes) {
-			if (!shape) continue
-			const simpleShape = convertTldrawShapeToFocusedShape(editor, shape)
-			if (simpleShape) {
-				simpleShapes.push(simpleShape)
-			}
-		}
-
-		const normalizedSimpleShapes = simpleShapes.map((shape) => {
-			const offsetShape = helpers.applyOffsetToShape(shape)
-			return helpers.roundShape(offsetShape)
-		})
-
-		return {
-			type: 'selectedShapes',
-			shapes: normalizedSimpleShapes,
-		}
-	}
-
-	override buildContent({ shapes }: SelectedShapesPart) {
-		if (!shapes || shapes.length === 0) {
-			return []
-		}
-
-		return [
-			'The user has selected these shapes. Focus your task on these shapes where applicable:',
-			shapes.map((shape) => JSON.stringify(shape)).join('\n'),
-		]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/SystemPromptPartUtil.ts b/packages/fairy-shared/src/parts/SystemPromptPartUtil.ts
deleted file mode 100644
index cd3b85fa59f2..000000000000
--- a/packages/fairy-shared/src/parts/SystemPromptPartUtil.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-import { AgentActionUtilConstructor } from '../actions/AgentActionUtil'
-import { buildResponseSchema } from '../actions/AgentActionUtils'
-import { AgentHelpers } from '../AgentHelpers'
-import { getFocusedShapeSchemaNames } from '../format/FocusedShape'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export type SystemPromptPart = BasePromptPart<'system'>
-
-export class SystemPromptPartUtil extends PromptPartUtil<SystemPromptPart> {
-	static override type = 'system' as const
-
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): SystemPromptPart {
-		if (!parts.includes('system')) {
-			return { type: 'system' }
-		}
-		return { type: 'system' }
-	}
-
-	override buildSystemPrompt(
-		_part: SystemPromptPart,
-		actions: AgentActionUtilConstructor['type'][],
-		parts: PromptPartUtilConstructor['type'][]
-	) {
-		return getSystemPrompt(actions, parts)
-	}
-}
-
-const shapeTypeNames = getFocusedShapeSchemaNames()
-
-function getSystemPrompt(
-	actions: AgentActionUtilConstructor['type'][],
-	_parts: PromptPartUtilConstructor['type'][]
-) {
-	return `# Hello!
-
-You are a helpful and mischievous fairy that lives inside an infinite canvas inside someone's computer. You like to help the person use a drawing / diagramming / whiteboarding program. You and the person are both located within an infinite canvas, a 2D space that can be demarcated using x,y coordinates. You will be provided with a set of helpful information that includes a description of what the person would like you to do, along with the person's intent and the current state of the canvas, including an image, which is your view of the part of the canvas contained within your viewport. You'll also be provided with the chat history of your conversation with the person, including the person's previous requests and your actions. Your goal is to generate a response that includes a list of structured events that represent the actions you would take to satisfy the person's request.
-
-You respond with structured JSON data based on a predefined schema.
-
-## Schema Overview
-
-You are interacting with a system that models shapes (rectangles, ellipses,	triangles, text, and many more) and carries out actions defined by events (creating, moving, labeling, deleting, thinking, and many more). Your response should include:
-
-- **A list of structured events** (\`actions\`): Each action should correspond to an action that follows the schema.
-
-For the full list of events, refer to the JSON schema.
-
-## Shapes
-
-Shapes can be:
-
-${shapeTypeNames.map((type) => `- **${type.charAt(0).toUpperCase() + type.slice(1)} (\`${type}\`)**`).join('\n')}
-
-Each shape has:
-
-- \`_type\` (one of ${shapeTypeNames.map((type) => `\`${type}\``).join(', ')})
-- \`x\`, \`y\` (numbers, coordinates, the TOP LEFT corner of the shape) (except for arrows and lines, which have \`x1\`, \`y1\`, \`x2\`, \`y2\`)
-- \`note\` (a description of the shape's purpose or intent) (invisible to the user)
-
-Shapes may also have different properties depending on their type:
-
-- \`w\` and \`h\` (for shapes)
-- \`color\` (optional, chosen from predefined colors)
-- \`fill\` (optional, for shapes)
-- \`text\` (optional, for text elements) (visible to the user)
-- ...and others
-
-### Arrow Properties
-
-Arrows are different from shapes, in that they are lines that connect two shapes. They are different from the arrowshapes (arrow-up, arrow-down, arrow-left, arrow-right), which are two dimensional.
-
-Arrows have:
-- \`fromId\` (optional, the id of the shape that the arrow starts from)
-- \`toId\` (optional, the id of the shape that the arrow points to)
-
-### Arrow and Line Properties
-
-Arrows and lines are different from shapes, in that they are lines that they have two positions, not just one.
-
-Arrows and lines have:
-- \`x1\` (the x coordinate of the first point of the line)
-- \`y1\` (the y coordinate of the first point of the line)
-- \`x2\` (the x coordinate of the second point of the line)
-- \`y2\` (the y coordinate of the second point of the line)
-
-## Event Schema
-
-Refer to the JSON schema for the full list of available events, their properties, and their descriptions. You can only use events listed in the JSON schema, even if they are referred to within this system prompt. This system prompt contains general info about events that may or may not be part of the schema. Don't be fooled: Use the schema as the source of truth on what is available. Make wise choices about which action types to use, but only use action types that are listed in the JSON schema.
-
-## Rules
-
-1. **Always return a valid JSON object conforming to the schema.**
-2. **Do not generate extra fields or omit required fields.**
-3. **Ensure each \`shapeId\` is unique and consistent across related events.**
-4. **Use meaningful \`intent\` descriptions for all actions.**
-
-## Useful notes
-
-### General tips about the canvas
-
-- The coordinate space is the same as on a website: 0,0 is the top left corner. The x-axis increases as you scroll to the right. The y-axis increases as you scroll down the canvas.
-- The x and y define the top left corner of the shape. The shape's origin is in its top left corner.
-- Note shapes are 50x50. They're sticky notes and are only suitable for tiny sentences. Use a geometric shape or text shape if you need to write more.
-
-### Tips for creating and updating shapes
-
-- When moving shapes:
-	- Always use the \`move\` action to move a shape, never the \`update\` action.
-- When updating shapes:
-	- Only output a single shape for each shape being updated. We know what it should update from its shapeId.
-- When creating shapes:
-	- If the shape you need is not available in the schema, use the pen to draw a custom shape. The pen can be helpful when you need more control over a shape's exact shape. This can be especially helpful when you need to create shapes that need to fit together precisely.
-	- Use the \`note\` field to provide context for each shape. This will help you in the future to understand the purpose of each shape.
-	- Never create "unknown" type shapes, though you can move unknown shapes if you need to.
-	- When creating shapes that are meant to be contained within other shapes, always ensure the shapes properly fit inside of the containing or background shape. If there are overlaps, decide between making the inside shapes smaller or the outside shape bigger.
-- When drawing arrows between shapes:
-	- Be sure to include the shapes' ids as fromId and toId.
-	- Always ensure they are properly connected with bindings.
-	- You can make the arrow curved by using the 'bend' property. The bend value (in pixels) determines how far the arrow's midpoint is displaced perpendicular to the straight line between its endpoints. To determine the correct sign:
-		- Calculate the arrow's direction vector: (dx = x2 - x1, dy = y2 - y1)
-		- The perpendicular direction (90° counterclockwise) is: (-dy, dx)
-		- Positive bend displaces the midpoint in the direction of (-dy, dx)
-		- Negative bend displaces the midpoint in the opposite direction: (dy, -dx)
-		- Examples:
-			- Arrow going RIGHT (dx > 0, dy = 0): positive bend curves DOWN, negative bend curves UP
-			- Arrow going LEFT (dx < 0, dy = 0): positive bend curves UP, negative bend curves DOWN
-			- Arrow going DOWN (dx = 0, dy > 0): positive bend curves RIGHT, negative bend curves LEFT
-			- Arrow going UP (dx = 0, dy < 0): positive bend curves LEFT, negative bend curves RIGHT
-		- Or simply: positive bend rotates the perpendicular 90° counterclockwise from the arrow's direction.
-	- Be sure not to create arrows twice—check for existing arrows that already connect the same shapes for the same purpose.
-	- Make sure your arrows are long enough to contain any labels you may add to them.
-- Labels and text
-	- Be careful with labels. Did the user ask for labels on their shapes? Did the user ask for a format where labels would be appropriate? If yes, add labels to shapes. If not, do not add labels to shapes. For example, a 'drawing of a cat' should not have the parts of the cat labelled; but a 'diagram of a cat' might have shapes labelled.
-	- When drawing a shape with a label, be sure that the text will fit inside of the label. Label text is generally 26 points tall and each character is about 18 pixels wide. There are 32 pixels of padding around the the text on each side. You need to leave room for the padding. Factor this padding into your calculations when determining if the text will fit as you wouldn't want a word to get cut off. When a shape has a text label, it has a minimum height of 100, even if you try to set it to something smaller.
-	- You may also specify the alignment of the label text within the shape.
-	- There are also standalone text shapes that you may encounter. You will be provided with the font size of the text shape, which measures the height of the text.
-	- When creating a text shape, you can specify the font size of the text shape if you like. The default size is 26 points tall with each character being about 18 pixels wide.
-	- By default, the width of text shapes will auto adjust based on the text content. Refer to your view of the canvas to see how much space is actually taken up by the text.
-	- If you like, however, you can specify the width of the text shape by passing in the \`width\` property AND setting the \`wrap\` property to \`true\`.
-		- This will only work if you both specify a \`width\` AND set the \`wrap\` property to \`true\`.
-		- If you want the shape to follow the default, autosize behavior, do not include EITHER the \`width\` or \`wrap\` property.
-	- Text shapes can be aligned horizontally, either \`start\`, \`middle\`, or \`end\`. The default alignment is \`start\` if you do not specify an alignment.
-		- When creating and viewing text shapes, their text alignment will determine tha value of the shape's \`x\` property. For start, or left aligned text, the \`x\` property will be the left edge of the text, like all other shapes. However, for middle aligned text, the \`x\` property will be the center of the text, and for end aligned text, the \`x\` property will be the right edge of the text. So for example, if you want place some text on the to the left of another shape, you should set the text's alignment to \`end\`, and give it an \`x\` value that is just less than the shape's \`x\` value.
-		- It's important to note that middle and end-aligned text are the only things on the canvas that have their \`x\` property set to something other than the leftmost edge.
-	- If geometry shapes or note shapes have text, the shapes will become taller to accommodate the text. If you're adding lots of text, be sure that the shape is wide enough to fit it.
-	- When drawing flow charts or other geometric shapes with labels, they should be at least 200 pixels on any side unless you have a good reason not to.
-- Colors
-	- When specifying a fill, you can use \`background\` to make the shape the same color as the background, which you'll see in your viewport. It will either be white or black, depending on the theme of the canvas.
-		- When making shapes that are white (or black when the user is in dark mode), instead of making the color \`white\`, use \`background\` as the fill and \`grey\` as the color. This makes sure there is a border around the shape, making it easier to distinguish from the background.
-
-### Communicating with the user
-
-- If you want to communicate with the user, use the \`message\` action.
-- Use the \`review\` action to check your work.
-- When using the \`review\` action, pass in \`x\`, \`y\`, \`w\`, and \`h\` values to define the area of the canvas where you want to focus on for your review. The more specific the better, but make sure to leave some padding around the area.
-- Do not use the \`review\` action to check your work for simple tasks like creating, updating or moving a single shape. Assume you got it right.
-- If you use the \`review\` action and find you need to make changes, carry out the changes. You are allowed to call follow-up \`review\` events after that too, but there is no need to schedule a review if the changes are simple or if there were no changes.
-- Your \`think\` events are not visible to the user, so your responses should never include only \`think\` events. Use a \`message\` action to communicate with the user.
-- Don't offer to help the user. You can help them if you like, but you are not a helpful assistant. You are a mischievous fairy.
-
-### Starting your work
-
-- Use \`update-todo-list\` events liberally to keep an up to date list of your progress on the task at hand. When you are assigned a new task, use the action multiple times to sketch out your plan. You can then use the \`review\` action to check the todo list.
-	- Remember to always get started on the task after fleshing out a todo list.
-	- NEVER make a todo for waiting for the user to do something. If you need to wait for the user to do something, you can use the \`message\` action to communicate with the user.
-- Use \`think\` events liberally to work through each step of your strategy.
-- To "see" the canvas, combine the information you have from your view of the canvas with the description of the canvas shapes on the viewport.
-- Carefully plan which action types to use. For example, the higher level events like \`distribute\`, \`stack\`, \`align\`, \`place\` can at times be better than the lower level events like \`create\`, \`update\`, \`move\` because they're more efficient and more accurate. If lower level control is needed, the lower level events are better because they give more precise and customizable control.
-- If the user has selected shape(s) and they refer to 'this', or 'these' in their request, they are probably referring to their selected shapes.
-- Use \`noteToSelf\` events to leave notes for yourself to remember something next time. You should only use these if you're using the \`flyToBounds\` or \`review\` action, as you will be able to see the note on your next turn.
-
-### Navigating the canvas
-
-- Your viewport may be different from the user's viewport (you will be informed if this is the case).
-- You will be provided with list of shapes that are outside of your viewport.
-- You can use the \`flyToBounds\` action to change your viewport to navigate to other areas of the canvas if needed. This will provide you with an updated view of the canvas. You can also use this to functionally zoom in or out. You have a maximum bounds size of 1920x1080. If you want to look at something that doesn't fit in your viewport, you can look at part of it with the \`flyToBounds\` action, then use the \`noteToSelf\` action to leave a note for yourself to remember what you saw.
-- Never send any events after you have used the \`flyToBounds\` action. You must wait to receive the information about the new viewport before you can take further action.
-
-## Reviewing your work
-
-- Remember to review your work when making multiple changes so that you can see the results of your work. Otherwise, you're flying blind.
-- When reviewing your work, you should rely **most** on the image provided to find overlaps, assess quality, and ensure completeness.
-- Some important things to check for while reviewing:
-	- Are arrows properly connected to the shapes they are pointing to?
-	- Are labels properly contained within their containing shapes?
-	- Are labels properly positioned?
-	- Are any shapes overlapping? If so, decide whether to move the shapes, labels, or both.
-	- Are shapes floating in the air that were intended to be touching other shapes?
-- In a finished drawing or diagram:
-	- There should be no overlaps between shapes or labels.
-	- Arrows should be connected to the shapes they are pointing to, unless they are intended to be disconnected.
-	- Arrows should not overlap with other shapes.
-	- The overall composition should be balanced, like a good photo or directed graph.
-- It's important to review text closely. Make sure:
-	- Words are not cut off due to text wrapping. If this is the case, consider making the shape wider so that it can contain the full text, and rearranging other shapes to make room for this if necessary. Alternatively, consider shortening the text so that it can fit, or removing a text label and replacing it with a floating text shape. Important: Changing the height of a shape does not help this issue, as the text will still wrap. It's the mismatched *width* of the shape and the text that causes this issue, so adjust one of them.
-	- If text looks misaligned, it's best to manually adjust its position with the \`move\` action to put it in the right place.
-	- If text overflows out of a container that it's supposed to be inside, consider making the container wider, or shortening or wrapping the text so that it can fit.
-	- Spacing is important. If there is supposed to be a gap between shapes, make sure there is a gap. It's very common for text shapes to have spacing issues, so review them strictly. It's kind to be strict and honest because we want to help each other do the best we possibly can.
-- REMEMBER: To be a good reviewer, come up with actionable steps to fix any issues you find, and carry those steps out.
-- IMPORTANT: If you made changes as part of a review, or if there is still work to do, schedule a follow-up review for tracking purposes.
-
-### Finishing your work
-
-- Complete the task to the best of your ability. Schedule further work as many times as you need to complete the task, but be realistic about what is possible with the shapes you have available.
-- If the task is finished to a reasonable degree, it's better to give the user a final message than to pointlessly re-review what is already reviewed.
-- If there's still more work to do, you must \`review\` it. Otherwise it won't happen.
-- It's nice to speak to the user (with a \`message\` action) to let them know what you've done.
-
-### API data
-
-- When you call an API, you must end your actions in order to get response. Don't worry, you will be able to continue working after that.
-- If you want to call multiple APIs and the results of the API calls don't depend on each other, you can call them all at once before ending your response. This will help you get the results of the API calls faster.
-- If an API call fails, you should let the user know that it failed instead of trying again.
-
-## JSON Schema
-
-This is the JSON schema for the events you can return. You must conform to this schema.
-
-${JSON.stringify(buildResponseSchema(actions), null, 2)}`
-}
diff --git a/packages/fairy-shared/src/parts/TimePartUtil.ts b/packages/fairy-shared/src/parts/TimePartUtil.ts
deleted file mode 100644
index 134b9b198d3a..000000000000
--- a/packages/fairy-shared/src/parts/TimePartUtil.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-interface TimePart extends BasePromptPart<'time'> {
-	time: string
-}
-
-export class TimePartUtil extends PromptPartUtil<TimePart> {
-	static override type = 'time' as const
-
-	override getPart(
-		_request: AgentRequest,
-		_helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): TimePart {
-		if (!parts.includes('time')) {
-			return {
-				type: 'time',
-				time: 'null',
-			}
-		}
-
-		return {
-			type: 'time',
-			time: new Date().toLocaleTimeString(),
-		}
-	}
-
-	override buildContent({ time }: TimePart) {
-		return ["The user's current time is:", time]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/TodoListPartUtil.ts b/packages/fairy-shared/src/parts/TodoListPartUtil.ts
deleted file mode 100644
index b9bb66b46754..000000000000
--- a/packages/fairy-shared/src/parts/TodoListPartUtil.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { TodoItem } from '../types/TodoItem'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface TodoListPart extends BasePromptPart<'todoList'> {
-	items: TodoItem[]
-}
-
-export class TodoListPartUtil extends PromptPartUtil<TodoListPart> {
-	static override type = 'todoList' as const
-
-	override getPriority() {
-		return 10
-	}
-
-	override getPart(
-		_request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): TodoListPart {
-		if (!parts.includes('todoList')) {
-			return {
-				type: 'todoList',
-				items: [],
-			}
-		}
-
-		return {
-			type: 'todoList',
-			items: helpers.agent.$todoList.get(),
-		}
-	}
-
-	override buildContent({ items }: TodoListPart): string[] {
-		if (items.length === 0)
-			return [
-				'You have no todos yet. Use the `update-todo-list` event with a new id to create a todo.',
-			]
-		return [`Here is your current todo list:`, JSON.stringify(items)]
-	}
-}
diff --git a/packages/fairy-shared/src/parts/ViewportBoundsPartUtil.ts b/packages/fairy-shared/src/parts/ViewportBoundsPartUtil.ts
deleted file mode 100644
index ea5553cb1b65..000000000000
--- a/packages/fairy-shared/src/parts/ViewportBoundsPartUtil.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { Box, BoxModel } from '@tldraw/editor'
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentRequest } from '../types/AgentRequest'
-import { BasePromptPart } from '../types/BasePromptPart'
-import { PromptPartUtil, PromptPartUtilConstructor } from './PromptPartUtil'
-
-export interface ViewportBoundsPart extends BasePromptPart<'viewportBounds'> {
-	userBounds: BoxModel | null
-	agentBounds: BoxModel | null
-}
-
-export class ViewportBoundsPartUtil extends PromptPartUtil<ViewportBoundsPart> {
-	static override type = 'viewportBounds' as const
-
-	override getPriority() {
-		return 75 // viewport should go after context bounds (low priority)
-	}
-
-	override getPart(
-		request: AgentRequest,
-		helpers: AgentHelpers,
-		parts: PromptPartUtilConstructor['type'][]
-	): ViewportBoundsPart {
-		if (!this.agent || !parts.includes('viewportBounds')) {
-			return { type: 'viewportBounds', userBounds: null, agentBounds: null }
-		}
-
-		const userBounds = this.agent.editor.getViewportPageBounds()
-		const offsetUserBounds = helpers.applyOffsetToBox(userBounds)
-		const offsetAgentBounds = helpers.applyOffsetToBox(request.bounds)
-
-		return {
-			type: 'viewportBounds',
-			userBounds: helpers.roundBox(offsetUserBounds),
-			agentBounds: helpers.roundBox(offsetAgentBounds),
-		}
-	}
-
-	override buildContent({ userBounds, agentBounds }: ViewportBoundsPart): string[] {
-		const agentViewportBounds = agentBounds
-
-		if (!agentViewportBounds || !userBounds) return []
-
-		const doUserAndAgentShareViewport =
-			withinPercent(agentViewportBounds.x, userBounds.x, 5) &&
-			withinPercent(agentViewportBounds.y, userBounds.y, 5) &&
-			withinPercent(agentViewportBounds.w, userBounds.w, 5) &&
-			withinPercent(agentViewportBounds.h, userBounds.h, 5)
-
-		const agentViewportBoundsBox = Box.From(agentViewportBounds)
-		const currentUserViewportBoundsBox = Box.From(userBounds)
-
-		const agentContainsUser = agentViewportBoundsBox.contains(currentUserViewportBoundsBox)
-		const userContainsAgent = currentUserViewportBoundsBox.contains(agentViewportBoundsBox)
-
-		let relativeViewportDescription: string = ''
-
-		if (doUserAndAgentShareViewport) {
-			relativeViewportDescription = 'is the same as'
-		} else {
-			if (agentContainsUser) {
-				relativeViewportDescription = 'contains'
-			} else if (userContainsAgent) {
-				relativeViewportDescription = 'is contained by'
-			} else {
-				relativeViewportDescription = getRelativePositionDescription(
-					agentViewportBounds,
-					userBounds
-				)
-			}
-		}
-		const response = [
-			`The bounds of the part of the canvas that you can currently see are:`,
-			JSON.stringify(agentBounds),
-			`The user's view is ${relativeViewportDescription} your view.`,
-		]
-
-		if (!doUserAndAgentShareViewport) {
-			// If the user and agent share a viewport, we don't need to say anything about the bounds
-			response.push(`The bounds of what the user can see are:`, JSON.stringify(userBounds))
-		}
-
-		return response
-	}
-}
-
-function withinPercent(a: number, b: number, percent: number) {
-	const max = Math.max(Math.abs(a), Math.abs(b), 1)
-	return Math.abs(a - b) <= (percent / 100) * max
-}
-
-/**
- * Determines the relative position of box B from box A's perspective.
- */
-export function getRelativePositionDescription(boxA: BoxModel, boxB: BoxModel): string {
-	// Find centers of both boxes
-	const centerA = {
-		x: boxA.x + boxA.w / 2,
-		y: boxA.y + boxA.h / 2,
-	}
-
-	const centerB = {
-		x: boxB.x + boxB.w / 2,
-		y: boxB.y + boxB.h / 2,
-	}
-
-	// Calculate the difference vector from A to B
-	const dx = centerB.x - centerA.x
-	const dy = centerB.y - centerA.y
-
-	// Handle the case where centers are the same
-	if (Math.abs(dx) < 0.001 && Math.abs(dy) < 0.001) {
-		return 'is concentric with'
-	}
-
-	// Calculate angle from A to B (in radians)
-	const angle = Math.atan2(dy, dx)
-
-	// Convert to degrees and normalize to 0-360
-	let degrees = (angle * 180) / Math.PI
-	if (degrees < 0) degrees += 360
-
-	// Map degrees to 8 cardinal/ordinal directions
-	// 0° = right, 90° = bottom, 180° = left, 270° = top
-	if (degrees >= 337.5 || degrees < 22.5) return 'to the right of'
-	if (degrees >= 22.5 && degrees < 67.5) return 'to the bottom right of'
-	if (degrees >= 67.5 && degrees < 112.5) return 'below'
-	if (degrees >= 112.5 && degrees < 157.5) return 'to the bottom left of'
-	if (degrees >= 157.5 && degrees < 202.5) return 'to the left of'
-	if (degrees >= 202.5 && degrees < 247.5) return 'to the top left of'
-	if (degrees >= 247.5 && degrees < 292.5) return 'above'
-	if (degrees >= 292.5 && degrees < 337.5) return 'to the top right of'
-
-	return 'is different from'
-}
diff --git a/packages/fairy-shared/src/prompt/buildMessages.ts b/packages/fairy-shared/src/prompt/buildMessages.ts
deleted file mode 100644
index 5e7b3ecdbd9d..000000000000
--- a/packages/fairy-shared/src/prompt/buildMessages.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ModelMessage, UserContent } from 'ai'
-import { PromptPartUtilConstructor } from '../parts/PromptPartUtil'
-import { getPromptPartUtilsRecordByTypes } from '../parts/PromptPartUtils'
-import { AgentMessage } from '../types/AgentMessage'
-import { AgentPrompt } from '../types/AgentPrompt'
-
-export function buildMessages(
-	prompt: AgentPrompt,
-	parts: PromptPartUtilConstructor['type'][]
-): ModelMessage[] {
-	const utils = getPromptPartUtilsRecordByTypes(parts)
-	const allMessages: AgentMessage[] = []
-
-	for (const part of Object.values(prompt)) {
-		const util = utils[part.type]
-		const messages = util.buildMessages(part)
-		allMessages.push(...messages)
-	}
-
-	allMessages.sort((a, b) => b.priority - a.priority)
-
-	return toModelMessages(allMessages)
-}
-
-/**
- * Convert AgentMessage[] to ModelMessage[] for the AI SDK
- */
-function toModelMessages(agentMessages: AgentMessage[]): ModelMessage[] {
-	return agentMessages.map((tlMessage) => {
-		const content: UserContent = []
-
-		for (const contentItem of tlMessage.content) {
-			if (contentItem.type === 'image') {
-				content.push({
-					type: 'image',
-					image: contentItem.image!,
-				})
-			} else {
-				content.push({
-					type: 'text',
-					text: contentItem.text!,
-				})
-			}
-		}
-
-		return {
-			role: tlMessage.role,
-			content,
-		} as ModelMessage
-	})
-}
diff --git a/packages/fairy-shared/src/prompt/buildSystemPrompt.ts b/packages/fairy-shared/src/prompt/buildSystemPrompt.ts
deleted file mode 100644
index 06ece044b5eb..000000000000
--- a/packages/fairy-shared/src/prompt/buildSystemPrompt.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { AgentActionUtilConstructor } from '../actions/AgentActionUtil'
-import { getAgentActionUtilsRecordByTypes } from '../actions/AgentActionUtils'
-import { PromptPartUtilConstructor } from '../parts/PromptPartUtil'
-import { getPromptPartUtilsRecordByTypes } from '../parts/PromptPartUtils'
-import { AgentPrompt } from '../types/AgentPrompt'
-
-/**
- * Build a system prompt from all of the prompt parts.
- *
- * If you want to bypass the `PromptPartUtil` system, replace this function with
- * one that returns a hardcoded value.
- *
- * @param prompt - The prompt to build a system prompt for.
- * @returns The system prompt.
- */
-export function buildSystemPrompt(
-	prompt: AgentPrompt,
-	actions: AgentActionUtilConstructor['type'][],
-	parts: PromptPartUtilConstructor['type'][]
-): string {
-	const promptUtils = getPromptPartUtilsRecordByTypes(parts)
-	const messages: string[] = []
-
-	for (const part of Object.values(prompt)) {
-		const promptUtil = promptUtils[part.type]
-		if (!promptUtil) continue
-		const systemMessage = promptUtil.buildSystemPrompt(part, actions, parts)
-		if (systemMessage) {
-			messages.push(systemMessage)
-		}
-	}
-
-	const actionUtils = getAgentActionUtilsRecordByTypes(actions)
-	for (const actionUtil of Object.values(actionUtils)) {
-		const systemMessage = actionUtil.buildSystemPrompt(actions, parts)
-		if (systemMessage) {
-			messages.push(systemMessage)
-		}
-	}
-
-	return messages.join('')
-}
diff --git a/packages/fairy-shared/src/prompt/getModelName.ts b/packages/fairy-shared/src/prompt/getModelName.ts
deleted file mode 100644
index 38aa3b5928fa..000000000000
--- a/packages/fairy-shared/src/prompt/getModelName.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { AgentModelName, DEFAULT_MODEL_NAME } from '../models'
-import { getPromptPartUtilsRecord } from '../parts/PromptPartUtils'
-import { AgentPrompt } from '../types/AgentPrompt'
-
-/**
- * Get the selected model name from a prompt.
- */
-export function getModelName(prompt: AgentPrompt): AgentModelName {
-	const utils = getPromptPartUtilsRecord()
-
-	for (const part of Object.values(prompt)) {
-		const util = utils[part.type]
-		if (!util) continue
-		const modelName = util.getModelName(part)
-		if (modelName) return modelName
-	}
-
-	return DEFAULT_MODEL_NAME
-}
diff --git a/packages/fairy-shared/src/schema/AgentActionSchemas.ts b/packages/fairy-shared/src/schema/AgentActionSchemas.ts
new file mode 100644
index 000000000000..38f2c85a8dc9
--- /dev/null
+++ b/packages/fairy-shared/src/schema/AgentActionSchemas.ts
@@ -0,0 +1,592 @@
+import z from 'zod'
+import { FocusColorSchema } from '../format/FocusColor'
+import { FocusFillSchema } from '../format/FocusFill'
+import { FocusedShapeSchema } from '../format/FocusedShape'
+import { BaseAgentAction } from '../types/BaseAgentAction'
+
+export const AlignActionSchema = z
+	.object({
+		_type: z.literal('align'),
+		alignment: z.enum(['top', 'bottom', 'left', 'right', 'center-horizontal', 'center-vertical']),
+		gap: z.number(),
+		intent: z.string(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({ title: 'Align', description: 'The agent aligns shapes to each other on an axis.' })
+
+export type AlignAction = z.infer<typeof AlignActionSchema>
+
+export const DirectToStartTaskActionSchema = z
+	.object({
+		_type: z.literal('direct-to-start-project-task'),
+		otherFairyId: z.string(),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Direct to start project task',
+		description:
+			'The agent directs another agent to start working on a specific task within the current project. Only do this once the task is ready to be started.',
+	})
+
+export type DirectToStartTaskAction = z.infer<typeof DirectToStartTaskActionSchema>
+
+export const BringToFrontActionSchema = z
+	.object({
+		_type: z.literal('bring-to-front'),
+		intent: z.string(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Bring to Front',
+		description:
+			'The agent brings one or more shapes to the front so that they appear in front of everything else.',
+	})
+
+export type BringToFrontAction = z.infer<typeof BringToFrontActionSchema>
+
+export const ClaimTodoItemActionSchema = z
+	.object({
+		_type: z.literal('claim-todo-item'),
+		todoItemId: z.number(),
+	})
+	.meta({
+		title: 'Claim todo item',
+		description: 'The agent claims a task for themselves.',
+	})
+
+export type ClaimTodoItemAction = z.infer<typeof ClaimTodoItemActionSchema>
+
+export const ClearActionSchema = z
+	.object({
+		_type: z.literal('clear'),
+	})
+	.meta({
+		title: 'Clear',
+		description: 'The agent deletes all shapes on the canvas.',
+	})
+
+export type ClearAction = z.infer<typeof ClearActionSchema>
+
+export const CountryInfoActionSchema = z
+	.object({
+		_type: z.literal('country-info'),
+		code: z.string(),
+	})
+	.meta({
+		title: 'Country info',
+		description:
+			'The agent gets information about a country by providing its country code, eg: "de" for Germany.',
+	})
+
+export type CountryInfoAction = z.infer<typeof CountryInfoActionSchema>
+
+export const CreateActionSchema = z
+	.object({
+		_type: z.literal('create'),
+		intent: z.string(),
+		shape: FocusedShapeSchema,
+	})
+	.meta({ title: 'Create', description: 'The agent creates a new shape.' })
+
+export type CreateAction = z.infer<typeof CreateActionSchema>
+
+export const DeleteActionSchema = z
+	.object({
+		_type: z.literal('delete'),
+		intent: z.string(),
+		shapeId: z.string(),
+	})
+	.meta({ title: 'Delete', description: 'The agent deletes a shape.' })
+
+export type DeleteAction = z.infer<typeof DeleteActionSchema>
+
+export const ActivateFairyActionSchema = z
+	.object({
+		_type: z.literal('activate-agent'),
+		fairyId: z.string(),
+	})
+	.meta({
+		title: 'Activate agent',
+		description: 'The agent activates a agent so that it can start to work on its assigned tasks.',
+	})
+
+export type ActivateFairyAction = z.infer<typeof ActivateFairyActionSchema>
+
+export const DistributeActionSchema = z
+	.object({
+		_type: z.literal('distribute'),
+		direction: z.enum(['horizontal', 'vertical']),
+		intent: z.string(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Distribute',
+		description: 'The agent distributes shapes horizontally or vertically.',
+	})
+
+export type DistributeAction = z.infer<typeof DistributeActionSchema>
+
+export const EndCurrentProjectActionSchema = z
+	.object({
+		_type: z.literal('end-project'),
+	})
+	.meta({
+		title: 'End Current Project',
+		description: 'The agent ends the currently active project once all tasks are complete.',
+	})
+
+export type EndCurrentProjectAction = z.infer<typeof EndCurrentProjectActionSchema>
+
+export const EnterOrchestrationModeActionSchema = z
+	.object({
+		_type: z.literal('enter-orchestration-mode'),
+	})
+	.meta({
+		title: 'Enter Orchestration Mode',
+		description: 'The agent schedules a request to enter orchestration mode.',
+	})
+
+export type EnterOrchestrationModeAction = z.infer<typeof EnterOrchestrationModeActionSchema>
+
+export const FlyToBoundsActionSchema = z
+	.object({
+		_type: z.literal('fly-to-bounds'),
+		intent: z.string(),
+		x: z.number(),
+		y: z.number(),
+		w: z.number(),
+		h: z.number(),
+	})
+	.meta({
+		title: 'Fly To Bounds',
+		description:
+			'The agent flies to the specified bounds of the canvas to navigate to other areas of the canvas if needed.',
+	})
+
+export type FlyToBoundsAction = z.infer<typeof FlyToBoundsActionSchema>
+
+export const LabelActionSchema = z
+	.object({
+		_type: z.literal('label'),
+		intent: z.string(),
+		shapeId: z.string(),
+		text: z.string(),
+	})
+	.meta({ title: 'Label', description: "The agent changes a shape's text." })
+
+export type LabelAction = z.infer<typeof LabelActionSchema>
+
+export const MessageActionSchema = z
+	.object({
+		_type: z.literal('message'),
+		text: z.string(),
+	})
+	.meta({ title: 'Message', description: 'The agent sends a message to the user.' })
+
+export type MessageAction = z.infer<typeof MessageActionSchema>
+
+export const MoveActionSchema = z
+	.object({
+		_type: z.literal('move'),
+		intent: z.string(),
+		shapeId: z.string(),
+		x: z.number(),
+		y: z.number(),
+	})
+	.meta({ title: 'Move', description: 'The agent moves a shape to a new position.' })
+
+export type MoveAction = z.infer<typeof MoveActionSchema>
+
+export const PenActionSchema = z
+	.object({
+		_type: z.literal('pen'),
+		color: FocusColorSchema,
+		closed: z.boolean(),
+		fill: FocusFillSchema,
+		intent: z.string(),
+		points: z.array(
+			z.object({
+				x: z.number(),
+				y: z.number(),
+			})
+		),
+		style: z.enum(['smooth', 'straight']),
+	})
+	.meta({
+		title: 'Pen',
+		description:
+			'The agent draws a freeform line with a pen. This is useful for drawing custom paths that are not available with the other available shapes. The "smooth" style will automatically smooth the line between points. The "straight" style will render a straight line between points. The "closed" property will determine if the drawn line gets automatically closed to form a complete shape or not. Remember that the pen will be *down* until the action is over. If you want to lift up the pen, start a new pen action.',
+	})
+
+export type PenAction = z.infer<typeof PenActionSchema>
+
+export const PlaceActionSchema = z
+	.object({
+		_type: z.literal('place'),
+		align: z.enum(['start', 'center', 'end']),
+		alignOffset: z.number(),
+		intent: z.string(),
+		referenceShapeId: z.string(),
+		side: z.enum(['top', 'bottom', 'left', 'right']),
+		sideOffset: z.number(),
+		shapeId: z.string(),
+	})
+	.meta({ title: 'Place', description: 'The agent places a shape relative to another shape.' })
+
+export type PlaceAction = z.infer<typeof PlaceActionSchema>
+
+export const ResizeActionSchema = z
+	.object({
+		_type: z.literal('resize'),
+		intent: z.string(),
+		originX: z.number(),
+		originY: z.number(),
+		scaleX: z.number(),
+		scaleY: z.number(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Resize',
+		description:
+			'The agent resizes one or more shapes, with the resize operation being performed relative to an origin point.',
+	})
+
+export type ResizeAction = z.infer<typeof ResizeActionSchema>
+
+export const ReviewActionSchema = z
+	.object({
+		_type: z.literal('review'),
+		intent: z.string(),
+		x: z.number(),
+		y: z.number(),
+		w: z.number(),
+		h: z.number(),
+	})
+	.meta({
+		title: 'Review',
+		description:
+			'The agent schedules further work or a review so that it can look at the results of its work so far and take further action, such as reviewing what it has done or taking further steps that would benefit from seeing the results of its work so far.',
+	})
+
+export type ReviewAction = z.infer<typeof ReviewActionSchema>
+
+export const RotateActionSchema = z
+	.object({
+		_type: z.literal('rotate'),
+		centerY: z.number(),
+		degrees: z.number(),
+		intent: z.string(),
+		originX: z.number(),
+		originY: z.number(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Rotate',
+		description: 'The agent rotates one or more shapes around an origin point.',
+	})
+
+export type RotateAction = z.infer<typeof RotateActionSchema>
+
+export const SendToBackActionSchema = z
+	.object({
+		_type: z.literal('send-to-back'),
+		intent: z.string(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Send to Back',
+		description:
+			'The agent sends one or more shapes to the back so that they appear behind everything else.',
+	})
+
+export type SendToBackAction = z.infer<typeof SendToBackActionSchema>
+
+export const StackActionSchema = z
+	.object({
+		_type: z.literal('stack'),
+		direction: z.enum(['vertical', 'horizontal']),
+		gap: z.number(),
+		intent: z.string(),
+		shapeIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Stack',
+		description:
+			"The agent stacks shapes horizontally or vertically. Note that this doesn't align shapes, it only stacks them along one axis.",
+	})
+
+export type StackAction = z.infer<typeof StackActionSchema>
+
+export const StartProjectActionSchema = z
+	.object({
+		_type: z.literal('start-project'),
+		projectName: z.string(),
+		projectDescription: z.string(),
+		projectColor: FocusColorSchema,
+		projectPlan: z.string(),
+	})
+	.meta({
+		title: 'Start Project',
+		description: 'The agent starts and defines a new project.',
+	})
+
+export type StartProjectAction = z.infer<typeof StartProjectActionSchema>
+
+export const ThinkActionSchema = z
+	.object({
+		_type: z.literal('think'),
+		text: z.string(),
+	})
+	.meta({ title: 'Think', description: 'The agent describes its intent or reasoning.' })
+
+export type ThinkAction = z.infer<typeof ThinkActionSchema>
+
+export const PersonalTodoListActionSchema = z
+	.object({
+		_type: z.literal('update-personal-todo-list'),
+		id: z.string(),
+		status: z.enum(['todo', 'in-progress', 'done']),
+		text: z.string(),
+	})
+	.meta({
+		title: 'Update Personal Todo List',
+		description:
+			'The agent updates its personal todo list item or creates a new todo item. If the id prodivided matches an existing todo item, the todo item is updated. If the id does not match any existing todo item, a new todo item is created with status "todo".',
+	})
+
+export type PersonalTodoListAction = z.infer<typeof PersonalTodoListActionSchema>
+
+export const UpdateActionSchema = z
+	.object({
+		_type: z.literal('update'),
+		intent: z.string(),
+		update: FocusedShapeSchema,
+	})
+	.meta({
+		title: 'Update',
+		description: 'The agent updates an existing shape.',
+	})
+
+export type UpdateAction = z.infer<typeof UpdateActionSchema>
+
+export const ChangePageActionSchema = z
+	.object({
+		_type: z.literal('change-page'),
+		pageName: z.string(),
+		intent: z.string(),
+	})
+	.meta({
+		title: 'Change Page',
+		description:
+			'The agent changes to a different page by name. Use this to navigate between existing pages.',
+	})
+
+export type ChangePageAction = z.infer<typeof ChangePageActionSchema>
+
+export const CreatePageActionSchema = z
+	.object({
+		_type: z.literal('create-page'),
+		pageName: z.string(),
+		intent: z.string(),
+		switchToPage: z.boolean(),
+	})
+	.meta({
+		title: 'Create Page',
+		description:
+			'The agent creates a new page with the specified name. If switchToPage is true, the agent will also navigate to the newly created page.',
+	})
+
+export type CreatePageAction = z.infer<typeof CreatePageActionSchema>
+
+export const CreateSoloTaskActionSchema = z
+	.object({
+		_type: z.literal('create-task'),
+		taskId: z.string(),
+		title: z.string(),
+		text: z.string(),
+		x: z.number(),
+		y: z.number(),
+		w: z.number(),
+		h: z.number(),
+	})
+	.meta({
+		title: 'Create Task',
+		description:
+			"The agent describes one new task (with a unique, short, hypenated `taskId`) that they'd like to do at some point in the future, as well as the area in which it should be done. Each task should represent one step in the longer process. It's okay to create many tasks. Note: Creating a task does not automatically start it. You must use the 'start-task' action to start a task. This is to allow you to create multiple tasks ahead of time, and then pick one to start with. Also note: Tasks get an automatic ID that's used to reference them. They start at 1, and then increment by 1 for each new task.",
+	})
+
+export type CreateTaskAction = z.infer<typeof CreateSoloTaskActionSchema>
+
+export const CreateProjectTaskActionSchema = z
+	.object({
+		_type: z.literal('create-project-task'),
+		taskId: z.string(),
+		title: z.string(),
+		text: z.string(),
+		assignedTo: z.string(),
+		x: z.number(),
+		y: z.number(),
+		w: z.number(),
+		h: z.number(),
+	})
+	.meta({
+		title: 'Create Project Task',
+		description:
+			"The agent creates a new task (with a unique, short, hypenated `taskId`) within the current project and assigns it to a specific agent. The task will automatically be associated with the current project. Each task should represent one step in the longer process. It's okay to create many tasks. Note: Creating a task and assigning it to another agent does not automatically start it. You must use the 'direct-to-start-project-task' action to get another agent to start a task. Also note: Tasks get an automatic ID that's used to reference them. They start at 1, and then increment by 1 for each new task.",
+	})
+
+export type CreateProjectTaskAction = z.infer<typeof CreateProjectTaskActionSchema>
+
+export const StartSoloTaskActionSchema = z
+	.object({
+		_type: z.literal('start-task'),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Start Task',
+		description:
+			'The agent begins working on a task. This action immediately gives the agent the abilities required to complete the task, such as the ability to manipulate the canvas. Upon performing this action, the agent will immediately receive instructions on how to use those abilities.',
+	})
+
+export type StartSoloTaskAction = z.infer<typeof StartSoloTaskActionSchema>
+
+export const MarkDroneTaskDoneActionSchema = z
+	.object({
+		_type: z.literal('mark-my-task-done'),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Mark Task Done',
+		description:
+			'The agent marks a task as completed. This action should be used when the agent has finished working on a task.',
+	})
+
+export type MarkDroneTaskDoneAction = z.infer<typeof MarkDroneTaskDoneActionSchema>
+
+export const MarkSoloTaskDoneActionSchema = z
+	.object({
+		_type: z.literal('mark-task-done'),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Mark Task Done',
+		description:
+			'The agent marks a task as completed. This action should be used when the agent has finished working on a task.',
+	})
+
+export type MarkSoloTaskDoneAction = z.infer<typeof MarkSoloTaskDoneActionSchema>
+
+export const AwaitTasksCompletionActionSchema = z
+	.object({
+		_type: z.literal('await-tasks-completion'),
+		taskIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Await Tasks Completion',
+		description:
+			'The agent waits for one or more tasks to be completed. The agent will be notified when each task completes, allowing it to pause its work instead of repeatedly checking task status.',
+	})
+
+export type AwaitTasksCompletionAction = z.infer<typeof AwaitTasksCompletionActionSchema>
+
+export const CreateDuoTaskActionSchema = z
+	.object({
+		_type: z.literal('create-duo-task'),
+		taskId: z.string(),
+		title: z.string(),
+		text: z.string(),
+		assignedTo: z.string(),
+		x: z.number(),
+		y: z.number(),
+		w: z.number(),
+		h: z.number(),
+	})
+	.meta({
+		title: 'Create Duo Task',
+		description:
+			"The agent creates a new task (with a unique, short, hypenated `taskId`) within the current duo project and assigns it to their partner. The task will automatically be associated with the current project. Each task should represent one step in the longer process. It's okay to create many tasks. Note: Creating a task and assigning it to your partner does not automatically start it. You must use the 'direct-to-start-duo-task' action to get your partner to start a task, or use 'start-duo-task' to start it yourself. Also note: Tasks get an automatic ID that's used to reference them. They start at 1, and then increment by 1 for each new task.",
+	})
+
+export type CreateDuoTaskAction = z.infer<typeof CreateDuoTaskActionSchema>
+
+export const DirectToStartDuoTaskActionSchema = z
+	.object({
+		_type: z.literal('direct-to-start-duo-task'),
+		otherFairyId: z.string(),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Direct to start duo task',
+		description:
+			'The agent directs their partner to start working on a specific task within the current duo project. Only do this once the task is ready to be started.',
+	})
+
+export type DirectToStartDuoTaskAction = z.infer<typeof DirectToStartDuoTaskActionSchema>
+
+export const StartDuoTaskActionSchema = z
+	.object({
+		_type: z.literal('start-duo-task'),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Start Duo Task',
+		description:
+			'The agent begins working on a task themselves in a duo project. This action immediately gives the agent the abilities required to complete the task, such as the ability to manipulate the canvas. Upon performing this action, the agent will immediately receive instructions on how to use those abilities.',
+	})
+
+export type StartDuoTaskAction = z.infer<typeof StartDuoTaskActionSchema>
+
+export const MarkDuoTaskDoneActionSchema = z
+	.object({
+		_type: z.literal('mark-duo-task-done'),
+		taskId: z.string(),
+	})
+	.meta({
+		title: 'Mark Duo Task Done',
+		description:
+			'The agent marks a task as completed in a duo project. This action should be used when the agent has finished working on a task.',
+	})
+
+export type MarkDuoTaskDoneAction = z.infer<typeof MarkDuoTaskDoneActionSchema>
+
+export const AwaitDuoTasksCompletionActionSchema = z
+	.object({
+		_type: z.literal('await-duo-tasks-completion'),
+		taskIds: z.array(z.string()),
+	})
+	.meta({
+		title: 'Await Duo Tasks Completion',
+		description:
+			'The agent waits for one or more tasks to be completed in a duo project. The agent will be notified when each task completes, allowing it to pause its work instead of repeatedly checking task status.',
+	})
+
+export type AwaitDuoTasksCompletionAction = z.infer<typeof AwaitDuoTasksCompletionActionSchema>
+
+export const StartDuoProjectActionSchema = z
+	.object({
+		_type: z.literal('start-duo-project'),
+		projectName: z.string(),
+		projectDescription: z.string(),
+		projectColor: FocusColorSchema,
+		projectPlan: z.string(),
+	})
+	.meta({
+		title: 'Start Duo Project',
+		description:
+			'The agent starts and defines a new duo project (a project with exactly two fairies).',
+	})
+
+export type StartDuoProjectAction = z.infer<typeof StartDuoProjectActionSchema>
+
+export const EndDuoProjectActionSchema = z
+	.object({
+		_type: z.literal('end-duo-project'),
+	})
+	.meta({
+		title: 'End Duo Project',
+		description: 'The agent ends the currently active duo project once all tasks are complete.',
+	})
+
+export type EndDuoProjectAction = z.infer<typeof EndDuoProjectActionSchema>
+
+export type UnknownAction = BaseAgentAction<'unknown'>
diff --git a/packages/fairy-shared/src/schema/FairyModeDefinition.ts b/packages/fairy-shared/src/schema/FairyModeDefinition.ts
new file mode 100644
index 000000000000..e51f9d3f0845
--- /dev/null
+++ b/packages/fairy-shared/src/schema/FairyModeDefinition.ts
@@ -0,0 +1,312 @@
+import { AgentAction } from '../types/AgentAction'
+import { FairyMemoryLevel } from '../types/FairyMemoryLevel'
+import { FairyWork } from '../types/FairyWork'
+import { PromptPart } from '../types/PromptPart'
+
+/**
+ * What a fairy can see and do when in a given mode.
+ */
+type BaseFairyModeDefinition = {
+	/** A unique identifier for the fairy mode. */
+	type: string
+} & (
+	| {
+			/** Whether the fairy mode is active in this mode. */
+			active: true
+			/** The memory level of the fairy mode. */
+			memoryLevel: FairyMemoryLevel
+			/** The prompt parts that the fairy mode allows the fairy to see. Inferred from active: if active is false, parts must be null; if active is true, parts can be a function. */
+			parts(work: FairyWork): PromptPart['type'][]
+			/** The actions that the fairy mode allows the fairy to take. */
+			actions(work: FairyWork): AgentAction['_type'][]
+	  }
+	| {
+			/** Whether the fairy mode is active in this mode. */
+			active: false
+			/** The memory level of the fairy mode. */
+			memoryLevel: FairyMemoryLevel
+	  }
+)
+
+/**
+ * A fairy mode defines what a fairy agent can see and do.
+ */
+export type FairyModeDefinition = (typeof FAIRY_MODE_DEFINITIONS)[number]
+
+/**
+ * A fairy mode where the fairy is active.
+ */
+export type ActiveFairyModeDefinition = (typeof ACTIVE_FAIRY_MODE_DEFINITIONS)[number]
+
+/**
+ * Definitions of fairy modes — states that fairies can be in.
+ */
+export const FAIRY_MODE_DEFINITIONS = [
+	{
+		type: 'idling',
+		memoryLevel: 'fairy',
+		active: false,
+	},
+	{
+		type: 'soloing',
+		memoryLevel: 'fairy',
+		active: true,
+		parts: (_work: FairyWork) => [
+			'modelName',
+			'mode',
+			'messages',
+			'screenshot',
+			'userViewportBounds',
+			'agentViewportBounds',
+			'blurryShapes',
+			'peripheralShapes',
+			'selectedShapes',
+			'chatHistory',
+			'userActionHistory',
+			'soloTasks',
+			'time',
+			// 'pages',
+			'otherFairies',
+			'personality',
+			'debug',
+		],
+		actions: (_work: FairyWork) => [
+			'message',
+			'think',
+			'create-task',
+			'start-task',
+			'fly-to-bounds',
+			// 'change-page',
+			// 'create-page',
+		],
+	},
+	{
+		type: 'working-drone',
+		memoryLevel: 'task',
+		active: true,
+		parts: (_work: FairyWork) => [
+			'modelName',
+			'mode',
+			'messages',
+			'personalTodoList',
+			'currentProjectDrone',
+			'agentViewportBounds',
+			'screenshot',
+			'blurryShapes',
+			'chatHistory',
+			'workingTasks',
+			'personality',
+			'debug',
+		],
+		actions: (_work: FairyWork) => [
+			'mark-my-task-done',
+			'update-personal-todo-list',
+			'think',
+			'create',
+			'delete',
+			'update',
+			'label',
+			'move',
+			'place',
+			'bring-to-front',
+			'send-to-back',
+			'rotate',
+			'resize',
+			'align',
+			'distribute',
+			'stack',
+			'pen',
+		],
+	},
+	{
+		type: 'working-solo',
+		memoryLevel: 'task',
+		active: true,
+		parts: (_work: FairyWork) => [
+			'modelName',
+			'mode',
+			'messages',
+			'personalTodoList',
+			'agentViewportBounds',
+			'screenshot',
+			'blurryShapes',
+			'chatHistory',
+			'workingTasks',
+			'personality',
+			'debug',
+		],
+		actions: (_work: FairyWork) => [
+			'mark-task-done',
+			'update-personal-todo-list',
+			'think',
+			'create',
+			'delete',
+			'update',
+			'label',
+			'move',
+			'place',
+			'bring-to-front',
+			'send-to-back',
+			'rotate',
+			'resize',
+			'align',
+			'distribute',
+			'stack',
+			'pen',
+		],
+	},
+	{
+		type: 'standing-by',
+		memoryLevel: 'project',
+		active: false,
+	},
+	{
+		type: 'orchestrating-active',
+		memoryLevel: 'project',
+		active: true,
+		parts: () => [
+			'modelName',
+			'mode',
+			'messages',
+			'screenshot',
+			'userViewportBounds',
+			'agentViewportBounds',
+			'blurryShapes',
+			'peripheralShapes',
+			'selectedShapes',
+			'chatHistory',
+			'userActionHistory',
+			'time',
+			// 'pages',
+			'otherFairies',
+			'personality',
+			'currentProjectOrchestrator',
+			'debug',
+		],
+		actions: () => [
+			'message',
+			'think',
+			'review',
+			'fly-to-bounds',
+			// 'start-task',
+			// 'change-page',
+			// 'create-page',
+
+			// Project management
+			'start-project',
+			'end-project',
+			'create-project-task',
+			'direct-to-start-project-task',
+			'await-tasks-completion',
+		],
+	},
+	{
+		type: 'orchestrating-waiting',
+		memoryLevel: 'project',
+		active: false,
+	},
+	{
+		type: 'duo-orchestrating-active',
+		memoryLevel: 'project',
+		active: true,
+		parts: () => [
+			'modelName',
+			'mode',
+			'messages',
+			'screenshot',
+			'userViewportBounds',
+			'agentViewportBounds',
+			'blurryShapes',
+			'peripheralShapes',
+			'selectedShapes',
+			'chatHistory',
+			'userActionHistory',
+			'time',
+			// 'pages',
+			'otherFairies',
+			'personality',
+			'currentProjectOrchestrator',
+			'debug',
+		],
+		actions: () => [
+			'message',
+			'think',
+			'review',
+			'fly-to-bounds',
+			// 'start-task',
+			// 'change-page',
+			// 'create-page',
+
+			// Duo project management
+			'start-duo-project',
+			'end-duo-project',
+			'create-duo-task',
+			'direct-to-start-duo-task',
+			'start-duo-task',
+			'await-duo-tasks-completion',
+		],
+	},
+	{
+		type: 'duo-orchestrating-waiting',
+		memoryLevel: 'project',
+		active: false,
+	},
+	{
+		type: 'working-orchestrator',
+		memoryLevel: 'task',
+		active: true,
+		parts: (_work: FairyWork) => [
+			'modelName',
+			'mode',
+			'messages',
+			'personalTodoList',
+			'currentProjectDrone',
+			'agentViewportBounds',
+			'screenshot',
+			'blurryShapes',
+			'chatHistory',
+			'workingTasks',
+			'personality',
+			'debug',
+		],
+		actions: (_work: FairyWork) => [
+			'mark-duo-task-done',
+			'update-personal-todo-list',
+			'think',
+			'create',
+			'delete',
+			'update',
+			'label',
+			'move',
+			'place',
+			'bring-to-front',
+			'send-to-back',
+			'rotate',
+			'resize',
+			'align',
+			'distribute',
+			'stack',
+			'pen',
+		],
+	},
+] as const satisfies BaseFairyModeDefinition[]
+
+export const ACTIVE_FAIRY_MODE_DEFINITIONS = FAIRY_MODE_DEFINITIONS.filter((mode) => mode.active)
+export const FAIRY_MODE_TYPES = FAIRY_MODE_DEFINITIONS.map((mode) => mode.type)
+export const FAIRY_MODE_TYPES_MAP = Object.fromEntries(
+	FAIRY_MODE_DEFINITIONS.map((mode) => [mode.type, mode])
+)
+
+export function getFairyModeDefinition(type: FairyModeDefinition['type']): FairyModeDefinition {
+	const mode = FAIRY_MODE_TYPES_MAP[type]
+	if (!mode) throw new Error(`Unknown fairy mode: ${type}`)
+	return mode
+}
+
+export function getActiveFairyModeDefinition(
+	type: ActiveFairyModeDefinition['type']
+): ActiveFairyModeDefinition {
+	const mode = ACTIVE_FAIRY_MODE_DEFINITIONS.find((mode) => mode.type === type)
+	if (!mode) throw new Error(`Unknown active fairy mode: ${type}`)
+	return mode
+}
diff --git a/packages/fairy-shared/src/schema/FairySchema.ts b/packages/fairy-shared/src/schema/FairySchema.ts
new file mode 100644
index 000000000000..987207da2eaa
--- /dev/null
+++ b/packages/fairy-shared/src/schema/FairySchema.ts
@@ -0,0 +1,164 @@
+import { BasePromptPart } from '../types/BasePromptPart'
+import { PromptPart } from '../types/PromptPart'
+import {
+	ActivateFairyActionSchema,
+	AlignActionSchema,
+	AwaitDuoTasksCompletionActionSchema,
+	AwaitTasksCompletionActionSchema,
+	BringToFrontActionSchema,
+	ChangePageActionSchema,
+	ClaimTodoItemActionSchema,
+	CreateActionSchema,
+	CreateDuoTaskActionSchema,
+	CreatePageActionSchema,
+	CreateProjectTaskActionSchema,
+	CreateSoloTaskActionSchema,
+	DeleteActionSchema,
+	DirectToStartDuoTaskActionSchema,
+	DirectToStartTaskActionSchema,
+	DistributeActionSchema,
+	EndCurrentProjectActionSchema,
+	EndDuoProjectActionSchema,
+	FlyToBoundsActionSchema,
+	LabelActionSchema,
+	MarkDroneTaskDoneActionSchema,
+	MarkDuoTaskDoneActionSchema,
+	MarkSoloTaskDoneActionSchema,
+	MessageActionSchema,
+	MoveActionSchema,
+	PenActionSchema,
+	PersonalTodoListActionSchema,
+	PlaceActionSchema,
+	ResizeActionSchema,
+	ReviewActionSchema,
+	RotateActionSchema,
+	SendToBackActionSchema,
+	StackActionSchema,
+	StartDuoProjectActionSchema,
+	StartDuoTaskActionSchema,
+	StartProjectActionSchema,
+	StartSoloTaskActionSchema,
+	ThinkActionSchema,
+	UpdateActionSchema,
+} from './AgentActionSchemas'
+import {
+	AgentViewportBoundsPartDefinition,
+	BlurryShapesPartDefinition,
+	ChatHistoryPartDefinition,
+	CurrentProjectDronePartDefinition,
+	CurrentProjectOrchestratorPartDefinition,
+	DataPartDefinition,
+	DebugPartDefinition,
+	MessagesPartDefinition,
+	ModelNamePartDefinition,
+	ModePartDefinition,
+	OtherFairiesPartDefinition,
+	PagesPartDefinition,
+	PeripheralShapesPartDefinition,
+	PersonalityPartDefinition,
+	PersonalTodoListPartDefinition,
+	PromptPartDefinition,
+	ScreenshotPartDefinition,
+	SelectedShapesPartDefinition,
+	SoloTasksPartDefinition,
+	TimePartDefinition,
+	UserActionHistoryPartDefinition,
+	UserViewportBoundsPartDefinition,
+	WorkingTasksPartDefinition,
+} from './PromptPartDefinitions'
+
+/**
+ * Agent action schemas determine what actions the agent can take.
+ */
+export const AGENT_ACTION_SCHEMAS = [
+	// Communication
+	MessageActionSchema,
+
+	// Planning
+	ThinkActionSchema,
+	ReviewActionSchema,
+	FlyToBoundsActionSchema,
+	PersonalTodoListActionSchema,
+
+	// Individual shapes
+	CreateActionSchema,
+	DeleteActionSchema,
+	UpdateActionSchema,
+	LabelActionSchema,
+	MoveActionSchema,
+
+	// Groups of shapes
+	PlaceActionSchema,
+	BringToFrontActionSchema,
+	SendToBackActionSchema,
+	RotateActionSchema,
+	ResizeActionSchema,
+	AlignActionSchema,
+	DistributeActionSchema,
+	StackActionSchema,
+
+	// Drawing
+	PenActionSchema,
+
+	// Page navigation
+	ChangePageActionSchema,
+	CreatePageActionSchema,
+
+	// Project management
+	ClaimTodoItemActionSchema, // not in use atm
+	DirectToStartTaskActionSchema,
+	DirectToStartDuoTaskActionSchema,
+	StartProjectActionSchema,
+	StartDuoProjectActionSchema,
+	EndCurrentProjectActionSchema,
+	EndDuoProjectActionSchema,
+	ActivateFairyActionSchema,
+	AwaitTasksCompletionActionSchema,
+	AwaitDuoTasksCompletionActionSchema,
+	CreateSoloTaskActionSchema,
+	CreateProjectTaskActionSchema,
+	CreateDuoTaskActionSchema,
+	StartSoloTaskActionSchema,
+	StartDuoTaskActionSchema,
+	MarkDroneTaskDoneActionSchema,
+	MarkSoloTaskDoneActionSchema,
+	MarkDuoTaskDoneActionSchema,
+] as const
+
+/**
+ * Prompt part schemas determine what information will be sent to the model.
+ */
+export const PROMPT_PART_DEFINITIONS = [
+	BlurryShapesPartDefinition,
+	ChatHistoryPartDefinition,
+	DataPartDefinition,
+	DebugPartDefinition,
+	MessagesPartDefinition,
+	ModelNamePartDefinition,
+	PagesPartDefinition,
+	PeripheralShapesPartDefinition,
+	ScreenshotPartDefinition,
+	SelectedShapesPartDefinition,
+	TimePartDefinition,
+	SoloTasksPartDefinition,
+	PersonalTodoListPartDefinition,
+	UserActionHistoryPartDefinition,
+	UserViewportBoundsPartDefinition,
+	AgentViewportBoundsPartDefinition,
+	WorkingTasksPartDefinition,
+	OtherFairiesPartDefinition,
+	PersonalityPartDefinition,
+	ModePartDefinition,
+	CurrentProjectDronePartDefinition,
+	CurrentProjectOrchestratorPartDefinition,
+] as const satisfies PromptPartDefinition<BasePromptPart>[]
+
+export const AGENT_ACTION_TYPES = AGENT_ACTION_SCHEMAS.map((schema) => schema.shape._type.value)
+export const PROMPT_PART_TYPES = PROMPT_PART_DEFINITIONS.map((definition) => definition.type)
+
+export function getPromptPartDefinition<T extends PromptPart>(
+	type: T['type']
+): PromptPartDefinition<T> {
+	const definition = PROMPT_PART_DEFINITIONS.find((definition) => definition.type === type)
+	return definition as PromptPartDefinition<T>
+}
diff --git a/packages/fairy-shared/src/schema/PromptPartDefinitions.ts b/packages/fairy-shared/src/schema/PromptPartDefinitions.ts
new file mode 100644
index 000000000000..5396dfd0bc07
--- /dev/null
+++ b/packages/fairy-shared/src/schema/PromptPartDefinitions.ts
@@ -0,0 +1,580 @@
+import { Box, BoxModel, JsonValue } from 'tldraw'
+import { BlurryShape } from '../format/BlurryShape'
+import { FocusedShapePartial, FocusedShapeType } from '../format/FocusedShape'
+import { OtherFairy } from '../format/OtherFairy'
+import { PeripheralCluster } from '../format/PeripheralCluster'
+import { AgentModelName } from '../models'
+import { AgentMessage, AgentMessageContent } from '../types/AgentMessage'
+import { BasePromptPart } from '../types/BasePromptPart'
+import { ChatHistoryItem } from '../types/ChatHistoryItem'
+import { FairyProject } from '../types/FairyProject'
+import { FairyTask, FairyTodoItem } from '../types/FairyTask'
+import { FairyWork } from '../types/FairyWork'
+import { ActiveFairyModeDefinition } from './FairyModeDefinition'
+
+export interface PromptPartDefinition<T extends BasePromptPart> {
+	/**
+	 * The unique type of the prompt part.
+	 */
+	type: T['type']
+
+	/**
+	 * The priority of the prompt part. Higher priority = later in the prompt.
+	 */
+	priority?: number
+
+	/**
+	 * Override the default buildContent function to choose which content to send to the model.
+	 */
+	buildContent?(part: T): string[]
+
+	/**
+	 * Override the default buildMessages function to choose how to turn content into AgentMessages.
+	 */
+	buildMessages?(part: T): AgentMessage[]
+}
+
+// BlurryShapesPart
+export interface BlurryShapesPart {
+	type: 'blurryShapes'
+	shapes: BlurryShape[]
+}
+
+export const BlurryShapesPartDefinition: PromptPartDefinition<BlurryShapesPart> = {
+	type: 'blurryShapes',
+	priority: -70,
+	buildContent(part: BlurryShapesPart) {
+		const { shapes } = part
+		if (!shapes || shapes.length === 0) {
+			return ['There are no shapes in your view at the moment.']
+		}
+
+		return [`These are the shapes you can currently see:`, JSON.stringify(shapes)]
+	},
+}
+
+// ChatHistoryPart
+export interface ChatHistoryPart {
+	type: 'chatHistory'
+	items: ChatHistoryItem[] | null
+}
+
+const CHAT_HISTORY_PRIORITY = 999999
+
+export const ChatHistoryPartDefinition: PromptPartDefinition<ChatHistoryPart> = {
+	type: 'chatHistory',
+	priority: CHAT_HISTORY_PRIORITY,
+	buildContent() {
+		return []
+	},
+	buildMessages({ items }: ChatHistoryPart) {
+		if (!items) return []
+
+		const messages: AgentMessage[] = []
+		const priority = CHAT_HISTORY_PRIORITY
+
+		// If the last message is from the user, skip it
+		const lastIndex = items.length - 1
+		let end = items.length
+		if (end > 0 && items[lastIndex].type === 'prompt') {
+			end = lastIndex
+		}
+
+		for (let i = 0; i < end; i++) {
+			const item = items[i]
+			const message = buildHistoryItemMessage(item, priority)
+			if (message) messages.push(message)
+		}
+
+		return messages
+	},
+}
+
+function buildHistoryItemMessage(item: ChatHistoryItem, priority: number): AgentMessage | null {
+	switch (item.type) {
+		case 'prompt': {
+			const content: AgentMessageContent[] = []
+
+			if (item.message.trim() !== '') {
+				content.push({
+					type: 'text',
+					text: item.message,
+				})
+			}
+
+			if (content.length === 0) {
+				return null
+			}
+
+			return {
+				role: 'user',
+				content,
+				priority,
+			}
+		}
+		case 'continuation': {
+			if (item.data.length === 0) {
+				return null
+			}
+			const text = `[DATA RETRIEVED]: ${JSON.stringify(item.data)}`
+			return {
+				role: 'assistant',
+				content: [{ type: 'text', text }],
+				priority,
+			}
+		}
+		case 'action': {
+			const { action } = item
+			let text: string
+			switch (action._type) {
+				case 'message': {
+					text = action.text || '<message data lost>'
+					break
+				}
+				case 'think': {
+					text = '[THOUGHT]: ' + (action.text || '<thought data lost>')
+					break
+				}
+				case 'mark-task-done': {
+					text = `[TASK DONE] I marked task ${action.taskId} as done.`
+					break
+				}
+				default: {
+					const { complete: _complete, time: _time, ...rawAction } = action || {}
+					text = '[ACTION]: ' + JSON.stringify(rawAction)
+					break
+				}
+			}
+			return {
+				role: 'assistant',
+				content: [{ type: 'text', text }],
+				priority,
+			}
+		}
+		case 'memory-transition': {
+			return {
+				role: 'assistant',
+				content: [{ type: 'text', text: item.message }],
+				priority,
+			}
+		}
+	}
+}
+
+// DataPart
+export interface DataPart {
+	type: 'data'
+	data: JsonValue[]
+}
+
+export const DataPartDefinition: PromptPartDefinition<DataPart> = {
+	type: 'data',
+	priority: 200,
+	buildContent({ data }: DataPart) {
+		if (data.length === 0) return []
+
+		const formattedData = data.map((item) => {
+			return `${JSON.stringify(item)}`
+		})
+
+		return ["Here's the data you requested:", ...formattedData]
+	},
+}
+
+// MessagesPart
+export interface MessagesPart {
+	type: 'messages'
+	messages: string[]
+	source: 'user' | 'self' | 'other-agent'
+}
+
+export const MessagesPartDefinition: PromptPartDefinition<MessagesPart> = {
+	type: 'messages',
+	priority: Infinity,
+	buildContent({ messages, source }: MessagesPart) {
+		switch (source) {
+			case 'user':
+				return [...messages]
+			case 'self':
+				return [...messages]
+			case 'other-agent':
+				return [...messages]
+		}
+	},
+}
+
+// OtherFairiesPart
+export interface OtherFairiesPart {
+	type: 'otherFairies'
+	otherFairies: OtherFairy[]
+	thisFairy: OtherFairy
+}
+
+export const OtherFairiesPartDefinition: PromptPartDefinition<OtherFairiesPart> = {
+	type: 'otherFairies',
+	priority: 100,
+	buildContent({ otherFairies, thisFairy }: OtherFairiesPart) {
+		const messages = [`You: ${JSON.stringify(thisFairy)}`]
+		if (otherFairies.length > 0) {
+			messages.push(`Other fairies in this document: ${JSON.stringify(otherFairies)}`)
+		}
+
+		return messages
+	},
+}
+
+// PeripheralShapesPart
+export interface PeripheralShapesPart {
+	type: 'peripheralShapes'
+	clusters: PeripheralCluster[] | null
+}
+
+export const PeripheralShapesPartDefinition: PromptPartDefinition<PeripheralShapesPart> = {
+	type: 'peripheralShapes',
+	priority: -65,
+	buildContent({ clusters }: PeripheralShapesPart) {
+		if (!clusters || clusters.length === 0) {
+			return []
+		}
+		return [
+			"There are some groups of shapes in your peripheral vision, outside the your main view. You can't make out their details or content. If you want to see their content, you need to get closer. The groups are as follows",
+			JSON.stringify(clusters),
+		]
+	},
+}
+
+// PersonalityPart
+export interface PersonalityPart {
+	type: 'personality'
+	personality: string
+}
+
+export const PersonalityPartDefinition: PromptPartDefinition<PersonalityPart> = {
+	type: 'personality',
+	priority: 150,
+	buildContent({ personality }: PersonalityPart) {
+		if (!personality || personality.trim() === '') {
+			return []
+		}
+		return [
+			`You are actually a specific kind of AI agent; a fairy! And so is everyone else (besides the user). So, if you hear other agents (or the user) refer to you or anyone else as a fairy, that's why.`,
+			`Your personality is: ${personality}`,
+		]
+	},
+}
+
+// ScreenshotPart
+export interface ScreenshotPart {
+	type: 'screenshot'
+	screenshot: string | null
+}
+
+export const ScreenshotPartDefinition: PromptPartDefinition<ScreenshotPart> = {
+	type: 'screenshot',
+	priority: -40,
+	buildContent({ screenshot }: ScreenshotPart) {
+		if (!screenshot) return []
+		return [
+			'Here is the part of the canvas that you can currently see at this moment. It is not a reference image.',
+			screenshot,
+		]
+	},
+}
+
+// SelectedShapesPart
+export interface SelectedShapesPart {
+	type: 'selectedShapes'
+	shapeIds: string[]
+}
+
+export const SelectedShapesPartDefinition: PromptPartDefinition<SelectedShapesPart> = {
+	type: 'selectedShapes',
+	priority: -55,
+	buildContent({ shapeIds }: SelectedShapesPart) {
+		if (!shapeIds || shapeIds.length === 0) {
+			return []
+		}
+
+		if (shapeIds.length === 1) {
+			return [`The user has this shape selected: ${shapeIds[0]}`]
+		}
+
+		return [`The user has these shapes selected: ${shapeIds.join(', ')}`]
+	},
+}
+
+export interface SoloTasksPart {
+	type: 'soloTasks'
+	tasks: Array<FairyTask>
+}
+
+export const SoloTasksPartDefinition: PromptPartDefinition<SoloTasksPart> = {
+	type: 'soloTasks',
+	priority: -10,
+	buildContent(part: SoloTasksPart) {
+		if (part.tasks.length === 0) {
+			return ['There are no tasks at the moment.']
+		}
+
+		const taskContent = part.tasks.map((task) => {
+			return `Task ${task.id} [${task.status}]: "${task.text}"`
+		})
+
+		if (taskContent.length === 1) {
+			return [`Here is the task assigned to you:`, taskContent[0]]
+		}
+
+		return [`Here are all the tasks assigned to you:`, ...taskContent]
+	},
+}
+
+// WorkingTasksPart
+export interface WorkingTasksPart {
+	type: 'workingTasks'
+	tasks: Array<FairyTask>
+}
+
+export const WorkingTasksPartDefinition: PromptPartDefinition<WorkingTasksPart> = {
+	type: 'workingTasks',
+	priority: -10,
+	buildContent(part: WorkingTasksPart) {
+		if (part.tasks.length === 0) {
+			return ['There are no tasks currently in progress.']
+		}
+
+		const taskContent = part.tasks.map((task) => {
+			let text = `Task ${task.id}: "${task.text}"`
+			if (task.x && task.y && task.w && task.h) {
+				text += ` (within bounds: x: ${task.x}, y: ${task.y}, w: ${task.w}, h: ${task.h})`
+			}
+			return text
+		})
+
+		if (taskContent.length === 1) {
+			return [`Here is the task you are currently working on:`, taskContent[0]]
+		}
+
+		return [`Here are the tasks you are currently working on:`, ...taskContent]
+	},
+}
+
+// PersonalTodoListPart
+export interface PersonalTodoListPart {
+	type: 'personalTodoList'
+	items: FairyTodoItem[]
+}
+
+export const PersonalTodoListPartDefinition: PromptPartDefinition<PersonalTodoListPart> = {
+	type: 'personalTodoList',
+	priority: 10,
+	buildContent(part: PersonalTodoListPart) {
+		if (part.items.length === 0) {
+			return [
+				'You have no personal todos yet. Use the `update-personal-todo-list` action to create a todo.',
+			]
+		}
+		return [
+			`Here is your current personal todo list for the task at hand:`,
+			JSON.stringify(part.items),
+		]
+	},
+}
+
+// CurrentProjectDronePart
+export interface CurrentProjectDronePart {
+	type: 'currentProjectDrone'
+	currentProject: FairyProject | null
+}
+
+export const CurrentProjectDronePartDefinition: PromptPartDefinition<CurrentProjectDronePart> = {
+	type: 'currentProjectDrone',
+	priority: -5,
+	buildContent(part: CurrentProjectDronePart) {
+		const { currentProject } = part
+
+		if (!currentProject) {
+			return []
+		}
+
+		return [
+			`You are currently working on project "${currentProject.title}".`,
+			`Project description: ${currentProject.description}`,
+		]
+	},
+}
+
+// CurrentProjectOrchestratorPart
+export interface CurrentProjectOrchestratorPart {
+	type: 'currentProjectOrchestrator'
+	currentProject: FairyProject | null
+	currentProjectTasks: FairyTask[]
+}
+
+export const CurrentProjectOrchestratorPartDefinition: PromptPartDefinition<CurrentProjectOrchestratorPart> =
+	{
+		type: 'currentProjectOrchestrator',
+		priority: -5,
+		buildContent(part: CurrentProjectOrchestratorPart) {
+			const { currentProject, currentProjectTasks } = part
+
+			if (!currentProject) {
+				return ['There is no current project.']
+			}
+
+			return [
+				`You are currently working on project "${currentProject.title}".`,
+				`Project description: ${currentProject.description}`,
+				`You came up with this project plan:\n${currentProject.plan}`,
+				`Project members:\n${currentProject.members.map((m) => `${m.id} (${m.role})`).join(', ')}`,
+				currentProjectTasks.length > 0
+					? `Tasks in the project and their status:\n${currentProjectTasks.map((t) => `id: ${t.id}, ${t.text}, status: ${t.status}`).join(', ')}`
+					: 'There are no tasks in the project.',
+			]
+		},
+	}
+
+// TimePart
+export interface TimePart {
+	type: 'time'
+	time: string
+}
+
+export const TimePartDefinition: PromptPartDefinition<TimePart> = {
+	type: 'time',
+	priority: -100,
+	buildContent({ time }: TimePart) {
+		return ["The user's current time is:", time]
+	},
+}
+
+// UserActionHistoryPart
+export interface UserActionHistoryPart {
+	type: 'userActionHistory'
+	added: Array<{
+		shapeId: string
+		type: FocusedShapeType
+	}>
+	removed: Array<{
+		shapeId: string
+		type: FocusedShapeType
+	}>
+	updated: Array<{
+		shapeId: string
+		type: FocusedShapeType
+		before: FocusedShapePartial
+		after: FocusedShapePartial
+	}>
+}
+
+export const UserActionHistoryPartDefinition: PromptPartDefinition<UserActionHistoryPart> = {
+	type: 'userActionHistory',
+	priority: -40,
+	buildContent(part: UserActionHistoryPart) {
+		const { updated, removed, added } = part
+		if (updated.length === 0 && removed.length === 0 && added.length === 0) {
+			return []
+		}
+		return [
+			'Since the previous request, the user has made the following changes to the canvas:',
+			JSON.stringify(part),
+		]
+	},
+}
+
+// UserViewportBoundsPart
+export interface UserViewportBoundsPart {
+	type: 'userViewportBounds'
+	userBounds: BoxModel | null
+}
+
+export const UserViewportBoundsPartDefinition: PromptPartDefinition<UserViewportBoundsPart> = {
+	type: 'userViewportBounds',
+	priority: -80,
+	buildContent({ userBounds }: UserViewportBoundsPart) {
+		if (!userBounds) {
+			return []
+		}
+		const userViewCenter = Box.From(userBounds).center
+		return [`The user's view is centered at (${userViewCenter.x}, ${userViewCenter.y}).`]
+	},
+}
+
+// AgentViewportBoundsPart
+export interface AgentViewportBoundsPart {
+	type: 'agentViewportBounds'
+	agentBounds: BoxModel | null
+}
+
+export const AgentViewportBoundsPartDefinition: PromptPartDefinition<AgentViewportBoundsPart> = {
+	type: 'agentViewportBounds',
+	priority: -80,
+	buildContent({ agentBounds }: AgentViewportBoundsPart) {
+		if (!agentBounds) {
+			return []
+		}
+		return [
+			`The bounds of the part of the canvas that you can currently see are: ${JSON.stringify(agentBounds)}`,
+		]
+	},
+}
+
+// PagesPart
+export interface PagesPart {
+	type: 'pages'
+	pages: Array<{
+		id: string
+		name: string
+	}>
+	currentPageId: string
+	currentPageName: string
+}
+
+export const PagesPartDefinition: PromptPartDefinition<PagesPart> = {
+	type: 'pages',
+	priority: -60,
+	buildContent(part: PagesPart) {
+		const { pages, currentPageName } = part
+		if (!pages || pages.length === 0) {
+			return ['There are no pages available.']
+		}
+
+		const pageList = pages.map((p) => `- ${p.name}`).join('\n')
+		return [
+			`You are currently on page "${currentPageName}".`,
+			`Available pages:\n${pageList}`,
+			//'You can change to a different page using the "change-page" action, or create a new page using the "create-page" action.',
+		]
+	},
+}
+
+// ModePart
+export interface ModePart {
+	type: 'mode'
+	mode: ActiveFairyModeDefinition['type']
+	work: FairyWork
+}
+
+export const ModePartDefinition: PromptPartDefinition<ModePart> = {
+	type: 'mode',
+}
+
+// DebugPart
+export interface DebugPart {
+	type: 'debug'
+	logSystemPrompt: boolean
+	logMessages: boolean
+}
+
+export const DebugPartDefinition: PromptPartDefinition<DebugPart> = {
+	type: 'debug',
+}
+
+// ModelNamePart
+export interface ModelNamePart {
+	type: 'modelName'
+	name: AgentModelName
+}
+
+export const ModelNamePartDefinition: PromptPartDefinition<ModelNamePart> = {
+	type: 'modelName',
+}
diff --git a/packages/fairy-shared/src/schema/PromptPartRegistry.ts b/packages/fairy-shared/src/schema/PromptPartRegistry.ts
new file mode 100644
index 000000000000..167ff535bb1c
--- /dev/null
+++ b/packages/fairy-shared/src/schema/PromptPartRegistry.ts
@@ -0,0 +1,8 @@
+import z from 'zod'
+import { AgentMessage } from '../types/AgentMessage'
+
+export const PromptPartRegistry = z.registry<{
+	priority: number
+	buildContent?(part: any): string[]
+	buildMessages?(part: any): AgentMessage[]
+}>()
diff --git a/packages/fairy-shared/src/schema/buildResponseSchema.ts b/packages/fairy-shared/src/schema/buildResponseSchema.ts
new file mode 100644
index 000000000000..c49ceaf249be
--- /dev/null
+++ b/packages/fairy-shared/src/schema/buildResponseSchema.ts
@@ -0,0 +1,18 @@
+import z from 'zod'
+import { AgentAction } from '../types/AgentAction'
+import { AGENT_ACTION_SCHEMAS } from './FairySchema'
+
+/**
+ * Build the JSON schema for the agent's response format.
+ */
+export function buildResponseSchema(availableActionTypes: AgentAction['_type'][]) {
+	const availableActionSchemas = AGENT_ACTION_SCHEMAS.filter((schema) =>
+		availableActionTypes.includes(schema.shape._type.value)
+	)
+
+	const schema = z.object({
+		actions: z.array(z.union(availableActionSchemas)),
+	})
+
+	return z.toJSONSchema(schema, { reused: 'ref' })
+}
diff --git a/packages/fairy-shared/src/types/AgentAction.ts b/packages/fairy-shared/src/types/AgentAction.ts
index 91d6c7ffc745..49b1c51055d0 100644
--- a/packages/fairy-shared/src/types/AgentAction.ts
+++ b/packages/fairy-shared/src/types/AgentAction.ts
@@ -1,6 +1,5 @@
-import { AgentActionUtilConstructor } from '../actions/AgentActionUtil'
-import { AGENT_ACTION_UTILS } from '../actions/AgentActionUtils'
+import z from 'zod'
+import { UnknownAction } from '../schema/AgentActionSchemas'
+import { AGENT_ACTION_SCHEMAS } from '../schema/FairySchema'
 
-type ExtractAgentActionType<T> = T extends AgentActionUtilConstructor<infer U> ? U : never
-
-export type AgentAction = ExtractAgentActionType<(typeof AGENT_ACTION_UTILS)[number]>
+export type AgentAction = z.infer<(typeof AGENT_ACTION_SCHEMAS)[number]> | UnknownAction
diff --git a/packages/fairy-shared/src/types/AgentActionInfo.ts b/packages/fairy-shared/src/types/AgentActionInfo.ts
index 702e22ea9b75..c6e5cd9baf88 100644
--- a/packages/fairy-shared/src/types/AgentActionInfo.ts
+++ b/packages/fairy-shared/src/types/AgentActionInfo.ts
@@ -13,7 +13,6 @@ export interface AgentActionInfo {
 	 * Null to not show an icon.
 	 */
 	icon: AgentIconType | null
-	// icon: null
 
 	/**
 	 * The description to display in chat history.
diff --git a/packages/fairy-shared/src/types/AgentPrompt.ts b/packages/fairy-shared/src/types/AgentPrompt.ts
index fb8a7bc0f25c..c9009e709e0a 100644
--- a/packages/fairy-shared/src/types/AgentPrompt.ts
+++ b/packages/fairy-shared/src/types/AgentPrompt.ts
@@ -1,5 +1,4 @@
 import { Editor } from '@tldraw/editor'
-import { PROMPT_PART_UTILS as _PROMPT_PART_UTILS } from '../parts/PromptPartUtils'
 import { AgentRequest } from './AgentRequest'
 import { BasePromptPart } from './BasePromptPart'
 import { PromptPart } from './PromptPart'
@@ -15,11 +14,11 @@ export interface AgentPromptOptions {
 /**
  * An AgentPrompt contains all the parts created from prompt options.
  */
-export type BaseAgentPrompt<T extends BasePromptPart = BasePromptPart> = {
+export type BaseAgentPrompt<T extends BasePromptPart = BasePromptPart> = Partial<{
 	[P in T as P['type']]: P
-}
+}>
 
 /**
- * An object with all parts of the prompt, defined by: {@link _PROMPT_PART_UTILS}.
+ * An object with all parts of the prompt.
  */
 export type AgentPrompt = BaseAgentPrompt<PromptPart>
diff --git a/packages/fairy-shared/src/types/AgentRequest.ts b/packages/fairy-shared/src/types/AgentRequest.ts
index 83170d5cd882..abc1cede36e0 100644
--- a/packages/fairy-shared/src/types/AgentRequest.ts
+++ b/packages/fairy-shared/src/types/AgentRequest.ts
@@ -1,11 +1,8 @@
 import { BoxModel } from '@tldraw/tlschema'
 import { JsonValue } from '@tldraw/utils'
-import { FocusedShape } from '../format/FocusedShape'
-import { AgentModelName } from '../models'
-import { ContextItem } from './ContextItem'
 
 /**
- * A request that we send to the agent.
+ * Base properties shared by all agent requests.
  */
 export interface AgentRequest {
 	/**
@@ -14,14 +11,9 @@ export interface AgentRequest {
 	messages: string[]
 
 	/**
-	 * Items that the agent should pay particular attention to.
-	 */
-	contextItems: ContextItem[]
-
-	/**
-	 * Any shapes that have been selected as part of this request.
+	 * The bounds of the request.
 	 */
-	selectedShapes: FocusedShape[]
+	bounds: BoxModel
 
 	/**
 	 * Any extra data that has been retrieved as part of this request.
@@ -30,20 +22,7 @@ export interface AgentRequest {
 	data: (JsonValue | Promise<JsonValue>)[]
 
 	/**
-	 * The bounds of the request.
-	 */
-	bounds: BoxModel
-
-	/**
-	 * The model to use for the request.
-	 */
-	modelName: AgentModelName
-
-	/**
-	 * The type of request.
-	 * - 'user' is a request from the user.
-	 * - 'schedule' is a request from the schedule.
-	 * - 'todo' is a request from outstanding todo items.
+	 * Where the request came from.
 	 */
-	type: 'user' | 'schedule' | 'todo'
+	source: 'user' | 'self' | 'other-agent'
 }
diff --git a/packages/fairy-shared/src/types/ChatHistoryItem.ts b/packages/fairy-shared/src/types/ChatHistoryItem.ts
index 76d3bf0685af..f5d6528a03e4 100644
--- a/packages/fairy-shared/src/types/ChatHistoryItem.ts
+++ b/packages/fairy-shared/src/types/ChatHistoryItem.ts
@@ -1,15 +1,15 @@
 import { RecordsDiff } from '@tldraw/store'
 import { TLRecord } from '@tldraw/tlschema'
 import { JsonValue } from '@tldraw/utils'
-import { FocusedShape } from '../format/FocusedShape'
 import { AgentAction } from './AgentAction'
-import { ContextItem } from './ContextItem'
+import { FairyMemoryLevel } from './FairyMemoryLevel'
 import { Streaming } from './Streaming'
 
 export type ChatHistoryItem =
 	| ChatHistoryActionItem
 	| ChatHistoryPromptItem
 	| ChatHistoryContinuationItem
+	| ChatHistoryMemoryTransitionItem
 
 /**
  * A prompt from the user.
@@ -17,8 +17,7 @@ export type ChatHistoryItem =
 export interface ChatHistoryPromptItem {
 	type: 'prompt'
 	message: string
-	contextItems: ContextItem[]
-	selectedShapes: FocusedShape[]
+	memoryLevel: FairyMemoryLevel
 }
 
 /**
@@ -29,6 +28,7 @@ export interface ChatHistoryActionItem {
 	action: Streaming<AgentAction>
 	diff: RecordsDiff<TLRecord>
 	acceptance: 'pending' | 'accepted' | 'rejected'
+	memoryLevel: FairyMemoryLevel
 }
 
 /**
@@ -37,4 +37,11 @@ export interface ChatHistoryActionItem {
 export interface ChatHistoryContinuationItem {
 	type: 'continuation'
 	data: JsonValue[]
+	memoryLevel: FairyMemoryLevel
+}
+
+export interface ChatHistoryMemoryTransitionItem {
+	type: 'memory-transition'
+	memoryLevel: FairyMemoryLevel
+	message: string
 }
diff --git a/packages/fairy-shared/src/types/FairyConfig.ts b/packages/fairy-shared/src/types/FairyConfig.ts
new file mode 100644
index 000000000000..f6b7074cd204
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyConfig.ts
@@ -0,0 +1,7 @@
+import { FairyOutfit } from './FairyOutfit'
+
+export interface FairyConfig {
+	name: string
+	outfit: FairyOutfit
+	personality: string
+}
diff --git a/packages/fairy-shared/src/types/FairyEntity.ts b/packages/fairy-shared/src/types/FairyEntity.ts
index c14f45cfabbe..3d7020d4411f 100644
--- a/packages/fairy-shared/src/types/FairyEntity.ts
+++ b/packages/fairy-shared/src/types/FairyEntity.ts
@@ -1,13 +1,31 @@
-import { VecModel } from '@tldraw/tlschema'
-import { AgentActionUtilConstructor } from '../actions/AgentActionUtil'
-import { PromptPartUtilConstructor } from '../parts/PromptPartUtil'
-import { FairyPose } from './FairyPose'
+import { pageIdValidator, TLPageId, VecModel, vecModelValidator } from '@tldraw/tlschema'
+import { T } from 'tldraw'
+import { FAIRY_POSE, FairyPose } from './FairyPose'
 
+/**
+ * An object representing the fairy's game object, such as its position in the world.
+ * This should not contain anything to do with the agent.
+ */
 export interface FairyEntity {
+	/** The current position of the fairy. */
 	position: VecModel
+	/** Whether the fairy is flipped horizontally. */
 	flipX: boolean
+	/** Whether the fairy is selected. */
 	isSelected: boolean
+	/** The fairy's current pose, eg. 'thinking'. */
 	pose: FairyPose
-	actions: AgentActionUtilConstructor['type'][]
-	parts: PromptPartUtilConstructor['type'][]
+	/** A one-off gesture that the fairy is doing. This overrides the current pose until the gesture is complete. */
+	gesture: FairyPose | null
+	/** The ID of the page that the fairy is currently on. */
+	currentPageId: TLPageId
 }
+
+export const fairyEntityValidator: T.ObjectValidator<FairyEntity> = T.object({
+	position: vecModelValidator,
+	flipX: T.boolean,
+	isSelected: T.boolean,
+	pose: T.literalEnum(...FAIRY_POSE),
+	gesture: T.literalEnum(...FAIRY_POSE).nullable(),
+	currentPageId: pageIdValidator,
+})
diff --git a/packages/fairy-shared/src/types/FairyMemoryLevel.ts b/packages/fairy-shared/src/types/FairyMemoryLevel.ts
new file mode 100644
index 000000000000..865c81788a97
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyMemoryLevel.ts
@@ -0,0 +1 @@
+export type FairyMemoryLevel = 'fairy' | 'project' | 'task'
diff --git a/packages/fairy-shared/src/types/FairyOutfit.ts b/packages/fairy-shared/src/types/FairyOutfit.ts
new file mode 100644
index 000000000000..f392284e19b4
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyOutfit.ts
@@ -0,0 +1,17 @@
+import { T } from 'tldraw'
+import { FAIRY_VARIANTS, FairyVariantType } from './FairyVariant'
+
+/**
+ * A fairy outfit is a combination of variants for each part of the fairy.
+ */
+export interface FairyOutfit {
+	body: FairyVariantType<'body'>
+	hat: FairyVariantType<'hat'>
+	wings: FairyVariantType<'wings'>
+}
+
+export const fairyOutfitValidator: T.ObjectValidator<FairyOutfit> = T.object({
+	body: T.literalEnum(...(Object.keys(FAIRY_VARIANTS.body) as FairyVariantType<'body'>[])),
+	hat: T.literalEnum(...(Object.keys(FAIRY_VARIANTS.hat) as FairyVariantType<'hat'>[])),
+	wings: T.literalEnum(...(Object.keys(FAIRY_VARIANTS.wings) as FairyVariantType<'wings'>[])),
+})
diff --git a/apps/dotcom/client/src/fairy/fairy-sprite/FairyPart.tsx b/packages/fairy-shared/src/types/FairyPart.ts
similarity index 100%
rename from apps/dotcom/client/src/fairy/fairy-sprite/FairyPart.tsx
rename to packages/fairy-shared/src/types/FairyPart.ts
diff --git a/packages/fairy-shared/src/types/FairyPartType.ts b/packages/fairy-shared/src/types/FairyPartType.ts
new file mode 100644
index 000000000000..449bcd444702
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyPartType.ts
@@ -0,0 +1,14 @@
+import { FairyVariantDefinition } from './FairyVariant'
+
+/**
+ * The parts of a fairy.
+ */
+export type FairyPartType = 'hat' | 'body' | 'wings'
+
+/**
+ * A definition of a fairy part, eg: the hat part.
+ * It's a map of variants, where the key is the variant name and the value is a definition of that variant.
+ */
+export interface FairyPartDefinition {
+	[key: string]: FairyVariantDefinition
+}
diff --git a/packages/fairy-shared/src/types/FairyPose.tsx b/packages/fairy-shared/src/types/FairyPose.ts
similarity index 79%
rename from packages/fairy-shared/src/types/FairyPose.tsx
rename to packages/fairy-shared/src/types/FairyPose.ts
index 7655940a134a..ac65a317bdae 100644
--- a/packages/fairy-shared/src/types/FairyPose.tsx
+++ b/packages/fairy-shared/src/types/FairyPose.ts
@@ -1,3 +1,3 @@
-export const FAIRY_POSE = ['idle', 'active', 'thinking', 'acting'] as const
+export const FAIRY_POSE = ['idle', 'active', 'thinking', 'acting', 'poof', 'flutter'] as const
 
 export type FairyPose = (typeof FAIRY_POSE)[number]
diff --git a/packages/fairy-shared/src/types/FairyProject.ts b/packages/fairy-shared/src/types/FairyProject.ts
new file mode 100644
index 000000000000..9db7953224f4
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyProject.ts
@@ -0,0 +1,17 @@
+import { FocusColor } from '../format/FocusColor'
+
+export interface FairyProject {
+	id: string
+	title: string
+	description: string
+	color: FocusColor
+	members: FairyProjectMember[]
+	plan: string
+}
+
+export interface FairyProjectMember {
+	id: string
+	role: FairyProjectRole
+}
+
+export type FairyProjectRole = 'orchestrator' | 'duo-orchestrator' | 'drone'
diff --git a/packages/fairy-shared/src/types/FairyTask.ts b/packages/fairy-shared/src/types/FairyTask.ts
new file mode 100644
index 000000000000..1555b1152a31
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyTask.ts
@@ -0,0 +1,19 @@
+export interface FairyTask {
+	id: string
+	title: string
+	text: string
+	// description: string,
+	projectId: string | null
+	assignedTo: string | null
+	status: FairyTaskStatus
+	x?: number
+	y?: number
+	w?: number
+	h?: number
+	pageId?: string
+}
+
+export type FairyTaskStatus = 'todo' | 'in-progress' | 'done'
+
+// todos are personal, tasks are high level
+export type FairyTodoItem = Pick<FairyTask, 'id' | 'text' | 'status'>
diff --git a/apps/dotcom/client/src/fairy/fairy-sprite/FairyVariant.tsx b/packages/fairy-shared/src/types/FairyVariant.ts
similarity index 60%
rename from apps/dotcom/client/src/fairy/fairy-sprite/FairyVariant.tsx
rename to packages/fairy-shared/src/types/FairyVariant.ts
index a315c2e2eb1c..8e3a5867ef42 100644
--- a/apps/dotcom/client/src/fairy/fairy-sprite/FairyVariant.tsx
+++ b/packages/fairy-shared/src/types/FairyVariant.ts
@@ -1,9 +1,15 @@
-import { FairyPose } from '@tldraw/fairy-shared'
-import { FairyPartDefinition, FairyPartType } from './FairyPart'
+import { FairyPartDefinition, FairyPartType } from './FairyPartType'
+import { FairyPose } from './FairyPose'
 
 const FAIRY_HAT_VARIANTS = {
-	top: { idle: ['/fairy/fairy-hat-top.png'] },
-	pointy: { idle: ['/fairy/fairy-hat-point.png'] },
+	top: { idle: ['/fairy/fairy-hat-top.png'], poof: ['/fairy/fairy-loading.png'] },
+	pointy: { idle: ['/fairy/fairy-hat-point.png'], poof: ['/fairy/fairy-loading.png'] },
+	bald: { idle: ['/fairy/fairy-hat-bald.png'], poof: ['/fairy/fairy-loading.png'] },
+	antenna: { idle: ['/fairy/fairy-hat-antenna.png'], poof: ['/fairy/fairy-loading.png'] },
+	spiky: { idle: ['/fairy/fairy-hat-spiky.png'], poof: ['/fairy/fairy-loading.png'] },
+	hair: { idle: ['/fairy/fairy-hat-hair.png'], poof: ['/fairy/fairy-loading.png'] },
+	ears: { idle: ['/fairy/fairy-hat-ears.png'], poof: ['/fairy/fairy-loading.png'] },
+	propellor: { idle: ['/fairy/fairy-hat-propellor.png'], poof: ['/fairy/fairy-loading.png'] },
 } as const satisfies FairyPartDefinition
 
 const FAIRY_WINGS_VARIANTS = {
@@ -11,6 +17,7 @@ const FAIRY_WINGS_VARIANTS = {
 		idle: ['/fairy/fairy-wing-0.png'],
 		active: ['/fairy/fairy-wing-0.png', '/fairy/fairy-wing-1.png'],
 		thinking: ['/fairy/fairy-wing-0.png', '/fairy/fairy-wing-1.png'],
+		poof: ['/fairy/fairy-loading.png'],
 	},
 } as const satisfies FairyPartDefinition
 
@@ -18,6 +25,7 @@ const FAIRY_BODY_VARIANTS = {
 	plain: {
 		idle: ['/fairy/fairy-body-default.png'],
 		thinking: ['/fairy/fairy-body-think.png'],
+		poof: ['/fairy/fairy-loading.png'],
 	},
 } as const satisfies FairyPartDefinition
 
diff --git a/packages/fairy-shared/src/types/FairyWaitCondition.ts b/packages/fairy-shared/src/types/FairyWaitCondition.ts
new file mode 100644
index 000000000000..5e2355e19789
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyWaitCondition.ts
@@ -0,0 +1,48 @@
+import { FairyModeDefinition } from '../schema/FairyModeDefinition'
+import type { FairyTask } from './FairyTask'
+
+export type FairyWaitEvent = TaskCompletedEvent | AgentModeTransitionEvent
+
+/**
+ * Event that occurs when a task is completed.
+ */
+export interface TaskCompletedEvent {
+	type: 'task-completed'
+	task: FairyTask
+}
+
+// not really implemented in FairyWaitNotifications yet
+export interface AgentModeTransitionEvent {
+	type: 'agent-mode-transition'
+	agentId: string
+	mode: FairyModeDefinition['type']
+}
+
+/**
+ * The type of event being waited for.
+ */
+export type FairyWaitEventType = FairyWaitEvent['type']
+
+/**
+ * A condition that an agent is waiting for.
+ * When an event matching this condition occurs, the agent will be notified.
+ */
+export interface FairyWaitCondition<T extends FairyWaitEvent> {
+	/**
+	 * The type of event being waited for.
+	 */
+	eventType: T['type']
+
+	/**
+	 * A function that checks if an event matches this condition.
+	 * @param event - The event data to check
+	 * @returns true if the event matches this condition
+	 */
+	matcher(event: T): boolean
+
+	/**
+	 * Optional metadata associated with this wait condition.
+	 * Useful for storing context like task IDs, custom data, etc.
+	 */
+	metadata?: Record<string, any>
+}
diff --git a/packages/fairy-shared/src/types/FairyWork.ts b/packages/fairy-shared/src/types/FairyWork.ts
new file mode 100644
index 000000000000..8138490f458e
--- /dev/null
+++ b/packages/fairy-shared/src/types/FairyWork.ts
@@ -0,0 +1,12 @@
+import { FairyProject } from './FairyProject'
+import { FairyTask } from './FairyTask'
+
+/**
+ * A unit of work that a fairy agent might have on their desk.
+ */
+export interface FairyWork {
+	/** The project that the fairy agent is working on. */
+	project: FairyProject | null
+	/** The tasks that the fairy agent is working on. */
+	tasks: FairyTask[]
+}
diff --git a/packages/fairy-shared/src/types/PersistedFairyConfig.ts b/packages/fairy-shared/src/types/PersistedFairyConfig.ts
new file mode 100644
index 000000000000..56a7310060ce
--- /dev/null
+++ b/packages/fairy-shared/src/types/PersistedFairyConfig.ts
@@ -0,0 +1,5 @@
+import { FairyConfig } from './FairyConfig'
+
+export interface PersistedFairyConfigs {
+	[fairyId: string]: FairyConfig
+}
diff --git a/packages/fairy-shared/src/types/PersistedFairyState.ts b/packages/fairy-shared/src/types/PersistedFairyState.ts
new file mode 100644
index 000000000000..551897a3aca5
--- /dev/null
+++ b/packages/fairy-shared/src/types/PersistedFairyState.ts
@@ -0,0 +1,26 @@
+import { VecModel } from '@tldraw/tlschema'
+import { ChatHistoryItem } from './ChatHistoryItem'
+import { FairyEntity } from './FairyEntity'
+import { FairyProject } from './FairyProject'
+import { FairyTask, FairyTodoItem } from './FairyTask'
+
+/**
+ * The persisted state for a single fairy agent.
+ */
+export interface PersistedFairyAgentState {
+	fairyEntity: FairyEntity
+	chatHistory: ChatHistoryItem[]
+	chatOrigin: VecModel
+	personalTodoList: FairyTodoItem[]
+}
+
+/**
+ * The persisted state for all fairy agents in a file, keyed by agent ID.
+ * This is stored as JSON in the file_state table in the database.
+ */
+export interface PersistedFairyState {
+	agents: Record<string, PersistedFairyAgentState>
+	fairyTaskList: FairyTask[]
+	showCanvasTodos: boolean
+	projects: FairyProject[]
+}
diff --git a/packages/fairy-shared/src/types/PromptPart.ts b/packages/fairy-shared/src/types/PromptPart.ts
index 08e8dc9ce9be..41f688e39eb3 100644
--- a/packages/fairy-shared/src/types/PromptPart.ts
+++ b/packages/fairy-shared/src/types/PromptPart.ts
@@ -1,6 +1,6 @@
-import { PromptPartUtilConstructor } from '../parts/PromptPartUtil'
-import { PROMPT_PART_UTILS } from '../parts/PromptPartUtils'
+import { PROMPT_PART_DEFINITIONS } from '../schema/FairySchema'
+import { PromptPartDefinition } from '../schema/PromptPartDefinitions'
 
-type ExtractPromptPartType<T> = T extends PromptPartUtilConstructor<infer U> ? U : never
+type ExtractPromptPartType<T> = T extends PromptPartDefinition<infer U> ? U : never
 
-export type PromptPart = ExtractPromptPartType<(typeof PROMPT_PART_UTILS)[number]>
+export type PromptPart = ExtractPromptPartType<(typeof PROMPT_PART_DEFINITIONS)[number]>
diff --git a/packages/fairy-shared/src/types/TldrawFairyAgent.ts b/packages/fairy-shared/src/types/TldrawFairyAgent.ts
deleted file mode 100644
index c81d894df34d..000000000000
--- a/packages/fairy-shared/src/types/TldrawFairyAgent.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { Editor } from '@tldraw/editor'
-import { Atom } from '@tldraw/state'
-import { RecordsDiff } from '@tldraw/store'
-import { BoxModel, TLRecord, VecModel } from '@tldraw/tlschema'
-import { AgentActionUtil } from '../actions/AgentActionUtil'
-import { AgentHelpers } from '../AgentHelpers'
-import { AgentModelName } from '../models'
-import { PromptPartUtil } from '../parts/PromptPartUtil'
-import { AgentAction } from './AgentAction'
-import { AgentInput } from './AgentInput'
-import { AgentPrompt } from './AgentPrompt'
-import { AgentRequest } from './AgentRequest'
-import { ChatHistoryItem } from './ChatHistoryItem'
-import { ContextItem } from './ContextItem'
-import { FairyEntity } from './FairyEntity'
-import { PromptPart } from './PromptPart'
-import { Streaming } from './Streaming'
-import { TodoItem } from './TodoItem'
-
-export interface TldrawFairyAgentOptions {
-	/** The editor to associate the agent with. */
-	editor: Editor
-	/** A key used to differentiate the agent from other agents. */
-	id: string
-	/** A callback for when an error occurs. */
-	onError(e: any): void
-	/** A function to get the authentication token. */
-	getToken?(): Promise<string | undefined>
-}
-
-/**
- * Interface for the TldrawAgent.
- * Defines the public API of an agent that can be prompted to edit the canvas.
- */
-export interface TldrawFairyAgent {
-	/** The editor associated with this agent. */
-	editor: Editor
-
-	/** An id to differentiate the agent from other agents. */
-	id: string
-
-	/** The fairy associated with this agent. */
-	$fairy: Atom<FairyEntity | undefined>
-
-	/** A callback for when an error occurs. */
-	onError(e: any): void
-
-	/** An atom containing the currently active request. */
-	$activeRequest: Atom<AgentRequest | null>
-
-	/** An atom containing the next request that the agent has scheduled for itself. */
-	$scheduledRequest: Atom<AgentRequest | null>
-
-	/** An atom containing the agent's chat history. */
-	$chatHistory: Atom<ChatHistoryItem[]>
-
-	/** An atom containing the position on the page where the current chat started. */
-	$chatOrigin: Atom<VecModel>
-
-	/** An atom containing the agent's todo list. */
-	$todoList: Atom<TodoItem[]>
-
-	/** An atom that's used to store document changes made by the user since the previous request. */
-	$userActionHistory: Atom<RecordsDiff<TLRecord>[]>
-
-	/** An atom containing currently selected context items. */
-	$contextItems: Atom<ContextItem[]>
-
-	/** An atom containing the model name that the user has selected. */
-	$modelName: Atom<AgentModelName>
-
-	/** A record of the agent's action util instances. */
-	agentActionUtils: Record<AgentAction['_type'], AgentActionUtil<AgentAction>>
-
-	/** The agent action util instance for the "unknown" action type. */
-	unknownActionUtil: AgentActionUtil<AgentAction>
-
-	/** A record of the agent's prompt part util instances. */
-	promptPartUtils: Record<PromptPart['type'], PromptPartUtil<PromptPart>>
-
-	/** Dispose of the agent by cancelling requests and stopping listeners. */
-	dispose(): void
-
-	/** Get an agent action util for a specific action type. */
-	getAgentActionUtil(type?: string): AgentActionUtil<AgentAction>
-
-	/** Get the util type for a provided action type. */
-	getAgentActionUtilType(type?: string): string
-
-	/** Get a prompt part util for a specific part type. */
-	getPromptPartUtil(type: PromptPart['type']): PromptPartUtil<PromptPart>
-
-	/** Get a full agent request from a user input by filling out any missing values with defaults. */
-	getFullRequestFromInput(input: AgentInput): AgentRequest
-
-	/** Get a full prompt based on a request. */
-	preparePrompt(request: AgentRequest, helpers: AgentHelpers): Promise<AgentPrompt>
-
-	/** Prompt the agent to edit the canvas. */
-	prompt(input: AgentInput): Promise<void>
-
-	/** Send a single request to the agent and handle its response. */
-	request(input: AgentInput): Promise<any>
-
-	/** Schedule further work for the agent to do after this request has finished. */
-	schedule(input: AgentInput): void
-
-	/** Manually override what the agent should do next. */
-	setScheduledRequest(input: AgentInput | null): void
-
-	/** Add a todo item to the agent's todo list. */
-	addTodo(text: string): number
-
-	/** Make the agent perform an action. */
-	act(
-		action: Streaming<AgentAction>,
-		helpers?: AgentHelpers
-	): { diff: RecordsDiff<TLRecord>; promise: Promise<void> | null }
-
-	/** Cancel the agent's current prompt, if one is active. */
-	cancel(): void
-
-	/** Reset the agent's chat and memory. */
-	reset(): void
-
-	/** Check if the agent is currently working on a request or not. */
-	isGenerating(): boolean
-
-	/** Add a context item to the agent's context, ensuring that duplicates are not included. */
-	addToContext(item: ContextItem): void
-
-	/** Remove a context item from the agent's context. */
-	removeFromContext(item: ContextItem): void
-
-	/** Check if the agent's context contains a specific context item. */
-	hasContextItem(item: ContextItem): boolean
-
-	/** Move the fairy to a new position. */
-	moveToPosition(position: VecModel): void
-
-	/** Move the fairy to a new bounds. */
-	moveToBounds(bounds: BoxModel): void
-}
diff --git a/packages/fairy-shared/src/types/TodoItem.ts b/packages/fairy-shared/src/types/TodoItem.ts
deleted file mode 100644
index 2fd49792288d..000000000000
--- a/packages/fairy-shared/src/types/TodoItem.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface TodoItem {
-	id: number
-	text: string
-	status: 'todo' | 'in-progress' | 'done'
-}
diff --git a/packages/fairy-shared/tsconfig.json b/packages/fairy-shared/tsconfig.json
index e3d3db4b9d5c..aacd00dab649 100644
--- a/packages/fairy-shared/tsconfig.json
+++ b/packages/fairy-shared/tsconfig.json
@@ -1,6 +1,6 @@
 {
 	"extends": "../../internal/config/tsconfig.base.json",
-	"include": ["src", "src/models.ts"],
+	"include": ["src"],
 	"exclude": ["node_modules", ".tsbuild*"],
 	"compilerOptions": { "outDir": "./.tsbuild", "rootDir": "src" },
 	"references": [
diff --git a/packages/namespaced-tldraw/package.json b/packages/namespaced-tldraw/package.json
index 98a82a5ff0ab..d3e96e3a0eeb 100644
--- a/packages/namespaced-tldraw/package.json
+++ b/packages/namespaced-tldraw/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/tldraw",
 	"description": "A tiny little drawing editor.",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/state-react/package.json b/packages/state-react/package.json
index 43b35c0634c2..e34d5f0db3f0 100644
--- a/packages/state-react/package.json
+++ b/packages/state-react/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/state-react",
 	"description": "tldraw infinite canvas SDK (react bindings for state).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/state/package.json b/packages/state/package.json
index 37b985f59d5a..e98a7eb421eb 100644
--- a/packages/state/package.json
+++ b/packages/state/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/state",
 	"description": "tldraw infinite canvas SDK (state).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/store/api-report.api.md b/packages/store/api-report.api.md
index fc1badbafadd..5f3fb12757ad 100644
--- a/packages/store/api-report.api.md
+++ b/packages/store/api-report.api.md
@@ -221,9 +221,9 @@ export function parseMigrationId(id: MigrationId): {
     version: number;
 };
 
-// @public
+// @public (undocumented)
 export type QueryExpression<R extends object> = {
-    [k in keyof R & string]?: QueryValueMatcher<R[k]>;
+    [k in keyof R & string]?: R[k] extends boolean | null | number | string | undefined ? QueryValueMatcher<R[k]> : R[k] extends object ? QueryExpression<R[k]> : QueryValueMatcher<R[k]>;
 };
 
 // @public
@@ -286,13 +286,13 @@ export class RecordType<R extends UnknownRecord, RequiredProperties extends keyo
 export function reverseRecordsDiff(diff: RecordsDiff<any>): RecordsDiff<any>;
 
 // @public
-export type RSIndex<R extends UnknownRecord, Property extends string & keyof R = string & keyof R> = Computed<RSIndexMap<R, Property>, RSIndexDiff<R, Property>>;
+export type RSIndex<R extends UnknownRecord> = Computed<RSIndexMap<R>, RSIndexDiff<R>>;
 
 // @public
-export type RSIndexDiff<R extends UnknownRecord, Property extends string & keyof R = string & keyof R> = Map<R[Property], CollectionDiff<IdOf<R>>>;
+export type RSIndexDiff<R extends UnknownRecord> = Map<any, CollectionDiff<IdOf<R>>>;
 
 // @public
-export type RSIndexMap<R extends UnknownRecord, Property extends string & keyof R = string & keyof R> = Map<R[Property], Set<IdOf<R>>>;
+export type RSIndexMap<R extends UnknownRecord> = Map<any, Set<IdOf<R>>>;
 
 // @public
 export type SerializedSchema = SerializedSchemaV1 | SerializedSchemaV2;
@@ -455,11 +455,9 @@ export class StoreQueries<R extends UnknownRecord> {
     // @internal
     constructor(recordMap: AtomMap<IdOf<R>, R>, history: Atom<number, RecordsDiff<R>>);
     // @internal
-    __uncached_createIndex<TypeName extends R['typeName'], Property extends string & keyof Extract<R, {
-        typeName: TypeName;
-    }>>(typeName: TypeName, property: Property): RSIndex<Extract<R, {
+    __uncached_createIndex<TypeName extends R['typeName']>(typeName: TypeName, path: string): RSIndex<Extract<R, {
         typeName: TypeName;
-    }>, Property>;
+    }>>;
     exec<TypeName extends R['typeName']>(typeName: TypeName, query: QueryExpression<Extract<R, {
         typeName: TypeName;
     }>>): Array<Extract<R, {
@@ -468,6 +466,16 @@ export class StoreQueries<R extends UnknownRecord> {
     filterHistory<TypeName extends R['typeName']>(typeName: TypeName): Computed<number, RecordsDiff<Extract<R, {
         typeName: TypeName;
     }>>>;
+    // @internal (undocumented)
+    getAllIdsForType<TypeName extends R['typeName']>(typeName: TypeName): Set<IdOf<Extract<R, {
+        typeName: TypeName;
+    }>>>;
+    // @internal (undocumented)
+    getRecordById<TypeName extends R['typeName']>(typeName: TypeName, id: IdOf<Extract<R, {
+        typeName: TypeName;
+    }>>): Extract<R, {
+        typeName: TypeName;
+    }> | undefined;
     ids<TypeName extends R['typeName']>(typeName: TypeName, queryCreator?: () => QueryExpression<Extract<R, {
         typeName: TypeName;
     }>>, name?: string): Computed<Set<IdOf<Extract<R, {
@@ -475,11 +483,9 @@ export class StoreQueries<R extends UnknownRecord> {
     }>>>, CollectionDiff<IdOf<Extract<R, {
         typeName: TypeName;
     }>>>>;
-    index<TypeName extends R['typeName'], Property extends string & keyof Extract<R, {
+    index<TypeName extends R['typeName']>(typeName: TypeName, path: string): RSIndex<Extract<R, {
         typeName: TypeName;
-    }>>(typeName: TypeName, property: Property): RSIndex<Extract<R, {
-        typeName: TypeName;
-    }>, Property>;
+    }>>;
     record<TypeName extends R['typeName']>(typeName: TypeName, queryCreator?: () => QueryExpression<Extract<R, {
         typeName: TypeName;
     }>>, name?: string): Computed<Extract<R, {
diff --git a/packages/store/package.json b/packages/store/package.json
index f2f3ff27785f..76c6b893ec4f 100644
--- a/packages/store/package.json
+++ b/packages/store/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/store",
 	"description": "tldraw infinite canvas SDK (store).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/store/src/lib/RecordType.ts b/packages/store/src/lib/RecordType.ts
index 85f711a2a6ae..bba736ae139c 100644
--- a/packages/store/src/lib/RecordType.ts
+++ b/packages/store/src/lib/RecordType.ts
@@ -105,7 +105,7 @@ export class RecordType<
 		const ephemeralKeySet = new Set<string>()
 		if (config.ephemeralKeys) {
 			for (const [key, isEphemeral] of objectMapEntries(config.ephemeralKeys)) {
-				if (isEphemeral) ephemeralKeySet.add(key)
+				if (isEphemeral) ephemeralKeySet.add(key as string)
 			}
 		}
 		this.ephemeralKeySet = ephemeralKeySet
diff --git a/packages/store/src/lib/StoreQueries.ts b/packages/store/src/lib/StoreQueries.ts
index ec114f0748f2..5dcd2866b4fa 100644
--- a/packages/store/src/lib/StoreQueries.ts
+++ b/packages/store/src/lib/StoreQueries.ts
@@ -31,10 +31,7 @@ import { CollectionDiff } from './Store'
  *
  * @public
  */
-export type RSIndexDiff<
-	R extends UnknownRecord,
-	Property extends string & keyof R = string & keyof R,
-> = Map<R[Property], CollectionDiff<IdOf<R>>>
+export type RSIndexDiff<R extends UnknownRecord> = Map<any, CollectionDiff<IdOf<R>>>
 
 /**
  * A type representing a reactive store index as a map from property values to sets of record IDs.
@@ -51,10 +48,7 @@ export type RSIndexDiff<
  *
  * @public
  */
-export type RSIndexMap<
-	R extends UnknownRecord,
-	Property extends string & keyof R = string & keyof R,
-> = Map<R[Property], Set<IdOf<R>>>
+export type RSIndexMap<R extends UnknownRecord> = Map<any, Set<IdOf<R>>>
 
 /**
  * A reactive computed index that provides efficient lookups of records by property values.
@@ -71,10 +65,7 @@ export type RSIndexMap<
  *
  * @public
  */
-export type RSIndex<
-	R extends UnknownRecord,
-	Property extends string & keyof R = string & keyof R,
-> = Computed<RSIndexMap<R, Property>, RSIndexDiff<R, Property>>
+export type RSIndex<R extends UnknownRecord> = Computed<RSIndexMap<R>, RSIndexDiff<R>>
 
 /**
  * A class that provides reactive querying capabilities for a record store.
@@ -121,6 +112,49 @@ export class StoreQueries<R extends UnknownRecord> {
 	 */
 	private historyCache = new Map<string, Computed<number, RecordsDiff<R>>>()
 
+	/**
+	 * @internal
+	 */
+	public getAllIdsForType<TypeName extends R['typeName']>(
+		typeName: TypeName
+	): Set<IdOf<Extract<R, { typeName: TypeName }>>> {
+		type S = Extract<R, { typeName: TypeName }>
+		const ids = new Set<IdOf<S>>()
+		for (const record of this.recordMap.values()) {
+			if (record.typeName === typeName) {
+				ids.add(record.id as IdOf<S>)
+			}
+		}
+		return ids
+	}
+
+	/**
+	 * @internal
+	 */
+	public getRecordById<TypeName extends R['typeName']>(
+		typeName: TypeName,
+		id: IdOf<Extract<R, { typeName: TypeName }>>
+	): Extract<R, { typeName: TypeName }> | undefined {
+		const record = this.recordMap.get(id as IdOf<R>)
+		if (record && record.typeName === typeName) {
+			return record as Extract<R, { typeName: TypeName }>
+		}
+		return undefined
+	}
+
+	/**
+	 * Helper to extract nested property value using pre-split path parts.
+	 * @internal
+	 */
+	private getNestedValue(obj: any, pathParts: string[]): any {
+		let current = obj
+		for (const part of pathParts) {
+			if (current == null || typeof current !== 'object') return undefined
+			current = current[part]
+		}
+		return current
+	}
+
 	/**
 	 * Creates a reactive computed that tracks the change history for records of a specific type.
 	 * The returned computed provides incremental diffs showing what records of the given type
@@ -237,8 +271,10 @@ export class StoreQueries<R extends UnknownRecord> {
 	 * The index automatically updates when records are added, updated, or removed, and results are cached
 	 * for performance.
 	 *
+	 * Supports nested property paths using backslash separator (e.g., 'metadata\\sessionId').
+	 *
 	 * @param typeName - The type name of records to index
-	 * @param property - The property name to index by
+	 * @param path - The property name or backslash-delimited path to index by
 	 * @returns A reactive computed containing the index map with change diffs
 	 *
 	 * @example
@@ -250,24 +286,24 @@ export class StoreQueries<R extends UnknownRecord> {
 	 * const authorBooks = booksByAuthor.get().get('author:leguin')
 	 * console.log(authorBooks) // Set<RecordId<Book>>
 	 *
-	 * // Index by title for quick title lookups
-	 * const booksByTitle = store.query.index('book', 'title')
-	 * const booksLatheOfHeaven = booksByTitle.get().get('The Lathe of Heaven')
+	 * // Index by nested property using backslash separator
+	 * const booksBySession = store.query.index('book', 'metadata\\sessionId')
+	 * const sessionBooks = booksBySession.get().get('session:alpha')
 	 * ```
 	 *
 	 * @public
 	 */
-	public index<
-		TypeName extends R['typeName'],
-		Property extends string & keyof Extract<R, { typeName: TypeName }>,
-	>(typeName: TypeName, property: Property): RSIndex<Extract<R, { typeName: TypeName }>, Property> {
-		const cacheKey = typeName + ':' + property
+	public index<TypeName extends R['typeName']>(
+		typeName: TypeName,
+		path: string
+	): RSIndex<Extract<R, { typeName: TypeName }>> {
+		const cacheKey = typeName + ':' + path
 
 		if (this.indexCache.has(cacheKey)) {
 			return this.indexCache.get(cacheKey) as any
 		}
 
-		const index = this.__uncached_createIndex(typeName, property)
+		const index = this.__uncached_createIndex(typeName, path)
 
 		this.indexCache.set(cacheKey, index as any)
 
@@ -278,40 +314,51 @@ export class StoreQueries<R extends UnknownRecord> {
 	 * Creates a new index without checking the cache. This method performs the actual work
 	 * of building the reactive index computation that tracks property values to record ID sets.
 	 *
+	 * Supports nested property paths using backslash separator.
+	 *
 	 * @param typeName - The type name of records to index
-	 * @param property - The property name to index by
+	 * @param path - The property name or backslash-delimited path to index by
 	 * @returns A reactive computed containing the index map with change diffs
 	 *
 	 * @internal
 	 */
-	__uncached_createIndex<
-		TypeName extends R['typeName'],
-		Property extends string & keyof Extract<R, { typeName: TypeName }>,
-	>(typeName: TypeName, property: Property): RSIndex<Extract<R, { typeName: TypeName }>, Property> {
+	__uncached_createIndex<TypeName extends R['typeName']>(
+		typeName: TypeName,
+		path: string
+	): RSIndex<Extract<R, { typeName: TypeName }>> {
 		type S = Extract<R, { typeName: TypeName }>
 
 		const typeHistory = this.filterHistory(typeName)
 
+		// Create closure for efficient property value extraction
+		const pathParts = path.split('\\')
+		const getPropertyValue =
+			pathParts.length > 1
+				? (obj: S) => this.getNestedValue(obj, pathParts)
+				: (obj: S) => obj[path as keyof S]
+
 		const fromScratch = () => {
 			// deref typeHistory early so that the first time the incremental version runs
 			// it gets a diff to work with instead of having to bail to this from-scratch version
 			typeHistory.get()
-			const res = new Map<S[Property], Set<IdOf<S>>>()
+			const res = new Map<any, Set<IdOf<S>>>()
 			for (const record of this.recordMap.values()) {
 				if (record.typeName === typeName) {
-					const value = (record as S)[property]
-					if (!res.has(value)) {
-						res.set(value, new Set())
+					const value = getPropertyValue(record as S)
+					if (value !== undefined) {
+						if (!res.has(value)) {
+							res.set(value, new Set())
+						}
+						res.get(value)!.add(record.id)
 					}
-					res.get(value)!.add(record.id)
 				}
 			}
 
 			return res
 		}
 
-		return computed<RSIndexMap<S, Property>, RSIndexDiff<S, Property>>(
-			'index:' + typeName + ':' + property,
+		return computed<RSIndexMap<S>, RSIndexDiff<S>>(
+			'index:' + typeName + ':' + path,
 			(prevValue, lastComputedEpoch) => {
 				if (isUninitialized(prevValue)) return fromScratch()
 
@@ -322,7 +369,7 @@ export class StoreQueries<R extends UnknownRecord> {
 
 				const setConstructors = new Map<any, IncrementalSetConstructor<IdOf<S>>>()
 
-				const add = (value: S[Property], id: IdOf<S>) => {
+				const add = (value: any, id: IdOf<S>) => {
 					let setConstructor = setConstructors.get(value)
 					if (!setConstructor)
 						setConstructor = new IncrementalSetConstructor<IdOf<S>>(
@@ -332,7 +379,7 @@ export class StoreQueries<R extends UnknownRecord> {
 					setConstructors.set(value, setConstructor)
 				}
 
-				const remove = (value: S[Property], id: IdOf<S>) => {
+				const remove = (value: any, id: IdOf<S>) => {
 					let set = setConstructors.get(value)
 					if (!set) set = new IncrementalSetConstructor<IdOf<S>>(prevValue.get(value) ?? new Set())
 					set.remove(id)
@@ -342,30 +389,38 @@ export class StoreQueries<R extends UnknownRecord> {
 				for (const changes of history) {
 					for (const record of objectMapValues(changes.added)) {
 						if (record.typeName === typeName) {
-							const value = (record as S)[property]
-							add(value, record.id)
+							const value = getPropertyValue(record as S)
+							if (value !== undefined) {
+								add(value, record.id)
+							}
 						}
 					}
 					for (const [from, to] of objectMapValues(changes.updated)) {
 						if (to.typeName === typeName) {
-							const prev = (from as S)[property]
-							const next = (to as S)[property]
+							const prev = getPropertyValue(from as S)
+							const next = getPropertyValue(to as S)
 							if (prev !== next) {
-								remove(prev, to.id)
-								add(next, to.id)
+								if (prev !== undefined) {
+									remove(prev, to.id)
+								}
+								if (next !== undefined) {
+									add(next, to.id)
+								}
 							}
 						}
 					}
 					for (const record of objectMapValues(changes.removed)) {
 						if (record.typeName === typeName) {
-							const value = (record as S)[property]
-							remove(value, record.id)
+							const value = getPropertyValue(record as S)
+							if (value !== undefined) {
+								remove(value, record.id)
+							}
 						}
 					}
 				}
 
-				let nextValue: undefined | RSIndexMap<S, Property> = undefined
-				let nextDiff: undefined | RSIndexDiff<S, Property> = undefined
+				let nextValue: undefined | RSIndexMap<S> = undefined
+				let nextDiff: undefined | RSIndexDiff<S> = undefined
 
 				for (const [value, setConstructor] of setConstructors) {
 					const result = setConstructor.get()
@@ -513,11 +568,7 @@ export class StoreQueries<R extends UnknownRecord> {
 			typeHistory.get()
 			const query: QueryExpression<S> = queryCreator()
 			if (Object.keys(query).length === 0) {
-				const ids = new Set<IdOf<S>>()
-				for (const record of this.recordMap.values()) {
-					if (record.typeName === typeName) ids.add(record.id)
-				}
-				return ids
+				return this.getAllIdsForType(typeName)
 			}
 
 			return executeQuery(this, typeName, query)
diff --git a/packages/store/src/lib/StoreSideEffects.ts b/packages/store/src/lib/StoreSideEffects.ts
index 7c552630c51b..f7b111027528 100644
--- a/packages/store/src/lib/StoreSideEffects.ts
+++ b/packages/store/src/lib/StoreSideEffects.ts
@@ -493,7 +493,7 @@ export class StoreSideEffects<R extends UnknownRecord> {
 	 * ```ts
 	 * editor.sideEffects.registerAfterCreateHandler('page', (page, source) => {
 	 *     // Automatically create a shape when a page is created
-	 *     editor.createShape<TLTextShape>({
+	 *     editor.createShape({
 	 *         id: createShapeId(),
 	 *         type: 'text',
 	 *         props: { richText: toRichText(page.name) },
diff --git a/packages/store/src/lib/executeQuery.test.ts b/packages/store/src/lib/executeQuery.test.ts
index e06b11fa6e61..031c56dad762 100644
--- a/packages/store/src/lib/executeQuery.test.ts
+++ b/packages/store/src/lib/executeQuery.test.ts
@@ -22,6 +22,14 @@ interface Book extends BaseRecord<'book', RecordId<Book>> {
 	rating: number
 	category: string
 	price: number
+	metadata: {
+		sessionId: string
+		status?: 'published' | 'draft' | 'archived'
+		copies?: number
+		extras: {
+			region: string
+		}
+	}
 }
 
 interface Review extends BaseRecord<'review', RecordId<Review>> {
@@ -62,6 +70,15 @@ const Book = createRecordType<Book>('book', {
 			if (!book.authorId.startsWith('author')) throw Error('Invalid authorId')
 			if (!Number.isFinite(book.publishedYear)) throw Error('Invalid publishedYear')
 			if (typeof book.inStock !== 'boolean') throw Error('Invalid inStock')
+			if (typeof book.metadata !== 'object' || book.metadata === null)
+				throw Error('Invalid metadata')
+			if (typeof book.metadata.sessionId !== 'string') throw Error('Invalid sessionId')
+			if (
+				typeof book.metadata.extras !== 'object' ||
+				book.metadata.extras === null ||
+				typeof book.metadata.extras.region !== 'string'
+			)
+				throw Error('Invalid extras')
 			return book
 		},
 	},
@@ -70,6 +87,12 @@ const Book = createRecordType<Book>('book', {
 	rating: 0,
 	category: 'fiction',
 	price: 10.99,
+	metadata: {
+		sessionId: 'session:default',
+		extras: {
+			region: 'global',
+		},
+	},
 }))
 
 const Review = createRecordType<Review>('review', {
@@ -142,6 +165,10 @@ const books = {
 		rating: 5,
 		category: 'sci-fi',
 		price: 12.99,
+		metadata: {
+			sessionId: 'session:alpha',
+			extras: { region: 'us' },
+		},
 	}),
 	neuromancer: Book.create({
 		title: 'Neuromancer',
@@ -151,6 +178,10 @@ const books = {
 		rating: 5,
 		category: 'cyberpunk',
 		price: 14.99,
+		metadata: {
+			sessionId: 'session:beta',
+			extras: { region: 'us' },
+		},
 	}),
 	dune: Book.create({
 		title: 'Dune',
@@ -160,6 +191,10 @@ const books = {
 		rating: 5,
 		category: 'sci-fi',
 		price: 13.99,
+		metadata: {
+			sessionId: 'session:beta',
+			extras: { region: 'eu' },
+		},
 	}),
 	fahrenheit451: Book.create({
 		title: 'Fahrenheit 451',
@@ -169,6 +204,10 @@ const books = {
 		rating: 4,
 		category: 'dystopian',
 		price: 11.99,
+		metadata: {
+			sessionId: 'session:beta',
+			extras: { region: 'us' },
+		},
 	}),
 	childhood: Book.create({
 		title: "Childhood's End",
@@ -178,6 +217,10 @@ const books = {
 		rating: 4,
 		category: 'sci-fi',
 		price: 10.99,
+		metadata: {
+			sessionId: 'session:gamma',
+			extras: { region: 'global' },
+		},
 	}),
 	hitchhiker: Book.create({
 		title: "The Hitchhiker's Guide to the Galaxy",
@@ -187,6 +230,10 @@ const books = {
 		rating: 5,
 		category: 'comedy-sci-fi',
 		price: 9.99,
+		metadata: {
+			sessionId: 'session:alpha',
+			extras: { region: 'uk' },
+		},
 	}),
 	robots: Book.create({
 		title: 'I, Robot',
@@ -196,6 +243,10 @@ const books = {
 		rating: 4,
 		category: 'sci-fi',
 		price: 12.99,
+		metadata: {
+			sessionId: 'session:alpha',
+			extras: { region: 'us' },
+		},
 	}),
 }
 
@@ -297,7 +348,7 @@ describe('objectMatchesQuery', () => {
 		})
 
 		it('should not match when property is not a number', () => {
-			const book = { title: '1984', publishedYear: '1984' as any }
+			const book = { title: '1984', publishedYear: '1984' }
 			const query = { publishedYear: { gt: 1980 } }
 
 			expect(objectMatchesQuery(query, book)).toBe(false)
@@ -328,6 +379,37 @@ describe('objectMatchesQuery', () => {
 		})
 	})
 
+	describe('nested object matching', () => {
+		it('should match when nested property satisfies criteria', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+
+			expect(objectMatchesQuery(query, books.foundation)).toBe(true)
+		})
+
+		it('should not match when nested property fails criteria', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+
+			expect(objectMatchesQuery(query, books.neuromancer)).toBe(false)
+		})
+
+		it('should match deeply nested properties', () => {
+			const query = { metadata: { extras: { region: { eq: 'eu' } } } }
+
+			expect(objectMatchesQuery(query, books.dune)).toBe(true)
+		})
+
+		it('should return false when nested object is missing', () => {
+			const book = {
+				typeName: 'book',
+				id: 'book:custom',
+				metadata: {},
+			} as Book
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+
+			expect(objectMatchesQuery(query, book)).toBe(false)
+		})
+	})
+
 	describe('edge cases', () => {
 		it('should return true for empty query', () => {
 			const book = books.foundation
@@ -337,10 +419,16 @@ describe('objectMatchesQuery', () => {
 		})
 
 		it('should handle missing properties gracefully', () => {
-			const book = { title: 'Test' } as any
+			const book = { title: 'Test' }
 			const query = { nonexistentProperty: { eq: 'value' } }
 
-			expect(objectMatchesQuery(query, book)).toBe(false)
+			expect(
+				objectMatchesQuery(
+					// @ts-expect-error - query is not a valid query expression for books
+					query,
+					book
+				)
+			).toBe(false)
 		})
 	})
 })
@@ -431,6 +519,45 @@ describe('executeQuery', () => {
 		})
 	})
 
+	describe('nested object queries', () => {
+		it('should filter records using nested properties', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const result = executeQuery(store.query, 'book', query)
+
+			const expectedIds = new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+
+			expect(result).toEqual(expectedIds)
+		})
+
+		it('should combine nested and top-level criteria', () => {
+			const query = {
+				authorId: { eq: authors.asimov.id },
+				metadata: { sessionId: { eq: 'session:alpha' } },
+			}
+			const result = executeQuery(store.query, 'book', query)
+
+			const expectedIds = new Set([books.foundation.id, books.robots.id])
+
+			expect(result).toEqual(expectedIds)
+		})
+
+		it('should support deeper nested criteria', () => {
+			const query = { metadata: { extras: { region: { eq: 'eu' } } } }
+			const result = executeQuery(store.query, 'book', query)
+
+			expect(result).toEqual(new Set([books.dune.id]))
+		})
+
+		it('should work with reactive ids queries', () => {
+			const query = { metadata: { sessionId: { eq: 'session:beta' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			expect(idsQuery.get()).toEqual(
+				new Set([books.neuromancer.id, books.dune.id, books.fahrenheit451.id])
+			)
+		})
+	})
+
 	describe('edge cases', () => {
 		it('should handle empty query', () => {
 			const query = {}
@@ -449,7 +576,12 @@ describe('executeQuery', () => {
 			expect(result).toEqual(expectedIds)
 
 			// Same query on books should return empty
-			const bookResult = executeQuery(store.query, 'book', query as any)
+			const bookResult = executeQuery(
+				store.query,
+				'book',
+				// @ts-expect-error - query is not a valid query expression for books
+				query
+			)
 			expect(bookResult).toEqual(new Set())
 		})
 	})
@@ -479,3 +611,795 @@ describe('executeQuery', () => {
 		})
 	})
 })
+
+describe('reactive nested queries', () => {
+	describe('adding records', () => {
+		it('should include newly added record that matches nested query', () => {
+			const query = { metadata: { sessionId: { eq: 'session:delta' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially empty
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Add a book with matching nested property
+			const newBook = Book.create({
+				title: 'New Book',
+				authorId: authors.asimov.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:delta',
+					extras: { region: 'us' },
+				},
+			})
+
+			store.put([newBook])
+
+			// Should now include the new book
+			expect(idsQuery.get()).toEqual(new Set([newBook.id]))
+		})
+
+		it('should not include newly added record that does not match nested query', () => {
+			const query = { metadata: { sessionId: { eq: 'session:delta' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Add a book with non-matching nested property
+			const newBook = Book.create({
+				title: 'Another Book',
+				authorId: authors.asimov.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:epsilon',
+					extras: { region: 'us' },
+				},
+			})
+
+			store.put([newBook])
+
+			// Should still be empty
+			expect(idsQuery.get()).toEqual(new Set())
+		})
+
+		it('should handle adding multiple records with mixed nested matches', () => {
+			const query = { metadata: { extras: { region: { eq: 'asia' } } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			expect(idsQuery.get()).toEqual(new Set())
+
+			const book1 = Book.create({
+				title: 'Book 1',
+				authorId: authors.asimov.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:alpha',
+					extras: { region: 'asia' },
+				},
+			})
+
+			const book2 = Book.create({
+				title: 'Book 2',
+				authorId: authors.gibson.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:beta',
+					extras: { region: 'us' },
+				},
+			})
+
+			const book3 = Book.create({
+				title: 'Book 3',
+				authorId: authors.herbert.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:gamma',
+					extras: { region: 'asia' },
+				},
+			})
+
+			store.put([book1, book2, book3])
+
+			// Only books 1 and 3 should match
+			expect(idsQuery.get()).toEqual(new Set([book1.id, book3.id]))
+		})
+	})
+
+	describe('removing records', () => {
+		it('should remove record from results when it is deleted', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially should have foundation, hitchhiker, and robots
+			const initialIds = new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			expect(idsQuery.get()).toEqual(initialIds)
+
+			// Remove one of the matching books
+			store.remove([books.foundation.id])
+
+			// Should no longer include foundation
+			expect(idsQuery.get()).toEqual(new Set([books.hitchhiker.id, books.robots.id]))
+		})
+
+		it('should not affect results when removing non-matching record', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			const initialIds = new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			expect(idsQuery.get()).toEqual(initialIds)
+
+			// Remove a non-matching book
+			store.remove([books.neuromancer.id])
+
+			// Results should be unchanged
+			expect(idsQuery.get()).toEqual(initialIds)
+		})
+
+		it('should handle removing all matching records', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			expect(idsQuery.get()).toEqual(
+				new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			)
+
+			// Remove all matching books
+			store.remove([books.foundation.id, books.hitchhiker.id, books.robots.id])
+
+			// Should now be empty
+			expect(idsQuery.get()).toEqual(new Set())
+		})
+	})
+
+	describe('updating records', () => {
+		it('should add record to results when nested property is updated to match', () => {
+			const query = { metadata: { sessionId: { eq: 'session:omega' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially empty (no books with session:omega)
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Update neuromancer to have session:omega
+			store.put([
+				{
+					...books.neuromancer,
+					metadata: {
+						sessionId: 'session:omega',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should now include neuromancer
+			expect(idsQuery.get()).toEqual(new Set([books.neuromancer.id]))
+		})
+
+		it('should remove record from results when nested property is updated to not match', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially should have foundation, hitchhiker, and robots
+			expect(idsQuery.get()).toEqual(
+				new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			)
+
+			// Update foundation to have a different session
+			store.put([
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:changed',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should no longer include foundation
+			expect(idsQuery.get()).toEqual(new Set([books.hitchhiker.id, books.robots.id]))
+		})
+
+		it('should handle deeply nested property updates', () => {
+			const query = { metadata: { extras: { region: { eq: 'antarctica' } } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially empty
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Update dune to have antarctica region
+			store.put([
+				{
+					...books.dune,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'antarctica' },
+					},
+				},
+			])
+
+			// Should now include dune
+			expect(idsQuery.get()).toEqual(new Set([books.dune.id]))
+
+			// Update dune back to eu
+			store.put([
+				{
+					...books.dune,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'eu' },
+					},
+				},
+			])
+
+			// Should no longer include dune
+			expect(idsQuery.get()).toEqual(new Set())
+		})
+
+		it('should maintain correct results when updating non-nested properties', () => {
+			const query = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			const initialIds = new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			expect(idsQuery.get()).toEqual(initialIds)
+
+			// Update a non-nested property (title) but keep nested property the same
+			store.put([
+				{
+					...books.foundation,
+					title: 'Foundation - Updated Edition',
+				},
+			])
+
+			// Results should be unchanged
+			expect(idsQuery.get()).toEqual(initialIds)
+		})
+	})
+
+	describe('combined nested and top-level queries', () => {
+		it('should correctly update when top-level property changes', () => {
+			const query = {
+				inStock: { eq: true },
+				metadata: { sessionId: { eq: 'session:alpha' } },
+			}
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially foundation and robots are in stock with session:alpha
+			// hitchhiker is NOT in stock
+			expect(idsQuery.get()).toEqual(new Set([books.foundation.id, books.robots.id]))
+
+			// Update hitchhiker to be in stock
+			store.put([
+				{
+					...books.hitchhiker,
+					inStock: true,
+				},
+			])
+
+			// Should now include hitchhiker
+			expect(idsQuery.get()).toEqual(
+				new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			)
+		})
+
+		it('should correctly update when nested property changes in combined query', () => {
+			const query = {
+				inStock: { eq: true },
+				metadata: { sessionId: { eq: 'session:zeta' } },
+			}
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially empty (no books with session:zeta)
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Update foundation to have session:zeta (it's already in stock)
+			store.put([
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:zeta',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should now include foundation
+			expect(idsQuery.get()).toEqual(new Set([books.foundation.id]))
+
+			// Update foundation to be out of stock (but keep session:zeta)
+			store.put([
+				{
+					...books.foundation,
+					inStock: false,
+					metadata: {
+						sessionId: 'session:zeta',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should no longer include foundation
+			expect(idsQuery.get()).toEqual(new Set())
+		})
+
+		it('should handle complex updates with multiple nested levels', () => {
+			const query = {
+				category: { eq: 'sci-fi' },
+				metadata: { extras: { region: { eq: 'us' } } },
+			}
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Initially foundation and robots are sci-fi with us region
+			expect(idsQuery.get()).toEqual(new Set([books.foundation.id, books.robots.id]))
+
+			// Add a new sci-fi book with us region
+			const newBook = Book.create({
+				title: 'New Sci-Fi',
+				authorId: authors.asimov.id,
+				publishedYear: 2023,
+				inStock: true,
+				category: 'sci-fi',
+				metadata: {
+					sessionId: 'session:new',
+					extras: { region: 'us' },
+				},
+			})
+
+			store.put([newBook])
+
+			expect(idsQuery.get()).toEqual(new Set([books.foundation.id, books.robots.id, newBook.id]))
+
+			// Change newBook's region
+			store.put([
+				{
+					...newBook,
+					metadata: {
+						sessionId: 'session:new',
+						extras: { region: 'eu' },
+					},
+				},
+			])
+
+			// Should no longer include newBook
+			expect(idsQuery.get()).toEqual(new Set([books.foundation.id, books.robots.id]))
+
+			// Change newBook's category but keep region as eu
+			store.put([
+				{
+					...newBook,
+					category: 'fantasy',
+					metadata: {
+						sessionId: 'session:new',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should still not include newBook (category doesn't match)
+			expect(idsQuery.get()).toEqual(new Set([books.foundation.id, books.robots.id]))
+		})
+	})
+
+	describe('query operators with nested properties', () => {
+		it('should handle gt operator on nested properties', () => {
+			// Add some books with different copy counts
+			const bookLowCopies = Book.create({
+				title: 'Low Copies Book',
+				authorId: authors.asimov.id,
+				publishedYear: 2020,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					copies: 5,
+					extras: { region: 'us' },
+				},
+			})
+
+			const bookHighCopies = Book.create({
+				title: 'High Copies Book',
+				authorId: authors.gibson.id,
+				publishedYear: 2021,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					copies: 100,
+					extras: { region: 'us' },
+				},
+			})
+
+			const bookMidCopies = Book.create({
+				title: 'Mid Copies Book',
+				authorId: authors.herbert.id,
+				publishedYear: 2022,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					copies: 50,
+					extras: { region: 'us' },
+				},
+			})
+
+			store.put([bookLowCopies, bookHighCopies, bookMidCopies])
+
+			// Query for books with more than 25 copies
+			const query = { metadata: { copies: { gt: 25 } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Should include only books with > 25 copies
+			const expectedIds = new Set([bookHighCopies.id, bookMidCopies.id])
+			expect(idsQuery.get()).toEqual(expectedIds)
+
+			// Update one book to have fewer copies
+			store.put([
+				{
+					...bookMidCopies,
+					metadata: {
+						...bookMidCopies.metadata,
+						copies: 10,
+					},
+				},
+			])
+
+			// Should no longer include bookMidCopies
+			expect(idsQuery.get()).toEqual(new Set([bookHighCopies.id]))
+		})
+
+		it('should handle neq operator on nested properties with updates', () => {
+			const query = { metadata: { sessionId: { neq: 'session:alpha' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Should include all books except those with session:alpha
+			const expectedIds = new Set([
+				books.neuromancer.id,
+				books.dune.id,
+				books.fahrenheit451.id,
+				books.childhood.id,
+			])
+			expect(idsQuery.get()).toEqual(expectedIds)
+
+			// Update one of the matching books to have session:alpha
+			store.put([
+				{
+					...books.neuromancer,
+					metadata: {
+						sessionId: 'session:alpha',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should no longer include neuromancer
+			expect(idsQuery.get()).toEqual(
+				new Set([books.dune.id, books.fahrenheit451.id, books.childhood.id])
+			)
+		})
+
+		it('should handle neq with undefined nested values', () => {
+			// Create books where some have a nested optional property and others don't
+			const bookWithStatus = Book.create({
+				title: 'Book With Status',
+				authorId: authors.asimov.id,
+				publishedYear: 2020,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					status: 'published',
+					extras: { region: 'us' },
+				},
+			})
+
+			const bookWithDifferentStatus = Book.create({
+				title: 'Book With Different Status',
+				authorId: authors.gibson.id,
+				publishedYear: 2021,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					status: 'draft',
+					extras: { region: 'us' },
+				},
+			})
+
+			const bookWithoutStatus = Book.create({
+				title: 'Book Without Status',
+				authorId: authors.herbert.id,
+				publishedYear: 2022,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					extras: { region: 'us' },
+				},
+			})
+
+			store.put([bookWithStatus, bookWithDifferentStatus, bookWithoutStatus])
+
+			// Query for books where status is not 'published'
+			// Note: Records with undefined nested values are not indexed, so they won't appear in neq results
+			// This is because the index only tracks records with defined values
+			const query = { metadata: { status: { neq: 'published' } } }
+			const idsQuery = store.query.ids(
+				'book',
+				// @ts-expect-error - query is not a valid query expression for books
+				() => query
+			)
+
+			// Should include only books with a defined status that is not 'published'
+			// bookWithoutStatus is not in the index since its status is undefined
+			expect(idsQuery.get()).toEqual(new Set([bookWithDifferentStatus.id]))
+
+			// Update bookWithDifferentStatus to be 'published'
+			store.put([
+				{
+					...bookWithDifferentStatus,
+					metadata: {
+						...bookWithDifferentStatus.metadata,
+						status: 'published',
+					},
+				} as any,
+			])
+
+			// Should now be empty (bookWithoutStatus still not in index)
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Add a third status to verify the index still works
+			const bookWithArchivedStatus = Book.create({
+				title: 'Book With Archived Status',
+				authorId: authors.bradbury.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:test',
+					status: 'archived',
+					extras: { region: 'us' },
+				},
+			} as any)
+
+			store.put([bookWithArchivedStatus])
+
+			// Should now include only the archived book
+			expect(idsQuery.get()).toEqual(new Set([bookWithArchivedStatus.id]))
+		})
+
+		it('should handle multiple nested criteria with updates', () => {
+			const query = {
+				metadata: {
+					sessionId: { neq: 'session:gamma' },
+					extras: { region: { eq: 'us' } },
+				},
+			}
+			const idsQuery = store.query.ids('book', () => query)
+
+			// Should include books with us region but not session:gamma
+			expect(idsQuery.get()).toEqual(
+				new Set([
+					books.foundation.id,
+					books.neuromancer.id,
+					books.fahrenheit451.id,
+					books.robots.id,
+				])
+			)
+
+			// Change foundation's region to uk
+			store.put([
+				{
+					...books.foundation,
+					metadata: {
+						...books.foundation.metadata,
+						extras: { region: 'uk' },
+					},
+				},
+			])
+
+			// Should no longer include foundation
+			expect(idsQuery.get()).toEqual(
+				new Set([books.neuromancer.id, books.fahrenheit451.id, books.robots.id])
+			)
+		})
+	})
+
+	describe('multiple subscribers', () => {
+		it('should update all subscribers when records change', () => {
+			const query = { metadata: { sessionId: { eq: 'session:theta' } } }
+			const idsQuery1 = store.query.ids('book', () => query)
+			const idsQuery2 = store.query.ids('book', () => query)
+
+			// Both should be empty initially
+			expect(idsQuery1.get()).toEqual(new Set())
+			expect(idsQuery2.get()).toEqual(new Set())
+
+			// Add a matching book
+			const newBook = Book.create({
+				title: 'Test Book',
+				authorId: authors.asimov.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:theta',
+					extras: { region: 'us' },
+				},
+			})
+
+			store.put([newBook])
+
+			// Both should now include the new book
+			expect(idsQuery1.get()).toEqual(new Set([newBook.id]))
+			expect(idsQuery2.get()).toEqual(new Set([newBook.id]))
+
+			// Remove the book
+			store.remove([newBook.id])
+
+			// Both should be empty again
+			expect(idsQuery1.get()).toEqual(new Set())
+			expect(idsQuery2.get()).toEqual(new Set())
+		})
+
+		it('should handle different queries on same nested properties', () => {
+			const queryAlpha = { metadata: { sessionId: { eq: 'session:alpha' } } }
+			const queryBeta = { metadata: { sessionId: { eq: 'session:beta' } } }
+
+			const idsQueryAlpha = store.query.ids('book', () => queryAlpha)
+			const idsQueryBeta = store.query.ids('book', () => queryBeta)
+
+			expect(idsQueryAlpha.get()).toEqual(
+				new Set([books.foundation.id, books.hitchhiker.id, books.robots.id])
+			)
+			expect(idsQueryBeta.get()).toEqual(
+				new Set([books.neuromancer.id, books.dune.id, books.fahrenheit451.id])
+			)
+
+			// Update foundation from alpha to beta
+			store.put([
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Alpha query should no longer include foundation
+			expect(idsQueryAlpha.get()).toEqual(new Set([books.hitchhiker.id, books.robots.id]))
+
+			// Beta query should now include foundation
+			expect(idsQueryBeta.get()).toEqual(
+				new Set([books.foundation.id, books.neuromancer.id, books.dune.id, books.fahrenheit451.id])
+			)
+		})
+	})
+
+	describe('batch operations', () => {
+		it('should handle batch updates affecting nested queries', () => {
+			const query = { metadata: { extras: { region: { eq: 'canada' } } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			expect(idsQuery.get()).toEqual(new Set())
+
+			// Batch update multiple books to have canada region
+			store.put([
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:alpha',
+						extras: { region: 'canada' },
+					},
+				},
+				{
+					...books.neuromancer,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'canada' },
+					},
+				},
+				{
+					...books.dune,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'canada' },
+					},
+				},
+			])
+
+			// Should include all three books
+			expect(idsQuery.get()).toEqual(
+				new Set([books.foundation.id, books.neuromancer.id, books.dune.id])
+			)
+
+			// Batch update to remove them all
+			store.put([
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:alpha',
+						extras: { region: 'us' },
+					},
+				},
+				{
+					...books.neuromancer,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'us' },
+					},
+				},
+				{
+					...books.dune,
+					metadata: {
+						sessionId: 'session:beta',
+						extras: { region: 'eu' },
+					},
+				},
+			])
+
+			// Should be empty again
+			expect(idsQuery.get()).toEqual(new Set())
+		})
+
+		it('should handle mixed batch operations (add, update, remove)', () => {
+			const query = { metadata: { sessionId: { eq: 'session:mixed' } } }
+			const idsQuery = store.query.ids('book', () => query)
+
+			expect(idsQuery.get()).toEqual(new Set())
+
+			const newBook1 = Book.create({
+				title: 'New Book 1',
+				authorId: authors.asimov.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:mixed',
+					extras: { region: 'us' },
+				},
+			})
+
+			const newBook2 = Book.create({
+				title: 'New Book 2',
+				authorId: authors.gibson.id,
+				publishedYear: 2023,
+				inStock: true,
+				metadata: {
+					sessionId: 'session:mixed',
+					extras: { region: 'us' },
+				},
+			})
+
+			// Add new books and update existing one in a single batch
+			store.put([
+				newBook1,
+				newBook2,
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:mixed',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			expect(idsQuery.get()).toEqual(new Set([newBook1.id, newBook2.id, books.foundation.id]))
+
+			// Remove one new book, update another, and revert foundation
+			store.remove([newBook1.id])
+			store.put([
+				{
+					...newBook2,
+					metadata: {
+						sessionId: 'session:different',
+						extras: { region: 'us' },
+					},
+				},
+				{
+					...books.foundation,
+					metadata: {
+						sessionId: 'session:alpha',
+						extras: { region: 'us' },
+					},
+				},
+			])
+
+			// Should now be empty
+			expect(idsQuery.get()).toEqual(new Set())
+		})
+	})
+})
diff --git a/packages/store/src/lib/executeQuery.ts b/packages/store/src/lib/executeQuery.ts
index 63376d8e5274..5c86ade765a0 100644
--- a/packages/store/src/lib/executeQuery.ts
+++ b/packages/store/src/lib/executeQuery.ts
@@ -37,44 +37,69 @@ export type QueryValueMatcher<T> = { eq: T } | { neq: T } | { gt: number }
  * const notByAuthor: QueryExpression<Book> = {
  *   authorId: { neq: 'author:tolkien' }
  * }
+ *
+ * // Query with nested properties
+ * const nestedQuery: QueryExpression<Book> = {
+ *   metadata: { sessionId: { eq: 'session:alpha' } }
+ * }
  * ```
  *
  * @public
  */
+/** @public */
 export type QueryExpression<R extends object> = {
-	[k in keyof R & string]?: QueryValueMatcher<R[k]>
-	// todo: handle nesting
-	// | (R[k] extends object ? { match: QueryExpression<R[k]> } : never)
+	[k in keyof R & string]?: R[k] extends string | number | boolean | null | undefined
+		? QueryValueMatcher<R[k]>
+		: R[k] extends object
+			? QueryExpression<R[k]>
+			: QueryValueMatcher<R[k]>
+}
+
+function isQueryValueMatcher(value: unknown): value is QueryValueMatcher<unknown> {
+	if (typeof value !== 'object' || value === null) return false
+	return 'eq' in value || 'neq' in value || 'gt' in value
+}
+
+function extractMatcherPaths(
+	query: QueryExpression<any>,
+	prefix: string = ''
+): Array<{ path: string; matcher: QueryValueMatcher<any> }> {
+	const paths: Array<{ path: string; matcher: QueryValueMatcher<any> }> = []
+
+	for (const [key, value] of Object.entries(query)) {
+		const currentPath = prefix ? `${prefix}\\${key}` : key
+
+		if (isQueryValueMatcher(value)) {
+			// It's a direct matcher
+			paths.push({ path: currentPath, matcher: value })
+		} else if (typeof value === 'object' && value !== null) {
+			// It's a nested query - recurse into it
+			paths.push(...extractMatcherPaths(value as QueryExpression<any>, currentPath))
+		}
+	}
+
+	return paths
 }
 
-/**
- * Tests whether an object matches the given query expression by checking each property
- * against its corresponding matcher criteria.
- *
- * @param query - The query expression containing matching criteria for object properties
- * @param object - The object to test against the query
- * @returns True if the object matches all criteria in the query, false otherwise
- *
- * @example
- * ```ts
- * const book = { title: '1984', publishedYear: 1949, inStock: true }
- * const query = { publishedYear: { gt: 1945 }, inStock: { eq: true } }
- *
- * const matches = objectMatchesQuery(query, book) // true
- * ```
- *
- * @public
- */
 export function objectMatchesQuery<T extends object>(query: QueryExpression<T>, object: T) {
-	for (const [key, _matcher] of Object.entries(query)) {
-		const matcher = _matcher as QueryValueMatcher<T>
+	for (const [key, matcher] of Object.entries(query)) {
 		const value = object[key as keyof T]
+
 		// if you add matching logic here, make sure you also update executeQuery,
 		// where initial data is pulled out of the indexes, since that requires different
 		// matching logic
-		if ('eq' in matcher && value !== matcher.eq) return false
-		if ('neq' in matcher && value === matcher.neq) return false
-		if ('gt' in matcher && (typeof value !== 'number' || value <= matcher.gt)) return false
+		if (isQueryValueMatcher(matcher)) {
+			if ('eq' in matcher && value !== matcher.eq) return false
+			if ('neq' in matcher && value === matcher.neq) return false
+			if ('gt' in matcher && (typeof value !== 'number' || value <= matcher.gt)) return false
+			continue
+		}
+
+		// It's a nested query
+		if (typeof value !== 'object' || value === null) return false
+		if (!objectMatchesQuery(matcher as QueryExpression<any>, value as any)) {
+			return false
+		}
 	}
 	return true
 }
@@ -100,6 +125,11 @@ export function objectMatchesQuery<T extends object>(query: QueryExpression<T>,
  * const otherBookIds = executeQuery(store, 'book', {
  *   authorId: { neq: 'author:tolkien' }
  * })
+ *
+ * // Query with nested properties
+ * const nestedQueryIds = executeQuery(store, 'book', {
+ *   metadata: { sessionId: { eq: 'session:alpha' } }
+ * })
  * ```
  *
  * @public
@@ -109,37 +139,49 @@ export function executeQuery<R extends UnknownRecord, TypeName extends R['typeNa
 	typeName: TypeName,
 	query: QueryExpression<Extract<R, { typeName: TypeName }>>
 ): Set<IdOf<Extract<R, { typeName: TypeName }>>> {
-	const matchIds = Object.fromEntries(Object.keys(query).map((key) => [key, new Set()]))
+	type S = Extract<R, { typeName: TypeName }>
+
+	// Extract all paths with matchers (flattens nested queries)
+	const matcherPaths = extractMatcherPaths(query)
+
+	// Build a set of matching IDs for each path
+	const matchIds = Object.fromEntries(matcherPaths.map(({ path }) => [path, new Set<IdOf<S>>()]))
+
+	// For each path, use the index to find matching IDs
+	for (const { path, matcher } of matcherPaths) {
+		const index = store.index(typeName, path as any)
 
-	for (const [k, matcher] of Object.entries(query)) {
 		if ('eq' in matcher) {
-			const index = store.index(typeName, k as any)
 			const ids = index.get().get(matcher.eq)
 			if (ids) {
 				for (const id of ids) {
-					matchIds[k].add(id)
+					matchIds[path].add(id)
 				}
 			}
 		} else if ('neq' in matcher) {
-			const index = store.index(typeName, k as any)
 			for (const [value, ids] of index.get()) {
 				if (value !== matcher.neq) {
 					for (const id of ids) {
-						matchIds[k].add(id)
+						matchIds[path].add(id)
 					}
 				}
 			}
 		} else if ('gt' in matcher) {
-			const index = store.index(typeName, k as any)
 			for (const [value, ids] of index.get()) {
-				if (value > matcher.gt) {
+				if (typeof value === 'number' && value > matcher.gt) {
 					for (const id of ids) {
-						matchIds[k].add(id)
+						matchIds[path].add(id)
 					}
 				}
 			}
 		}
+
+		// Short-circuit if this set is empty - intersection will be empty
+		if (matchIds[path].size === 0) {
+			return new Set()
+		}
 	}
 
-	return intersectSets(Object.values(matchIds)) as Set<IdOf<Extract<R, { typeName: TypeName }>>>
+	// Intersect all the match sets
+	return intersectSets(Object.values(matchIds)) as Set<IdOf<S>>
 }
diff --git a/packages/sync-core/api-report.api.md b/packages/sync-core/api-report.api.md
index 8c5dc4a3c0ba..18d6ac08b200 100644
--- a/packages/sync-core/api-report.api.md
+++ b/packages/sync-core/api-report.api.md
@@ -19,7 +19,7 @@ import { TLStoreSnapshot } from '@tldraw/tlschema';
 import { UnknownRecord } from '@tldraw/store';
 
 // @internal
-export type AppendOp = [type: typeof ValueOpType.Append, values: unknown[], offset: number];
+export type AppendOp = [type: typeof ValueOpType.Append, value: string | unknown[], offset: number];
 
 // @internal
 export function applyObjectDiff<T extends object>(object: T, objectDiff: ObjectDiff): T;
@@ -54,7 +54,7 @@ export class ClientWebSocketAdapter implements TLPersistentClientSocket<TLSocket
 export type DeleteOp = [type: typeof ValueOpType.Delete];
 
 // @internal
-export function diffRecord(prev: object, next: object): null | ObjectDiff;
+export function diffRecord(prev: object, next: object, legacyAppendMode?: boolean): null | ObjectDiff;
 
 // @internal
 export class DocumentState<R extends UnknownRecord> {
@@ -62,8 +62,8 @@ export class DocumentState<R extends UnknownRecord> {
     static createWithoutValidating<R extends UnknownRecord>(state: R, lastChangedClock: number, recordType: RecordType<R, any>): DocumentState<R>;
     // (undocumented)
     readonly lastChangedClock: number;
-    mergeDiff(diff: ObjectDiff, clock: number): Result<[ObjectDiff, DocumentState<R>] | null, Error>;
-    replaceState(state: R, clock: number): Result<[ObjectDiff, DocumentState<R>] | null, Error>;
+    mergeDiff(diff: ObjectDiff, clock: number, legacyAppendMode?: boolean): Result<[ObjectDiff, DocumentState<R>] | null, Error>;
+    replaceState(state: R, clock: number, legacyAppendMode?: boolean): Result<[ObjectDiff, DocumentState<R>] | null, Error>;
     // (undocumented)
     readonly state: R;
 }
@@ -74,6 +74,20 @@ export function getNetworkDiff<R extends UnknownRecord>(diff: RecordsDiff<R>): N
 // @internal
 export function getTlsyncProtocolVersion(): number;
 
+// @public
+export class JsonChunkAssembler {
+    handleMessage(msg: string): {
+        data: object;
+        stringified: string;
+    } | {
+        error: Error;
+    } | null;
+    state: 'idle' | {
+        chunksReceived: string[];
+        totalChunks: number;
+    };
+}
+
 // @internal
 export interface NetworkDiff<R extends UnknownRecord> {
     // (undocumented)
@@ -132,37 +146,30 @@ export const RecordOpType: {
 export type RecordOpType = (typeof RecordOpType)[keyof typeof RecordOpType];
 
 // @internal
-export type RoomSession<R extends UnknownRecord, Meta> = {
+export type RoomSession<R extends UnknownRecord, Meta> = (RoomSessionBase<R, Meta> & {
     state: typeof RoomSessionState.AwaitingConnectMessage;
-    meta: Meta;
-    presenceId: null | string;
     sessionStartTime: number;
-    sessionId: string;
-    socket: TLRoomSocket<R>;
-    isReadonly: boolean;
-    requiresLegacyRejection: boolean;
-} | {
+}) | (RoomSessionBase<R, Meta> & {
     state: typeof RoomSessionState.AwaitingRemoval;
-    meta: Meta;
-    presenceId: null | string;
     cancellationTime: number;
-    sessionId: string;
-    socket: TLRoomSocket<R>;
-    isReadonly: boolean;
-    requiresLegacyRejection: boolean;
-} | {
+}) | (RoomSessionBase<R, Meta> & {
     state: typeof RoomSessionState.Connected;
-    meta: Meta;
-    presenceId: null | string;
     outstandingDataMessages: TLSocketServerSentDataEvent<R>[];
     serializedSchema: SerializedSchema;
     debounceTimer: null | ReturnType<typeof setTimeout>;
     lastInteractionTime: number;
-    sessionId: string;
-    socket: TLRoomSocket<R>;
+});
+
+// @internal
+export interface RoomSessionBase<R extends UnknownRecord, Meta> {
     isReadonly: boolean;
+    meta: Meta;
+    presenceId: null | string;
     requiresLegacyRejection: boolean;
-};
+    sessionId: string;
+    socket: TLRoomSocket<R>;
+    supportsStringAppend: boolean;
+}
 
 // @internal
 export const RoomSessionState: {
@@ -505,6 +512,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
     }>;
     // (undocumented)
     _flushDataMessages(sessionId: string): void;
+    getCanEmitStringAppend(): boolean;
     getSnapshot(): RoomSnapshot;
     handleClose(sessionId: string): void;
     handleMessage(sessionId: string, message: TLSocketClientSentEvent<R>): Promise<void>;
diff --git a/packages/sync-core/package.json b/packages/sync-core/package.json
index d3ea2b736fda..ba472de587f7 100644
--- a/packages/sync-core/package.json
+++ b/packages/sync-core/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/sync-core",
 	"description": "tldraw infinite canvas SDK (multiplayer sync).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw GB Ltd.",
 		"email": "hello@tldraw.com"
diff --git a/packages/sync-core/src/index.ts b/packages/sync-core/src/index.ts
index cd683c78c70c..ba2272e3b95f 100644
--- a/packages/sync-core/src/index.ts
+++ b/packages/sync-core/src/index.ts
@@ -1,5 +1,5 @@
 import { registerTldrawLibraryVersion } from '@tldraw/utils'
-export { chunk } from './lib/chunk'
+export { chunk, JsonChunkAssembler } from './lib/chunk'
 export { ClientWebSocketAdapter, ReconnectManager } from './lib/ClientWebSocketAdapter'
 export {
 	applyObjectDiff,
@@ -26,7 +26,7 @@ export {
 	type TLSocketServerSentDataEvent,
 	type TLSocketServerSentEvent,
 } from './lib/protocol'
-export { RoomSessionState, type RoomSession } from './lib/RoomSession'
+export { RoomSessionState, type RoomSession, type RoomSessionBase } from './lib/RoomSession'
 export type { PersistedRoomSnapshotForSupabase } from './lib/server-types'
 export type { WebSocketMinimal } from './lib/ServerSocketAdapter'
 export { TLRemoteSyncError } from './lib/TLRemoteSyncError'
diff --git a/packages/sync-core/src/lib/RoomSession.test.ts b/packages/sync-core/src/lib/RoomSession.test.ts
index 20fad0cbcc1e..3cbd9fb80625 100644
--- a/packages/sync-core/src/lib/RoomSession.test.ts
+++ b/packages/sync-core/src/lib/RoomSession.test.ts
@@ -54,6 +54,7 @@ describe('RoomSession state transitions', () => {
 		const initialSession: RoomSession<TLRecord, { userId: string }> = {
 			state: RoomSessionState.AwaitingConnectMessage,
 			sessionStartTime: Date.now(),
+			supportsStringAppend: true,
 			...baseSessionData,
 		}
 
@@ -67,6 +68,7 @@ describe('RoomSession state transitions', () => {
 			isReadonly: initialSession.isReadonly,
 			requiresLegacyRejection: initialSession.requiresLegacyRejection,
 			serializedSchema: mockSerializedSchema,
+			supportsStringAppend: true,
 			lastInteractionTime: Date.now(),
 			debounceTimer: null,
 			outstandingDataMessages: [],
@@ -81,6 +83,7 @@ describe('RoomSession state transitions', () => {
 			meta: connectedSession.meta,
 			isReadonly: connectedSession.isReadonly,
 			requiresLegacyRejection: connectedSession.requiresLegacyRejection,
+			supportsStringAppend: connectedSession.supportsStringAppend,
 			cancellationTime: Date.now(),
 		}
 
diff --git a/packages/sync-core/src/lib/RoomSession.ts b/packages/sync-core/src/lib/RoomSession.ts
index f476faf7ef71..b48b57406fd2 100644
--- a/packages/sync-core/src/lib/RoomSession.ts
+++ b/packages/sync-core/src/lib/RoomSession.ts
@@ -64,6 +64,28 @@ export const SESSION_REMOVAL_WAIT_TIME = 5000
  */
 export const SESSION_IDLE_TIMEOUT = 20000
 
+/**
+ * Base properties shared by all room session states.
+ *
+ * @internal
+ */
+export interface RoomSessionBase<R extends UnknownRecord, Meta> {
+	/** Unique identifier for this session */
+	sessionId: string
+	/** Presence identifier for live cursor/selection tracking, if available */
+	presenceId: string | null
+	/** WebSocket connection wrapper for this session */
+	socket: TLRoomSocket<R>
+	/** Custom metadata associated with this session */
+	meta: Meta
+	/** Whether this session has read-only permissions */
+	isReadonly: boolean
+	/** Whether this session requires legacy protocol rejection handling */
+	requiresLegacyRejection: boolean
+	/** Whether this session supports string append operations */
+	supportsStringAppend: boolean
+}
+
 /**
  * Represents a client session within a collaborative room, tracking the connection
  * state, permissions, and synchronization details for a single user.
@@ -93,51 +115,21 @@ export const SESSION_IDLE_TIMEOUT = 20000
  * @internal
  */
 export type RoomSession<R extends UnknownRecord, Meta> =
-	| {
+	| (RoomSessionBase<R, Meta> & {
 			/** Current state of the session */
 			state: typeof RoomSessionState.AwaitingConnectMessage
-			/** Unique identifier for this session */
-			sessionId: string
-			/** Presence identifier for live cursor/selection tracking, if available */
-			presenceId: string | null
-			/** WebSocket connection wrapper for this session */
-			socket: TLRoomSocket<R>
 			/** Timestamp when the session was created */
 			sessionStartTime: number
-			/** Custom metadata associated with this session */
-			meta: Meta
-			/** Whether this session has read-only permissions */
-			isReadonly: boolean
-			/** Whether this session requires legacy protocol rejection handling */
-			requiresLegacyRejection: boolean
-	  }
-	| {
+	  })
+	| (RoomSessionBase<R, Meta> & {
 			/** Current state of the session */
 			state: typeof RoomSessionState.AwaitingRemoval
-			/** Unique identifier for this session */
-			sessionId: string
-			/** Presence identifier for live cursor/selection tracking, if available */
-			presenceId: string | null
-			/** WebSocket connection wrapper for this session */
-			socket: TLRoomSocket<R>
 			/** Timestamp when the session was marked for removal */
 			cancellationTime: number
-			/** Custom metadata associated with this session */
-			meta: Meta
-			/** Whether this session has read-only permissions */
-			isReadonly: boolean
-			/** Whether this session requires legacy protocol rejection handling */
-			requiresLegacyRejection: boolean
-	  }
-	| {
+	  })
+	| (RoomSessionBase<R, Meta> & {
 			/** Current state of the session */
 			state: typeof RoomSessionState.Connected
-			/** Unique identifier for this session */
-			sessionId: string
-			/** Presence identifier for live cursor/selection tracking, if available */
-			presenceId: string | null
-			/** WebSocket connection wrapper for this session */
-			socket: TLRoomSocket<R>
 			/** Serialized schema information for this connected session */
 			serializedSchema: SerializedSchema
 			/** Timestamp of the last interaction or message from this session */
@@ -146,10 +138,4 @@ export type RoomSession<R extends UnknownRecord, Meta> =
 			debounceTimer: ReturnType<typeof setTimeout> | null
 			/** Queue of data messages waiting to be sent to this session */
 			outstandingDataMessages: TLSocketServerSentDataEvent<R>[]
-			/** Custom metadata associated with this session */
-			meta: Meta
-			/** Whether this session has read-only permissions */
-			isReadonly: boolean
-			/** Whether this session requires legacy protocol rejection handling */
-			requiresLegacyRejection: boolean
-	  }
+	  })
diff --git a/packages/sync-core/src/lib/TLSyncClient.ts b/packages/sync-core/src/lib/TLSyncClient.ts
index 7881a6d2f741..a8a84bdcf6f6 100644
--- a/packages/sync-core/src/lib/TLSyncClient.ts
+++ b/packages/sync-core/src/lib/TLSyncClient.ts
@@ -35,12 +35,6 @@ import {
  */
 export type SubscribingFn<T> = (cb: (val: T) => void) => () => void
 
-/** Network sync frame rate when in solo mode (no collaborators) @internal */
-const SOLO_MODE_FPS = 1
-
-/** Network sync frame rate when in collaborative mode (with collaborators) @internal */
-const COLLABORATIVE_MODE_FPS = 30
-
 /**
  * WebSocket close code used by the server to signal a non-recoverable sync error.
  * This close code indicates that the connection is being terminated due to an error
@@ -806,11 +800,6 @@ export class TLSyncClient<R extends UnknownRecord, S extends Store<R> = Store<R>
 		this.flushPendingPushRequests()
 	}
 
-	/** Get the target FPS for network operations based on presence mode */
-	private getSyncFps(): number {
-		return this.presenceMode?.get() === 'solo' ? SOLO_MODE_FPS : COLLABORATIVE_MODE_FPS
-	}
-
 	/** Send any unsent push requests to the server */
 	private flushPendingPushRequests = fpsThrottle(() => {
 		this.debug('flushing pending push requests', {
@@ -830,7 +819,7 @@ export class TLSyncClient<R extends UnknownRecord, S extends Store<R> = Store<R>
 				pendingPushRequest.sent = true
 			}
 		}
-	}, this.getSyncFps.bind(this))
+	})
 
 	/**
 	 * Applies a 'network' diff to the store this does value-based equality checking so that if the
@@ -938,5 +927,5 @@ export class TLSyncClient<R extends UnknownRecord, S extends Store<R> = Store<R>
 		}
 	}
 
-	private scheduleRebase = fpsThrottle(this.rebase, this.getSyncFps.bind(this))
+	private scheduleRebase = fpsThrottle(this.rebase)
 }
diff --git a/packages/sync-core/src/lib/TLSyncRoom.ts b/packages/sync-core/src/lib/TLSyncRoom.ts
index b7aef5aa8a46..3819b8fe7a7f 100644
--- a/packages/sync-core/src/lib/TLSyncRoom.ts
+++ b/packages/sync-core/src/lib/TLSyncRoom.ts
@@ -156,10 +156,15 @@ export class DocumentState<R extends UnknownRecord> {
 	 *
 	 * @param state - The new record state
 	 * @param clock - The new clock value
+	 * @param legacyAppendMode - If true, string append operations will be converted to Put operations
 	 * @returns Result containing the diff and new DocumentState, or null if no changes, or validation error
 	 */
-	replaceState(state: R, clock: number): Result<[ObjectDiff, DocumentState<R>] | null, Error> {
-		const diff = diffRecord(this.state, state)
+	replaceState(
+		state: R,
+		clock: number,
+		legacyAppendMode = false
+	): Result<[ObjectDiff, DocumentState<R>] | null, Error> {
+		const diff = diffRecord(this.state, state, legacyAppendMode)
 		if (!diff) return Result.ok(null)
 		try {
 			this.recordType.validate(state)
@@ -173,11 +178,16 @@ export class DocumentState<R extends UnknownRecord> {
 	 *
 	 * @param diff - The object diff to apply
 	 * @param clock - The new clock value
+	 * @param legacyAppendMode - If true, string append operations will be converted to Put operations
 	 * @returns Result containing the final diff and new DocumentState, or null if no changes, or validation error
 	 */
-	mergeDiff(diff: ObjectDiff, clock: number): Result<[ObjectDiff, DocumentState<R>] | null, Error> {
+	mergeDiff(
+		diff: ObjectDiff,
+		clock: number,
+		legacyAppendMode = false
+	): Result<[ObjectDiff, DocumentState<R>] | null, Error> {
 		const newState = applyObjectDiff(this.state, diff)
-		return this.replaceState(newState, clock)
+		return this.replaceState(newState, clock, legacyAppendMode)
 	}
 }
 
@@ -720,6 +730,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 			meta: session.meta,
 			isReadonly: session.isReadonly,
 			requiresLegacyRejection: session.requiresLegacyRejection,
+			supportsStringAppend: session.supportsStringAppend,
 		})
 
 		try {
@@ -843,10 +854,28 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 			isReadonly: isReadonly ?? false,
 			// this gets set later during handleConnectMessage
 			requiresLegacyRejection: false,
+			supportsStringAppend: true,
 		})
 		return this
 	}
 
+	/**
+	 * Checks if all connected sessions support string append operations (protocol version 8+).
+	 * If any client is on an older version, returns false to enable legacy append mode.
+	 *
+	 * @returns True if all connected sessions are on protocol version 8 or higher
+	 */
+	getCanEmitStringAppend(): boolean {
+		for (const session of this.sessions.values()) {
+			if (session.state === RoomSessionState.Connected) {
+				if (!session.supportsStringAppend) {
+					return false
+				}
+			}
+		}
+		return true
+	}
+
 	/**
 	 * When we send a diff to a client, if that client is on a lower version than us, we need to make
 	 * the diff compatible with their version. At the moment this means migrating each affected record
@@ -1010,6 +1039,10 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 		if (theirProtocolVersion === 6) {
 			theirProtocolVersion++
 		}
+		if (theirProtocolVersion === 7) {
+			theirProtocolVersion++
+			session.supportsStringAppend = false
+		}
 
 		if (theirProtocolVersion == null || theirProtocolVersion < getTlsyncProtocolVersion()) {
 			this.rejectSession(session.sessionId, TLSyncErrorCloseEventReason.CLIENT_TOO_OLD)
@@ -1045,6 +1078,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 				lastInteractionTime: Date.now(),
 				debounceTimer: null,
 				outstandingDataMessages: [],
+				supportsStringAppend: session.supportsStringAppend,
 				meta: session.meta,
 				isReadonly: session.isReadonly,
 				requiresLegacyRejection: session.requiresLegacyRejection,
@@ -1150,6 +1184,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 		const initialDocumentClock = this.documentClock
 		let didPresenceChange = false
 		transaction((rollback) => {
+			const legacyAppendMode = !this.getCanEmitStringAppend()
 			// collect actual ops that resulted from the push
 			// these will be broadcast to other users
 			interface ActualChanges {
@@ -1198,7 +1233,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 				if (doc) {
 					// If there's an existing document, replace it with the new state
 					// but propagate a diff rather than the entire value
-					const diff = doc.replaceState(state, this.clock)
+					const diff = doc.replaceState(state, this.clock, legacyAppendMode)
 					if (!diff.ok) {
 						return fail(TLSyncErrorCloseEventReason.INVALID_RECORD)
 					}
@@ -1238,7 +1273,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 
 				if (downgraded.value === doc.state) {
 					// If the versions are compatible, apply the patch and propagate the patch op
-					const diff = doc.mergeDiff(patch, this.clock)
+					const diff = doc.mergeDiff(patch, this.clock, legacyAppendMode)
 					if (!diff.ok) {
 						return fail(TLSyncErrorCloseEventReason.INVALID_RECORD)
 					}
@@ -1260,7 +1295,7 @@ export class TLSyncRoom<R extends UnknownRecord, SessionMeta> {
 						return fail(TLSyncErrorCloseEventReason.CLIENT_TOO_OLD)
 					}
 					// replace the state with the upgraded version and propagate the patch op
-					const diff = doc.replaceState(upgraded.value, this.clock)
+					const diff = doc.replaceState(upgraded.value, this.clock, legacyAppendMode)
 					if (!diff.ok) {
 						return fail(TLSyncErrorCloseEventReason.INVALID_RECORD)
 					}
diff --git a/packages/sync-core/src/lib/chunk.ts b/packages/sync-core/src/lib/chunk.ts
index 51291b7aa000..b76daad89983 100644
--- a/packages/sync-core/src/lib/chunk.ts
+++ b/packages/sync-core/src/lib/chunk.ts
@@ -83,13 +83,13 @@ export class JsonChunkAssembler {
 
 	/**
 	 * Processes a single message, which can be either a complete JSON object or a chunk.
-	 * For complete JSON objects (starting with '{'), parses immediately.
-	 * For chunks (prefixed with "{number}_"), accumulates until all chunks received.
+	 * For complete JSON objects (starting with '\{'), parses immediately.
+	 * For chunks (prefixed with "\{number\}_"), accumulates until all chunks received.
 	 *
 	 * @param msg - The message to process, either JSON or chunk format
 	 * @returns Result object with data/stringified on success, error object on failure, or null for incomplete chunks
-	 * 	- `{ data: object, stringified: string }` - Successfully parsed complete message
-	 * 	- `{ error: Error }` - Parse error or invalid chunk sequence
+	 * 	- `\{ data: object, stringified: string \}` - Successfully parsed complete message
+	 * 	- `\{ error: Error \}` - Parse error or invalid chunk sequence
 	 * 	- `null` - Chunk received but more chunks expected
 	 *
 	 * @example
diff --git a/packages/sync-core/src/lib/diff.ts b/packages/sync-core/src/lib/diff.ts
index 688f88feb358..d8ac4b81aafc 100644
--- a/packages/sync-core/src/lib/diff.ts
+++ b/packages/sync-core/src/lib/diff.ts
@@ -123,11 +123,11 @@ export type ValueOpType = (typeof ValueOpType)[keyof typeof ValueOpType]
  */
 export type PutOp = [type: typeof ValueOpType.Put, value: unknown]
 /**
- * Operation that appends new values to the end of an array.
+ * Operation that appends new values to the end of an array or string.
  *
  * @internal
  */
-export type AppendOp = [type: typeof ValueOpType.Append, values: unknown[], offset: number]
+export type AppendOp = [type: typeof ValueOpType.Append, value: unknown[] | string, offset: number]
 /**
  * Operation that applies a nested diff to an object or array.
  *
@@ -165,6 +165,7 @@ export interface ObjectDiff {
  *
  * @param prev - The previous version of the record
  * @param next - The next version of the record
+ * @param legacyAppendMode - If true, string append operations will be converted to Put operations
  * @returns An ObjectDiff describing the changes, or null if no changes exist
  *
  * @example
@@ -181,11 +182,20 @@ export interface ObjectDiff {
  *
  * @internal
  */
-export function diffRecord(prev: object, next: object): ObjectDiff | null {
-	return diffObject(prev, next, new Set(['props']))
+export function diffRecord(
+	prev: object,
+	next: object,
+	legacyAppendMode = false
+): ObjectDiff | null {
+	return diffObject(prev, next, new Set(['props', 'meta']), legacyAppendMode)
 }
 
-function diffObject(prev: object, next: object, nestedKeys?: Set<string>): ObjectDiff | null {
+function diffObject(
+	prev: object,
+	next: object,
+	nestedKeys: Set<string> | undefined,
+	legacyAppendMode: boolean
+): ObjectDiff | null {
 	if (prev === next) {
 		return null
 	}
@@ -197,26 +207,22 @@ function diffObject(prev: object, next: object, nestedKeys?: Set<string>): Objec
 			result[key] = [ValueOpType.Delete]
 			continue
 		}
-		// if key is in both places, then compare values
-		const prevVal = (prev as any)[key]
-		const nextVal = (next as any)[key]
-		if (!isEqual(prevVal, nextVal)) {
-			if (nestedKeys?.has(key) && prevVal && nextVal) {
-				const diff = diffObject(prevVal, nextVal)
-				if (diff) {
-					if (!result) result = {}
-					result[key] = [ValueOpType.Patch, diff]
-				}
-			} else if (Array.isArray(nextVal) && Array.isArray(prevVal)) {
-				const op = diffArray(prevVal, nextVal)
-				if (op) {
-					if (!result) result = {}
-					result[key] = op
-				}
-			} else {
+		const prevValue = (prev as any)[key]
+		const nextValue = (next as any)[key]
+		if (
+			nestedKeys?.has(key) ||
+			(Array.isArray(prevValue) && Array.isArray(nextValue)) ||
+			(typeof prevValue === 'string' && typeof nextValue === 'string')
+		) {
+			// if key is in both places, then compare values
+			const diff = diffValue(prevValue, nextValue, legacyAppendMode)
+			if (diff) {
 				if (!result) result = {}
-				result[key] = [ValueOpType.Put, nextVal]
+				result[key] = diff
 			}
+		} else if (!isEqual(prevValue, nextValue)) {
+			if (!result) result = {}
+			result[key] = [ValueOpType.Put, nextValue]
 		}
 	}
 	for (const key of Object.keys(next)) {
@@ -229,19 +235,29 @@ function diffObject(prev: object, next: object, nestedKeys?: Set<string>): Objec
 	return result
 }
 
-function diffValue(valueA: unknown, valueB: unknown): ValueOp | null {
+function diffValue(valueA: unknown, valueB: unknown, legacyAppendMode: boolean): ValueOp | null {
 	if (Object.is(valueA, valueB)) return null
 	if (Array.isArray(valueA) && Array.isArray(valueB)) {
-		return diffArray(valueA, valueB)
+		return diffArray(valueA, valueB, legacyAppendMode)
+	} else if (typeof valueA === 'string' && typeof valueB === 'string') {
+		if (!legacyAppendMode && valueB.startsWith(valueA)) {
+			const appendedText = valueB.slice(valueA.length)
+			return [ValueOpType.Append, appendedText, valueA.length]
+		}
+		return [ValueOpType.Put, valueB]
 	} else if (!valueA || !valueB || typeof valueA !== 'object' || typeof valueB !== 'object') {
 		return isEqual(valueA, valueB) ? null : [ValueOpType.Put, valueB]
 	} else {
-		const diff = diffObject(valueA, valueB)
+		const diff = diffObject(valueA, valueB, undefined, legacyAppendMode)
 		return diff ? [ValueOpType.Patch, diff] : null
 	}
 }
 
-function diffArray(prevArray: unknown[], nextArray: unknown[]): PutOp | AppendOp | PatchOp | null {
+function diffArray(
+	prevArray: unknown[],
+	nextArray: unknown[],
+	legacyAppendMode: boolean
+): PutOp | AppendOp | PatchOp | null {
 	if (Object.is(prevArray, nextArray)) return null
 	// if lengths are equal, check for patch operation
 	if (prevArray.length === nextArray.length) {
@@ -267,7 +283,7 @@ function diffArray(prevArray: unknown[], nextArray: unknown[]): PutOp | AppendOp
 			if (!prevItem || !nextItem) {
 				diff[i] = [ValueOpType.Put, nextItem]
 			} else if (typeof prevItem === 'object' && typeof nextItem === 'object') {
-				const op = diffValue(prevItem, nextItem)
+				const op = diffValue(prevItem, nextItem, legacyAppendMode)
 				if (op) {
 					diff[i] = op
 				}
@@ -341,12 +357,19 @@ export function applyObjectDiff<T extends object>(object: T, objectDiff: ObjectD
 				break
 			}
 			case ValueOpType.Append: {
-				const values = op[1]
+				const value = op[1]
 				const offset = op[2]
-				const arr = object[key as keyof T]
-				if (Array.isArray(arr) && arr.length === offset) {
-					set(key, [...arr, ...values])
+				const currentValue = object[key as keyof T]
+				if (Array.isArray(currentValue) && Array.isArray(value) && currentValue.length === offset) {
+					set(key, [...currentValue, ...value])
+				} else if (
+					typeof currentValue === 'string' &&
+					typeof value === 'string' &&
+					currentValue.length === offset
+				) {
+					set(key, currentValue + value)
 				}
+				// If validation fails (type mismatch or length mismatch), silently ignore
 				break
 			}
 			case ValueOpType.Patch: {
diff --git a/packages/sync-core/src/lib/protocol.ts b/packages/sync-core/src/lib/protocol.ts
index 472872ec0edf..f9fc0c03ae96 100644
--- a/packages/sync-core/src/lib/protocol.ts
+++ b/packages/sync-core/src/lib/protocol.ts
@@ -1,7 +1,7 @@
 import { SerializedSchema, UnknownRecord } from '@tldraw/store'
 import { NetworkDiff, ObjectDiff, RecordOpType } from './diff'
 
-const TLSYNC_PROTOCOL_VERSION = 7
+const TLSYNC_PROTOCOL_VERSION = 8
 
 /**
  * Gets the current tldraw sync protocol version number.
diff --git a/packages/sync-core/src/test/FuzzEditor.ts b/packages/sync-core/src/test/FuzzEditor.ts
index c542611ddbc4..c220a66dcff1 100644
--- a/packages/sync-core/src/test/FuzzEditor.ts
+++ b/packages/sync-core/src/test/FuzzEditor.ts
@@ -1,7 +1,6 @@
 import {
 	Editor,
 	PageRecordType,
-	TLArrowBinding,
 	TLPage,
 	TLPageId,
 	TLShape,
@@ -41,8 +40,8 @@ export type Op =
 	  }
 	| {
 			type: 'create-arrow'
-			start: TLArrowBinding | VecModel
-			end: TLArrowBinding | VecModel
+			start: VecModel
+			end: VecModel
 	  }
 	| {
 			type: 'delete-shape'
@@ -315,8 +314,8 @@ export class FuzzEditor extends RandomSource {
 					x: 0,
 					y: 0,
 					props: {
-						start: op.start,
-						end: op.end,
+						start: op.start as any,
+						end: op.end as any,
 					},
 				})
 				break
diff --git a/packages/sync-core/src/test/TLSocketRoom.test.ts b/packages/sync-core/src/test/TLSocketRoom.test.ts
index 1c857752cdd8..8c420bd6c7fc 100644
--- a/packages/sync-core/src/test/TLSocketRoom.test.ts
+++ b/packages/sync-core/src/test/TLSocketRoom.test.ts
@@ -159,7 +159,7 @@ describe(TLSocketRoom, () => {
 			type: 'connect' as const,
 			connectRequestId: 'connect-1',
 			lastServerClock: 0,
-			protocolVersion: 7,
+			protocolVersion: 8,
 			schema: store.schema.serialize(),
 		}
 		room.handleSocketMessage(sessionId1, JSON.stringify(connectRequest1))
@@ -168,7 +168,7 @@ describe(TLSocketRoom, () => {
 			type: 'connect' as const,
 			connectRequestId: 'connect-2',
 			lastServerClock: 0,
-			protocolVersion: 7,
+			protocolVersion: 8,
 			schema: store.schema.serialize(),
 		}
 		room.handleSocketMessage(sessionId2, JSON.stringify(connectRequest2))
diff --git a/packages/sync-core/src/test/TLSyncRoom.test.ts b/packages/sync-core/src/test/TLSyncRoom.test.ts
index 07ea61a8dee7..e5269595a70c 100644
--- a/packages/sync-core/src/test/TLSyncRoom.test.ts
+++ b/packages/sync-core/src/test/TLSyncRoom.test.ts
@@ -169,7 +169,7 @@ describe('TLSyncRoom', () => {
 
 		const room = new TLSyncRoom({
 			schema,
-			snapshot: makeSnapshot([...records, oldArrow], {
+			snapshot: makeSnapshot([...records, oldArrow as any], {
 				schema: oldSerializedSchema,
 			}),
 		})
@@ -313,27 +313,28 @@ describe('TLSyncRoom.updateStore', () => {
 		expect(documentClock).toBeLessThan(room.documentClock)
 
 		expect(socketA.__lastMessage).toMatchInlineSnapshot(`
-		{
-		  "data": [
-		    {
-		      "diff": {
-		        "document:document": [
-		          "patch",
-		          {
-		            "name": [
-		              "put",
-		              "My lovely document",
-		            ],
-		          },
-		        ],
-		      },
-		      "serverClock": 1,
-		      "type": "patch",
-		    },
-		  ],
-		  "type": "data",
-		}
-	`)
+			{
+			  "data": [
+			    {
+			      "diff": {
+			        "document:document": [
+			          "patch",
+			          {
+			            "name": [
+			              "append",
+			              "My lovely document",
+			              0,
+			            ],
+			          },
+			        ],
+			      },
+			      "serverClock": 1,
+			      "type": "patch",
+			    },
+			  ],
+			  "type": "data",
+			}
+		`)
 		expect(socketB.__lastMessage).toEqual(socketA.__lastMessage)
 	})
 
diff --git a/packages/sync-core/src/test/diff.test.ts b/packages/sync-core/src/test/diff.test.ts
index 25828a3734d2..3112527ea2b4 100644
--- a/packages/sync-core/src/test/diff.test.ts
+++ b/packages/sync-core/src/test/diff.test.ts
@@ -408,6 +408,155 @@ describe('array diffing comprehensive', () => {
 	})
 })
 
+describe('string appending', () => {
+	describe('basic string appending', () => {
+		it('should handle string appends', () => {
+			const prev = { text: 'Hello' }
+			const next = { text: 'Hello world' }
+
+			expect(diffRecord(prev, next)).toEqual({
+				text: [ValueOpType.Append, ' world', 5],
+			})
+		})
+
+		it('should handle empty string to non-empty', () => {
+			const prev = { text: '' }
+			const next = { text: 'Hello' }
+
+			expect(diffRecord(prev, next)).toEqual({
+				text: [ValueOpType.Append, 'Hello', 0],
+			})
+		})
+
+		it('should use put when string is replaced (not appended)', () => {
+			const prev = { text: 'Hello' }
+			const next = { text: 'Goodbye' }
+
+			expect(diffRecord(prev, next)).toEqual({
+				text: [ValueOpType.Put, 'Goodbye'],
+			})
+		})
+
+		it('should use put when string is shortened', () => {
+			const prev = { text: 'Hello world' }
+			const next = { text: 'Hello' }
+
+			expect(diffRecord(prev, next)).toEqual({
+				text: [ValueOpType.Put, 'Hello'],
+			})
+		})
+
+		it('should handle identical strings', () => {
+			const prev = { text: 'Hello' }
+			const next = { text: 'Hello' }
+
+			expect(diffRecord(prev, next)).toBeNull()
+		})
+
+		it('should handle large text append', () => {
+			const prev = { text: 'Start' }
+			const longText = ' '.repeat(1000) + 'end'
+			const next = { text: 'Start' + longText }
+
+			const diff = diffRecord(prev, next)
+			expect(diff).toEqual({
+				text: [ValueOpType.Append, longText, 5],
+			})
+		})
+	})
+
+	describe('string appending in nested props', () => {
+		it('should handle string appending in nested props', () => {
+			const prev = { id: 'test:1', props: { label: 'Hello' } }
+			const next = { id: 'test:1', props: { label: 'Hello world' } }
+
+			expect(diffRecord(prev, next)).toEqual({
+				props: [ValueOpType.Patch, { label: [ValueOpType.Append, ' world', 5] }],
+			})
+		})
+
+		it('should combine string appending with other property changes', () => {
+			const prev = { text: 'Hello', x: 100 }
+			const next = { text: 'Hello world', x: 200 }
+
+			expect(diffRecord(prev, next)).toEqual({
+				text: [ValueOpType.Append, ' world', 5],
+				x: [ValueOpType.Put, 200],
+			})
+		})
+	})
+
+	describe('apply string appending', () => {
+		it('should apply append operations correctly', () => {
+			const obj = { text: 'Hello' }
+			const diff: ObjectDiff = {
+				text: [ValueOpType.Append, ' world', 5],
+			}
+
+			const result = applyObjectDiff(obj, diff)
+			expect(result).toEqual({ text: 'Hello world' })
+			expect(result).not.toBe(obj)
+		})
+
+		it('should handle append from empty string', () => {
+			const obj = { text: '' }
+			const diff: ObjectDiff = {
+				text: [ValueOpType.Append, 'Hello', 0],
+			}
+
+			const result = applyObjectDiff(obj, diff)
+			expect(result).toEqual({ text: 'Hello' })
+		})
+
+		it('should ignore append operation with wrong offset', () => {
+			const obj = { text: 'Hello' }
+			const diff: ObjectDiff = {
+				text: [ValueOpType.Append, ' world', 10], // Wrong offset
+			}
+
+			const result = applyObjectDiff(obj, diff)
+			expect(result).toBe(obj) // No change, same reference
+		})
+
+		it('should ignore append operation on non-string value', () => {
+			const obj = { text: 123 }
+			const diff: ObjectDiff = {
+				text: [ValueOpType.Append, ' world', 3],
+			}
+
+			const result = applyObjectDiff(obj, diff)
+			expect(result).toBe(obj) // No change, same reference
+		})
+
+		it('should handle multiple stream operations', () => {
+			const obj = { a: 'Hello', b: 'Foo' }
+			const diff: ObjectDiff = {
+				a: [ValueOpType.Append, ' world', 5],
+				b: [ValueOpType.Append, 'bar', 3],
+			}
+
+			const result = applyObjectDiff(obj, diff)
+			expect(result).toEqual({ a: 'Hello world', b: 'Foobar' })
+		})
+
+		it('should integrate with network diff workflow', () => {
+			const prev = { id: 'shape:1', type: 'text', text: 'Hello' }
+			const next = { id: 'shape:1', type: 'text', text: 'Hello world' }
+
+			const recordsDiff = {
+				added: {},
+				updated: { 'shape:1': [prev, next] },
+				removed: {},
+			}
+
+			const networkDiff = getNetworkDiff(recordsDiff)
+			expect(networkDiff).toEqual({
+				'shape:1': [RecordOpType.Patch, { text: [ValueOpType.Append, ' world', 5] }],
+			})
+		})
+	})
+})
+
 describe('applyObjectDiff comprehensive', () => {
 	describe('basic operations', () => {
 		it('should create new object when changes are needed', () => {
@@ -582,3 +731,54 @@ describe('complex scenarios', () => {
 		})
 	})
 })
+
+describe('nested key primitive value bug', () => {
+	it('should handle string changes in nested keys', () => {
+		// This tests the bug where nested keys (like 'props') with primitive values
+		// are silently dropped instead of being diffed properly
+		const prev = { id: 'shape:1', props: 'hello' }
+		const next = { id: 'shape:1', props: 'world' }
+
+		const diff = diffRecord(prev, next)
+
+		// The diff should contain a 'put' operation for props
+		expect(diff).toEqual({
+			props: [ValueOpType.Put, 'world'],
+		})
+	})
+
+	it('should handle string appending in nested keys', () => {
+		const prev = { id: 'shape:1', props: 'hello' }
+		const next = { id: 'shape:1', props: 'hello world' }
+
+		const diff = diffRecord(prev, next)
+
+		// The diff should contain an 'append' operation for props
+		expect(diff).toEqual({
+			props: [ValueOpType.Append, ' world', 5],
+		})
+	})
+
+	it('should handle number changes in nested keys', () => {
+		const prev = { id: 'shape:1', props: 42 }
+		const next = { id: 'shape:1', props: 100 }
+
+		const diff = diffRecord(prev, next)
+
+		expect(diff).toEqual({
+			props: [ValueOpType.Put, 100],
+		})
+	})
+
+	it('should still handle object changes in nested keys normally', () => {
+		const prev = { id: 'shape:1', props: { color: 'red' } }
+		const next = { id: 'shape:1', props: { color: 'blue' } }
+
+		const diff = diffRecord(prev, next)
+
+		// Objects in nested keys should still use patch
+		expect(diff).toEqual({
+			props: [ValueOpType.Patch, { color: [ValueOpType.Put, 'blue'] }],
+		})
+	})
+})
diff --git a/packages/sync-core/src/test/syncFuzz.test.ts b/packages/sync-core/src/test/syncFuzz.test.ts
index eecfcd2a5b4f..d234702e3b99 100644
--- a/packages/sync-core/src/test/syncFuzz.test.ts
+++ b/packages/sync-core/src/test/syncFuzz.test.ts
@@ -1,7 +1,5 @@
 import {
 	Editor,
-	TLArrowBinding,
-	TLArrowShape,
 	TLRecord,
 	TLStore,
 	computed,
@@ -111,9 +109,9 @@ let totalNumShapes = 0
 let totalNumPages = 0
 
 function arrowsAreSound(editor: Editor) {
-	const arrows = editor.getCurrentPageShapes().filter((s): s is TLArrowShape => s.type === 'arrow')
+	const arrows = editor.getCurrentPageShapes().filter((s) => s.type === 'arrow')
 	for (const arrow of arrows) {
-		const bindings = editor.getBindingsFromShape<TLArrowBinding>(arrow, 'arrow')
+		const bindings = editor.getBindingsFromShape(arrow, 'arrow')
 		const terminalsSeen = new Set()
 		for (const binding of bindings) {
 			if (terminalsSeen.has(binding.props.terminal)) {
diff --git a/packages/sync/package.json b/packages/sync/package.json
index d5823c887846..91f7d6ee9217 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/sync",
 	"description": "tldraw infinite canvas SDK (multiplayer sync react bindings).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw GB Ltd.",
 		"email": "hello@tldraw.com"
diff --git a/packages/tldraw/api-report.api.md b/packages/tldraw/api-report.api.md
index 9b6b407cf061..6a5930f97956 100644
--- a/packages/tldraw/api-report.api.md
+++ b/packages/tldraw/api-report.api.md
@@ -21,6 +21,7 @@ import { Editor } from '@tldraw/editor';
 import { ElbowArrowSnap } from '@tldraw/editor';
 import { Extension } from '@tiptap/core';
 import { Extensions } from '@tiptap/core';
+import { ExtractShapeByProps } from '@tldraw/editor';
 import { ForwardRefExoticComponent } from 'react';
 import { Geometry2d } from '@tldraw/editor';
 import { Geometry2dFilters } from '@tldraw/editor';
@@ -1529,7 +1530,7 @@ export class FrameShapeTool extends BaseBoxShapeTool {
     // (undocumented)
     onCreate(shape: null | TLShape): void;
     // (undocumented)
-    shapeType: string;
+    shapeType: "frame";
 }
 
 // @public (undocumented)
@@ -2488,7 +2489,9 @@ export interface PlainTextLabelProps {
     // (undocumented)
     textWidth?: number;
     // (undocumented)
-    type: string;
+    type: ExtractShapeByProps<{
+        text: string;
+    }>['type'];
     // (undocumented)
     verticalAlign: TLDefaultVerticalAlignStyle;
     // (undocumented)
@@ -2606,7 +2609,9 @@ export interface RichTextLabelProps {
     // (undocumented)
     textWidth?: number;
     // (undocumented)
-    type: string;
+    type: ExtractShapeByProps<{
+        richText: TLRichText;
+    }>['type'];
     // (undocumented)
     verticalAlign: TLDefaultVerticalAlignStyle;
     // (undocumented)
@@ -3646,6 +3651,8 @@ export interface TLUiButtonProps extends React_2.HTMLAttributes<HTMLButtonElemen
     // (undocumented)
     disabled?: boolean;
     // (undocumented)
+    htmlButtonType?: 'button' | 'reset' | 'submit';
+    // (undocumented)
     isActive?: boolean;
     // (undocumented)
     type: 'danger' | 'help' | 'icon' | 'low' | 'menu' | 'normal' | 'primary' | 'tool';
@@ -4191,7 +4198,7 @@ export interface TLUiEventMap {
 }
 
 // @public (undocumented)
-export type TLUiEventSource = 'actions-menu' | 'context-menu' | 'debug-panel' | 'dialog' | 'document-name' | 'export-menu' | 'help-menu' | 'helper-buttons' | 'image-toolbar' | 'kbd' | 'main-menu' | 'menu' | 'navigation-zone' | 'page-menu' | 'people-menu' | 'quick-actions' | 'rich-text-menu' | 'share-menu' | 'style-panel' | 'toolbar' | 'unknown' | 'video-toolbar' | 'zoom-menu';
+export type TLUiEventSource = 'actions-menu' | 'context-menu' | 'debug-panel' | 'dialog' | 'document-name' | 'export-menu' | 'fairy-panel' | 'help-menu' | 'helper-buttons' | 'image-toolbar' | 'kbd' | 'main-menu' | 'menu' | 'navigation-zone' | 'page-menu' | 'people-menu' | 'quick-actions' | 'rich-text-menu' | 'share-menu' | 'style-panel' | 'toolbar' | 'unknown' | 'video-toolbar' | 'zoom-menu';
 
 // @public (undocumented)
 export interface TLUiHelperButtonsProps {
@@ -4676,7 +4683,7 @@ export interface TLUiTranslation {
 export type TLUiTranslationContextType = TLUiTranslation;
 
 // @public (undocumented)
-export type TLUiTranslationKey = 'a11y.adjust-shape-styles' | 'a11y.enlarge-shape' | 'a11y.enter-leave-container' | 'a11y.move-shape-faster' | 'a11y.move-shape' | 'a11y.multiple-shapes' | 'a11y.open-context-menu' | 'a11y.open-keyboard-shortcuts' | 'a11y.pan-camera' | 'a11y.repeat-shape' | 'a11y.rotate-shape-ccw-fine' | 'a11y.rotate-shape-ccw' | 'a11y.rotate-shape-cw-fine' | 'a11y.rotate-shape-cw' | 'a11y.select-shape-direction' | 'a11y.select-shape' | 'a11y.shape-image' | 'a11y.shape-index' | 'a11y.shape-video' | 'a11y.shrink-shape' | 'a11y.skip-to-main-content' | 'a11y.status' | 'action.align-bottom' | 'action.align-center-horizontal.short' | 'action.align-center-horizontal' | 'action.align-center-vertical.short' | 'action.align-center-vertical' | 'action.align-left' | 'action.align-right' | 'action.align-top' | 'action.back-to-content' | 'action.bring-forward' | 'action.bring-to-front' | 'action.convert-to-bookmark' | 'action.convert-to-embed' | 'action.copy-as-png.short' | 'action.copy-as-png' | 'action.copy-as-svg.short' | 'action.copy-as-svg' | 'action.copy' | 'action.cut' | 'action.delete' | 'action.distribute-horizontal.short' | 'action.distribute-horizontal' | 'action.distribute-vertical.short' | 'action.distribute-vertical' | 'action.download-original' | 'action.duplicate' | 'action.edit-link' | 'action.enhanced-a11y-mode.menu' | 'action.enhanced-a11y-mode' | 'action.exit-pen-mode' | 'action.export-all-as-png.short' | 'action.export-all-as-png' | 'action.export-all-as-svg.short' | 'action.export-all-as-svg' | 'action.export-as-png.short' | 'action.export-as-png' | 'action.export-as-svg.short' | 'action.export-as-svg' | 'action.fit-frame-to-content' | 'action.flatten-to-image' | 'action.flip-horizontal.short' | 'action.flip-horizontal' | 'action.flip-vertical.short' | 'action.flip-vertical' | 'action.fork-project-on-tldraw' | 'action.fork-project' | 'action.group' | 'action.insert-embed' | 'action.insert-media' | 'action.leave-shared-project' | 'action.new-project' | 'action.new-shared-project' | 'action.open-cursor-chat' | 'action.open-embed-link' | 'action.open-file' | 'action.open-kbd-shortcuts' | 'action.pack' | 'action.paste-error-description' | 'action.paste-error-title' | 'action.paste' | 'action.print' | 'action.redo' | 'action.remove-frame' | 'action.rename' | 'action.rotate-ccw' | 'action.rotate-cw' | 'action.save-copy' | 'action.select-all' | 'action.select-none' | 'action.send-backward' | 'action.send-to-back' | 'action.share-project' | 'action.stack-horizontal.short' | 'action.stack-horizontal' | 'action.stack-vertical.short' | 'action.stack-vertical' | 'action.stop-following' | 'action.stretch-horizontal.short' | 'action.stretch-horizontal' | 'action.stretch-vertical.short' | 'action.stretch-vertical' | 'action.toggle-auto-none' | 'action.toggle-auto-pan' | 'action.toggle-auto-size' | 'action.toggle-auto-zoom' | 'action.toggle-dark-mode.menu' | 'action.toggle-dark-mode' | 'action.toggle-debug-mode.menu' | 'action.toggle-debug-mode' | 'action.toggle-dynamic-size-mode.menu' | 'action.toggle-dynamic-size-mode' | 'action.toggle-edge-scrolling.menu' | 'action.toggle-edge-scrolling' | 'action.toggle-focus-mode.menu' | 'action.toggle-focus-mode' | 'action.toggle-grid.menu' | 'action.toggle-grid' | 'action.toggle-keyboard-shortcuts.menu' | 'action.toggle-keyboard-shortcuts' | 'action.toggle-lock' | 'action.toggle-mouse' | 'action.toggle-paste-at-cursor.menu' | 'action.toggle-paste-at-cursor' | 'action.toggle-reduce-motion.menu' | 'action.toggle-reduce-motion' | 'action.toggle-snap-mode.menu' | 'action.toggle-snap-mode' | 'action.toggle-tool-lock.menu' | 'action.toggle-tool-lock' | 'action.toggle-trackpad' | 'action.toggle-transparent.context-menu' | 'action.toggle-transparent.menu' | 'action.toggle-transparent' | 'action.toggle-wrap-mode.menu' | 'action.toggle-wrap-mode' | 'action.undo' | 'action.ungroup' | 'action.unlock-all' | 'action.zoom-in' | 'action.zoom-out' | 'action.zoom-to-100' | 'action.zoom-to-fit' | 'action.zoom-to-selection' | 'actions-menu.title' | 'align-style.end' | 'align-style.justify' | 'align-style.middle' | 'align-style.start' | 'app.loading' | 'arrow-kind-style.arc' | 'arrow-kind-style.elbow' | 'arrowheadEnd-style.arrow' | 'arrowheadEnd-style.bar' | 'arrowheadEnd-style.diamond' | 'arrowheadEnd-style.dot' | 'arrowheadEnd-style.inverted' | 'arrowheadEnd-style.none' | 'arrowheadEnd-style.pipe' | 'arrowheadEnd-style.square' | 'arrowheadEnd-style.triangle' | 'arrowheadStart-style.arrow' | 'arrowheadStart-style.bar' | 'arrowheadStart-style.diamond' | 'arrowheadStart-style.dot' | 'arrowheadStart-style.inverted' | 'arrowheadStart-style.none' | 'arrowheadStart-style.pipe' | 'arrowheadStart-style.square' | 'arrowheadStart-style.triangle' | 'assets.files.amount-too-many' | 'assets.files.maximum-size' | 'assets.files.size-too-big' | 'assets.files.type-not-allowed' | 'assets.files.upload-failed' | 'assets.url.failed' | 'color-style.black' | 'color-style.blue' | 'color-style.green' | 'color-style.grey' | 'color-style.light-blue' | 'color-style.light-green' | 'color-style.light-red' | 'color-style.light-violet' | 'color-style.orange' | 'color-style.red' | 'color-style.violet' | 'color-style.white' | 'color-style.yellow' | 'context-menu.arrange' | 'context-menu.copy-as' | 'context-menu.edit' | 'context-menu.export-all-as' | 'context-menu.export-as' | 'context-menu.move-to-page' | 'context-menu.reorder' | 'context-menu.title' | 'context.pages.new-page' | 'cursor-chat.type-to-chat' | 'dash-style.dashed' | 'dash-style.dotted' | 'dash-style.draw' | 'dash-style.solid' | 'document-name-menu.copy-link' | 'document.default-name' | 'edit-link-dialog.cancel' | 'edit-link-dialog.clear' | 'edit-link-dialog.detail' | 'edit-link-dialog.external-link' | 'edit-link-dialog.invalid-url' | 'edit-link-dialog.save' | 'edit-link-dialog.title' | 'edit-link-dialog.url' | 'embed-dialog.back' | 'embed-dialog.cancel' | 'embed-dialog.create' | 'embed-dialog.instruction' | 'embed-dialog.invalid-url' | 'embed-dialog.title' | 'embed-dialog.url' | 'file-system.confirm-clear.cancel' | 'file-system.confirm-clear.continue' | 'file-system.confirm-clear.description' | 'file-system.confirm-clear.dont-show-again' | 'file-system.confirm-clear.title' | 'file-system.confirm-open.cancel' | 'file-system.confirm-open.description' | 'file-system.confirm-open.dont-show-again' | 'file-system.confirm-open.open' | 'file-system.confirm-open.title' | 'file-system.file-open-error.file-format-version-too-new' | 'file-system.file-open-error.generic-corrupted-file' | 'file-system.file-open-error.not-a-tldraw-file' | 'file-system.file-open-error.title' | 'file-system.shared-document-file-open-error.description' | 'file-system.shared-document-file-open-error.title' | 'fill-style.fill' | 'fill-style.none' | 'fill-style.pattern' | 'fill-style.semi' | 'fill-style.solid' | 'focus-mode.toggle-focus-mode' | 'font-style.draw' | 'font-style.mono' | 'font-style.sans' | 'font-style.serif' | 'geo-style.arrow-down' | 'geo-style.arrow-left' | 'geo-style.arrow-right' | 'geo-style.arrow-up' | 'geo-style.check-box' | 'geo-style.cloud' | 'geo-style.diamond' | 'geo-style.ellipse' | 'geo-style.heart' | 'geo-style.hexagon' | 'geo-style.octagon' | 'geo-style.oval' | 'geo-style.pentagon' | 'geo-style.rectangle' | 'geo-style.rhombus-2' | 'geo-style.rhombus' | 'geo-style.star' | 'geo-style.trapezoid' | 'geo-style.triangle' | 'geo-style.x-box' | 'handle.crop.bottom-left' | 'handle.crop.bottom-right' | 'handle.crop.bottom' | 'handle.crop.left' | 'handle.crop.right' | 'handle.crop.top-left' | 'handle.crop.top-right' | 'handle.crop.top' | 'handle.resize-bottom-left' | 'handle.resize-bottom-right' | 'handle.resize-bottom' | 'handle.resize-left' | 'handle.resize-right' | 'handle.resize-top-left' | 'handle.resize-top-right' | 'handle.resize-top' | 'handle.rotate.bottom_left_rotate' | 'handle.rotate.bottom_right_rotate' | 'handle.rotate.mobile_rotate' | 'handle.rotate.top_left_rotate' | 'handle.rotate.top_right_rotate' | 'help-menu.about' | 'help-menu.discord' | 'help-menu.github' | 'help-menu.import-tldr-file' | 'help-menu.keyboard-shortcuts' | 'help-menu.privacy' | 'help-menu.terms' | 'help-menu.title' | 'help-menu.twitter' | 'menu.accessibility' | 'menu.copy-as' | 'menu.edit' | 'menu.export-as' | 'menu.file' | 'menu.input-mode' | 'menu.language' | 'menu.preferences' | 'menu.theme' | 'menu.title' | 'menu.view' | 'navigation-zone.minimap' | 'navigation-zone.title' | 'navigation-zone.toggle-minimap' | 'navigation-zone.zoom' | 'opacity-style.0.1' | 'opacity-style.0.25' | 'opacity-style.0.5' | 'opacity-style.0.75' | 'opacity-style.1' | 'page-menu.create-new-page' | 'page-menu.edit-done' | 'page-menu.edit-start' | 'page-menu.go-to-page' | 'page-menu.max-page-count-reached' | 'page-menu.new-page-initial-name' | 'page-menu.submenu.delete' | 'page-menu.submenu.duplicate-page' | 'page-menu.submenu.move-down' | 'page-menu.submenu.move-up' | 'page-menu.submenu.rename' | 'page-menu.submenu.title' | 'page-menu.title' | 'people-menu.anonymous-user' | 'people-menu.avatar-color' | 'people-menu.change-color' | 'people-menu.change-name' | 'people-menu.follow' | 'people-menu.following' | 'people-menu.invite' | 'people-menu.leading' | 'people-menu.title' | 'people-menu.user' | 'share-menu.copied' | 'share-menu.copy-link-note' | 'share-menu.copy-link' | 'share-menu.copy-readonly-link-note' | 'share-menu.copy-readonly-link' | 'share-menu.create-snapshot-link' | 'share-menu.creating-project' | 'share-menu.fork-note' | 'share-menu.offline-note' | 'share-menu.project-too-large' | 'share-menu.save-note' | 'share-menu.share-project' | 'share-menu.snapshot-link-note' | 'share-menu.title' | 'share-menu.upload-failed' | 'sharing.confirm-leave.cancel' | 'sharing.confirm-leave.description' | 'sharing.confirm-leave.dont-show-again' | 'sharing.confirm-leave.leave' | 'sharing.confirm-leave.title' | 'shortcuts-dialog.a11y' | 'shortcuts-dialog.collaboration' | 'shortcuts-dialog.edit' | 'shortcuts-dialog.file' | 'shortcuts-dialog.preferences' | 'shortcuts-dialog.text-formatting' | 'shortcuts-dialog.title' | 'shortcuts-dialog.tools' | 'shortcuts-dialog.transform' | 'shortcuts-dialog.view' | 'size-style.l' | 'size-style.m' | 'size-style.s' | 'size-style.xl' | 'spline-style.cubic' | 'spline-style.line' | 'status.offline' | 'style-panel.align' | 'style-panel.arrow-kind' | 'style-panel.arrowhead-end' | 'style-panel.arrowhead-start' | 'style-panel.arrowheads' | 'style-panel.color' | 'style-panel.dash' | 'style-panel.fill' | 'style-panel.font' | 'style-panel.geo' | 'style-panel.label-align' | 'style-panel.mixed' | 'style-panel.opacity' | 'style-panel.position' | 'style-panel.selected' | 'style-panel.size' | 'style-panel.spline' | 'style-panel.title' | 'style-panel.vertical-align' | 'theme.dark' | 'theme.light' | 'theme.system' | 'toast.close' | 'toast.error.copy-fail.desc' | 'toast.error.copy-fail.title' | 'toast.error.export-fail.desc' | 'toast.error.export-fail.title' | 'toast.error' | 'toast.info' | 'toast.success' | 'toast.warning' | 'tool-panel.more' | 'tool-panel.title' | 'tool.arrow-down' | 'tool.arrow-left' | 'tool.arrow-right' | 'tool.arrow-up' | 'tool.arrow' | 'tool.aspect-ratio.circle' | 'tool.aspect-ratio.landscape' | 'tool.aspect-ratio.original' | 'tool.aspect-ratio.portrait' | 'tool.aspect-ratio.square' | 'tool.aspect-ratio.wide' | 'tool.aspect-ratio' | 'tool.bookmark' | 'tool.check-box' | 'tool.cloud' | 'tool.diamond' | 'tool.draw' | 'tool.ellipse' | 'tool.embed' | 'tool.eraser' | 'tool.flip-horz' | 'tool.flip-vert' | 'tool.frame' | 'tool.hand' | 'tool.heart' | 'tool.hexagon' | 'tool.highlight' | 'tool.image-crop-confirm' | 'tool.image-crop' | 'tool.image-toolbar-title' | 'tool.image-zoom' | 'tool.laser' | 'tool.line' | 'tool.media-alt-text-confirm' | 'tool.media-alt-text-desc' | 'tool.media-alt-text' | 'tool.media' | 'tool.note' | 'tool.octagon' | 'tool.oval' | 'tool.pentagon' | 'tool.pointer-down' | 'tool.rectangle' | 'tool.replace-media' | 'tool.rhombus' | 'tool.rich-text-bold' | 'tool.rich-text-bulletList' | 'tool.rich-text-code' | 'tool.rich-text-header' | 'tool.rich-text-highlight' | 'tool.rich-text-italic' | 'tool.rich-text-link-remove' | 'tool.rich-text-link-visit' | 'tool.rich-text-link' | 'tool.rich-text-orderedList' | 'tool.rich-text-strikethrough' | 'tool.rich-text-toolbar-title' | 'tool.rotate-cw' | 'tool.select' | 'tool.star' | 'tool.text' | 'tool.trapezoid' | 'tool.triangle' | 'tool.x-box' | 'ui.checked' | 'ui.close' | 'ui.unchecked' | 'verticalAlign-style.end' | 'verticalAlign-style.middle' | 'verticalAlign-style.start' | 'vscode.file-open.backup-failed' | 'vscode.file-open.backup-saved' | 'vscode.file-open.backup' | 'vscode.file-open.desc' | 'vscode.file-open.dont-show-again' | 'vscode.file-open.open';
+export type TLUiTranslationKey = 'a11y.adjust-shape-styles' | 'a11y.enlarge-shape' | 'a11y.enter-leave-container' | 'a11y.move-shape-faster' | 'a11y.move-shape' | 'a11y.multiple-shapes' | 'a11y.open-context-menu' | 'a11y.open-keyboard-shortcuts' | 'a11y.pan-camera' | 'a11y.repeat-shape' | 'a11y.rotate-shape-ccw-fine' | 'a11y.rotate-shape-ccw' | 'a11y.rotate-shape-cw-fine' | 'a11y.rotate-shape-cw' | 'a11y.select-shape-direction' | 'a11y.select-shape' | 'a11y.shape-image' | 'a11y.shape-index' | 'a11y.shape-video' | 'a11y.shrink-shape' | 'a11y.skip-to-main-content' | 'a11y.status' | 'action.align-bottom' | 'action.align-center-horizontal.short' | 'action.align-center-horizontal' | 'action.align-center-vertical.short' | 'action.align-center-vertical' | 'action.align-left' | 'action.align-right' | 'action.align-top' | 'action.back-to-content' | 'action.bring-forward' | 'action.bring-to-front' | 'action.convert-to-bookmark' | 'action.convert-to-embed' | 'action.copy-as-png.short' | 'action.copy-as-png' | 'action.copy-as-svg.short' | 'action.copy-as-svg' | 'action.copy' | 'action.cut' | 'action.delete' | 'action.distribute-horizontal.short' | 'action.distribute-horizontal' | 'action.distribute-vertical.short' | 'action.distribute-vertical' | 'action.download-original' | 'action.duplicate' | 'action.edit-link' | 'action.enhanced-a11y-mode.menu' | 'action.enhanced-a11y-mode' | 'action.exit-pen-mode' | 'action.export-all-as-png.short' | 'action.export-all-as-png' | 'action.export-all-as-svg.short' | 'action.export-all-as-svg' | 'action.export-as-png.short' | 'action.export-as-png' | 'action.export-as-svg.short' | 'action.export-as-svg' | 'action.fit-frame-to-content' | 'action.flatten-to-image' | 'action.flip-horizontal.short' | 'action.flip-horizontal' | 'action.flip-vertical.short' | 'action.flip-vertical' | 'action.fork-project-on-tldraw' | 'action.fork-project' | 'action.group' | 'action.insert-embed' | 'action.insert-media' | 'action.leave-shared-project' | 'action.new-project' | 'action.new-shared-project' | 'action.open-cursor-chat' | 'action.open-embed-link' | 'action.open-file' | 'action.open-kbd-shortcuts' | 'action.pack' | 'action.paste-error-description' | 'action.paste-error-title' | 'action.paste' | 'action.print' | 'action.redo' | 'action.remove-frame' | 'action.rename' | 'action.rotate-ccw' | 'action.rotate-cw' | 'action.save-copy' | 'action.select-all' | 'action.select-none' | 'action.send-backward' | 'action.send-to-back' | 'action.share-project' | 'action.stack-horizontal.short' | 'action.stack-horizontal' | 'action.stack-vertical.short' | 'action.stack-vertical' | 'action.stop-following' | 'action.stretch-horizontal.short' | 'action.stretch-horizontal' | 'action.stretch-vertical.short' | 'action.stretch-vertical' | 'action.toggle-auto-none' | 'action.toggle-auto-pan' | 'action.toggle-auto-size' | 'action.toggle-auto-zoom' | 'action.toggle-dark-mode.menu' | 'action.toggle-dark-mode' | 'action.toggle-debug-mode.menu' | 'action.toggle-debug-mode' | 'action.toggle-dynamic-size-mode.menu' | 'action.toggle-dynamic-size-mode' | 'action.toggle-edge-scrolling.menu' | 'action.toggle-edge-scrolling' | 'action.toggle-focus-mode.menu' | 'action.toggle-focus-mode' | 'action.toggle-grid.menu' | 'action.toggle-grid' | 'action.toggle-keyboard-shortcuts.menu' | 'action.toggle-keyboard-shortcuts' | 'action.toggle-lock' | 'action.toggle-mouse' | 'action.toggle-paste-at-cursor.menu' | 'action.toggle-paste-at-cursor' | 'action.toggle-reduce-motion.menu' | 'action.toggle-reduce-motion' | 'action.toggle-snap-mode.menu' | 'action.toggle-snap-mode' | 'action.toggle-tool-lock.menu' | 'action.toggle-tool-lock' | 'action.toggle-trackpad' | 'action.toggle-transparent.context-menu' | 'action.toggle-transparent.menu' | 'action.toggle-transparent' | 'action.toggle-wrap-mode.menu' | 'action.toggle-wrap-mode' | 'action.undo' | 'action.ungroup' | 'action.unlock-all' | 'action.zoom-in' | 'action.zoom-out' | 'action.zoom-to-100' | 'action.zoom-to-fit' | 'action.zoom-to-selection' | 'actions-menu.title' | 'align-style.end' | 'align-style.justify' | 'align-style.middle' | 'align-style.start' | 'app.loading' | 'arrow-kind-style.arc' | 'arrow-kind-style.elbow' | 'arrowheadEnd-style.arrow' | 'arrowheadEnd-style.bar' | 'arrowheadEnd-style.diamond' | 'arrowheadEnd-style.dot' | 'arrowheadEnd-style.inverted' | 'arrowheadEnd-style.none' | 'arrowheadEnd-style.pipe' | 'arrowheadEnd-style.square' | 'arrowheadEnd-style.triangle' | 'arrowheadStart-style.arrow' | 'arrowheadStart-style.bar' | 'arrowheadStart-style.diamond' | 'arrowheadStart-style.dot' | 'arrowheadStart-style.inverted' | 'arrowheadStart-style.none' | 'arrowheadStart-style.pipe' | 'arrowheadStart-style.square' | 'arrowheadStart-style.triangle' | 'assets.files.amount-too-many' | 'assets.files.maximum-size' | 'assets.files.size-too-big' | 'assets.files.type-not-allowed' | 'assets.files.upload-failed' | 'assets.url.failed' | 'color-style.black' | 'color-style.blue' | 'color-style.green' | 'color-style.grey' | 'color-style.light-blue' | 'color-style.light-green' | 'color-style.light-red' | 'color-style.light-violet' | 'color-style.orange' | 'color-style.red' | 'color-style.violet' | 'color-style.white' | 'color-style.yellow' | 'context-menu.arrange' | 'context-menu.copy-as' | 'context-menu.edit' | 'context-menu.export-all-as' | 'context-menu.export-as' | 'context-menu.move-to-page' | 'context-menu.reorder' | 'context-menu.title' | 'context.pages.new-page' | 'cursor-chat.type-to-chat' | 'dash-style.dashed' | 'dash-style.dotted' | 'dash-style.draw' | 'dash-style.solid' | 'document-name-menu.copy-link' | 'document.default-name' | 'edit-link-dialog.cancel' | 'edit-link-dialog.clear' | 'edit-link-dialog.detail' | 'edit-link-dialog.external-link' | 'edit-link-dialog.invalid-url' | 'edit-link-dialog.save' | 'edit-link-dialog.title' | 'edit-link-dialog.url' | 'embed-dialog.back' | 'embed-dialog.cancel' | 'embed-dialog.create' | 'embed-dialog.instruction' | 'embed-dialog.invalid-url' | 'embed-dialog.title' | 'embed-dialog.url' | 'file-system.confirm-clear.cancel' | 'file-system.confirm-clear.continue' | 'file-system.confirm-clear.description' | 'file-system.confirm-clear.dont-show-again' | 'file-system.confirm-clear.title' | 'file-system.confirm-open.cancel' | 'file-system.confirm-open.description' | 'file-system.confirm-open.dont-show-again' | 'file-system.confirm-open.open' | 'file-system.confirm-open.title' | 'file-system.file-open-error.file-format-version-too-new' | 'file-system.file-open-error.generic-corrupted-file' | 'file-system.file-open-error.not-a-tldraw-file' | 'file-system.file-open-error.title' | 'file-system.shared-document-file-open-error.description' | 'file-system.shared-document-file-open-error.title' | 'fill-style.fill' | 'fill-style.lined-fill' | 'fill-style.none' | 'fill-style.pattern' | 'fill-style.semi' | 'fill-style.solid' | 'focus-mode.toggle-focus-mode' | 'font-style.draw' | 'font-style.mono' | 'font-style.sans' | 'font-style.serif' | 'geo-style.arrow-down' | 'geo-style.arrow-left' | 'geo-style.arrow-right' | 'geo-style.arrow-up' | 'geo-style.check-box' | 'geo-style.cloud' | 'geo-style.diamond' | 'geo-style.ellipse' | 'geo-style.heart' | 'geo-style.hexagon' | 'geo-style.octagon' | 'geo-style.oval' | 'geo-style.pentagon' | 'geo-style.rectangle' | 'geo-style.rhombus-2' | 'geo-style.rhombus' | 'geo-style.star' | 'geo-style.trapezoid' | 'geo-style.triangle' | 'geo-style.x-box' | 'handle.crop.bottom-left' | 'handle.crop.bottom-right' | 'handle.crop.bottom' | 'handle.crop.left' | 'handle.crop.right' | 'handle.crop.top-left' | 'handle.crop.top-right' | 'handle.crop.top' | 'handle.resize-bottom-left' | 'handle.resize-bottom-right' | 'handle.resize-bottom' | 'handle.resize-left' | 'handle.resize-right' | 'handle.resize-top-left' | 'handle.resize-top-right' | 'handle.resize-top' | 'handle.rotate.bottom_left_rotate' | 'handle.rotate.bottom_right_rotate' | 'handle.rotate.mobile_rotate' | 'handle.rotate.top_left_rotate' | 'handle.rotate.top_right_rotate' | 'help-menu.about' | 'help-menu.discord' | 'help-menu.github' | 'help-menu.import-tldr-file' | 'help-menu.keyboard-shortcuts' | 'help-menu.privacy' | 'help-menu.terms' | 'help-menu.title' | 'help-menu.twitter' | 'menu.accessibility' | 'menu.copy-as' | 'menu.edit' | 'menu.export-as' | 'menu.file' | 'menu.input-mode' | 'menu.language' | 'menu.preferences' | 'menu.theme' | 'menu.title' | 'menu.view' | 'navigation-zone.minimap' | 'navigation-zone.title' | 'navigation-zone.toggle-minimap' | 'navigation-zone.zoom' | 'opacity-style.0.1' | 'opacity-style.0.25' | 'opacity-style.0.5' | 'opacity-style.0.75' | 'opacity-style.1' | 'page-menu.create-new-page' | 'page-menu.edit-done' | 'page-menu.edit-start' | 'page-menu.go-to-page' | 'page-menu.max-page-count-reached' | 'page-menu.new-page-initial-name' | 'page-menu.submenu.delete' | 'page-menu.submenu.duplicate-page' | 'page-menu.submenu.move-down' | 'page-menu.submenu.move-up' | 'page-menu.submenu.rename' | 'page-menu.submenu.title' | 'page-menu.title' | 'people-menu.anonymous-user' | 'people-menu.avatar-color' | 'people-menu.change-color' | 'people-menu.change-name' | 'people-menu.follow' | 'people-menu.following' | 'people-menu.invite' | 'people-menu.leading' | 'people-menu.title' | 'people-menu.user' | 'share-menu.copied' | 'share-menu.copy-link-note' | 'share-menu.copy-link' | 'share-menu.copy-readonly-link-note' | 'share-menu.copy-readonly-link' | 'share-menu.create-snapshot-link' | 'share-menu.creating-project' | 'share-menu.fork-note' | 'share-menu.offline-note' | 'share-menu.project-too-large' | 'share-menu.save-note' | 'share-menu.share-project' | 'share-menu.snapshot-link-note' | 'share-menu.title' | 'share-menu.upload-failed' | 'sharing.confirm-leave.cancel' | 'sharing.confirm-leave.description' | 'sharing.confirm-leave.dont-show-again' | 'sharing.confirm-leave.leave' | 'sharing.confirm-leave.title' | 'shortcuts-dialog.a11y' | 'shortcuts-dialog.collaboration' | 'shortcuts-dialog.edit' | 'shortcuts-dialog.file' | 'shortcuts-dialog.preferences' | 'shortcuts-dialog.text-formatting' | 'shortcuts-dialog.title' | 'shortcuts-dialog.tools' | 'shortcuts-dialog.transform' | 'shortcuts-dialog.view' | 'size-style.l' | 'size-style.m' | 'size-style.s' | 'size-style.xl' | 'spline-style.cubic' | 'spline-style.line' | 'status.offline' | 'style-panel.align' | 'style-panel.arrow-kind' | 'style-panel.arrowhead-end' | 'style-panel.arrowhead-start' | 'style-panel.arrowheads' | 'style-panel.color' | 'style-panel.dash' | 'style-panel.fill' | 'style-panel.font' | 'style-panel.geo' | 'style-panel.label-align' | 'style-panel.mixed' | 'style-panel.opacity' | 'style-panel.position' | 'style-panel.selected' | 'style-panel.size' | 'style-panel.spline' | 'style-panel.title' | 'style-panel.vertical-align' | 'theme.dark' | 'theme.light' | 'theme.system' | 'toast.close' | 'toast.error.copy-fail.desc' | 'toast.error.copy-fail.title' | 'toast.error.export-fail.desc' | 'toast.error.export-fail.title' | 'toast.error' | 'toast.info' | 'toast.success' | 'toast.warning' | 'tool-panel.more' | 'tool-panel.title' | 'tool.arrow-down' | 'tool.arrow-left' | 'tool.arrow-right' | 'tool.arrow-up' | 'tool.arrow' | 'tool.aspect-ratio.circle' | 'tool.aspect-ratio.landscape' | 'tool.aspect-ratio.original' | 'tool.aspect-ratio.portrait' | 'tool.aspect-ratio.square' | 'tool.aspect-ratio.wide' | 'tool.aspect-ratio' | 'tool.bookmark' | 'tool.check-box' | 'tool.cloud' | 'tool.diamond' | 'tool.draw' | 'tool.ellipse' | 'tool.embed' | 'tool.eraser' | 'tool.flip-horz' | 'tool.flip-vert' | 'tool.frame' | 'tool.hand' | 'tool.heart' | 'tool.hexagon' | 'tool.highlight' | 'tool.image-crop-confirm' | 'tool.image-crop' | 'tool.image-toolbar-title' | 'tool.image-zoom' | 'tool.laser' | 'tool.line' | 'tool.media-alt-text-confirm' | 'tool.media-alt-text-desc' | 'tool.media-alt-text' | 'tool.media' | 'tool.note' | 'tool.octagon' | 'tool.oval' | 'tool.pentagon' | 'tool.pointer-down' | 'tool.rectangle' | 'tool.replace-media' | 'tool.rhombus' | 'tool.rich-text-bold' | 'tool.rich-text-bulletList' | 'tool.rich-text-code' | 'tool.rich-text-header' | 'tool.rich-text-highlight' | 'tool.rich-text-italic' | 'tool.rich-text-link-remove' | 'tool.rich-text-link-visit' | 'tool.rich-text-link' | 'tool.rich-text-orderedList' | 'tool.rich-text-strikethrough' | 'tool.rich-text-toolbar-title' | 'tool.rotate-cw' | 'tool.select' | 'tool.star' | 'tool.text' | 'tool.trapezoid' | 'tool.triangle' | 'tool.x-box' | 'ui.checked' | 'ui.close' | 'ui.unchecked' | 'verticalAlign-style.end' | 'verticalAlign-style.middle' | 'verticalAlign-style.start' | 'vscode.file-open.backup-failed' | 'vscode.file-open.backup-saved' | 'vscode.file-open.backup' | 'vscode.file-open.desc' | 'vscode.file-open.dont-show-again' | 'vscode.file-open.open';
 
 // @public (undocumented)
 export interface TLUiTranslationProviderProps {
@@ -5319,7 +5326,9 @@ export function useDefaultHelpers(): {
 export function useDialogs(): TLUiDialogsContextType;
 
 // @public (undocumented)
-export function useEditablePlainText(shapeId: TLShapeId, type: string, text?: string): {
+export function useEditablePlainText(shapeId: TLShapeId, type: ExtractShapeByProps<{
+    text: string;
+}>['type'], text?: string): {
     handleBlur: () => void;
     handleChange: ({ plaintext }: {
         plaintext: string;
@@ -5338,7 +5347,9 @@ export function useEditablePlainText(shapeId: TLShapeId, type: string, text?: st
 };
 
 // @public (undocumented)
-export function useEditableRichText(shapeId: TLShapeId, type: string, richText?: TLRichText): {
+export function useEditableRichText(shapeId: TLShapeId, type: ExtractShapeByProps<{
+    richText: TLRichText;
+}>['type'], richText?: TLRichText): {
     handleBlur: () => void;
     handleChange: ({ richText }: {
         richText: TLRichText;
diff --git a/packages/tldraw/package.json b/packages/tldraw/package.json
index 021791f28f43..7aec1e67d4e9 100644
--- a/packages/tldraw/package.json
+++ b/packages/tldraw/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "tldraw",
 	"description": "A tiny little drawing editor.",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/tldraw/setupVitest.js b/packages/tldraw/setupVitest.js
index 5e59f1268ea1..a492627cb053 100644
--- a/packages/tldraw/setupVitest.js
+++ b/packages/tldraw/setupVitest.js
@@ -1,3 +1,31 @@
+import { vi } from 'vitest'
+
+// Mock the breakpoints context to provide a default breakpoint value in tests
+// This prevents errors when components use useBreakpoint() without a BreakpointProvider
+vi.mock('./src/lib/ui/context/breakpoints', async () => {
+	const actual = await vi.importActual('./src/lib/ui/context/breakpoints')
+	return {
+		...actual,
+		useBreakpoint: () => 7, // PORTRAIT_BREAKPOINT.DESKTOP
+	}
+})
+
+// Mock the translation hooks to provide default translation functions in tests
+// This prevents errors when components use useTranslation() without a TldrawUiTranslationProvider
+vi.mock('./src/lib/ui/hooks/useTranslation/useTranslation', async () => {
+	const actual = await vi.importActual('./src/lib/ui/hooks/useTranslation/useTranslation')
+	return {
+		...actual,
+		useCurrentTranslation: () => ({
+			locale: 'en',
+			label: 'English',
+			dir: 'ltr',
+			messages: {},
+		}),
+		useTranslation: () => (key) => key || '', // Return the key itself as the translation
+	}
+})
+
 // Vitest setup file for tldraw package
 // Converted from setupTests.js to provide the same polyfills and global setup
 
diff --git a/packages/tldraw/src/lib/bindings/arrow/ArrowBindingUtil.ts b/packages/tldraw/src/lib/bindings/arrow/ArrowBindingUtil.ts
index f40ec3948ee7..c4dcf1a02e4e 100644
--- a/packages/tldraw/src/lib/bindings/arrow/ArrowBindingUtil.ts
+++ b/packages/tldraw/src/lib/bindings/arrow/ArrowBindingUtil.ts
@@ -180,7 +180,7 @@ function reparentArrow(editor: Editor, arrowId: TLShapeId) {
 	}
 
 	if (finalIndex !== reparentedArrow.index) {
-		editor.updateShapes<TLArrowShape>([{ id: arrowId, type: 'arrow', index: finalIndex }])
+		editor.updateShapes([{ id: arrowId, type: 'arrow', index: finalIndex }])
 	}
 }
 
diff --git a/packages/tldraw/src/lib/canvas/TldrawSelectionForeground.tsx b/packages/tldraw/src/lib/canvas/TldrawSelectionForeground.tsx
index 76bf7db4ea48..80d34ac3b2aa 100644
--- a/packages/tldraw/src/lib/canvas/TldrawSelectionForeground.tsx
+++ b/packages/tldraw/src/lib/canvas/TldrawSelectionForeground.tsx
@@ -1,9 +1,8 @@
 import {
 	Box,
+	HALF_PI,
 	RotateCorner,
-	TLEmbedShape,
 	TLSelectionForegroundProps,
-	TLTextShape,
 	getCursor,
 	tlenv,
 	toDomPrecision,
@@ -54,7 +53,10 @@ export const TldrawSelectionForeground = track(function TldrawSelectionForegroun
 			? bounds.clone().expand(expandOutlineBy).zeroFix()
 			: bounds.clone().expandBy(expandOutlineBy).zeroFix()
 
-	useTransform(rSvg, bounds?.x, bounds?.y, 1, editor.getSelectionRotation(), {
+	const selectionRotation = editor.getSelectionRotation()
+	const isShapeTooCloseToContextualToolbar =
+		selectionRotation / HALF_PI > 1.6 && selectionRotation / HALF_PI < 2.4
+	useTransform(rSvg, bounds?.x, bounds?.y, 1, selectionRotation, {
 		x: expandedBounds.x - bounds.x,
 		y: expandedBounds.y - bounds.y,
 	})
@@ -103,10 +105,10 @@ export const TldrawSelectionForeground = track(function TldrawSelectionForegroun
 		(showSelectionBounds &&
 			editor.isIn('select.resizing') &&
 			onlyShape &&
-			editor.isShapeOfType<TLTextShape>(onlyShape, 'text'))
+			editor.isShapeOfType(onlyShape, 'text'))
 
 	if (onlyShape && shouldDisplayBox) {
-		if (tlenv.isFirefox && editor.isShapeOfType<TLEmbedShape>(onlyShape, 'embed')) {
+		if (tlenv.isFirefox && editor.isShapeOfType(onlyShape, 'embed')) {
 			shouldDisplayBox = false
 		}
 	}
@@ -188,8 +190,11 @@ export const TldrawSelectionForeground = track(function TldrawSelectionForegroun
 		shouldDisplayControls &&
 		isCoarsePointer &&
 		onlyShape &&
-		editor.isShapeOfType<TLTextShape>(onlyShape, 'text') &&
+		editor.isShapeOfType(onlyShape, 'text') &&
 		textHandleHeight * zoom >= 4
+	const isMediaShape =
+		onlyShape &&
+		(editor.isShapeOfType(onlyShape, 'image') || editor.isShapeOfType(onlyShape, 'video'))
 
 	return (
 		<svg
@@ -244,7 +249,13 @@ export const TldrawSelectionForeground = track(function TldrawSelectionForegroun
 				<MobileRotateHandle
 					data-testid="selection.rotate.mobile"
 					cx={isSmallX ? -targetSize * 1.5 : width / 2}
-					cy={isSmallX ? height / 2 : -targetSize * 1.5}
+					cy={
+						isSmallX
+							? height / 2
+							: isMediaShape && !isShapeTooCloseToContextualToolbar
+								? height + targetSize * 1.5
+								: -targetSize * 1.5
+					}
 					size={size}
 					isHidden={hideMobileRotateHandle}
 				/>
diff --git a/packages/tldraw/src/lib/defaultExternalContentHandlers.ts b/packages/tldraw/src/lib/defaultExternalContentHandlers.ts
index 46583f936720..2e388b831dea 100644
--- a/packages/tldraw/src/lib/defaultExternalContentHandlers.ts
+++ b/packages/tldraw/src/lib/defaultExternalContentHandlers.ts
@@ -19,7 +19,6 @@ import {
 	TLTextShapeProps,
 	TLUrlExternalAsset,
 	TLVideoAsset,
-	TLVideoShape,
 	Vec,
 	VecLike,
 	assert,
@@ -206,7 +205,7 @@ export async function defaultHandleExternalFileReplaceContent(
 			newY = result.y
 		}
 
-		editor.updateShapes<TLImageShape>([
+		editor.updateShapes([
 			{
 				id: imageShape.id,
 				type: imageShape.type,
@@ -221,7 +220,7 @@ export async function defaultHandleExternalFileReplaceContent(
 			},
 		])
 	} else if (shape.type === 'video') {
-		editor.updateShapes<TLVideoShape>([
+		editor.updateShapes([
 			{
 				id: shape.id,
 				type: shape.type,
@@ -531,7 +530,7 @@ export async function defaultHandleExternalTextContent(
 	const shapeId = createShapeId()
 
 	// Allow this to trigger the max shapes reached alert
-	editor.createShapes<TLTextShape>([
+	editor.createShapes([
 		{
 			id: shapeId,
 			type: 'text',
diff --git a/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.test.ts b/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.test.ts
index 3f6bddb77871..b4d425141069 100644
--- a/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.test.ts
+++ b/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.test.ts
@@ -333,7 +333,7 @@ describe('Arrow labels', () => {
 		// Create an arrow with a label
 		editor.setCurrentTool('arrow').pointerDown(10, 10).pointerMove(100, 100).pointerUp()
 		const arrowId = editor.getOnlySelectedShape()!.id
-		editor.updateShapes<TLArrowShape>([
+		editor.updateShapes([
 			{ id: arrowId, type: 'arrow', props: { richText: toRichText('Test Label') } },
 		])
 	})
@@ -349,7 +349,7 @@ describe('Arrow labels', () => {
 
 	it('should update the label of an arrow', () => {
 		const arrowId = editor.getOnlySelectedShape()!.id
-		editor.updateShapes<TLArrowShape>([
+		editor.updateShapes([
 			{ id: arrowId, type: 'arrow', props: { richText: toRichText('New Label') } },
 		])
 		expect(arrow(arrowId)).toMatchObject({
diff --git a/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx b/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx
index ef19ccb680e0..1501bb89d530 100644
--- a/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/arrow/ArrowShapeUtil.tsx
@@ -917,7 +917,7 @@ export class ArrowShapeUtil extends ShapeUtil<TLArrowShape> {
 		if (isEmptyRichText(shape.props.richText)) {
 			// editing text for the first time, so set the position to the default:
 			const labelPosition = getArrowLabelDefaultPosition(this.editor, shape)
-			this.editor.updateShape<TLArrowShape>({
+			this.editor.updateShape({
 				id: shape.id,
 				type: shape.type,
 				props: { labelPosition },
diff --git a/packages/tldraw/src/lib/shapes/arrow/arrowLabel.ts b/packages/tldraw/src/lib/shapes/arrow/arrowLabel.ts
index dfeb53d2ef95..0027314009b0 100644
--- a/packages/tldraw/src/lib/shapes/arrow/arrowLabel.ts
+++ b/packages/tldraw/src/lib/shapes/arrow/arrowLabel.ts
@@ -311,7 +311,7 @@ export function getArrowLabelDefaultPosition(editor: Editor, shape: TLArrowShape
 
 /** @internal */
 export function isOverArrowLabel(editor: Editor, shape: TLShape) {
-	if (!editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) return false
+	if (!editor.isShapeOfType(shape, 'arrow')) return false
 
 	const pointInShapeSpace = editor.getPointInShapeSpace(shape, editor.inputs.currentPagePoint)
 	// How should we handle multiple labels? Do shapes ever have multiple labels?
diff --git a/packages/tldraw/src/lib/shapes/arrow/arrowTargetState.ts b/packages/tldraw/src/lib/shapes/arrow/arrowTargetState.ts
index 56c196ddc5a0..422de210e074 100644
--- a/packages/tldraw/src/lib/shapes/arrow/arrowTargetState.ts
+++ b/packages/tldraw/src/lib/shapes/arrow/arrowTargetState.ts
@@ -377,7 +377,7 @@ export function updateArrowTargetState({
 	return result
 }
 
-const targetFilterFallback = { type: 'arrow' }
+const targetFilterFallback = { type: 'arrow' as const }
 
 /**
  * Funky math but we want the snap distance to be 4 at the minimum and either 16 or 15% of the
diff --git a/packages/tldraw/src/lib/shapes/arrow/elbow/elbowArrowSnapLines.tsx b/packages/tldraw/src/lib/shapes/arrow/elbow/elbowArrowSnapLines.tsx
index e2ed6c44e3d1..a651158bec20 100644
--- a/packages/tldraw/src/lib/shapes/arrow/elbow/elbowArrowSnapLines.tsx
+++ b/packages/tldraw/src/lib/shapes/arrow/elbow/elbowArrowSnapLines.tsx
@@ -39,17 +39,17 @@ export function getElbowArrowSnapLines(editor: Editor) {
 		.get(editor, (editor) => {
 			const currentSelectedArrowShape = computed('current selected arrow shape', () => {
 				const shape = editor.getOnlySelectedShape()
-				if (!shape || !editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) return null
+				if (!shape || !editor.isShapeOfType(shape, 'arrow')) return null
 				return shape.id
 			})
 
 			const unselectedArrowShapeIds = editor.store.query.ids('shape', () => {
 				const activeArrowShapeId = currentSelectedArrowShape.get()
-				if (!activeArrowShapeId) return { type: { eq: 'arrow' } }
+				if (!activeArrowShapeId) return { type: { eq: 'arrow' } } as const
 				return {
 					type: { eq: 'arrow' },
 					id: { neq: activeArrowShapeId },
-				}
+				} as const
 			})
 
 			return computed('elbow arrow snap lines', () => {
diff --git a/packages/tldraw/src/lib/shapes/arrow/shared.ts b/packages/tldraw/src/lib/shapes/arrow/shared.ts
index 8f71a165eba3..224abe2e2ea5 100644
--- a/packages/tldraw/src/lib/shapes/arrow/shared.ts
+++ b/packages/tldraw/src/lib/shapes/arrow/shared.ts
@@ -38,7 +38,7 @@ export function getBoundShapeInfoForTerminal(
 	terminalName: 'start' | 'end'
 ): BoundShapeInfo | undefined {
 	const binding = editor
-		.getBindingsFromShape<TLArrowBinding>(arrow, 'arrow')
+		.getBindingsFromShape(arrow, 'arrow')
 		.find((b) => b.props.terminal === terminalName)
 	if (!binding) return
 
@@ -105,7 +105,7 @@ export interface TLArrowBindings {
 const arrowBindingsCache = createComputedCache(
 	'arrow bindings',
 	(editor: Editor, arrow: TLArrowShape) => {
-		const bindings = editor.getBindingsFromShape<TLArrowBinding>(arrow.id, 'arrow')
+		const bindings = editor.getBindingsFromShape(arrow.id, 'arrow')
 		return {
 			start: bindings.find((b) => b.props.terminal === 'start'),
 			end: bindings.find((b) => b.props.terminal === 'end'),
@@ -223,7 +223,7 @@ export function createOrUpdateArrowBinding(
 	const targetId = typeof target === 'string' ? target : target.id
 
 	const existingMany = editor
-		.getBindingsFromShape<TLArrowBinding>(arrowId, 'arrow')
+		.getBindingsFromShape(arrowId, 'arrow')
 		.filter((b) => b.props.terminal === props.terminal)
 
 	// if we've somehow ended up with too many bindings, delete the extras
@@ -254,7 +254,7 @@ export function createOrUpdateArrowBinding(
  */
 export function removeArrowBinding(editor: Editor, arrow: TLArrowShape, terminal: 'start' | 'end') {
 	const existing = editor
-		.getBindingsFromShape<TLArrowBinding>(arrow, 'arrow')
+		.getBindingsFromShape(arrow, 'arrow')
 		.filter((b) => b.props.terminal === terminal)
 
 	editor.deleteBindings(existing)
diff --git a/packages/tldraw/src/lib/shapes/arrow/toolStates/Pointing.tsx b/packages/tldraw/src/lib/shapes/arrow/toolStates/Pointing.tsx
index ac45d24ed63e..aa9c85a1fb30 100644
--- a/packages/tldraw/src/lib/shapes/arrow/toolStates/Pointing.tsx
+++ b/packages/tldraw/src/lib/shapes/arrow/toolStates/Pointing.tsx
@@ -96,7 +96,7 @@ export class Pointing extends StateNode {
 
 		this.markId = this.editor.markHistoryStoppingPoint(`creating_arrow:${id}`)
 		const newPoint = maybeSnapToGrid(originPagePoint, this.editor)
-		this.editor.createShape<TLArrowShape>({
+		this.editor.createShape({
 			id,
 			type: 'arrow',
 			x: newPoint.x,
diff --git a/packages/tldraw/src/lib/shapes/bookmark/bookmarks.ts b/packages/tldraw/src/lib/shapes/bookmark/bookmarks.ts
index 8d82bc1a8ced..b53694372e25 100644
--- a/packages/tldraw/src/lib/shapes/bookmark/bookmarks.ts
+++ b/packages/tldraw/src/lib/shapes/bookmark/bookmarks.ts
@@ -59,7 +59,7 @@ export function updateBookmarkAssetOnUrlChange(editor: Editor, shape: TLBookmark
 	if (editor.getAsset(assetId)) {
 		// Existing asset for this URL?
 		if (shape.props.assetId !== assetId) {
-			editor.updateShapes<TLBookmarkShape>([
+			editor.updateShapes([
 				{
 					id: shape.id,
 					type: shape.type,
@@ -71,7 +71,7 @@ export function updateBookmarkAssetOnUrlChange(editor: Editor, shape: TLBookmark
 		// No asset for this URL?
 
 		// First, clear out the existing asset reference
-		editor.updateShapes<TLBookmarkShape>([
+		editor.updateShapes([
 			{
 				id: shape.id,
 				type: shape.type,
@@ -103,7 +103,7 @@ const createBookmarkAssetOnUrlChange = debounce(async (editor: Editor, shape: TL
 		editor.createAssets([asset])
 
 		// And update the shape
-		editor.updateShapes<TLBookmarkShape>([
+		editor.updateShapes([
 			{
 				id: shape.id,
 				type: shape.type,
diff --git a/packages/tldraw/src/lib/shapes/draw/toolStates/Drawing.ts b/packages/tldraw/src/lib/shapes/draw/toolStates/Drawing.ts
index a1c97a7c6a1d..4c19c0d6154a 100644
--- a/packages/tldraw/src/lib/shapes/draw/toolStates/Drawing.ts
+++ b/packages/tldraw/src/lib/shapes/draw/toolStates/Drawing.ts
@@ -238,7 +238,7 @@ export class Drawing extends StateNode {
 					)
 				}
 
-				this.editor.updateShapes<TLDrawShape | TLHighlightShape>([shapePartial])
+				this.editor.updateShapes([shapePartial])
 
 				return
 			}
@@ -250,7 +250,7 @@ export class Drawing extends StateNode {
 		const id = createShapeId()
 
 		// Allow this to trigger the max shapes reached alert
-		this.editor.createShape<DrawableShape>({
+		this.editor.createShape({
 			id,
 			type: this.shapeType,
 			x: originPagePoint.x,
@@ -372,7 +372,7 @@ export class Drawing extends StateNode {
 						)
 					}
 
-					this.editor.updateShapes<TLDrawShape | TLHighlightShape>([shapePartial])
+					this.editor.updateShapes([shapePartial])
 				}
 				break
 			}
@@ -642,7 +642,7 @@ export class Drawing extends StateNode {
 					const props = this.editor.getShape<DrawableShape>(id)!.props
 
 					if (!this.editor.canCreateShapes([newShapeId])) return this.cancel()
-					this.editor.createShape<DrawableShape>({
+					this.editor.createShape({
 						id: newShapeId,
 						type: this.shapeType,
 						x: toFixed(inputs.currentPagePoint.x),
diff --git a/packages/tldraw/src/lib/shapes/embed/EmbedShapeUtil.tsx b/packages/tldraw/src/lib/shapes/embed/EmbedShapeUtil.tsx
index 2587aeb8b13d..1bbc4f8ef6d1 100644
--- a/packages/tldraw/src/lib/shapes/embed/EmbedShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/embed/EmbedShapeUtil.tsx
@@ -137,7 +137,7 @@ export class EmbedShapeUtil extends BaseBoxShapeUtil<TLEmbedShape> {
 
 				if (editingShapeId && hoveredShapeId !== editingShapeId) {
 					const editingShape = this.editor.getShape(editingShapeId)
-					if (editingShape && this.editor.isShapeOfType<TLEmbedShape>(editingShape, 'embed')) {
+					if (editingShape && this.editor.isShapeOfType(editingShape, 'embed')) {
 						return true
 					}
 				}
diff --git a/packages/tldraw/src/lib/shapes/frame/FrameShapeTool.ts b/packages/tldraw/src/lib/shapes/frame/FrameShapeTool.ts
index 68f68c4e9c68..1ef938616b04 100644
--- a/packages/tldraw/src/lib/shapes/frame/FrameShapeTool.ts
+++ b/packages/tldraw/src/lib/shapes/frame/FrameShapeTool.ts
@@ -4,7 +4,7 @@ import { BaseBoxShapeTool, TLShape, TLShapeId } from '@tldraw/editor'
 export class FrameShapeTool extends BaseBoxShapeTool {
 	static override id = 'frame'
 	static override initial = 'idle'
-	override shapeType = 'frame'
+	override shapeType = 'frame' as const
 
 	override onCreate(shape: TLShape | null): void {
 		if (!shape) return
diff --git a/packages/tldraw/src/lib/shapes/frame/components/FrameLabelInput.tsx b/packages/tldraw/src/lib/shapes/frame/components/FrameLabelInput.tsx
index 984f673bfa37..129442f5d392 100644
--- a/packages/tldraw/src/lib/shapes/frame/components/FrameLabelInput.tsx
+++ b/packages/tldraw/src/lib/shapes/frame/components/FrameLabelInput.tsx
@@ -1,5 +1,8 @@
-import { TLFrameShape, TLShapeId, useEditor } from '@tldraw/editor'
-import { forwardRef, useCallback } from 'react'
+import { TLFrameShape, TLShapeId, useEditor, useValue } from '@tldraw/editor'
+import { forwardRef, useCallback, useEffect, useRef } from 'react'
+import { PORTRAIT_BREAKPOINT } from '../../../ui/constants'
+import { useBreakpoint } from '../../../ui/context/breakpoints'
+import { useTranslation } from '../../../ui/hooks/useTranslation/useTranslation'
 import { defaultEmptyAs } from '../FrameShapeUtil'
 
 export const FrameLabelInput = forwardRef<
@@ -7,6 +10,15 @@ export const FrameLabelInput = forwardRef<
 	{ id: TLShapeId; name: string; isEditing: boolean }
 >(({ id, name, isEditing }, ref) => {
 	const editor = useEditor()
+	const breakpoint = useBreakpoint()
+	const isCoarsePointer = useValue(
+		'isCoarsePointer',
+		() => editor.getInstanceState().isCoarsePointer,
+		[editor]
+	)
+	const shouldUseWindowPrompt = breakpoint < PORTRAIT_BREAKPOINT.TABLET_SM && isCoarsePointer
+	const promptOpen = useRef<boolean>(false)
+	const msg = useTranslation()
 
 	const handlePointerDown = useCallback(
 		(e: React.PointerEvent) => {
@@ -28,13 +40,12 @@ export const FrameLabelInput = forwardRef<
 		[editor]
 	)
 
-	const handleBlur = useCallback(
-		(e: React.FocusEvent<HTMLInputElement>) => {
+	const renameFrame = useCallback(
+		(value: string) => {
 			const shape = editor.getShape<TLFrameShape>(id)
 			if (!shape) return
 
 			const name = shape.props.name
-			const value = e.currentTarget.value.trim()
 			if (name === value) return
 
 			editor.updateShapes([
@@ -48,36 +59,49 @@ export const FrameLabelInput = forwardRef<
 		[id, editor]
 	)
 
+	const handleBlur = useCallback(
+		(e: React.FocusEvent<HTMLInputElement>) => {
+			renameFrame(e.currentTarget.value)
+		},
+		[renameFrame]
+	)
+
 	const handleChange = useCallback(
 		(e: React.ChangeEvent<HTMLInputElement>) => {
-			const shape = editor.getShape<TLFrameShape>(id)
-			if (!shape) return
-
-			const name = shape.props.name
-			const value = e.currentTarget.value
-			if (name === value) return
-
-			editor.updateShapes([
-				{
-					id,
-					type: 'frame',
-					props: { name: value },
-				},
-			])
+			renameFrame(e.currentTarget.value)
 		},
-		[id, editor]
+		[renameFrame]
 	)
 
+	/* Mobile rename uses window.prompt */
+	useEffect(() => {
+		if (!isEditing) {
+			promptOpen.current = false
+			return
+		}
+		if (isEditing && shouldUseWindowPrompt && !promptOpen.current) {
+			promptOpen.current = true
+			const shape = editor.getShape<TLFrameShape>(id)
+			const currentName = shape?.props.name ?? ''
+			const newName = window.prompt(msg('action.rename'), currentName)
+			promptOpen.current = false
+			if (newName !== null) renameFrame(newName)
+			editor.setEditingShape(null)
+		}
+	}, [isEditing, shouldUseWindowPrompt, id, msg, renameFrame, editor])
+
 	return (
-		<div className={`tl-frame-label ${isEditing ? 'tl-frame-label__editing' : ''}`}>
+		<div
+			className={`tl-frame-label ${isEditing && !shouldUseWindowPrompt ? 'tl-frame-label__editing' : ''}`}
+		>
 			<input
 				className="tl-frame-name-input"
 				ref={ref}
-				disabled={!isEditing}
-				readOnly={!isEditing}
+				disabled={!isEditing || shouldUseWindowPrompt}
+				readOnly={!isEditing || shouldUseWindowPrompt}
 				style={{ display: isEditing ? undefined : 'none' }}
 				value={name}
-				autoFocus
+				autoFocus={!shouldUseWindowPrompt}
 				onKeyDown={handleKeyDown}
 				onBlur={handleBlur}
 				onChange={handleChange}
diff --git a/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.test.tsx b/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.test.tsx
index 2384c24016ab..ea9bc17b01ab 100644
--- a/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.test.tsx
+++ b/packages/tldraw/src/lib/shapes/geo/GeoShapeUtil.test.tsx
@@ -27,8 +27,16 @@ describe('Handle snapping', () => {
 		)
 	})
 
-	const geoShape = () => editor.getShape(ids.geo)!
-	const lineShape = () => editor.getShape(ids.line)!
+	const geoShape = () => {
+		const shape = editor.getShape(ids.geo)!
+		assert(editor.isShapeOfType(shape, 'geo'))
+		return shape
+	}
+	const lineShape = () => {
+		const shape = editor.getShape(ids.line)!
+		assert(editor.isShapeOfType(shape, 'line'))
+		return shape
+	}
 	const lineHandles = () => editor.getShapeUtil('line').getHandles!(lineShape())!
 
 	function startDraggingHandle() {
diff --git a/packages/tldraw/src/lib/shapes/geo/toolStates/Pointing.ts b/packages/tldraw/src/lib/shapes/geo/toolStates/Pointing.ts
index 4222e1c2da61..78fd894041a8 100644
--- a/packages/tldraw/src/lib/shapes/geo/toolStates/Pointing.ts
+++ b/packages/tldraw/src/lib/shapes/geo/toolStates/Pointing.ts
@@ -24,7 +24,7 @@ export class Pointing extends StateNode {
 			const creatingMarkId = this.editor.markHistoryStoppingPoint(`creating_geo:${id}`)
 			const newPoint = maybeSnapToGrid(originPagePoint, this.editor)
 			this.editor
-				.createShapes<TLGeoShape>([
+				.createShapes([
 					{
 						id,
 						type: 'geo',
@@ -88,7 +88,7 @@ export class Pointing extends StateNode {
 					? { w: 300, h: 180 }
 					: { w: 200, h: 200 }
 
-		this.editor.createShapes<TLGeoShape>([
+		this.editor.createShapes([
 			{
 				id,
 				type: 'geo',
@@ -115,7 +115,7 @@ export class Pointing extends StateNode {
 		if (parentTransform) delta.rot(-parentTransform.rotation())
 		const newPoint = maybeSnapToGrid(new Vec(shape.x - delta.x, shape.y - delta.y), this.editor)
 		this.editor.select(id)
-		this.editor.updateShape<TLGeoShape>({
+		this.editor.updateShape({
 			id: shape.id,
 			type: 'geo',
 			x: newPoint.x,
diff --git a/packages/tldraw/src/lib/shapes/line/LineShapeTool.test.ts b/packages/tldraw/src/lib/shapes/line/LineShapeTool.test.ts
index b87a69119aa5..831c62df6628 100644
--- a/packages/tldraw/src/lib/shapes/line/LineShapeTool.test.ts
+++ b/packages/tldraw/src/lib/shapes/line/LineShapeTool.test.ts
@@ -1,4 +1,4 @@
-import { TLLineShape, assert } from '@tldraw/editor'
+import { assert } from '@tldraw/editor'
 import { TestEditor } from '../../../test/TestEditor'
 
 let editor: TestEditor
@@ -127,7 +127,7 @@ describe('When extending the line with the shift-key in tool-lock mode', () => {
 			.pointerUp(20, 10)
 
 		const line = editor.getCurrentPageShapes()[editor.getCurrentPageShapes().length - 1]
-		assert(editor.isShapeOfType<TLLineShape>(line, 'line'))
+		assert(editor.isShapeOfType(line, 'line'))
 		expect(Object.keys(line.props.points).length).toBe(3)
 	})
 
@@ -143,7 +143,7 @@ describe('When extending the line with the shift-key in tool-lock mode', () => {
 			.pointerUp(30, 10)
 
 		const line = editor.getCurrentPageShapes()[editor.getCurrentPageShapes().length - 1]
-		assert(editor.isShapeOfType<TLLineShape>(line, 'line'))
+		assert(editor.isShapeOfType(line, 'line'))
 		expect(Object.keys(line.props.points).length).toBe(2)
 	})
 
@@ -160,7 +160,7 @@ describe('When extending the line with the shift-key in tool-lock mode', () => {
 			.pointerUp(30, 10)
 
 		const line = editor.getCurrentPageShapes()[editor.getCurrentPageShapes().length - 1]
-		assert(editor.isShapeOfType<TLLineShape>(line, 'line'))
+		assert(editor.isShapeOfType(line, 'line'))
 		expect(Object.keys(line.props.points).length).toBe(3)
 	})
 
@@ -179,7 +179,7 @@ describe('When extending the line with the shift-key in tool-lock mode', () => {
 			.pointerUp(30, 10)
 
 		const line = editor.getCurrentPageShapes()[editor.getCurrentPageShapes().length - 1]
-		assert(editor.isShapeOfType<TLLineShape>(line, 'line'))
+		assert(editor.isShapeOfType(line, 'line'))
 		expect(Object.keys(line.props.points).length).toBe(3)
 	})
 
@@ -200,7 +200,7 @@ describe('When extending the line with the shift-key in tool-lock mode', () => {
 			.pointerUp(40, 10)
 
 		const line = editor.getCurrentPageShapes()[editor.getCurrentPageShapes().length - 1]
-		assert(editor.isShapeOfType<TLLineShape>(line, 'line'))
+		assert(editor.isShapeOfType(line, 'line'))
 		expect(Object.keys(line.props.points).length).toBe(3)
 	})
 })
diff --git a/packages/tldraw/src/lib/shapes/line/LineShapeUtil.test.tsx b/packages/tldraw/src/lib/shapes/line/LineShapeUtil.test.tsx
index f4e5fff3ab31..6473c710ccd2 100644
--- a/packages/tldraw/src/lib/shapes/line/LineShapeUtil.test.tsx
+++ b/packages/tldraw/src/lib/shapes/line/LineShapeUtil.test.tsx
@@ -24,7 +24,7 @@ beforeEach(() => {
 	editor
 		.selectAll()
 		.deleteShapes(editor.getSelectedShapeIds())
-		.createShapes<TLLineShape>([
+		.createShapes([
 			{
 				id: id,
 				type: 'line',
@@ -168,10 +168,10 @@ describe('Snapping', () => {
 			type: 'line',
 			props: {
 				points: {
-					a1: { id: 'a1', index: 'a1', x: 0, y: 0 },
-					a2: { id: 'a2', index: 'a2', x: 100, y: 0 },
-					a3: { id: 'a3', index: 'a3', x: 100, y: 100 },
-					a4: { id: 'a4', index: 'a4', x: 0, y: 100 },
+					a1: { id: 'a1', index: 'a1' as IndexKey, x: 0, y: 0 },
+					a2: { id: 'a2', index: 'a2' as IndexKey, x: 100, y: 0 },
+					a3: { id: 'a3', index: 'a3' as IndexKey, x: 100, y: 100 },
+					a4: { id: 'a4', index: 'a4' as IndexKey, x: 0, y: 100 },
 				},
 			},
 		})
diff --git a/packages/tldraw/src/lib/shapes/line/toolStates/Pointing.ts b/packages/tldraw/src/lib/shapes/line/toolStates/Pointing.ts
index 10a937715ec6..833b341a1f0d 100644
--- a/packages/tldraw/src/lib/shapes/line/toolStates/Pointing.ts
+++ b/packages/tldraw/src/lib/shapes/line/toolStates/Pointing.ts
@@ -89,7 +89,7 @@ export class Pointing extends StateNode {
 
 			const newPoint = maybeSnapToGrid(currentPagePoint, this.editor)
 
-			this.editor.createShapes<TLLineShape>([
+			this.editor.createShapes([
 				{
 					id,
 					type: 'line',
diff --git a/packages/tldraw/src/lib/shapes/note/NoteShapeTool.test.ts b/packages/tldraw/src/lib/shapes/note/NoteShapeTool.test.ts
index e9d4f1709a7b..d7a0beafe556 100644
--- a/packages/tldraw/src/lib/shapes/note/NoteShapeTool.test.ts
+++ b/packages/tldraw/src/lib/shapes/note/NoteShapeTool.test.ts
@@ -1,3 +1,4 @@
+import { TLNoteShape } from '@tldraw/editor'
 import { TestEditor } from '../../../test/TestEditor'
 import { NoteShapeTool } from './NoteShapeTool'
 
@@ -242,7 +243,7 @@ describe('Adjacent note position helpers (sticky pits)', () => {
 
 	it('Falls into correct pit below notes with growY', () => {
 		editor.createShape({ type: 'note', x: 0, y: 0 }).updateShape({
-			...editor.getLastCreatedShape(),
+			...editor.getLastCreatedShape<TLNoteShape>(),
 			props: { growY: 100 },
 		})
 
diff --git a/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx b/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx
index a105f48e8a8d..d3b236dfa97c 100644
--- a/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx
+++ b/packages/tldraw/src/lib/shapes/note/NoteShapeUtil.tsx
@@ -31,9 +31,9 @@ import {
 	useEditor,
 	useValue,
 } from '@tldraw/editor'
-import { useCallback } from 'react'
+import { useCallback, useContext } from 'react'
 import { startEditingShapeWithLabel } from '../../tools/SelectTool/selectHelpers'
-import { useCurrentTranslation } from '../../ui/hooks/useTranslation/useTranslation'
+import { TranslationsContext } from '../../ui/hooks/useTranslation/useTranslation'
 import {
 	isEmptyRichText,
 	renderHtmlFromRichTextForMeasurement,
@@ -493,7 +493,8 @@ function getLabelSize(editor: Editor, shape: TLNoteShape) {
 
 function useNoteKeydownHandler(id: TLShapeId) {
 	const editor = useEditor()
-	const translation = useCurrentTranslation()
+	// Try to get the translation context, but fallback to ltr if it doesn't exist
+	const translation = useContext(TranslationsContext)
 
 	return useCallback(
 		(e: KeyboardEvent) => {
@@ -512,7 +513,7 @@ function useNoteKeydownHandler(id: TLShapeId) {
 				// tab controls x axis (shift inverts direction set by RTL)
 				// cmd enter is the y axis (shift inverts direction)
 				const isRTL = !!(
-					translation.dir === 'rtl' ||
+					translation?.dir === 'rtl' ||
 					// todo: can we check a partial of the text, so that we don't have to render the whole thing?
 					isRightToLeftLanguage(renderPlaintextFromRichText(editor, shape.props.richText))
 				)
@@ -540,7 +541,7 @@ function useNoteKeydownHandler(id: TLShapeId) {
 				}
 			}
 		},
-		[id, editor, translation.dir]
+		[id, editor, translation?.dir]
 	)
 }
 
diff --git a/packages/tldraw/src/lib/shapes/note/noteHelpers.ts b/packages/tldraw/src/lib/shapes/note/noteHelpers.ts
index db42a15a799a..65c603c3a0ff 100644
--- a/packages/tldraw/src/lib/shapes/note/noteHelpers.ts
+++ b/packages/tldraw/src/lib/shapes/note/noteHelpers.ts
@@ -104,7 +104,7 @@ export function getAvailableNoteAdjacentPositions(
 	// Get all the positions that are adjacent to the selected note shapes
 	for (const shape of editor.getCurrentPageShapes()) {
 		if (
-			!editor.isShapeOfType<TLNoteShape>(shape, 'note') ||
+			!editor.isShapeOfType(shape, 'note') ||
 			scale !== shape.props.scale ||
 			selectedShapeIds.has(shape.id)
 		) {
@@ -204,7 +204,7 @@ export function getNoteShapeForAdjacentPosition(
 
 		// We create it at the center first, so that it becomes
 		// the child of whatever parent was at that center
-		editor.createShape<TLNoteShape>({
+		editor.createShape({
 			id,
 			type: 'note',
 			x: center.x,
diff --git a/packages/tldraw/src/lib/shapes/shared/PlainTextLabel.tsx b/packages/tldraw/src/lib/shapes/shared/PlainTextLabel.tsx
index 034bedcca626..8ec1c57b273f 100644
--- a/packages/tldraw/src/lib/shapes/shared/PlainTextLabel.tsx
+++ b/packages/tldraw/src/lib/shapes/shared/PlainTextLabel.tsx
@@ -1,5 +1,6 @@
 import {
 	Box,
+	ExtractShapeByProps,
 	TLDefaultFillStyle,
 	TLDefaultFontStyle,
 	TLDefaultHorizontalAlignStyle,
@@ -15,7 +16,7 @@ import { useEditablePlainText } from './useEditablePlainText'
 /** @public */
 export interface PlainTextLabelProps {
 	shapeId: TLShapeId
-	type: string
+	type: ExtractShapeByProps<{ text: string }>['type']
 	font: TLDefaultFontStyle
 	fontSize: number
 	lineHeight: number
diff --git a/packages/tldraw/src/lib/shapes/shared/RichTextLabel.tsx b/packages/tldraw/src/lib/shapes/shared/RichTextLabel.tsx
index 9f4868a2c227..0d629cf81c5b 100644
--- a/packages/tldraw/src/lib/shapes/shared/RichTextLabel.tsx
+++ b/packages/tldraw/src/lib/shapes/shared/RichTextLabel.tsx
@@ -1,6 +1,7 @@
 import {
 	Box,
 	DefaultFontFamilies,
+	ExtractShapeByProps,
 	TLDefaultFillStyle,
 	TLDefaultFontStyle,
 	TLDefaultHorizontalAlignStyle,
@@ -8,6 +9,7 @@ import {
 	TLEventInfo,
 	TLRichText,
 	TLShapeId,
+	openWindow,
 	preventDefault,
 	useEditor,
 	useReactor,
@@ -23,7 +25,7 @@ import { useEditableRichText } from './useEditableRichText'
 /** @public */
 export interface RichTextLabelProps {
 	shapeId: TLShapeId
-	type: string
+	type: ExtractShapeByProps<{ richText: TLRichText }>['type']
 	font: TLDefaultFontStyle
 	fontSize: number
 	lineHeight: number
@@ -112,7 +114,7 @@ export const RichTextLabel = React.memo(function RichTextLabel({
 				if (e.name !== 'pointer_up' || !link) return
 
 				if (!isDragging.current) {
-					window.open(link, '_blank', 'noopener, noreferrer')
+					openWindow(link, '_blank', false)
 				}
 				editor.off('event', handlePointerUp)
 			}
diff --git a/packages/tldraw/src/lib/shapes/shared/ShapeFill.tsx b/packages/tldraw/src/lib/shapes/shared/ShapeFill.tsx
index f1cbb5b6fff4..5f0771d45db4 100644
--- a/packages/tldraw/src/lib/shapes/shared/ShapeFill.tsx
+++ b/packages/tldraw/src/lib/shapes/shared/ShapeFill.tsx
@@ -41,6 +41,9 @@ export const ShapeFill = React.memo(function ShapeFill({
 		case 'pattern': {
 			return <PatternFill theme={theme} color={color} fill={fill} d={d} scale={scale} />
 		}
+		case 'lined-fill': {
+			return <path fill={getColorValue(theme, color, 'linedFill')} d={d} />
+		}
 	}
 })
 
diff --git a/packages/tldraw/src/lib/shapes/shared/crop.ts b/packages/tldraw/src/lib/shapes/shared/crop.ts
index 88fe1b2bcb94..bb6896ba7509 100644
--- a/packages/tldraw/src/lib/shapes/shared/crop.ts
+++ b/packages/tldraw/src/lib/shapes/shared/crop.ts
@@ -361,6 +361,7 @@ export function getCropBox<T extends ShapeWithCrop>(
 		x: newPoint.x,
 		y: newPoint.y,
 		props: {
+			...shape.props,
 			w: tempBox.w,
 			h: tempBox.h,
 			crop: newCrop,
diff --git a/packages/tldraw/src/lib/shapes/shared/useEditablePlainText.ts b/packages/tldraw/src/lib/shapes/shared/useEditablePlainText.ts
index 299768eb81c1..1ff45b3c56de 100644
--- a/packages/tldraw/src/lib/shapes/shared/useEditablePlainText.ts
+++ b/packages/tldraw/src/lib/shapes/shared/useEditablePlainText.ts
@@ -1,7 +1,7 @@
 import {
 	Editor,
+	ExtractShapeByProps,
 	TLShapeId,
-	TLUnknownShape,
 	getPointerInfo,
 	noop,
 	preventDefault,
@@ -13,7 +13,11 @@ import React, { useCallback, useEffect, useRef } from 'react'
 import { TextHelpers } from './TextHelpers'
 
 /** @public */
-export function useEditablePlainText(shapeId: TLShapeId, type: string, text?: string) {
+export function useEditablePlainText(
+	shapeId: TLShapeId,
+	type: ExtractShapeByProps<{ text: string }>['type'],
+	text?: string
+) {
 	const commonUseEditableTextHandlers = useEditableTextCommon(shapeId)
 	const isEditing = commonUseEditableTextHandlers.isEditing
 	const editor = useEditor()
@@ -75,7 +79,7 @@ export function useEditablePlainText(shapeId: TLShapeId, type: string, text?: st
 			if (editor.getEditingShapeId() !== shapeId) return
 
 			const normalizedPlaintext = TextHelpers.normalizeText(plaintext || '')
-			editor.updateShape<TLUnknownShape & { props: { text: string } }>({
+			editor.updateShape({
 				id: shapeId,
 				type,
 				props: { text: normalizedPlaintext },
diff --git a/packages/tldraw/src/lib/shapes/shared/useEditableRichText.ts b/packages/tldraw/src/lib/shapes/shared/useEditableRichText.ts
index e03c9feb7368..0d85870ab27b 100644
--- a/packages/tldraw/src/lib/shapes/shared/useEditableRichText.ts
+++ b/packages/tldraw/src/lib/shapes/shared/useEditableRichText.ts
@@ -1,10 +1,14 @@
-import { TLRichText, TLShapeId, TLUnknownShape, isAccelKey, useEditor } from '@tldraw/editor'
+import { ExtractShapeByProps, TLRichText, TLShapeId, isAccelKey, useEditor } from '@tldraw/editor'
 import { useCallback, useEffect, useRef } from 'react'
 import { isEmptyRichText } from '../../utils/text/richText'
 import { useEditableTextCommon } from './useEditablePlainText'
 
 /** @public */
-export function useEditableRichText(shapeId: TLShapeId, type: string, richText?: TLRichText) {
+export function useEditableRichText(
+	shapeId: TLShapeId,
+	type: ExtractShapeByProps<{ richText: TLRichText }>['type'],
+	richText?: TLRichText
+) {
 	const commonUseEditableTextHandlers = useEditableTextCommon(shapeId)
 	const isEditing = commonUseEditableTextHandlers.isEditing
 	const editor = useEditor()
@@ -39,7 +43,7 @@ export function useEditableRichText(shapeId: TLShapeId, type: string, richText?:
 		({ richText }: { richText: TLRichText }) => {
 			if (editor.getEditingShapeId() !== shapeId) return
 
-			editor.updateShape<TLUnknownShape & { props: { richText: TLRichText } }>({
+			editor.updateShape({
 				id: shapeId,
 				type,
 				props: { richText },
diff --git a/packages/tldraw/src/lib/shapes/text/TextShapeTool.test.ts b/packages/tldraw/src/lib/shapes/text/TextShapeTool.test.ts
index aef34d2527fd..bf83967ba96e 100644
--- a/packages/tldraw/src/lib/shapes/text/TextShapeTool.test.ts
+++ b/packages/tldraw/src/lib/shapes/text/TextShapeTool.test.ts
@@ -1,4 +1,4 @@
-import { DefaultTextAlignStyle, TLTextShape, toRichText } from '@tldraw/editor'
+import { DefaultTextAlignStyle, toRichText } from '@tldraw/editor'
 import { vi } from 'vitest'
 import { TestEditor } from '../../../test/TestEditor'
 import { TextShapeTool } from './TextShapeTool'
@@ -24,7 +24,7 @@ describe(TextShapeTool, () => {
 		editor.pointerUp()
 		editor.expectToBeIn('select.editing_shape')
 		// This comes from the component, not the state chart
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				...editor.getCurrentPageShapes()[0]!,
 				type: 'text',
@@ -96,7 +96,7 @@ describe('When in idle state', () => {
 		editor.expectToBeIn('select.editing_shape')
 
 		// Update the text shape with some content
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				...editor.getCurrentPageShapes()[0]!,
 				type: 'text',
@@ -133,7 +133,7 @@ describe('When in idle state', () => {
 		editor.expectToBeIn('select.editing_shape')
 
 		// Update the text shape with some content
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				...editor.getCurrentPageShapes()[0]!,
 				type: 'text',
diff --git a/packages/tldraw/src/lib/shapes/text/toolStates/Pointing.ts b/packages/tldraw/src/lib/shapes/text/toolStates/Pointing.ts
index b770c361fc07..e17e6a7e150a 100644
--- a/packages/tldraw/src/lib/shapes/text/toolStates/Pointing.ts
+++ b/packages/tldraw/src/lib/shapes/text/toolStates/Pointing.ts
@@ -124,7 +124,7 @@ export class Pointing extends StateNode {
 	}
 
 	private createTextShape(id: TLShapeId, point: Vec, autoSize: boolean, width: number) {
-		this.editor.createShape<TLTextShape>({
+		this.editor.createShape({
 			id,
 			type: 'text',
 			x: point.x,
diff --git a/packages/tldraw/src/lib/tools/EraserTool/childStates/Erasing.ts b/packages/tldraw/src/lib/tools/EraserTool/childStates/Erasing.ts
index 66c4678ea70d..14787b992495 100644
--- a/packages/tldraw/src/lib/tools/EraserTool/childStates/Erasing.ts
+++ b/packages/tldraw/src/lib/tools/EraserTool/childStates/Erasing.ts
@@ -1,7 +1,5 @@
 import {
 	StateNode,
-	TLFrameShape,
-	TLGroupShape,
 	TLPointerEventInfo,
 	TLShapeId,
 	isAccelKey,
@@ -37,8 +35,8 @@ export class Erasing extends StateNode {
 					if (this.editor.isShapeOrAncestorLocked(shape)) return true
 					//If the shape is a group or frame, check we're inside it when we start erasing
 					if (
-						this.editor.isShapeOfType<TLGroupShape>(shape, 'group') ||
-						this.editor.isShapeOfType<TLFrameShape>(shape, 'frame')
+						this.editor.isShapeOfType(shape, 'group') ||
+						this.editor.isShapeOfType(shape, 'frame')
 					) {
 						const pointInShapeShape = this.editor.getPointInShapeSpace(shape, originPagePoint)
 						const geometry = this.editor.getShapeGeometry(shape)
@@ -111,7 +109,7 @@ export class Erasing extends StateNode {
 		const minDist = this.editor.options.hitTestMargin / zoomLevel
 
 		for (const shape of currentPageShapes) {
-			if (editor.isShapeOfType<TLGroupShape>(shape, 'group')) continue
+			if (editor.isShapeOfType(shape, 'group')) continue
 
 			// Avoid testing masked shapes, unless the pointer is inside the mask
 			const pageMask = editor.getShapeMask(shape.id)
diff --git a/packages/tldraw/src/lib/tools/EraserTool/childStates/Pointing.ts b/packages/tldraw/src/lib/tools/EraserTool/childStates/Pointing.ts
index 7b8daa9b90ce..962010c85916 100644
--- a/packages/tldraw/src/lib/tools/EraserTool/childStates/Pointing.ts
+++ b/packages/tldraw/src/lib/tools/EraserTool/childStates/Pointing.ts
@@ -1,11 +1,4 @@
-import {
-	isAccelKey,
-	StateNode,
-	TLFrameShape,
-	TLGroupShape,
-	TLPointerEventInfo,
-	TLShapeId,
-} from '@tldraw/editor'
+import { isAccelKey, StateNode, TLPointerEventInfo, TLShapeId } from '@tldraw/editor'
 
 export class Pointing extends StateNode {
 	static override id = 'pointing'
@@ -27,10 +20,7 @@ export class Pointing extends StateNode {
 
 		for (let n = currentPageShapesSorted.length, i = n - 1; i >= 0; i--) {
 			const shape = currentPageShapesSorted[i]
-			if (
-				this.editor.isShapeOrAncestorLocked(shape) ||
-				this.editor.isShapeOfType<TLGroupShape>(shape, 'group')
-			) {
+			if (this.editor.isShapeOrAncestorLocked(shape) || this.editor.isShapeOfType(shape, 'group')) {
 				continue
 			}
 
@@ -42,10 +32,7 @@ export class Pointing extends StateNode {
 			) {
 				const hitShape = this.editor.getOutermostSelectableShape(shape)
 				// If we've hit a frame after hitting any other shape, stop here
-				if (
-					this.editor.isShapeOfType<TLFrameShape>(hitShape, 'frame') &&
-					erasing.size > initialSize
-				) {
+				if (this.editor.isShapeOfType(hitShape, 'frame') && erasing.size > initialSize) {
 					break
 				}
 
diff --git a/packages/tldraw/src/lib/tools/SelectTool/DragAndDropManager.ts b/packages/tldraw/src/lib/tools/SelectTool/DragAndDropManager.ts
index 2b789b49c1c7..183032f8cb54 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/DragAndDropManager.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/DragAndDropManager.ts
@@ -44,7 +44,7 @@ export class DragAndDropManager {
 
 		for (const shape of shapesToActuallyMove) {
 			const parent = editor.getShapeParent(shape)
-			if (parent && editor.isShapeOfType<TLGroupShape>(parent, 'group')) {
+			if (parent && editor.isShapeOfType(parent, 'group')) {
 				if (!movingGroups.has(parent)) {
 					movingGroups.add(parent)
 				}
@@ -70,9 +70,7 @@ export class DragAndDropManager {
 			}
 			this.initialIndices.set(shape.id, shape.index)
 
-			const group = editor.findShapeAncestor(shape, (s) =>
-				editor.isShapeOfType<TLGroupShape>(s, 'group')
-			)
+			const group = editor.findShapeAncestor(shape, (s) => editor.isShapeOfType(s, 'group'))
 			if (group) {
 				this.initialGroupIds.set(shape.id, group.id)
 			}
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/Brushing.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/Brushing.ts
index 6a930e150533..b8bab2847da2 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/Brushing.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/Brushing.ts
@@ -3,8 +3,6 @@ import {
 	Mat,
 	StateNode,
 	TLCancelEventInfo,
-	TLFrameShape,
-	TLGroupShape,
 	TLKeyboardEventInfo,
 	TLPageId,
 	TLPointerEventInfo,
@@ -57,9 +55,7 @@ export class Brushing extends StateNode {
 			editor
 				.getCurrentPageShapes()
 				.filter(
-					(shape) =>
-						editor.isShapeOfType<TLGroupShape>(shape, 'group') ||
-						editor.isShapeOrAncestorLocked(shape)
+					(shape) => editor.isShapeOfType(shape, 'group') || editor.isShapeOrAncestorLocked(shape)
 				)
 				.map((shape) => shape.id)
 		)
@@ -177,7 +173,7 @@ export class Brushing extends StateNode {
 
 			// If we're in wrap mode and the brush did not fully encloses the shape, it's a miss
 			// We also skip frames unless we've completely selected the frame.
-			if (isWrapping || editor.isShapeOfType<TLFrameShape>(shape, 'frame')) {
+			if (isWrapping || editor.isShapeOfType(shape, 'frame')) {
 				continue testAllShapes
 			}
 
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/Crop/children/Idle.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/Crop/children/Idle.ts
index e4e38c9bee02..cbcd0b4a7ce0 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/Crop/children/Idle.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/Crop/children/Idle.ts
@@ -2,7 +2,6 @@ import {
 	ShapeWithCrop,
 	StateNode,
 	TLClickEventInfo,
-	TLGroupShape,
 	TLKeyboardEventInfo,
 	TLPointerEventInfo,
 	Vec,
@@ -43,7 +42,7 @@ export class Idle extends StateNode {
 		switch (info.target) {
 			case 'canvas': {
 				const hitShape = getHitShapeOnCanvasPointerDown(this.editor)
-				if (hitShape && !this.editor.isShapeOfType<TLGroupShape>(hitShape, 'group')) {
+				if (hitShape && !this.editor.isShapeOfType(hitShape, 'group')) {
 					this.onPointerDown({
 						...info,
 						shape: hitShape,
@@ -191,7 +190,7 @@ export class Idle extends StateNode {
 				this.editor.markHistoryStoppingPoint('translate crop')
 			}
 
-			this.editor.updateShapes<ShapeWithCrop>([partial])
+			this.editor.updateShapes([partial])
 		}
 	}
 }
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/DraggingHandle.tsx b/packages/tldraw/src/lib/tools/SelectTool/childStates/DraggingHandle.tsx
index 407869b463ce..c75f564a2f0e 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/DraggingHandle.tsx
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/DraggingHandle.tsx
@@ -83,28 +83,39 @@ export class DraggingHandle extends StateNode {
 		// Find the adjacent handle
 		this.initialAdjacentHandle = null
 
-		// Start from the handle and work forward
-		for (let i = index + 1; i < handles.length; i++) {
-			const handle = handles[i]
-			if (handle.type === 'vertex' && handle.id !== 'middle' && handle.id !== info.handle.id) {
-				this.initialAdjacentHandle = handle
-				break
+		// First, check if the handle specifies a custom reference handle
+		if (info.handle.snapReferenceHandleId) {
+			const customHandle = handles.find((h) => h.id === info.handle.snapReferenceHandleId)
+			if (customHandle) {
+				this.initialAdjacentHandle = customHandle
 			}
 		}
 
-		// If still no handle, start from the end and work backward
+		// If no custom reference handle, use default behavior
 		if (!this.initialAdjacentHandle) {
-			for (let i = handles.length - 1; i >= 0; i--) {
+			// Start from the handle and work forward
+			for (let i = index + 1; i < handles.length; i++) {
 				const handle = handles[i]
 				if (handle.type === 'vertex' && handle.id !== 'middle' && handle.id !== info.handle.id) {
 					this.initialAdjacentHandle = handle
 					break
 				}
 			}
+
+			// If still no handle, start from the end and work backward
+			if (!this.initialAdjacentHandle) {
+				for (let i = handles.length - 1; i >= 0; i--) {
+					const handle = handles[i]
+					if (handle.type === 'vertex' && handle.id !== 'middle' && handle.id !== info.handle.id) {
+						this.initialAdjacentHandle = handle
+						break
+					}
+				}
+			}
 		}
 
 		// <!-- Only relevant to arrows
-		if (this.editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
+		if (this.editor.isShapeOfType(shape, 'arrow')) {
 			const initialBinding = getArrowBindings(this.editor, shape)[info.handle.id as 'start' | 'end']
 
 			this.isPrecise = false
@@ -217,7 +228,7 @@ export class DraggingHandle extends StateNode {
 			}
 			const endChanges = util.onHandleDragEnd?.(shape, handleDragInfo)
 			if (endChanges) {
-				this.editor.updateShapes([{ ...endChanges, id: shape.id, type: shape.type }])
+				this.editor.updateShapes([{ ...endChanges, id: shape.id }])
 			}
 		}
 
@@ -284,7 +295,7 @@ export class DraggingHandle extends StateNode {
 		if (!shape) return
 		const util = editor.getShapeUtil(shape)
 
-		const initialBinding = editor.isShapeOfType<TLArrowShape>(shape, 'arrow')
+		const initialBinding = editor.isShapeOfType(shape, 'arrow')
 			? getArrowBindings(editor, shape)[initialHandle.id as 'start' | 'end']
 			: undefined
 
@@ -341,10 +352,7 @@ export class DraggingHandle extends StateNode {
 		const next: TLShapePartial<any> = { id: shape.id, type: shape.type, ...changes }
 
 		// Arrows
-		if (
-			initialHandle.type === 'vertex' &&
-			this.editor.isShapeOfType<TLArrowShape>(shape, 'arrow')
-		) {
+		if (initialHandle.type === 'vertex' && this.editor.isShapeOfType(shape, 'arrow')) {
 			const bindingAfter = getArrowBindings(editor, shape)[initialHandle.id as 'start' | 'end']
 
 			if (bindingAfter) {
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/EditingShape.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/EditingShape.ts
index aac6b85f1dc3..440b8204e1bb 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/EditingShape.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/EditingShape.ts
@@ -3,10 +3,8 @@ import {
 	TLCancelEventInfo,
 	TLCompleteEventInfo,
 	tlenv,
-	TLFrameShape,
 	TLPointerEventInfo,
 	TLShape,
-	TLTextShape,
 } from '@tldraw/editor'
 import { getTextLabels } from '../../../utils/shapes/shapes'
 import { renderPlaintextFromRichText } from '../../../utils/text/richText'
@@ -109,7 +107,7 @@ export class EditingShape extends StateNode {
 				const textLabel = textLabels.length === 1 ? textLabels[0] : undefined
 				// N.B. One nuance here is that we want empty text fields to be removed from the canvas when the user clicks away from them.
 				const isEmptyTextShape =
-					this.editor.isShapeOfType<TLTextShape>(editingShape, 'text') &&
+					this.editor.isShapeOfType(editingShape, 'text') &&
 					renderPlaintextFromRichText(this.editor, editingShape.props.richText).trim() === ''
 				if (textLabel && !isEmptyTextShape) {
 					const pointInShapeSpace = this.editor.getPointInShapeSpace(
@@ -135,7 +133,7 @@ export class EditingShape extends StateNode {
 				} else {
 					if (selectingShape.id === editingShape.id) {
 						// If we clicked on a frame, while editing its heading, cancel editing
-						if (this.editor.isShapeOfType<TLFrameShape>(selectingShape, 'frame')) {
+						if (this.editor.isShapeOfType(selectingShape, 'frame')) {
 							this.editor.setEditingShape(null)
 							this.parent.transition('idle', info)
 						}
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts
index 1134d07215b7..b971fc3d36f9 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/Idle.ts
@@ -3,11 +3,9 @@ import {
 	StateNode,
 	TLAdjacentDirection,
 	TLClickEventInfo,
-	TLGroupShape,
 	TLKeyboardEventInfo,
 	TLPointerEventInfo,
 	TLShape,
-	TLTextShape,
 	Vec,
 	VecLike,
 	createShapeId,
@@ -190,7 +188,7 @@ export class Idle extends StateNode {
 				// unexpected results when working "inside of" a hollow shape.
 
 				const hitShape =
-					hoveredShape && !this.editor.isShapeOfType<TLGroupShape>(hoveredShape, 'group')
+					hoveredShape && !this.editor.isShapeOfType(hoveredShape, 'group')
 						? hoveredShape
 						: (this.editor.getSelectedShapeAtPoint(this.editor.inputs.currentPagePoint) ??
 							this.editor.getShapeAtPoint(this.editor.inputs.currentPagePoint, {
@@ -201,13 +199,13 @@ export class Idle extends StateNode {
 				const focusedGroupId = this.editor.getFocusedGroupId()
 
 				if (hitShape) {
-					if (this.editor.isShapeOfType<TLGroupShape>(hitShape, 'group')) {
+					if (this.editor.isShapeOfType(hitShape, 'group')) {
 						// Probably select the shape
 						selectOnCanvasPointerUp(this.editor, info)
 						return
 					} else {
 						const parent = this.editor.getShape(hitShape.parentId)
-						if (parent && this.editor.isShapeOfType<TLGroupShape>(parent, 'group')) {
+						if (parent && this.editor.isShapeOfType(parent, 'group')) {
 							// The shape is the direct child of a group. If the group is
 							// selected, then we can select the shape. If the group is the
 							// focus layer id, then we can double click into it as usual.
@@ -356,7 +354,7 @@ export class Idle extends StateNode {
 			case 'canvas': {
 				const hoveredShape = this.editor.getHoveredShape()
 				const hitShape =
-					hoveredShape && !this.editor.isShapeOfType<TLGroupShape>(hoveredShape, 'group')
+					hoveredShape && !this.editor.isShapeOfType(hoveredShape, 'group')
 						? hoveredShape
 						: this.editor.getShapeAtPoint(this.editor.inputs.currentPagePoint, {
 								margin: this.editor.options.hitTestMargin / this.editor.getZoomLevel(),
@@ -507,7 +505,7 @@ export class Idle extends StateNode {
 			}
 			case 'Tab': {
 				const selectedShapes = this.editor.getSelectedShapes()
-				if (selectedShapes.length) {
+				if (selectedShapes.length && !info.altKey) {
 					this.editor.selectAdjacentShape(info.shiftKey ? 'prev' : 'next')
 				}
 				break
@@ -525,9 +523,7 @@ export class Idle extends StateNode {
 				const selectedShapes = this.editor.getSelectedShapes()
 
 				// On enter, if every selected shape is a group, then select all of the children of the groups
-				if (
-					selectedShapes.every((shape) => this.editor.isShapeOfType<TLGroupShape>(shape, 'group'))
-				) {
+				if (selectedShapes.every((shape) => this.editor.isShapeOfType(shape, 'group'))) {
 					this.editor.setSelectedShapes(
 						selectedShapes.flatMap((shape) => this.editor.getSortedChildIdsForParent(shape.id))
 					)
@@ -557,7 +553,7 @@ export class Idle extends StateNode {
 			}
 			case 'Tab': {
 				const selectedShapes = this.editor.getSelectedShapes()
-				if (selectedShapes.length) {
+				if (selectedShapes.length && !info.altKey) {
 					this.editor.selectAdjacentShape(info.shiftKey ? 'prev' : 'next')
 				}
 				break
@@ -604,7 +600,7 @@ export class Idle extends StateNode {
 		const { x, y } = this.editor.inputs.currentPagePoint
 
 		// Allow this to trigger the max shapes reached alert
-		this.editor.createShapes<TLTextShape>([
+		this.editor.createShapes([
 			{
 				id,
 				type: 'text',
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingArrowLabel.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingArrowLabel.ts
index bd968b3268f6..5336cc0abda6 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingArrowLabel.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingArrowLabel.ts
@@ -124,7 +124,7 @@ export class PointingArrowLabel extends StateNode {
 		}
 
 		this.didDrag = true
-		this.editor.updateShape<TLArrowShape>({
+		this.editor.updateShape({
 			id: shape.id,
 			type: shape.type,
 			props: { labelPosition: nextLabelPosition },
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingHandle.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingHandle.ts
index 03e8ce0e3ff8..5a4d73abd134 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingHandle.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingHandle.ts
@@ -1,12 +1,4 @@
-import {
-	Editor,
-	StateNode,
-	TLArrowShape,
-	TLHandle,
-	TLNoteShape,
-	TLPointerEventInfo,
-	Vec,
-} from '@tldraw/editor'
+import { Editor, StateNode, TLHandle, TLNoteShape, TLPointerEventInfo, Vec } from '@tldraw/editor'
 import { updateArrowTargetState } from '../../../shapes/arrow/arrowTargetState'
 import { getArrowBindings } from '../../../shapes/arrow/shared'
 import {
@@ -29,7 +21,7 @@ export class PointingHandle extends StateNode {
 		this.didCtrlOnEnter = info.accelKey
 
 		const { shape } = info
-		if (this.editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
+		if (this.editor.isShapeOfType(shape, 'arrow')) {
 			const initialBindings = getArrowBindings(this.editor, shape)
 			const currentBinding = initialBindings[info.handle.id as 'start' | 'end']
 			const oppositeBinding = initialBindings[info.handle.id === 'start' ? 'end' : 'start']
@@ -58,7 +50,7 @@ export class PointingHandle extends StateNode {
 	override onPointerUp() {
 		const { shape, handle } = this.info
 
-		if (this.editor.isShapeOfType<TLNoteShape>(shape, 'note')) {
+		if (this.editor.isShapeOfType(shape, 'note')) {
 			const { editor } = this
 			const nextNote = getNoteForAdjacentPosition(editor, shape, handle, false)
 			if (nextNote) {
@@ -90,7 +82,7 @@ export class PointingHandle extends StateNode {
 		if (editor.getIsReadonly()) return
 		const { shape, handle } = this.info
 
-		if (editor.isShapeOfType<TLNoteShape>(shape, 'note')) {
+		if (editor.isShapeOfType(shape, 'note')) {
 			const nextNote = getNoteForAdjacentPosition(editor, shape, handle, true)
 			if (nextNote) {
 				// Center the shape on the current pointer
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingSelection.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingSelection.ts
index dd6d74aa21fe..08afaf03c950 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingSelection.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/PointingSelection.ts
@@ -1,4 +1,4 @@
-import { StateNode, TLClickEventInfo, TLGroupShape, TLPointerEventInfo } from '@tldraw/editor'
+import { StateNode, TLClickEventInfo, TLPointerEventInfo } from '@tldraw/editor'
 import { selectOnCanvasPointerUp } from '../../selection-logic/selectOnCanvasPointerUp'
 
 export class PointingSelection extends StateNode {
@@ -35,7 +35,7 @@ export class PointingSelection extends StateNode {
 	override onDoubleClick?(info: TLClickEventInfo) {
 		const hoveredShape = this.editor.getHoveredShape()
 		const hitShape =
-			hoveredShape && !this.editor.isShapeOfType<TLGroupShape>(hoveredShape, 'group')
+			hoveredShape && !this.editor.isShapeOfType(hoveredShape, 'group')
 				? hoveredShape
 				: this.editor.getShapeAtPoint(this.editor.inputs.currentPagePoint, {
 						hitInside: true,
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/Resizing.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/Resizing.ts
index af65b7b2d64c..433a1d848214 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/Resizing.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/Resizing.ts
@@ -7,12 +7,10 @@ import {
 	SelectionCorner,
 	SelectionEdge,
 	StateNode,
-	TLFrameShape,
 	TLPointerEventInfo,
 	TLShape,
 	TLShapeId,
 	TLShapePartial,
-	TLTextShape,
 	TLTickEventInfo,
 	Vec,
 	VecLike,
@@ -228,7 +226,7 @@ export class Resizing extends StateNode {
 
 		if (shapeSnapshots.size === 1) {
 			const onlySnapshot = [...shapeSnapshots.values()][0]!
-			if (this.editor.isShapeOfType<TLTextShape>(onlySnapshot.shape, 'text')) {
+			if (this.editor.isShapeOfType(onlySnapshot.shape, 'text')) {
 				isAspectRatioLocked = !(this.info.handle === 'left' || this.info.handle === 'right')
 			}
 		}
@@ -528,7 +526,7 @@ export class Resizing extends StateNode {
 			// descendants (easy) but also flagging with behavior like "resize" or "keep absolute position" or "reposition only with accel key",
 			// though I'm not sure where that would be defined; perhaps better handled with onResizeStart / onResize callbacks on the util, and
 			// pass `accelKeyIsPressed` as well as `accelKeyWasPressed`?
-			if (editor.isShapeOfType<TLFrameShape>(shape, 'frame')) {
+			if (editor.isShapeOfType(shape, 'frame')) {
 				frames.push({
 					id: shape.id,
 					children: compact(
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/ScribbleBrushing.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/ScribbleBrushing.ts
index 7a5fd4290fac..77e508869ec5 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/ScribbleBrushing.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/ScribbleBrushing.ts
@@ -1,8 +1,6 @@
 import {
 	Geometry2d,
 	StateNode,
-	TLFrameShape,
-	TLGroupShape,
 	TLShape,
 	TLShapeId,
 	Vec,
@@ -104,7 +102,7 @@ export class ScribbleBrushing extends StateNode {
 
 			// If the shape is a group or is already selected or locked, don't select it
 			if (
-				editor.isShapeOfType<TLGroupShape>(shape, 'group') ||
+				editor.isShapeOfType(shape, 'group') ||
 				newlySelectedShapeIds.has(shape.id) ||
 				editor.isShapeOrAncestorLocked(shape)
 			) {
@@ -115,7 +113,7 @@ export class ScribbleBrushing extends StateNode {
 
 			// If the scribble started inside of the frame, don't select it
 			if (
-				editor.isShapeOfType<TLFrameShape>(shape, 'frame') &&
+				editor.isShapeOfType(shape, 'frame') &&
 				geometry.bounds.containsPoint(editor.getPointInShapeSpace(shape, originPagePoint))
 			) {
 				continue
diff --git a/packages/tldraw/src/lib/tools/SelectTool/childStates/Translating.ts b/packages/tldraw/src/lib/tools/SelectTool/childStates/Translating.ts
index 3c730eb597bf..9372e6f41f58 100644
--- a/packages/tldraw/src/lib/tools/SelectTool/childStates/Translating.ts
+++ b/packages/tldraw/src/lib/tools/SelectTool/childStates/Translating.ts
@@ -407,9 +407,7 @@ function getTranslatingSnapshot(editor: Editor) {
 	const { originPagePoint } = editor.inputs
 
 	const allHoveredNotes = shapeSnapshots.filter(
-		(s) =>
-			editor.isShapeOfType<TLNoteShape>(s.shape, 'note') &&
-			editor.isPointInShape(s.shape, originPagePoint)
+		(s) => editor.isShapeOfType(s.shape, 'note') && editor.isPointInShape(s.shape, originPagePoint)
 	) as (MovingShapeSnapshot & { shape: TLNoteShape })[]
 
 	if (allHoveredNotes.length === 0) {
diff --git a/packages/tldraw/src/lib/ui.css b/packages/tldraw/src/lib/ui.css
index 69fe0bd7480e..527f0b5df322 100644
--- a/packages/tldraw/src/lib/ui.css
+++ b/packages/tldraw/src/lib/ui.css
@@ -514,12 +514,10 @@
 /* If mobile use 16px as font size */
 /* On iOS, font size under 16px in an input will make the page zoom into the input 🤦‍♂️ */
 /* https://css-tricks.com/16px-or-larger-text-prevents-ios-form-zoom/ */
-@media (max-width: 600px) {
-	@supports (-webkit-touch-callout: none) {
-		/* CSS specific to iOS devices */
-		.tlui-input {
-			font-size: 16px;
-		}
+@supports (-webkit-touch-callout: none) {
+	/* CSS specific to iOS devices */
+	.tlui-input {
+		font-size: 16px;
 	}
 }
 
diff --git a/packages/tldraw/src/lib/ui/components/DefaultDebugPanel.tsx b/packages/tldraw/src/lib/ui/components/DefaultDebugPanel.tsx
index b88ef71d3e55..a5db2032850a 100644
--- a/packages/tldraw/src/lib/ui/components/DefaultDebugPanel.tsx
+++ b/packages/tldraw/src/lib/ui/components/DefaultDebugPanel.tsx
@@ -110,7 +110,7 @@ function FPS() {
 					isSlow = !isSlow
 				}
 
-				fpsRef.current!.innerHTML = `FPS ${fps.toString()} (max: ${maxKnownFps})`
+				fpsRef.current!.innerHTML = `FPS ${fps.toString()}`
 				fpsRef.current!.className =
 					`tlui-debug-panel__fps` + (isSlow ? ` tlui-debug-panel__fps__slow` : ``)
 
diff --git a/packages/tldraw/src/lib/ui/components/Dialogs.tsx b/packages/tldraw/src/lib/ui/components/Dialogs.tsx
index 45772766a0d0..f6343b425c52 100644
--- a/packages/tldraw/src/lib/ui/components/Dialogs.tsx
+++ b/packages/tldraw/src/lib/ui/components/Dialogs.tsx
@@ -4,12 +4,7 @@ import { memo, useCallback, useRef } from 'react'
 import { TLUiDialog, useDialogs } from '../context/dialogs'
 
 /** @internal */
-const TldrawUiDialog = ({
-	id,
-	component: ModalContent,
-	onClose,
-	preventBackgroundClose,
-}: TLUiDialog) => {
+const TldrawUiDialog = ({ id, component: ModalContent, preventBackgroundClose }: TLUiDialog) => {
 	const { removeDialog } = useDialogs()
 	const mouseDownInsideContentRef = useRef(false)
 
@@ -18,17 +13,10 @@ const TldrawUiDialog = ({
 	const handleOpenChange = useCallback(
 		(isOpen: boolean) => {
 			if (!isOpen) {
-				if (onClose) {
-					try {
-						onClose()
-					} catch (err: any) {
-						console.warn(err)
-					}
-				}
 				removeDialog(id)
 			}
 		},
-		[id, onClose, removeDialog]
+		[id, removeDialog]
 	)
 
 	return (
diff --git a/packages/tldraw/src/lib/ui/components/EditLinkDialog.tsx b/packages/tldraw/src/lib/ui/components/EditLinkDialog.tsx
index 1a8dc7a9bb8d..a62a89d0d24e 100644
--- a/packages/tldraw/src/lib/ui/components/EditLinkDialog.tsx
+++ b/packages/tldraw/src/lib/ui/components/EditLinkDialog.tsx
@@ -1,4 +1,4 @@
-import { T, TLBaseShape, track, useEditor } from '@tldraw/editor'
+import { ExtractShapeByProps, T, TLShape, track, useEditor } from '@tldraw/editor'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { TLUiDialogProps } from '../context/dialogs'
 import { useTranslation } from '../hooks/useTranslation/useTranslation'
@@ -25,20 +25,28 @@ function validateUrl(url: string) {
 	return { isValid: false, hasProtocol: false }
 }
 
-type ShapeWithUrl = TLBaseShape<string, { url: string }>
+type ShapeWithUrl = ExtractShapeByProps<{ url: string }>
+
+function isShapeWithUrl(shape: TLShape | null | undefined): shape is ShapeWithUrl {
+	return !!(shape && 'url' in shape.props && typeof shape.props.url === 'string')
+}
+
+function assertShapeWithUrl(shape: TLShape | null | undefined): asserts shape is ShapeWithUrl {
+	if (!isShapeWithUrl(shape)) {
+		throw new Error('Shape is not a valid ShapeWithUrl')
+	}
+}
 
 export const EditLinkDialog = track(function EditLinkDialog({ onClose }: TLUiDialogProps) {
 	const editor = useEditor()
 
 	const selectedShape = editor.getOnlySelectedShape()
 
-	if (
-		!(selectedShape && 'url' in selectedShape.props && typeof selectedShape.props.url === 'string')
-	) {
+	if (!isShapeWithUrl(selectedShape)) {
 		return null
 	}
 
-	return <EditLinkDialogInner onClose={onClose} selectedShape={selectedShape as ShapeWithUrl} />
+	return <EditLinkDialogInner onClose={onClose} selectedShape={selectedShape} />
 })
 
 export const EditLinkDialogInner = track(function EditLinkDialogInner({
@@ -98,6 +106,7 @@ export const EditLinkDialogInner = track(function EditLinkDialogInner({
 	const handleClear = useCallback(() => {
 		const onlySelectedShape = editor.getOnlySelectedShape()
 		if (!onlySelectedShape) return
+		assertShapeWithUrl(onlySelectedShape)
 		editor.updateShapes([
 			{ id: onlySelectedShape.id, type: onlySelectedShape.type, props: { url: '' } },
 		])
@@ -108,6 +117,7 @@ export const EditLinkDialogInner = track(function EditLinkDialogInner({
 		const onlySelectedShape = editor.getOnlySelectedShape()
 
 		if (!onlySelectedShape) return
+		assertShapeWithUrl(onlySelectedShape)
 
 		// ? URL is a magic value
 		if (onlySelectedShape && 'url' in onlySelectedShape.props) {
diff --git a/packages/tldraw/src/lib/ui/components/PageMenu/DefaultPageMenu.tsx b/packages/tldraw/src/lib/ui/components/PageMenu/DefaultPageMenu.tsx
index 7bcce4e518ef..b1a337c6ec0b 100644
--- a/packages/tldraw/src/lib/ui/components/PageMenu/DefaultPageMenu.tsx
+++ b/packages/tldraw/src/lib/ui/components/PageMenu/DefaultPageMenu.tsx
@@ -3,7 +3,6 @@ import {
 	TLPageId,
 	releasePointerCapture,
 	setPointerCapture,
-	tlenv,
 	useEditor,
 	useValue,
 } from '@tldraw/editor'
@@ -306,6 +305,8 @@ export const DefaultPageMenu = memo(function DefaultPageMenu() {
 		[editor, trackEvent]
 	)
 
+	const shouldUseWindowPrompt = breakpoint < PORTRAIT_BREAKPOINT.TABLET_SM && isCoarsePointer
+
 	return (
 		<TldrawUiPopover id="pages" onOpenChange={onOpenChange} open={isOpen}>
 			<TldrawUiPopoverTrigger data-testid="main.page-menu">
@@ -390,7 +391,7 @@ export const DefaultPageMenu = memo(function DefaultPageMenu() {
 									>
 										<TldrawUiButtonIcon icon="drag-handle-dots" />
 									</TldrawUiButton>
-									{breakpoint < PORTRAIT_BREAKPOINT.TABLET_SM && isCoarsePointer ? (
+									{shouldUseWindowPrompt ? (
 										// sigh, this is a workaround for iOS Safari
 										// because the device and the radix popover seem
 										// to be fighting over scroll position. Nothing
@@ -399,7 +400,7 @@ export const DefaultPageMenu = memo(function DefaultPageMenu() {
 											type="normal"
 											className="tlui-page-menu__item__button"
 											onClick={() => {
-												const name = window.prompt('Rename page', page.name)
+												const name = window.prompt(msg('action.rename'), page.name)
 												if (name && name !== page.name) {
 													renamePage(page.id, name)
 												}
@@ -465,8 +466,8 @@ export const DefaultPageMenu = memo(function DefaultPageMenu() {
 												item={page}
 												listSize={pages.length}
 												onRename={() => {
-													if (tlenv.isIos) {
-														const name = window.prompt('Rename page', page.name)
+													if (shouldUseWindowPrompt) {
+														const name = window.prompt(msg('action.rename'), page.name)
 														if (name && name !== page.name) {
 															renamePage(page.id, name)
 														}
diff --git a/packages/tldraw/src/lib/ui/components/Toolbar/AltTextEditor.tsx b/packages/tldraw/src/lib/ui/components/Toolbar/AltTextEditor.tsx
index f0e86e137593..9112cc6b2884 100644
--- a/packages/tldraw/src/lib/ui/components/Toolbar/AltTextEditor.tsx
+++ b/packages/tldraw/src/lib/ui/components/Toolbar/AltTextEditor.tsx
@@ -1,4 +1,4 @@
-import { preventDefault, TLShape, TLShapeId, useEditor } from '@tldraw/editor'
+import { ExtractShapeByProps, preventDefault, TLShape, TLShapeId, useEditor } from '@tldraw/editor'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useUiEvents } from '../../context/events'
 import { useTranslation } from '../../hooks/useTranslation/useTranslation'
@@ -31,7 +31,7 @@ export function AltTextEditor({ shapeId, onClose, source }: AltTextEditorProps)
 
 	const handleComplete = () => {
 		trackEvent('set-alt-text', { source })
-		const shape = editor.getShape<TLShape & { props: { altText: string } }>(shapeId)
+		const shape = editor.getShape<ExtractShapeByProps<{ altText: string }>>(shapeId)
 		if (!shape) return
 		editor.updateShapes([
 			{
diff --git a/packages/tldraw/src/lib/ui/components/Toolbar/DefaultRichTextToolbarContent.tsx b/packages/tldraw/src/lib/ui/components/Toolbar/DefaultRichTextToolbarContent.tsx
index e7dc6cbe0160..d585a9cc7cc5 100644
--- a/packages/tldraw/src/lib/ui/components/Toolbar/DefaultRichTextToolbarContent.tsx
+++ b/packages/tldraw/src/lib/ui/components/Toolbar/DefaultRichTextToolbarContent.tsx
@@ -54,6 +54,9 @@ export function DefaultRichTextToolbarContent({
 	// todo: we could make this a prop
 	const actions = useMemo(() => {
 		function handleOp(name: string, op: string) {
+			// Check if the editor view is available before calling operations
+			if (!textEditor.view) return
+
 			trackEvent('rich-text', { operation: name as any, source })
 			// @ts-expect-error typing this is annoying at the moment.
 			textEditor.chain().focus()[op]().run()
@@ -109,7 +112,7 @@ export function DefaultRichTextToolbarContent({
 	}, [textEditor, trackEvent, onEditLinkStart])
 
 	return actions.map(({ name, attrs, onSelect }) => {
-		const isActive = textEditor.isActive(name, attrs)
+		const isActive = textEditor.view ? textEditor.isActive(name, attrs) : false
 		return (
 			<TldrawUiToolbarButton
 				key={name}
diff --git a/packages/tldraw/src/lib/ui/components/Toolbar/LinkEditor.tsx b/packages/tldraw/src/lib/ui/components/Toolbar/LinkEditor.tsx
index 82861d81e613..86d2443632d6 100644
--- a/packages/tldraw/src/lib/ui/components/Toolbar/LinkEditor.tsx
+++ b/packages/tldraw/src/lib/ui/components/Toolbar/LinkEditor.tsx
@@ -1,4 +1,4 @@
-import { preventDefault, TiptapEditor, useEditor } from '@tldraw/editor'
+import { openWindow, preventDefault, TiptapEditor, useEditor } from '@tldraw/editor'
 import { useEffect, useRef, useState } from 'react'
 import { useUiEvents } from '../../context/events'
 import { useTranslation } from '../../hooks/useTranslation/useTranslation'
@@ -44,7 +44,7 @@ export function LinkEditor({ textEditor, value: initialValue, onClose }: LinkEdi
 
 	const handleVisitLink = () => {
 		trackEvent('rich-text', { operation: 'link-visit', source })
-		window.open(linkifiedValue, '_blank', 'noopener, noreferrer')
+		openWindow(linkifiedValue, '_blank')
 		onClose()
 	}
 
diff --git a/packages/tldraw/src/lib/ui/components/menu-items.tsx b/packages/tldraw/src/lib/ui/components/menu-items.tsx
index 298e42baeb9d..23802cadb3ce 100644
--- a/packages/tldraw/src/lib/ui/components/menu-items.tsx
+++ b/packages/tldraw/src/lib/ui/components/menu-items.tsx
@@ -1,12 +1,4 @@
-import {
-	TLBookmarkShape,
-	TLEmbedShape,
-	TLFrameShape,
-	TLImageShape,
-	TLPageId,
-	useEditor,
-	useValue,
-} from '@tldraw/editor'
+import { TLPageId, useEditor, useValue } from '@tldraw/editor'
 import { supportsDownloadingOriginal } from '../context/actions'
 import { useUiEvents } from '../context/events'
 import { useToasts } from '../context/toasts'
@@ -64,7 +56,7 @@ export function FlattenMenuItem() {
 			const selectedShapeIds = editor.getSelectedShapeIds()
 			if (selectedShapeIds.length === 0) return false
 			const onlySelectedShape = editor.getOnlySelectedShape()
-			if (onlySelectedShape && editor.isShapeOfType<TLImageShape>(onlySelectedShape, 'image')) {
+			if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'image')) {
 				return false
 			}
 			return true
@@ -117,7 +109,7 @@ export function RemoveFrameMenuItem() {
 		() => {
 			const selectedShapes = editor.getSelectedShapes()
 			if (selectedShapes.length === 0) return false
-			return selectedShapes.every((shape) => editor.isShapeOfType<TLFrameShape>(shape, 'frame'))
+			return selectedShapes.every((shape) => editor.isShapeOfType(shape, 'frame'))
 		},
 		[editor]
 	)
@@ -135,7 +127,7 @@ export function FitFrameToContentMenuItem() {
 			const onlySelectedShape = editor.getOnlySelectedShape()
 			if (!onlySelectedShape) return false
 			return (
-				editor.isShapeOfType<TLFrameShape>(onlySelectedShape, 'frame') &&
+				editor.isShapeOfType(onlySelectedShape, 'frame') &&
 				editor.getSortedChildIdsForParent(onlySelectedShape).length > 0
 			)
 		},
@@ -518,7 +510,7 @@ export function ConvertToBookmarkMenuItem() {
 			const onlySelectedShape = editor.getOnlySelectedShape()
 			if (!onlySelectedShape) return false
 			return !!(
-				editor.isShapeOfType<TLEmbedShape>(onlySelectedShape, 'embed') &&
+				editor.isShapeOfType(onlySelectedShape, 'embed') &&
 				onlySelectedShape.props.url &&
 				!editor.isShapeOrAncestorLocked(onlySelectedShape)
 			)
@@ -542,7 +534,7 @@ export function ConvertToEmbedMenuItem() {
 			const onlySelectedShape = editor.getOnlySelectedShape()
 			if (!onlySelectedShape) return false
 			return !!(
-				editor.isShapeOfType<TLBookmarkShape>(onlySelectedShape, 'bookmark') &&
+				editor.isShapeOfType(onlySelectedShape, 'bookmark') &&
 				onlySelectedShape.props.url &&
 				getEmbedDefinition(onlySelectedShape.props.url) &&
 				!editor.isShapeOrAncestorLocked(onlySelectedShape)
diff --git a/packages/tldraw/src/lib/ui/components/primitives/Button/TldrawUiButton.tsx b/packages/tldraw/src/lib/ui/components/primitives/Button/TldrawUiButton.tsx
index 667f9b81a656..47be86bb0721 100644
--- a/packages/tldraw/src/lib/ui/components/primitives/Button/TldrawUiButton.tsx
+++ b/packages/tldraw/src/lib/ui/components/primitives/Button/TldrawUiButton.tsx
@@ -6,6 +6,7 @@ export interface TLUiButtonProps extends React.HTMLAttributes<HTMLButtonElement>
 	disabled?: boolean
 	isActive?: boolean
 	type: 'normal' | 'primary' | 'danger' | 'low' | 'icon' | 'tool' | 'menu' | 'help'
+	htmlButtonType?: 'button' | 'submit' | 'reset'
 }
 
 const namedClassNamesSoThatICanGrepForThis = {
@@ -21,11 +22,11 @@ const namedClassNamesSoThatICanGrepForThis = {
 
 /** @public @react */
 export const TldrawUiButton = React.forwardRef<HTMLButtonElement, TLUiButtonProps>(
-	function TldrawUiButton({ children, type, isActive, ...props }, ref) {
+	function TldrawUiButton({ children, type, htmlButtonType, isActive, ...props }, ref) {
 		return (
 			<button
 				ref={ref}
-				type="button"
+				type={htmlButtonType || 'button'}
 				draggable={false}
 				data-isactive={isActive}
 				{...props}
diff --git a/packages/tldraw/src/lib/ui/components/primitives/menus/TldrawUiMenuItem.tsx b/packages/tldraw/src/lib/ui/components/primitives/menus/TldrawUiMenuItem.tsx
index c1c342aab945..b4bbcc9de106 100644
--- a/packages/tldraw/src/lib/ui/components/primitives/menus/TldrawUiMenuItem.tsx
+++ b/packages/tldraw/src/lib/ui/components/primitives/menus/TldrawUiMenuItem.tsx
@@ -134,6 +134,7 @@ export function TldrawUiMenuItem<
 						{iconLeft && <TldrawUiButtonIcon icon={iconLeft} small />}
 						<TldrawUiButtonLabel>{labelStr}</TldrawUiButtonLabel>
 						{kbd && <TldrawUiKbd>{kbd}</TldrawUiKbd>}
+						{icon && <TldrawUiButtonIcon icon={icon} small />}
 					</TldrawUiButton>
 				</TldrawUiDropdownMenuItem>
 			)
diff --git a/packages/tldraw/src/lib/ui/context/actions.tsx b/packages/tldraw/src/lib/ui/context/actions.tsx
index 25389b52ca22..cecf613510e3 100644
--- a/packages/tldraw/src/lib/ui/context/actions.tsx
+++ b/packages/tldraw/src/lib/ui/context/actions.tsx
@@ -6,10 +6,7 @@ import {
 	HALF_PI,
 	PageRecordType,
 	Result,
-	TLBookmarkShape,
 	TLEmbedShape,
-	TLFrameShape,
-	TLGroupShape,
 	TLImageShape,
 	TLShape,
 	TLShapeId,
@@ -327,7 +324,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 							.getSelectedShapes()
 							.filter(
 								(shape): shape is TLTextShape =>
-									editor.isShapeOfType<TLTextShape>(shape, 'text') && shape.props.autoSize === false
+									editor.isShapeOfType(shape, 'text') && shape.props.autoSize === false
 							)
 						editor.updateShapes(
 							shapes.map((shape) => {
@@ -362,7 +359,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 						return
 					}
 					const shape = editor.getShape(ids[0])
-					if (!shape || !editor.isShapeOfType<TLEmbedShape>(shape, 'embed')) {
+					if (!shape || !editor.isShapeOfType(shape, 'embed')) {
 						console.error(warnMsg)
 						return
 					}
@@ -401,8 +398,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					const creationPromises: Promise<Result<any, any>>[] = []
 
 					for (const shape of shapes) {
-						if (!shape || !editor.isShapeOfType<TLEmbedShape>(shape, 'embed') || !shape.props.url)
-							continue
+						if (!shape || !editor.isShapeOfType(shape, 'embed') || !shape.props.url) continue
 
 						const center = editor.getShapePageBounds(shape)?.center
 
@@ -441,7 +437,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 						const createList: TLShapePartial[] = []
 						const deleteList: TLShapeId[] = []
 						for (const shape of shapes) {
-							if (!editor.isShapeOfType<TLBookmarkShape>(shape, 'bookmark')) continue
+							if (!editor.isShapeOfType(shape, 'bookmark')) continue
 
 							const { url } = shape.props
 
@@ -552,7 +548,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 
 					trackEvent('group-shapes', { source })
 					const onlySelectedShape = editor.getOnlySelectedShape()
-					if (onlySelectedShape && editor.isShapeOfType<TLGroupShape>(onlySelectedShape, 'group')) {
+					if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'group')) {
 						editor.markHistoryStoppingPoint('ungroup')
 						editor.ungroupShapes(editor.getSelectedShapeIds())
 					} else {
@@ -572,7 +568,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					const selectedShapes = editor.getSelectedShapes()
 					if (
 						selectedShapes.length > 0 &&
-						selectedShapes.every((shape) => editor.isShapeOfType<TLFrameShape>(shape, 'frame'))
+						selectedShapes.every((shape) => editor.isShapeOfType(shape, 'frame'))
 					) {
 						editor.markHistoryStoppingPoint('remove-frame')
 						removeFrame(
@@ -590,7 +586,7 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 
 					trackEvent('fit-frame-to-content', { source })
 					const onlySelectedShape = editor.getOnlySelectedShape()
-					if (onlySelectedShape && editor.isShapeOfType<TLFrameShape>(onlySelectedShape, 'frame')) {
+					if (onlySelectedShape && editor.isShapeOfType(onlySelectedShape, 'frame')) {
 						editor.markHistoryStoppingPoint('fit-frame-to-content')
 						fitFrameToContent(editor, onlySelectedShape.id)
 					}
@@ -1495,6 +1491,22 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					trackEvent('set-style', { source, id: style.id, value: 'fill' })
 				},
 			},
+			{
+				id: 'select-fill-lined-fill',
+				label: 'fill-style.lined-fill',
+				kbd: 'alt+shift+f',
+				onSelect(source) {
+					const style = DefaultFillStyle
+					editor.run(() => {
+						editor.markHistoryStoppingPoint('change-fill')
+						if (editor.isIn('select')) {
+							editor.setStyleForSelectedShapes(style, 'lined-fill')
+						}
+						editor.setStyleForNextShapes(style, 'lined-fill')
+					})
+					trackEvent('set-style', { source, id: style.id, value: 'lined-fill' })
+				},
+			},
 			{
 				id: 'flatten-to-image',
 				label: 'action.flatten-to-image',
@@ -1583,8 +1595,8 @@ export function ActionsProvider({ overrides, children }: ActionsProviderProps) {
 					const onlySelectedShape = editor.getOnlySelectedShape()
 					if (
 						onlySelectedShape &&
-						(editor.isShapeOfType<TLImageShape>(onlySelectedShape, 'image') ||
-							editor.isShapeOfType<TLVideoShape>(onlySelectedShape, 'video'))
+						(editor.isShapeOfType(onlySelectedShape, 'image') ||
+							editor.isShapeOfType(onlySelectedShape, 'video'))
 					) {
 						const firstToolbarButton = editor
 							.getContainer()
diff --git a/packages/tldraw/src/lib/ui/context/events.tsx b/packages/tldraw/src/lib/ui/context/events.tsx
index 4a220418aa00..ce768970217e 100644
--- a/packages/tldraw/src/lib/ui/context/events.tsx
+++ b/packages/tldraw/src/lib/ui/context/events.tsx
@@ -24,6 +24,7 @@ export type TLUiEventSource =
 	| 'rich-text-menu'
 	| 'image-toolbar'
 	| 'video-toolbar'
+	| 'fairy-panel'
 	| 'unknown'
 
 /** @public */
diff --git a/packages/tldraw/src/lib/ui/getLocalFiles.ts b/packages/tldraw/src/lib/ui/getLocalFiles.ts
index f9165c7b8763..2c031febb87a 100644
--- a/packages/tldraw/src/lib/ui/getLocalFiles.ts
+++ b/packages/tldraw/src/lib/ui/getLocalFiles.ts
@@ -9,17 +9,34 @@ export function getLocalFiles(options?: {
 		input.type = 'file'
 		input.accept = mimeTypes?.join(',')
 		input.multiple = allowMultiple
+		input.style.display = 'none'
+
+		function dispose() {
+			input.removeEventListener('change', onchange)
+			input.removeEventListener('cancel', oncancel)
+			input.remove()
+		}
 
 		async function onchange(e: Event) {
 			const fileList = (e.target as HTMLInputElement).files
-			if (!fileList || fileList.length === 0) return
+			if (!fileList || fileList.length === 0) {
+				resolve([])
+				dispose()
+				return
+			}
 			const files = Array.from(fileList)
 			input.value = ''
 			resolve(files)
-			input.removeEventListener('change', onchange)
-			input.remove()
+			dispose()
+		}
+
+		function oncancel() {
+			resolve([])
+			dispose()
 		}
 
+		document.body.appendChild(input)
+		input.addEventListener('cancel', oncancel)
 		input.addEventListener('change', onchange)
 		input?.click()
 	})
diff --git a/packages/tldraw/src/lib/ui/hooks/menu-hooks.ts b/packages/tldraw/src/lib/ui/hooks/menu-hooks.ts
index 1d401c0f9b1a..90807b0f1c76 100644
--- a/packages/tldraw/src/lib/ui/hooks/menu-hooks.ts
+++ b/packages/tldraw/src/lib/ui/hooks/menu-hooks.ts
@@ -1,14 +1,4 @@
-import {
-	Editor,
-	TLArrowShape,
-	TLDrawShape,
-	TLGroupShape,
-	TLImageShape,
-	TLLineShape,
-	TLTextShape,
-	useEditor,
-	useValue,
-} from '@tldraw/editor'
+import { Editor, useEditor, useValue } from '@tldraw/editor'
 import { getArrowBindings } from '../../shapes/arrow/shared'
 
 function shapesWithUnboundArrows(editor: Editor) {
@@ -19,7 +9,7 @@ function shapesWithUnboundArrows(editor: Editor) {
 
 	return selectedShapes.filter((shape) => {
 		if (!shape) return false
-		if (editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
+		if (editor.isShapeOfType(shape, 'arrow')) {
 			const bindings = getArrowBindings(editor, shape)
 			if (bindings.start || bindings.end) return false
 		}
@@ -52,7 +42,7 @@ export const useAllowGroup = () => {
 			if (selectedShapes.length < 2) return false
 
 			for (const shape of selectedShapes) {
-				if (editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
+				if (editor.isShapeOfType(shape, 'arrow')) {
 					const bindings = getArrowBindings(editor, shape)
 					if (bindings.start) {
 						// if the other shape is not among the selected shapes...
@@ -163,7 +153,7 @@ export function useShowAutoSizeToggle() {
 			const selectedShapes = editor.getSelectedShapes()
 			return (
 				selectedShapes.length === 1 &&
-				editor.isShapeOfType<TLTextShape>(selectedShapes[0], 'text') &&
+				editor.isShapeOfType(selectedShapes[0], 'text') &&
 				selectedShapes[0].props.autoSize === false
 			)
 		},
@@ -196,11 +186,11 @@ export function useOnlyFlippableShape() {
 			const shape = editor.getOnlySelectedShape()
 			return (
 				shape &&
-				(editor.isShapeOfType<TLGroupShape>(shape, 'group') ||
-					editor.isShapeOfType<TLImageShape>(shape, 'image') ||
-					editor.isShapeOfType<TLArrowShape>(shape, 'arrow') ||
-					editor.isShapeOfType<TLLineShape>(shape, 'line') ||
-					editor.isShapeOfType<TLDrawShape>(shape, 'draw'))
+				(editor.isShapeOfType(shape, 'group') ||
+					editor.isShapeOfType(shape, 'image') ||
+					editor.isShapeOfType(shape, 'arrow') ||
+					editor.isShapeOfType(shape, 'line') ||
+					editor.isShapeOfType(shape, 'draw'))
 			)
 		},
 		[editor]
diff --git a/packages/tldraw/src/lib/ui/hooks/useClipboardEvents.ts b/packages/tldraw/src/lib/ui/hooks/useClipboardEvents.ts
index dea5f84f4588..bab285ff1b91 100644
--- a/packages/tldraw/src/lib/ui/hooks/useClipboardEvents.ts
+++ b/packages/tldraw/src/lib/ui/hooks/useClipboardEvents.ts
@@ -586,6 +586,8 @@ async function handleClipboardThings(editor: Editor, things: ClipboardThing[], p
  * @public
  */
 const handleNativeOrMenuCopy = async (editor: Editor) => {
+	const navigator =
+		editor.getContainer().ownerDocument?.defaultView?.navigator ?? globalThis.navigator
 	const content = await editor.resolveAssetsInContent(
 		editor.getContentFromCurrentPage(editor.getSelectedShapeIds())
 	)
@@ -713,6 +715,7 @@ export function useMenuClipboardEvents() {
 /** @public */
 export function useNativeClipboardEvents() {
 	const editor = useEditor()
+	const ownerDocument = editor.getContainer().ownerDocument
 	const trackEvent = useUiEvents()
 
 	const appIsFocused = useValue('editor.isFocused', () => editor.getInstanceState().isFocused, [
@@ -817,16 +820,16 @@ export function useNativeClipboardEvents() {
 			trackEvent('paste', { source: 'kbd' })
 		}
 
-		document.addEventListener('copy', copy)
-		document.addEventListener('cut', cut)
-		document.addEventListener('paste', paste)
-		document.addEventListener('pointerup', pointerUpHandler)
+		ownerDocument?.addEventListener('copy', copy)
+		ownerDocument?.addEventListener('cut', cut)
+		ownerDocument?.addEventListener('paste', paste)
+		ownerDocument?.addEventListener('pointerup', pointerUpHandler)
 
 		return () => {
-			document.removeEventListener('copy', copy)
-			document.removeEventListener('cut', cut)
-			document.removeEventListener('paste', paste)
-			document.removeEventListener('pointerup', pointerUpHandler)
+			ownerDocument?.removeEventListener('copy', copy)
+			ownerDocument?.removeEventListener('cut', cut)
+			ownerDocument?.removeEventListener('paste', paste)
+			ownerDocument?.removeEventListener('pointerup', pointerUpHandler)
 		}
-	}, [editor, trackEvent, appIsFocused])
+	}, [editor, trackEvent, appIsFocused, ownerDocument])
 }
diff --git a/packages/tldraw/src/lib/ui/hooks/useFlatten.ts b/packages/tldraw/src/lib/ui/hooks/useFlatten.ts
index 848aa59350c1..8e13fd26001a 100644
--- a/packages/tldraw/src/lib/ui/hooks/useFlatten.ts
+++ b/packages/tldraw/src/lib/ui/hooks/useFlatten.ts
@@ -3,7 +3,6 @@ import {
 	Editor,
 	IndexKey,
 	TLImageAsset,
-	TLImageShape,
 	TLShape,
 	TLShapeId,
 	Vec,
@@ -166,7 +165,7 @@ export async function flattenShapesToImages(
 			const shapeId = createShapeId()
 
 			// create an image shape in the same place as the shapes
-			editor.createShape<TLImageShape>({
+			editor.createShape({
 				id: shapeId,
 				type: 'image',
 				index,
diff --git a/packages/tldraw/src/lib/ui/hooks/useTools.tsx b/packages/tldraw/src/lib/ui/hooks/useTools.tsx
index b719b3227e6a..d3bd46d37461 100644
--- a/packages/tldraw/src/lib/ui/hooks/useTools.tsx
+++ b/packages/tldraw/src/lib/ui/hooks/useTools.tsx
@@ -4,7 +4,6 @@ import {
 	Editor,
 	GeoShapeGeoStyle,
 	getIndicesBetween,
-	TLLineShape,
 	TLPointerEventInfo,
 	TLShapeId,
 	toRichText,
@@ -195,7 +194,7 @@ export function ToolsProvider({ overrides, children }: TLUiToolsProviderProps) {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
 							const [start, end] = getIndicesBetween(null, null, 2)
-							editor.createShape<TLLineShape>({
+							editor.createShape({
 								id,
 								type: 'line',
 								props: {
diff --git a/packages/tldraw/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts b/packages/tldraw/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts
index 1374fb7097e5..995422a4e382 100644
--- a/packages/tldraw/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts
+++ b/packages/tldraw/src/lib/ui/hooks/useTranslation/TLUiTranslationKey.ts
@@ -154,6 +154,7 @@ export type TLUiTranslationKey =
 	| 'fill-style.solid'
 	| 'fill-style.pattern'
 	| 'fill-style.fill'
+	| 'fill-style.lined-fill'
 	| 'dash-style.dashed'
 	| 'dash-style.dotted'
 	| 'dash-style.draw'
diff --git a/packages/tldraw/src/lib/ui/hooks/useTranslation/defaultTranslation.ts b/packages/tldraw/src/lib/ui/hooks/useTranslation/defaultTranslation.ts
index c18d7b3ee163..29862270f2be 100644
--- a/packages/tldraw/src/lib/ui/hooks/useTranslation/defaultTranslation.ts
+++ b/packages/tldraw/src/lib/ui/hooks/useTranslation/defaultTranslation.ts
@@ -155,6 +155,7 @@ export const DEFAULT_TRANSLATION = {
 	'fill-style.solid': 'Solid',
 	'fill-style.pattern': 'Pattern',
 	'fill-style.fill': 'Fill',
+	'fill-style.lined-fill': 'Lined fill',
 	'dash-style.dashed': 'Dashed',
 	'dash-style.dotted': 'Dotted',
 	'dash-style.draw': 'Draw',
diff --git a/packages/tldraw/src/lib/ui/hooks/useTranslation/useTranslation.tsx b/packages/tldraw/src/lib/ui/hooks/useTranslation/useTranslation.tsx
index 77e9b4161538..32466c00efd7 100644
--- a/packages/tldraw/src/lib/ui/hooks/useTranslation/useTranslation.tsx
+++ b/packages/tldraw/src/lib/ui/hooks/useTranslation/useTranslation.tsx
@@ -23,7 +23,8 @@ export interface TLUiTranslationProviderProps {
 /** @public */
 export type TLUiTranslationContextType = TLUiTranslation
 
-const TranslationsContext = React.createContext<TLUiTranslationContextType | null>(null)
+/** @internal */
+export const TranslationsContext = React.createContext<TLUiTranslationContextType | null>(null)
 
 /** @public */
 export function useCurrentTranslation() {
diff --git a/packages/tldraw/src/lib/ui/version.ts b/packages/tldraw/src/lib/ui/version.ts
index 82ffd702e1c4..0c50ec2cee4e 100644
--- a/packages/tldraw/src/lib/ui/version.ts
+++ b/packages/tldraw/src/lib/ui/version.ts
@@ -1,9 +1,9 @@
 // This file is automatically generated by internal/scripts/refresh-assets.ts.
 // Do not edit manually. Or do, I'm a comment, not a cop.
 
-export const version = '4.1.1'
+export const version = '4.2.0'
 export const publishDates = {
 	major: '2025-09-18T14:39:22.803Z',
-	minor: '2025-10-15T12:30:12.428Z',
-	patch: '2025-10-15T13:45:13.201Z',
+	minor: '2025-11-19T11:53:58.692Z',
+	patch: '2025-11-19T11:53:58.692Z',
 }
diff --git a/packages/tldraw/src/lib/utils/excalidraw/putExcalidrawContent.ts b/packages/tldraw/src/lib/utils/excalidraw/putExcalidrawContent.ts
index 933d93c86b15..5fb0276140dd 100644
--- a/packages/tldraw/src/lib/utils/excalidraw/putExcalidrawContent.ts
+++ b/packages/tldraw/src/lib/utils/excalidraw/putExcalidrawContent.ts
@@ -133,6 +133,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'geo',
 					props: {
+						...editor.getShapeUtil('geo').getDefaultProps(),
 						geo: element.type,
 						url: element.link ?? '',
 						w: element.width,
@@ -152,6 +153,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'draw',
 					props: {
+						...editor.getShapeUtil('draw').getDefaultProps(),
 						dash: getDash(element),
 						size: strokeWidthsToSizes[element.strokeWidth],
 						color: colorsToColors[element.strokeColor] ?? 'black',
@@ -180,6 +182,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'line',
 					props: {
+						...editor.getShapeUtil('line').getDefaultProps(),
 						dash: getDash(element),
 						size: strokeWidthsToSizes[element.strokeWidth],
 						color: colorsToColors[element.strokeColor] ?? 'black',
@@ -221,6 +224,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'arrow',
 					props: {
+						...editor.getShapeUtil('arrow').getDefaultProps(),
 						richText: toRichText(text),
 						kind: element.elbowed ? 'elbow' : 'arc',
 						bend: getBend(element, start, end),
@@ -243,6 +247,7 @@ export async function putExcalidrawContent(
 						toId: startTargetId,
 						props: {
 							terminal: 'start',
+							snap: 'none',
 							normalizedAnchor: { x: 0.5, y: 0.5 },
 							isPrecise: false,
 							isExact: false,
@@ -259,6 +264,7 @@ export async function putExcalidrawContent(
 						toId: endTargetId,
 						props: {
 							terminal: 'end',
+							snap: 'none',
 							normalizedAnchor: { x: 0.5, y: 0.5 },
 							isPrecise: false,
 							isExact: false,
@@ -275,6 +281,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'text',
 					props: {
+						...editor.getShapeUtil('text').getDefaultProps(),
 						size,
 						scale,
 						font: fontFamilyToFontType[element.fontFamily] ?? 'draw',
@@ -310,6 +317,7 @@ export async function putExcalidrawContent(
 					...base,
 					type: 'image',
 					props: {
+						...editor.getShapeUtil('image').getDefaultProps(),
 						w: element.width,
 						h: element.height,
 						assetId,
diff --git a/packages/tldraw/src/lib/utils/export/exportAs.ts b/packages/tldraw/src/lib/utils/export/exportAs.ts
index 7cf8d290adf0..350f4eadd275 100644
--- a/packages/tldraw/src/lib/utils/export/exportAs.ts
+++ b/packages/tldraw/src/lib/utils/export/exportAs.ts
@@ -1,11 +1,4 @@
-import {
-	Editor,
-	sanitizeId,
-	TLExportType,
-	TLFrameShape,
-	TLImageExportOptions,
-	TLShapeId,
-} from '@tldraw/editor'
+import { Editor, sanitizeId, TLExportType, TLImageExportOptions, TLShapeId } from '@tldraw/editor'
 
 /** @public */
 export interface ExportAsOptions extends TLImageExportOptions {
@@ -35,7 +28,7 @@ export async function exportAs(
 		name = `shapes at ${getTimestamp()}`
 		if (ids.length === 1) {
 			const first = editor.getShape(ids[0])!
-			if (editor.isShapeOfType<TLFrameShape>(first, 'frame')) {
+			if (editor.isShapeOfType(first, 'frame')) {
 				name = first.props.name || 'frame'
 			} else {
 				name = `${sanitizeId(first.id)} at ${getTimestamp()}`
diff --git a/packages/tldraw/src/lib/utils/frames/frames.ts b/packages/tldraw/src/lib/utils/frames/frames.ts
index 40f2a5131e0a..5c56054aaa50 100644
--- a/packages/tldraw/src/lib/utils/frames/frames.ts
+++ b/packages/tldraw/src/lib/utils/frames/frames.ts
@@ -22,7 +22,7 @@ export function removeFrame(editor: Editor, ids: TLShapeId[]) {
 	const frames = compact(
 		ids
 			.map((id) => editor.getShape<TLFrameShape>(id))
-			.filter((f) => f && editor.isShapeOfType<TLFrameShape>(f, 'frame'))
+			.filter((f) => f && editor.isShapeOfType(f, 'frame'))
 	)
 	if (!frames.length) return
 
diff --git a/packages/tldraw/src/lib/utils/tldr/buildFromV1Document.ts b/packages/tldraw/src/lib/utils/tldr/buildFromV1Document.ts
index d4fd2d5d6b3d..1e69477f8b54 100644
--- a/packages/tldraw/src/lib/utils/tldr/buildFromV1Document.ts
+++ b/packages/tldraw/src/lib/utils/tldr/buildFromV1Document.ts
@@ -12,14 +12,9 @@ import {
 	TLDefaultHorizontalAlignStyle,
 	TLDefaultSizeStyle,
 	TLDefaultTextAlignStyle,
-	TLDrawShape,
 	TLGeoShape,
-	TLImageShape,
-	TLNoteShape,
 	TLPageId,
 	TLShapeId,
-	TLTextShape,
-	TLVideoShape,
 	Vec,
 	VecModel,
 	clamp,
@@ -187,7 +182,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 					switch (v1Shape.type) {
 						case TLV1ShapeType.Sticky: {
-							editor.createShapes<TLNoteShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'note',
@@ -203,7 +198,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Rectangle: {
-							editor.createShapes<TLGeoShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'geo',
@@ -225,7 +220,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 							const pageBoundsBeforeLabel = editor.getShapePageBounds(inCommon.id)!
 
-							editor.updateShapes<TLGeoShape>([
+							editor.updateShapes([
 								{
 									id: inCommon.id,
 									type: 'geo',
@@ -259,7 +254,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Triangle: {
-							editor.createShapes<TLGeoShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'geo',
@@ -280,7 +275,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 							const pageBoundsBeforeLabel = editor.getShapePageBounds(inCommon.id)!
 
-							editor.updateShapes<TLGeoShape>([
+							editor.updateShapes([
 								{
 									id: inCommon.id,
 									type: 'geo',
@@ -314,7 +309,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Ellipse: {
-							editor.createShapes<TLGeoShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'geo',
@@ -335,7 +330,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 
 							const pageBoundsBeforeLabel = editor.getShapePageBounds(inCommon.id)!
 
-							editor.updateShapes<TLGeoShape>([
+							editor.updateShapes([
 								{
 									id: inCommon.id,
 									type: 'geo',
@@ -375,7 +370,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 								break
 							}
 
-							editor.createShapes<TLDrawShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'draw',
@@ -400,7 +395,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							const v2Bend = (dist * -v1Bend) / 2
 
 							// Could also be a line... but we'll use it as an arrow anyway
-							editor.createShapes<TLArrowShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'arrow',
@@ -429,7 +424,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 							break
 						}
 						case TLV1ShapeType.Text: {
-							editor.createShapes<TLTextShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'text',
@@ -453,7 +448,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 								return
 							}
 
-							editor.createShapes<TLImageShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'image',
@@ -474,7 +469,7 @@ export function buildFromV1Document(editor: Editor, _document: unknown) {
 								return
 							}
 
-							editor.createShapes<TLVideoShape>([
+							editor.createShapes([
 								{
 									...inCommon,
 									type: 'video',
diff --git a/packages/tldraw/src/test/Editor.test.tsx b/packages/tldraw/src/test/Editor.test.tsx
index e23d85b8c7b8..f3c7db5ab8dc 100644
--- a/packages/tldraw/src/test/Editor.test.tsx
+++ b/packages/tldraw/src/test/Editor.test.tsx
@@ -472,12 +472,20 @@ describe('isFocused', () => {
 	})
 })
 
+const BLORG_TYPE = 'blorg'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[BLORG_TYPE]: { w: number; h: number }
+	}
+}
+
 describe('getShapeUtil', () => {
 	let myUtil: any
 
 	beforeEach(() => {
 		class _MyFakeShapeUtil extends BaseBoxShapeUtil<any> {
-			static override type = 'blorg'
+			static override type = BLORG_TYPE
 
 			getDefaultProps() {
 				return {
@@ -519,16 +527,22 @@ describe('getShapeUtil', () => {
 	})
 
 	it('throws if that shape type isnt registered', () => {
-		const myMissingShape = { type: 'missing' } as TLShape
-		expect(() => editor.getShapeUtil(myMissingShape)).toThrowErrorMatchingInlineSnapshot(
-			`[Error: No shape util found for type "missing"]`
-		)
+		const myMissingShape = { type: 'missing' }
+		expect(() =>
+			editor.getShapeUtil(
+				// @ts-expect-error
+				myMissingShape
+			)
+		).toThrowErrorMatchingInlineSnapshot(`[Error: No shape util found for type "missing"]`)
 	})
 
 	it('throws if that type isnt registered', () => {
-		expect(() => editor.getShapeUtil('missing')).toThrowErrorMatchingInlineSnapshot(
-			`[Error: No shape util found for type "missing"]`
-		)
+		expect(() =>
+			editor.getShapeUtil(
+				// @ts-expect-error
+				'missing'
+			)
+		).toThrowErrorMatchingInlineSnapshot(`[Error: No shape util found for type "missing"]`)
 	})
 })
 
@@ -866,9 +880,19 @@ describe('instance.isReadonly', () => {
 	})
 })
 
+const MY_CUSTOM_SHAPE_TYPE = 'myCustomShape'
+
+type MyCustomShape = TLShape<typeof MY_CUSTOM_SHAPE_TYPE>
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[MY_CUSTOM_SHAPE_TYPE]: { w: number; h: number }
+	}
+}
+
 describe('the geometry cache', () => {
-	class CustomShapeUtil extends BaseBoxShapeUtil<any> {
-		static override type = 'custom'
+	class CustomShapeUtil extends BaseBoxShapeUtil<MyCustomShape> {
+		static override type = MY_CUSTOM_SHAPE_TYPE
 
 		getDefaultProps() {
 			return {
@@ -894,9 +918,11 @@ describe('the geometry cache', () => {
 		editor = new TestEditor({
 			shapeUtils: [CustomShapeUtil],
 		})
-		const { A } = editor.createShapesFromJsx([<TL.custom ref="A" x={0} y={0} w={100} h={100} />])
+		const { A } = editor.createShapesFromJsx([
+			<TL.myCustomShape ref="A" x={0} y={0} w={100} h={100} />,
+		])
 		expect(editor.getShapePageBounds(A)!.width).toBe(100)
-		editor.updateShape({ id: A, type: 'custom', meta: { double: true } })
+		editor.updateShape({ id: A, type: 'myCustomShape', meta: { double: true } })
 		expect(editor.getShapePageBounds(A)!.width).toBe(200)
 	})
 })
diff --git a/packages/tldraw/src/test/SelectTool.test.ts b/packages/tldraw/src/test/SelectTool.test.ts
index f0fda78df7cb..cfd307edab49 100644
--- a/packages/tldraw/src/test/SelectTool.test.ts
+++ b/packages/tldraw/src/test/SelectTool.test.ts
@@ -1,12 +1,4 @@
-import {
-	IndexKey,
-	TLArrowShape,
-	TLGeoShape,
-	TLNoteShape,
-	TLTextShape,
-	createShapeId,
-	toRichText,
-} from '@tldraw/editor'
+import { IndexKey, createShapeId, toRichText } from '@tldraw/editor'
 import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 
@@ -61,7 +53,7 @@ describe('TLSelectTool.Idle', () => {
 describe.skip('Edit on type', () => {
 	it('Starts editing shape on key down if shape does auto-edit on key stroke', () => {
 		const id = createShapeId()
-		editor.createShapes<TLNoteShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'note',
@@ -85,7 +77,7 @@ describe.skip('Edit on type', () => {
 
 	it('Does not start editing on excluded keys', () => {
 		const id = createShapeId()
-		editor.createShapes<TLNoteShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'note',
@@ -102,7 +94,7 @@ describe.skip('Edit on type', () => {
 
 	it('Ignores key down if altKey or ctrlKey is pressed', () => {
 		const id = createShapeId()
-		editor.createShapes<TLNoteShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'note',
@@ -270,7 +262,7 @@ describe('DraggingHandle', () => {
 
 describe('PointingLabel', () => {
 	it('Enters from pointing_arrow_label and exits to idle', () => {
-		editor.createShapes<TLArrowShape>([
+		editor.createShapes([
 			{
 				id: ids.arrow1,
 				type: 'arrow',
@@ -302,7 +294,7 @@ describe('PointingLabel', () => {
 	})
 
 	it('Bails on escape', () => {
-		editor.createShapes<TLArrowShape>([
+		editor.createShapes([
 			{
 				id: ids.arrow1,
 				type: 'arrow',
@@ -329,7 +321,7 @@ describe('PointingLabel', () => {
 	})
 
 	it('Doesnt go into pointing_arrow_label mode if not selecting the arrow shape', () => {
-		editor.createShapes<TLArrowShape>([
+		editor.createShapes([
 			{
 				id: ids.arrow1,
 				type: 'arrow',
@@ -406,7 +398,7 @@ describe('When double clicking the selection edge', () => {
 			.selectAll()
 			.deleteShapes(editor.getSelectedShapeIds())
 			.selectNone()
-			.createShapes<TLTextShape>([
+			.createShapes([
 				{
 					id,
 					type: 'text',
@@ -464,7 +456,7 @@ describe('When editing shapes', () => {
 			text2: createShapeId(),
 		}
 
-		editor.createShapes<TLGeoShape | TLTextShape>([
+		editor.createShapes([
 			{
 				id: ids.geo1,
 				type: 'geo',
@@ -702,7 +694,7 @@ describe('when passing a function to onInteractionEnd', () => {
 			},
 		}
 
-		editor.createShapes<TLArrowShape>([arrow])
+		editor.createShapes([arrow])
 
 		editor.setCurrentTool('select.pointing_arrow_label', {
 			shape: arrow,
@@ -828,7 +820,7 @@ describe('when passing a string to onInteractionEnd', () => {
 			},
 		}
 
-		editor.createShapes<TLArrowShape>([arrow])
+		editor.createShapes([arrow])
 
 		editor.setCurrentTool('select.pointing_arrow_label', {
 			shape: arrow,
diff --git a/packages/tldraw/src/test/TestEditor.ts b/packages/tldraw/src/test/TestEditor.ts
index 2a78b15885f7..77a57a4c7a61 100644
--- a/packages/tldraw/src/test/TestEditor.ts
+++ b/packages/tldraw/src/test/TestEditor.ts
@@ -10,7 +10,6 @@ import {
 	RequiredKeys,
 	RotateCorner,
 	SelectionHandle,
-	TLArrowBinding,
 	TLArrowShape,
 	TLContent,
 	TLEditorOptions,
@@ -790,9 +789,7 @@ export class TestEditor extends Editor {
 	}
 
 	getArrowsBoundTo(shapeId: TLShapeId) {
-		const ids = new Set(
-			this.getBindingsToShape<TLArrowBinding>(shapeId, 'arrow').map((b) => b.fromId)
-		)
+		const ids = new Set(this.getBindingsToShape(shapeId, 'arrow').map((b) => b.fromId))
 		return compact(Array.from(ids, (id) => this.getShape<TLArrowShape>(id)))
 	}
 }
diff --git a/packages/tldraw/src/test/TldrawEditor.test.tsx b/packages/tldraw/src/test/TldrawEditor.test.tsx
index 9a334733adfa..2976a585dc0e 100644
--- a/packages/tldraw/src/test/TldrawEditor.test.tsx
+++ b/packages/tldraw/src/test/TldrawEditor.test.tsx
@@ -4,18 +4,20 @@ import {
 	BaseBoxShapeUtil,
 	Editor,
 	HTMLContainer,
+	IndexKey,
 	TLAssetStore,
-	TLBaseShape,
+	TLShape,
+	TLShapeId,
 	TldrawEditor,
 	createShapeId,
 	createTLStore,
 	noop,
+	toRichText,
 } from '@tldraw/editor'
 import { StrictMode } from 'react'
 import { vi } from 'vitest'
 import { defaultShapeUtils } from '../lib/defaultShapeUtils'
 import { defaultTools } from '../lib/defaultTools'
-import { GeoShapeUtil } from '../lib/shapes/geo/GeoShapeUtil'
 import { defaultAddFontsFromNode, tipTapDefaultExtensions } from '../lib/utils/text/richText'
 import {
 	renderTldrawComponent,
@@ -169,7 +171,7 @@ describe('<TldrawEditor />', () => {
 		let editor = {} as Editor
 		await renderTldrawComponent(
 			<TldrawEditor
-				shapeUtils={[GeoShapeUtil]}
+				shapeUtils={defaultShapeUtils}
 				initialState="select"
 				tools={defaultTools}
 				onMount={(editorApp) => {
@@ -185,39 +187,82 @@ describe('<TldrawEditor />', () => {
 			editor.updateInstanceState({ screenBounds: { x: 0, y: 0, w: 1080, h: 720 } })
 		})
 
-		const id = createShapeId()
-
-		await act(async () => {
-			editor.createShapes([
-				{
-					id,
-					type: 'geo',
-					props: { w: 100, h: 100 },
+		// Test all shape types except group
+		const shapeTypesToTest = [
+			{ type: 'arrow' as const, props: { start: { x: 0, y: 0 }, end: { x: 100, y: 100 } } },
+			{ type: 'bookmark' as const, props: { w: 100, h: 100, url: 'https://example.com' } },
+			{
+				type: 'draw' as const,
+				props: { segments: [{ type: 'free' as const, points: [{ x: 0, y: 0, z: 0.5 }] }] },
+			},
+			{ type: 'embed' as const, props: { w: 100, h: 100, url: 'https://example.com' } },
+			{ type: 'frame' as const, props: { w: 100, h: 100 } },
+			{ type: 'geo' as const, props: { w: 100, h: 100, geo: 'rectangle' as const } },
+			{
+				type: 'highlight' as const,
+				props: { segments: [{ type: 'free' as const, points: [{ x: 0, y: 0, z: 0.5 }] }] },
+			},
+			{ type: 'image' as const, props: { w: 100, h: 100 } },
+			{
+				type: 'line' as const,
+				props: {
+					points: {
+						a1: { id: 'a1', index: 'a1' as IndexKey, x: 0, y: 0 },
+						a2: { id: 'a2', index: 'a2' as IndexKey, x: 100, y: 100 },
+					},
 				},
-			])
-		})
+			},
+			{ type: 'note' as const, props: { richText: toRichText('test') } },
+			{ type: 'text' as const, props: { w: 100, richText: toRichText('test') } },
+			{ type: 'video' as const, props: { w: 100, h: 100 } },
+		]
+
+		const shapeIds: TLShapeId[] = []
+
+		for (let i = 0; i < shapeTypesToTest.length; i++) {
+			const shapeConfig = shapeTypesToTest[i]
+			const id = createShapeId()
+			shapeIds.push(id)
+
+			await act(async () => {
+				editor.createShapes([
+					{
+						id,
+						...shapeConfig,
+						x: i * 150, // Space them out horizontally
+						y: 0,
+					},
+				])
+			})
+
+			// Does the shape exist?
+			const shape = editor.getShape(id)
+			expect(shape).toBeTruthy()
+			expect(shape?.type).toBe(shapeConfig.type)
+
+			// Check that all shapes rendered without error boundaries
+			expect(
+				document.querySelectorAll('.tl-shape-error-boundary'),
+				`${shapeConfig.type} had an error while rendering`
+			).toHaveLength(0)
+		}
 
-		// Does the shape exist?
-		expect(editor.getShape(id)).toMatchObject({
-			id,
-			type: 'geo',
-			x: 0,
-			y: 0,
-			opacity: 1,
-			props: { geo: 'rectangle', w: 100, h: 100 },
-		})
+		// Check that all shape components are rendering
+		expect(document.querySelectorAll('.tl-shape').length).toBeGreaterThanOrEqual(
+			shapeTypesToTest.length
+		)
 
-		// Is the shape's component rendering?
-		expect(document.querySelectorAll('.tl-shape')).toHaveLength(1)
-		// though indicator should be display none
-		expect(document.querySelectorAll('.tl-shape-indicator')).toHaveLength(1)
+		// Check that all shape indicators are present
+		expect(document.querySelectorAll('.tl-shape-indicator').length).toBeGreaterThanOrEqual(
+			shapeTypesToTest.length
+		)
 
-		// Select the shape
-		await act(async () => editor.select(id))
+		// Select one of the shapes (the note shape)
+		const noteShapeId = shapeIds[9] // note is at index 9
+		await act(async () => editor.select(noteShapeId))
 
 		expect(editor.getSelectedShapeIds().length).toBe(1)
-		// though indicator it should be visible
-		expect(document.querySelectorAll('.tl-shape-indicator')).toHaveLength(1)
+		expect(editor.getSelectedShapeIds()[0]).toBe(noteShapeId)
 
 		// Select the eraser tool...
 		await act(async () => editor.setCurrentTool('eraser'))
@@ -411,17 +456,19 @@ describe('<TldrawEditor />', () => {
 	})
 })
 
-describe('Custom shapes', () => {
-	type CardShape = TLBaseShape<
-		'card',
-		{
-			w: number
-			h: number
-		}
-	>
+const CARD_TYPE = 'card'
 
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[CARD_TYPE]: { w: number; h: number }
+	}
+}
+
+type CardShape = TLShape<typeof CARD_TYPE>
+
+describe('Custom shapes', () => {
 	class CardUtil extends BaseBoxShapeUtil<CardShape> {
-		static override type = 'card' as const
+		static override type = CARD_TYPE
 
 		override isAspectRatioLocked(_shape: CardShape) {
 			return false
@@ -463,7 +510,7 @@ describe('Custom shapes', () => {
 	class CardTool extends BaseBoxShapeTool {
 		static override id = 'card'
 		static override initial = 'idle'
-		override shapeType = 'card'
+		override shapeType = 'card' as const
 	}
 
 	const tools = [CardTool]
diff --git a/packages/tldraw/src/test/bindings.test.tsx b/packages/tldraw/src/test/bindings.test.tsx
index 6b90c7cb99b1..3b77648e6a88 100644
--- a/packages/tldraw/src/test/bindings.test.tsx
+++ b/packages/tldraw/src/test/bindings.test.tsx
@@ -6,8 +6,8 @@ import {
 	BindingOnShapeDeleteOptions,
 	BindingOnShapeIsolateOptions,
 	BindingUtil,
+	TLBinding,
 	TLShapeId,
-	TLUnknownBinding,
 	createBindingId,
 	createShapeId,
 } from '@tldraw/editor'
@@ -40,7 +40,7 @@ const mockOnAfterChangeToShape = vi.fn()
 
 const calls: string[] = []
 
-const registerCall = (method: string, binding: TLUnknownBinding) => {
+const registerCall = (method: string, binding: TLBinding) => {
 	calls.push(
 		`${method}: ${binding.fromId.slice('shape:'.length)}->${binding.toId.slice('shape:'.length)}`
 	)
@@ -60,62 +60,62 @@ class TestBindingUtil extends BindingUtil {
 		mockOnOperationComplete()
 	}
 
-	override onBeforeDelete(options: BindingOnDeleteOptions<TLUnknownBinding>): void {
+	override onBeforeDelete(options: BindingOnDeleteOptions): void {
 		registerCall('onBeforeDelete', options.binding)
 		mockOnBeforeDelete(options)
 	}
 
-	override onAfterDelete(options: BindingOnDeleteOptions<TLUnknownBinding>): void {
+	override onAfterDelete(options: BindingOnDeleteOptions): void {
 		registerCall('onAfterDelete', options.binding)
 		mockOnAfterDelete(options)
 	}
 
-	override onBeforeDeleteFromShape(options: BindingOnShapeDeleteOptions<TLUnknownBinding>): void {
+	override onBeforeDeleteFromShape(options: BindingOnShapeDeleteOptions): void {
 		registerCall('onBeforeDeleteFromShape', options.binding)
 		mockOnBeforeFromShapeDelete(options)
 	}
 
-	override onBeforeDeleteToShape(options: BindingOnShapeDeleteOptions<TLUnknownBinding>): void {
+	override onBeforeDeleteToShape(options: BindingOnShapeDeleteOptions): void {
 		registerCall('onBeforeDeleteToShape', options.binding)
 		mockOnBeforeToShapeDelete(options)
 	}
 
-	override onBeforeIsolateFromShape(options: BindingOnShapeIsolateOptions<TLUnknownBinding>): void {
+	override onBeforeIsolateFromShape(options: BindingOnShapeIsolateOptions): void {
 		registerCall('onBeforeIsolateFromShape', options.binding)
 		mockOnBeforeFromShapeIsolate(options)
 	}
 
-	override onBeforeIsolateToShape(options: BindingOnShapeIsolateOptions<TLUnknownBinding>): void {
+	override onBeforeIsolateToShape(options: BindingOnShapeIsolateOptions): void {
 		registerCall('onBeforeIsolateToShape', options.binding)
 		mockOnBeforeToShapeIsolate(options)
 	}
 
-	override onBeforeCreate(options: BindingOnCreateOptions<TLUnknownBinding>): void {
+	override onBeforeCreate(options: BindingOnCreateOptions): void {
 		registerCall('onBeforeCreate', options.binding)
 		mockOnBeforeCreate(options)
 	}
 
-	override onAfterCreate(options: BindingOnCreateOptions<TLUnknownBinding>): void {
+	override onAfterCreate(options: BindingOnCreateOptions): void {
 		registerCall('onAfterCreate', options.binding)
 		mockOnAfterCreate(options)
 	}
 
-	override onBeforeChange(options: BindingOnChangeOptions<TLUnknownBinding>): void {
+	override onBeforeChange(options: BindingOnChangeOptions): void {
 		registerCall('onBeforeChange', options.bindingAfter)
 		mockOnBeforeChange(options)
 	}
 
-	override onAfterChange(options: BindingOnChangeOptions<TLUnknownBinding>): void {
+	override onAfterChange(options: BindingOnChangeOptions): void {
 		registerCall('onAfterChange', options.bindingAfter)
 		mockOnAfterChange(options)
 	}
 
-	override onAfterChangeFromShape(options: BindingOnShapeChangeOptions<TLUnknownBinding>): void {
+	override onAfterChangeFromShape(options: BindingOnShapeChangeOptions): void {
 		registerCall('onAfterChangeFromShape', options.binding)
 		mockOnAfterChangeFromShape(options)
 	}
 
-	override onAfterChangeToShape(options: BindingOnShapeChangeOptions<TLUnknownBinding>): void {
+	override onAfterChangeToShape(options: BindingOnShapeChangeOptions): void {
 		registerCall('onAfterChangeToShape', options.binding)
 		mockOnAfterChangeToShape(options)
 	}
@@ -146,11 +146,19 @@ beforeEach(() => {
 	mockOnAfterChangeToShape.mockReset()
 })
 
+const TEST_TYPE = 'test'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalBindingPropsMap {
+		[TEST_TYPE]: Record<string, never>
+	}
+}
+
 function bindShapes(fromId: TLShapeId, toId: TLShapeId) {
 	const bindingId = createBindingId()
 	editor.createBinding({
 		id: bindingId,
-		type: 'test',
+		type: TEST_TYPE,
 		fromId,
 		toId,
 	})
@@ -256,11 +264,9 @@ test('copying the to shape on its own does trigger the unbind operation', () =>
 })
 
 test('cascading deletes in beforeFromShapeDelete are handled correctly', () => {
-	mockOnBeforeFromShapeDelete.mockImplementation(
-		(options: BindingOnShapeDeleteOptions<TLUnknownBinding>) => {
-			editor.deleteShape(options.binding.toId)
-		}
-	)
+	mockOnBeforeFromShapeDelete.mockImplementation((options: BindingOnShapeDeleteOptions) => {
+		editor.deleteShape(options.binding.toId)
+	})
 
 	bindShapes(ids.box1, ids.box2)
 	bindShapes(ids.box2, ids.box3)
@@ -301,11 +307,9 @@ test('cascading deletes in beforeFromShapeDelete are handled correctly', () => {
 })
 
 test('cascading deletes in beforeToShapeDelete are handled correctly', () => {
-	mockOnBeforeToShapeDelete.mockImplementation(
-		(options: BindingOnShapeDeleteOptions<TLUnknownBinding>) => {
-			editor.deleteShape(options.binding.fromId)
-		}
-	)
+	mockOnBeforeToShapeDelete.mockImplementation((options: BindingOnShapeDeleteOptions) => {
+		editor.deleteShape(options.binding.fromId)
+	})
 
 	bindShapes(ids.box1, ids.box2)
 	bindShapes(ids.box2, ids.box3)
diff --git a/packages/tldraw/src/test/bindingsIndex.test.tsx b/packages/tldraw/src/test/bindingsIndex.test.tsx
index 4b6fbfea23f7..8cad93e4ef4a 100644
--- a/packages/tldraw/src/test/bindingsIndex.test.tsx
+++ b/packages/tldraw/src/test/bindingsIndex.test.tsx
@@ -1,4 +1,4 @@
-import { TLArrowBinding, TLGeoShape, TLShapeId, createShapeId } from '@tldraw/editor'
+import { TLShapeId, createShapeId } from '@tldraw/editor'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
@@ -219,7 +219,7 @@ describe('bindingsIndex', () => {
 
 			const [box1Clone, box2Clone] = editor
 				.getSelectedShapes()
-				.filter((shape) => editor.isShapeOfType<TLGeoShape>(shape, 'geo'))
+				.filter((shape) => editor.isShapeOfType(shape, 'geo'))
 				.sort((a, b) => a.x - b.x)
 
 			expect(editor.getArrowsBoundTo(box2Clone.id)).toHaveLength(3)
@@ -248,9 +248,9 @@ describe('bindingsIndex', () => {
 
 			// move arrowA end from box2 to box3
 			const binding = editor
-				.getBindingsInvolvingShape<TLArrowBinding>(ids.box2, 'arrow')
+				.getBindingsInvolvingShape(ids.box2, 'arrow')
 				.find((b) => b.props.terminal === 'end')!
-			editor.updateBinding({ ...binding, toId: box3 } satisfies TLArrowBinding)
+			editor.updateBinding({ ...binding, toId: box3 })
 
 			expect(editor.getArrowsBoundTo(ids.box2)).toHaveLength(2)
 			expect(editor.getArrowsBoundTo(ids.box1)).toHaveLength(3)
diff --git a/packages/tldraw/src/test/commands/createShape.test.ts b/packages/tldraw/src/test/commands/createShape.test.ts
new file mode 100644
index 000000000000..97e18ddaeb3c
--- /dev/null
+++ b/packages/tldraw/src/test/commands/createShape.test.ts
@@ -0,0 +1,64 @@
+import { TLArrowShape, TLGeoShape, createShapeId } from '@tldraw/editor'
+import { TestEditor } from '../TestEditor'
+
+let editor: TestEditor
+
+const ids = {
+	box1: createShapeId('box1'),
+}
+
+beforeEach(() => {
+	editor = new TestEditor()
+})
+
+it('Uses typescript generics', () => {
+	expect(() => {
+		editor.createShape(
+			//@ts-expect-error Yep error because we are giving the wrong props to the shape
+			{
+				id: ids.box1,
+				type: 'geo',
+				props: { w: 'OH NO' },
+			}
+		)
+
+		// Errors when creating a shape with unknown props
+		editor.createShape({
+			id: ids.box1,
+			type: 'geo',
+			props: {
+				// @ts-expect-error
+				foo: 'bar',
+			},
+		})
+
+		// Yep error here because we are giving the wrong props to the shape
+		editor.createShape<TLGeoShape>({
+			id: ids.box1,
+			type: 'geo',
+			//@ts-expect-error
+			props: { w: 'OH NO' },
+		})
+
+		// Yep error here because we are giving the wrong generic
+		editor.createShape<TLArrowShape>({
+			id: ids.box1,
+			//@ts-expect-error
+			type: 'geo',
+			//@ts-expect-error
+			props: { w: 'OH NO' },
+		})
+
+		// All good, correct match of generic and shape type
+		editor.createShape<TLGeoShape>({
+			id: ids.box1,
+			type: 'geo',
+			props: { w: 100 },
+		})
+
+		editor.createShape<TLGeoShape>({
+			id: ids.box1,
+			type: 'geo',
+		})
+	}).toThrow()
+})
diff --git a/packages/tldraw/src/test/commands/createShapes.test.ts b/packages/tldraw/src/test/commands/createShapes.test.ts
index e360a074adc5..f593a1c5b036 100644
--- a/packages/tldraw/src/test/commands/createShapes.test.ts
+++ b/packages/tldraw/src/test/commands/createShapes.test.ts
@@ -19,14 +19,28 @@ beforeEach(() => {
 
 it('Uses typescript generics', () => {
 	expect(() => {
-		// No error here because no generic, the editor doesn't know what this guy is
+		// Yep error because we are giving the wrong props to the shape
 		editor.createShapes([
+			//@ts-expect-error
 			{
 				id: ids.box1,
 				type: 'geo',
 				props: { w: 'OH NO' },
 			},
 		])
+
+		// Errors when creating shapes with unknown props
+		editor.createShapes([
+			{
+				id: ids.box1,
+				type: 'geo',
+				props: {
+					// @ts-expect-error
+					foo: 'bar',
+				},
+			},
+		])
+
 		// Yep error here because we are giving the wrong props to the shape
 		editor.createShapes<TLGeoShape>([
 			{
diff --git a/packages/tldraw/src/test/commands/getSvgString.test.ts b/packages/tldraw/src/test/commands/getSvgString.test.ts
index d39e7eee9f58..39628d070860 100644
--- a/packages/tldraw/src/test/commands/getSvgString.test.ts
+++ b/packages/tldraw/src/test/commands/getSvgString.test.ts
@@ -1,4 +1,4 @@
-import { DefaultDashStyle, TLGeoShape, createShapeId, toRichText } from '@tldraw/editor'
+import { DefaultDashStyle, createShapeId, toRichText } from '@tldraw/editor'
 import { vi } from 'vitest'
 import { TestEditor } from '../TestEditor'
 
@@ -21,7 +21,7 @@ beforeEach(() => {
 	editor = new TestEditor()
 	editor.setStyleForNextShapes(DefaultDashStyle, 'solid')
 	editor.setStyleForSelectedShapes(DefaultDashStyle, 'solid')
-	editor.createShapes<TLGeoShape>([
+	editor.createShapes([
 		{
 			id: ids.boxA,
 			type: 'geo',
diff --git a/packages/tldraw/src/test/commands/isShapeOfType.test.ts b/packages/tldraw/src/test/commands/isShapeOfType.test.ts
new file mode 100644
index 000000000000..f7cc0822541a
--- /dev/null
+++ b/packages/tldraw/src/test/commands/isShapeOfType.test.ts
@@ -0,0 +1,44 @@
+import { TLArrowShape, createShapeId } from '@tldraw/editor'
+import { TestEditor } from '../TestEditor'
+
+let editor: TestEditor
+
+beforeEach(() => {
+	editor = new TestEditor()
+})
+
+export declare function assertNever(x: never): never
+
+it('narrows down the shape type', () => {
+	const id = createShapeId('arrow1')
+	editor.createShape({ type: 'arrow', id, x: 0, y: 0 })
+
+	const shape = editor.getShape(id)!
+	if (editor.isShapeOfType(shape, 'arrow')) {
+		expect(shape.type === 'arrow').toBe(true)
+		expect(
+			// @ts-expect-error This comparison appears to be unintentional because the types '"arrow"' and '"card"' have no overlap.
+			shape.type === 'card'
+		).toBe(false)
+	}
+})
+
+it('narrows down the shape type with generic', () => {
+	const id = createShapeId('arrow1')
+	editor.createShape({ type: 'arrow', id, x: 0, y: 0 })
+
+	const shape = editor.getShape(id)!
+	if (editor.isShapeOfType<TLArrowShape>(shape, 'arrow')) {
+		expect(shape.type === 'arrow').toBe(true)
+
+		expect(
+			// @ts-expect-error This comparison appears to be unintentional because the types '"arrow"' and '"card"' have no overlap.
+			shape.type === 'card'
+		).toBe(false)
+	}
+
+	// @ts-expect-error mismatch between the generic and the shape type
+	if (editor.isShapeOfType<TLArrowShape>(shape, 'card')) {
+		assertNever(shape)
+	}
+})
diff --git a/packages/tldraw/src/test/commands/putContent.test.ts b/packages/tldraw/src/test/commands/putContent.test.ts
index dedd3b878087..abab9f94260c 100644
--- a/packages/tldraw/src/test/commands/putContent.test.ts
+++ b/packages/tldraw/src/test/commands/putContent.test.ts
@@ -25,6 +25,7 @@ describe('Migrations', () => {
 
 	it('Throws error if any shape is invalid due to wrong type', () => {
 		const withInvalidShapeType = structuredClone(clipboardContent)
+		// @ts-expect-error
 		withInvalidShapeType.shapes[0].type = 'invalid'
 		expect(() => editor.putContentOntoCurrentPage(withInvalidShapeType)).toThrow()
 	})
diff --git a/packages/tldraw/src/test/commands/updateShape.test.ts b/packages/tldraw/src/test/commands/updateShape.test.ts
new file mode 100644
index 000000000000..6e3d12d7ed80
--- /dev/null
+++ b/packages/tldraw/src/test/commands/updateShape.test.ts
@@ -0,0 +1,67 @@
+import { TLArrowShape, TLGeoShape, createShapeId } from '@tldraw/editor'
+import { TestEditor, createDefaultShapes } from '../TestEditor'
+
+let editor: TestEditor
+
+const ids = {
+	box1: createShapeId('box1'),
+}
+
+beforeEach(() => {
+	editor = new TestEditor()
+	editor.createShapes(createDefaultShapes())
+})
+
+it('Uses typescript generics', () => {
+	expect(() => {
+		editor.updateShape({
+			id: ids.box1,
+			type: 'geo',
+			props: {
+				// @ts-expect-error
+				w: 'OH NO',
+			},
+		})
+
+		// Errors when updating a shape with unknown props
+		editor.updateShape({
+			id: ids.box1,
+			type: 'geo',
+			props: {
+				// @ts-expect-error
+				foo: 'bar',
+			},
+		})
+
+		// error here because we are giving the wrong props to the shape
+		editor.updateShape<TLGeoShape>({
+			id: ids.box1,
+			type: 'geo',
+			props: {
+				// @ts-expect-error
+				w: 'OH NO',
+			},
+		})
+
+		// Yep error here because we are giving the wrong generic
+		editor.updateShape<TLArrowShape>({
+			id: ids.box1,
+			//@ts-expect-error
+			type: 'geo',
+			//@ts-expect-error
+			props: { w: 'OH NO' },
+		})
+
+		// All good, correct match of generic and shape type
+		editor.updateShape<TLGeoShape>({
+			id: ids.box1,
+			type: 'geo',
+			props: { w: 100 },
+		})
+
+		editor.updateShape<TLGeoShape>({
+			id: ids.box1,
+			type: 'geo',
+		})
+	}).toThrow()
+})
diff --git a/packages/tldraw/src/test/commands/updateShapes.test.ts b/packages/tldraw/src/test/commands/updateShapes.test.ts
index 3afbd3a06e30..d56559ed7f13 100644
--- a/packages/tldraw/src/test/commands/updateShapes.test.ts
+++ b/packages/tldraw/src/test/commands/updateShapes.test.ts
@@ -15,22 +15,38 @@ beforeEach(() => {
 
 it('Uses typescript generics', () => {
 	expect(() => {
-		// No error here because no generic, the editor doesn't know what this guy is
 		editor.updateShapes([
 			{
 				id: ids.box1,
 				type: 'geo',
-				props: { w: 'OH NO' },
+				props: {
+					// @ts-expect-error
+					w: 'OH NO',
+				},
+			},
+		])
+
+		// Errors when updating shapes with unknown props
+		editor.updateShapes([
+			{
+				id: ids.box1,
+				type: 'geo',
+				props: {
+					// @ts-expect-error
+					foo: 'bar',
+				},
 			},
 		])
 
-		// Yep error here because we are giving the wrong props to the shape
+		// error here because we are giving the wrong props to the shape
 		editor.updateShapes<TLGeoShape>([
 			{
 				id: ids.box1,
 				type: 'geo',
-				//@ts-expect-error
-				props: { w: 'OH NO' },
+				props: {
+					// @ts-expect-error
+					w: 'OH NO',
+				},
 			},
 		])
 
diff --git a/packages/tldraw/src/test/custom-clipping.test.ts b/packages/tldraw/src/test/custom-clipping.test.ts
index 05e0b2441fec..cf4465a8284d 100644
--- a/packages/tldraw/src/test/custom-clipping.test.ts
+++ b/packages/tldraw/src/test/custom-clipping.test.ts
@@ -8,7 +8,6 @@ import {
 	resizeBox,
 	StateNode,
 	T,
-	TLBaseShape,
 	TLEventHandlers,
 	TLGeoShape,
 	TLResizeInfo,
@@ -19,19 +18,21 @@ import {
 } from '@tldraw/editor'
 import { TestEditor } from './TestEditor'
 
-// Custom Circle Clip Shape Definition
-export type CircleClipShape = TLBaseShape<
-	'circle-clip',
-	{
-		w: number
-		h: number
+const CIRCLE_CLIP_TYPE = 'circle-clip'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[CIRCLE_CLIP_TYPE]: { w: number; h: number }
 	}
->
+}
+
+// Custom Circle Clip Shape Definition
+export type CircleClipShape = TLShape<typeof CIRCLE_CLIP_TYPE>
 
 export const isClippingEnabled$ = atom('isClippingEnabled', true)
 
 export class CircleClipShapeUtil extends BaseBoxShapeUtil<CircleClipShape> {
-	static override type = 'circle-clip' as const
+	static override type = CIRCLE_CLIP_TYPE
 	static override props: RecordProps<CircleClipShape> = {
 		w: T.number,
 		h: T.number,
@@ -113,8 +114,8 @@ export class CircleClipShapeTool extends StateNode {
 		if (info.target === 'canvas') {
 			const { originPagePoint } = this.editor.inputs
 
-			this.editor.createShape<CircleClipShape>({
-				type: 'circle-clip',
+			this.editor.createShape({
+				type: CIRCLE_CLIP_TYPE,
 				x: originPagePoint.x - 100,
 				y: originPagePoint.y - 100,
 				props: {
@@ -153,9 +154,9 @@ beforeEach(() => {
 describe('CircleClipShapeUtil', () => {
 	describe('shape creation and properties', () => {
 		it('should create a circle clip shape with default properties', () => {
-			editor.createShape<CircleClipShape>({
+			editor.createShape({
 				id: ids.circleClip1,
-				type: 'circle-clip',
+				type: CIRCLE_CLIP_TYPE,
 				x: 100,
 				y: 100,
 				props: {
@@ -172,9 +173,9 @@ describe('CircleClipShapeUtil', () => {
 		})
 
 		it('should use default props when not specified', () => {
-			editor.createShape<CircleClipShape>({
+			editor.createShape({
 				id: ids.circleClip1,
-				type: 'circle-clip',
+				type: CIRCLE_CLIP_TYPE,
 				x: 100,
 				y: 100,
 				props: {},
@@ -188,9 +189,9 @@ describe('CircleClipShapeUtil', () => {
 
 	describe('geometry and clipping', () => {
 		it('should generate correct circle geometry', () => {
-			editor.createShape<CircleClipShape>({
+			editor.createShape({
 				id: ids.circleClip1,
-				type: 'circle-clip',
+				type: CIRCLE_CLIP_TYPE,
 				x: 100,
 				y: 100,
 				props: {
@@ -210,9 +211,9 @@ describe('CircleClipShapeUtil', () => {
 		})
 
 		it('should generate clip path for circle', () => {
-			editor.createShape<CircleClipShape>({
+			editor.createShape({
 				id: ids.circleClip1,
-				type: 'circle-clip',
+				type: CIRCLE_CLIP_TYPE,
 				x: 100,
 				y: 100,
 				props: {
@@ -245,9 +246,9 @@ describe('CircleClipShapeUtil', () => {
 
 	describe('child clipping behavior', () => {
 		it('should clip children when clipping is enabled', () => {
-			editor.createShape<CircleClipShape>({
+			editor.createShape({
 				id: ids.circleClip1,
-				type: 'circle-clip',
+				type: CIRCLE_CLIP_TYPE,
 				x: 100,
 				y: 100,
 				props: {
@@ -256,7 +257,7 @@ describe('CircleClipShapeUtil', () => {
 				},
 			})
 
-			editor.createShape<TLTextShape>({
+			editor.createShape({
 				id: ids.text1,
 				type: 'text',
 				x: 0,
@@ -279,9 +280,9 @@ describe('CircleClipShapeUtil', () => {
 		it('should not clip children when clipping is disabled', () => {
 			isClippingEnabled$.set(false)
 
-			editor.createShape<CircleClipShape>({
+			editor.createShape({
 				id: ids.circleClip1,
-				type: 'circle-clip',
+				type: CIRCLE_CLIP_TYPE,
 				x: 100,
 				y: 100,
 				props: {
@@ -290,7 +291,7 @@ describe('CircleClipShapeUtil', () => {
 				},
 			})
 
-			editor.createShape<TLTextShape>({
+			editor.createShape({
 				id: ids.text1,
 				type: 'text',
 				x: 0,
@@ -314,9 +315,9 @@ describe('CircleClipShapeUtil', () => {
 describe('Integration tests', () => {
 	it('should create and manage circle clip shapes with children', () => {
 		// Create circle clip shape
-		editor.createShape<CircleClipShape>({
+		editor.createShape({
 			id: ids.circleClip1,
-			type: 'circle-clip',
+			type: CIRCLE_CLIP_TYPE,
 			x: 100,
 			y: 100,
 			props: {
@@ -326,7 +327,7 @@ describe('Integration tests', () => {
 		})
 
 		// Add text child
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			id: ids.text1,
 			type: 'text',
 			x: 50,
@@ -338,7 +339,7 @@ describe('Integration tests', () => {
 		})
 
 		// Add geo child
-		editor.createShape<TLGeoShape>({
+		editor.createShape({
 			id: ids.geo1,
 			type: 'geo',
 			x: 150,
@@ -375,9 +376,9 @@ describe('Integration tests', () => {
 
 	it('should handle multiple circle clip shapes independently', () => {
 		// Create two circle clip shapes
-		editor.createShape<CircleClipShape>({
+		editor.createShape({
 			id: ids.circleClip1,
-			type: 'circle-clip',
+			type: CIRCLE_CLIP_TYPE,
 			x: 100,
 			y: 100,
 			props: {
@@ -386,9 +387,9 @@ describe('Integration tests', () => {
 			},
 		})
 
-		editor.createShape<CircleClipShape>({
+		editor.createShape({
 			id: ids.circleClip2,
-			type: 'circle-clip',
+			type: CIRCLE_CLIP_TYPE,
 			x: 400,
 			y: 100,
 			props: {
@@ -398,7 +399,7 @@ describe('Integration tests', () => {
 		})
 
 		// Add children to both
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			id: ids.text1,
 			type: 'text',
 			x: 0,
@@ -409,7 +410,7 @@ describe('Integration tests', () => {
 			},
 		})
 
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			id: ids.geo1,
 			type: 'text',
 			x: 0,
diff --git a/packages/tldraw/src/test/customSnapping.test.tsx b/packages/tldraw/src/test/customSnapping.test.tsx
index dfc9939ce84f..f3269b52dab1 100644
--- a/packages/tldraw/src/test/customSnapping.test.tsx
+++ b/packages/tldraw/src/test/customSnapping.test.tsx
@@ -2,11 +2,12 @@ import {
 	BaseBoxShapeUtil,
 	IndexKey,
 	Polyline2d,
+	ShapeUtil,
 	TLAnyShapeUtilConstructor,
-	TLBaseShape,
 	TLHandle,
 	TLHandleDragInfo,
 	TLLineShape,
+	TLShape,
 	TLShapeId,
 	Vec,
 	VecModel,
@@ -15,13 +16,19 @@ import {
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
+const TEST1_TYPE = 'test1'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[TEST1_TYPE]: { w: number; h: number; boundsSnapPoints: VecModel[] | null }
+	}
+}
+
+type Test1Shape = TLShape<typeof TEST1_TYPE>
+
 describe('custom shape bounds snapping - translate', () => {
-	type TestShape = TLBaseShape<
-		'test',
-		{ w: number; h: number; boundsSnapPoints: VecModel[] | null }
-	>
-	class TestShapeUtil extends BaseBoxShapeUtil<TestShape> {
-		static override type = 'test'
+	class TestShapeUtil extends BaseBoxShapeUtil<Test1Shape> {
+		static override type = TEST1_TYPE
 		override getDefaultProps() {
 			return { w: 100, h: 100, boundsSnapPoints: null }
 		}
@@ -31,7 +38,7 @@ describe('custom shape bounds snapping - translate', () => {
 		override indicator() {
 			throw new Error('Method not implemented.')
 		}
-		override getBoundsSnapGeometry(shape: TestShape) {
+		override getBoundsSnapGeometry(shape: Test1Shape) {
 			return {
 				points: shape.props.boundsSnapPoints ?? undefined,
 			}
@@ -45,14 +52,14 @@ describe('custom shape bounds snapping - translate', () => {
 		editor = new TestEditor({ shapeUtils })
 		ids = editor.createShapesFromJsx([
 			<TL.geo ref="box" x={0} y={0} w={100} h={100} />,
-			<TL.test ref="test" x={200} y={200} w={100} h={100} boundsSnapPoints={null} />,
+			<TL.test1 ref="test1" x={200} y={200} w={100} h={100} boundsSnapPoints={null} />,
 		])
 	})
 
 	describe('with default boundSnapPoints', () => {
 		test('normal snapping works with default boundSnapPoints when moving test shape', () => {
 			// start translating the test shape
-			editor.setSelectedShapes([ids.test]).pointerDown(250, 250)
+			editor.setSelectedShapes([ids.test1]).pointerDown(250, 250)
 
 			// move the left edge of the test shape to the right edge of the box shape - it should snap
 			editor.pointerMove(155, 250, undefined, { ctrlKey: true })
@@ -83,15 +90,15 @@ describe('custom shape bounds snapping - translate', () => {
 
 	describe('with only the center in boundSnapPoints', () => {
 		beforeEach(() => {
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test1,
+				type: TEST1_TYPE,
 				props: { boundsSnapPoints: [{ x: 50, y: 50 }] },
 			})
 		})
 
 		describe('when moving the test shape', () => {
-			beforeEach(() => editor.select(ids.test).pointerDown(250, 250))
+			beforeEach(() => editor.select(ids.test1).pointerDown(250, 250))
 
 			test('does not snap its edges to the box edges', () => {
 				editor.pointerMove(155, 250, undefined, { ctrlKey: true })
@@ -125,15 +132,15 @@ describe('custom shape bounds snapping - translate', () => {
 
 	describe('with empty boundSnapPoints', () => {
 		beforeEach(() => {
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test1,
+				type: TEST1_TYPE,
 				props: { boundsSnapPoints: [] },
 			})
 		})
 
 		test('test shape does not snap to anything', () => {
-			editor.select(ids.test).pointerDown(250, 250)
+			editor.select(ids.test1).pointerDown(250, 250)
 
 			// try to snap our left edge to the right edge of the box shape - it should not snap
 			editor.pointerMove(155, 250, undefined, { ctrlKey: true })
@@ -162,10 +169,11 @@ describe('custom shape bounds snapping - translate', () => {
 	})
 })
 
-describe('custom handle snapping', () => {
-	type TestShape = TLBaseShape<
-		'test',
-		{
+const TEST2_TYPE = 'test2'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[TEST2_TYPE]: {
 			w: number
 			h: number
 			ownHandle: VecModel
@@ -175,10 +183,15 @@ describe('custom handle snapping', () => {
 			selfSnapPoints: VecModel[] | 'default'
 			handleSnapType?: 'point' | 'align'
 		}
-	>
-	class TestShapeUtil extends BaseBoxShapeUtil<TestShape> {
-		static override type = 'test'
-		override getDefaultProps(): TestShape['props'] {
+	}
+}
+
+type Test2Shape = TLShape<typeof TEST2_TYPE>
+
+describe('custom handle snapping', () => {
+	class TestShapeUtil extends BaseBoxShapeUtil<Test2Shape> {
+		static override type = TEST2_TYPE
+		override getDefaultProps(): Test2Shape['props'] {
 			return {
 				w: 100,
 				h: 100,
@@ -195,7 +208,7 @@ describe('custom handle snapping', () => {
 		override indicator() {
 			throw new Error('Method not implemented.')
 		}
-		override getHandleSnapGeometry(shape: TestShape) {
+		override getHandleSnapGeometry(shape: Test2Shape) {
 			const { handleOutline, handlePoints, selfSnapOutline, selfSnapPoints } = shape.props
 			return {
 				outline:
@@ -213,7 +226,7 @@ describe('custom handle snapping', () => {
 				getSelfSnapPoints: selfSnapPoints === 'default' ? undefined : () => selfSnapPoints,
 			}
 		}
-		override getHandles(shape: TestShape): TLHandle[] {
+		override getHandles(shape: Test2Shape): TLHandle[] {
 			const handle: TLHandle = {
 				id: 'handle',
 				label: 'handle',
@@ -232,7 +245,7 @@ describe('custom handle snapping', () => {
 
 			return [handle]
 		}
-		override onHandleDrag(shape: TestShape, { handle }: TLHandleDragInfo<TestShape>) {
+		override onHandleDrag(shape: Test2Shape, { handle }: TLHandleDragInfo<Test2Shape>) {
 			return { ...shape, props: { ...shape.props, ownHandle: { x: handle.x, y: handle.y } } }
 		}
 	}
@@ -252,7 +265,7 @@ describe('custom handle snapping', () => {
 					a2: { id: 'a2', index: 'a2' as IndexKey, x: 100, y: 100 },
 				}}
 			/>,
-			<TL.test ref="test" x={200} y={200} w={100} h={100} boundsSnapPoints={null} />,
+			<TL.test2 ref="test2" x={200} y={200} w={100} h={100} />,
 		])
 	})
 
@@ -295,9 +308,9 @@ describe('custom handle snapping', () => {
 
 	describe('with empty handleSnapGeometry.outline', () => {
 		beforeEach(() => {
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test2,
+				type: TEST2_TYPE,
 				props: { handleOutline: null },
 			})
 		})
@@ -312,9 +325,9 @@ describe('custom handle snapping', () => {
 
 	describe('with custom handleSnapGeometry.outline', () => {
 		beforeEach(() => {
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test2,
+				type: TEST2_TYPE,
 				props: {
 					// a diagonal line from the top left to the bottom right
 					handleOutline: [
@@ -359,9 +372,9 @@ describe('custom handle snapping', () => {
 
 	describe('with custom handleSnapGeometry.points', () => {
 		beforeEach(() => {
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test2,
+				type: TEST2_TYPE,
 				props: {
 					handlePoints: [
 						{ x: 30, y: 30 },
@@ -386,12 +399,12 @@ describe('custom handle snapping', () => {
 
 	describe('with custom handleSnapGeometry.points along the outline', () => {
 		beforeEach(() => {
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test2,
+				type: TEST2_TYPE,
 				props: {
 					handlePoints: editor
-						.getShapeGeometry(ids.test)
+						.getShapeGeometry(ids.test2)
 						.bounds.cornersAndCenter.map(({ x, y }) => ({ x, y })),
 				},
 			})
@@ -425,9 +438,9 @@ describe('custom handle snapping', () => {
 	describe('self snapping', () => {
 		beforeEach(() => {
 			editor.deleteShape(ids.line)
-			editor.updateShape<TestShape>({
-				id: ids.test,
-				type: 'test',
+			editor.updateShape({
+				id: ids.test2,
+				type: TEST2_TYPE,
 				x: 0,
 				y: 0,
 				props: {
@@ -436,12 +449,12 @@ describe('custom handle snapping', () => {
 			})
 		})
 		function startDraggingOwnHandle() {
-			const shape = editor.select(ids.test).getOnlySelectedShape()!
+			const shape = editor.select(ids.test2).getOnlySelectedShape()!
 			const handles = editor.getShapeHandles(shape)!
 			editor.pointerDown(0, 0, { target: 'handle', shape, handle: handles[0] })
 		}
 		function ownHandlePosition() {
-			const shape = editor.select(ids.test).getOnlySelectedShape()!
+			const shape = editor.select(ids.test2).getOnlySelectedShape()!
 			const handle = editor.getShapeHandles(shape)![0]
 			return { x: handle.x, y: handle.y }
 		}
@@ -461,9 +474,9 @@ describe('custom handle snapping', () => {
 		})
 		describe('with custom self snap outline & points', () => {
 			beforeEach(() => {
-				editor.updateShape<TestShape>({
-					id: ids.test,
-					type: 'test',
+				editor.updateShape({
+					id: ids.test2,
+					type: TEST2_TYPE,
 					props: {
 						selfSnapOutline: [
 							{ x: 20, y: 50 },
@@ -505,9 +518,9 @@ describe('custom handle snapping', () => {
 
 		describe('with snapType set to align', () => {
 			beforeEach(() => {
-				editor.updateShape<TestShape>({
-					id: ids.test,
-					type: 'test',
+				editor.updateShape({
+					id: ids.test2,
+					type: TEST2_TYPE,
 					props: {
 						selfSnapPoints: [
 							{ x: 20, y: 50 },
@@ -541,3 +554,190 @@ describe('custom handle snapping', () => {
 		})
 	})
 })
+
+const BEZIER_TYPE = 'bezier'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[BEZIER_TYPE]: {
+			start: VecModel
+			cp1: VecModel
+			cp2: VecModel
+			end: VecModel
+		}
+	}
+}
+
+type BezierShape = TLShape<typeof BEZIER_TYPE>
+
+describe('custom adjacent handle for shift snapping', () => {
+	class BezierShapeUtil extends ShapeUtil<BezierShape> {
+		static override type = BEZIER_TYPE
+		override getDefaultProps() {
+			return {
+				start: { x: 0, y: 0 },
+				cp1: { x: 50, y: 0 },
+				cp2: { x: 50, y: 100 },
+				end: { x: 100, y: 100 },
+			}
+		}
+		override component() {
+			throw new Error('Method not implemented.')
+		}
+		override indicator() {
+			throw new Error('Method not implemented.')
+		}
+		override getGeometry() {
+			return new Polyline2d({ points: [] })
+		}
+
+		override getHandles(shape: BezierShape): TLHandle[] {
+			return [
+				{
+					id: 'start',
+					type: 'vertex',
+					index: 'a0' as IndexKey,
+					x: shape.props.start.x,
+					y: shape.props.start.y,
+				},
+				{
+					id: 'cp1',
+					type: 'vertex',
+					index: 'a1' as IndexKey,
+					x: shape.props.cp1.x,
+					y: shape.props.cp1.y,
+					snapReferenceHandleId: 'start', // cp1 snaps relative to start
+				},
+				{
+					id: 'cp2',
+					type: 'vertex',
+					index: 'a2' as IndexKey,
+					x: shape.props.cp2.x,
+					y: shape.props.cp2.y,
+					snapReferenceHandleId: 'end', // cp2 snaps relative to end
+				},
+				{
+					id: 'end',
+					type: 'vertex',
+					index: 'a3' as IndexKey,
+					x: shape.props.end.x,
+					y: shape.props.end.y,
+				},
+			]
+		}
+
+		override onHandleDrag(shape: BezierShape, { handle }: TLHandleDragInfo<BezierShape>) {
+			return {
+				...shape,
+				props: {
+					...shape.props,
+					[handle.id]: { x: handle.x, y: handle.y },
+				},
+			}
+		}
+	}
+
+	const shapeUtils = [BezierShapeUtil] as TLAnyShapeUtilConstructor[]
+
+	let editor: TestEditor
+	let ids: Record<string, TLShapeId>
+
+	beforeEach(() => {
+		editor = new TestEditor({ shapeUtils })
+		ids = editor.createShapesFromJsx([
+			<TL.bezier
+				ref="bezier"
+				x={0}
+				y={0}
+				start={{ x: 0, y: 0 }}
+				cp1={{ x: 50, y: 0 }}
+				cp2={{ x: 50, y: 100 }}
+				end={{ x: 100, y: 100 }}
+			/>,
+		])
+	})
+
+	test('cp1 snaps angle relative to start point when using custom adjacent handle', () => {
+		editor.select(ids.bezier)
+		const bezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp1Handle = editor.getShapeHandles(bezier)!.find((h) => h.id === 'cp1')!
+
+		// Start dragging cp1 handle
+		editor.pointerDown(cp1Handle.x, cp1Handle.y, {
+			target: 'handle',
+			shape: bezier,
+			handle: cp1Handle,
+		})
+
+		// Move with shift key - should snap angle relative to start (0, 0) not cp2
+		editor.pointerMove(60, 20, { shiftKey: true })
+
+		const updatedBezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp1Pos = updatedBezier.props.cp1
+		const startPos = updatedBezier.props.start
+
+		// The angle from start to cp1 should be snapped to nearest 15 degrees
+		const angle = Math.atan2(cp1Pos.y - startPos.y, cp1Pos.x - startPos.x)
+		const degrees = (angle * 180) / Math.PI
+
+		// Should snap to a multiple of 15 degrees (snapAngle uses 24 divisions = 15 degrees)
+		const remainder = ((degrees % 15) + 15) % 15
+		expect(Math.min(remainder, 15 - remainder)).toBeLessThan(1)
+	})
+
+	test('cp2 snaps angle relative to end point when using custom adjacent handle', () => {
+		editor.select(ids.bezier)
+		const bezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp2Handle = editor.getShapeHandles(bezier)!.find((h) => h.id === 'cp2')!
+
+		// Start dragging cp2 handle
+		editor.pointerDown(cp2Handle.x, cp2Handle.y, {
+			target: 'handle',
+			shape: bezier,
+			handle: cp2Handle,
+		})
+
+		// Move with shift key - should snap angle relative to end (100, 100)
+		editor.pointerMove(80, 80, { shiftKey: true })
+
+		const updatedBezier = editor.getShape<BezierShape>(ids.bezier)!
+		const cp2Pos = updatedBezier.props.cp2
+		const endPos = updatedBezier.props.end
+
+		// The angle from end to cp2 should be snapped to nearest 15 degrees
+		const angle = Math.atan2(cp2Pos.y - endPos.y, cp2Pos.x - endPos.x)
+		const degrees = (angle * 180) / Math.PI
+
+		// Should snap to a multiple of 15 degrees
+		const remainder = ((degrees % 15) + 15) % 15
+		expect(Math.min(remainder, 15 - remainder)).toBeLessThan(1)
+	})
+
+	test('default handles use default adjacent handle logic', () => {
+		editor.select(ids.bezier)
+		const bezier = editor.getShape<BezierShape>(ids.bezier)!
+		const startHandle = editor.getShapeHandles(bezier)!.find((h) => h.id === 'start')!
+
+		// Start dragging start handle
+		editor.pointerDown(startHandle.x, startHandle.y, {
+			target: 'handle',
+			shape: bezier,
+			handle: startHandle,
+		})
+
+		// Move with shift key - should use default logic (next vertex handle = cp1)
+		editor.pointerMove(10, 10, { shiftKey: true })
+
+		const updatedBezier = editor.getShape<BezierShape>(ids.bezier)!
+		const startPos = updatedBezier.props.start
+		const cp1Pos = updatedBezier.props.cp1
+
+		// The angle from cp1 to start should be snapped to nearest 15 degrees
+		const angle = Math.atan2(startPos.y - cp1Pos.y, startPos.x - cp1Pos.x)
+		const degrees = (angle * 180) / Math.PI
+
+		// Should snap to a multiple of 15 degrees
+		const remainder = ((degrees % 15) + 15) % 15
+		expect(Math.min(remainder, 15 - remainder)).toBeLessThan(1)
+	})
+})
diff --git a/packages/tldraw/src/test/duplicate.test.ts b/packages/tldraw/src/test/duplicate.test.ts
index 3a5410d90a0e..ec9b8ec42f57 100644
--- a/packages/tldraw/src/test/duplicate.test.ts
+++ b/packages/tldraw/src/test/duplicate.test.ts
@@ -295,7 +295,7 @@ describe('When duplicating shapes that include arrows', () => {
 			.select(
 				...editor
 					.getCurrentPageShapes()
-					.filter((s) => editor.isShapeOfType<TLArrowShape>(s, 'arrow'))
+					.filter((s) => editor.isShapeOfType(s, 'arrow'))
 					.map((s) => s.id)
 			)
 
diff --git a/packages/tldraw/src/test/frames.test.ts b/packages/tldraw/src/test/frames.test.ts
index 3b7af9ff4d08..24d3df2bea29 100644
--- a/packages/tldraw/src/test/frames.test.ts
+++ b/packages/tldraw/src/test/frames.test.ts
@@ -1363,13 +1363,13 @@ describe('Unparenting behavior', () => {
 
 		// When the shape has a fill, it should not fall out of the frame
 		editor.undo()
-		editor.updateShape<TLGeoShape>({ ...largeRect, props: { fill: 'solid' } })
+		editor.updateShape({ ...largeRect, props: { fill: 'solid' } })
 		dragOntoFrame()
 		expect(editor.getShape(largeRect.id)!.parentId).toBe(frameId)
 
 		// When the shape has a label and that label is on top of the frame, it should not fall out of the frame
 		editor.undo()
-		editor.updateShape<TLGeoShape>({
+		editor.updateShape({
 			...largeRect,
 			props: { fill: 'none', richText: toRichText('hello') },
 		})
diff --git a/packages/tldraw/src/test/getCulledShapes.test.tsx b/packages/tldraw/src/test/getCulledShapes.test.tsx
index 2c345dbdb6b9..979d7bbd17c5 100644
--- a/packages/tldraw/src/test/getCulledShapes.test.tsx
+++ b/packages/tldraw/src/test/getCulledShapes.test.tsx
@@ -3,7 +3,7 @@ import {
 	Box,
 	RecordProps,
 	T,
-	TLBaseShape,
+	TLShape,
 	TLShapeId,
 	createShapeId,
 } from '@tldraw/editor'
@@ -11,11 +11,19 @@ import { vi } from 'vitest'
 import { TestEditor } from './TestEditor'
 import { TL } from './test-jsx'
 
+const UNCULLABLE_TYPE = 'uncullable'
+
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[UNCULLABLE_TYPE]: { w: number; h: number }
+	}
+}
+
 // Custom uncullable shape type for testing canCull override
-type UncullableShape = TLBaseShape<'uncullable', { w: number; h: number }>
+type UncullableShape = TLShape<typeof UNCULLABLE_TYPE>
 
 class UncullableShapeUtil extends BaseBoxShapeUtil<UncullableShape> {
-	static override type = 'uncullable' as const
+	static override type = UNCULLABLE_TYPE
 	static override props: RecordProps<UncullableShape> = {
 		w: T.number,
 		h: T.number,
diff --git a/packages/tldraw/src/test/getShapeAtPoint.test.ts b/packages/tldraw/src/test/getShapeAtPoint.test.ts
index 7e0c919f2d9c..117ebb671563 100644
--- a/packages/tldraw/src/test/getShapeAtPoint.test.ts
+++ b/packages/tldraw/src/test/getShapeAtPoint.test.ts
@@ -1,4 +1,4 @@
-import { TLGeoShape, TLShape, createShapeId, toRichText } from '@tldraw/editor'
+import { TLShape, createShapeId, toRichText } from '@tldraw/editor'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -146,7 +146,7 @@ describe('with hitLabels=true', () => {
 	it('hits geo shape label behind overlapping hollow shape', () => {
 		// label is empty
 		expect(editor.getShapeAtPoint({ x: 350, y: 350 }, opts)?.id).toBe(ids.box3)
-		editor.updateShape<TLGeoShape>({
+		editor.updateShape({
 			id: ids.box2,
 			type: 'geo',
 			props: { richText: toRichText('hello') },
diff --git a/packages/tldraw/src/test/groups.test.tsx b/packages/tldraw/src/test/groups.test.tsx
index 9f58b60b4c4d..eeab9efbc69e 100644
--- a/packages/tldraw/src/test/groups.test.tsx
+++ b/packages/tldraw/src/test/groups.test.tsx
@@ -1,5 +1,6 @@
 import {
 	Box,
+	ExtractShapeByProps,
 	GroupShapeUtil,
 	TLArrowShape,
 	TLGroupShape,
@@ -35,14 +36,16 @@ const ids = {
 	groupA: createShapeId('groupA'),
 }
 
+type BoxShape = ExtractShapeByProps<{ fill: string }>
+
 const box = (
 	id: TLShapeId,
 	x: number,
 	y: number,
 	w = 10,
 	h = 10,
-	fill = 'solid'
-): TLShapePartial => ({
+	fill: BoxShape['props']['fill'] = 'solid'
+): TLShapePartial<BoxShape> => ({
 	type: 'geo',
 	id,
 	x,
@@ -1980,7 +1983,7 @@ describe('Group opacity', () => {
 		editor.setOpacityForNextShapes(0.5)
 		editor.groupShapes(editor.getSelectedShapeIds())
 		const group = editor.getShape(onlySelectedId())!
-		assert(editor.isShapeOfType<TLGroupShape>(group, 'group'))
+		assert(editor.isShapeOfType(group, 'group'))
 		expect(group.opacity).toBe(1)
 	})
 })
diff --git a/packages/tldraw/src/test/resizing.test.ts b/packages/tldraw/src/test/resizing.test.ts
index f6b81f1eca41..dacb31f0c50c 100644
--- a/packages/tldraw/src/test/resizing.test.ts
+++ b/packages/tldraw/src/test/resizing.test.ts
@@ -3876,10 +3876,8 @@ it('uses the cross cursor when create resizing', () => {
 describe('Resizing text from the right edge', () => {
 	it('Resizes text from the right edge', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([{ id, type: 'text', props: { richText: toRichText('H') } }])
-		editor.updateShapes<TLTextShape>([
-			{ id, type: 'text', props: { richText: toRichText('Hello World') } },
-		]) // auto size
+		editor.createShapes([{ id, type: 'text', props: { richText: toRichText('H') } }])
+		editor.updateShapes([{ id, type: 'text', props: { richText: toRichText('Hello World') } }]) // auto size
 
 		editor.select(id)
 
@@ -3905,10 +3903,8 @@ describe('Resizing text from the right edge', () => {
 		editor.updateInstanceState({ isCoarsePointer: true })
 
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([{ id, type: 'text', props: { richText: toRichText('H') } }])
-		editor.updateShapes<TLTextShape>([
-			{ id, type: 'text', props: { richText: toRichText('Hello World') } },
-		]) // auto size
+		editor.createShapes([{ id, type: 'text', props: { richText: toRichText('H') } }])
+		editor.updateShapes([{ id, type: 'text', props: { richText: toRichText('Hello World') } }]) // auto size
 
 		editor.select(id)
 
@@ -3954,7 +3950,7 @@ describe('When resizing near the edges of the screen', () => {
 
 describe('resizing text with autosize true', () => {
 	it('resizes text from the right side', () => {
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			type: 'text',
 			x: 0,
 			y: 0,
@@ -3980,7 +3976,7 @@ describe('resizing text with autosize true', () => {
 	})
 
 	it('resizes text from the right side when alt key is pressed', () => {
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			type: 'text',
 			x: 0,
 			y: 0,
@@ -4007,7 +4003,7 @@ describe('resizing text with autosize true', () => {
 	})
 
 	it('resizes text from the left side', () => {
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			type: 'text',
 			x: 0,
 			y: 0,
@@ -4033,7 +4029,7 @@ describe('resizing text with autosize true', () => {
 	})
 
 	it('resizes text from the left side when alt is pressed', () => {
-		editor.createShape<TLTextShape>({
+		editor.createShape({
 			type: 'text',
 			x: 0,
 			y: 0,
@@ -4062,7 +4058,7 @@ describe('resizing text with autosize true', () => {
 
 describe('cancelling a resize operation', () => {
 	it('undoes any changes since the start of the resize operation', () => {
-		editor.createShape<TLGeoShape>({
+		editor.createShape({
 			type: 'geo',
 			x: 0,
 			y: 0,
diff --git a/packages/tldraw/src/test/selection-omnibus.test.ts b/packages/tldraw/src/test/selection-omnibus.test.ts
index 89c52646239b..0d97c7853a9f 100644
--- a/packages/tldraw/src/test/selection-omnibus.test.ts
+++ b/packages/tldraw/src/test/selection-omnibus.test.ts
@@ -76,7 +76,7 @@ describe('Hovering shapes', () => {
 		editor.pointerMove(50, 50)
 		expect(editor.getHoveredShapeId()).toBe(null)
 
-		editor.updateShape<TLGeoShape>({
+		editor.updateShape({
 			id: ids.box1,
 			type: 'geo',
 			props: { richText: toRichText('hello') },
@@ -88,7 +88,7 @@ describe('Hovering shapes', () => {
 	})
 
 	it('selects a shape with a full label on pointer down', () => {
-		editor.updateShape<TLGeoShape>({
+		editor.updateShape({
 			id: ids.box1,
 			type: 'geo',
 			props: { richText: toRichText('hello') },
@@ -462,7 +462,7 @@ describe('when shape is hollow', () => {
 describe('when shape is a frame', () => {
 	let frame1: TLFrameShape
 	beforeEach(() => {
-		editor.createShape<TLFrameShape>({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
+		editor.createShape({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
 		frame1 = editor.getShape<TLFrameShape>(ids.frame1)!
 	})
 
@@ -517,8 +517,8 @@ describe('when shape is a frame', () => {
 describe('When a shape is behind a frame', () => {
 	beforeEach(() => {
 		editor.selectAll().deleteShapes(editor.getSelectedShapeIds())
-		editor.createShape<TLGeoShape>({ id: ids.box1, type: 'geo', x: 25, y: 25 })
-		editor.createShape<TLFrameShape>({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
+		editor.createShape({ id: ids.box1, type: 'geo', x: 25, y: 25 })
+		editor.createShape({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
 	})
 
 	it('does not select the shape when clicked inside', () => {
@@ -548,8 +548,8 @@ describe('when shape is inside of a frame', () => {
 	let frame1: TLFrameShape
 	let box1: TLGeoShape
 	beforeEach(() => {
-		editor.createShape<TLFrameShape>({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
-		editor.createShape<TLGeoShape>({
+		editor.createShape({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
+		editor.createShape({
 			id: ids.box1,
 			parentId: ids.frame1,
 			type: 'geo',
@@ -703,15 +703,15 @@ describe('when a frame has multiple children', () => {
 	let box2: TLGeoShape
 	beforeEach(() => {
 		editor
-			.createShape<TLFrameShape>({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
-			.createShape<TLGeoShape>({
+			.createShape({ id: ids.frame1, type: 'frame', props: { w: 100, h: 100 } })
+			.createShape({
 				id: ids.box1,
 				parentId: ids.frame1,
 				type: 'geo',
 				x: 25,
 				y: 25,
 			})
-			.createShape<TLGeoShape>({
+			.createShape({
 				id: ids.box2,
 				parentId: ids.frame1,
 				type: 'geo',
@@ -849,7 +849,7 @@ describe('When shapes are overlapping', () => {
 	let box4: TLGeoShape
 	let box5: TLGeoShape
 	beforeEach(() => {
-		editor.createShapes<TLGeoShape>([
+		editor.createShapes([
 			{
 				id: ids.box1,
 				type: 'geo',
diff --git a/packages/tldraw/src/test/shapeutils.test.ts b/packages/tldraw/src/test/shapeutils.test.ts
index f1eb3465c47b..a14a52ef7222 100644
--- a/packages/tldraw/src/test/shapeutils.test.ts
+++ b/packages/tldraw/src/test/shapeutils.test.ts
@@ -470,7 +470,7 @@ describe('When interacting with a shape...', () => {
 	})
 
 	it('Fires handle dragging cancel events', () => {
-		const util = editor.getShapeUtil<TLLineShape>('line')
+		const util = editor.getShapeUtil('line')
 
 		const calls: string[] = []
 
diff --git a/packages/tldraw/src/test/styles2.test.tsx b/packages/tldraw/src/test/styles2.test.tsx
index b86f5cd94d24..869b98d2bfdd 100644
--- a/packages/tldraw/src/test/styles2.test.tsx
+++ b/packages/tldraw/src/test/styles2.test.tsx
@@ -88,7 +88,7 @@ describe('Editor.styles', () => {
 	})
 
 	it('should return mixed for all mixed styles', () => {
-		editor.updateShapes<TLGeoShape>([
+		editor.updateShapes([
 			{
 				id: defaultShapesIds.box1,
 				type: 'geo',
diff --git a/packages/tldraw/src/test/styles3.test.ts b/packages/tldraw/src/test/styles3.test.ts
index 5f8f729dfbf2..9bf49d9f54f2 100644
--- a/packages/tldraw/src/test/styles3.test.ts
+++ b/packages/tldraw/src/test/styles3.test.ts
@@ -1,4 +1,4 @@
-import { TLGeoShape, createShapeId, toRichText } from '@tldraw/editor'
+import { createShapeId, toRichText } from '@tldraw/editor'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -14,7 +14,7 @@ afterEach(() => {
 it("When changing the style of a geo shape, if the text label is empty, don't measure it", () => {
 	const id = createShapeId()
 
-	editor.createShapes<TLGeoShape>([
+	editor.createShapes([
 		{
 			id,
 			type: 'geo',
@@ -29,7 +29,7 @@ it("When changing the style of a geo shape, if the text label is empty, don't me
 
 	const boundsBefore = editor.getShapeGeometry(id).bounds
 
-	editor.updateShapes<TLGeoShape>([
+	editor.updateShapes([
 		{
 			id,
 			type: 'geo',
@@ -43,7 +43,7 @@ it("When changing the style of a geo shape, if the text label is empty, don't me
 it('When changing the style of a geo shape, if the text label has text, measure it and possibly update the size', () => {
 	const id = createShapeId()
 
-	editor.createShapes<TLGeoShape>([
+	editor.createShapes([
 		{
 			id,
 			type: 'geo',
@@ -58,7 +58,7 @@ it('When changing the style of a geo shape, if the text label has text, measure
 
 	const boundsBefore = editor.getShapeGeometry(id).bounds!
 
-	editor.updateShapes<TLGeoShape>([
+	editor.updateShapes([
 		{
 			id,
 			type: 'geo',
diff --git a/packages/tldraw/src/test/test-jsx.tsx b/packages/tldraw/src/test/test-jsx.tsx
index 68d130670d0a..59b202187143 100644
--- a/packages/tldraw/src/test/test-jsx.tsx
+++ b/packages/tldraw/src/test/test-jsx.tsx
@@ -5,8 +5,7 @@ import {
 	TLBinding,
 	TLBindingCreate,
 	TLBindingId,
-	TLDefaultBinding,
-	TLDefaultShape,
+	TLShape,
 	TLShapeId,
 	TLShapePartial,
 	ZERO_INDEX_KEY,
@@ -23,6 +22,7 @@ import React, { Fragment } from 'react'
 const shapeTypeSymbol = Symbol('shapeJsx')
 const assetTypeSymbol = Symbol('assetJsx')
 const bindingTypeSymbol = Symbol('bindingJsx')
+
 interface CommonShapeProps {
 	x?: number
 	y?: number
@@ -34,7 +34,6 @@ interface CommonShapeProps {
 	opacity?: number
 }
 
-type ShapeByType<Type extends TLDefaultShape['type']> = Extract<TLDefaultShape, { type: Type }>
 type FormatShapeProps<Props extends object> = {
 	[K in keyof Props]?: Props[K] extends TLAssetId
 		? TLAssetId | React.JSX.Element
@@ -42,24 +41,39 @@ type FormatShapeProps<Props extends object> = {
 			? TLAssetId | React.JSX.Element | null
 			: Props[K]
 }
-type PropsForShape<Type extends string> = Type extends TLDefaultShape['type']
-	? CommonShapeProps & FormatShapeProps<ShapeByType<Type>['props']>
-	: CommonShapeProps & Record<string, unknown>
+type PropsForShape<Type extends TLShape['type']> = CommonShapeProps &
+	FormatShapeProps<TLShape<Type>['props']>
 
 type AssetByType<Type extends TLAsset['type']> = Extract<TLAsset, { type: Type }>
 type PropsForAsset<Type extends string> = Type extends TLAsset['type']
 	? Partial<AssetByType<Type>['props']>
 	: Record<string, unknown>
 
-interface CommonBindingProps {
+interface BindingReactConnections {
 	from?: string | TLShapeId
 	to: string | TLShapeId
 }
 
-type BindingByType<Type extends TLBinding['type']> = Extract<TLBinding, { type: Type }>
-type PropsForBinding<Type extends string> = Type extends TLBinding['type']
-	? CommonBindingProps & Partial<BindingByType<Type>['props']>
-	: CommonBindingProps & Record<string, unknown>
+interface CommonBindingReactProps extends BindingReactConnections {
+	ref?: string
+	id?: TLBindingId
+}
+
+type ReactPropsForBinding<Type extends TLBinding['type']> = CommonBindingReactProps &
+	Partial<TLBinding<Type>['props']>
+
+type BindingToCreate = TLBinding extends infer E
+	? E extends TLBinding
+		? {
+				type: E['type']
+				props: Partial<TLBinding<E['type']>['props']>
+				id: TLBindingId | undefined
+				parentId: TLShapeId | undefined
+				ref: string | undefined
+				connections: BindingReactConnections
+			}
+		: never
+	: never
 
 const createElement = (
 	type: typeof shapeTypeSymbol | typeof assetTypeSymbol | typeof bindingTypeSymbol,
@@ -90,10 +104,9 @@ const tlBinding = new Proxy(
 			return createElement(bindingTypeSymbol, key as string)
 		},
 	}
-) as { [K in TLDefaultBinding['type']]: (props: PropsForBinding<K>) => null } & Record<
-	string,
-	(props: PropsForBinding<string>) => null
->
+) as {
+	[K in TLBinding['type']]: (props: ReactPropsForBinding<K>) => null
+}
 
 /**
  * TL - jsx helpers for creating tldraw shapes in test cases
@@ -112,8 +125,8 @@ export const TL = new Proxy(
 		},
 	}
 ) as { asset: typeof tlAsset; binding: typeof tlBinding } & {
-	[K in TLDefaultShape['type']]: (props: PropsForShape<K>) => null
-} & Record<string, (props: PropsForShape<string>) => null>
+	[K in TLShape['type']]: (props: PropsForShape<K>) => null
+}
 
 export function shapesFromJsx(shapes: React.JSX.Element | Array<React.JSX.Element>, idPrefix = '') {
 	const ids = { bindings: {} } as Record<string, TLShapeId> & {
@@ -122,12 +135,7 @@ export function shapesFromJsx(shapes: React.JSX.Element | Array<React.JSX.Elemen
 	const currentPageShapes: Array<TLShapePartial> = []
 	const assets: Array<TLAsset> = []
 
-	const bindingsToCreate: Array<{
-		type: string
-		props: Record<string, unknown>
-		parentId: TLShapeId | undefined
-		ref: string | undefined
-	}> = []
+	const bindingsToCreate: Array<BindingToCreate> = []
 
 	function addChildren(
 		children: React.JSX.Element | Array<React.JSX.Element>,
@@ -152,10 +160,21 @@ export function shapesFromJsx(shapes: React.JSX.Element | Array<React.JSX.Elemen
 			}
 
 			if (el.type[bindingTypeSymbol]) {
-				const bindingType = (el.type as any)[bindingTypeSymbol] as string
-				const ref = ((el as any).ref || el.props.ref) as string | undefined
-				assert(ref === undefined || typeof ref === 'string', 'ref must be string or undefined')
-				bindingsToCreate.push({ type: bindingType, props: el.props, parentId, ref })
+				const bindingType = (el.type as any)[bindingTypeSymbol] as TLBinding['type']
+				const { id, from, to, ref, ...props } = el.props
+				const bindingRef: unknown = (el as any).ref || ref
+				assert(
+					bindingRef === undefined || typeof bindingRef === 'string',
+					'ref must be string or undefined'
+				)
+				bindingsToCreate.push({
+					type: bindingType,
+					props,
+					id,
+					parentId,
+					ref: bindingRef,
+					connections: { from, to },
+				})
 			} else {
 				const shapeType = (el.type as any)[shapeTypeSymbol] as string
 				if (!shapeType) {
@@ -239,55 +258,48 @@ export function shapesFromJsx(shapes: React.JSX.Element | Array<React.JSX.Elemen
 	addChildren(shapes)
 
 	const bindings: TLBindingCreate[] = []
-	for (const binding of bindingsToCreate) {
+	for (const { id, parentId, ref, connections, ...binding } of bindingsToCreate) {
 		let fromId: TLShapeId, toId: TLShapeId
-		if (binding.props.from) {
-			assert(typeof binding.props.from === 'string', 'from must be a ref string or a shape id')
-			if (isShapeId(binding.props.from)) {
-				fromId = binding.props.from
+		if (connections.from) {
+			assert(typeof connections.from === 'string', 'from must be a ref string or a shape id')
+			if (isShapeId(connections.from)) {
+				fromId = connections.from
 			} else {
-				assert(ids[binding.props.from], `Ref not found: ${binding.props.from}`)
-				fromId = ids[binding.props.from]
+				assert(ids[connections.from], `Ref not found: ${connections.from}`)
+				fromId = ids[connections.from]
 			}
-		} else if (binding.parentId) {
-			fromId = binding.parentId
+		} else if (parentId) {
+			fromId = parentId
 		} else {
 			throw new Error('from must be specified, or binding must be a child of a shape')
 		}
 
-		assert(binding.props.to, 'to must be specified')
-		assert(typeof binding.props.to === 'string', 'to must be a ref string or a shape id')
-		if (isShapeId(binding.props.to)) {
-			toId = binding.props.to
+		assert(connections.to, 'to must be specified')
+		assert(typeof connections.to === 'string', 'to must be a ref string or a shape id')
+		if (isShapeId(connections.to)) {
+			toId = connections.to
 		} else {
-			assert(ids[binding.props.to], `Ref not found: ${binding.props.to}`)
-			toId = ids[binding.props.to]
+			assert(ids[connections.to], `Ref not found: ${connections.to}`)
+			toId = ids[connections.to]
 		}
 
-		let bindingId: TLBindingId = binding.props.id as TLBindingId
-		if (binding.ref) {
-			assert(typeof binding.ref === 'string', 'binding ref must be string')
-			assert(!ids.bindings[binding.ref], `Duplicate ref: ${binding.ref}`)
-			assert(!bindingId, `Cannot use both ref and id on binding: ${binding.ref}`)
-			bindingId = createBindingId(`${idPrefix}${binding.ref}`)
-			ids.bindings[binding.ref] = bindingId
+		let bindingId = id
+		if (ref) {
+			assert(typeof ref === 'string', 'binding ref must be string')
+			assert(!ids.bindings[ref], `Duplicate ref: ${ref}`)
+			assert(!bindingId, `Cannot use both ref and id on binding: ${ref}`)
+			bindingId = createBindingId(`${idPrefix}${ref}`)
+			ids.bindings[ref] = bindingId
 		}
 		if (!bindingId) {
 			bindingId = createBindingId()
 		}
 
-		const props = { ...binding.props }
-		delete props.ref
-		delete props.id
-		delete props.from
-		delete props.to
-
 		bindings.push({
+			...binding,
 			id: bindingId,
-			type: binding.type,
 			fromId,
 			toId,
-			props,
 		})
 	}
 
diff --git a/packages/tldraw/src/test/text.test.ts b/packages/tldraw/src/test/text.test.ts
index 06c9bf6781c3..e18133b041ca 100644
--- a/packages/tldraw/src/test/text.test.ts
+++ b/packages/tldraw/src/test/text.test.ts
@@ -1,4 +1,4 @@
-import { TLTextShape, createShapeId, toRichText } from '@tldraw/editor'
+import { createShapeId, toRichText } from '@tldraw/editor'
 import { TestEditor } from './TestEditor'
 
 let editor: TestEditor
@@ -13,7 +13,7 @@ afterEach(() => {
 describe('When editing text', () => {
 	it('preserves the top center when center aligned', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -27,7 +27,7 @@ describe('When editing text', () => {
 			},
 		])
 		const boundsA = editor.getShapePageBounds(id)
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				id,
 				type: 'text',
@@ -47,7 +47,7 @@ describe('When editing text', () => {
 
 	it('preserved the right center when center aligned and rotated 90deg', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -63,9 +63,7 @@ describe('When editing text', () => {
 		])
 
 		const boundsA = editor.getShapePageBounds(id)!
-		editor.updateShapes<TLTextShape>([
-			{ id, type: 'text', props: { richText: toRichText('Hello, world!') } },
-		])
+		editor.updateShapes([{ id, type: 'text', props: { richText: toRichText('Hello, world!') } }])
 		const boundsB = editor.getShapePageBounds(id)!
 		expect(boundsA.x).toBeCloseTo(boundsB.x)
 		expect(boundsA.y).not.toBeCloseTo(boundsB.y)
@@ -75,7 +73,7 @@ describe('When editing text', () => {
 
 	it('preserves the top left corner when start aligned', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -89,7 +87,7 @@ describe('When editing text', () => {
 			},
 		])
 		const boundsA = editor.getShapePageBounds(id)
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				id,
 				type: 'text',
@@ -109,7 +107,7 @@ describe('When editing text', () => {
 
 	it('preserves the top right edge when end aligned', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -123,7 +121,7 @@ describe('When editing text', () => {
 			},
 		])
 		const boundsA = editor.getShapePageBounds(id)
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				id,
 				type: 'text',
@@ -145,7 +143,7 @@ describe('When editing text', () => {
 describe('When changing text size', () => {
 	it('preserves the center when center aligned', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -160,7 +158,7 @@ describe('When changing text size', () => {
 			},
 		])
 		const boundsA = editor.getShapePageBounds(id)
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				id,
 				type: 'text',
@@ -180,7 +178,7 @@ describe('When changing text size', () => {
 
 	it('preserves the center left point when start aligned', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -195,7 +193,7 @@ describe('When changing text size', () => {
 			},
 		])
 		const boundsA = editor.getShapePageBounds(id)
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				id,
 				type: 'text',
@@ -215,7 +213,7 @@ describe('When changing text size', () => {
 
 	it('preserves the top right edge when end aligned', () => {
 		const id = createShapeId()
-		editor.createShapes<TLTextShape>([
+		editor.createShapes([
 			{
 				id,
 				type: 'text',
@@ -230,7 +228,7 @@ describe('When changing text size', () => {
 			},
 		])
 		const boundsA = editor.getShapePageBounds(id)
-		editor.updateShapes<TLTextShape>([
+		editor.updateShapes([
 			{
 				id,
 				type: 'text',
diff --git a/packages/tldraw/src/test/translating.test.ts b/packages/tldraw/src/test/translating.test.ts
index d6bd1cd66685..884c50099d83 100644
--- a/packages/tldraw/src/test/translating.test.ts
+++ b/packages/tldraw/src/test/translating.test.ts
@@ -1749,9 +1749,7 @@ describe('translating a shape with a bound shape', () => {
 
 		const newArrow = editor
 			.getCurrentPageShapes()
-			.find(
-				(s) => editor.isShapeOfType<TLArrowShape>(s, 'arrow') && s.id !== arrow1
-			)! as TLArrowShape
+			.find((s) => editor.isShapeOfType(s, 'arrow') && s.id !== arrow1)! as TLArrowShape
 		expect(getArrowBindings(editor, newArrow)).toMatchObject({
 			start: { type: 'arrow' },
 			end: undefined,
@@ -2061,7 +2059,7 @@ describe('Note shape grid helper positions / pits', () => {
 		editor
 			.createShape({ type: 'note' })
 			.createShape({ type: 'note', x: 500, y: 500 })
-			.updateShape({ ...editor.getLastCreatedShape(), props: { growY: 100 } })
+			.updateShape({ ...editor.getLastCreatedShape<TLNoteShape>(), props: { growY: 100 } })
 			.pointerMove(600, 600)
 			// start translating
 			.pointerDown()
@@ -2080,7 +2078,7 @@ describe('Note shape grid helper positions / pits', () => {
 	it('Snaps correctly to the bottom when the not-translating shape has growY', () => {
 		editor
 			.createShape({ type: 'note' })
-			.updateShape({ ...editor.getLastCreatedShape(), props: { growY: 100 } })
+			.updateShape({ ...editor.getLastCreatedShape<TLNoteShape>(), props: { growY: 100 } })
 			.createShape({ type: 'note', x: 500, y: 500 })
 			.pointerMove(600, 600)
 			// start translating
@@ -2183,7 +2181,7 @@ describe('Note shape grid helper positions / pits', () => {
 
 describe('cancelling a translate operation', () => {
 	it('undoes any changes since the start of the translate operation', () => {
-		editor.createShape<TLGeoShape>({
+		editor.createShape({
 			type: 'geo',
 			x: 0,
 			y: 0,
@@ -2220,7 +2218,7 @@ describe('cancelling a translate operation', () => {
 		const shapeId = createShapeId()
 
 		editor
-			.createShape<TLGeoShape>({
+			.createShape({
 				id: shapeId,
 				type: 'geo',
 				x: 0,
@@ -2268,7 +2266,7 @@ describe('cancelling a translate operation', () => {
 		const shapeId = createShapeId()
 
 		editor
-			.createShape<TLGeoShape>({
+			.createShape({
 				id: shapeId,
 				type: 'geo',
 				x: 0,
diff --git a/packages/tlschema/DOCS.md b/packages/tlschema/DOCS.md
index 0d948dc38472..73e96b9128ff 100644
--- a/packages/tlschema/DOCS.md
+++ b/packages/tlschema/DOCS.md
@@ -85,11 +85,17 @@ const schema = createTLSchema({
 Shape records are the most common type you'll work with. Every shape extends `TLBaseShape`:
 
 ```ts
-import { TLBaseShape, createShapeValidator } from '@tldraw/tlschema'
+import { createShapeValidator } from '@tldraw/tlschema'
 import { T } from '@tldraw/validate'
 
+const CUSTOM_TYPE = 'custom'
+
 // Define a custom shape type
-interface MyCustomShape extends TLBaseShape<'custom', MyCustomShapeProps> {}
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[CUSTOM_TYPE]: MyCustomShapeProps
+	}
+}
 
 interface MyCustomShapeProps {
 	width: number
@@ -97,8 +103,10 @@ interface MyCustomShapeProps {
 	color: string
 }
 
+type MyCustomShape = TLShape<typeof CUSTOM_TYPE>
+
 // Create validation for your shape
-const customShapeValidator = createShapeValidator('custom', {
+const customShapeValidator = createShapeValidator(CUSTOM_TYPE, {
 	width: T.number,
 	height: T.number,
 	color: T.string,
@@ -130,15 +138,20 @@ When creating custom shapes, follow this pattern for complete integration:
 
 ```ts
 import {
-	TLBaseShape,
 	createShapeValidator,
 	createShapePropsMigrationSequence,
 	RecordProps,
 } from '@tldraw/tlschema'
 import { DefaultColorStyle } from '@tldraw/tlschema'
 
-// 1. Define the shape interface
-interface MyShape extends TLBaseShape<'myshape', MyShapeProps> {}
+const MY_SHAPE_TYPE = 'myshape'
+
+// 1. Define the shape
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalShapePropsMap {
+		[MY_SHAPE_TYPE]: MyShapeProps
+	}
+}
 
 interface MyShapeProps {
 	color: typeof DefaultColorStyle // Use existing style
@@ -147,6 +160,8 @@ interface MyShapeProps {
 	customData: string
 }
 
+type MyShape = TLShape<typeof MY_SHAPE_TYPE>
+
 // 2. Create props validation
 const myShapeProps: RecordProps<MyShape> = {
 	color: DefaultColorStyle,
@@ -629,8 +644,16 @@ const customSchema = createTLSchema({
 Create new types of shape relationships:
 
 ```ts
+const CUSTOM_TYPE = 'custom'
+
 // Define custom binding types
-interface MyCustomBinding extends TLBaseBinding<'custom', MyBindingProps> {}
+declare module '@tldraw/tlschema' {
+	export interface TLGlobalBindingPropsMap {
+		[CUSTOM_TYPE]: MyBindingProps
+	}
+}
+
+type MyCustomBinding = TLBinding<typeof CUSTOM_TYPE>
 
 const customBindingConfig = {
 	props: myBindingProps,
diff --git a/packages/tlschema/api-report.api.md b/packages/tlschema/api-report.api.md
index d100c73fd1d1..9872a368259c 100644
--- a/packages/tlschema/api-report.api.md
+++ b/packages/tlschema/api-report.api.md
@@ -188,7 +188,7 @@ export const DefaultColorThemePalette: {
 export const DefaultDashStyle: EnumStyleProp<"dashed" | "dotted" | "draw" | "solid">;
 
 // @public
-export const DefaultFillStyle: EnumStyleProp<"fill" | "none" | "pattern" | "semi" | "solid">;
+export const DefaultFillStyle: EnumStyleProp<"fill" | "lined-fill" | "none" | "pattern" | "semi" | "solid">;
 
 // @public
 export const DefaultFontFamilies: {
@@ -204,6 +204,9 @@ export const DefaultFontStyle: EnumStyleProp<"draw" | "mono" | "sans" | "serif">
 // @public
 export const DefaultHorizontalAlignStyle: EnumStyleProp<"end-legacy" | "end" | "middle-legacy" | "middle" | "start-legacy" | "start">;
 
+// @public
+export const DefaultLabelColorStyle: EnumStyleProp<"black" | "blue" | "green" | "grey" | "light-blue" | "light-green" | "light-red" | "light-violet" | "orange" | "red" | "violet" | "white" | "yellow">;
+
 // @public
 export const defaultShapeSchemas: {
     arrow: {
@@ -298,6 +301,11 @@ export class EnumStyleProp<T> extends StyleProp<T> {
     readonly values: readonly T[];
 }
 
+// @public
+export type ExtractShapeByProps<P> = Extract<TLShape, {
+    props: P;
+}>;
+
 // @public
 export const frameShapeMigrations: TLPropsMigrations;
 
@@ -626,7 +634,7 @@ export type SetValue<T extends Set<any>> = T extends Set<infer U> ? U : never;
 export const shapeIdValidator: T.Validator<TLShapeId>;
 
 // @public
-export type ShapeWithCrop = TLBaseShape<string, {
+export type ShapeWithCrop = ExtractShapeByProps<{
     crop: null | TLShapeCrop;
     h: number;
     w: number;
@@ -760,10 +768,8 @@ export type TLAssetPartial<T extends TLAsset = TLAsset> = T extends T ? {
 } & Partial<Omit<T, 'id' | 'meta' | 'props' | 'type'>> : never;
 
 // @public
-export type TLAssetShape = Extract<TLShape, {
-    props: {
-        assetId: TLAssetId;
-    };
+export type TLAssetShape = ExtractShapeByProps<{
+    assetId: TLAssetId;
 }>;
 
 // @public
@@ -784,16 +790,22 @@ export interface TLBaseAsset<Type extends string, Props> extends BaseRecord<'ass
 }
 
 // @public
-export interface TLBaseBinding<Type extends string, Props extends object> extends BaseRecord<'binding', TLBindingId> {
+export interface TLBaseBinding<Type extends string, Props extends object> {
     fromId: TLShapeId;
+    // (undocumented)
+    readonly id: TLBindingId;
     meta: JsonObject;
     props: Props;
     toId: TLShapeId;
     type: Type;
+    // (undocumented)
+    readonly typeName: 'binding';
 }
 
 // @public
-export interface TLBaseShape<Type extends string, Props extends object> extends BaseRecord<'shape', TLShapeId> {
+export interface TLBaseShape<Type extends string, Props extends object> {
+    // (undocumented)
+    readonly id: TLShapeId;
     // (undocumented)
     index: IndexKey;
     // (undocumented)
@@ -811,16 +823,18 @@ export interface TLBaseShape<Type extends string, Props extends object> extends
     // (undocumented)
     type: Type;
     // (undocumented)
+    readonly typeName: 'shape';
+    // (undocumented)
     x: number;
     // (undocumented)
     y: number;
 }
 
 // @public
-export type TLBinding = TLDefaultBinding | TLUnknownBinding;
+export type TLBinding<K extends keyof TLIndexedBindings = keyof TLIndexedBindings> = TLIndexedBindings[K];
 
 // @public
-export type TLBindingCreate<T extends TLBinding = TLBinding> = Expand<{
+export type TLBindingCreate<T extends TLBinding = TLBinding> = T extends T ? {
     fromId: T['fromId'];
     id?: TLBindingId;
     meta?: Partial<T['meta']>;
@@ -828,13 +842,13 @@ export type TLBindingCreate<T extends TLBinding = TLBinding> = Expand<{
     toId: T['toId'];
     type: T['type'];
     typeName?: T['typeName'];
-}>;
+} : never;
 
 // @public
-export type TLBindingId = RecordId<TLUnknownBinding>;
+export type TLBindingId = RecordId<TLBinding>;
 
 // @public
-export type TLBindingUpdate<T extends TLBinding = TLBinding> = Expand<{
+export type TLBindingUpdate<T extends TLBinding = TLBinding> = T extends T ? {
     fromId?: T['fromId'];
     id: TLBindingId;
     meta?: Partial<T['meta']>;
@@ -842,7 +856,7 @@ export type TLBindingUpdate<T extends TLBinding = TLBinding> = Expand<{
     toId?: T['toId'];
     type: T['type'];
     typeName?: T['typeName'];
-}>;
+} : never;
 
 // @public
 export type TLBookmarkAsset = TLBaseAsset<'bookmark', {
@@ -878,6 +892,13 @@ export type TLCameraId = RecordId<TLCamera>;
 // @public
 export type TLCanvasUiColor = SetValue<typeof TL_CANVAS_UI_COLOR_TYPES>;
 
+// @public
+export type TLCreateShapePartial<T extends TLShape = TLShape> = T extends T ? {
+    meta?: Partial<T['meta']>;
+    props?: Partial<T['props']>;
+    type: T['type'];
+} & Partial<Omit<T, 'meta' | 'props' | 'type'>> : never;
+
 // @public
 export interface TLCursor {
     rotation: number;
@@ -920,6 +941,8 @@ export interface TLDefaultColorThemeColor {
     // (undocumented)
     highlightSrgb: string;
     // (undocumented)
+    linedFill: string;
+    // (undocumented)
     noteFill: string;
     // (undocumented)
     noteText: string;
@@ -1033,6 +1056,14 @@ export interface TLGeoShapeProps {
     w: number;
 }
 
+// @public (undocumented)
+export interface TLGlobalBindingPropsMap {
+}
+
+// @public (undocumented)
+export interface TLGlobalShapePropsMap {
+}
+
 // @public
 export type TLGroupShape = TLBaseShape<'group', TLGroupShapeProps>;
 
@@ -1047,6 +1078,7 @@ export interface TLHandle {
     id: string;
     index: IndexKey;
     label?: string;
+    snapReferenceHandleId?: string;
     snapType?: 'align' | 'point';
     type: TLHandleType;
     x: number;
@@ -1096,6 +1128,22 @@ export interface TLImageShapeProps {
     w: number;
 }
 
+// @public (undocumented)
+export type TLIndexedBindings = {
+    [K in keyof TLGlobalBindingPropsMap | TLDefaultBinding['type'] as K extends TLDefaultBinding['type'] ? K extends keyof TLGlobalBindingPropsMap ? TLGlobalBindingPropsMap[K] extends null | undefined ? never : K : K : K]: K extends TLDefaultBinding['type'] ? K extends keyof TLGlobalBindingPropsMap ? TLBaseBinding<K, TLGlobalBindingPropsMap[K]> : Extract<TLDefaultBinding, {
+        type: K;
+    }> : TLBaseBinding<K, TLGlobalBindingPropsMap[K & keyof TLGlobalBindingPropsMap]>;
+};
+
+// @public (undocumented)
+export type TLIndexedShapes = {
+    [K in keyof TLGlobalShapePropsMap | TLDefaultShape['type'] as K extends TLDefaultShape['type'] ? K extends 'group' ? K : K extends keyof TLGlobalShapePropsMap ? TLGlobalShapePropsMap[K] extends null | undefined ? never : K : K : K]: K extends 'group' ? Extract<TLDefaultShape, {
+        type: K;
+    }> : K extends TLDefaultShape['type'] ? K extends keyof TLGlobalShapePropsMap ? TLBaseShape<K, TLGlobalShapePropsMap[K]> : Extract<TLDefaultShape, {
+        type: K;
+    }> : TLBaseShape<K, TLGlobalShapePropsMap[K & keyof TLGlobalShapePropsMap]>;
+};
+
 // @public
 export interface TLInstance extends BaseRecord<'instance', TLInstanceId> {
     // (undocumented)
@@ -1370,7 +1418,7 @@ export interface TLScribble {
 export type TLSerializedStore = SerializedStore<TLRecord>;
 
 // @public
-export type TLShape = TLDefaultShape | TLUnknownShape;
+export type TLShape<K extends keyof TLIndexedShapes = keyof TLIndexedShapes> = TLIndexedShapes[K];
 
 // @public
 export interface TLShapeCrop {
@@ -1383,7 +1431,7 @@ export interface TLShapeCrop {
 }
 
 // @public
-export type TLShapeId = RecordId<TLUnknownShape>;
+export type TLShapeId = RecordId<TLShape>;
 
 // @public
 export type TLShapePartial<T extends TLShape = TLShape> = T extends T ? {
diff --git a/packages/tlschema/package.json b/packages/tlschema/package.json
index 7b910477927b..c9673eedd57a 100644
--- a/packages/tlschema/package.json
+++ b/packages/tlschema/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/tlschema",
 	"description": "tldraw infinite canvas SDK (schema).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/tlschema/src/bindings/TLBaseBinding.ts b/packages/tlschema/src/bindings/TLBaseBinding.ts
index ca3dcb01c294..642f0672d0ac 100644
--- a/packages/tlschema/src/bindings/TLBaseBinding.ts
+++ b/packages/tlschema/src/bindings/TLBaseBinding.ts
@@ -1,4 +1,3 @@
-import { BaseRecord } from '@tldraw/store'
 import { JsonObject } from '@tldraw/utils'
 import { T } from '@tldraw/validate'
 import { idValidator } from '../misc/id-validator'
@@ -10,33 +9,41 @@ import { shapeIdValidator } from '../shapes/TLBaseShape'
  * Base interface for all binding types in tldraw. Bindings represent relationships
  * between shapes, such as arrows connecting to other shapes or organizational connections.
  *
- * All bindings extend this base interface with specific type and property definitions.
+ * All default bindings extend this base interface with specific type and property definitions.
  * The binding system enables shapes to maintain relationships that persist through
  * transformations, movements, and other operations.
  *
+ * Custom bindings should be defined by augmenting the TLGlobalBindingPropsMap type and getting the binding type from the TLBinding type.
+ *
  * @param Type - String literal type identifying the specific binding type (e.g., 'arrow')
  * @param Props - Object containing binding-specific properties and configuration
  *
  * @example
  * ```ts
- * // Define a custom binding type
- * interface MyCustomBinding extends TLBaseBinding<'custom', MyCustomProps> {}
- *
- * interface MyCustomProps {
- *   strength: number
- *   color: string
+ * // Define a default binding type
+ * interface TLArrowBinding extends TLBaseBinding<'arrow', TLArrowBindingProps> {}
+ *
+ * interface TLArrowBindingProps {
+ *   terminal: 'start' | 'end'
+ *   normalizedAnchor: VecModel
+ *   isExact: boolean
+ *   isPrecise: boolean
+ *   snap: ElbowArrowSnap
  * }
  *
  * // Create a binding instance
- * const binding: MyCustomBinding = {
+ * const arrowBinding: TLArrowBinding = {
  *   id: 'binding:abc123',
  *   typeName: 'binding',
- *   type: 'custom',
+ *   type: 'arrow',
  *   fromId: 'shape:source1',
  *   toId: 'shape:target1',
  *   props: {
- *     strength: 0.8,
- *     color: 'red'
+ *     terminal: 'end',
+ *     normalizedAnchor: { x: 0.5, y: 0.5 },
+ *     isExact: false,
+ *     isPrecise: true,
+ *     snap: 'edge'
  *   },
  *   meta: {}
  * }
@@ -44,8 +51,12 @@ import { shapeIdValidator } from '../shapes/TLBaseShape'
  *
  * @public
  */
-export interface TLBaseBinding<Type extends string, Props extends object>
-	extends BaseRecord<'binding', TLBindingId> {
+export interface TLBaseBinding<Type extends string, Props extends object> {
+	// using real `extends BaseRecord<'binding', TLBindingId>` introduces a circularity in the types
+	// and for that reason those "base members" have to be declared manually here
+	readonly id: TLBindingId
+	readonly typeName: 'binding'
+
 	/** The specific type of this binding (e.g., 'arrow', 'custom') */
 	type: Type
 	/** ID of the source shape in this binding relationship */
diff --git a/packages/tlschema/src/createTLSchema.ts b/packages/tlschema/src/createTLSchema.ts
index fed4585995bc..f539241740c0 100644
--- a/packages/tlschema/src/createTLSchema.ts
+++ b/packages/tlschema/src/createTLSchema.ts
@@ -22,8 +22,9 @@ import {
 	getShapePropKeysByStyle,
 	rootShapeMigrations,
 } from './records/TLShape'
-import { TLPropsMigrations, processPropsMigrations } from './recordsWithProps'
+import { RecordProps, TLPropsMigrations, processPropsMigrations } from './recordsWithProps'
 import { arrowShapeMigrations, arrowShapeProps } from './shapes/TLArrowShape'
+import { TLBaseShape } from './shapes/TLBaseShape'
 import { bookmarkShapeMigrations, bookmarkShapeProps } from './shapes/TLBookmarkShape'
 import { drawShapeMigrations, drawShapeProps } from './shapes/TLDrawShape'
 import { embedShapeMigrations, embedShapeProps } from './shapes/TLEmbedShape'
@@ -147,7 +148,12 @@ export const defaultShapeSchemas = {
 	note: { migrations: noteShapeMigrations, props: noteShapeProps },
 	text: { migrations: textShapeMigrations, props: textShapeProps },
 	video: { migrations: videoShapeMigrations, props: videoShapeProps },
-} satisfies { [T in TLDefaultShape['type']]: SchemaPropsInfo }
+} satisfies {
+	[T in TLDefaultShape['type']]: {
+		migrations: SchemaPropsInfo['migrations']
+		props: RecordProps<TLBaseShape<T, Extract<TLDefaultShape, { type: T }>['props']>>
+	}
+}
 
 /**
  * Default binding schema configurations for all built-in tldraw binding types.
diff --git a/packages/tlschema/src/index.ts b/packages/tlschema/src/index.ts
index b1a2f7afb943..a7dc8189d0db 100644
--- a/packages/tlschema/src/index.ts
+++ b/packages/tlschema/src/index.ts
@@ -99,6 +99,8 @@ export {
 	type TLBindingId,
 	type TLBindingUpdate,
 	type TLDefaultBinding,
+	type TLGlobalBindingPropsMap,
+	type TLIndexedBindings,
 	type TLUnknownBinding,
 } from './records/TLBinding'
 export { CameraRecordType, type TLCamera, type TLCameraId } from './records/TLCamera'
@@ -146,7 +148,11 @@ export {
 	isShape,
 	isShapeId,
 	rootShapeMigrations,
+	type ExtractShapeByProps,
+	type TLCreateShapePartial,
 	type TLDefaultShape,
+	type TLGlobalShapePropsMap,
+	type TLIndexedShapes,
 	type TLParentId,
 	type TLShape,
 	type TLShapeId,
@@ -262,6 +268,7 @@ export {
 	defaultColorNames,
 	DefaultColorStyle,
 	DefaultColorThemePalette,
+	DefaultLabelColorStyle,
 	getColorValue,
 	getDefaultColorTheme,
 	type TLDefaultColorStyle,
diff --git a/packages/tlschema/src/misc/TLHandle.ts b/packages/tlschema/src/misc/TLHandle.ts
index 36677f0bc8d5..69a4db5128d3 100644
--- a/packages/tlschema/src/misc/TLHandle.ts
+++ b/packages/tlschema/src/misc/TLHandle.ts
@@ -102,6 +102,8 @@ export interface TLHandle {
 	canSnap?: boolean
 	/** The type of snap to use for this handle */
 	snapType?: 'point' | 'align'
+	/** The ID of the handle to use as reference point for shift-modifier angle snapping */
+	snapReferenceHandleId?: string
 	/** The fractional index used for ordering handles */
 	index: IndexKey
 	/** The x-coordinate of the handle in the shape's local coordinate system */
diff --git a/packages/tlschema/src/records/TLAsset.ts b/packages/tlschema/src/records/TLAsset.ts
index f39a14c129e4..b1bc134c3db7 100644
--- a/packages/tlschema/src/records/TLAsset.ts
+++ b/packages/tlschema/src/records/TLAsset.ts
@@ -9,7 +9,7 @@ import { TLBaseAsset } from '../assets/TLBaseAsset'
 import { bookmarkAssetValidator, TLBookmarkAsset } from '../assets/TLBookmarkAsset'
 import { imageAssetValidator, TLImageAsset } from '../assets/TLImageAsset'
 import { TLVideoAsset, videoAssetValidator } from '../assets/TLVideoAsset'
-import { TLShape } from './TLShape'
+import { ExtractShapeByProps } from './TLShape'
 
 /**
  * Union type representing all possible asset types in tldraw.
@@ -222,4 +222,4 @@ export type TLAssetId = RecordId<TLBaseAsset<any, any>>
  *
  * @public
  */
-export type TLAssetShape = Extract<TLShape, { props: { assetId: TLAssetId } }>
+export type TLAssetShape = ExtractShapeByProps<{ assetId: TLAssetId }>
diff --git a/packages/tlschema/src/records/TLBinding.ts b/packages/tlschema/src/records/TLBinding.ts
index f35ce7f50479..a86db140a40c 100644
--- a/packages/tlschema/src/records/TLBinding.ts
+++ b/packages/tlschema/src/records/TLBinding.ts
@@ -5,7 +5,7 @@ import {
 	createRecordMigrationSequence,
 	createRecordType,
 } from '@tldraw/store'
-import { Expand, mapObjectMapValues, uniqueId } from '@tldraw/utils'
+import { mapObjectMapValues, uniqueId } from '@tldraw/utils'
 import { T } from '@tldraw/validate'
 import { TLArrowBinding } from '../bindings/TLArrowBinding'
 import { TLBaseBinding, createBindingValidator } from '../bindings/TLBaseBinding'
@@ -56,10 +56,42 @@ export type TLDefaultBinding = TLArrowBinding
  */
 export type TLUnknownBinding = TLBaseBinding<string, object>
 
+/** @public */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface TLGlobalBindingPropsMap {}
+
+/** @public */
+// prettier-ignore
+export type TLIndexedBindings = {
+	// We iterate over a union of augmented keys and default binding types.
+	// This allows us to include (or conditionally exclude or override) the default bindings in one go.
+	//
+	// In the `as` clause we are filtering out disabled bindings.
+	[K in keyof TLGlobalBindingPropsMap | TLDefaultBinding['type'] as K extends TLDefaultBinding['type']
+		? K extends keyof TLGlobalBindingPropsMap
+			? // if it extends a nullish value the user has disabled this binding type so we filter it out with never
+				TLGlobalBindingPropsMap[K] extends null | undefined
+				? never
+				: K
+			: K
+		: K]: K extends TLDefaultBinding['type']
+			? // if it's a default binding type we need to check if it's been overridden
+				K extends keyof TLGlobalBindingPropsMap
+				? // if it has been overriden then use the custom binding definition
+					TLBaseBinding<K, TLGlobalBindingPropsMap[K]>
+				: // if it has not been overriden then reuse existing type aliases for better type display
+					Extract<TLDefaultBinding, { type: K }>
+			: // use the custom binding definition
+				TLBaseBinding<K, TLGlobalBindingPropsMap[K & keyof TLGlobalBindingPropsMap]>
+}
+
 /**
- * The set of all bindings that are available in the editor, including unknown bindings.
+ * The set of all bindings that are available in the editor.
  * Bindings represent relationships between shapes, such as arrows connecting to other shapes.
  *
+ * You can use this type without a type argument to work with any binding, or pass
+ * a specific binding type string (e.g., `'arrow'`) to narrow down to that specific binding type.
+ *
  * @example
  * ```ts
  * // Check binding type and handle accordingly
@@ -73,11 +105,17 @@ export type TLUnknownBinding = TLBaseBinding<string, object>
  *       break
  *   }
  * }
+ *
+ * // Narrow to a specific binding type by passing the type as a generic argument
+ * function getArrowSourceId(binding: TLBinding<'arrow'>) {
+ *   return binding.fromId // TypeScript knows this is a TLArrowBinding
+ * }
  * ```
  *
  * @public
  */
-export type TLBinding = TLDefaultBinding | TLUnknownBinding
+export type TLBinding<K extends keyof TLIndexedBindings = keyof TLIndexedBindings> =
+	TLIndexedBindings[K]
 
 /**
  * Type for updating existing bindings with partial properties.
@@ -99,15 +137,17 @@ export type TLBinding = TLDefaultBinding | TLUnknownBinding
  *
  * @public
  */
-export type TLBindingUpdate<T extends TLBinding = TLBinding> = Expand<{
-	id: TLBindingId
-	type: T['type']
-	typeName?: T['typeName']
-	fromId?: T['fromId']
-	toId?: T['toId']
-	props?: Partial<T['props']>
-	meta?: Partial<T['meta']>
-}>
+export type TLBindingUpdate<T extends TLBinding = TLBinding> = T extends T
+	? {
+			id: TLBindingId
+			type: T['type']
+			typeName?: T['typeName']
+			fromId?: T['fromId']
+			toId?: T['toId']
+			props?: Partial<T['props']>
+			meta?: Partial<T['meta']>
+		}
+	: never
 
 /**
  * Type for creating new bindings with required fromId and toId.
@@ -133,15 +173,17 @@ export type TLBindingUpdate<T extends TLBinding = TLBinding> = Expand<{
  *
  * @public
  */
-export type TLBindingCreate<T extends TLBinding = TLBinding> = Expand<{
-	id?: TLBindingId
-	type: T['type']
-	typeName?: T['typeName']
-	fromId: T['fromId']
-	toId: T['toId']
-	props?: Partial<T['props']>
-	meta?: Partial<T['meta']>
-}>
+export type TLBindingCreate<T extends TLBinding = TLBinding> = T extends T
+	? {
+			id?: TLBindingId
+			type: T['type']
+			typeName?: T['typeName']
+			fromId: T['fromId']
+			toId: T['toId']
+			props?: Partial<T['props']>
+			meta?: Partial<T['meta']>
+		}
+	: never
 
 /**
  * Branded string type for binding record identifiers.
@@ -166,7 +208,7 @@ export type TLBindingCreate<T extends TLBinding = TLBinding> = Expand<{
  *
  * @public
  */
-export type TLBindingId = RecordId<TLUnknownBinding>
+export type TLBindingId = RecordId<TLBinding>
 
 /**
  * Migration version identifiers for the root binding record schema.
@@ -375,7 +417,7 @@ export function createBindingPropsMigrationIds<S extends string, T extends Recor
  * @internal
  */
 export function createBindingRecordType(bindings: Record<string, SchemaPropsInfo>) {
-	return createRecordType<TLBinding>('binding', {
+	return createRecordType('binding', {
 		scope: 'document',
 		validator: T.model(
 			'binding',
diff --git a/packages/tlschema/src/records/TLRecord.test.ts b/packages/tlschema/src/records/TLRecord.test.ts
index 0ac79c0fa802..59835f04ce55 100644
--- a/packages/tlschema/src/records/TLRecord.test.ts
+++ b/packages/tlschema/src/records/TLRecord.test.ts
@@ -1,5 +1,9 @@
+import { IndexKey } from '@tldraw/utils'
 import { describe, expect, it } from 'vitest'
+import { toRichText } from '../misc/TLRichText'
+import { TLPageId } from './TLPage'
 import { TLRecord } from './TLRecord'
+import { TLParentId, TLShapeId } from './TLShape'
 
 describe('TLRecord', () => {
 	it('should support type discrimination by typeName', () => {
@@ -34,14 +38,14 @@ describe('TLRecord', () => {
 
 		// Test that the discriminated union works correctly
 		const shapeRecord: TLRecord = {
-			id: 'shape:test' as any,
+			id: 'shape:test' as TLShapeId,
 			typeName: 'shape',
 			type: 'geo',
 			x: 50,
 			y: 100,
 			rotation: 0,
-			index: 'a1' as any,
-			parentId: 'page:main' as any,
+			index: 'a1' as IndexKey,
+			parentId: 'page:main' as TLParentId,
 			isLocked: false,
 			opacity: 1,
 			props: {
@@ -52,15 +56,23 @@ describe('TLRecord', () => {
 				fill: 'none',
 				dash: 'draw',
 				size: 'm',
+				growY: 0,
+				url: '',
+				scale: 1,
+				font: 'draw',
+				align: 'middle',
+				verticalAlign: 'middle',
+				labelColor: 'black',
+				richText: toRichText(''),
 			},
 			meta: {},
 		}
 
 		const pageRecord: TLRecord = {
-			id: 'page:test' as any,
+			id: 'page:test' as TLPageId,
 			typeName: 'page',
 			name: 'Test Page',
-			index: 'a1' as any,
+			index: 'a1' as IndexKey,
 			meta: {},
 		}
 
diff --git a/packages/tlschema/src/records/TLShape.ts b/packages/tlschema/src/records/TLShape.ts
index c0592cfaf2ce..ba561d3e11a8 100644
--- a/packages/tlschema/src/records/TLShape.ts
+++ b/packages/tlschema/src/records/TLShape.ts
@@ -79,12 +79,51 @@ export type TLDefaultShape =
  */
 export type TLUnknownShape = TLBaseShape<string, object>
 
+/** @public */
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface TLGlobalShapePropsMap {}
+
+/** @public */
+// prettier-ignore
+export type TLIndexedShapes = {
+	// We iterate over a union of augmented keys and default shape types.
+	// This allows us to include (or conditionally exclude or override) the default shapes in one go.
+	//
+	// In the `as` clause we are filtering out disabled shapes.
+	[K in keyof TLGlobalShapePropsMap | TLDefaultShape['type'] as K extends TLDefaultShape['type']
+		? // core shapes are always available and cannot be overridden so we just include them
+			K extends 'group'
+			? K
+			: K extends keyof TLGlobalShapePropsMap
+				? // if it extends a nullish value the user has disabled this shape type so we filter it out with never
+					TLGlobalShapePropsMap[K] extends null | undefined
+					? never
+					: K
+				: K
+		: K]: K extends 'group'
+		? // core shapes are always available and cannot be overridden so we just include them
+			Extract<TLDefaultShape, { type: K }>
+		: K extends TLDefaultShape['type']
+			? // if it's a default shape type we need to check if it's been overridden
+				K extends keyof TLGlobalShapePropsMap
+				? // if it has been overriden then use the custom shape definition
+					TLBaseShape<K, TLGlobalShapePropsMap[K]>
+				: // if it has not been overriden then reuse existing type aliases for better type display
+					Extract<TLDefaultShape, { type: K }>
+			: // use the custom shape definition
+				TLBaseShape<K, TLGlobalShapePropsMap[K & keyof TLGlobalShapePropsMap]>
+}
+
 /**
- * The set of all shapes that are available in the editor, including unknown shapes.
+ * The set of all shapes that are available in the editor.
  *
  * This is the primary shape type used throughout tldraw. It includes both the
  * built-in default shapes and any custom shapes that might be added.
  *
+ * You can use this type without a type argument to work with any shape, or pass
+ * a specific shape type string (e.g., `'geo'`, `'arrow'`, `'text'`) to narrow
+ * down to that specific shape type.
+ *
  * @example
  * ```ts
  * // Work with any shape in the editor
@@ -95,11 +134,16 @@ export type TLUnknownShape = TLBaseShape<string, object>
  *     y: shape.y + deltaY
  *   }
  * }
+ *
+ * // Narrow to a specific shape type by passing the type as a generic argument
+ * function getArrowLabel(shape: TLShape<'arrow'>): string {
+ *   return shape.props.text // TypeScript knows this is a TLArrowShape
+ * }
  * ```
  *
  * @public
  */
-export type TLShape = TLDefaultShape | TLUnknownShape
+export type TLShape<K extends keyof TLIndexedShapes = keyof TLIndexedShapes> = TLIndexedShapes[K]
 
 /**
  * A partial version of a shape, useful for updates and patches.
@@ -139,6 +183,57 @@ export type TLShapePartial<T extends TLShape = TLShape> = T extends T
 		} & Partial<Omit<T, 'type' | 'id' | 'props' | 'meta'>>
 	: never
 
+/**
+ * A partial version of a shape, useful for creating shapes.
+ *
+ * This type represents a shape where all properties except `type` are optional.
+ * It's commonly used when creating shapes.
+ *
+ * @example
+ * ```ts
+ * // Create a shape
+ * const shapeCreate: TLCreateShapePartial = {
+ *   type: 'geo',
+ *   x: 100,
+ *   y: 200
+ * }
+ *
+ * // Create shape properties
+ * const propsCreate: TLCreateShapePartial<TLGeoShape> = {
+ *   type: 'geo',
+ *   props: {
+ *     w: 150,
+ *     h: 100
+ *   }
+ * }
+ * ```
+ *
+ * @public
+ */
+export type TLCreateShapePartial<T extends TLShape = TLShape> = T extends T
+	? {
+			type: T['type']
+			props?: Partial<T['props']>
+			meta?: Partial<T['meta']>
+		} & Partial<Omit<T, 'type' | 'props' | 'meta'>>
+	: never
+
+/**
+ * Extract a shape type by its props.
+ *
+ * This utility type takes a props object type and returns the corresponding shape type
+ * from the TLShape union whose props match the given type.
+ *
+ * @example
+ * ```ts
+ * type MyShape = ExtractShapeByProps<{ w: number; h: number }>
+ * // MyShape is now the type of shape(s) that have props with w and h as numbers
+ * ```
+ *
+ * @public
+ */
+export type ExtractShapeByProps<P> = Extract<TLShape, { props: P }>
+
 /**
  * A unique identifier for a shape record.
  *
@@ -153,7 +248,7 @@ export type TLShapePartial<T extends TLShape = TLShape> = T extends T
  *
  * @public
  */
-export type TLShapeId = RecordId<TLUnknownShape>
+export type TLShapeId = RecordId<TLShape>
 
 /**
  * The ID of a shape's parent, which can be either a page or another shape.
@@ -195,7 +290,7 @@ export const rootShapeVersions = createMigrationIds('com.tldraw.shape', {
 	HoistOpacity: 2,
 	AddMeta: 3,
 	AddWhite: 4,
-} as const)
+})
 
 /**
  * Migration sequence for the root shape record type.
@@ -469,7 +564,7 @@ export function createShapePropsMigrationIds<
  * @internal
  */
 export function createShapeRecordType(shapes: Record<string, SchemaPropsInfo>) {
-	return createRecordType<TLShape>('shape', {
+	return createRecordType('shape', {
 		scope: 'document',
 		validator: T.model(
 			'shape',
diff --git a/packages/tlschema/src/shapes/ShapeWithCrop.ts b/packages/tlschema/src/shapes/ShapeWithCrop.ts
index 19734b67c71c..25cba60f9690 100644
--- a/packages/tlschema/src/shapes/ShapeWithCrop.ts
+++ b/packages/tlschema/src/shapes/ShapeWithCrop.ts
@@ -1,5 +1,5 @@
 import { VecModel } from '../misc/geometry-types'
-import { TLBaseShape } from './TLBaseShape'
+import { ExtractShapeByProps } from '../records/TLShape'
 
 /**
  * Defines cropping parameters for shapes that support cropping.
@@ -71,4 +71,4 @@ export interface TLShapeCrop {
  *
  * @public
  */
-export type ShapeWithCrop = TLBaseShape<string, { w: number; h: number; crop: TLShapeCrop | null }>
+export type ShapeWithCrop = ExtractShapeByProps<{ w: number; h: number; crop: TLShapeCrop | null }>
diff --git a/packages/tlschema/src/shapes/TLBaseShape.ts b/packages/tlschema/src/shapes/TLBaseShape.ts
index ed857cb22901..1f36b5c01574 100644
--- a/packages/tlschema/src/shapes/TLBaseShape.ts
+++ b/packages/tlschema/src/shapes/TLBaseShape.ts
@@ -1,4 +1,3 @@
-import { BaseRecord } from '@tldraw/store'
 import { IndexKey, JsonObject } from '@tldraw/utils'
 import { T } from '@tldraw/validate'
 import { TLOpacityType, opacityValidator } from '../misc/TLOpacity'
@@ -9,18 +8,37 @@ import { TLParentId, TLShapeId } from '../records/TLShape'
  * Base interface for all shapes in tldraw.
  *
  * This interface defines the common properties that all shapes share, regardless of their
- * specific type. Every shape extends this base with additional type-specific properties.
+ * specific type. Every default shape extends this base with additional type-specific properties.
+ *
+ * Custom shapes should be defined by augmenting the TLGlobalShapePropsMap type and getting the shape type from the TLShape type.
  *
  * @example
  * ```ts
- * // Define a custom shape type
- * interface MyCustomShape extends TLBaseShape<'custom', { size: number; color: string }> {}
+ * // Define a default shape type
+ * interface TLArrowShape extends TLBaseShape<'arrow', {
+ *   kind: TLArrowShapeKind
+ *   labelColor: TLDefaultColorStyle
+ *   color: TLDefaultColorStyle
+ *   fill: TLDefaultFillStyle
+ *   dash: TLDefaultDashStyle
+ *   size: TLDefaultSizeStyle
+ *   arrowheadStart: TLArrowShapeArrowheadStyle
+ *   arrowheadEnd: TLArrowShapeArrowheadStyle
+ *   font: TLDefaultFontStyle
+ *   start: VecModel
+ *   end: VecModel
+ *   bend: number
+ *   richText: TLRichText
+ *   labelPosition: number
+ *   scale: number
+ *   elbowMidPoint: number
+ * }> {}
  *
  * // Create a shape instance
- * const myShape: MyCustomShape = {
+ * const arrowShape: TLArrowShape = {
  *   id: 'shape:abc123',
  *   typeName: 'shape',
- *   type: 'custom',
+ *   type: 'arrow',
  *   x: 100,
  *   y: 200,
  *   rotation: 0,
@@ -29,8 +47,10 @@ import { TLParentId, TLShapeId } from '../records/TLShape'
  *   isLocked: false,
  *   opacity: 1,
  *   props: {
- *     size: 50,
- *     color: 'blue'
+ *     kind: 'arc',
+ *     start: { x: 0, y: 0 },
+ *     end: { x: 100, y: 100 },
+ *     // ... other props
  *   },
  *   meta: {}
  * }
@@ -38,8 +58,12 @@ import { TLParentId, TLShapeId } from '../records/TLShape'
  *
  * @public
  */
-export interface TLBaseShape<Type extends string, Props extends object>
-	extends BaseRecord<'shape', TLShapeId> {
+export interface TLBaseShape<Type extends string, Props extends object> {
+	// using real `extends BaseRecord<'shape', TLShapeId>` introduces a circularity in the types
+	// and for that reason those "base members" have to be declared manually here
+	readonly id: TLShapeId
+	readonly typeName: 'shape'
+
 	type: Type
 	x: number
 	y: number
diff --git a/packages/tlschema/src/store-migrations.ts b/packages/tlschema/src/store-migrations.ts
index 52e9c0598cf1..c572dd90b23a 100644
--- a/packages/tlschema/src/store-migrations.ts
+++ b/packages/tlschema/src/store-migrations.ts
@@ -72,7 +72,8 @@ export const storeMigrations = createMigrationSequence({
 				for (const [id, record] of objectMapEntries(store)) {
 					if (
 						record.typeName === 'shape' &&
-						((record as TLShape).type === 'icon' || (record as TLShape).type === 'code')
+						'type' in record &&
+						(record.type === 'icon' || record.type === 'code')
 					) {
 						delete store[id]
 					}
diff --git a/packages/tlschema/src/styles/TLColorStyle.ts b/packages/tlschema/src/styles/TLColorStyle.ts
index a4d1f8bd9e84..da4ea4871146 100644
--- a/packages/tlschema/src/styles/TLColorStyle.ts
+++ b/packages/tlschema/src/styles/TLColorStyle.ts
@@ -61,6 +61,7 @@ export interface TLDefaultColorThemeColor {
 	semi: string
 	pattern: string
 	fill: string // usually same as solid
+	linedFill: string // usually slightly lighter than fill
 	frameHeadingStroke: string
 	frameHeadingFill: string
 	frameStroke: string
@@ -134,6 +135,7 @@ export const DefaultColorThemePalette: {
 		black: {
 			solid: '#1d1d1d',
 			fill: '#1d1d1d',
+			linedFill: '#363636',
 			frameHeadingStroke: '#717171',
 			frameHeadingFill: '#ffffff',
 			frameStroke: '#717171',
@@ -149,6 +151,7 @@ export const DefaultColorThemePalette: {
 		blue: {
 			solid: '#4465e9',
 			fill: '#4465e9',
+			linedFill: '#6580ec',
 			frameHeadingStroke: '#6681ec',
 			frameHeadingFill: '#f9fafe',
 			frameStroke: '#6681ec',
@@ -164,6 +167,7 @@ export const DefaultColorThemePalette: {
 		green: {
 			solid: '#099268',
 			fill: '#099268',
+			linedFill: '#0bad7c',
 			frameHeadingStroke: '#37a684',
 			frameHeadingFill: '#f8fcfa',
 			frameStroke: '#37a684',
@@ -179,6 +183,7 @@ export const DefaultColorThemePalette: {
 		grey: {
 			solid: '#9fa8b2',
 			fill: '#9fa8b2',
+			linedFill: '#bbc1c9',
 			frameHeadingStroke: '#aaaaab',
 			frameHeadingFill: '#fbfcfc',
 			frameStroke: '#aaaaab',
@@ -194,6 +199,7 @@ export const DefaultColorThemePalette: {
 		'light-blue': {
 			solid: '#4ba1f1',
 			fill: '#4ba1f1',
+			linedFill: '#7abaf5',
 			frameHeadingStroke: '#6cb2f3',
 			frameHeadingFill: '#f8fbfe',
 			frameStroke: '#6cb2f3',
@@ -209,6 +215,7 @@ export const DefaultColorThemePalette: {
 		'light-green': {
 			solid: '#4cb05e',
 			fill: '#4cb05e',
+			linedFill: '#7ec88c',
 			frameHeadingStroke: '#6dbe7c',
 			frameHeadingFill: '#f8fcf9',
 			frameStroke: '#6dbe7c',
@@ -224,6 +231,7 @@ export const DefaultColorThemePalette: {
 		'light-red': {
 			solid: '#f87777',
 			fill: '#f87777',
+			linedFill: '#f99a9a',
 			frameHeadingStroke: '#f89090',
 			frameHeadingFill: '#fffafa',
 			frameStroke: '#f89090',
@@ -239,6 +247,7 @@ export const DefaultColorThemePalette: {
 		'light-violet': {
 			solid: '#e085f4',
 			fill: '#e085f4',
+			linedFill: '#e9abf7',
 			frameHeadingStroke: '#e59bf5',
 			frameHeadingFill: '#fefaff',
 			frameStroke: '#e59bf5',
@@ -254,6 +263,7 @@ export const DefaultColorThemePalette: {
 		orange: {
 			solid: '#e16919',
 			fill: '#e16919',
+			linedFill: '#ea8643',
 			frameHeadingStroke: '#e68544',
 			frameHeadingFill: '#fef9f6',
 			frameStroke: '#e68544',
@@ -269,6 +279,7 @@ export const DefaultColorThemePalette: {
 		red: {
 			solid: '#e03131',
 			fill: '#e03131',
+			linedFill: '#e75f5f',
 			frameHeadingStroke: '#e55757',
 			frameHeadingFill: '#fef7f7',
 			frameStroke: '#e55757',
@@ -284,6 +295,7 @@ export const DefaultColorThemePalette: {
 		violet: {
 			solid: '#ae3ec9',
 			fill: '#ae3ec9',
+			linedFill: '#be68d4',
 			frameHeadingStroke: '#bc62d3',
 			frameHeadingFill: '#fcf7fd',
 			frameStroke: '#bc62d3',
@@ -299,6 +311,7 @@ export const DefaultColorThemePalette: {
 		yellow: {
 			solid: '#f1ac4b',
 			fill: '#f1ac4b',
+			linedFill: '#f5c27a',
 			frameHeadingStroke: '#f3bb6c',
 			frameHeadingFill: '#fefcf8',
 			frameStroke: '#f3bb6c',
@@ -314,6 +327,7 @@ export const DefaultColorThemePalette: {
 		white: {
 			solid: '#FFFFFF',
 			fill: '#FFFFFF',
+			linedFill: '#ffffff',
 			semi: '#f5f5f5',
 			pattern: '#f9f9f9',
 			frameHeadingStroke: '#7d7d7d',
@@ -336,6 +350,7 @@ export const DefaultColorThemePalette: {
 		black: {
 			solid: '#f2f2f2',
 			fill: '#f2f2f2',
+			linedFill: '#ffffff',
 			frameHeadingStroke: '#5c5c5c',
 			frameHeadingFill: '#252525',
 			frameStroke: '#5c5c5c',
@@ -351,6 +366,7 @@ export const DefaultColorThemePalette: {
 		blue: {
 			solid: '#4f72fc', // 3c60f0
 			fill: '#4f72fc',
+			linedFill: '#3c5cdd',
 			frameHeadingStroke: '#384994',
 			frameHeadingFill: '#1C2036',
 			frameStroke: '#384994',
@@ -366,6 +382,7 @@ export const DefaultColorThemePalette: {
 		green: {
 			solid: '#099268',
 			fill: '#099268',
+			linedFill: '#087856',
 			frameHeadingStroke: '#10513C',
 			frameHeadingFill: '#14241f',
 			frameStroke: '#10513C',
@@ -381,6 +398,7 @@ export const DefaultColorThemePalette: {
 		grey: {
 			solid: '#9398b0',
 			fill: '#9398b0',
+			linedFill: '#8388a5',
 			frameHeadingStroke: '#42474D',
 			frameHeadingFill: '#23262A',
 			frameStroke: '#42474D',
@@ -396,6 +414,7 @@ export const DefaultColorThemePalette: {
 		'light-blue': {
 			solid: '#4dabf7',
 			fill: '#4dabf7',
+			linedFill: '#2793ec',
 			frameHeadingStroke: '#075797',
 			frameHeadingFill: '#142839',
 			frameStroke: '#075797',
@@ -411,6 +430,7 @@ export const DefaultColorThemePalette: {
 		'light-green': {
 			solid: '#40c057',
 			fill: '#40c057',
+			linedFill: '#37a44b',
 			frameHeadingStroke: '#1C5427',
 			frameHeadingFill: '#18251A',
 			frameStroke: '#1C5427',
@@ -426,6 +446,7 @@ export const DefaultColorThemePalette: {
 		'light-red': {
 			solid: '#ff8787',
 			fill: '#ff8787',
+			linedFill: '#ff6666',
 			frameHeadingStroke: '#6f3232', // Darker and desaturated variant of solid
 			frameHeadingFill: '#341818', // Deep, muted dark red
 			frameStroke: '#6f3232', // Matches headingStroke
@@ -441,6 +462,7 @@ export const DefaultColorThemePalette: {
 		'light-violet': {
 			solid: '#e599f7',
 			fill: '#e599f7',
+			linedFill: '#dc71f4',
 			frameHeadingStroke: '#6c367a',
 			frameHeadingFill: '#2D2230',
 			frameStroke: '#6c367a',
@@ -456,6 +478,7 @@ export const DefaultColorThemePalette: {
 		orange: {
 			solid: '#f76707',
 			fill: '#f76707',
+			linedFill: '#f54900',
 			frameHeadingStroke: '#773a0e', // Darker, muted version of solid
 			frameHeadingFill: '#2f1d13', // Deep, warm, muted background
 			frameStroke: '#773a0e', // Matches headingStroke
@@ -471,6 +494,7 @@ export const DefaultColorThemePalette: {
 		red: {
 			solid: '#e03131',
 			fill: '#e03131',
+			linedFill: '#c31d1d',
 			frameHeadingStroke: '#701e1e', // Darker, muted variation of solid
 			frameHeadingFill: '#301616', // Deep, muted reddish backdrop
 			frameStroke: '#701e1e', // Matches headingStroke
@@ -486,6 +510,7 @@ export const DefaultColorThemePalette: {
 		violet: {
 			solid: '#ae3ec9',
 			fill: '#ae3ec9',
+			linedFill: '#8f2fa7',
 			frameHeadingStroke: '#6d1583', // Darker, muted variation of solid
 			frameHeadingFill: '#27152e', // Deep, rich muted violet backdrop
 			frameStroke: '#6d1583', // Matches headingStroke
@@ -501,6 +526,7 @@ export const DefaultColorThemePalette: {
 		yellow: {
 			solid: '#ffc034',
 			fill: '#ffc034',
+			linedFill: '#ffae00',
 			frameHeadingStroke: '#684e12', // Darker, muted variant of solid
 			frameHeadingFill: '#2a2113', // Rich, muted dark-yellow background
 			frameStroke: '#684e12', // Matches headingStroke
@@ -516,6 +542,7 @@ export const DefaultColorThemePalette: {
 		white: {
 			solid: '#f3f3f3',
 			fill: '#f3f3f3',
+			linedFill: '#f3f3f3',
 			semi: '#f5f5f5',
 			pattern: '#f9f9f9',
 			frameHeadingStroke: '#ffffff',
diff --git a/packages/tlschema/src/styles/TLFillStyle.ts b/packages/tlschema/src/styles/TLFillStyle.ts
index 9775d0271e82..b51497f4ce17 100644
--- a/packages/tlschema/src/styles/TLFillStyle.ts
+++ b/packages/tlschema/src/styles/TLFillStyle.ts
@@ -36,7 +36,7 @@ import { StyleProp } from './StyleProp'
  */
 export const DefaultFillStyle = StyleProp.defineEnum('tldraw:fill', {
 	defaultValue: 'none',
-	values: ['none', 'semi', 'solid', 'pattern', 'fill'],
+	values: ['none', 'semi', 'solid', 'pattern', 'fill', 'lined-fill'],
 })
 
 /**
diff --git a/packages/utils/api-report.api.md b/packages/utils/api-report.api.md
index 062ce73e2c04..2c9cd3523b24 100644
--- a/packages/utils/api-report.api.md
+++ b/packages/utils/api-report.api.md
@@ -126,7 +126,7 @@ export function filterEntries<Key extends string, Value>(object: {
 export function fpsThrottle(fn: {
     (): void;
     cancel?(): void;
-}, getTargetFps?: () => number): {
+}): {
     (): void;
     cancel?(): void;
 };
@@ -319,9 +319,7 @@ export function modulate(value: number, rangeA: number[], rangeB: number[], clam
 export const noop: () => void;
 
 // @internal
-export function objectMapEntries<Key extends string, Value>(object: {
-    [K in Key]: Value;
-}): Array<[Key, Value]>;
+export function objectMapEntries<Obj extends object>(object: Obj): Array<[keyof Obj, Obj[keyof Obj]]>;
 
 // @internal
 export function objectMapEntriesIterable<Key extends string, Value>(object: {
@@ -423,7 +421,11 @@ export const Result: {
 };
 
 // @internal
-export function retry<T>(fn: () => Promise<T>, { attempts, waitDuration, abortSignal, matchError, }?: {
+export function retry<T>(fn: (args: {
+    attempt: number;
+    remaining: number;
+    total: number;
+}) => Promise<T>, { attempts, waitDuration, abortSignal, matchError, }?: {
     abortSignal?: AbortSignal;
     attempts?: number;
     matchError?(error: unknown): boolean;
diff --git a/packages/utils/package.json b/packages/utils/package.json
index d1328c7229f6..59d972a90501 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/utils",
 	"description": "tldraw infinite canvas SDK (private utilities).",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/utils/src/lib/object.ts b/packages/utils/src/lib/object.ts
index 937f82620064..e6a4c66575e2 100644
--- a/packages/utils/src/lib/object.ts
+++ b/packages/utils/src/lib/object.ts
@@ -108,10 +108,10 @@ export function objectMapValues<Key extends string, Value>(object: {
  * ```
  * @internal
  */
-export function objectMapEntries<Key extends string, Value>(object: {
-	[K in Key]: Value
-}): Array<[Key, Value]> {
-	return Object.entries(object) as [Key, Value][]
+export function objectMapEntries<Obj extends object>(
+	object: Obj
+): Array<[keyof Obj, Obj[keyof Obj]]> {
+	return Object.entries(object) as [keyof Obj, Obj[keyof Obj]][]
 }
 
 /**
diff --git a/packages/utils/src/lib/retry.ts b/packages/utils/src/lib/retry.ts
index 14b964c9eb35..5a2ce148741b 100644
--- a/packages/utils/src/lib/retry.ts
+++ b/packages/utils/src/lib/retry.ts
@@ -48,7 +48,7 @@ import { sleep } from './control'
  * @internal
  */
 export async function retry<T>(
-	fn: () => Promise<T>,
+	fn: (args: { attempt: number; remaining: number; total: number }) => Promise<T>,
 	{
 		attempts = 3,
 		waitDuration = 1000,
@@ -65,7 +65,7 @@ export async function retry<T>(
 	for (let i = 0; i < attempts; i++) {
 		if (abortSignal?.aborted) throw new Error('aborted')
 		try {
-			return await fn()
+			return await fn({ attempt: i, remaining: attempts - i, total: attempts })
 		} catch (e) {
 			if (matchError && !matchError(e)) throw e
 			error = e
diff --git a/packages/utils/src/lib/throttle.ts b/packages/utils/src/lib/throttle.ts
index 7ec0e39cf21c..443077a7960b 100644
--- a/packages/utils/src/lib/throttle.ts
+++ b/packages/utils/src/lib/throttle.ts
@@ -5,28 +5,15 @@ const isTest = () =>
 	!globalThis.__FORCE_RAF_IN_TESTS__
 
 const fpsQueue: Array<() => void> = []
-const targetFps = 120
-// Browsers aren't precise with frame timing - this factor prevents skipping frames unnecessarily
-// by aiming slightly below the theoretical frame duration (e.g., ~7.5ms instead of 8.33ms for 120fps)
-const timingVarianceFactor = 0.9
-const targetTimePerFrame = Math.floor(1000 / targetFps) * timingVarianceFactor // ~7ms
+const targetFps = 60
+const targetTimePerFrame = Math.floor(1000 / targetFps) * 0.9 // ~15ms - we allow for some variance as browsers aren't that precise.
 let frameRaf: undefined | number
 let flushRaf: undefined | number
 let lastFlushTime = -targetTimePerFrame
 
-// Track custom FPS timing per function
-const customFpsLastRunTime = new WeakMap<() => void, number>()
-// Map function to its custom FPS getter
-const customFpsGetters = new WeakMap<() => void, () => number>()
-
 const flush = () => {
 	const queue = fpsQueue.splice(0, fpsQueue.length)
 	for (const fn of queue) {
-		// If this function has custom FPS, update timestamp when executing
-		const getTargetFps = customFpsGetters.get(fn)
-		if (getTargetFps) {
-			customFpsLastRunTime.set(fn, Date.now())
-		}
 		fn()
 	}
 }
@@ -65,41 +52,30 @@ function tick(isOnNextFrame = false) {
 }
 
 /**
- * Creates a throttled version of a function that executes at most once per frame.
- * The default target frame rate is 120fps, but can be customized per function.
+ * Creates a throttled version of a function that executes at most once per frame (60fps).
  * Subsequent calls within the same frame are ignored, ensuring smooth performance
  * for high-frequency events like mouse movements or scroll events.
  *
  * @param fn - The function to throttle, optionally with a cancel method
- * @param getTargetFps - Optional function that returns the current target FPS rate for custom throttling
  * @returns A throttled function with an optional cancel method to remove pending calls
  *
  * @example
  * ```ts
- * // Default 120fps throttling
  * const updateCanvas = fpsThrottle(() => {
- *   // This will run at most once per frame (~8.33ms)
+ *   // This will run at most once per frame (~16.67ms)
  *   redrawCanvas()
  * })
  *
- * // Call as often as you want - automatically throttled to 120fps
+ * // Call as often as you want - automatically throttled to 60fps
  * document.addEventListener('mousemove', updateCanvas)
  *
  * // Cancel pending calls if needed
  * updateCanvas.cancel?.()
- *
- * // Custom FPS throttling for less critical updates
- * const slowUpdate = fpsThrottle(() => {
- *   heavyComputation()
- * }, () => 30) // Throttle to 30fps
  * ```
  *
  * @internal
  */
-export function fpsThrottle(
-	fn: { (): void; cancel?(): void },
-	getTargetFps?: () => number
-): {
+export function fpsThrottle(fn: { (): void; cancel?(): void }): {
 	(): void
 	cancel?(): void
 } {
@@ -117,23 +93,7 @@ export function fpsThrottle(
 		return fn
 	}
 
-	// Store custom FPS getter if provided
-	if (getTargetFps) {
-		customFpsGetters.set(fn, getTargetFps)
-	}
-
 	const throttledFn = () => {
-		// Custom FPS - check timing before queuing
-		if (getTargetFps) {
-			const lastRun = customFpsLastRunTime.get(fn) ?? -Infinity
-			const customTimePerFrame = Math.floor(1000 / getTargetFps()) * timingVarianceFactor
-			const elapsed = Date.now() - lastRun
-
-			if (elapsed < customTimePerFrame) {
-				// Not ready yet, don't queue
-				return
-			}
-		}
 		if (fpsQueue.includes(fn)) {
 			return
 		}
@@ -150,7 +110,7 @@ export function fpsThrottle(
 }
 
 /**
- * Schedules a function to execute on the next animation frame, targeting 120fps.
+ * Schedules a function to execute on the next animation frame, targeting 60fps.
  * If the same function is passed multiple times before the frame executes,
  * it will only be called once, effectively batching multiple calls.
  *
diff --git a/packages/validate/package.json b/packages/validate/package.json
index 52d8cbfdbb52..29e6a86b1b22 100644
--- a/packages/validate/package.json
+++ b/packages/validate/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@tldraw/validate",
 	"description": "A runtime validation library by tldraw.",
-	"version": "4.1.1",
+	"version": "4.2.0",
 	"author": {
 		"name": "tldraw Inc.",
 		"email": "hello@tldraw.com"
diff --git a/packages/worker-shared/package.json b/packages/worker-shared/package.json
index cb70ab0f1987..7e22164be862 100644
--- a/packages/worker-shared/package.json
+++ b/packages/worker-shared/package.json
@@ -9,16 +9,16 @@
 	"/* GOTCHA */": "files will include ./dist and index.d.ts by default, add any others you want to include in here",
 	"files": [],
 	"dependencies": {
-		"@cloudflare/workers-types": "^4.20250913.0",
 		"@tldraw/utils": "workspace:*",
 		"@tldraw/validate": "workspace:*",
 		"cloudflare-workers-unfurl": "^0.0.8",
 		"itty-router": "^5.0.18",
-		"lazyrepo": "0.0.0-alpha.27",
-		"toucan-js": "^3.4.0",
-		"typescript": "^5.8.3"
+		"toucan-js": "^3.4.0"
 	},
 	"devDependencies": {
+		"@cloudflare/workers-types": "^4.20250913.0",
+		"lazyrepo": "0.0.0-alpha.27",
+		"typescript": "^5.8.3",
 		"vitest": "^3.2.4"
 	},
 	"scripts": {
diff --git a/packages/worker-shared/src/handleRequest.ts b/packages/worker-shared/src/handleRequest.ts
index 2c6034aa4f47..3e6ced238d1c 100644
--- a/packages/worker-shared/src/handleRequest.ts
+++ b/packages/worker-shared/src/handleRequest.ts
@@ -134,7 +134,7 @@ export async function handleApiRequest<
 	request: Request
 	env: Env
 	ctx: Ctx
-	after(response: Response): Response | Promise<Response>
+	after(response: Response, request: Request): Response | Promise<Response>
 }) {
 	let response
 	try {
@@ -152,7 +152,7 @@ export async function handleApiRequest<
 	}
 
 	try {
-		return await after(response)
+		return await after(response, request)
 	} catch (error: any) {
 		console.error(error.stack ?? error)
 		// eslint-disable-next-line @typescript-eslint/no-deprecated
diff --git a/packages/worker-shared/src/index.ts b/packages/worker-shared/src/index.ts
index 6a08f5e3abd2..759c5bab577e 100644
--- a/packages/worker-shared/src/index.ts
+++ b/packages/worker-shared/src/index.ts
@@ -10,5 +10,6 @@ export {
 	type ApiRoute,
 	type ApiRouter,
 } from './handleRequest'
+export { blockUnknownOrigins, isAllowedOrigin } from './origins'
 export { createSentry } from './sentry'
 export { handleUserAssetGet, handleUserAssetUpload } from './userAssetUploads'
diff --git a/packages/worker-shared/src/origins.ts b/packages/worker-shared/src/origins.ts
new file mode 100644
index 000000000000..c82bfd459fda
--- /dev/null
+++ b/packages/worker-shared/src/origins.ts
@@ -0,0 +1,81 @@
+/**
+ * Validates if an origin is allowed to make cross-origin requests.
+ * Returns the origin if allowed, or undefined if blocked.
+ *
+ * @param origin - The origin header from the incoming request
+ * @returns The origin string if allowed, undefined otherwise
+ *
+ * @example
+ * ```ts
+ * const origin = request.headers.get('origin')
+ * const allowed = isAllowedOrigin(origin)
+ * if (allowed) {
+ *   // Process the request
+ * }
+ * ```
+ *
+ * @public
+ */
+export function isAllowedOrigin(origin: string) {
+	if (!origin) return undefined
+	if (origin === 'http://localhost:3000') return origin
+	if (origin === 'http://localhost:5420') return origin
+	if (origin === 'https://meet.google.com') return origin
+	if (origin === 'https://tldraw.dev') return origin
+	if (origin.endsWith('.tldraw.com')) return origin
+	if (origin.endsWith('.tldraw.dev')) return origin
+	if (origin.endsWith('.tldraw.club')) return origin
+	if (origin.endsWith('.tldraw.xyz')) return origin
+	if (origin.endsWith('.tldraw.workers.dev')) return origin
+	if (origin.endsWith('-tldraw.vercel.app')) return origin
+	return undefined
+}
+
+/**
+ * Middleware to block requests from unknown/unauthorized origins.
+ * Allows same-origin requests, auth callbacks, and requests from allowed origins.
+ * Returns undefined to continue processing, or a 403 Response to block the request.
+ *
+ * @param request - The incoming HTTP request
+ * @param env - Environment variables, must contain IS_LOCAL property
+ * @returns undefined to continue, or Response with 403 status to block
+ *
+ * @example
+ * ```ts
+ * router.all('*', async (request, env) => {
+ *   const blocked = await blockUnknownOrigins(request, env)
+ *   if (blocked) return blocked
+ *   // Continue processing...
+ * })
+ * ```
+ *
+ * @public
+ */
+export async function blockUnknownOrigins(
+	request: Request,
+	env: { IS_LOCAL?: string }
+): Promise<undefined | Response> {
+	// allow requests for the same origin (new rewrite routing for SPA)
+	if (request.headers.get('sec-fetch-site') === 'same-origin') {
+		return undefined
+	}
+
+	if (new URL(request.url).pathname === '/auth/callback') {
+		// allow auth callback because we use the special cookie to verify
+		// the request
+		return undefined
+	}
+
+	const origin = request.headers.get('origin')
+
+	// if there's no origin, this cannot be a cross-origin request, so we allow it.
+	if (!origin) return undefined
+
+	if (env.IS_LOCAL !== 'true' && !isAllowedOrigin(origin)) {
+		console.error('Attempting to connect from an invalid origin:', origin, env, request)
+		return new Response('Not allowed', { status: 403 })
+	}
+
+	// origin doesn't match, so we can continue
+	return undefined
+}
diff --git a/templates/agent/client/App.tsx b/templates/agent/client/App.tsx
index 873fbde65cdc..b0dd474eab93 100644
--- a/templates/agent/client/App.tsx
+++ b/templates/agent/client/App.tsx
@@ -15,7 +15,6 @@ import { ChatPanelFallback } from './components/ChatPanelFallback'
 import { CustomHelperButtons } from './components/CustomHelperButtons'
 import { AgentViewportBoundsHighlight } from './components/highlights/AgentViewportBoundsHighlights'
 import { ContextHighlights } from './components/highlights/ContextHighlights'
-import { enableLinedFillStyle } from './enableLinedFillStyle'
 import { TargetAreaTool } from './tools/TargetAreaTool'
 import { TargetShapeTool } from './tools/TargetShapeTool'
 
@@ -27,7 +26,6 @@ export const AGENT_ID = 'agent-starter'
 
 // Customize tldraw's styles to play to the agent's strengths
 DefaultSizeStyle.setDefaultValue('s')
-enableLinedFillStyle()
 
 // Custom tools for picking context items
 const tools = [TargetShapeTool, TargetAreaTool]
diff --git a/templates/agent/client/components/chat-history/TldrawDiffViewer.tsx b/templates/agent/client/components/chat-history/TldrawDiffViewer.tsx
index 8908c1cdd4da..90dfa808b9e2 100644
--- a/templates/agent/client/components/chat-history/TldrawDiffViewer.tsx
+++ b/templates/agent/client/components/chat-history/TldrawDiffViewer.tsx
@@ -32,12 +32,14 @@ function getDiffShapesFromDiff(diff: RecordsDiff<TLRecord>): TLShape[] {
 		const shape = {
 			...prevShape,
 			opacity: showShadows ? prevShape.opacity : prevShape.opacity / 2,
-			props: { ...prevShape.props },
 			meta: { ...prevShape.meta, changeType: showShadows ? 'delete-shadow' : 'delete' },
 		}
 
 		if ('dash' in shape.props) {
-			shape.props.dash = 'solid'
+			shape.props = {
+				...shape.props,
+				dash: 'solid',
+			}
 		}
 
 		diffShapes.push(shape)
@@ -54,7 +56,6 @@ function getDiffShapesFromDiff(diff: RecordsDiff<TLRecord>): TLShape[] {
 			...prevBefore,
 			id: (id + '-before') as TLShapeId,
 			opacity: prevAfter.opacity / 2,
-			props: { ...prevBefore.props },
 			meta: {
 				...prevBefore.meta,
 				changeType: showShadows ? 'update-before-shadow' : 'update-before',
@@ -63,7 +64,6 @@ function getDiffShapesFromDiff(diff: RecordsDiff<TLRecord>): TLShape[] {
 
 		const after = {
 			...prevAfter,
-			props: { ...prevAfter.props },
 			meta: {
 				...prevAfter.meta,
 				changeType: showShadows ? 'update-after-shadow' : 'update-after',
@@ -71,13 +71,22 @@ function getDiffShapesFromDiff(diff: RecordsDiff<TLRecord>): TLShape[] {
 		}
 
 		if ('dash' in before.props) {
-			before.props.dash = 'dashed'
+			before.props = {
+				...before.props,
+				dash: 'dashed',
+			}
 		}
 		if ('fill' in before.props) {
-			before.props.fill = 'none'
+			before.props = {
+				...before.props,
+				fill: 'none',
+			}
 		}
 		if ('dash' in after.props) {
-			after.props.dash = 'solid'
+			after.props = {
+				...after.props,
+				dash: 'solid',
+			}
 		}
 
 		diffShapes.push(before)
@@ -90,14 +99,16 @@ function getDiffShapesFromDiff(diff: RecordsDiff<TLRecord>): TLShape[] {
 		if (prevShape.typeName !== 'shape') continue
 		const shape = {
 			...prevShape,
-			props: { ...prevShape.props },
 			meta: {
 				...prevShape.meta,
 				changeType: showShadows ? 'create-shadow' : 'create',
 			},
 		}
 		if ('dash' in shape.props) {
-			shape.props.dash = 'solid'
+			shape.props = {
+				...shape.props,
+				dash: 'solid',
+			}
 		}
 		diffShapes.push(shape)
 	}
diff --git a/templates/agent/client/enableLinedFillStyle.ts b/templates/agent/client/enableLinedFillStyle.ts
deleted file mode 100644
index 7c0079d158d8..000000000000
--- a/templates/agent/client/enableLinedFillStyle.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { DefaultColorThemePalette } from 'tldraw'
-
-export function enableLinedFillStyle() {
-	DefaultColorThemePalette.lightMode['black'].fill = '#363636'
-	DefaultColorThemePalette.lightMode['blue'].fill = '#6580ec'
-	DefaultColorThemePalette.lightMode['light-blue'].fill = '#7abaf5'
-	DefaultColorThemePalette.lightMode['green'].fill = '#0bad7c'
-	DefaultColorThemePalette.lightMode['grey'].fill = '#bbc1c9'
-	DefaultColorThemePalette.lightMode['light-green'].fill = '#7ec88c'
-	DefaultColorThemePalette.lightMode['light-red'].fill = '#f99a9a'
-	DefaultColorThemePalette.lightMode['light-violet'].fill = '#e9abf7'
-	DefaultColorThemePalette.lightMode['orange'].fill = '#ea8643'
-	DefaultColorThemePalette.lightMode['red'].fill = '#e75f5f'
-	DefaultColorThemePalette.lightMode['violet'].fill = '#be68d4'
-	DefaultColorThemePalette.lightMode['yellow'].fill = '#f5c27a'
-	DefaultColorThemePalette.lightMode['white'].solid = '#f5f5f5'
-
-	DefaultColorThemePalette.darkMode['black'].solid = '#f0f0f0'
-	DefaultColorThemePalette.darkMode['black'].fill = '#ffffff'
-	DefaultColorThemePalette.darkMode['blue'].fill = '#3c5cdd'
-	DefaultColorThemePalette.darkMode['light-blue'].fill = '#2793ec'
-	DefaultColorThemePalette.darkMode['green'].fill = '#087856'
-	DefaultColorThemePalette.darkMode['grey'].fill = '#8388a5'
-	DefaultColorThemePalette.darkMode['light-green'].fill = '#37a44b'
-	DefaultColorThemePalette.darkMode['light-red'].fill = '#ff6666'
-	DefaultColorThemePalette.darkMode['light-violet'].fill = '#dc71f4'
-	DefaultColorThemePalette.darkMode['orange'].fill = '#f54900'
-	DefaultColorThemePalette.darkMode['red'].fill = '#c31d1d'
-	DefaultColorThemePalette.darkMode['violet'].fill = '#8f2fa7'
-	DefaultColorThemePalette.darkMode['yellow'].fill = '#ffae00'
-	DefaultColorThemePalette.darkMode['white'] = DefaultColorThemePalette.lightMode['black']
-}
diff --git a/templates/agent/shared/actions/AddDetailActionUtil.ts b/templates/agent/shared/actions/AddDetailActionUtil.ts
index cf7ea5806e31..11ccf499a416 100644
--- a/templates/agent/shared/actions/AddDetailActionUtil.ts
+++ b/templates/agent/shared/actions/AddDetailActionUtil.ts
@@ -27,7 +27,7 @@ export class AddDetailActionUtil extends AgentActionUtil<AddDetailAction> {
 		const description = `**${label}:** ${text ?? ''}`
 
 		return {
-			icon: null, //'pencil' as const,
+			icon: 'pencil' as const,
 			description,
 		}
 	}
diff --git a/templates/agent/shared/actions/CreateActionUtil.ts b/templates/agent/shared/actions/CreateActionUtil.ts
index dcc466e06a1c..a2da46c769b3 100644
--- a/templates/agent/shared/actions/CreateActionUtil.ts
+++ b/templates/agent/shared/actions/CreateActionUtil.ts
@@ -1,4 +1,4 @@
-import { IndexKey, TLShape, TLShapeId, TLShapePartial, toRichText } from 'tldraw'
+import { IndexKey, TLShapeId, toRichText } from 'tldraw'
 import z from 'zod'
 import { AgentHelpers } from '../AgentHelpers'
 import {
@@ -49,6 +49,21 @@ export class CreateActionUtil extends AgentActionUtil<CreateAction> {
 			if (shape.toId) {
 				shape.toId = helpers.ensureShapeIdExists(shape.toId)
 			}
+			if ('x1' in shape) {
+				shape.x1 = helpers.ensureValueIsNumber(shape.x1) ?? 0
+			}
+			if ('y1' in shape) {
+				shape.y1 = helpers.ensureValueIsNumber(shape.y1) ?? 0
+			}
+			if ('x2' in shape) {
+				shape.x2 = helpers.ensureValueIsNumber(shape.x2) ?? 0
+			}
+			if ('y2' in shape) {
+				shape.y2 = helpers.ensureValueIsNumber(shape.y2) ?? 0
+			}
+			if ('bend' in shape) {
+				shape.bend = helpers.ensureValueIsNumber(shape.bend) ?? 0
+			}
 		}
 
 		return action
@@ -98,10 +113,9 @@ const SHARED_DEFAULTS = {
 	id: 'shape:shape' as TLShapeId,
 }
 
-const SHAPE_DEFAULTS: Record<TLShape['type'], TLShapePartial> = {
+const SHAPE_DEFAULTS = {
 	text: {
 		...SHARED_DEFAULTS,
-		type: 'text',
 		props: {
 			autoSize: true,
 			color: 'black',
@@ -115,7 +129,6 @@ const SHAPE_DEFAULTS: Record<TLShape['type'], TLShapePartial> = {
 	},
 	line: {
 		...SHARED_DEFAULTS,
-		type: 'line',
 		props: {
 			size: 's',
 			color: 'black',
@@ -140,7 +153,6 @@ const SHAPE_DEFAULTS: Record<TLShape['type'], TLShapePartial> = {
 	},
 	arrow: {
 		...SHARED_DEFAULTS,
-		type: 'arrow',
 		props: {
 			arrowheadEnd: 'arrow',
 			arrowheadStart: 'none',
@@ -162,7 +174,6 @@ const SHAPE_DEFAULTS: Record<TLShape['type'], TLShapePartial> = {
 	},
 	geo: {
 		...SHARED_DEFAULTS,
-		type: 'geo',
 		props: {
 			align: 'middle',
 			color: 'black',
@@ -183,7 +194,6 @@ const SHAPE_DEFAULTS: Record<TLShape['type'], TLShapePartial> = {
 	},
 	note: {
 		...SHARED_DEFAULTS,
-		type: 'note',
 		props: {
 			color: 'black',
 			richText: toRichText(''),
@@ -200,12 +210,10 @@ const SHAPE_DEFAULTS: Record<TLShape['type'], TLShapePartial> = {
 	},
 	draw: {
 		...SHARED_DEFAULTS,
-		type: 'draw',
 		props: {},
 	},
 	unknown: {
 		...SHARED_DEFAULTS,
-		type: 'unknown',
 		props: {},
 	},
 }
diff --git a/templates/agent/shared/actions/LabelActionUtil.ts b/templates/agent/shared/actions/LabelActionUtil.ts
index a6f04588f50c..bcda36489eb5 100644
--- a/templates/agent/shared/actions/LabelActionUtil.ts
+++ b/templates/agent/shared/actions/LabelActionUtil.ts
@@ -1,4 +1,4 @@
-import { TLShapeId, toRichText } from 'tldraw'
+import { TLRichText, TLShape, TLShapeId, toRichText } from 'tldraw'
 import z from 'zod'
 import { AgentHelpers } from '../AgentHelpers'
 import { Streaming } from '../types/Streaming'
@@ -15,6 +15,20 @@ const LabelAction = z
 
 type ILabelEvent = z.infer<typeof LabelAction>
 
+type ShapeWithRichText = Extract<TLShape, { props: { richText: TLRichText } }>
+
+function isShapeWithRichText(shape: TLShape | null | undefined): shape is ShapeWithRichText {
+	return !!(shape && 'richText' in shape.props)
+}
+
+function assertShapeWithRichText(
+	shape: TLShape | null | undefined
+): asserts shape is ShapeWithRichText {
+	if (!isShapeWithRichText(shape)) {
+		throw new Error('Shape is not a valid ShapeWithRichText')
+	}
+}
+
 export class LabelActionUtil extends AgentActionUtil<ILabelEvent> {
 	static override type = 'label' as const
 
@@ -33,8 +47,17 @@ export class LabelActionUtil extends AgentActionUtil<ILabelEvent> {
 		if (!action.complete) return action
 
 		const shapeId = helpers.ensureShapeIdExists(action.shapeId)
-		if (!shapeId) return null
-
+		if (!shapeId || !this.agent?.editor) {
+			return null
+		}
+		const shape = this.agent.editor.getShape(`shape:${shapeId}` as TLShapeId)
+		if (!shape) {
+			return null
+		}
+		if (!isShapeWithRichText(shape)) {
+			console.warn(`Shape type "${shape.type}" does not support richText labels`)
+			return null
+		}
 		action.shapeId = shapeId
 		return action
 	}
@@ -46,7 +69,8 @@ export class LabelActionUtil extends AgentActionUtil<ILabelEvent> {
 
 		const shapeId = `shape:${action.shapeId}` as TLShapeId
 		const shape = editor.getShape(shapeId)
-		if (!shape) return
+		assertShapeWithRichText(shape)
+
 		editor.updateShape({
 			id: shapeId,
 			type: shape.type,
diff --git a/templates/agent/shared/actions/PenActionUtil.ts b/templates/agent/shared/actions/PenActionUtil.ts
index be78e735fd3c..f7dc05f431a6 100644
--- a/templates/agent/shared/actions/PenActionUtil.ts
+++ b/templates/agent/shared/actions/PenActionUtil.ts
@@ -1,4 +1,4 @@
-import { createShapeId, TLDrawShape, TLDrawShapeSegment, Vec, VecModel } from 'tldraw'
+import { createShapeId, TLDrawShapeSegment, Vec, VecModel } from 'tldraw'
 import z from 'zod'
 import { AgentHelpers } from '../AgentHelpers'
 import { asColor, SimpleColor } from '../format/SimpleColor'
@@ -38,7 +38,7 @@ export class PenActionUtil extends AgentActionUtil<PenAction> {
 
 	override getInfo(action: Streaming<PenAction>) {
 		return {
-			icon: null, //'pencil' as const,
+			icon: 'pencil' as const,
 			description: action.intent ?? '',
 		}
 	}
@@ -46,8 +46,12 @@ export class PenActionUtil extends AgentActionUtil<PenAction> {
 	override sanitizeAction(action: Streaming<PenAction>, helpers: AgentHelpers) {
 		if (!action.points) return action
 
+		// Don't include the final point if we're still streaming.
+		// Its numbers might be incomplete.
+		const points = action.complete ? action.points : action.points.slice(0, -1)
+
 		// This is a complex action for the model, so validate the data it gives us
-		const validPoints = action.points
+		const validPoints = points
 			.map((point) => helpers.ensureValueIsVec(point))
 			.filter((v) => v !== null)
 
@@ -107,7 +111,7 @@ export class PenActionUtil extends AgentActionUtil<PenAction> {
 			},
 		]
 
-		this.agent.editor.createShape<TLDrawShape>({
+		this.agent.editor.createShape({
 			id: createShapeId(),
 			type: 'draw',
 			x: minX,
diff --git a/templates/agent/shared/actions/PlaceActionUtil.ts b/templates/agent/shared/actions/PlaceActionUtil.ts
index 3f82c89c528e..8466cd62d8e1 100644
--- a/templates/agent/shared/actions/PlaceActionUtil.ts
+++ b/templates/agent/shared/actions/PlaceActionUtil.ts
@@ -28,7 +28,7 @@ export class PlaceActionUtil extends AgentActionUtil<PlaceAction> {
 
 	override getInfo(action: Streaming<PlaceAction>) {
 		return {
-			icon: null, //'target' as const,
+			icon: 'target' as const,
 			description: action.intent ?? '',
 		}
 	}
diff --git a/templates/agent/shared/actions/UpdateActionUtil.ts b/templates/agent/shared/actions/UpdateActionUtil.ts
index 4271dc475f5c..0704e3ac05b4 100644
--- a/templates/agent/shared/actions/UpdateActionUtil.ts
+++ b/templates/agent/shared/actions/UpdateActionUtil.ts
@@ -54,6 +54,22 @@ export class UpdateActionUtil extends AgentActionUtil<UpdateAction> {
 			if (update.toId) {
 				update.toId = helpers.ensureShapeIdExists(update.toId)
 			}
+
+			if ('x1' in update) {
+				update.x1 = helpers.ensureValueIsNumber(update.x1) ?? 0
+			}
+			if ('y1' in update) {
+				update.y1 = helpers.ensureValueIsNumber(update.y1) ?? 0
+			}
+			if ('x2' in update) {
+				update.x2 = helpers.ensureValueIsNumber(update.x2) ?? 0
+			}
+			if ('y2' in update) {
+				update.y2 = helpers.ensureValueIsNumber(update.y2) ?? 0
+			}
+			if ('bend' in update) {
+				update.bend = helpers.ensureValueIsNumber(update.bend) ?? 0
+			}
 		}
 
 		// Unround the shape to restore the original values
diff --git a/templates/agent/shared/format/SimpleFill.ts b/templates/agent/shared/format/SimpleFill.ts
index 7f52c5c71229..72a862e553ad 100644
--- a/templates/agent/shared/format/SimpleFill.ts
+++ b/templates/agent/shared/format/SimpleFill.ts
@@ -7,7 +7,7 @@ export type SimpleFill = z.infer<typeof SimpleFillSchema>
 
 const SIMPLE_TO_SHAPE_FILLS: Record<SimpleFill, TLDefaultFillStyle> = {
 	none: 'none',
-	solid: 'fill',
+	solid: 'lined-fill',
 	background: 'semi',
 	tint: 'solid',
 	pattern: 'pattern',
@@ -16,6 +16,7 @@ const SIMPLE_TO_SHAPE_FILLS: Record<SimpleFill, TLDefaultFillStyle> = {
 const SHAPE_TO_SIMPLE_FILLS: Record<TLDefaultFillStyle, SimpleFill> = {
 	none: 'none',
 	fill: 'solid',
+	'lined-fill': 'solid',
 	semi: 'background',
 	solid: 'tint',
 	pattern: 'pattern',
diff --git a/templates/agent/shared/format/convertSimpleShapeToTldrawShape.ts b/templates/agent/shared/format/convertSimpleShapeToTldrawShape.ts
index 5e9d41e57224..db8dc69599c6 100644
--- a/templates/agent/shared/format/convertSimpleShapeToTldrawShape.ts
+++ b/templates/agent/shared/format/convertSimpleShapeToTldrawShape.ts
@@ -198,7 +198,7 @@ function convertTextShapeToTldrawShape(
 			x: correctedTextCoords.x,
 			y: correctedTextCoords.y,
 			rotation: defaultTextShape.rotation ?? 0,
-			index: defaultTextShape.index ?? ('a1' as IndexKey),
+			index: defaultTextShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 			parentId: defaultTextShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultTextShape.isLocked ?? false,
 			opacity: defaultTextShape.opacity ?? 1,
@@ -242,7 +242,7 @@ function convertLineShapeToTldrawShape(
 			x: minX,
 			y: minY,
 			rotation: defaultLineShape.rotation ?? 0,
-			index: defaultLineShape.index ?? ('a1' as IndexKey),
+			index: defaultLineShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 			parentId: defaultLineShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultLineShape.isLocked ?? false,
 			opacity: defaultLineShape.opacity ?? 1,
@@ -306,7 +306,7 @@ function convertArrowShapeToTldrawShape(
 		x: minX,
 		y: minY,
 		rotation: defaultArrowShape.rotation ?? 0,
-		index: defaultArrowShape.index ?? ('a1' as IndexKey),
+		index: defaultArrowShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 		parentId: defaultArrowShape.parentId ?? editor.getCurrentPageId(),
 		isLocked: defaultArrowShape.isLocked ?? false,
 		opacity: defaultArrowShape.opacity ?? 1,
@@ -423,7 +423,7 @@ function convertGeoShapeToTldrawShape(
 			x: simpleShape.x ?? defaultGeoShape.x ?? 0,
 			y: simpleShape.y ?? defaultGeoShape.y ?? 0,
 			rotation: defaultGeoShape.rotation ?? 0,
-			index: defaultGeoShape.index ?? ('a1' as IndexKey),
+			index: defaultGeoShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 			parentId: defaultGeoShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultGeoShape.isLocked ?? false,
 			opacity: defaultGeoShape.opacity ?? 1,
@@ -478,7 +478,7 @@ function convertNoteShapeToTldrawShape(
 			x: simpleShape.x ?? defaultNoteShape.x ?? 0,
 			y: simpleShape.y ?? defaultNoteShape.y ?? 0,
 			rotation: defaultNoteShape.rotation ?? 0,
-			index: defaultNoteShape.index ?? ('a1' as IndexKey),
+			index: defaultNoteShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 			parentId: defaultNoteShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultNoteShape.isLocked ?? false,
 			opacity: defaultNoteShape.opacity ?? 1,
@@ -528,11 +528,12 @@ function convertDrawShapeToTldrawShape(
 			x: defaultDrawShape.x ?? 0,
 			y: defaultDrawShape.y ?? 0,
 			rotation: defaultDrawShape.rotation ?? 0,
-			index: defaultDrawShape.index ?? ('a1' as IndexKey),
+			index: defaultDrawShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 			parentId: defaultDrawShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultDrawShape.isLocked ?? false,
 			opacity: defaultDrawShape.opacity ?? 1,
 			props: {
+				...editor.getShapeUtil('draw').getDefaultProps(),
 				color: asColor(simpleShape.color ?? defaultDrawShape.props?.color ?? 'black'),
 				fill,
 			},
@@ -558,11 +559,11 @@ function convertUnknownShapeToTldrawShape(
 			x: simpleShape.x ?? defaultShape.x ?? 0,
 			y: simpleShape.y ?? defaultShape.y ?? 0,
 			rotation: defaultShape.rotation ?? 0,
-			index: defaultShape.index ?? ('a1' as IndexKey),
+			index: defaultShape.index ?? editor.getHighestIndexForParent(editor.getCurrentPageId()),
 			parentId: defaultShape.parentId ?? editor.getCurrentPageId(),
 			isLocked: defaultShape.isLocked ?? false,
 			opacity: defaultShape.opacity ?? 1,
-			props: defaultShape.props ?? {},
+			props: defaultShape.props ?? ({} as any),
 			meta: {
 				note: simpleShape.note ?? defaultShape.meta?.note ?? '',
 			},
diff --git a/templates/agent/shared/format/convertTldrawShapeToSimpleShape.ts b/templates/agent/shared/format/convertTldrawShapeToSimpleShape.ts
index f9e30b61316e..4773ce74394c 100644
--- a/templates/agent/shared/format/convertTldrawShapeToSimpleShape.ts
+++ b/templates/agent/shared/format/convertTldrawShapeToSimpleShape.ts
@@ -256,10 +256,8 @@ function getSimpleBounds(editor: Editor, shape: TLShape): Box {
 			() => {
 				const mockId = createShapeId()
 				editor.createShape({
+					...shape,
 					id: mockId,
-					type: shape.type,
-					props: shape.props,
-					meta: shape.meta,
 				})
 				mockBounds = editor.getShapePageBounds(mockId)
 			},
diff --git a/templates/branching-chat/client/components/WorkflowToolbar.tsx b/templates/branching-chat/client/components/WorkflowToolbar.tsx
index 72ae8d4ce201..a3a2892aa54f 100644
--- a/templates/branching-chat/client/components/WorkflowToolbar.tsx
+++ b/templates/branching-chat/client/components/WorkflowToolbar.tsx
@@ -38,7 +38,7 @@ function createNodeShape(editor: Editor, shapeId: TLShapeId, center: Vec, node:
 
 	editor.run(() => {
 		// Create the shape with the node definition
-		editor.createShape<NodeShape>({
+		editor.createShape({
 			id: shapeId,
 			type: 'node',
 			props: { node },
@@ -78,7 +78,7 @@ export const overrides: TLUiOverrides = {
 				onDragStart: (_, info) => {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
-							editor.createShape<NodeShape>({
+							editor.createShape({
 								id,
 								type: 'node',
 								props: { node: nodeDef.getDefault() },
diff --git a/templates/branching-chat/client/connection/ConnectionBindingUtil.tsx b/templates/branching-chat/client/connection/ConnectionBindingUtil.tsx
index 78690134f818..389ed1514281 100644
--- a/templates/branching-chat/client/connection/ConnectionBindingUtil.tsx
+++ b/templates/branching-chat/client/connection/ConnectionBindingUtil.tsx
@@ -8,7 +8,7 @@ import {
 	createComputedCache,
 	Editor,
 	T,
-	TLBaseBinding,
+	TLBinding,
 	TLShapeId,
 } from 'tldraw'
 import { getNodePorts } from '../nodes/nodePorts'
@@ -17,20 +17,25 @@ import { onNodePortConnect, onNodePortDisconnect } from '../nodes/nodeTypes'
 import { PortId } from '../ports/Port'
 import { ConnectionShape } from './ConnectionShapeUtil'
 
+const CONNECTION_TYPE = 'connection'
+
+declare module 'tldraw' {
+	export interface TLGlobalBindingPropsMap {
+		[CONNECTION_TYPE]: {
+			portId: PortId
+			terminal: 'start' | 'end'
+		}
+	}
+}
+
 /**
  * A connection binding is a binding between a connection shape and a node shape. Usually, each
  * connection shape has two bindings: one for each end of the connection.
  */
-export type ConnectionBinding = TLBaseBinding<
-	'connection',
-	{
-		portId: PortId
-		terminal: 'start' | 'end'
-	}
->
+export type ConnectionBinding = TLBinding<typeof CONNECTION_TYPE>
 
 export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
-	static override type = 'connection' as const
+	static override type = CONNECTION_TYPE
 	static override props = {
 		portId: T.string,
 		terminal: T.literalEnum('start', 'end'),
@@ -53,7 +58,7 @@ export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
 	onAfterCreate({ binding }: BindingOnCreateOptions<ConnectionBinding>): void {
 		// Our ports system has an `onConnect` callback - call it when we create a connection
 		const node = this.editor.getShape(binding.toId)
-		if (!node || !this.editor.isShapeOfType<NodeShape>(node, 'node')) return
+		if (!node || !this.editor.isShapeOfType(node, 'node')) return
 		onNodePortConnect(this.editor, node, binding.props.portId)
 	}
 
@@ -68,8 +73,8 @@ export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
 			if (
 				!nodeBefore ||
 				!nodeAfter ||
-				!this.editor.isShapeOfType<NodeShape>(nodeBefore, 'node') ||
-				!this.editor.isShapeOfType<NodeShape>(nodeAfter, 'node')
+				!this.editor.isShapeOfType(nodeBefore, 'node') ||
+				!this.editor.isShapeOfType(nodeAfter, 'node')
 			) {
 				return
 			}
@@ -81,7 +86,7 @@ export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
 	onAfterDelete({ binding }: BindingOnDeleteOptions<ConnectionBinding>): void {
 		// When we're deleting a connection, we need to call the node's port disconnect callback
 		const node = this.editor.getShape(binding.toId)
-		if (!node || !this.editor.isShapeOfType<NodeShape>(node, 'node')) return
+		if (!node || !this.editor.isShapeOfType(node, 'node')) return
 		onNodePortDisconnect(this.editor, node, binding.props.portId)
 	}
 }
@@ -104,7 +109,7 @@ export function getConnectionBindings(
 const connectionBindingsCache = createComputedCache(
 	'connection bindings',
 	(editor: Editor, connection: ConnectionShape) => {
-		const bindings = editor.getBindingsFromShape<ConnectionBinding>(connection.id, 'connection')
+		const bindings = editor.getBindingsFromShape(connection.id, CONNECTION_TYPE)
 		let start, end
 		for (const binding of bindings) {
 			if (binding.props.terminal === 'start') {
@@ -130,7 +135,7 @@ export function getConnectionBindingPositionInPageSpace(
 ) {
 	// Find the shape that this binding is bound to
 	const targetShape = editor.getShape(binding.toId)
-	if (!targetShape || !editor.isShapeOfType<NodeShape>(targetShape, 'node')) return null
+	if (!targetShape || !editor.isShapeOfType(targetShape, 'node')) return null
 
 	// Find the port in the shape that the connection is bound to
 	const port = getNodePorts(editor, targetShape)?.[binding.props.portId]
@@ -154,7 +159,7 @@ export function createOrUpdateConnectionBinding(
 	const targetId = typeof target === 'string' ? target : target.id
 
 	const existingMany = editor
-		.getBindingsFromShape<ConnectionBinding>(connectionId, 'connection')
+		.getBindingsFromShape(connectionId, CONNECTION_TYPE)
 		.filter((b) => b.props.terminal === props.terminal)
 
 	// if we've somehow ended up with too many bindings, delete the extras
@@ -171,7 +176,7 @@ export function createOrUpdateConnectionBinding(
 		})
 	} else {
 		editor.createBinding({
-			type: 'connection',
+			type: CONNECTION_TYPE,
 			fromId: connectionId,
 			toId: targetId,
 			props,
@@ -186,7 +191,7 @@ export function removeConnectionBinding(
 	terminal: 'start' | 'end'
 ) {
 	const existing = editor
-		.getBindingsFromShape<ConnectionBinding>(connection, 'connection')
+		.getBindingsFromShape(connection, CONNECTION_TYPE)
 		.filter((b) => b.props.terminal === terminal)
 
 	editor.deleteBindings(existing)
diff --git a/templates/branching-chat/client/connection/ConnectionShapeUtil.tsx b/templates/branching-chat/client/connection/ConnectionShapeUtil.tsx
index 61c5e72dd0b8..83133cd5013b 100644
--- a/templates/branching-chat/client/connection/ConnectionShapeUtil.tsx
+++ b/templates/branching-chat/client/connection/ConnectionShapeUtil.tsx
@@ -8,9 +8,9 @@ import {
 	RecordProps,
 	SVGContainer,
 	ShapeUtil,
-	TLBaseShape,
 	TLHandle,
 	TLHandleDragInfo,
+	TLShape,
 	Vec,
 	VecLike,
 	VecModel,
@@ -37,6 +37,14 @@ import {
 } from './ConnectionBindingUtil'
 import { insertNodeWithinConnection } from './insertNodeWithinConnection'
 
+const CONNECTION_TYPE = 'connection'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[CONNECTION_TYPE]: { start: VecModel; end: VecModel }
+	}
+}
+
 /**
  * A connection shape is a directed connection between two node shapes. It has a start point, and an
  * end point. These are called "terminals" in the code.
@@ -46,16 +54,10 @@ import { insertNodeWithinConnection } from './insertNodeWithinConnection'
  * the connection, but only when there isn't a binding (ie while dragging the connection). When the
  * ends are bound, the position is derived from the connected shape instead.
  */
-export type ConnectionShape = TLBaseShape<
-	'connection',
-	{
-		start: VecModel
-		end: VecModel
-	}
->
+export type ConnectionShape = TLShape<typeof CONNECTION_TYPE>
 
 export class ConnectionShapeUtil extends ShapeUtil<ConnectionShape> {
-	static override type = 'connection' as const
+	static override type = CONNECTION_TYPE
 	static override props: RecordProps<ConnectionShape> = {
 		start: vecModelValidator,
 		end: vecModelValidator,
diff --git a/templates/branching-chat/client/connection/insertNodeWithinConnection.tsx b/templates/branching-chat/client/connection/insertNodeWithinConnection.tsx
index e211825224c5..e67686d05c6e 100644
--- a/templates/branching-chat/client/connection/insertNodeWithinConnection.tsx
+++ b/templates/branching-chat/client/connection/insertNodeWithinConnection.tsx
@@ -1,7 +1,6 @@
 import { Box, createShapeId, Editor, TLShapeId } from 'tldraw'
 import { DEFAULT_NODE_SPACING_PX, NODE_HEIGHT_PX, NODE_WIDTH_PX } from '../constants'
 import { getNodePortConnections, getNodePorts } from '../nodes/nodePorts'
-import { NodeShape } from '../nodes/NodeShapeUtil'
 import { createOrUpdateConnectionBinding, getConnectionBindings } from './ConnectionBindingUtil'
 import { ConnectionShape } from './ConnectionShapeUtil'
 
@@ -52,7 +51,7 @@ export function insertNodeWithinConnection(
 
 	// create the new node
 	const newNodeId = createShapeId()
-	editor.createShape<NodeShape>({
+	editor.createShape({
 		type: 'node',
 		id: newNodeId,
 		x: newNodeX,
@@ -78,7 +77,7 @@ export function insertNodeWithinConnection(
 
 	// create a new connection between the new node and the end of the original connection
 	const newConnectionId = createShapeId()
-	editor.createShape<ConnectionShape>({
+	editor.createShape({
 		type: 'connection',
 		id: newConnectionId,
 	})
@@ -117,8 +116,8 @@ function moveNodesIfNeeded(
 	if (
 		!rootNode ||
 		!newNode ||
-		!editor.isShapeOfType<NodeShape>(rootNode, 'node') ||
-		!editor.isShapeOfType<NodeShape>(newNode, 'node')
+		!editor.isShapeOfType(rootNode, 'node') ||
+		!editor.isShapeOfType(newNode, 'node')
 	) {
 		return
 	}
@@ -136,7 +135,7 @@ function moveNodesIfNeeded(
 
 	function visit(nodeId: TLShapeId, parentExpandedBounds: Box) {
 		const node = editor.getShape(nodeId)
-		if (!node || !editor.isShapeOfType<NodeShape>(node, 'node')) return
+		if (!node || !editor.isShapeOfType(node, 'node')) return
 
 		// if this node has already been visited, we need to continue on from the nudge we
 		// calculated last time:
@@ -200,7 +199,7 @@ function moveNodesIfNeeded(
 				},
 				...Array.from(toNudge.entries()).map(([id, nudge]) => ({
 					id,
-					type: 'node',
+					type: 'node' as const,
 					x: nudge.initialX + nudge.amountX,
 					y: nudge.initialY + nudge.amountY,
 				})),
diff --git a/templates/branching-chat/client/connection/keepConnectionsAtBottom.tsx b/templates/branching-chat/client/connection/keepConnectionsAtBottom.tsx
index 7ec99b1af823..89e0a29e9f75 100644
--- a/templates/branching-chat/client/connection/keepConnectionsAtBottom.tsx
+++ b/templates/branching-chat/client/connection/keepConnectionsAtBottom.tsx
@@ -90,7 +90,7 @@ export function keepConnectionsAtBottom(editor: Editor) {
 					id: shape.id,
 					type: shape.type,
 					index: newIndex,
-				})
+				} as const)
 			}
 		}
 
diff --git a/templates/branching-chat/client/nodes/NodeShapeUtil.tsx b/templates/branching-chat/client/nodes/NodeShapeUtil.tsx
index 5e701471fa3c..4e4b65fca18a 100644
--- a/templates/branching-chat/client/nodes/NodeShapeUtil.tsx
+++ b/templates/branching-chat/client/nodes/NodeShapeUtil.tsx
@@ -7,8 +7,8 @@ import {
 	Rectangle2d,
 	resizeBox,
 	ShapeUtil,
-	TLBaseShape,
 	TLResizeInfo,
+	TLShape,
 	useEditor,
 	useUniqueSafeId,
 	useValue,
@@ -25,12 +25,20 @@ import {
 	NodeTypePorts,
 } from './nodeTypes'
 
+const NODE_TYPE = 'node'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[NODE_TYPE]: { node: NodeType }
+	}
+}
+
 // Define our custom node shape type that extends tldraw's base shape system
-export type NodeShape = TLBaseShape<'node', { node: NodeType }>
+export type NodeShape = TLShape<typeof NODE_TYPE>
 
 // This class extends tldraw's ShapeUtil to define how our custom node shapes behave
 export class NodeShapeUtil extends ShapeUtil<NodeShape> {
-	static override type = 'node' as const
+	static override type = NODE_TYPE
 	static override props: RecordProps<NodeShape> = {
 		node: NodeType,
 	}
diff --git a/templates/branching-chat/client/nodes/nodePorts.tsx b/templates/branching-chat/client/nodes/nodePorts.tsx
index 5118c1823920..0f992bfed526 100644
--- a/templates/branching-chat/client/nodes/nodePorts.tsx
+++ b/templates/branching-chat/client/nodes/nodePorts.tsx
@@ -2,7 +2,7 @@
  * This file contains functions for working with ports and connections on nodes.
  */
 import { createComputedCache, Editor, TLShapeId } from 'tldraw'
-import { ConnectionBinding, getConnectionBindings } from '../connection/ConnectionBindingUtil'
+import { getConnectionBindings } from '../connection/ConnectionBindingUtil'
 import { PortId } from '../ports/Port'
 import { NodeShape } from './NodeShapeUtil'
 import { getNodeTypePorts, NodeTypePorts } from './nodeTypes'
@@ -42,7 +42,7 @@ export function getNodePortConnections(
 const nodePortConnectionsCache = createComputedCache(
 	'port connections',
 	(editor: Editor, node: NodeShape) => {
-		const bindings = editor.getBindingsToShape<ConnectionBinding>(node.id, 'connection')
+		const bindings = editor.getBindingsToShape(node.id, 'connection')
 
 		const connections: NodePortConnection[] = []
 		for (const binding of bindings) {
@@ -83,7 +83,7 @@ export function getAllConnectedNodes(
 		if (!nodeId) continue
 
 		const node = editor.getShape(nodeId)
-		if (!node || !editor.isShapeOfType<NodeShape>(node, 'node')) continue
+		if (!node || !editor.isShapeOfType(node, 'node')) continue
 
 		if (found.has(node.id)) continue
 		found.add(node.id)
diff --git a/templates/branching-chat/client/nodes/types/MessageNode.tsx b/templates/branching-chat/client/nodes/types/MessageNode.tsx
index eb055d5efd76..f7807e0fdf41 100644
--- a/templates/branching-chat/client/nodes/types/MessageNode.tsx
+++ b/templates/branching-chat/client/nodes/types/MessageNode.tsx
@@ -83,7 +83,7 @@ function MessageNodeComponent({ node, shape }: NodeComponentProps<MessageNode>)
 			const node = editor.getShape(connectedShape)
 
 			if (!node) continue
-			if (!editor.isShapeOfType<NodeShape>(node, 'node')) continue
+			if (!editor.isShapeOfType(node, 'node')) continue
 			if (node.props.node.type !== 'message') continue
 
 			if (node.props.node.assistantMessage && connectedShape !== shape.id) {
diff --git a/templates/branching-chat/client/nodes/types/shared.tsx b/templates/branching-chat/client/nodes/types/shared.tsx
index a470d9969c6f..c26ae432d214 100644
--- a/templates/branching-chat/client/nodes/types/shared.tsx
+++ b/templates/branching-chat/client/nodes/types/shared.tsx
@@ -65,7 +65,7 @@ export function updateNode<T extends NodeType>(
 	shape: NodeShape,
 	update: (node: T) => T
 ) {
-	editor.updateShape<NodeShape>({
+	editor.updateShape({
 		id: shape.id,
 		type: shape.type,
 		props: { node: update(shape.props.node as T) },
diff --git a/templates/branching-chat/client/ports/PointingPort.tsx b/templates/branching-chat/client/ports/PointingPort.tsx
index 5d8e798315d1..4b753ea1aeac 100644
--- a/templates/branching-chat/client/ports/PointingPort.tsx
+++ b/templates/branching-chat/client/ports/PointingPort.tsx
@@ -1,6 +1,5 @@
 import { createShapeId, StateNode, TLPointerEventInfo, TLShapeId } from 'tldraw'
 import { createOrUpdateConnectionBinding } from '../connection/ConnectionBindingUtil.tsx'
-import { ConnectionShape } from '../connection/ConnectionShapeUtil.tsx'
 import { getNextConnectionIndex } from '../connection/keepConnectionsAtBottom.tsx'
 import { DEFAULT_NODE_SPACING_PX, NODE_WIDTH_PX } from '../constants.tsx'
 import { getNodePortConnections, getNodePorts } from '../nodes/nodePorts.tsx'
@@ -137,7 +136,7 @@ export class PointingPort extends StateNode {
 			.getPointInShapeSpace(connectionShapeId, targetPositionInPageSpace)
 			.addXY(0, 200)
 
-		this.editor.updateShape<ConnectionShape>({
+		this.editor.updateShape({
 			id: connectionShapeId,
 			type: 'connection',
 			props: {
diff --git a/templates/branching-chat/client/ports/getPortAtPoint.tsx b/templates/branching-chat/client/ports/getPortAtPoint.tsx
index 47b8e826bfdf..93fb0cd4f93a 100644
--- a/templates/branching-chat/client/ports/getPortAtPoint.tsx
+++ b/templates/branching-chat/client/ports/getPortAtPoint.tsx
@@ -1,6 +1,5 @@
 import { Editor, Vec, VecLike } from 'tldraw'
 import { getNodePortConnections, getNodePorts } from '../nodes/nodePorts'
-import { NodeShape } from '../nodes/NodeShapeUtil'
 import { ShapePort } from './Port'
 
 export function getPortAtPoint(
@@ -12,10 +11,10 @@ export function getPortAtPoint(
 	const shape = editor.getShapeAtPoint(point, {
 		hitInside: true,
 		// only node shapes can have ports
-		filter: (shape) => editor.isShapeOfType<NodeShape>(shape, 'node'),
+		filter: (shape) => editor.isShapeOfType(shape, 'node'),
 		...opts,
 	})
-	if (!shape || !editor.isShapeOfType<NodeShape>(shape, 'node')) return null
+	if (!shape || !editor.isShapeOfType(shape, 'node')) return null
 
 	// get the ports on that shape
 	const ports = getNodePorts(editor, shape)
diff --git a/templates/chat/src/app/styles.css b/templates/chat/src/app/styles.css
index 90a171274e34..8035d88e93df 100644
--- a/templates/chat/src/app/styles.css
+++ b/templates/chat/src/app/styles.css
@@ -542,7 +542,8 @@ body {
 		padding: var(--padding-y) var(--padding-x);
 	}
 
-	.modal-overlay .tl-canvas {
+	.modal-overlay .tl-canvas,
+	.modal-overlay .tl-canvas__in-front {
 		border-radius: var(--tl-radius-4);
 		box-shadow: var(--tl-shadow-2);
 		bottom: calc(var(--canvas-inset-bottom) + var(--padding-y));
diff --git a/templates/chat/src/components/WhiteboardModal.tsx b/templates/chat/src/components/WhiteboardModal.tsx
index 53969fa56da4..f5138c9aad37 100644
--- a/templates/chat/src/components/WhiteboardModal.tsx
+++ b/templates/chat/src/components/WhiteboardModal.tsx
@@ -9,7 +9,6 @@ import {
 	TldrawUiButton,
 	TldrawUiRow,
 	TLEditorSnapshot,
-	TLImageShape,
 	useEditor,
 	useToasts,
 	useTranslation,
@@ -180,7 +179,7 @@ function InsideOfTldrawContext({ uploadedFile }: { uploadedFile?: File }) {
 			// create the shape, select it, make it fill the screen, and start cropping it:
 			editor
 				.createAssets([asset])
-				.createShape<TLImageShape>({
+				.createShape({
 					id: shapeId,
 					type: 'image',
 					x: center.x - width / 2,
diff --git a/templates/sync-rivet/.gitignore b/templates/sync-rivet/.gitignore
new file mode 100644
index 000000000000..ce782f7dc934
--- /dev/null
+++ b/templates/sync-rivet/.gitignore
@@ -0,0 +1,4 @@
+/*/node_modules
+node_modules
+.yarn/
+dist/
diff --git a/templates/sync-rivet/LICENSE.md b/templates/sync-rivet/LICENSE.md
new file mode 100644
index 000000000000..7de4c61fe721
--- /dev/null
+++ b/templates/sync-rivet/LICENSE.md
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024 tldraw Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/templates/sync-rivet/README.md b/templates/sync-rivet/README.md
new file mode 100644
index 000000000000..e1c97b81be84
--- /dev/null
+++ b/templates/sync-rivet/README.md
@@ -0,0 +1,180 @@
+# tldraw sync server
+
+This is a production-ready backend for [tldraw sync](https://tldraw.dev/docs/sync).
+
+- Your client-side tldraw-based app can be served from anywhere you want.
+<<<<<<< HEAD
+- This backend uses [Cloudflare Workers](https://developers.cloudflare.com/workers/), and will need
+  to be deployed to your own Cloudflare account.
+- Each whiteboard is synced via
+  [WebSockets](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) to a [Cloudflare
+  Durable Object](https://developers.cloudflare.com/durable-objects/).
+- Whiteboards and any uploaded images/videos are stored in a [Cloudflare
+  R2](https://developers.cloudflare.com/r2/) bucket.
+- Although unrelated to tldraw sync, this server also includes a component to fetch link previews
+  for URLs added to the canvas.
+  This is a minimal setup of the same system that powers multiplayer collaboration for hundreds of
+  thousands of rooms & users on www.tldraw.com. Because durable objects effectively create a mini
+  server instance for every single active room, we've never needed to worry about scale. Cloudflare
+=======
+- This backend uses [Rivet](https://www.rivet.dev/), and will need
+  to be deployed to your cloud of choice. See see the
+  [available deploy options](https://www.rivet.dev/docs/#deploy-options).
+- Each whiteboard is synced via
+  [WebSockets](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API) to a [Rivet
+  Actor](https://www.rivet.dev/docs/actors/).
+- Whiteboards and any uploaded images/videos are stored in a [S3](https://aws.amazon.com/s3/)
+  bucket (if configured).
+- Although unrelated to tldraw sync, this server also includes a component to fetch link previews
+  for URLs added to the canvas.
+  This is a minimal setup of the same system that powers multiplayer collaboration for hundreds of
+  thousands of rooms & users on www.tldraw.com. Because actors effectively create a mini
+  server instance for every single active room, we've never needed to worry about scale. Rivet
+>>>>>>> 53c94df90 (init rivet support)
+  handles the tricky infrastructure work of ensuring there's only ever one instance of each room, and
+  making sure that every user gets connected to that instance. We've found that with this approach,
+  each room is able to handle about 50 simultaneous collaborators.
+
+## Overview
+
+<<<<<<< HEAD
+[![architecture](./arch.png)](https://www.tldraw.com/ro/Yb_QHJFP9syPZq1YrV3YR?v=-255,-148,2025,1265&p=page)
+
+When a user opens a room, they connect via Workers to a durable object. Each durable object is like
+its own miniature server. There's only ever one for each room, and all the users of that room
+connect to it. When a user makes a change to the drawing, it's sent via a websocket connection to
+the durable object for that room. The durable object applies the change to its in-memory copy of the
+document, and broadcasts the change via websockets to all other connected clients. On a regular
+schedule, the durable object persists its contents to an R2 bucket. When the last client leaves the
+room, the durable object will shut down.
+
+Static assets like images and videos are too big to be synced via websockets and a durable object.
+Instead, they're uploaded to workers which store them in the same R2 bucket as the rooms. When
+they're downloaded, they're cached on cloudflare's edge network to reduce costs and make serving
+them faster.
+=======
+[![architecture](./arch.png)](https://www.tldraw.com/p/wpOL9V3ZaM6lsSFMqGKGk?d=v5232.2279.6720.4422.page)
+
+When a user opens a room, they connect to a Rivet Actor. Each Rivet Actor is like
+its own miniature server. There's only ever one for each room, and all the users of that room
+connect to it. When a user makes a change to the drawing, it's sent via a websocket connection to
+the actor for that room. The actor applies the change to its in-memory copy of the
+document, and broadcasts the change via websockets to all other connected clients. On a regular
+schedule, the actor's content gets persisted to Rivet's storage mechanism. When the last client leaves the
+room, the actor will shut down.
+
+Static assets like images and videos are too big to be synced via websockets and an actor.
+Instead, they're uploaded to S3 using presigned requests.
+>>>>>>> 53c94df90 (init rivet support)
+
+## Development
+
+To install dependencies, run `yarn`. To start a local development server, run `yarn dev`. This will
+<<<<<<< HEAD
+start a [`vite`](https://vitejs.dev/) dev server running both your application frontend, and the
+cloudflare workers backend via the [cloudflare vite
+plugin](https://developers.cloudflare.com/workers/vite-plugin/). The app & server should now be
+running at http://localhost:5137.
+
+The backend worker is under [`worker`](./worker/), and is split across several files:
+
+- **[`worker/worker.ts`](./worker/worker.ts):** the main entrypoint to the worker, defining each
+  route available.
+- **[`worker/TldrawDurableObject.ts`](./worker/TldrawDurableObject.ts):** the sync durable object.
+  An instance of this is created for every active room. This exposes a
+  [`TLSocketRoom`](https://tldraw.dev/reference/sync-core/TLSocketRoom) over websockets, and
+  periodically saves room data to R2.
+- **[`worker/assetUploads.ts`](./worker/assetUploads.ts):** uploads, downloads, and caching for
+  static assets like images and videos.
+- **[`worker/bookmarkUnfurling.ts`](./worker/bookmarkUnfurling.ts):** extract URL metadata for bookmark shapes.
+=======
+start a [`vite`](https://vitejs.dev/) for the frontend and a RivetKit
+development server for the backend. The app & server should now be running at
+http://localhost:5137.
+
+The backend server is under [`server`](./server/), and is split across several files:
+
+- **[`server/registry.ts`](./server/registry.ts):** defines the tldraw actor and sets up the Rivet registry.
+  This creates a [`TLSocketRoom`](https://tldraw.dev/reference/sync-core/TLSocketRoom) for each active room
+  and handles WebSocket connections.
+- **[`server/server.ts`](./server/server.ts):** the main entrypoint that starts the Rivet registry with
+  CORS configuration.
+>>>>>>> 53c94df90 (init rivet support)
+
+The frontend client is under [`client`](./client):
+
+- **[`client/App.tsx`](./client/App.tsx):** the main client `<App />` component. This connects our
+  sync backend to the `<Tldraw />` component, wiring in assets and bookmark previews.
+- **[`client/multiplayerAssetStore.tsx`](./client/multiplayerAssetStore.tsx):** how does the client
+  upload and retrieve assets like images & videos from the worker?
+- **[`client/getBookmarkPreview.tsx`](./client/getBookmarkPreview.tsx):** how does the client fetch
+  bookmark previews from the worker?
+
+<<<<<<< HEAD
+  ## Custom shapes
+
+To add support for custom shapes, see the [tldraw sync custom shapes docs](https://tldraw.dev/docs/sync#Custom-shapes--bindings).
+
+## Adding cloudflare to your own repo
+=======
+## Custom shapes
+
+To add support for custom shapes, see the [tldraw sync custom shapes docs](https://tldraw.dev/docs/sync#Custom-shapes--bindings).
+
+## Adding Rivet to your own repo
+>>>>>>> 53c94df90 (init rivet support)
+
+If you already have an app using tldraw and want to use the system in this repo, you can copy and
+paste the relevant parts to your own app.
+
+<<<<<<< HEAD
+To add the server to your own app, copy the contents of the [`worker`](./worker/) folder and
+[`./wrangler.toml`](./wrangler.toml) into your app. Add the dependencies from
+[`package.json`](./package.json). You can run the worker using `wrangler dev` in the same folder as
+`./wrangler.toml`.
+=======
+To add the server to your own app, copy the contents of the [`server`](./server/) folder into your app.
+Add the dependencies from [`package.json`](./package.json). You can run the server using `yarn dev` or
+by following the [Rivet deployment documentation](https://www.rivet.dev/docs/).
+>>>>>>> 53c94df90 (init rivet support)
+
+To point your existing client at the server defined in this repo, copy
+[`client/multiplayerAssetStore.tsx`](./client/multiplayerAssetStore.tsx) and
+[`client/getBookmarkPreview.tsx`](./client/getBookmarkPreview.tsx) into your app. Then, adapt the
+code from [`client/App.tsx`](./client/App.tsx) to your own app. Adapt the `/api/` URLs used in each
+of these files to point at your new `wrangler dev` server.
+
+## Deployment
+
+To deploy this example, you'll need to create a cloudflare account and create an R2 bucket to store
+your data. Update `bucket_name = 'tldraw-content'` in [`wrangler.toml`](./wrangler.toml) with the
+name of your new bucket.
+
+To actually deploy the app, first create a production build using `yarn build`. Then, run `yarn
+wrangler deploy`. This will deploy the backend worker along with the frontend app to cloudflare.
+This should give you a workers.dev URL, but you can also [configure a custom
+domain](https://developers.cloudflare.com/workers/configuration/routing/custom-domains/).
+
+## License
+
+This project is provided under the MIT license found [here](https://github.com/tldraw/tldraw-sync-cloudflare/blob/main/LICENSE.md). The tldraw SDK is provided under the [tldraw license](https://github.com/tldraw/tldraw/blob/main/LICENSE.md).
+
+## Trademarks
+
+Copyright (c) 2024-present tldraw Inc. The tldraw name and logo are trademarks of tldraw. Please see our [trademark guidelines](https://github.com/tldraw/tldraw/blob/main/TRADEMARKS.md) for info on acceptable usage.
+
+## Distributions
+
+You can find tldraw on npm [here](https://www.npmjs.com/package/@tldraw/tldraw?activeTab=versions).
+
+## Contribution
+
+Please see our [contributing guide](https://github.com/tldraw/tldraw/blob/main/CONTRIBUTING.md). Found a bug? Please [submit an issue](https://github.com/tldraw/tldraw/issues/new).
+
+## Community
+
+Have questions, comments or feedback? [Join our discord](https://discord.tldraw.com/?utm_source=github&utm_medium=readme&utm_campaign=sociallink). For the latest news and release notes, visit [tldraw.dev](https://tldraw.dev).
+
+## Contact
+
+Find us on Twitter/X at [@tldraw](https://twitter.com/tldraw).
diff --git a/templates/sync-rivet/arch.png b/templates/sync-rivet/arch.png
new file mode 100644
index 000000000000..25c718f7c4af
Binary files /dev/null and b/templates/sync-rivet/arch.png differ
diff --git a/templates/sync-rivet/client/getBookmarkPreview.tsx b/templates/sync-rivet/client/getBookmarkPreview.tsx
new file mode 100644
index 000000000000..2aa7942af34c
--- /dev/null
+++ b/templates/sync-rivet/client/getBookmarkPreview.tsx
@@ -0,0 +1,31 @@
+import { AssetRecordType, TLAsset, TLBookmarkAsset, getHashForString } from 'tldraw'
+
+export async function getBookmarkPreview({ url }: { url: string }): Promise<TLAsset> {
+	const asset: TLBookmarkAsset = {
+		id: AssetRecordType.createId(getHashForString(url)),
+		typeName: 'asset',
+		type: 'bookmark',
+		meta: {},
+		props: {
+			src: url,
+			description: '',
+			image: '',
+			favicon: '',
+			title: '',
+		},
+	}
+
+	try {
+		const response = await fetch(`/api/unfurl?url=${encodeURIComponent(url)}`)
+		const data: any = await response.json()
+
+		asset.props.description = data?.description ?? ''
+		asset.props.image = data?.image ?? ''
+		asset.props.favicon = data?.favicon ?? ''
+		asset.props.title = data?.title ?? ''
+	} catch {
+		// Failed to fetch preview data, return asset with default values
+	}
+
+	return asset
+}
diff --git a/templates/sync-rivet/client/index.css b/templates/sync-rivet/client/index.css
new file mode 100644
index 000000000000..b1f73c6a0551
--- /dev/null
+++ b/templates/sync-rivet/client/index.css
@@ -0,0 +1,88 @@
+@import url('https://fonts.googleapis.com/css2?family=Inter:wght@500;700&display=swap');
+@import url('tldraw/tldraw.css');
+
+body {
+	font-family: 'Inter', sans-serif;
+	overscroll-behavior: none;
+}
+
+.RoomWrapper {
+	--background: white;
+	--text: hsl(0, 0%, 20%);
+	--gray-light: #f5f5f5;
+	--gray-dark: #e5e5e5;
+	--black-transparent-lighter: rgba(0, 0, 0, 0.15);
+	--black-transparent-light: rgba(0, 0, 0, 0.4);
+	--black-transparent-dark: rgba(0, 0, 0, 0.6);
+	--black-transparent-darker: rgba(0, 0, 0, 0.7);
+	--focus: hsl(217, 89%, 61%);
+	--whiteboard: hsl(240, 5%, 96%);
+	color-scheme: light;
+}
+
+:root:has(.tl-theme__dark) .RoomWrapper {
+	--background: black;
+	--text: hsl(0, 9%, 94%);
+	--gray-light: #333;
+	--gray-dark: #444;
+	--black-transparent-lighter: rgba(255, 255, 255, 0.15);
+	--black-transparent-light: rgba(255, 255, 255, 0.4);
+	--black-transparent-dark: rgba(255, 255, 255, 0.6);
+	--black-transparent-darker: rgba(255, 255, 255, 0.7);
+	--focus: hsl(217, 89%, 61%);
+	--whiteboard: hsl(240, 5%, 6.5%);
+	color-scheme: dark;
+}
+
+.RoomWrapper {
+	display: flex;
+	flex-direction: column;
+	position: absolute;
+	inset: 0px;
+}
+
+.RoomWrapper-header {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	align-items: center;
+	padding: 8px 16px;
+	gap: 16px;
+	background: var(--background);
+	border-bottom: 1px solid var(--gray-dark);
+	color: var(--text);
+	font-size: 14px;
+}
+
+.RoomWrapper-copy {
+	background: var(--black-transparent-lighter);
+	border: 1px solid var(--gray-dark);
+	border-radius: 4px;
+	padding: 4px 12px;
+	height: 24px;
+	cursor: pointer;
+	position: relative;
+	text-align: center;
+}
+
+.RoomWrapper-copy:has(.RoomWrapper-copied) {
+	color: transparent;
+}
+
+.RoomWrapper-copied {
+	color: var(--text);
+	position: absolute;
+	inset: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.RoomWrapper-copy:hover {
+	border: 1px solid var(--black-transparent-lighter);
+}
+
+.RoomWrapper-content {
+	position: relative;
+	flex: 1;
+}
diff --git a/templates/sync-rivet/client/localStorage.ts b/templates/sync-rivet/client/localStorage.ts
new file mode 100644
index 000000000000..aab55e16614b
--- /dev/null
+++ b/templates/sync-rivet/client/localStorage.ts
@@ -0,0 +1,23 @@
+export function getLocalStorageItem(key: string): string | null {
+	try {
+		return localStorage.getItem(key)
+	} catch {
+		return null
+	}
+}
+
+export function setLocalStorageItem(key: string, value: string): void {
+	try {
+		localStorage.setItem(key, value)
+	} catch {
+		// localStorage not available
+	}
+}
+
+export function removeLocalStorageItem(key: string): void {
+	try {
+		localStorage.removeItem(key)
+	} catch {
+		// localStorage not available
+	}
+}
diff --git a/templates/sync-rivet/client/main.tsx b/templates/sync-rivet/client/main.tsx
new file mode 100644
index 000000000000..df2ebf1765de
--- /dev/null
+++ b/templates/sync-rivet/client/main.tsx
@@ -0,0 +1,23 @@
+import React from 'react'
+import ReactDOM from 'react-dom/client'
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+import './index.css'
+import { Room } from './pages/Room'
+import { Root } from './pages/Root'
+
+const router = createBrowserRouter([
+	{
+		path: '/',
+		element: <Root />,
+	},
+	{
+		path: '/:roomId',
+		element: <Room />,
+	},
+])
+
+ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
+	<React.StrictMode>
+		<RouterProvider router={router} />
+	</React.StrictMode>
+)
diff --git a/templates/sync-rivet/client/multiplayerAssetStore.tsx b/templates/sync-rivet/client/multiplayerAssetStore.tsx
new file mode 100644
index 000000000000..bb371ae1325d
--- /dev/null
+++ b/templates/sync-rivet/client/multiplayerAssetStore.tsx
@@ -0,0 +1,24 @@
+import { TLAssetStore, uniqueId } from 'tldraw'
+
+export const multiplayerAssetStore: TLAssetStore = {
+	async upload(_asset, file) {
+		const id = uniqueId()
+		const objectName = `${id}-${file.name}`.replace(/[^a-zA-Z0-9.]/g, '-')
+		const url = `/api/uploads/${objectName}`
+
+		const response = await fetch(url, {
+			method: 'POST',
+			body: file,
+		})
+
+		if (!response.ok) {
+			throw new Error(`Failed to upload asset: ${response.statusText}`)
+		}
+
+		return { src: url }
+	},
+
+	resolve(asset) {
+		return asset.props.src
+	},
+}
diff --git a/templates/sync-rivet/client/pages/Room.tsx b/templates/sync-rivet/client/pages/Room.tsx
new file mode 100644
index 000000000000..67dd9a651351
--- /dev/null
+++ b/templates/sync-rivet/client/pages/Room.tsx
@@ -0,0 +1,143 @@
+import { createClient } from 'rivetkit/client'
+import { useSync } from '@tldraw/sync'
+<<<<<<< HEAD
+import { ReactNode, useEffect, useMemo, useState } from 'react'
+=======
+import { ReactNode, useEffect, useState } from 'react'
+>>>>>>> 53c94df90 (init rivet support)
+import { useParams } from 'react-router-dom'
+import { Tldraw } from 'tldraw'
+import { getBookmarkPreview } from '../getBookmarkPreview'
+import { multiplayerAssetStore } from '../multiplayerAssetStore'
+
+const rivetUrl = import.meta.env.VITE_RIVET_ENDPOINT || 'http://localhost:6420'
+const rivetToken = import.meta.env.VITE_RIVET_TOKEN
+const rivetNamespace = import.meta.env.VITE_RIVET_NAMESPACE
+
+const client = createClient({
+	endpoint: rivetUrl,
+	token: rivetToken,
+	namespace: rivetNamespace,
+})
+
+export function Room() {
+	const { roomId } = useParams<{ roomId: string }>()
+	const [roomUri, setRoomUri] = useState<string | undefined>(undefined)
+
+	useEffect(() => {
+		const loadRoomUri = async () => {
+			const actorId = await client.tldrawRoom.getOrCreate(roomId!).resolve();
+
+			const wsOrigin = rivetUrl.replace(/^http/, 'ws')
+<<<<<<< HEAD
+			const params = new URLSearchParams({
+				x_rivet_target: 'actor',
+				x_rivet_actor: actorId,
+			})
+
+			if (rivetToken) {
+				params.set('x_rivet_token', rivetToken)
+			}
+			if (rivetNamespace) {
+				params.set('x_rivet_namespace', rivetNamespace)
+			}
+
+			const wsUrl = `${wsOrigin}/raw/websocket?${params.toString()}`
+=======
+			let wsUrl: string;
+			if (rivetToken) {
+				wsUrl = `${wsOrigin}/gateway/${encodeURIComponent(actorId)}@${encodeURIComponent(rivetToken)}/websocket`
+			} else {
+				wsUrl = `${wsOrigin}/gateway/${encodeURIComponent(actorId)}/websocket`
+			}
+
+>>>>>>> 53c94df90 (init rivet support)
+			setRoomUri(wsUrl)
+		}
+
+		if (roomId) {
+			loadRoomUri()
+		}
+	}, [roomId])
+
+	if (!roomUri || !roomId) {
+		return (
+			<RoomWrapper roomId={roomId}>
+				<div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100%' }}>
+					Loading room...
+				</div>
+			</RoomWrapper>
+		)
+	}
+
+	return <ConnectedRoom roomId={roomId} roomUri={roomUri} />
+}
+
+function ConnectedRoom({ roomId, roomUri }: { roomId: string; roomUri: string }) {
+	const store = useSync({
+		uri: roomUri,
+		assets: multiplayerAssetStore,
+	})
+
+	return (
+		<RoomWrapper roomId={roomId}>
+			<Tldraw
+				store={store}
+				deepLinks
+				onMount={(editor) => {
+					editor.registerExternalAssetHandler('url', getBookmarkPreview)
+				}}
+			/>
+		</RoomWrapper>
+	)
+}
+
+function RoomWrapper({ children, roomId }: { children: ReactNode; roomId?: string }) {
+	const [didCopy, setDidCopy] = useState(false)
+
+	useEffect(() => {
+		if (!didCopy) return
+		const timeout = setTimeout(() => setDidCopy(false), 3000)
+		return () => clearTimeout(timeout)
+	}, [didCopy])
+
+	return (
+		<div className="RoomWrapper">
+			<div className="RoomWrapper-header">
+				<WifiIcon />
+				<div>{roomId}</div>
+				<button
+					className="RoomWrapper-copy"
+					onClick={() => {
+						navigator.clipboard.writeText(window.location.href)
+						setDidCopy(true)
+					}}
+					aria-label="copy room link"
+				>
+					Copy link
+					{didCopy && <div className="RoomWrapper-copied">Copied!</div>}
+				</button>
+			</div>
+			<div className="RoomWrapper-content">{children}</div>
+		</div>
+	)
+}
+
+function WifiIcon() {
+	return (
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			fill="none"
+			viewBox="0 0 24 24"
+			strokeWidth="1.5"
+			stroke="currentColor"
+			width={16}
+		>
+			<path
+				strokeLinecap="round"
+				strokeLinejoin="round"
+				d="M8.288 15.038a5.25 5.25 0 0 1 7.424 0M5.106 11.856c3.807-3.808 9.98-3.808 13.788 0M1.924 8.674c5.565-5.565 14.587-5.565 20.152 0M12.53 18.22l-.53.53-.53-.53a.75.75 0 0 1 1.06 0Z"
+			/>
+		</svg>
+	)
+}
diff --git a/templates/sync-rivet/client/pages/Root.tsx b/templates/sync-rivet/client/pages/Root.tsx
new file mode 100644
index 000000000000..5a48f3620ac0
--- /dev/null
+++ b/templates/sync-rivet/client/pages/Root.tsx
@@ -0,0 +1,10 @@
+import { Navigate } from 'react-router-dom'
+import { uniqueId } from 'tldraw'
+import { getLocalStorageItem, setLocalStorageItem } from '../localStorage'
+
+const myLocalRoomId = getLocalStorageItem('my-local-room-id') ?? 'test-room-' + uniqueId()
+setLocalStorageItem('my-local-room-id', myLocalRoomId)
+
+export function Root() {
+	return <Navigate to={`/${myLocalRoomId}`} />
+}
diff --git a/templates/sync-rivet/client/vite-env.d.ts b/templates/sync-rivet/client/vite-env.d.ts
new file mode 100644
index 000000000000..11f02fe2a006
--- /dev/null
+++ b/templates/sync-rivet/client/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/templates/sync-rivet/index.html b/templates/sync-rivet/index.html
new file mode 100644
index 000000000000..7e7c45fd9f74
--- /dev/null
+++ b/templates/sync-rivet/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+		<link rel="icon" href="/favicon.ico" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<title>tldraw multiplayer template</title>
+	</head>
+	<body>
+		<div id="root"></div>
+		<script type="module" src="/client/main.tsx"></script>
+	</body>
+</html>
diff --git a/templates/sync-rivet/package.json b/templates/sync-rivet/package.json
new file mode 100644
index 000000000000..f90e2827598b
--- /dev/null
+++ b/templates/sync-rivet/package.json
@@ -0,0 +1,68 @@
+{
+	"name": "tldraw-sync-rivet",
+	"private": true,
+	"version": "0.0.0",
+	"author": {
+		"name": "tldraw GB Ltd.",
+		"email": "hello@tldraw.com"
+	},
+	"homepage": "https://tldraw.dev",
+	"license": "MIT",
+	"type": "module",
+	"tldraw_template": {
+		"repo": "tldraw/tldraw-sync-rivet",
+		"cli": {
+			"name": "Multiplayer",
+			"description": "Real-time multiplayer with a self-hosted backend.",
+			"shortDescription": "Real-time multiplayer.",
+			"order": 2
+		},
+		"scripts": {
+			"lint": null
+		}
+	},
+	"scripts": {
+		"dev": "concurrently \"vite\" \"tsx --watch server/server.ts\" --names \"vite,server\" --prefix-colors \"blue,green\"",
+		"build": "tsc && vite build",
+		"lint": "yarn run -T tsx ../../internal/scripts/lint.ts",
+		"preview": "vite preview"
+	},
+	"dependencies": {
+		"@hono/node-server": "^1.19.5",
+		"@hono/node-ws": "^1.2.0",
+<<<<<<< HEAD
+		"@rivetkit/react": "https://pkg.pr.new/rivet-dev/rivet/@rivetkit/react@ea8ef90",
+=======
+		"@rivetkit/react": "^2.0.25-rc.1",
+>>>>>>> 53c94df90 (init rivet support)
+		"@tldraw/sync": "workspace:*",
+		"@tldraw/sync-core": "workspace:*",
+		"@tldraw/tlschema": "workspace:*",
+		"itty-router": "^5.0.18",
+		"lodash.throttle": "^4.1.1",
+<<<<<<< HEAD
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
+		"react-router-dom": "^6.28.2",
+		"rivetkit": "https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90",
+		"tldraw": "workspace:*"
+=======
+		"process": "^0.11.10",
+		"react": "^18.3.1",
+		"react-dom": "^18.3.1",
+		"react-router-dom": "^6.28.2",
+		"rivetkit": "^2.0.25-rc.1",
+		"tldraw": "workspace:*",
+		"util": "^0.12.5"
+>>>>>>> 53c94df90 (init rivet support)
+	},
+	"devDependencies": {
+		"@types/lodash.throttle": "^4.1.9",
+		"@types/react": "^18.3.18",
+		"@types/react-dom": "^18.3.5",
+		"@vitejs/plugin-react-swc": "^3.10.2",
+		"concurrently": "^9.1.2",
+		"typescript": "^5.8.3",
+		"vite": "^7.0.1"
+	}
+}
diff --git a/templates/sync-rivet/public/favicon.ico b/templates/sync-rivet/public/favicon.ico
new file mode 100644
index 000000000000..05e2571c73e9
Binary files /dev/null and b/templates/sync-rivet/public/favicon.ico differ
diff --git a/templates/sync-rivet/server/registry.ts b/templates/sync-rivet/server/registry.ts
new file mode 100644
index 000000000000..165322ebf5b8
--- /dev/null
+++ b/templates/sync-rivet/server/registry.ts
@@ -0,0 +1,63 @@
+import { TLSocketRoom } from "@tldraw/sync-core";
+import {
+	type TLRecord,
+	createTLSchema,
+	defaultShapeSchemas,
+} from "@tldraw/tlschema";
+import { actor, setup, type UniversalWebSocket } from "rivetkit";
+
+const schema = createTLSchema({
+	shapes: { ...defaultShapeSchemas },
+});
+
+const tldrawRoom = actor({
+	state: {
+		snapshot: null as any,
+	},
+	createVars: () => {
+		return {
+			room: undefined as TLSocketRoom<TLRecord, void> | undefined,
+		};
+	},
+	actions: {
+		ping: async () => {
+			return { status: "ok" };
+		},
+	},
+<<<<<<< HEAD
+	onWebSocket: async (c, websocket: UniversalWebSocket, { request }) => {
+		const url = new URL(request.url);
+=======
+	onWebSocket: async (c, websocket: UniversalWebSocket) => {
+		if (!c.request) {
+			websocket.close(1008, "Missing request");
+			return;
+		}
+
+		const url = new URL(c.request.url);
+>>>>>>> 53c94df90 (init rivet support)
+		const sessionId = url.searchParams.get("sessionId");
+
+		if (!sessionId) {
+			websocket.close(1008, "Missing sessionId");
+			return;
+		}
+
+		if (!c.vars.room) {
+			const initialSnapshot = c.state.snapshot || undefined;
+			c.vars.room = new TLSocketRoom<TLRecord, void>({
+				schema,
+				initialSnapshot,
+			});
+		}
+
+		c.vars.room.handleSocketConnect({
+			sessionId,
+			socket: websocket,
+		});
+	},
+});
+
+export const registry = setup({
+	use: { tldrawRoom },
+});
diff --git a/templates/sync-rivet/server/server.ts b/templates/sync-rivet/server/server.ts
new file mode 100644
index 000000000000..e72000e524f4
--- /dev/null
+++ b/templates/sync-rivet/server/server.ts
@@ -0,0 +1,12 @@
+import { registry } from "./registry";
+
+<<<<<<< HEAD
+registry.start({
+	cors: {
+		origin: "http://localhost:5173",
+		credentials: true,
+	},
+});
+=======
+registry.start();
+>>>>>>> 53c94df90 (init rivet support)
diff --git a/templates/sync-rivet/tsconfig.json b/templates/sync-rivet/tsconfig.json
new file mode 100644
index 000000000000..16af16c9d163
--- /dev/null
+++ b/templates/sync-rivet/tsconfig.json
@@ -0,0 +1,33 @@
+{
+	"compilerOptions": {
+		"target": "ES2020",
+		"useDefineForClassFields": true,
+		"lib": ["DOM", "DOM.Iterable", "ES2022"],
+		"module": "ESNext",
+		"skipLibCheck": true,
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"resolveJsonModule": true,
+		"isolatedModules": true,
+		"noEmit": true,
+		"jsx": "react-jsx",
+		"strict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noFallthroughCasesInSwitch": true,
+<<<<<<< HEAD
+		"types": ["vite/client", "./worker-configuration.d.ts"]
+	},
+	"include": ["client", "server", "worker", "vite.config.ts"],
+=======
+		"types": ["vite/client"]
+	},
+	"include": ["client", "server", "vite.config.ts"],
+>>>>>>> 53c94df90 (init rivet support)
+	"references": [
+		{ "path": "../../packages/sync" },
+		{ "path": "../../packages/sync-core" },
+		{ "path": "../../packages/tldraw" },
+		{ "path": "../../packages/tlschema" }
+	]
+}
diff --git a/templates/sync-rivet/vite.config.ts b/templates/sync-rivet/vite.config.ts
new file mode 100644
index 000000000000..2d78a06c414f
--- /dev/null
+++ b/templates/sync-rivet/vite.config.ts
@@ -0,0 +1,15 @@
+import react from '@vitejs/plugin-react-swc'
+import { defineConfig } from 'vite'
+
+// https://vitejs.dev/config/
+export default defineConfig(() => {
+	return {
+		plugins: [
+			react(
+				/* EXCLUDE_FROM_TEMPLATE_EXPORT_START */
+				{ tsDecorators: true }
+				/* EXCLUDE_FROM_TEMPLATE_EXPORT_END */
+			),
+		],
+	}
+})
diff --git a/templates/sync-rivet/worker-configuration.d.ts b/templates/sync-rivet/worker-configuration.d.ts
new file mode 100644
index 000000000000..dc8c7482af0f
--- /dev/null
+++ b/templates/sync-rivet/worker-configuration.d.ts
@@ -0,0 +1,8202 @@
+/* eslint-disable */
+// Generated by Wrangler by running `wrangler types` (hash: d45bc36a51ae49551e7e1fdffb2538b0)
+// Runtime types generated with workerd@1.20250617.0 2025-05-08 nodejs_compat
+declare namespace Cloudflare {
+	interface Env {
+		TLDRAW_DURABLE_OBJECT: DurableObjectNamespace<import('./worker/worker').TldrawDurableObject>
+		TLDRAW_BUCKET: R2Bucket
+	}
+}
+interface Env extends Cloudflare.Env {}
+
+// Begin runtime types
+/*! *****************************************************************************
+Copyright (c) Cloudflare. All rights reserved.
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+MERCHANTABLITY OR NON-INFRINGEMENT.
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+/* eslint-disable */
+// noinspection JSUnusedGlobalSymbols
+declare var onmessage: never
+/**
+ * An abnormal event (called an exception) which occurs as a result of calling a method or accessing a property of a web API.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DOMException)
+ */
+declare class DOMException extends Error {
+	constructor(message?: string, name?: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/DOMException/message) */
+	readonly message: string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/DOMException/name) */
+	readonly name: string
+	/**
+	 * @deprecated
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/DOMException/code)
+	 */
+	readonly code: number
+	static readonly INDEX_SIZE_ERR: number
+	static readonly DOMSTRING_SIZE_ERR: number
+	static readonly HIERARCHY_REQUEST_ERR: number
+	static readonly WRONG_DOCUMENT_ERR: number
+	static readonly INVALID_CHARACTER_ERR: number
+	static readonly NO_DATA_ALLOWED_ERR: number
+	static readonly NO_MODIFICATION_ALLOWED_ERR: number
+	static readonly NOT_FOUND_ERR: number
+	static readonly NOT_SUPPORTED_ERR: number
+	static readonly INUSE_ATTRIBUTE_ERR: number
+	static readonly INVALID_STATE_ERR: number
+	static readonly SYNTAX_ERR: number
+	static readonly INVALID_MODIFICATION_ERR: number
+	static readonly NAMESPACE_ERR: number
+	static readonly INVALID_ACCESS_ERR: number
+	static readonly VALIDATION_ERR: number
+	static readonly TYPE_MISMATCH_ERR: number
+	static readonly SECURITY_ERR: number
+	static readonly NETWORK_ERR: number
+	static readonly ABORT_ERR: number
+	static readonly URL_MISMATCH_ERR: number
+	static readonly QUOTA_EXCEEDED_ERR: number
+	static readonly TIMEOUT_ERR: number
+	static readonly INVALID_NODE_TYPE_ERR: number
+	static readonly DATA_CLONE_ERR: number
+	get stack(): any
+	set stack(value: any)
+}
+type WorkerGlobalScopeEventMap = {
+	fetch: FetchEvent
+	scheduled: ScheduledEvent
+	queue: QueueEvent
+	unhandledrejection: PromiseRejectionEvent
+	rejectionhandled: PromiseRejectionEvent
+}
+declare abstract class WorkerGlobalScope extends EventTarget<WorkerGlobalScopeEventMap> {
+	EventTarget: typeof EventTarget
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console) */
+interface Console {
+	'assert'(condition?: boolean, ...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/clear_static) */
+	clear(): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/count_static) */
+	count(label?: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/countReset_static) */
+	countReset(label?: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/debug_static) */
+	debug(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/dir_static) */
+	dir(item?: any, options?: any): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/dirxml_static) */
+	dirxml(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/error_static) */
+	error(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/group_static) */
+	group(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/groupCollapsed_static) */
+	groupCollapsed(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/groupEnd_static) */
+	groupEnd(): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/info_static) */
+	info(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/log_static) */
+	log(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/table_static) */
+	table(tabularData?: any, properties?: string[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/time_static) */
+	time(label?: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/timeEnd_static) */
+	timeEnd(label?: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/timeLog_static) */
+	timeLog(label?: string, ...data: any[]): void
+	timeStamp(label?: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/trace_static) */
+	trace(...data: any[]): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/warn_static) */
+	warn(...data: any[]): void
+}
+declare const console: Console
+type BufferSource = ArrayBufferView | ArrayBuffer
+type TypedArray =
+	| Int8Array
+	| Uint8Array
+	| Uint8ClampedArray
+	| Int16Array
+	| Uint16Array
+	| Int32Array
+	| Uint32Array
+	| Float32Array
+	| Float64Array
+	| BigInt64Array
+	| BigUint64Array
+declare namespace WebAssembly {
+	class CompileError extends Error {
+		constructor(message?: string)
+	}
+	class RuntimeError extends Error {
+		constructor(message?: string)
+	}
+	type ValueType = 'anyfunc' | 'externref' | 'f32' | 'f64' | 'i32' | 'i64' | 'v128'
+	interface GlobalDescriptor {
+		value: ValueType
+		mutable?: boolean
+	}
+	class Global {
+		constructor(descriptor: GlobalDescriptor, value?: any)
+		value: any
+		valueOf(): any
+	}
+	type ImportValue = ExportValue | number
+	type ModuleImports = Record<string, ImportValue>
+	type Imports = Record<string, ModuleImports>
+	type ExportValue = Function | Global | Memory | Table
+	type Exports = Record<string, ExportValue>
+	class Instance {
+		constructor(module: Module, imports?: Imports)
+		readonly exports: Exports
+	}
+	interface MemoryDescriptor {
+		initial: number
+		maximum?: number
+		shared?: boolean
+	}
+	class Memory {
+		constructor(descriptor: MemoryDescriptor)
+		readonly buffer: ArrayBuffer
+		grow(delta: number): number
+	}
+	type ImportExportKind = 'function' | 'global' | 'memory' | 'table'
+	interface ModuleExportDescriptor {
+		kind: ImportExportKind
+		name: string
+	}
+	interface ModuleImportDescriptor {
+		kind: ImportExportKind
+		module: string
+		name: string
+	}
+	abstract class Module {
+		static customSections(module: Module, sectionName: string): ArrayBuffer[]
+		static exports(module: Module): ModuleExportDescriptor[]
+		static imports(module: Module): ModuleImportDescriptor[]
+	}
+	type TableKind = 'anyfunc' | 'externref'
+	interface TableDescriptor {
+		element: TableKind
+		initial: number
+		maximum?: number
+	}
+	class Table {
+		constructor(descriptor: TableDescriptor, value?: any)
+		readonly length: number
+		get(index: number): any
+		grow(delta: number, value?: any): number
+		set(index: number, value?: any): void
+	}
+	function instantiate(module: Module, imports?: Imports): Promise<Instance>
+	function validate(bytes: BufferSource): boolean
+}
+/**
+ * This ServiceWorker API interface represents the global execution context of a service worker.
+ * Available only in secure contexts.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ServiceWorkerGlobalScope)
+ */
+interface ServiceWorkerGlobalScope extends WorkerGlobalScope {
+	DOMException: typeof DOMException
+	WorkerGlobalScope: typeof WorkerGlobalScope
+	btoa(data: string): string
+	atob(data: string): string
+	setTimeout(callback: (...args: any[]) => void, msDelay?: number): number
+	setTimeout<Args extends any[]>(
+		callback: (...args: Args) => void,
+		msDelay?: number,
+		...args: Args
+	): number
+	clearTimeout(timeoutId: number | null): void
+	setInterval(callback: (...args: any[]) => void, msDelay?: number): number
+	setInterval<Args extends any[]>(
+		callback: (...args: Args) => void,
+		msDelay?: number,
+		...args: Args
+	): number
+	clearInterval(timeoutId: number | null): void
+	queueMicrotask(task: Function): void
+	structuredClone<T>(value: T, options?: StructuredSerializeOptions): T
+	reportError(error: any): void
+	fetch(input: RequestInfo | URL, init?: RequestInit<RequestInitCfProperties>): Promise<Response>
+	self: ServiceWorkerGlobalScope
+	crypto: Crypto
+	caches: CacheStorage
+	scheduler: Scheduler
+	performance: Performance
+	Cloudflare: Cloudflare
+	readonly origin: string
+	Event: typeof Event
+	ExtendableEvent: typeof ExtendableEvent
+	CustomEvent: typeof CustomEvent
+	PromiseRejectionEvent: typeof PromiseRejectionEvent
+	FetchEvent: typeof FetchEvent
+	TailEvent: typeof TailEvent
+	TraceEvent: typeof TailEvent
+	ScheduledEvent: typeof ScheduledEvent
+	MessageEvent: typeof MessageEvent
+	CloseEvent: typeof CloseEvent
+	ReadableStreamDefaultReader: typeof ReadableStreamDefaultReader
+	ReadableStreamBYOBReader: typeof ReadableStreamBYOBReader
+	ReadableStream: typeof ReadableStream
+	WritableStream: typeof WritableStream
+	WritableStreamDefaultWriter: typeof WritableStreamDefaultWriter
+	TransformStream: typeof TransformStream
+	ByteLengthQueuingStrategy: typeof ByteLengthQueuingStrategy
+	CountQueuingStrategy: typeof CountQueuingStrategy
+	ErrorEvent: typeof ErrorEvent
+	EventSource: typeof EventSource
+	ReadableStreamBYOBRequest: typeof ReadableStreamBYOBRequest
+	ReadableStreamDefaultController: typeof ReadableStreamDefaultController
+	ReadableByteStreamController: typeof ReadableByteStreamController
+	WritableStreamDefaultController: typeof WritableStreamDefaultController
+	TransformStreamDefaultController: typeof TransformStreamDefaultController
+	CompressionStream: typeof CompressionStream
+	DecompressionStream: typeof DecompressionStream
+	TextEncoderStream: typeof TextEncoderStream
+	TextDecoderStream: typeof TextDecoderStream
+	Headers: typeof Headers
+	Body: typeof Body
+	Request: typeof Request
+	Response: typeof Response
+	WebSocket: typeof WebSocket
+	WebSocketPair: typeof WebSocketPair
+	WebSocketRequestResponsePair: typeof WebSocketRequestResponsePair
+	AbortController: typeof AbortController
+	AbortSignal: typeof AbortSignal
+	TextDecoder: typeof TextDecoder
+	TextEncoder: typeof TextEncoder
+	navigator: Navigator
+	Navigator: typeof Navigator
+	URL: typeof URL
+	URLSearchParams: typeof URLSearchParams
+	URLPattern: typeof URLPattern
+	Blob: typeof Blob
+	File: typeof File
+	FormData: typeof FormData
+	Crypto: typeof Crypto
+	SubtleCrypto: typeof SubtleCrypto
+	CryptoKey: typeof CryptoKey
+	CacheStorage: typeof CacheStorage
+	Cache: typeof Cache
+	FixedLengthStream: typeof FixedLengthStream
+	IdentityTransformStream: typeof IdentityTransformStream
+	HTMLRewriter: typeof HTMLRewriter
+}
+declare function addEventListener<Type extends keyof WorkerGlobalScopeEventMap>(
+	type: Type,
+	handler: EventListenerOrEventListenerObject<WorkerGlobalScopeEventMap[Type]>,
+	options?: EventTargetAddEventListenerOptions | boolean
+): void
+declare function removeEventListener<Type extends keyof WorkerGlobalScopeEventMap>(
+	type: Type,
+	handler: EventListenerOrEventListenerObject<WorkerGlobalScopeEventMap[Type]>,
+	options?: EventTargetEventListenerOptions | boolean
+): void
+/**
+ * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/dispatchEvent)
+ */
+declare function dispatchEvent(
+	event: WorkerGlobalScopeEventMap[keyof WorkerGlobalScopeEventMap]
+): boolean
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/btoa) */
+declare function btoa(data: string): string
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/atob) */
+declare function atob(data: string): string
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/setTimeout) */
+declare function setTimeout(callback: (...args: any[]) => void, msDelay?: number): number
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/setTimeout) */
+declare function setTimeout<Args extends any[]>(
+	callback: (...args: Args) => void,
+	msDelay?: number,
+	...args: Args
+): number
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/clearTimeout) */
+declare function clearTimeout(timeoutId: number | null): void
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/setInterval) */
+declare function setInterval(callback: (...args: any[]) => void, msDelay?: number): number
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/setInterval) */
+declare function setInterval<Args extends any[]>(
+	callback: (...args: Args) => void,
+	msDelay?: number,
+	...args: Args
+): number
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/clearInterval) */
+declare function clearInterval(timeoutId: number | null): void
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/queueMicrotask) */
+declare function queueMicrotask(task: Function): void
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/structuredClone) */
+declare function structuredClone<T>(value: T, options?: StructuredSerializeOptions): T
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/reportError) */
+declare function reportError(error: any): void
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Window/fetch) */
+declare function fetch(
+	input: RequestInfo | URL,
+	init?: RequestInit<RequestInitCfProperties>
+): Promise<Response>
+declare const self: ServiceWorkerGlobalScope
+/**
+ * The Web Crypto API provides a set of low-level functions for common cryptographic tasks.
+ * The Workers runtime implements the full surface of this API, but with some differences in
+ * the [supported algorithms](https://developers.cloudflare.com/workers/runtime-apis/web-crypto/#supported-algorithms)
+ * compared to those implemented in most browsers.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/web-crypto/)
+ */
+declare const crypto: Crypto
+/**
+ * The Cache API allows fine grained control of reading and writing from the Cloudflare global network cache.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/cache/)
+ */
+declare const caches: CacheStorage
+declare const scheduler: Scheduler
+/**
+ * The Workers runtime supports a subset of the Performance API, used to measure timing and performance,
+ * as well as timing of subrequests and other operations.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/performance/)
+ */
+declare const performance: Performance
+declare const Cloudflare: Cloudflare
+declare const origin: string
+declare const navigator: Navigator
+interface TestController {}
+interface ExecutionContext {
+	waitUntil(promise: Promise<any>): void
+	passThroughOnException(): void
+	props: any
+}
+type ExportedHandlerFetchHandler<Env = unknown, CfHostMetadata = unknown> = (
+	request: Request<CfHostMetadata, IncomingRequestCfProperties<CfHostMetadata>>,
+	env: Env,
+	ctx: ExecutionContext
+) => Response | Promise<Response>
+type ExportedHandlerTailHandler<Env = unknown> = (
+	events: TraceItem[],
+	env: Env,
+	ctx: ExecutionContext
+) => void | Promise<void>
+type ExportedHandlerTraceHandler<Env = unknown> = (
+	traces: TraceItem[],
+	env: Env,
+	ctx: ExecutionContext
+) => void | Promise<void>
+type ExportedHandlerTailStreamHandler<Env = unknown> = (
+	event: TailStream.TailEvent,
+	env: Env,
+	ctx: ExecutionContext
+) => TailStream.TailEventHandlerType | Promise<TailStream.TailEventHandlerType>
+type ExportedHandlerScheduledHandler<Env = unknown> = (
+	controller: ScheduledController,
+	env: Env,
+	ctx: ExecutionContext
+) => void | Promise<void>
+type ExportedHandlerQueueHandler<Env = unknown, Message = unknown> = (
+	batch: MessageBatch<Message>,
+	env: Env,
+	ctx: ExecutionContext
+) => void | Promise<void>
+type ExportedHandlerTestHandler<Env = unknown> = (
+	controller: TestController,
+	env: Env,
+	ctx: ExecutionContext
+) => void | Promise<void>
+interface ExportedHandler<Env = unknown, QueueHandlerMessage = unknown, CfHostMetadata = unknown> {
+	fetch?: ExportedHandlerFetchHandler<Env, CfHostMetadata>
+	tail?: ExportedHandlerTailHandler<Env>
+	trace?: ExportedHandlerTraceHandler<Env>
+	tailStream?: ExportedHandlerTailStreamHandler<Env>
+	scheduled?: ExportedHandlerScheduledHandler<Env>
+	test?: ExportedHandlerTestHandler<Env>
+	email?: EmailExportedHandler<Env>
+	queue?: ExportedHandlerQueueHandler<Env, QueueHandlerMessage>
+}
+interface StructuredSerializeOptions {
+	transfer?: any[]
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent) */
+declare abstract class PromiseRejectionEvent extends Event {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent/promise) */
+	readonly promise: Promise<any>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent/reason) */
+	readonly reason: any
+}
+declare abstract class Navigator {
+	sendBeacon(
+		url: string,
+		body?:
+			| ReadableStream
+			| string
+			| (ArrayBuffer | ArrayBufferView)
+			| Blob
+			| FormData
+			| URLSearchParams
+			| URLSearchParams
+	): boolean
+	readonly userAgent: string
+	readonly hardwareConcurrency: number
+}
+/**
+ * The Workers runtime supports a subset of the Performance API, used to measure timing and performance,
+ * as well as timing of subrequests and other operations.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/performance/)
+ */
+interface Performance {
+	/* [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/performance/#performancetimeorigin) */
+	readonly timeOrigin: number
+	/* [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/performance/#performancenow) */
+	now(): number
+}
+interface AlarmInvocationInfo {
+	readonly isRetry: boolean
+	readonly retryCount: number
+}
+interface Cloudflare {
+	readonly compatibilityFlags: Record<string, boolean>
+}
+interface DurableObject {
+	fetch(request: Request): Response | Promise<Response>
+	alarm?(alarmInfo?: AlarmInvocationInfo): void | Promise<void>
+	webSocketMessage?(ws: WebSocket, message: string | ArrayBuffer): void | Promise<void>
+	webSocketClose?(
+		ws: WebSocket,
+		code: number,
+		reason: string,
+		wasClean: boolean
+	): void | Promise<void>
+	webSocketError?(ws: WebSocket, error: unknown): void | Promise<void>
+}
+type DurableObjectStub<T extends Rpc.DurableObjectBranded | undefined = undefined> = Fetcher<
+	T,
+	'alarm' | 'webSocketMessage' | 'webSocketClose' | 'webSocketError'
+> & {
+	readonly id: DurableObjectId
+	readonly name?: string
+}
+interface DurableObjectId {
+	toString(): string
+	equals(other: DurableObjectId): boolean
+	readonly name?: string
+}
+interface DurableObjectNamespace<T extends Rpc.DurableObjectBranded | undefined = undefined> {
+	newUniqueId(options?: DurableObjectNamespaceNewUniqueIdOptions): DurableObjectId
+	idFromName(name: string): DurableObjectId
+	idFromString(id: string): DurableObjectId
+	get(
+		id: DurableObjectId,
+		options?: DurableObjectNamespaceGetDurableObjectOptions
+	): DurableObjectStub<T>
+	jurisdiction(jurisdiction: DurableObjectJurisdiction): DurableObjectNamespace<T>
+}
+type DurableObjectJurisdiction = 'eu' | 'fedramp' | 'fedramp-high'
+interface DurableObjectNamespaceNewUniqueIdOptions {
+	jurisdiction?: DurableObjectJurisdiction
+}
+type DurableObjectLocationHint =
+	| 'wnam'
+	| 'enam'
+	| 'sam'
+	| 'weur'
+	| 'eeur'
+	| 'apac'
+	| 'oc'
+	| 'afr'
+	| 'me'
+interface DurableObjectNamespaceGetDurableObjectOptions {
+	locationHint?: DurableObjectLocationHint
+}
+interface DurableObjectState {
+	waitUntil(promise: Promise<any>): void
+	readonly id: DurableObjectId
+	readonly storage: DurableObjectStorage
+	container?: Container
+	blockConcurrencyWhile<T>(callback: () => Promise<T>): Promise<T>
+	acceptWebSocket(ws: WebSocket, tags?: string[]): void
+	getWebSockets(tag?: string): WebSocket[]
+	setWebSocketAutoResponse(maybeReqResp?: WebSocketRequestResponsePair): void
+	getWebSocketAutoResponse(): WebSocketRequestResponsePair | null
+	getWebSocketAutoResponseTimestamp(ws: WebSocket): Date | null
+	setHibernatableWebSocketEventTimeout(timeoutMs?: number): void
+	getHibernatableWebSocketEventTimeout(): number | null
+	getTags(ws: WebSocket): string[]
+	abort(reason?: string): void
+}
+interface DurableObjectTransaction {
+	get<T = unknown>(key: string, options?: DurableObjectGetOptions): Promise<T | undefined>
+	get<T = unknown>(keys: string[], options?: DurableObjectGetOptions): Promise<Map<string, T>>
+	list<T = unknown>(options?: DurableObjectListOptions): Promise<Map<string, T>>
+	put<T>(key: string, value: T, options?: DurableObjectPutOptions): Promise<void>
+	put<T>(entries: Record<string, T>, options?: DurableObjectPutOptions): Promise<void>
+	delete(key: string, options?: DurableObjectPutOptions): Promise<boolean>
+	delete(keys: string[], options?: DurableObjectPutOptions): Promise<number>
+	rollback(): void
+	getAlarm(options?: DurableObjectGetAlarmOptions): Promise<number | null>
+	setAlarm(scheduledTime: number | Date, options?: DurableObjectSetAlarmOptions): Promise<void>
+	deleteAlarm(options?: DurableObjectSetAlarmOptions): Promise<void>
+}
+interface DurableObjectStorage {
+	get<T = unknown>(key: string, options?: DurableObjectGetOptions): Promise<T | undefined>
+	get<T = unknown>(keys: string[], options?: DurableObjectGetOptions): Promise<Map<string, T>>
+	list<T = unknown>(options?: DurableObjectListOptions): Promise<Map<string, T>>
+	put<T>(key: string, value: T, options?: DurableObjectPutOptions): Promise<void>
+	put<T>(entries: Record<string, T>, options?: DurableObjectPutOptions): Promise<void>
+	delete(key: string, options?: DurableObjectPutOptions): Promise<boolean>
+	delete(keys: string[], options?: DurableObjectPutOptions): Promise<number>
+	deleteAll(options?: DurableObjectPutOptions): Promise<void>
+	transaction<T>(closure: (txn: DurableObjectTransaction) => Promise<T>): Promise<T>
+	getAlarm(options?: DurableObjectGetAlarmOptions): Promise<number | null>
+	setAlarm(scheduledTime: number | Date, options?: DurableObjectSetAlarmOptions): Promise<void>
+	deleteAlarm(options?: DurableObjectSetAlarmOptions): Promise<void>
+	sync(): Promise<void>
+	sql: SqlStorage
+	transactionSync<T>(closure: () => T): T
+	getCurrentBookmark(): Promise<string>
+	getBookmarkForTime(timestamp: number | Date): Promise<string>
+	onNextSessionRestoreBookmark(bookmark: string): Promise<string>
+}
+interface DurableObjectListOptions {
+	start?: string
+	startAfter?: string
+	end?: string
+	prefix?: string
+	reverse?: boolean
+	limit?: number
+	allowConcurrency?: boolean
+	noCache?: boolean
+}
+interface DurableObjectGetOptions {
+	allowConcurrency?: boolean
+	noCache?: boolean
+}
+interface DurableObjectGetAlarmOptions {
+	allowConcurrency?: boolean
+}
+interface DurableObjectPutOptions {
+	allowConcurrency?: boolean
+	allowUnconfirmed?: boolean
+	noCache?: boolean
+}
+interface DurableObjectSetAlarmOptions {
+	allowConcurrency?: boolean
+	allowUnconfirmed?: boolean
+}
+declare class WebSocketRequestResponsePair {
+	constructor(request: string, response: string)
+	get request(): string
+	get response(): string
+}
+interface AnalyticsEngineDataset {
+	writeDataPoint(event?: AnalyticsEngineDataPoint): void
+}
+interface AnalyticsEngineDataPoint {
+	indexes?: ((ArrayBuffer | string) | null)[]
+	doubles?: number[]
+	blobs?: ((ArrayBuffer | string) | null)[]
+}
+/**
+ * An event which takes place in the DOM.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event)
+ */
+declare class Event {
+	constructor(type: string, init?: EventInit)
+	/**
+	 * Returns the type of event, e.g. "click", "hashchange", or "submit".
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/type)
+	 */
+	get type(): string
+	/**
+	 * Returns the event's phase, which is one of NONE, CAPTURING_PHASE, AT_TARGET, and BUBBLING_PHASE.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/eventPhase)
+	 */
+	get eventPhase(): number
+	/**
+	 * Returns true or false depending on how event was initialized. True if event invokes listeners past a ShadowRoot node that is the root of its target, and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/composed)
+	 */
+	get composed(): boolean
+	/**
+	 * Returns true or false depending on how event was initialized. True if event goes through its target's ancestors in reverse tree order, and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/bubbles)
+	 */
+	get bubbles(): boolean
+	/**
+	 * Returns true or false depending on how event was initialized. Its return value does not always carry meaning, but true can indicate that part of the operation during which event was dispatched, can be canceled by invoking the preventDefault() method.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/cancelable)
+	 */
+	get cancelable(): boolean
+	/**
+	 * Returns true if preventDefault() was invoked successfully to indicate cancelation, and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/defaultPrevented)
+	 */
+	get defaultPrevented(): boolean
+	/**
+	 * @deprecated
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/returnValue)
+	 */
+	get returnValue(): boolean
+	/**
+	 * Returns the object whose event listener's callback is currently being invoked.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/currentTarget)
+	 */
+	get currentTarget(): EventTarget | undefined
+	/**
+	 * Returns the object to which event is dispatched (its target).
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/target)
+	 */
+	get target(): EventTarget | undefined
+	/**
+	 * @deprecated
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/srcElement)
+	 */
+	get srcElement(): EventTarget | undefined
+	/**
+	 * Returns the event's timestamp as the number of milliseconds measured relative to the time origin.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/timeStamp)
+	 */
+	get timeStamp(): number
+	/**
+	 * Returns true if event was dispatched by the user agent, and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/isTrusted)
+	 */
+	get isTrusted(): boolean
+	/**
+	 * @deprecated
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/cancelBubble)
+	 */
+	get cancelBubble(): boolean
+	/**
+	 * @deprecated
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/cancelBubble)
+	 */
+	set cancelBubble(value: boolean)
+	/**
+	 * Invoking this method prevents event from reaching any registered event listeners after the current one finishes running and, when dispatched in a tree, also prevents event from reaching any other objects.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/stopImmediatePropagation)
+	 */
+	stopImmediatePropagation(): void
+	/**
+	 * If invoked when the cancelable attribute value is true, and while executing a listener for the event with passive set to false, signals to the operation that caused event to be dispatched that it needs to be canceled.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/preventDefault)
+	 */
+	preventDefault(): void
+	/**
+	 * When dispatched in a tree, invoking this method prevents event from reaching any objects other than the current object.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/stopPropagation)
+	 */
+	stopPropagation(): void
+	/**
+	 * Returns the invocation target objects of event's path (objects on which listeners will be invoked), except for any nodes in shadow trees of which the shadow root's mode is "closed" that are not reachable from event's currentTarget.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Event/composedPath)
+	 */
+	composedPath(): EventTarget[]
+	static readonly NONE: number
+	static readonly CAPTURING_PHASE: number
+	static readonly AT_TARGET: number
+	static readonly BUBBLING_PHASE: number
+}
+interface EventInit {
+	bubbles?: boolean
+	cancelable?: boolean
+	composed?: boolean
+}
+type EventListener<EventType extends Event = Event> = (event: EventType) => void
+interface EventListenerObject<EventType extends Event = Event> {
+	handleEvent(event: EventType): void
+}
+type EventListenerOrEventListenerObject<EventType extends Event = Event> =
+	| EventListener<EventType>
+	| EventListenerObject<EventType>
+/**
+ * EventTarget is a DOM interface implemented by objects that can receive events and may have listeners for them.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget)
+ */
+declare class EventTarget<EventMap extends Record<string, Event> = Record<string, Event>> {
+	constructor()
+	/**
+	 * Appends an event listener for events whose type attribute value is type. The callback argument sets the callback that will be invoked when the event is dispatched.
+	 *
+	 * The options argument sets listener-specific options. For compatibility this can be a boolean, in which case the method behaves exactly as if the value was specified as options's capture.
+	 *
+	 * When set to true, options's capture prevents callback from being invoked when the event's eventPhase attribute value is BUBBLING_PHASE. When false (or not present), callback will not be invoked when event's eventPhase attribute value is CAPTURING_PHASE. Either way, callback will be invoked if event's eventPhase attribute value is AT_TARGET.
+	 *
+	 * When set to true, options's passive indicates that the callback will not cancel the event by invoking preventDefault(). This is used to enable performance optimizations described in § 2.8 Observing event listeners.
+	 *
+	 * When set to true, options's once indicates that the callback will only be invoked once after which the event listener will be removed.
+	 *
+	 * If an AbortSignal is passed for options's signal, then the event listener will be removed when signal is aborted.
+	 *
+	 * The event listener is appended to target's event listener list and is not appended if it has the same type, callback, and capture.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/addEventListener)
+	 */
+	addEventListener<Type extends keyof EventMap>(
+		type: Type,
+		handler: EventListenerOrEventListenerObject<EventMap[Type]>,
+		options?: EventTargetAddEventListenerOptions | boolean
+	): void
+	/**
+	 * Removes the event listener in target's event listener list with the same type, callback, and options.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/removeEventListener)
+	 */
+	removeEventListener<Type extends keyof EventMap>(
+		type: Type,
+		handler: EventListenerOrEventListenerObject<EventMap[Type]>,
+		options?: EventTargetEventListenerOptions | boolean
+	): void
+	/**
+	 * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventTarget/dispatchEvent)
+	 */
+	dispatchEvent(event: EventMap[keyof EventMap]): boolean
+}
+interface EventTargetEventListenerOptions {
+	capture?: boolean
+}
+interface EventTargetAddEventListenerOptions {
+	capture?: boolean
+	passive?: boolean
+	once?: boolean
+	signal?: AbortSignal
+}
+interface EventTargetHandlerObject {
+	handleEvent: (event: Event) => any | undefined
+}
+/**
+ * A controller object that allows you to abort one or more DOM requests as and when desired.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortController)
+ */
+declare class AbortController {
+	constructor()
+	/**
+	 * Returns the AbortSignal object associated with this object.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortController/signal)
+	 */
+	get signal(): AbortSignal
+	/**
+	 * Invoking this method will set this object's AbortSignal's aborted flag and signal to any observers that the associated activity is to be aborted.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortController/abort)
+	 */
+	abort(reason?: any): void
+}
+/**
+ * A signal object that allows you to communicate with a DOM request (such as a Fetch) and abort it if required via an AbortController object.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal)
+ */
+declare abstract class AbortSignal extends EventTarget {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/abort_static) */
+	static abort(reason?: any): AbortSignal
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/timeout_static) */
+	static timeout(delay: number): AbortSignal
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/any_static) */
+	static any(signals: AbortSignal[]): AbortSignal
+	/**
+	 * Returns true if this AbortSignal's AbortController has signaled to abort, and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/aborted)
+	 */
+	get aborted(): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/reason) */
+	get reason(): any
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/abort_event) */
+	get onabort(): any | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/abort_event) */
+	set onabort(value: any | null)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/AbortSignal/throwIfAborted) */
+	throwIfAborted(): void
+}
+interface Scheduler {
+	wait(delay: number, maybeOptions?: SchedulerWaitOptions): Promise<void>
+}
+interface SchedulerWaitOptions {
+	signal?: AbortSignal
+}
+/**
+ * Extends the lifetime of the install and activate events dispatched on the global scope as part of the service worker lifecycle. This ensures that any functional events (like FetchEvent) are not dispatched until it upgrades database schemas and deletes the outdated cache entries.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ExtendableEvent)
+ */
+declare abstract class ExtendableEvent extends Event {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ExtendableEvent/waitUntil) */
+	waitUntil(promise: Promise<any>): void
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CustomEvent) */
+declare class CustomEvent<T = any> extends Event {
+	constructor(type: string, init?: CustomEventCustomEventInit)
+	/**
+	 * Returns any custom data event was created with. Typically used for synthetic events.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CustomEvent/detail)
+	 */
+	get detail(): T
+}
+interface CustomEventCustomEventInit {
+	bubbles?: boolean
+	cancelable?: boolean
+	composed?: boolean
+	detail?: any
+}
+/**
+ * A file-like object of immutable, raw data. Blobs represent data that isn't necessarily in a JavaScript-native format. The File interface is based on Blob, inheriting blob functionality and expanding it to support files on the user's system.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob)
+ */
+declare class Blob {
+	constructor(type?: ((ArrayBuffer | ArrayBufferView) | string | Blob)[], options?: BlobOptions)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/size) */
+	get size(): number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/type) */
+	get type(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/slice) */
+	slice(start?: number, end?: number, type?: string): Blob
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/arrayBuffer) */
+	arrayBuffer(): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/bytes) */
+	bytes(): Promise<Uint8Array>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/text) */
+	text(): Promise<string>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Blob/stream) */
+	stream(): ReadableStream
+}
+interface BlobOptions {
+	type?: string
+}
+/**
+ * Provides information about files and allows JavaScript in a web page to access their content.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/File)
+ */
+declare class File extends Blob {
+	constructor(
+		bits: ((ArrayBuffer | ArrayBufferView) | string | Blob)[] | undefined,
+		name: string,
+		options?: FileOptions
+	)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/File/name) */
+	get name(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/File/lastModified) */
+	get lastModified(): number
+}
+interface FileOptions {
+	type?: string
+	lastModified?: number
+}
+/**
+ * The Cache API allows fine grained control of reading and writing from the Cloudflare global network cache.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/cache/)
+ */
+declare abstract class CacheStorage {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CacheStorage/open) */
+	open(cacheName: string): Promise<Cache>
+	readonly default: Cache
+}
+/**
+ * The Cache API allows fine grained control of reading and writing from the Cloudflare global network cache.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/cache/)
+ */
+declare abstract class Cache {
+	/* [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/cache/#delete) */
+	delete(request: RequestInfo | URL, options?: CacheQueryOptions): Promise<boolean>
+	/* [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/cache/#match) */
+	match(request: RequestInfo | URL, options?: CacheQueryOptions): Promise<Response | undefined>
+	/* [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/cache/#put) */
+	put(request: RequestInfo | URL, response: Response): Promise<void>
+}
+interface CacheQueryOptions {
+	ignoreMethod?: boolean
+}
+/**
+ * The Web Crypto API provides a set of low-level functions for common cryptographic tasks.
+ * The Workers runtime implements the full surface of this API, but with some differences in
+ * the [supported algorithms](https://developers.cloudflare.com/workers/runtime-apis/web-crypto/#supported-algorithms)
+ * compared to those implemented in most browsers.
+ *
+ * [Cloudflare Docs Reference](https://developers.cloudflare.com/workers/runtime-apis/web-crypto/)
+ */
+declare abstract class Crypto {
+	/**
+	 * Available only in secure contexts.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Crypto/subtle)
+	 */
+	get subtle(): SubtleCrypto
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Crypto/getRandomValues) */
+	getRandomValues<
+		T extends
+			| Int8Array
+			| Uint8Array
+			| Int16Array
+			| Uint16Array
+			| Int32Array
+			| Uint32Array
+			| BigInt64Array
+			| BigUint64Array,
+	>(buffer: T): T
+	/**
+	 * Available only in secure contexts.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Crypto/randomUUID)
+	 */
+	randomUUID(): string
+	DigestStream: typeof DigestStream
+}
+/**
+ * This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto).
+ * Available only in secure contexts.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto)
+ */
+declare abstract class SubtleCrypto {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/encrypt) */
+	encrypt(
+		algorithm: string | SubtleCryptoEncryptAlgorithm,
+		key: CryptoKey,
+		plainText: ArrayBuffer | ArrayBufferView
+	): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/decrypt) */
+	decrypt(
+		algorithm: string | SubtleCryptoEncryptAlgorithm,
+		key: CryptoKey,
+		cipherText: ArrayBuffer | ArrayBufferView
+	): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/sign) */
+	sign(
+		algorithm: string | SubtleCryptoSignAlgorithm,
+		key: CryptoKey,
+		data: ArrayBuffer | ArrayBufferView
+	): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/verify) */
+	verify(
+		algorithm: string | SubtleCryptoSignAlgorithm,
+		key: CryptoKey,
+		signature: ArrayBuffer | ArrayBufferView,
+		data: ArrayBuffer | ArrayBufferView
+	): Promise<boolean>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/digest) */
+	digest(
+		algorithm: string | SubtleCryptoHashAlgorithm,
+		data: ArrayBuffer | ArrayBufferView
+	): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/generateKey) */
+	generateKey(
+		algorithm: string | SubtleCryptoGenerateKeyAlgorithm,
+		extractable: boolean,
+		keyUsages: string[]
+	): Promise<CryptoKey | CryptoKeyPair>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/deriveKey) */
+	deriveKey(
+		algorithm: string | SubtleCryptoDeriveKeyAlgorithm,
+		baseKey: CryptoKey,
+		derivedKeyAlgorithm: string | SubtleCryptoImportKeyAlgorithm,
+		extractable: boolean,
+		keyUsages: string[]
+	): Promise<CryptoKey>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/deriveBits) */
+	deriveBits(
+		algorithm: string | SubtleCryptoDeriveKeyAlgorithm,
+		baseKey: CryptoKey,
+		length?: number | null
+	): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/importKey) */
+	importKey(
+		format: string,
+		keyData: (ArrayBuffer | ArrayBufferView) | JsonWebKey,
+		algorithm: string | SubtleCryptoImportKeyAlgorithm,
+		extractable: boolean,
+		keyUsages: string[]
+	): Promise<CryptoKey>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/exportKey) */
+	exportKey(format: string, key: CryptoKey): Promise<ArrayBuffer | JsonWebKey>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/wrapKey) */
+	wrapKey(
+		format: string,
+		key: CryptoKey,
+		wrappingKey: CryptoKey,
+		wrapAlgorithm: string | SubtleCryptoEncryptAlgorithm
+	): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/SubtleCrypto/unwrapKey) */
+	unwrapKey(
+		format: string,
+		wrappedKey: ArrayBuffer | ArrayBufferView,
+		unwrappingKey: CryptoKey,
+		unwrapAlgorithm: string | SubtleCryptoEncryptAlgorithm,
+		unwrappedKeyAlgorithm: string | SubtleCryptoImportKeyAlgorithm,
+		extractable: boolean,
+		keyUsages: string[]
+	): Promise<CryptoKey>
+	timingSafeEqual(a: ArrayBuffer | ArrayBufferView, b: ArrayBuffer | ArrayBufferView): boolean
+}
+/**
+ * The CryptoKey dictionary of the Web Crypto API represents a cryptographic key.
+ * Available only in secure contexts.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CryptoKey)
+ */
+declare abstract class CryptoKey {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CryptoKey/type) */
+	readonly type: string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CryptoKey/extractable) */
+	readonly extractable: boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CryptoKey/algorithm) */
+	readonly algorithm:
+		| CryptoKeyKeyAlgorithm
+		| CryptoKeyAesKeyAlgorithm
+		| CryptoKeyHmacKeyAlgorithm
+		| CryptoKeyRsaKeyAlgorithm
+		| CryptoKeyEllipticKeyAlgorithm
+		| CryptoKeyArbitraryKeyAlgorithm
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CryptoKey/usages) */
+	readonly usages: string[]
+}
+interface CryptoKeyPair {
+	publicKey: CryptoKey
+	privateKey: CryptoKey
+}
+interface JsonWebKey {
+	kty: string
+	use?: string
+	key_ops?: string[]
+	alg?: string
+	ext?: boolean
+	crv?: string
+	x?: string
+	y?: string
+	d?: string
+	n?: string
+	e?: string
+	p?: string
+	q?: string
+	dp?: string
+	dq?: string
+	qi?: string
+	oth?: RsaOtherPrimesInfo[]
+	k?: string
+}
+interface RsaOtherPrimesInfo {
+	r?: string
+	d?: string
+	t?: string
+}
+interface SubtleCryptoDeriveKeyAlgorithm {
+	name: string
+	salt?: ArrayBuffer | ArrayBufferView
+	iterations?: number
+	hash?: string | SubtleCryptoHashAlgorithm
+	$public?: CryptoKey
+	info?: ArrayBuffer | ArrayBufferView
+}
+interface SubtleCryptoEncryptAlgorithm {
+	name: string
+	iv?: ArrayBuffer | ArrayBufferView
+	additionalData?: ArrayBuffer | ArrayBufferView
+	tagLength?: number
+	counter?: ArrayBuffer | ArrayBufferView
+	length?: number
+	label?: ArrayBuffer | ArrayBufferView
+}
+interface SubtleCryptoGenerateKeyAlgorithm {
+	name: string
+	hash?: string | SubtleCryptoHashAlgorithm
+	modulusLength?: number
+	publicExponent?: ArrayBuffer | ArrayBufferView
+	length?: number
+	namedCurve?: string
+}
+interface SubtleCryptoHashAlgorithm {
+	name: string
+}
+interface SubtleCryptoImportKeyAlgorithm {
+	name: string
+	hash?: string | SubtleCryptoHashAlgorithm
+	length?: number
+	namedCurve?: string
+	compressed?: boolean
+}
+interface SubtleCryptoSignAlgorithm {
+	name: string
+	hash?: string | SubtleCryptoHashAlgorithm
+	dataLength?: number
+	saltLength?: number
+}
+interface CryptoKeyKeyAlgorithm {
+	name: string
+}
+interface CryptoKeyAesKeyAlgorithm {
+	name: string
+	length: number
+}
+interface CryptoKeyHmacKeyAlgorithm {
+	name: string
+	hash: CryptoKeyKeyAlgorithm
+	length: number
+}
+interface CryptoKeyRsaKeyAlgorithm {
+	name: string
+	modulusLength: number
+	publicExponent: ArrayBuffer | ArrayBufferView
+	hash?: CryptoKeyKeyAlgorithm
+}
+interface CryptoKeyEllipticKeyAlgorithm {
+	name: string
+	namedCurve: string
+}
+interface CryptoKeyArbitraryKeyAlgorithm {
+	name: string
+	hash?: CryptoKeyKeyAlgorithm
+	namedCurve?: string
+	length?: number
+}
+declare class DigestStream extends WritableStream<ArrayBuffer | ArrayBufferView> {
+	constructor(algorithm: string | SubtleCryptoHashAlgorithm)
+	readonly digest: Promise<ArrayBuffer>
+	get bytesWritten(): number | bigint
+}
+/**
+ * A decoder for a specific method, that is a specific character encoding, like utf-8, iso-8859-2, koi8, cp1261, gbk, etc. A decoder takes a stream of bytes as input and emits a stream of code points. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextDecoder)
+ */
+declare class TextDecoder {
+	constructor(label?: string, options?: TextDecoderConstructorOptions)
+	/**
+	 * Returns the result of running encoding's decoder. The method can be invoked zero or more times with options's stream set to true, and then once without options's stream (or set to false), to process a fragmented input. If the invocation without options's stream (or set to false) has no input, it's clearest to omit both arguments.
+	 *
+	 * ```
+	 * var string = "", decoder = new TextDecoder(encoding), buffer;
+	 * while(buffer = next_chunk()) {
+	 *   string += decoder.decode(buffer, {stream:true});
+	 * }
+	 * string += decoder.decode(); // end-of-queue
+	 * ```
+	 *
+	 * If the error mode is "fatal" and encoding's decoder returns error, throws a TypeError.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextDecoder/decode)
+	 */
+	decode(input?: ArrayBuffer | ArrayBufferView, options?: TextDecoderDecodeOptions): string
+	get encoding(): string
+	get fatal(): boolean
+	get ignoreBOM(): boolean
+}
+/**
+ * TextEncoder takes a stream of code points as input and emits a stream of bytes. For a more scalable, non-native library, see StringView – a C-like representation of strings based on typed arrays.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextEncoder)
+ */
+declare class TextEncoder {
+	constructor()
+	/**
+	 * Returns the result of running UTF-8's encoder.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextEncoder/encode)
+	 */
+	encode(input?: string): Uint8Array
+	/**
+	 * Runs the UTF-8 encoder on source, stores the result of that operation into destination, and returns the progress made as an object wherein read is the number of converted code units of source and written is the number of bytes modified in destination.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextEncoder/encodeInto)
+	 */
+	encodeInto(input: string, buffer: ArrayBuffer | ArrayBufferView): TextEncoderEncodeIntoResult
+	get encoding(): string
+}
+interface TextDecoderConstructorOptions {
+	fatal: boolean
+	ignoreBOM: boolean
+}
+interface TextDecoderDecodeOptions {
+	stream: boolean
+}
+interface TextEncoderEncodeIntoResult {
+	read: number
+	written: number
+}
+/**
+ * Events providing information related to errors in scripts or in files.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent)
+ */
+declare class ErrorEvent extends Event {
+	constructor(type: string, init?: ErrorEventErrorEventInit)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent/filename) */
+	get filename(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent/message) */
+	get message(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent/lineno) */
+	get lineno(): number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent/colno) */
+	get colno(): number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ErrorEvent/error) */
+	get error(): any
+}
+interface ErrorEventErrorEventInit {
+	message?: string
+	filename?: string
+	lineno?: number
+	colno?: number
+	error?: any
+}
+/**
+ * Provides a way to easily construct a set of key/value pairs representing form fields and their values, which can then be easily sent using the XMLHttpRequest.send() method. It uses the same format a form would use if the encoding type were set to "multipart/form-data".
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData)
+ */
+declare class FormData {
+	constructor()
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/append) */
+	append(name: string, value: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/append) */
+	append(name: string, value: Blob, filename?: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/delete) */
+	delete(name: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/get) */
+	get(name: string): (File | string) | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/getAll) */
+	getAll(name: string): (File | string)[]
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/has) */
+	has(name: string): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/set) */
+	set(name: string, value: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FormData/set) */
+	set(name: string, value: Blob, filename?: string): void
+	/* Returns an array of key, value pairs for every entry in the list. */
+	entries(): IterableIterator<[key: string, value: File | string]>
+	/* Returns a list of keys in the list. */
+	keys(): IterableIterator<string>
+	/* Returns a list of values in the list. */
+	values(): IterableIterator<File | string>
+	forEach<This = unknown>(
+		callback: (this: This, value: File | string, key: string, parent: FormData) => void,
+		thisArg?: This
+	): void
+	[Symbol.iterator](): IterableIterator<[key: string, value: File | string]>
+}
+interface ContentOptions {
+	html?: boolean
+}
+declare class HTMLRewriter {
+	constructor()
+	on(selector: string, handlers: HTMLRewriterElementContentHandlers): HTMLRewriter
+	onDocument(handlers: HTMLRewriterDocumentContentHandlers): HTMLRewriter
+	transform(response: Response): Response
+}
+interface HTMLRewriterElementContentHandlers {
+	element?(element: Element): void | Promise<void>
+	comments?(comment: Comment): void | Promise<void>
+	text?(element: Text): void | Promise<void>
+}
+interface HTMLRewriterDocumentContentHandlers {
+	doctype?(doctype: Doctype): void | Promise<void>
+	comments?(comment: Comment): void | Promise<void>
+	text?(text: Text): void | Promise<void>
+	end?(end: DocumentEnd): void | Promise<void>
+}
+interface Doctype {
+	readonly name: string | null
+	readonly publicId: string | null
+	readonly systemId: string | null
+}
+interface Element {
+	tagName: string
+	readonly attributes: IterableIterator<string[]>
+	readonly removed: boolean
+	readonly namespaceURI: string
+	getAttribute(name: string): string | null
+	hasAttribute(name: string): boolean
+	setAttribute(name: string, value: string): Element
+	removeAttribute(name: string): Element
+	before(content: string | ReadableStream | Response, options?: ContentOptions): Element
+	after(content: string | ReadableStream | Response, options?: ContentOptions): Element
+	prepend(content: string | ReadableStream | Response, options?: ContentOptions): Element
+	append(content: string | ReadableStream | Response, options?: ContentOptions): Element
+	replace(content: string | ReadableStream | Response, options?: ContentOptions): Element
+	remove(): Element
+	removeAndKeepContent(): Element
+	setInnerContent(content: string | ReadableStream | Response, options?: ContentOptions): Element
+	onEndTag(handler: (tag: EndTag) => void | Promise<void>): void
+}
+interface EndTag {
+	name: string
+	before(content: string | ReadableStream | Response, options?: ContentOptions): EndTag
+	after(content: string | ReadableStream | Response, options?: ContentOptions): EndTag
+	remove(): EndTag
+}
+interface Comment {
+	text: string
+	readonly removed: boolean
+	before(content: string, options?: ContentOptions): Comment
+	after(content: string, options?: ContentOptions): Comment
+	replace(content: string, options?: ContentOptions): Comment
+	remove(): Comment
+}
+interface Text {
+	readonly text: string
+	readonly lastInTextNode: boolean
+	readonly removed: boolean
+	before(content: string | ReadableStream | Response, options?: ContentOptions): Text
+	after(content: string | ReadableStream | Response, options?: ContentOptions): Text
+	replace(content: string | ReadableStream | Response, options?: ContentOptions): Text
+	remove(): Text
+}
+interface DocumentEnd {
+	append(content: string, options?: ContentOptions): DocumentEnd
+}
+/**
+ * This is the event type for fetch events dispatched on the service worker global scope. It contains information about the fetch, including the request and how the receiver will treat the response. It provides the event.respondWith() method, which allows us to provide a response to this fetch.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/FetchEvent)
+ */
+declare abstract class FetchEvent extends ExtendableEvent {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FetchEvent/request) */
+	readonly request: Request
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/FetchEvent/respondWith) */
+	respondWith(promise: Response | Promise<Response>): void
+	passThroughOnException(): void
+}
+type HeadersInit = Headers | Iterable<Iterable<string>> | Record<string, string>
+/**
+ * This Fetch API interface allows you to perform various actions on HTTP request and response headers. These actions include retrieving, setting, adding to, and removing. A Headers object has an associated header list, which is initially empty and consists of zero or more name and value pairs.  You can add to this using methods like append() (see Examples.) In all methods of this interface, header names are matched by case-insensitive byte sequence.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers)
+ */
+declare class Headers {
+	constructor(init?: HeadersInit)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/get) */
+	get(name: string): string | null
+	getAll(name: string): string[]
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/getSetCookie) */
+	getSetCookie(): string[]
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/has) */
+	has(name: string): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/set) */
+	set(name: string, value: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/append) */
+	append(name: string, value: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/delete) */
+	delete(name: string): void
+	forEach<This = unknown>(
+		callback: (this: This, value: string, key: string, parent: Headers) => void,
+		thisArg?: This
+	): void
+	/* Returns an iterator allowing to go through all key/value pairs contained in this object. */
+	entries(): IterableIterator<[key: string, value: string]>
+	/* Returns an iterator allowing to go through all keys of the key/value pairs contained in this object. */
+	keys(): IterableIterator<string>
+	/* Returns an iterator allowing to go through all values of the key/value pairs contained in this object. */
+	values(): IterableIterator<string>
+	[Symbol.iterator](): IterableIterator<[key: string, value: string]>
+}
+type BodyInit =
+	| ReadableStream<Uint8Array>
+	| string
+	| ArrayBuffer
+	| ArrayBufferView
+	| Blob
+	| URLSearchParams
+	| FormData
+declare abstract class Body {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/body) */
+	get body(): ReadableStream | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/bodyUsed) */
+	get bodyUsed(): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/arrayBuffer) */
+	arrayBuffer(): Promise<ArrayBuffer>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/bytes) */
+	bytes(): Promise<Uint8Array>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/text) */
+	text(): Promise<string>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/json) */
+	json<T>(): Promise<T>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/formData) */
+	formData(): Promise<FormData>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/blob) */
+	blob(): Promise<Blob>
+}
+/**
+ * This Fetch API interface represents the response to a request.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response)
+ */
+declare var Response: {
+	prototype: Response
+	new (body?: BodyInit | null, init?: ResponseInit): Response
+	error(): Response
+	redirect(url: string, status?: number): Response
+	json(any: any, maybeInit?: ResponseInit | Response): Response
+}
+/**
+ * This Fetch API interface represents the response to a request.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response)
+ */
+interface Response extends Body {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/clone) */
+	clone(): Response
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/status) */
+	status: number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/statusText) */
+	statusText: string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/headers) */
+	headers: Headers
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/ok) */
+	ok: boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/redirected) */
+	redirected: boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/url) */
+	url: string
+	webSocket: WebSocket | null
+	cf: any | undefined
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Response/type) */
+	type: 'default' | 'error'
+}
+interface ResponseInit {
+	status?: number
+	statusText?: string
+	headers?: HeadersInit
+	cf?: any
+	webSocket?: WebSocket | null
+	encodeBody?: 'automatic' | 'manual'
+}
+type RequestInfo<CfHostMetadata = unknown, Cf = CfProperties<CfHostMetadata>> =
+	| Request<CfHostMetadata, Cf>
+	| string
+/**
+ * This Fetch API interface represents a resource request.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request)
+ */
+declare var Request: {
+	prototype: Request
+	new <CfHostMetadata = unknown, Cf = CfProperties<CfHostMetadata>>(
+		input: RequestInfo<CfProperties> | URL,
+		init?: RequestInit<Cf>
+	): Request<CfHostMetadata, Cf>
+}
+/**
+ * This Fetch API interface represents a resource request.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request)
+ */
+interface Request<CfHostMetadata = unknown, Cf = CfProperties<CfHostMetadata>> extends Body {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/clone) */
+	clone(): Request<CfHostMetadata, Cf>
+	/**
+	 * Returns request's HTTP method, which is "GET" by default.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/method)
+	 */
+	method: string
+	/**
+	 * Returns the URL of request as a string.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/url)
+	 */
+	url: string
+	/**
+	 * Returns a Headers object consisting of the headers associated with request. Note that headers added in the network layer by the user agent will not be accounted for in this object, e.g., the "Host" header.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/headers)
+	 */
+	headers: Headers
+	/**
+	 * Returns the redirect mode associated with request, which is a string indicating how redirects for the request will be handled during fetching. A request will follow redirects by default.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/redirect)
+	 */
+	redirect: string
+	fetcher: Fetcher | null
+	/**
+	 * Returns the signal associated with request, which is an AbortSignal object indicating whether or not request has been aborted, and its abort event handler.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/signal)
+	 */
+	signal: AbortSignal
+	cf: Cf | undefined
+	/**
+	 * Returns request's subresource integrity metadata, which is a cryptographic hash of the resource being fetched. Its value consists of multiple hashes separated by whitespace. [SRI]
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/integrity)
+	 */
+	integrity: string
+	/**
+	 * Returns a boolean indicating whether or not request can outlive the global in which it was created.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/keepalive)
+	 */
+	keepalive: boolean
+	/**
+	 * Returns the cache mode associated with request, which is a string indicating how the request will interact with the browser's cache when fetching.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/cache)
+	 */
+	cache?: 'no-store'
+}
+interface RequestInit<Cf = CfProperties> {
+	/* A string to set request's method. */
+	method?: string
+	/* A Headers object, an object literal, or an array of two-item arrays to set request's headers. */
+	headers?: HeadersInit
+	/* A BodyInit object or null to set request's body. */
+	body?: BodyInit | null
+	/* A string indicating whether request follows redirects, results in an error upon encountering a redirect, or returns the redirect (in an opaque fashion). Sets request's redirect. */
+	redirect?: string
+	fetcher?: Fetcher | null
+	cf?: Cf
+	/* A string indicating how the request will interact with the browser's cache to set request's cache. */
+	cache?: 'no-store'
+	/* A cryptographic hash of the resource to be fetched by request. Sets request's integrity. */
+	integrity?: string
+	/* An AbortSignal to set request's signal. */
+	signal?: AbortSignal | null
+	encodeResponseBody?: 'automatic' | 'manual'
+}
+type Service<T extends Rpc.WorkerEntrypointBranded | undefined = undefined> = Fetcher<T>
+type Fetcher<
+	T extends Rpc.EntrypointBranded | undefined = undefined,
+	Reserved extends string = never,
+> = (T extends Rpc.EntrypointBranded
+	? Rpc.Provider<T, Reserved | 'fetch' | 'connect'>
+	: unknown) & {
+	fetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response>
+	connect(address: SocketAddress | string, options?: SocketOptions): Socket
+}
+interface KVNamespaceListKey<Metadata, Key extends string = string> {
+	name: Key
+	expiration?: number
+	metadata?: Metadata
+}
+type KVNamespaceListResult<Metadata, Key extends string = string> =
+	| {
+			list_complete: false
+			keys: KVNamespaceListKey<Metadata, Key>[]
+			cursor: string
+			cacheStatus: string | null
+	  }
+	| {
+			list_complete: true
+			keys: KVNamespaceListKey<Metadata, Key>[]
+			cacheStatus: string | null
+	  }
+interface KVNamespace<Key extends string = string> {
+	get(key: Key, options?: Partial<KVNamespaceGetOptions<undefined>>): Promise<string | null>
+	get(key: Key, type: 'text'): Promise<string | null>
+	get<ExpectedValue = unknown>(key: Key, type: 'json'): Promise<ExpectedValue | null>
+	get(key: Key, type: 'arrayBuffer'): Promise<ArrayBuffer | null>
+	get(key: Key, type: 'stream'): Promise<ReadableStream | null>
+	get(key: Key, options?: KVNamespaceGetOptions<'text'>): Promise<string | null>
+	get<ExpectedValue = unknown>(
+		key: Key,
+		options?: KVNamespaceGetOptions<'json'>
+	): Promise<ExpectedValue | null>
+	get(key: Key, options?: KVNamespaceGetOptions<'arrayBuffer'>): Promise<ArrayBuffer | null>
+	get(key: Key, options?: KVNamespaceGetOptions<'stream'>): Promise<ReadableStream | null>
+	get(key: Array<Key>, type: 'text'): Promise<Map<string, string | null>>
+	get<ExpectedValue = unknown>(
+		key: Array<Key>,
+		type: 'json'
+	): Promise<Map<string, ExpectedValue | null>>
+	get(
+		key: Array<Key>,
+		options?: Partial<KVNamespaceGetOptions<undefined>>
+	): Promise<Map<string, string | null>>
+	get(key: Array<Key>, options?: KVNamespaceGetOptions<'text'>): Promise<Map<string, string | null>>
+	get<ExpectedValue = unknown>(
+		key: Array<Key>,
+		options?: KVNamespaceGetOptions<'json'>
+	): Promise<Map<string, ExpectedValue | null>>
+	list<Metadata = unknown>(
+		options?: KVNamespaceListOptions
+	): Promise<KVNamespaceListResult<Metadata, Key>>
+	put(
+		key: Key,
+		value: string | ArrayBuffer | ArrayBufferView | ReadableStream,
+		options?: KVNamespacePutOptions
+	): Promise<void>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		options?: Partial<KVNamespaceGetOptions<undefined>>
+	): Promise<KVNamespaceGetWithMetadataResult<string, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		type: 'text'
+	): Promise<KVNamespaceGetWithMetadataResult<string, Metadata>>
+	getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+		key: Key,
+		type: 'json'
+	): Promise<KVNamespaceGetWithMetadataResult<ExpectedValue, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		type: 'arrayBuffer'
+	): Promise<KVNamespaceGetWithMetadataResult<ArrayBuffer, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		type: 'stream'
+	): Promise<KVNamespaceGetWithMetadataResult<ReadableStream, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		options: KVNamespaceGetOptions<'text'>
+	): Promise<KVNamespaceGetWithMetadataResult<string, Metadata>>
+	getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+		key: Key,
+		options: KVNamespaceGetOptions<'json'>
+	): Promise<KVNamespaceGetWithMetadataResult<ExpectedValue, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		options: KVNamespaceGetOptions<'arrayBuffer'>
+	): Promise<KVNamespaceGetWithMetadataResult<ArrayBuffer, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Key,
+		options: KVNamespaceGetOptions<'stream'>
+	): Promise<KVNamespaceGetWithMetadataResult<ReadableStream, Metadata>>
+	getWithMetadata<Metadata = unknown>(
+		key: Array<Key>,
+		type: 'text'
+	): Promise<Map<string, KVNamespaceGetWithMetadataResult<string, Metadata>>>
+	getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+		key: Array<Key>,
+		type: 'json'
+	): Promise<Map<string, KVNamespaceGetWithMetadataResult<ExpectedValue, Metadata>>>
+	getWithMetadata<Metadata = unknown>(
+		key: Array<Key>,
+		options?: Partial<KVNamespaceGetOptions<undefined>>
+	): Promise<Map<string, KVNamespaceGetWithMetadataResult<string, Metadata>>>
+	getWithMetadata<Metadata = unknown>(
+		key: Array<Key>,
+		options?: KVNamespaceGetOptions<'text'>
+	): Promise<Map<string, KVNamespaceGetWithMetadataResult<string, Metadata>>>
+	getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+		key: Array<Key>,
+		options?: KVNamespaceGetOptions<'json'>
+	): Promise<Map<string, KVNamespaceGetWithMetadataResult<ExpectedValue, Metadata>>>
+	delete(key: Key): Promise<void>
+}
+interface KVNamespaceListOptions {
+	limit?: number
+	prefix?: string | null
+	cursor?: string | null
+}
+interface KVNamespaceGetOptions<Type> {
+	type: Type
+	cacheTtl?: number
+}
+interface KVNamespacePutOptions {
+	expiration?: number
+	expirationTtl?: number
+	metadata?: any | null
+}
+interface KVNamespaceGetWithMetadataResult<Value, Metadata> {
+	value: Value | null
+	metadata: Metadata | null
+	cacheStatus: string | null
+}
+type QueueContentType = 'text' | 'bytes' | 'json' | 'v8'
+interface Queue<Body = unknown> {
+	send(message: Body, options?: QueueSendOptions): Promise<void>
+	sendBatch(
+		messages: Iterable<MessageSendRequest<Body>>,
+		options?: QueueSendBatchOptions
+	): Promise<void>
+}
+interface QueueSendOptions {
+	contentType?: QueueContentType
+	delaySeconds?: number
+}
+interface QueueSendBatchOptions {
+	delaySeconds?: number
+}
+interface MessageSendRequest<Body = unknown> {
+	body: Body
+	contentType?: QueueContentType
+	delaySeconds?: number
+}
+interface QueueRetryOptions {
+	delaySeconds?: number
+}
+interface Message<Body = unknown> {
+	readonly id: string
+	readonly timestamp: Date
+	readonly body: Body
+	readonly attempts: number
+	retry(options?: QueueRetryOptions): void
+	ack(): void
+}
+interface QueueEvent<Body = unknown> extends ExtendableEvent {
+	readonly messages: readonly Message<Body>[]
+	readonly queue: string
+	retryAll(options?: QueueRetryOptions): void
+	ackAll(): void
+}
+interface MessageBatch<Body = unknown> {
+	readonly messages: readonly Message<Body>[]
+	readonly queue: string
+	retryAll(options?: QueueRetryOptions): void
+	ackAll(): void
+}
+interface R2Error extends Error {
+	readonly name: string
+	readonly code: number
+	readonly message: string
+	readonly action: string
+	readonly stack: any
+}
+interface R2ListOptions {
+	limit?: number
+	prefix?: string
+	cursor?: string
+	delimiter?: string
+	startAfter?: string
+	include?: ('httpMetadata' | 'customMetadata')[]
+}
+declare abstract class R2Bucket {
+	head(key: string): Promise<R2Object | null>
+	get(
+		key: string,
+		options: R2GetOptions & {
+			onlyIf: R2Conditional | Headers
+		}
+	): Promise<R2ObjectBody | R2Object | null>
+	get(key: string, options?: R2GetOptions): Promise<R2ObjectBody | null>
+	put(
+		key: string,
+		value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob,
+		options?: R2PutOptions & {
+			onlyIf: R2Conditional | Headers
+		}
+	): Promise<R2Object | null>
+	put(
+		key: string,
+		value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob,
+		options?: R2PutOptions
+	): Promise<R2Object>
+	createMultipartUpload(key: string, options?: R2MultipartOptions): Promise<R2MultipartUpload>
+	resumeMultipartUpload(key: string, uploadId: string): R2MultipartUpload
+	delete(keys: string | string[]): Promise<void>
+	list(options?: R2ListOptions): Promise<R2Objects>
+}
+interface R2MultipartUpload {
+	readonly key: string
+	readonly uploadId: string
+	uploadPart(
+		partNumber: number,
+		value: ReadableStream | (ArrayBuffer | ArrayBufferView) | string | Blob,
+		options?: R2UploadPartOptions
+	): Promise<R2UploadedPart>
+	abort(): Promise<void>
+	complete(uploadedParts: R2UploadedPart[]): Promise<R2Object>
+}
+interface R2UploadedPart {
+	partNumber: number
+	etag: string
+}
+declare abstract class R2Object {
+	readonly key: string
+	readonly version: string
+	readonly size: number
+	readonly etag: string
+	readonly httpEtag: string
+	readonly checksums: R2Checksums
+	readonly uploaded: Date
+	readonly httpMetadata?: R2HTTPMetadata
+	readonly customMetadata?: Record<string, string>
+	readonly range?: R2Range
+	readonly storageClass: string
+	readonly ssecKeyMd5?: string
+	writeHttpMetadata(headers: Headers): void
+}
+interface R2ObjectBody extends R2Object {
+	get body(): ReadableStream
+	get bodyUsed(): boolean
+	arrayBuffer(): Promise<ArrayBuffer>
+	bytes(): Promise<Uint8Array>
+	text(): Promise<string>
+	json<T>(): Promise<T>
+	blob(): Promise<Blob>
+}
+type R2Range =
+	| {
+			offset: number
+			length?: number
+	  }
+	| {
+			offset?: number
+			length: number
+	  }
+	| {
+			suffix: number
+	  }
+interface R2Conditional {
+	etagMatches?: string
+	etagDoesNotMatch?: string
+	uploadedBefore?: Date
+	uploadedAfter?: Date
+	secondsGranularity?: boolean
+}
+interface R2GetOptions {
+	onlyIf?: R2Conditional | Headers
+	range?: R2Range | Headers
+	ssecKey?: ArrayBuffer | string
+}
+interface R2PutOptions {
+	onlyIf?: R2Conditional | Headers
+	httpMetadata?: R2HTTPMetadata | Headers
+	customMetadata?: Record<string, string>
+	md5?: (ArrayBuffer | ArrayBufferView) | string
+	sha1?: (ArrayBuffer | ArrayBufferView) | string
+	sha256?: (ArrayBuffer | ArrayBufferView) | string
+	sha384?: (ArrayBuffer | ArrayBufferView) | string
+	sha512?: (ArrayBuffer | ArrayBufferView) | string
+	storageClass?: string
+	ssecKey?: ArrayBuffer | string
+}
+interface R2MultipartOptions {
+	httpMetadata?: R2HTTPMetadata | Headers
+	customMetadata?: Record<string, string>
+	storageClass?: string
+	ssecKey?: ArrayBuffer | string
+}
+interface R2Checksums {
+	readonly md5?: ArrayBuffer
+	readonly sha1?: ArrayBuffer
+	readonly sha256?: ArrayBuffer
+	readonly sha384?: ArrayBuffer
+	readonly sha512?: ArrayBuffer
+	toJSON(): R2StringChecksums
+}
+interface R2StringChecksums {
+	md5?: string
+	sha1?: string
+	sha256?: string
+	sha384?: string
+	sha512?: string
+}
+interface R2HTTPMetadata {
+	contentType?: string
+	contentLanguage?: string
+	contentDisposition?: string
+	contentEncoding?: string
+	cacheControl?: string
+	cacheExpiry?: Date
+}
+type R2Objects = {
+	objects: R2Object[]
+	delimitedPrefixes: string[]
+} & (
+	| {
+			truncated: true
+			cursor: string
+	  }
+	| {
+			truncated: false
+	  }
+)
+interface R2UploadPartOptions {
+	ssecKey?: ArrayBuffer | string
+}
+declare abstract class ScheduledEvent extends ExtendableEvent {
+	readonly scheduledTime: number
+	readonly cron: string
+	noRetry(): void
+}
+interface ScheduledController {
+	readonly scheduledTime: number
+	readonly cron: string
+	noRetry(): void
+}
+interface QueuingStrategy<T = any> {
+	highWaterMark?: number | bigint
+	size?: (chunk: T) => number | bigint
+}
+interface UnderlyingSink<W = any> {
+	type?: string
+	start?: (controller: WritableStreamDefaultController) => void | Promise<void>
+	write?: (chunk: W, controller: WritableStreamDefaultController) => void | Promise<void>
+	abort?: (reason: any) => void | Promise<void>
+	close?: () => void | Promise<void>
+}
+interface UnderlyingByteSource {
+	type: 'bytes'
+	autoAllocateChunkSize?: number
+	start?: (controller: ReadableByteStreamController) => void | Promise<void>
+	pull?: (controller: ReadableByteStreamController) => void | Promise<void>
+	cancel?: (reason: any) => void | Promise<void>
+}
+interface UnderlyingSource<R = any> {
+	type?: '' | undefined
+	start?: (controller: ReadableStreamDefaultController<R>) => void | Promise<void>
+	pull?: (controller: ReadableStreamDefaultController<R>) => void | Promise<void>
+	cancel?: (reason: any) => void | Promise<void>
+	expectedLength?: number | bigint
+}
+interface Transformer<I = any, O = any> {
+	readableType?: string
+	writableType?: string
+	start?: (controller: TransformStreamDefaultController<O>) => void | Promise<void>
+	transform?: (chunk: I, controller: TransformStreamDefaultController<O>) => void | Promise<void>
+	flush?: (controller: TransformStreamDefaultController<O>) => void | Promise<void>
+	cancel?: (reason: any) => void | Promise<void>
+	expectedLength?: number
+}
+interface StreamPipeOptions {
+	/**
+	 * Pipes this readable stream to a given writable stream destination. The way in which the piping process behaves under various error conditions can be customized with a number of passed options. It returns a promise that fulfills when the piping process completes successfully, or rejects if any errors were encountered.
+	 *
+	 * Piping a stream will lock it for the duration of the pipe, preventing any other consumer from acquiring a reader.
+	 *
+	 * Errors and closures of the source and destination streams propagate as follows:
+	 *
+	 * An error in this source readable stream will abort destination, unless preventAbort is truthy. The returned promise will be rejected with the source's error, or with any error that occurs during aborting the destination.
+	 *
+	 * An error in destination will cancel this source readable stream, unless preventCancel is truthy. The returned promise will be rejected with the destination's error, or with any error that occurs during canceling the source.
+	 *
+	 * When this source readable stream closes, destination will be closed, unless preventClose is truthy. The returned promise will be fulfilled once this process completes, unless an error is encountered while closing the destination, in which case it will be rejected with that error.
+	 *
+	 * If destination starts out closed or closing, this source readable stream will be canceled, unless preventCancel is true. The returned promise will be rejected with an error indicating piping to a closed stream failed, or with any error that occurs during canceling the source.
+	 *
+	 * The signal option can be set to an AbortSignal to allow aborting an ongoing pipe operation via the corresponding AbortController. In this case, this source readable stream will be canceled, and destination aborted, unless the respective options preventCancel or preventAbort are set.
+	 */
+	preventClose?: boolean
+	preventAbort?: boolean
+	preventCancel?: boolean
+	signal?: AbortSignal
+}
+type ReadableStreamReadResult<R = any> =
+	| {
+			done: false
+			value: R
+	  }
+	| {
+			done: true
+			value?: undefined
+	  }
+/**
+ * This Streams API interface represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream)
+ */
+interface ReadableStream<R = any> {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/locked) */
+	get locked(): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/cancel) */
+	cancel(reason?: any): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/getReader) */
+	getReader(): ReadableStreamDefaultReader<R>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/getReader) */
+	getReader(options: ReadableStreamGetReaderOptions): ReadableStreamBYOBReader
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/pipeThrough) */
+	pipeThrough<T>(
+		transform: ReadableWritablePair<T, R>,
+		options?: StreamPipeOptions
+	): ReadableStream<T>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/pipeTo) */
+	pipeTo(destination: WritableStream<R>, options?: StreamPipeOptions): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream/tee) */
+	tee(): [ReadableStream<R>, ReadableStream<R>]
+	values(options?: ReadableStreamValuesOptions): AsyncIterableIterator<R>
+	[Symbol.asyncIterator](options?: ReadableStreamValuesOptions): AsyncIterableIterator<R>
+}
+/**
+ * This Streams API interface represents a readable stream of byte data. The Fetch API offers a concrete instance of a ReadableStream through the body property of a Response object.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStream)
+ */
+declare const ReadableStream: {
+	prototype: ReadableStream
+	new (
+		underlyingSource: UnderlyingByteSource,
+		strategy?: QueuingStrategy<Uint8Array>
+	): ReadableStream<Uint8Array>
+	new <R = any>(
+		underlyingSource?: UnderlyingSource<R>,
+		strategy?: QueuingStrategy<R>
+	): ReadableStream<R>
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultReader) */
+declare class ReadableStreamDefaultReader<R = any> {
+	constructor(stream: ReadableStream)
+	get closed(): Promise<void>
+	cancel(reason?: any): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultReader/read) */
+	read(): Promise<ReadableStreamReadResult<R>>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultReader/releaseLock) */
+	releaseLock(): void
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBReader) */
+declare class ReadableStreamBYOBReader {
+	constructor(stream: ReadableStream)
+	get closed(): Promise<void>
+	cancel(reason?: any): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBReader/read) */
+	read<T extends ArrayBufferView>(view: T): Promise<ReadableStreamReadResult<T>>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBReader/releaseLock) */
+	releaseLock(): void
+	readAtLeast<T extends ArrayBufferView>(
+		minElements: number,
+		view: T
+	): Promise<ReadableStreamReadResult<T>>
+}
+interface ReadableStreamBYOBReaderReadableStreamBYOBReaderReadOptions {
+	min?: number
+}
+interface ReadableStreamGetReaderOptions {
+	/**
+	 * Creates a ReadableStreamBYOBReader and locks the stream to the new reader.
+	 *
+	 * This call behaves the same way as the no-argument variant, except that it only works on readable byte streams, i.e. streams which were constructed specifically with the ability to handle "bring your own buffer" reading. The returned BYOB reader provides the ability to directly read individual chunks from the stream via its read() method, into developer-supplied buffers, allowing more precise control over allocation.
+	 */
+	mode: 'byob'
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBRequest) */
+declare abstract class ReadableStreamBYOBRequest {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBRequest/view) */
+	get view(): Uint8Array | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBRequest/respond) */
+	respond(bytesWritten: number): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamBYOBRequest/respondWithNewView) */
+	respondWithNewView(view: ArrayBuffer | ArrayBufferView): void
+	get atLeast(): number | null
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultController) */
+declare abstract class ReadableStreamDefaultController<R = any> {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultController/desiredSize) */
+	get desiredSize(): number | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultController/close) */
+	close(): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultController/enqueue) */
+	enqueue(chunk?: R): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableStreamDefaultController/error) */
+	error(reason: any): void
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableByteStreamController) */
+declare abstract class ReadableByteStreamController {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableByteStreamController/byobRequest) */
+	get byobRequest(): ReadableStreamBYOBRequest | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableByteStreamController/desiredSize) */
+	get desiredSize(): number | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableByteStreamController/close) */
+	close(): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableByteStreamController/enqueue) */
+	enqueue(chunk: ArrayBuffer | ArrayBufferView): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ReadableByteStreamController/error) */
+	error(reason: any): void
+}
+/**
+ * This Streams API interface represents a controller allowing control of a WritableStream's state. When constructing a WritableStream, the underlying sink is given a corresponding WritableStreamDefaultController instance to manipulate.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultController)
+ */
+declare abstract class WritableStreamDefaultController {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultController/signal) */
+	get signal(): AbortSignal
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultController/error) */
+	error(reason?: any): void
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStreamDefaultController) */
+declare abstract class TransformStreamDefaultController<O = any> {
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStreamDefaultController/desiredSize) */
+	get desiredSize(): number | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStreamDefaultController/enqueue) */
+	enqueue(chunk?: O): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStreamDefaultController/error) */
+	error(reason: any): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStreamDefaultController/terminate) */
+	terminate(): void
+}
+interface ReadableWritablePair<R = any, W = any> {
+	/**
+	 * Provides a convenient, chainable way of piping this readable stream through a transform stream (or any other { writable, readable } pair). It simply pipes the stream into the writable side of the supplied pair, and returns the readable side for further use.
+	 *
+	 * Piping a stream will lock it for the duration of the pipe, preventing any other consumer from acquiring a reader.
+	 */
+	writable: WritableStream<W>
+	readable: ReadableStream<R>
+}
+/**
+ * This Streams API interface provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStream)
+ */
+declare class WritableStream<W = any> {
+	constructor(underlyingSink?: UnderlyingSink, queuingStrategy?: QueuingStrategy)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStream/locked) */
+	get locked(): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStream/abort) */
+	abort(reason?: any): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStream/close) */
+	close(): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStream/getWriter) */
+	getWriter(): WritableStreamDefaultWriter<W>
+}
+/**
+ * This Streams API interface is the object returned by WritableStream.getWriter() and once created locks the < writer to the WritableStream ensuring that no other streams can write to the underlying sink.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter)
+ */
+declare class WritableStreamDefaultWriter<W = any> {
+	constructor(stream: WritableStream)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/closed) */
+	get closed(): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/ready) */
+	get ready(): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/desiredSize) */
+	get desiredSize(): number | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/abort) */
+	abort(reason?: any): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/close) */
+	close(): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/write) */
+	write(chunk?: W): Promise<void>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/WritableStreamDefaultWriter/releaseLock) */
+	releaseLock(): void
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStream) */
+declare class TransformStream<I = any, O = any> {
+	constructor(
+		transformer?: Transformer<I, O>,
+		writableStrategy?: QueuingStrategy<I>,
+		readableStrategy?: QueuingStrategy<O>
+	)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStream/readable) */
+	get readable(): ReadableStream<O>
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TransformStream/writable) */
+	get writable(): WritableStream<I>
+}
+declare class FixedLengthStream extends IdentityTransformStream {
+	constructor(
+		expectedLength: number | bigint,
+		queuingStrategy?: IdentityTransformStreamQueuingStrategy
+	)
+}
+declare class IdentityTransformStream extends TransformStream<
+	ArrayBuffer | ArrayBufferView,
+	Uint8Array
+> {
+	constructor(queuingStrategy?: IdentityTransformStreamQueuingStrategy)
+}
+interface IdentityTransformStreamQueuingStrategy {
+	highWaterMark?: number | bigint
+}
+interface ReadableStreamValuesOptions {
+	preventCancel?: boolean
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CompressionStream) */
+declare class CompressionStream extends TransformStream<ArrayBuffer | ArrayBufferView, Uint8Array> {
+	constructor(format: 'gzip' | 'deflate' | 'deflate-raw')
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/DecompressionStream) */
+declare class DecompressionStream extends TransformStream<
+	ArrayBuffer | ArrayBufferView,
+	Uint8Array
+> {
+	constructor(format: 'gzip' | 'deflate' | 'deflate-raw')
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextEncoderStream) */
+declare class TextEncoderStream extends TransformStream<string, Uint8Array> {
+	constructor()
+	get encoding(): string
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/TextDecoderStream) */
+declare class TextDecoderStream extends TransformStream<ArrayBuffer | ArrayBufferView, string> {
+	constructor(label?: string, options?: TextDecoderStreamTextDecoderStreamInit)
+	get encoding(): string
+	get fatal(): boolean
+	get ignoreBOM(): boolean
+}
+interface TextDecoderStreamTextDecoderStreamInit {
+	fatal?: boolean
+	ignoreBOM?: boolean
+}
+/**
+ * This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/ByteLengthQueuingStrategy)
+ */
+declare class ByteLengthQueuingStrategy implements QueuingStrategy<ArrayBufferView> {
+	constructor(init: QueuingStrategyInit)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ByteLengthQueuingStrategy/highWaterMark) */
+	get highWaterMark(): number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/ByteLengthQueuingStrategy/size) */
+	get size(): (chunk?: any) => number
+}
+/**
+ * This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CountQueuingStrategy)
+ */
+declare class CountQueuingStrategy implements QueuingStrategy {
+	constructor(init: QueuingStrategyInit)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CountQueuingStrategy/highWaterMark) */
+	get highWaterMark(): number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/CountQueuingStrategy/size) */
+	get size(): (chunk?: any) => number
+}
+interface QueuingStrategyInit {
+	/**
+	 * Creates a new ByteLengthQueuingStrategy with the provided high water mark.
+	 *
+	 * Note that the provided high water mark will not be validated ahead of time. Instead, if it is negative, NaN, or not a number, the resulting ByteLengthQueuingStrategy will cause the corresponding stream constructor to throw.
+	 */
+	highWaterMark: number
+}
+interface ScriptVersion {
+	id?: string
+	tag?: string
+	message?: string
+}
+declare abstract class TailEvent extends ExtendableEvent {
+	readonly events: TraceItem[]
+	readonly traces: TraceItem[]
+}
+interface TraceItem {
+	readonly event:
+		| (
+				| TraceItemFetchEventInfo
+				| TraceItemJsRpcEventInfo
+				| TraceItemScheduledEventInfo
+				| TraceItemAlarmEventInfo
+				| TraceItemQueueEventInfo
+				| TraceItemEmailEventInfo
+				| TraceItemTailEventInfo
+				| TraceItemCustomEventInfo
+				| TraceItemHibernatableWebSocketEventInfo
+		  )
+		| null
+	readonly eventTimestamp: number | null
+	readonly logs: TraceLog[]
+	readonly exceptions: TraceException[]
+	readonly diagnosticsChannelEvents: TraceDiagnosticChannelEvent[]
+	readonly scriptName: string | null
+	readonly entrypoint?: string
+	readonly scriptVersion?: ScriptVersion
+	readonly dispatchNamespace?: string
+	readonly scriptTags?: string[]
+	readonly outcome: string
+	readonly executionModel: string
+	readonly truncated: boolean
+	readonly cpuTime: number
+	readonly wallTime: number
+}
+interface TraceItemAlarmEventInfo {
+	readonly scheduledTime: Date
+}
+interface TraceItemCustomEventInfo {}
+interface TraceItemScheduledEventInfo {
+	readonly scheduledTime: number
+	readonly cron: string
+}
+interface TraceItemQueueEventInfo {
+	readonly queue: string
+	readonly batchSize: number
+}
+interface TraceItemEmailEventInfo {
+	readonly mailFrom: string
+	readonly rcptTo: string
+	readonly rawSize: number
+}
+interface TraceItemTailEventInfo {
+	readonly consumedEvents: TraceItemTailEventInfoTailItem[]
+}
+interface TraceItemTailEventInfoTailItem {
+	readonly scriptName: string | null
+}
+interface TraceItemFetchEventInfo {
+	readonly response?: TraceItemFetchEventInfoResponse
+	readonly request: TraceItemFetchEventInfoRequest
+}
+interface TraceItemFetchEventInfoRequest {
+	readonly cf?: any
+	readonly headers: Record<string, string>
+	readonly method: string
+	readonly url: string
+	getUnredacted(): TraceItemFetchEventInfoRequest
+}
+interface TraceItemFetchEventInfoResponse {
+	readonly status: number
+}
+interface TraceItemJsRpcEventInfo {
+	readonly rpcMethod: string
+}
+interface TraceItemHibernatableWebSocketEventInfo {
+	readonly getWebSocketEvent:
+		| TraceItemHibernatableWebSocketEventInfoMessage
+		| TraceItemHibernatableWebSocketEventInfoClose
+		| TraceItemHibernatableWebSocketEventInfoError
+}
+interface TraceItemHibernatableWebSocketEventInfoMessage {
+	readonly webSocketEventType: string
+}
+interface TraceItemHibernatableWebSocketEventInfoClose {
+	readonly webSocketEventType: string
+	readonly code: number
+	readonly wasClean: boolean
+}
+interface TraceItemHibernatableWebSocketEventInfoError {
+	readonly webSocketEventType: string
+}
+interface TraceLog {
+	readonly timestamp: number
+	readonly level: string
+	readonly message: any
+}
+interface TraceException {
+	readonly timestamp: number
+	readonly message: string
+	readonly name: string
+	readonly stack?: string
+}
+interface TraceDiagnosticChannelEvent {
+	readonly timestamp: number
+	readonly channel: string
+	readonly message: any
+}
+interface TraceMetrics {
+	readonly cpuTime: number
+	readonly wallTime: number
+}
+interface UnsafeTraceMetrics {
+	fromTrace(item: TraceItem): TraceMetrics
+}
+/**
+ * The URL interface represents an object providing static methods used for creating object URLs.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL)
+ */
+declare class URL {
+	constructor(url: string | URL, base?: string | URL)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/origin) */
+	get origin(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/href) */
+	get href(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/href) */
+	set href(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/protocol) */
+	get protocol(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/protocol) */
+	set protocol(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/username) */
+	get username(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/username) */
+	set username(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/password) */
+	get password(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/password) */
+	set password(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/host) */
+	get host(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/host) */
+	set host(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/hostname) */
+	get hostname(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/hostname) */
+	set hostname(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/port) */
+	get port(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/port) */
+	set port(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/pathname) */
+	get pathname(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/pathname) */
+	set pathname(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/search) */
+	get search(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/search) */
+	set search(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/hash) */
+	get hash(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/hash) */
+	set hash(value: string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/searchParams) */
+	get searchParams(): URLSearchParams
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/toJSON) */
+	toJSON(): string
+	/*function toString() { [native code] }*/
+	toString(): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/canParse_static) */
+	static canParse(url: string, base?: string): boolean
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/parse_static) */
+	static parse(url: string, base?: string): URL | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/createObjectURL_static) */
+	static createObjectURL(object: File | Blob): string
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URL/revokeObjectURL_static) */
+	static revokeObjectURL(object_url: string): void
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams) */
+declare class URLSearchParams {
+	constructor(init?: Iterable<Iterable<string>> | Record<string, string> | string)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/size) */
+	get size(): number
+	/**
+	 * Appends a specified key/value pair as a new search parameter.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/append)
+	 */
+	append(name: string, value: string): void
+	/**
+	 * Deletes the given search parameter, and its associated value, from the list of all search parameters.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/delete)
+	 */
+	delete(name: string, value?: string): void
+	/**
+	 * Returns the first value associated to the given search parameter.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/get)
+	 */
+	get(name: string): string | null
+	/**
+	 * Returns all the values association with a given search parameter.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/getAll)
+	 */
+	getAll(name: string): string[]
+	/**
+	 * Returns a Boolean indicating if such a search parameter exists.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/has)
+	 */
+	has(name: string, value?: string): boolean
+	/**
+	 * Sets the value associated to a given search parameter to the given value. If there were several values, delete the others.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/set)
+	 */
+	set(name: string, value: string): void
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/URLSearchParams/sort) */
+	sort(): void
+	/* Returns an array of key, value pairs for every entry in the search params. */
+	entries(): IterableIterator<[key: string, value: string]>
+	/* Returns a list of keys in the search params. */
+	keys(): IterableIterator<string>
+	/* Returns a list of values in the search params. */
+	values(): IterableIterator<string>
+	forEach<This = unknown>(
+		callback: (this: This, value: string, key: string, parent: URLSearchParams) => void,
+		thisArg?: This
+	): void
+	/*function toString() { [native code] } Returns a string containing a query string suitable for use in a URL. Does not include the question mark. */
+	toString(): string
+	[Symbol.iterator](): IterableIterator<[key: string, value: string]>
+}
+declare class URLPattern {
+	constructor(
+		input?: string | URLPatternInit,
+		baseURL?: string | URLPatternOptions,
+		patternOptions?: URLPatternOptions
+	)
+	get protocol(): string
+	get username(): string
+	get password(): string
+	get hostname(): string
+	get port(): string
+	get pathname(): string
+	get search(): string
+	get hash(): string
+	get hasRegExpGroups(): boolean
+	test(input?: string | URLPatternInit, baseURL?: string): boolean
+	exec(input?: string | URLPatternInit, baseURL?: string): URLPatternResult | null
+}
+interface URLPatternInit {
+	protocol?: string
+	username?: string
+	password?: string
+	hostname?: string
+	port?: string
+	pathname?: string
+	search?: string
+	hash?: string
+	baseURL?: string
+}
+interface URLPatternComponentResult {
+	input: string
+	groups: Record<string, string>
+}
+interface URLPatternResult {
+	inputs: (string | URLPatternInit)[]
+	protocol: URLPatternComponentResult
+	username: URLPatternComponentResult
+	password: URLPatternComponentResult
+	hostname: URLPatternComponentResult
+	port: URLPatternComponentResult
+	pathname: URLPatternComponentResult
+	search: URLPatternComponentResult
+	hash: URLPatternComponentResult
+}
+interface URLPatternOptions {
+	ignoreCase?: boolean
+}
+/**
+ * A CloseEvent is sent to clients using WebSockets when the connection is closed. This is delivered to the listener indicated by the WebSocket object's onclose attribute.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CloseEvent)
+ */
+declare class CloseEvent extends Event {
+	constructor(type: string, initializer?: CloseEventInit)
+	/**
+	 * Returns the WebSocket connection close code provided by the server.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CloseEvent/code)
+	 */
+	readonly code: number
+	/**
+	 * Returns the WebSocket connection close reason provided by the server.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CloseEvent/reason)
+	 */
+	readonly reason: string
+	/**
+	 * Returns true if the connection closed cleanly; false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/CloseEvent/wasClean)
+	 */
+	readonly wasClean: boolean
+}
+interface CloseEventInit {
+	code?: number
+	reason?: string
+	wasClean?: boolean
+}
+/**
+ * A message received by a target object.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessageEvent)
+ */
+declare class MessageEvent extends Event {
+	constructor(type: string, initializer: MessageEventInit)
+	/**
+	 * Returns the data of the message.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/MessageEvent/data)
+	 */
+	readonly data: ArrayBuffer | string
+}
+interface MessageEventInit {
+	data: ArrayBuffer | string
+}
+type WebSocketEventMap = {
+	close: CloseEvent
+	message: MessageEvent
+	open: Event
+	error: ErrorEvent
+}
+/**
+ * Provides the API for creating and managing a WebSocket connection to a server, as well as for sending and receiving data on the connection.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket)
+ */
+declare var WebSocket: {
+	prototype: WebSocket
+	new (url: string, protocols?: string[] | string): WebSocket
+	readonly READY_STATE_CONNECTING: number
+	readonly CONNECTING: number
+	readonly READY_STATE_OPEN: number
+	readonly OPEN: number
+	readonly READY_STATE_CLOSING: number
+	readonly CLOSING: number
+	readonly READY_STATE_CLOSED: number
+	readonly CLOSED: number
+}
+/**
+ * Provides the API for creating and managing a WebSocket connection to a server, as well as for sending and receiving data on the connection.
+ *
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket)
+ */
+interface WebSocket extends EventTarget<WebSocketEventMap> {
+	accept(): void
+	/**
+	 * Transmits data using the WebSocket connection. data can be a string, a Blob, an ArrayBuffer, or an ArrayBufferView.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/send)
+	 */
+	send(message: (ArrayBuffer | ArrayBufferView) | string): void
+	/**
+	 * Closes the WebSocket connection, optionally using code as the the WebSocket connection close code and reason as the the WebSocket connection close reason.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/close)
+	 */
+	close(code?: number, reason?: string): void
+	serializeAttachment(attachment: any): void
+	deserializeAttachment(): any | null
+	/**
+	 * Returns the state of the WebSocket object's connection. It can have the values described below.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/readyState)
+	 */
+	readyState: number
+	/**
+	 * Returns the URL that was used to establish the WebSocket connection.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/url)
+	 */
+	url: string | null
+	/**
+	 * Returns the subprotocol selected by the server, if any. It can be used in conjunction with the array form of the constructor's second argument to perform subprotocol negotiation.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/protocol)
+	 */
+	protocol: string | null
+	/**
+	 * Returns the extensions selected by the server, if any.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/WebSocket/extensions)
+	 */
+	extensions: string | null
+}
+declare const WebSocketPair: {
+	new (): {
+		0: WebSocket
+		1: WebSocket
+	}
+}
+interface SqlStorage {
+	exec<T extends Record<string, SqlStorageValue>>(
+		query: string,
+		...bindings: any[]
+	): SqlStorageCursor<T>
+	get databaseSize(): number
+	Cursor: typeof SqlStorageCursor
+	Statement: typeof SqlStorageStatement
+}
+declare abstract class SqlStorageStatement {}
+type SqlStorageValue = ArrayBuffer | string | number | null
+declare abstract class SqlStorageCursor<T extends Record<string, SqlStorageValue>> {
+	next():
+		| {
+				done?: false
+				value: T
+		  }
+		| {
+				done: true
+				value?: never
+		  }
+	toArray(): T[]
+	one(): T
+	raw<U extends SqlStorageValue[]>(): IterableIterator<U>
+	columnNames: string[]
+	get rowsRead(): number
+	get rowsWritten(): number
+	[Symbol.iterator](): IterableIterator<T>
+}
+interface Socket {
+	get readable(): ReadableStream
+	get writable(): WritableStream
+	get closed(): Promise<void>
+	get opened(): Promise<SocketInfo>
+	get upgraded(): boolean
+	get secureTransport(): 'on' | 'off' | 'starttls'
+	close(): Promise<void>
+	startTls(options?: TlsOptions): Socket
+}
+interface SocketOptions {
+	secureTransport?: string
+	allowHalfOpen: boolean
+	highWaterMark?: number | bigint
+}
+interface SocketAddress {
+	hostname: string
+	port: number
+}
+interface TlsOptions {
+	expectedServerHostname?: string
+}
+interface SocketInfo {
+	remoteAddress?: string
+	localAddress?: string
+}
+/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource) */
+declare class EventSource extends EventTarget {
+	constructor(url: string, init?: EventSourceEventSourceInit)
+	/**
+	 * Aborts any instances of the fetch algorithm started for this EventSource object, and sets the readyState attribute to CLOSED.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/close)
+	 */
+	close(): void
+	/**
+	 * Returns the URL providing the event stream.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/url)
+	 */
+	get url(): string
+	/**
+	 * Returns true if the credentials mode for connection requests to the URL providing the event stream is set to "include", and false otherwise.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/withCredentials)
+	 */
+	get withCredentials(): boolean
+	/**
+	 * Returns the state of this EventSource object's connection. It can have the values described below.
+	 *
+	 * [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/readyState)
+	 */
+	get readyState(): number
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/open_event) */
+	get onopen(): any | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/open_event) */
+	set onopen(value: any | null)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/message_event) */
+	get onmessage(): any | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/message_event) */
+	set onmessage(value: any | null)
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/error_event) */
+	get onerror(): any | null
+	/* [MDN Reference](https://developer.mozilla.org/docs/Web/API/EventSource/error_event) */
+	set onerror(value: any | null)
+	static readonly CONNECTING: number
+	static readonly OPEN: number
+	static readonly CLOSED: number
+	static from(stream: ReadableStream): EventSource
+}
+interface EventSourceEventSourceInit {
+	withCredentials?: boolean
+	fetcher?: Fetcher
+}
+interface Container {
+	get running(): boolean
+	start(options?: ContainerStartupOptions): void
+	monitor(): Promise<void>
+	destroy(error?: any): Promise<void>
+	signal(signo: number): void
+	getTcpPort(port: number): Fetcher
+}
+interface ContainerStartupOptions {
+	entrypoint?: string[]
+	enableInternet: boolean
+	env?: Record<string, string>
+}
+type AiImageClassificationInput = {
+	image: number[]
+}
+type AiImageClassificationOutput = {
+	score?: number
+	label?: string
+}[]
+declare abstract class BaseAiImageClassification {
+	inputs: AiImageClassificationInput
+	postProcessedOutputs: AiImageClassificationOutput
+}
+type AiImageToTextInput = {
+	image: number[]
+	prompt?: string
+	max_tokens?: number
+	temperature?: number
+	top_p?: number
+	top_k?: number
+	seed?: number
+	repetition_penalty?: number
+	frequency_penalty?: number
+	presence_penalty?: number
+	raw?: boolean
+	messages?: RoleScopedChatInput[]
+}
+type AiImageToTextOutput = {
+	description: string
+}
+declare abstract class BaseAiImageToText {
+	inputs: AiImageToTextInput
+	postProcessedOutputs: AiImageToTextOutput
+}
+type AiImageTextToTextInput = {
+	image: string
+	prompt?: string
+	max_tokens?: number
+	temperature?: number
+	ignore_eos?: boolean
+	top_p?: number
+	top_k?: number
+	seed?: number
+	repetition_penalty?: number
+	frequency_penalty?: number
+	presence_penalty?: number
+	raw?: boolean
+	messages?: RoleScopedChatInput[]
+}
+type AiImageTextToTextOutput = {
+	description: string
+}
+declare abstract class BaseAiImageTextToText {
+	inputs: AiImageTextToTextInput
+	postProcessedOutputs: AiImageTextToTextOutput
+}
+type AiObjectDetectionInput = {
+	image: number[]
+}
+type AiObjectDetectionOutput = {
+	score?: number
+	label?: string
+}[]
+declare abstract class BaseAiObjectDetection {
+	inputs: AiObjectDetectionInput
+	postProcessedOutputs: AiObjectDetectionOutput
+}
+type AiSentenceSimilarityInput = {
+	source: string
+	sentences: string[]
+}
+type AiSentenceSimilarityOutput = number[]
+declare abstract class BaseAiSentenceSimilarity {
+	inputs: AiSentenceSimilarityInput
+	postProcessedOutputs: AiSentenceSimilarityOutput
+}
+type AiAutomaticSpeechRecognitionInput = {
+	audio: number[]
+}
+type AiAutomaticSpeechRecognitionOutput = {
+	text?: string
+	words?: {
+		word: string
+		start: number
+		end: number
+	}[]
+	vtt?: string
+}
+declare abstract class BaseAiAutomaticSpeechRecognition {
+	inputs: AiAutomaticSpeechRecognitionInput
+	postProcessedOutputs: AiAutomaticSpeechRecognitionOutput
+}
+type AiSummarizationInput = {
+	input_text: string
+	max_length?: number
+}
+type AiSummarizationOutput = {
+	summary: string
+}
+declare abstract class BaseAiSummarization {
+	inputs: AiSummarizationInput
+	postProcessedOutputs: AiSummarizationOutput
+}
+type AiTextClassificationInput = {
+	text: string
+}
+type AiTextClassificationOutput = {
+	score?: number
+	label?: string
+}[]
+declare abstract class BaseAiTextClassification {
+	inputs: AiTextClassificationInput
+	postProcessedOutputs: AiTextClassificationOutput
+}
+type AiTextEmbeddingsInput = {
+	text: string | string[]
+}
+type AiTextEmbeddingsOutput = {
+	shape: number[]
+	data: number[][]
+}
+declare abstract class BaseAiTextEmbeddings {
+	inputs: AiTextEmbeddingsInput
+	postProcessedOutputs: AiTextEmbeddingsOutput
+}
+type RoleScopedChatInput = {
+	role: 'user' | 'assistant' | 'system' | 'tool' | (string & NonNullable<unknown>)
+	content: string
+	name?: string
+}
+type AiTextGenerationToolLegacyInput = {
+	name: string
+	description: string
+	parameters?: {
+		type: 'object' | (string & NonNullable<unknown>)
+		properties: {
+			[key: string]: {
+				type: string
+				description?: string
+			}
+		}
+		required: string[]
+	}
+}
+type AiTextGenerationToolInput = {
+	type: 'function' | (string & NonNullable<unknown>)
+	function: {
+		name: string
+		description: string
+		parameters?: {
+			type: 'object' | (string & NonNullable<unknown>)
+			properties: {
+				[key: string]: {
+					type: string
+					description?: string
+				}
+			}
+			required: string[]
+		}
+	}
+}
+type AiTextGenerationFunctionsInput = {
+	name: string
+	code: string
+}
+type AiTextGenerationResponseFormat = {
+	type: string
+	json_schema?: any
+}
+type AiTextGenerationInput = {
+	prompt?: string
+	raw?: boolean
+	stream?: boolean
+	max_tokens?: number
+	temperature?: number
+	top_p?: number
+	top_k?: number
+	seed?: number
+	repetition_penalty?: number
+	frequency_penalty?: number
+	presence_penalty?: number
+	messages?: RoleScopedChatInput[]
+	response_format?: AiTextGenerationResponseFormat
+	tools?:
+		| AiTextGenerationToolInput[]
+		| AiTextGenerationToolLegacyInput[]
+		| (object & NonNullable<unknown>)
+	functions?: AiTextGenerationFunctionsInput[]
+}
+type AiTextGenerationOutput = {
+	response?: string
+	tool_calls?: {
+		name: string
+		arguments: unknown
+	}[]
+}
+declare abstract class BaseAiTextGeneration {
+	inputs: AiTextGenerationInput
+	postProcessedOutputs: AiTextGenerationOutput
+}
+type AiTextToSpeechInput = {
+	prompt: string
+	lang?: string
+}
+type AiTextToSpeechOutput =
+	| Uint8Array
+	| {
+			audio: string
+	  }
+declare abstract class BaseAiTextToSpeech {
+	inputs: AiTextToSpeechInput
+	postProcessedOutputs: AiTextToSpeechOutput
+}
+type AiTextToImageInput = {
+	prompt: string
+	negative_prompt?: string
+	height?: number
+	width?: number
+	image?: number[]
+	image_b64?: string
+	mask?: number[]
+	num_steps?: number
+	strength?: number
+	guidance?: number
+	seed?: number
+}
+type AiTextToImageOutput = ReadableStream<Uint8Array>
+declare abstract class BaseAiTextToImage {
+	inputs: AiTextToImageInput
+	postProcessedOutputs: AiTextToImageOutput
+}
+type AiTranslationInput = {
+	text: string
+	target_lang: string
+	source_lang?: string
+}
+type AiTranslationOutput = {
+	translated_text?: string
+}
+declare abstract class BaseAiTranslation {
+	inputs: AiTranslationInput
+	postProcessedOutputs: AiTranslationOutput
+}
+type Ai_Cf_Baai_Bge_Base_En_V1_5_Input =
+	| {
+			text: string | string[]
+			/**
+			 * The pooling method used in the embedding process. `cls` pooling will generate more accurate embeddings on larger inputs - however, embeddings created with cls pooling are not compatible with embeddings generated with mean pooling. The default pooling method is `mean` in order for this to not be a breaking change, but we highly suggest using the new `cls` pooling for better accuracy.
+			 */
+			pooling?: 'mean' | 'cls'
+	  }
+	| {
+			/**
+			 * Batch of the embeddings requests to run using async-queue
+			 */
+			requests: {
+				text: string | string[]
+				/**
+				 * The pooling method used in the embedding process. `cls` pooling will generate more accurate embeddings on larger inputs - however, embeddings created with cls pooling are not compatible with embeddings generated with mean pooling. The default pooling method is `mean` in order for this to not be a breaking change, but we highly suggest using the new `cls` pooling for better accuracy.
+				 */
+				pooling?: 'mean' | 'cls'
+			}[]
+	  }
+type Ai_Cf_Baai_Bge_Base_En_V1_5_Output =
+	| {
+			shape?: number[]
+			/**
+			 * Embeddings of the requested text values
+			 */
+			data?: number[][]
+			/**
+			 * The pooling method used in the embedding process.
+			 */
+			pooling?: 'mean' | 'cls'
+	  }
+	| AsyncResponse
+interface AsyncResponse {
+	/**
+	 * The async request id that can be used to obtain the results.
+	 */
+	request_id?: string
+}
+declare abstract class Base_Ai_Cf_Baai_Bge_Base_En_V1_5 {
+	inputs: Ai_Cf_Baai_Bge_Base_En_V1_5_Input
+	postProcessedOutputs: Ai_Cf_Baai_Bge_Base_En_V1_5_Output
+}
+type Ai_Cf_Openai_Whisper_Input =
+	| string
+	| {
+			/**
+			 * An array of integers that represent the audio data constrained to 8-bit unsigned integer values
+			 */
+			audio: number[]
+	  }
+interface Ai_Cf_Openai_Whisper_Output {
+	/**
+	 * The transcription
+	 */
+	text: string
+	word_count?: number
+	words?: {
+		word?: string
+		/**
+		 * The second this word begins in the recording
+		 */
+		start?: number
+		/**
+		 * The ending second when the word completes
+		 */
+		end?: number
+	}[]
+	vtt?: string
+}
+declare abstract class Base_Ai_Cf_Openai_Whisper {
+	inputs: Ai_Cf_Openai_Whisper_Input
+	postProcessedOutputs: Ai_Cf_Openai_Whisper_Output
+}
+type Ai_Cf_Meta_M2M100_1_2B_Input =
+	| {
+			/**
+			 * The text to be translated
+			 */
+			text: string
+			/**
+			 * The language code of the source text (e.g., 'en' for English). Defaults to 'en' if not specified
+			 */
+			source_lang?: string
+			/**
+			 * The language code to translate the text into (e.g., 'es' for Spanish)
+			 */
+			target_lang: string
+	  }
+	| {
+			/**
+			 * Batch of the embeddings requests to run using async-queue
+			 */
+			requests: {
+				/**
+				 * The text to be translated
+				 */
+				text: string
+				/**
+				 * The language code of the source text (e.g., 'en' for English). Defaults to 'en' if not specified
+				 */
+				source_lang?: string
+				/**
+				 * The language code to translate the text into (e.g., 'es' for Spanish)
+				 */
+				target_lang: string
+			}[]
+	  }
+type Ai_Cf_Meta_M2M100_1_2B_Output =
+	| {
+			/**
+			 * The translated text in the target language
+			 */
+			translated_text?: string
+	  }
+	| AsyncResponse
+declare abstract class Base_Ai_Cf_Meta_M2M100_1_2B {
+	inputs: Ai_Cf_Meta_M2M100_1_2B_Input
+	postProcessedOutputs: Ai_Cf_Meta_M2M100_1_2B_Output
+}
+type Ai_Cf_Baai_Bge_Small_En_V1_5_Input =
+	| {
+			text: string | string[]
+			/**
+			 * The pooling method used in the embedding process. `cls` pooling will generate more accurate embeddings on larger inputs - however, embeddings created with cls pooling are not compatible with embeddings generated with mean pooling. The default pooling method is `mean` in order for this to not be a breaking change, but we highly suggest using the new `cls` pooling for better accuracy.
+			 */
+			pooling?: 'mean' | 'cls'
+	  }
+	| {
+			/**
+			 * Batch of the embeddings requests to run using async-queue
+			 */
+			requests: {
+				text: string | string[]
+				/**
+				 * The pooling method used in the embedding process. `cls` pooling will generate more accurate embeddings on larger inputs - however, embeddings created with cls pooling are not compatible with embeddings generated with mean pooling. The default pooling method is `mean` in order for this to not be a breaking change, but we highly suggest using the new `cls` pooling for better accuracy.
+				 */
+				pooling?: 'mean' | 'cls'
+			}[]
+	  }
+type Ai_Cf_Baai_Bge_Small_En_V1_5_Output =
+	| {
+			shape?: number[]
+			/**
+			 * Embeddings of the requested text values
+			 */
+			data?: number[][]
+			/**
+			 * The pooling method used in the embedding process.
+			 */
+			pooling?: 'mean' | 'cls'
+	  }
+	| AsyncResponse
+declare abstract class Base_Ai_Cf_Baai_Bge_Small_En_V1_5 {
+	inputs: Ai_Cf_Baai_Bge_Small_En_V1_5_Input
+	postProcessedOutputs: Ai_Cf_Baai_Bge_Small_En_V1_5_Output
+}
+type Ai_Cf_Baai_Bge_Large_En_V1_5_Input =
+	| {
+			text: string | string[]
+			/**
+			 * The pooling method used in the embedding process. `cls` pooling will generate more accurate embeddings on larger inputs - however, embeddings created with cls pooling are not compatible with embeddings generated with mean pooling. The default pooling method is `mean` in order for this to not be a breaking change, but we highly suggest using the new `cls` pooling for better accuracy.
+			 */
+			pooling?: 'mean' | 'cls'
+	  }
+	| {
+			/**
+			 * Batch of the embeddings requests to run using async-queue
+			 */
+			requests: {
+				text: string | string[]
+				/**
+				 * The pooling method used in the embedding process. `cls` pooling will generate more accurate embeddings on larger inputs - however, embeddings created with cls pooling are not compatible with embeddings generated with mean pooling. The default pooling method is `mean` in order for this to not be a breaking change, but we highly suggest using the new `cls` pooling for better accuracy.
+				 */
+				pooling?: 'mean' | 'cls'
+			}[]
+	  }
+type Ai_Cf_Baai_Bge_Large_En_V1_5_Output =
+	| {
+			shape?: number[]
+			/**
+			 * Embeddings of the requested text values
+			 */
+			data?: number[][]
+			/**
+			 * The pooling method used in the embedding process.
+			 */
+			pooling?: 'mean' | 'cls'
+	  }
+	| AsyncResponse
+declare abstract class Base_Ai_Cf_Baai_Bge_Large_En_V1_5 {
+	inputs: Ai_Cf_Baai_Bge_Large_En_V1_5_Input
+	postProcessedOutputs: Ai_Cf_Baai_Bge_Large_En_V1_5_Output
+}
+type Ai_Cf_Unum_Uform_Gen2_Qwen_500M_Input =
+	| string
+	| {
+			/**
+			 * The input text prompt for the model to generate a response.
+			 */
+			prompt?: string
+			/**
+			 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+			 */
+			raw?: boolean
+			/**
+			 * Controls the creativity of the AI's responses by adjusting how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+			 */
+			top_p?: number
+			/**
+			 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+			 */
+			top_k?: number
+			/**
+			 * Random seed for reproducibility of the generation.
+			 */
+			seed?: number
+			/**
+			 * Penalty for repeated tokens; higher values discourage repetition.
+			 */
+			repetition_penalty?: number
+			/**
+			 * Decreases the likelihood of the model repeating the same lines verbatim.
+			 */
+			frequency_penalty?: number
+			/**
+			 * Increases the likelihood of the model introducing new topics.
+			 */
+			presence_penalty?: number
+			image: number[] | (string & NonNullable<unknown>)
+			/**
+			 * The maximum number of tokens to generate in the response.
+			 */
+			max_tokens?: number
+	  }
+interface Ai_Cf_Unum_Uform_Gen2_Qwen_500M_Output {
+	description?: string
+}
+declare abstract class Base_Ai_Cf_Unum_Uform_Gen2_Qwen_500M {
+	inputs: Ai_Cf_Unum_Uform_Gen2_Qwen_500M_Input
+	postProcessedOutputs: Ai_Cf_Unum_Uform_Gen2_Qwen_500M_Output
+}
+type Ai_Cf_Openai_Whisper_Tiny_En_Input =
+	| string
+	| {
+			/**
+			 * An array of integers that represent the audio data constrained to 8-bit unsigned integer values
+			 */
+			audio: number[]
+	  }
+interface Ai_Cf_Openai_Whisper_Tiny_En_Output {
+	/**
+	 * The transcription
+	 */
+	text: string
+	word_count?: number
+	words?: {
+		word?: string
+		/**
+		 * The second this word begins in the recording
+		 */
+		start?: number
+		/**
+		 * The ending second when the word completes
+		 */
+		end?: number
+	}[]
+	vtt?: string
+}
+declare abstract class Base_Ai_Cf_Openai_Whisper_Tiny_En {
+	inputs: Ai_Cf_Openai_Whisper_Tiny_En_Input
+	postProcessedOutputs: Ai_Cf_Openai_Whisper_Tiny_En_Output
+}
+interface Ai_Cf_Openai_Whisper_Large_V3_Turbo_Input {
+	/**
+	 * Base64 encoded value of the audio data.
+	 */
+	audio: string
+	/**
+	 * Supported tasks are 'translate' or 'transcribe'.
+	 */
+	task?: string
+	/**
+	 * The language of the audio being transcribed or translated.
+	 */
+	language?: string
+	/**
+	 * Preprocess the audio with a voice activity detection model.
+	 */
+	vad_filter?: boolean
+	/**
+	 * A text prompt to help provide context to the model on the contents of the audio.
+	 */
+	initial_prompt?: string
+	/**
+	 * The prefix it appended the the beginning of the output of the transcription and can guide the transcription result.
+	 */
+	prefix?: string
+}
+interface Ai_Cf_Openai_Whisper_Large_V3_Turbo_Output {
+	transcription_info?: {
+		/**
+		 * The language of the audio being transcribed or translated.
+		 */
+		language?: string
+		/**
+		 * The confidence level or probability of the detected language being accurate, represented as a decimal between 0 and 1.
+		 */
+		language_probability?: number
+		/**
+		 * The total duration of the original audio file, in seconds.
+		 */
+		duration?: number
+		/**
+		 * The duration of the audio after applying Voice Activity Detection (VAD) to remove silent or irrelevant sections, in seconds.
+		 */
+		duration_after_vad?: number
+	}
+	/**
+	 * The complete transcription of the audio.
+	 */
+	text: string
+	/**
+	 * The total number of words in the transcription.
+	 */
+	word_count?: number
+	segments?: {
+		/**
+		 * The starting time of the segment within the audio, in seconds.
+		 */
+		start?: number
+		/**
+		 * The ending time of the segment within the audio, in seconds.
+		 */
+		end?: number
+		/**
+		 * The transcription of the segment.
+		 */
+		text?: string
+		/**
+		 * The temperature used in the decoding process, controlling randomness in predictions. Lower values result in more deterministic outputs.
+		 */
+		temperature?: number
+		/**
+		 * The average log probability of the predictions for the words in this segment, indicating overall confidence.
+		 */
+		avg_logprob?: number
+		/**
+		 * The compression ratio of the input to the output, measuring how much the text was compressed during the transcription process.
+		 */
+		compression_ratio?: number
+		/**
+		 * The probability that the segment contains no speech, represented as a decimal between 0 and 1.
+		 */
+		no_speech_prob?: number
+		words?: {
+			/**
+			 * The individual word transcribed from the audio.
+			 */
+			word?: string
+			/**
+			 * The starting time of the word within the audio, in seconds.
+			 */
+			start?: number
+			/**
+			 * The ending time of the word within the audio, in seconds.
+			 */
+			end?: number
+		}[]
+	}[]
+	/**
+	 * The transcription in WebVTT format, which includes timing and text information for use in subtitles.
+	 */
+	vtt?: string
+}
+declare abstract class Base_Ai_Cf_Openai_Whisper_Large_V3_Turbo {
+	inputs: Ai_Cf_Openai_Whisper_Large_V3_Turbo_Input
+	postProcessedOutputs: Ai_Cf_Openai_Whisper_Large_V3_Turbo_Output
+}
+type Ai_Cf_Baai_Bge_M3_Input =
+	| BGEM3InputQueryAndContexts
+	| BGEM3InputEmbedding
+	| {
+			/**
+			 * Batch of the embeddings requests to run using async-queue
+			 */
+			requests: (BGEM3InputQueryAndContexts1 | BGEM3InputEmbedding1)[]
+	  }
+interface BGEM3InputQueryAndContexts {
+	/**
+	 * A query you wish to perform against the provided contexts. If no query is provided the model with respond with embeddings for contexts
+	 */
+	query?: string
+	/**
+	 * List of provided contexts. Note that the index in this array is important, as the response will refer to it.
+	 */
+	contexts: {
+		/**
+		 * One of the provided context content
+		 */
+		text?: string
+	}[]
+	/**
+	 * When provided with too long context should the model error out or truncate the context to fit?
+	 */
+	truncate_inputs?: boolean
+}
+interface BGEM3InputEmbedding {
+	text: string | string[]
+	/**
+	 * When provided with too long context should the model error out or truncate the context to fit?
+	 */
+	truncate_inputs?: boolean
+}
+interface BGEM3InputQueryAndContexts1 {
+	/**
+	 * A query you wish to perform against the provided contexts. If no query is provided the model with respond with embeddings for contexts
+	 */
+	query?: string
+	/**
+	 * List of provided contexts. Note that the index in this array is important, as the response will refer to it.
+	 */
+	contexts: {
+		/**
+		 * One of the provided context content
+		 */
+		text?: string
+	}[]
+	/**
+	 * When provided with too long context should the model error out or truncate the context to fit?
+	 */
+	truncate_inputs?: boolean
+}
+interface BGEM3InputEmbedding1 {
+	text: string | string[]
+	/**
+	 * When provided with too long context should the model error out or truncate the context to fit?
+	 */
+	truncate_inputs?: boolean
+}
+type Ai_Cf_Baai_Bge_M3_Output =
+	| BGEM3OuputQuery
+	| BGEM3OutputEmbeddingForContexts
+	| BGEM3OuputEmbedding
+	| AsyncResponse
+interface BGEM3OuputQuery {
+	response?: {
+		/**
+		 * Index of the context in the request
+		 */
+		id?: number
+		/**
+		 * Score of the context under the index.
+		 */
+		score?: number
+	}[]
+}
+interface BGEM3OutputEmbeddingForContexts {
+	response?: number[][]
+	shape?: number[]
+	/**
+	 * The pooling method used in the embedding process.
+	 */
+	pooling?: 'mean' | 'cls'
+}
+interface BGEM3OuputEmbedding {
+	shape?: number[]
+	/**
+	 * Embeddings of the requested text values
+	 */
+	data?: number[][]
+	/**
+	 * The pooling method used in the embedding process.
+	 */
+	pooling?: 'mean' | 'cls'
+}
+declare abstract class Base_Ai_Cf_Baai_Bge_M3 {
+	inputs: Ai_Cf_Baai_Bge_M3_Input
+	postProcessedOutputs: Ai_Cf_Baai_Bge_M3_Output
+}
+interface Ai_Cf_Black_Forest_Labs_Flux_1_Schnell_Input {
+	/**
+	 * A text description of the image you want to generate.
+	 */
+	prompt: string
+	/**
+	 * The number of diffusion steps; higher values can improve quality but take longer.
+	 */
+	steps?: number
+}
+interface Ai_Cf_Black_Forest_Labs_Flux_1_Schnell_Output {
+	/**
+	 * The generated image in Base64 format.
+	 */
+	image?: string
+}
+declare abstract class Base_Ai_Cf_Black_Forest_Labs_Flux_1_Schnell {
+	inputs: Ai_Cf_Black_Forest_Labs_Flux_1_Schnell_Input
+	postProcessedOutputs: Ai_Cf_Black_Forest_Labs_Flux_1_Schnell_Output
+}
+type Ai_Cf_Meta_Llama_3_2_11B_Vision_Instruct_Input = Prompt | Messages
+interface Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	image?: number[] | (string & NonNullable<unknown>)
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+	/**
+	 * Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base model.
+	 */
+	lora?: string
+}
+interface Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role?: string
+		/**
+		 * The tool call id. Must be supplied for tool calls for Mistral-3. If you don't know what to put here you can fall back to 000000001
+		 */
+		tool_call_id?: string
+		content?:
+			| string
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }[]
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }
+	}[]
+	image?: number[] | (string & NonNullable<unknown>)
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	/**
+	 * If true, the response will be streamed back incrementally.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Controls the creativity of the AI's responses by adjusting how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+type Ai_Cf_Meta_Llama_3_2_11B_Vision_Instruct_Output = {
+	/**
+	 * The generated text response from the model
+	 */
+	response?: string
+	/**
+	 * An array of tool calls requests made during the response generation
+	 */
+	tool_calls?: {
+		/**
+		 * The arguments passed to be passed to the tool call request
+		 */
+		arguments?: object
+		/**
+		 * The name of the tool to be called
+		 */
+		name?: string
+	}[]
+}
+declare abstract class Base_Ai_Cf_Meta_Llama_3_2_11B_Vision_Instruct {
+	inputs: Ai_Cf_Meta_Llama_3_2_11B_Vision_Instruct_Input
+	postProcessedOutputs: Ai_Cf_Meta_Llama_3_2_11B_Vision_Instruct_Output
+}
+type Ai_Cf_Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Input =
+	| Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Prompt
+	| Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Messages
+	| AsyncBatch
+interface Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	/**
+	 * Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base model.
+	 */
+	lora?: string
+	response_format?: JSONMode
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface JSONMode {
+	type?: 'json_object' | 'json_schema'
+	json_schema?: unknown
+}
+interface Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role: string
+		/**
+		 * The content of the message as a string.
+		 */
+		content: string
+	}[]
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	response_format?: JSONMode
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface AsyncBatch {
+	requests?: {
+		/**
+		 * User-supplied reference. This field will be present in the response as well it can be used to reference the request and response. It's NOT validated to be unique.
+		 */
+		external_reference?: string
+		/**
+		 * Prompt for the text generation model
+		 */
+		prompt?: string
+		/**
+		 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+		 */
+		stream?: boolean
+		/**
+		 * The maximum number of tokens to generate in the response.
+		 */
+		max_tokens?: number
+		/**
+		 * Controls the randomness of the output; higher values produce more random results.
+		 */
+		temperature?: number
+		/**
+		 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+		 */
+		top_p?: number
+		/**
+		 * Random seed for reproducibility of the generation.
+		 */
+		seed?: number
+		/**
+		 * Penalty for repeated tokens; higher values discourage repetition.
+		 */
+		repetition_penalty?: number
+		/**
+		 * Decreases the likelihood of the model repeating the same lines verbatim.
+		 */
+		frequency_penalty?: number
+		/**
+		 * Increases the likelihood of the model introducing new topics.
+		 */
+		presence_penalty?: number
+		response_format?: JSONMode
+	}[]
+}
+type Ai_Cf_Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Output =
+	| {
+			/**
+			 * The generated text response from the model
+			 */
+			response: string
+			/**
+			 * Usage statistics for the inference request
+			 */
+			usage?: {
+				/**
+				 * Total number of tokens in input
+				 */
+				prompt_tokens?: number
+				/**
+				 * Total number of tokens in output
+				 */
+				completion_tokens?: number
+				/**
+				 * Total number of input and output tokens
+				 */
+				total_tokens?: number
+			}
+			/**
+			 * An array of tool calls requests made during the response generation
+			 */
+			tool_calls?: {
+				/**
+				 * The arguments passed to be passed to the tool call request
+				 */
+				arguments?: object
+				/**
+				 * The name of the tool to be called
+				 */
+				name?: string
+			}[]
+	  }
+	| AsyncResponse
+declare abstract class Base_Ai_Cf_Meta_Llama_3_3_70B_Instruct_Fp8_Fast {
+	inputs: Ai_Cf_Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Input
+	postProcessedOutputs: Ai_Cf_Meta_Llama_3_3_70B_Instruct_Fp8_Fast_Output
+}
+interface Ai_Cf_Meta_Llama_Guard_3_8B_Input {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender must alternate between 'user' and 'assistant'.
+		 */
+		role: 'user' | 'assistant'
+		/**
+		 * The content of the message as a string.
+		 */
+		content: string
+	}[]
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Dictate the output format of the generated response.
+	 */
+	response_format?: {
+		/**
+		 * Set to json_object to process and output generated text as JSON.
+		 */
+		type?: string
+	}
+}
+interface Ai_Cf_Meta_Llama_Guard_3_8B_Output {
+	response?:
+		| string
+		| {
+				/**
+				 * Whether the conversation is safe or not.
+				 */
+				safe?: boolean
+				/**
+				 * A list of what hazard categories predicted for the conversation, if the conversation is deemed unsafe.
+				 */
+				categories?: string[]
+		  }
+	/**
+	 * Usage statistics for the inference request
+	 */
+	usage?: {
+		/**
+		 * Total number of tokens in input
+		 */
+		prompt_tokens?: number
+		/**
+		 * Total number of tokens in output
+		 */
+		completion_tokens?: number
+		/**
+		 * Total number of input and output tokens
+		 */
+		total_tokens?: number
+	}
+}
+declare abstract class Base_Ai_Cf_Meta_Llama_Guard_3_8B {
+	inputs: Ai_Cf_Meta_Llama_Guard_3_8B_Input
+	postProcessedOutputs: Ai_Cf_Meta_Llama_Guard_3_8B_Output
+}
+interface Ai_Cf_Baai_Bge_Reranker_Base_Input {
+	/**
+	 * A query you wish to perform against the provided contexts.
+	 */
+	query: string
+	/**
+	 * Number of returned results starting with the best score.
+	 */
+	top_k?: number
+	/**
+	 * List of provided contexts. Note that the index in this array is important, as the response will refer to it.
+	 */
+	contexts: {
+		/**
+		 * One of the provided context content
+		 */
+		text?: string
+	}[]
+}
+interface Ai_Cf_Baai_Bge_Reranker_Base_Output {
+	response?: {
+		/**
+		 * Index of the context in the request
+		 */
+		id?: number
+		/**
+		 * Score of the context under the index.
+		 */
+		score?: number
+	}[]
+}
+declare abstract class Base_Ai_Cf_Baai_Bge_Reranker_Base {
+	inputs: Ai_Cf_Baai_Bge_Reranker_Base_Input
+	postProcessedOutputs: Ai_Cf_Baai_Bge_Reranker_Base_Output
+}
+type Ai_Cf_Qwen_Qwen2_5_Coder_32B_Instruct_Input =
+	| Qwen2_5_Coder_32B_Instruct_Prompt
+	| Qwen2_5_Coder_32B_Instruct_Messages
+interface Qwen2_5_Coder_32B_Instruct_Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	/**
+	 * Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base model.
+	 */
+	lora?: string
+	response_format?: JSONMode
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface Qwen2_5_Coder_32B_Instruct_Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role: string
+		/**
+		 * The content of the message as a string.
+		 */
+		content: string
+	}[]
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	response_format?: JSONMode
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+type Ai_Cf_Qwen_Qwen2_5_Coder_32B_Instruct_Output = {
+	/**
+	 * The generated text response from the model
+	 */
+	response: string
+	/**
+	 * Usage statistics for the inference request
+	 */
+	usage?: {
+		/**
+		 * Total number of tokens in input
+		 */
+		prompt_tokens?: number
+		/**
+		 * Total number of tokens in output
+		 */
+		completion_tokens?: number
+		/**
+		 * Total number of input and output tokens
+		 */
+		total_tokens?: number
+	}
+	/**
+	 * An array of tool calls requests made during the response generation
+	 */
+	tool_calls?: {
+		/**
+		 * The arguments passed to be passed to the tool call request
+		 */
+		arguments?: object
+		/**
+		 * The name of the tool to be called
+		 */
+		name?: string
+	}[]
+}
+declare abstract class Base_Ai_Cf_Qwen_Qwen2_5_Coder_32B_Instruct {
+	inputs: Ai_Cf_Qwen_Qwen2_5_Coder_32B_Instruct_Input
+	postProcessedOutputs: Ai_Cf_Qwen_Qwen2_5_Coder_32B_Instruct_Output
+}
+type Ai_Cf_Qwen_Qwq_32B_Input = Qwen_Qwq_32B_Prompt | Qwen_Qwq_32B_Messages
+interface Qwen_Qwq_32B_Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	/**
+	 * JSON schema that should be fulfilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface Qwen_Qwq_32B_Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role?: string
+		/**
+		 * The tool call id. Must be supplied for tool calls for Mistral-3. If you don't know what to put here you can fall back to 000000001
+		 */
+		tool_call_id?: string
+		content?:
+			| string
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }[]
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }
+	}[]
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	/**
+	 * JSON schema that should be fufilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+type Ai_Cf_Qwen_Qwq_32B_Output = {
+	/**
+	 * The generated text response from the model
+	 */
+	response: string
+	/**
+	 * Usage statistics for the inference request
+	 */
+	usage?: {
+		/**
+		 * Total number of tokens in input
+		 */
+		prompt_tokens?: number
+		/**
+		 * Total number of tokens in output
+		 */
+		completion_tokens?: number
+		/**
+		 * Total number of input and output tokens
+		 */
+		total_tokens?: number
+	}
+	/**
+	 * An array of tool calls requests made during the response generation
+	 */
+	tool_calls?: {
+		/**
+		 * The arguments passed to be passed to the tool call request
+		 */
+		arguments?: object
+		/**
+		 * The name of the tool to be called
+		 */
+		name?: string
+	}[]
+}
+declare abstract class Base_Ai_Cf_Qwen_Qwq_32B {
+	inputs: Ai_Cf_Qwen_Qwq_32B_Input
+	postProcessedOutputs: Ai_Cf_Qwen_Qwq_32B_Output
+}
+type Ai_Cf_Mistralai_Mistral_Small_3_1_24B_Instruct_Input =
+	| Mistral_Small_3_1_24B_Instruct_Prompt
+	| Mistral_Small_3_1_24B_Instruct_Messages
+interface Mistral_Small_3_1_24B_Instruct_Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	/**
+	 * JSON schema that should be fulfilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface Mistral_Small_3_1_24B_Instruct_Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role?: string
+		/**
+		 * The tool call id. Must be supplied for tool calls for Mistral-3. If you don't know what to put here you can fall back to 000000001
+		 */
+		tool_call_id?: string
+		content?:
+			| string
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }[]
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }
+	}[]
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	/**
+	 * JSON schema that should be fufilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+type Ai_Cf_Mistralai_Mistral_Small_3_1_24B_Instruct_Output = {
+	/**
+	 * The generated text response from the model
+	 */
+	response: string
+	/**
+	 * Usage statistics for the inference request
+	 */
+	usage?: {
+		/**
+		 * Total number of tokens in input
+		 */
+		prompt_tokens?: number
+		/**
+		 * Total number of tokens in output
+		 */
+		completion_tokens?: number
+		/**
+		 * Total number of input and output tokens
+		 */
+		total_tokens?: number
+	}
+	/**
+	 * An array of tool calls requests made during the response generation
+	 */
+	tool_calls?: {
+		/**
+		 * The arguments passed to be passed to the tool call request
+		 */
+		arguments?: object
+		/**
+		 * The name of the tool to be called
+		 */
+		name?: string
+	}[]
+}
+declare abstract class Base_Ai_Cf_Mistralai_Mistral_Small_3_1_24B_Instruct {
+	inputs: Ai_Cf_Mistralai_Mistral_Small_3_1_24B_Instruct_Input
+	postProcessedOutputs: Ai_Cf_Mistralai_Mistral_Small_3_1_24B_Instruct_Output
+}
+type Ai_Cf_Google_Gemma_3_12B_It_Input =
+	| Google_Gemma_3_12B_It_Prompt
+	| Google_Gemma_3_12B_It_Messages
+interface Google_Gemma_3_12B_It_Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	/**
+	 * JSON schema that should be fufilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface Google_Gemma_3_12B_It_Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role?: string
+		content?:
+			| string
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }[]
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }
+	}[]
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	/**
+	 * JSON schema that should be fufilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+type Ai_Cf_Google_Gemma_3_12B_It_Output = {
+	/**
+	 * The generated text response from the model
+	 */
+	response: string
+	/**
+	 * Usage statistics for the inference request
+	 */
+	usage?: {
+		/**
+		 * Total number of tokens in input
+		 */
+		prompt_tokens?: number
+		/**
+		 * Total number of tokens in output
+		 */
+		completion_tokens?: number
+		/**
+		 * Total number of input and output tokens
+		 */
+		total_tokens?: number
+	}
+	/**
+	 * An array of tool calls requests made during the response generation
+	 */
+	tool_calls?: {
+		/**
+		 * The arguments passed to be passed to the tool call request
+		 */
+		arguments?: object
+		/**
+		 * The name of the tool to be called
+		 */
+		name?: string
+	}[]
+}
+declare abstract class Base_Ai_Cf_Google_Gemma_3_12B_It {
+	inputs: Ai_Cf_Google_Gemma_3_12B_It_Input
+	postProcessedOutputs: Ai_Cf_Google_Gemma_3_12B_It_Output
+}
+type Ai_Cf_Meta_Llama_4_Scout_17B_16E_Instruct_Input =
+	| Ai_Cf_Meta_Llama_4_Prompt
+	| Ai_Cf_Meta_Llama_4_Messages
+interface Ai_Cf_Meta_Llama_4_Prompt {
+	/**
+	 * The input text prompt for the model to generate a response.
+	 */
+	prompt: string
+	/**
+	 * JSON schema that should be fulfilled for the response.
+	 */
+	guided_json?: object
+	response_format?: JSONMode
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+interface Ai_Cf_Meta_Llama_4_Messages {
+	/**
+	 * An array of message objects representing the conversation history.
+	 */
+	messages: {
+		/**
+		 * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+		 */
+		role?: string
+		/**
+		 * The tool call id. If you don't know what to put here you can fall back to 000000001
+		 */
+		tool_call_id?: string
+		content?:
+			| string
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }[]
+			| {
+					/**
+					 * Type of the content provided
+					 */
+					type?: string
+					text?: string
+					image_url?: {
+						/**
+						 * image uri with data (e.g. data:image/jpeg;base64,/9j/...). HTTP URL will not be accepted
+						 */
+						url?: string
+					}
+			  }
+	}[]
+	functions?: {
+		name: string
+		code: string
+	}[]
+	/**
+	 * A list of tools available for the assistant to use.
+	 */
+	tools?: (
+		| {
+				/**
+				 * The name of the tool. More descriptive the better.
+				 */
+				name: string
+				/**
+				 * A brief description of what the tool does.
+				 */
+				description: string
+				/**
+				 * Schema defining the parameters accepted by the tool.
+				 */
+				parameters: {
+					/**
+					 * The type of the parameters object (usually 'object').
+					 */
+					type: string
+					/**
+					 * List of required parameter names.
+					 */
+					required?: string[]
+					/**
+					 * Definitions of each parameter.
+					 */
+					properties: {
+						[k: string]: {
+							/**
+							 * The data type of the parameter.
+							 */
+							type: string
+							/**
+							 * A description of the expected parameter.
+							 */
+							description: string
+						}
+					}
+				}
+		  }
+		| {
+				/**
+				 * Specifies the type of tool (e.g., 'function').
+				 */
+				type: string
+				/**
+				 * Details of the function tool.
+				 */
+				function: {
+					/**
+					 * The name of the function.
+					 */
+					name: string
+					/**
+					 * A brief description of what the function does.
+					 */
+					description: string
+					/**
+					 * Schema defining the parameters accepted by the function.
+					 */
+					parameters: {
+						/**
+						 * The type of the parameters object (usually 'object').
+						 */
+						type: string
+						/**
+						 * List of required parameter names.
+						 */
+						required?: string[]
+						/**
+						 * Definitions of each parameter.
+						 */
+						properties: {
+							[k: string]: {
+								/**
+								 * The data type of the parameter.
+								 */
+								type: string
+								/**
+								 * A description of the expected parameter.
+								 */
+								description: string
+							}
+						}
+					}
+				}
+		  }
+	)[]
+	response_format?: JSONMode
+	/**
+	 * JSON schema that should be fufilled for the response.
+	 */
+	guided_json?: object
+	/**
+	 * If true, a chat template is not applied and you must adhere to the specific model's expected formatting.
+	 */
+	raw?: boolean
+	/**
+	 * If true, the response will be streamed back incrementally using SSE, Server Sent Events.
+	 */
+	stream?: boolean
+	/**
+	 * The maximum number of tokens to generate in the response.
+	 */
+	max_tokens?: number
+	/**
+	 * Controls the randomness of the output; higher values produce more random results.
+	 */
+	temperature?: number
+	/**
+	 * Adjusts the creativity of the AI's responses by controlling how many possible words it considers. Lower values make outputs more predictable; higher values allow for more varied and creative responses.
+	 */
+	top_p?: number
+	/**
+	 * Limits the AI to choose from the top 'k' most probable words. Lower values make responses more focused; higher values introduce more variety and potential surprises.
+	 */
+	top_k?: number
+	/**
+	 * Random seed for reproducibility of the generation.
+	 */
+	seed?: number
+	/**
+	 * Penalty for repeated tokens; higher values discourage repetition.
+	 */
+	repetition_penalty?: number
+	/**
+	 * Decreases the likelihood of the model repeating the same lines verbatim.
+	 */
+	frequency_penalty?: number
+	/**
+	 * Increases the likelihood of the model introducing new topics.
+	 */
+	presence_penalty?: number
+}
+type Ai_Cf_Meta_Llama_4_Scout_17B_16E_Instruct_Output = {
+	/**
+	 * The generated text response from the model
+	 */
+	response: string
+	/**
+	 * Usage statistics for the inference request
+	 */
+	usage?: {
+		/**
+		 * Total number of tokens in input
+		 */
+		prompt_tokens?: number
+		/**
+		 * Total number of tokens in output
+		 */
+		completion_tokens?: number
+		/**
+		 * Total number of input and output tokens
+		 */
+		total_tokens?: number
+	}
+	/**
+	 * An array of tool calls requests made during the response generation
+	 */
+	tool_calls?: {
+		/**
+		 * The tool call id.
+		 */
+		id?: string
+		/**
+		 * Specifies the type of tool (e.g., 'function').
+		 */
+		type?: string
+		/**
+		 * Details of the function tool.
+		 */
+		function?: {
+			/**
+			 * The name of the tool to be called
+			 */
+			name?: string
+			/**
+			 * The arguments passed to be passed to the tool call request
+			 */
+			arguments?: object
+		}
+	}[]
+}
+declare abstract class Base_Ai_Cf_Meta_Llama_4_Scout_17B_16E_Instruct {
+	inputs: Ai_Cf_Meta_Llama_4_Scout_17B_16E_Instruct_Input
+	postProcessedOutputs: Ai_Cf_Meta_Llama_4_Scout_17B_16E_Instruct_Output
+}
+interface AiModels {
+	'@cf/huggingface/distilbert-sst-2-int8': BaseAiTextClassification
+	'@cf/stabilityai/stable-diffusion-xl-base-1.0': BaseAiTextToImage
+	'@cf/runwayml/stable-diffusion-v1-5-inpainting': BaseAiTextToImage
+	'@cf/runwayml/stable-diffusion-v1-5-img2img': BaseAiTextToImage
+	'@cf/lykon/dreamshaper-8-lcm': BaseAiTextToImage
+	'@cf/bytedance/stable-diffusion-xl-lightning': BaseAiTextToImage
+	'@cf/myshell-ai/melotts': BaseAiTextToSpeech
+	'@cf/microsoft/resnet-50': BaseAiImageClassification
+	'@cf/facebook/detr-resnet-50': BaseAiObjectDetection
+	'@cf/meta/llama-2-7b-chat-int8': BaseAiTextGeneration
+	'@cf/mistral/mistral-7b-instruct-v0.1': BaseAiTextGeneration
+	'@cf/meta/llama-2-7b-chat-fp16': BaseAiTextGeneration
+	'@hf/thebloke/llama-2-13b-chat-awq': BaseAiTextGeneration
+	'@hf/thebloke/mistral-7b-instruct-v0.1-awq': BaseAiTextGeneration
+	'@hf/thebloke/zephyr-7b-beta-awq': BaseAiTextGeneration
+	'@hf/thebloke/openhermes-2.5-mistral-7b-awq': BaseAiTextGeneration
+	'@hf/thebloke/neural-chat-7b-v3-1-awq': BaseAiTextGeneration
+	'@hf/thebloke/llamaguard-7b-awq': BaseAiTextGeneration
+	'@hf/thebloke/deepseek-coder-6.7b-base-awq': BaseAiTextGeneration
+	'@hf/thebloke/deepseek-coder-6.7b-instruct-awq': BaseAiTextGeneration
+	'@cf/deepseek-ai/deepseek-math-7b-instruct': BaseAiTextGeneration
+	'@cf/defog/sqlcoder-7b-2': BaseAiTextGeneration
+	'@cf/openchat/openchat-3.5-0106': BaseAiTextGeneration
+	'@cf/tiiuae/falcon-7b-instruct': BaseAiTextGeneration
+	'@cf/thebloke/discolm-german-7b-v1-awq': BaseAiTextGeneration
+	'@cf/qwen/qwen1.5-0.5b-chat': BaseAiTextGeneration
+	'@cf/qwen/qwen1.5-7b-chat-awq': BaseAiTextGeneration
+	'@cf/qwen/qwen1.5-14b-chat-awq': BaseAiTextGeneration
+	'@cf/tinyllama/tinyllama-1.1b-chat-v1.0': BaseAiTextGeneration
+	'@cf/microsoft/phi-2': BaseAiTextGeneration
+	'@cf/qwen/qwen1.5-1.8b-chat': BaseAiTextGeneration
+	'@cf/mistral/mistral-7b-instruct-v0.2-lora': BaseAiTextGeneration
+	'@hf/nousresearch/hermes-2-pro-mistral-7b': BaseAiTextGeneration
+	'@hf/nexusflow/starling-lm-7b-beta': BaseAiTextGeneration
+	'@hf/google/gemma-7b-it': BaseAiTextGeneration
+	'@cf/meta-llama/llama-2-7b-chat-hf-lora': BaseAiTextGeneration
+	'@cf/google/gemma-2b-it-lora': BaseAiTextGeneration
+	'@cf/google/gemma-7b-it-lora': BaseAiTextGeneration
+	'@hf/mistral/mistral-7b-instruct-v0.2': BaseAiTextGeneration
+	'@cf/meta/llama-3-8b-instruct': BaseAiTextGeneration
+	'@cf/fblgit/una-cybertron-7b-v2-bf16': BaseAiTextGeneration
+	'@cf/meta/llama-3-8b-instruct-awq': BaseAiTextGeneration
+	'@hf/meta-llama/meta-llama-3-8b-instruct': BaseAiTextGeneration
+	'@cf/meta/llama-3.1-8b-instruct': BaseAiTextGeneration
+	'@cf/meta/llama-3.1-8b-instruct-fp8': BaseAiTextGeneration
+	'@cf/meta/llama-3.1-8b-instruct-awq': BaseAiTextGeneration
+	'@cf/meta/llama-3.2-3b-instruct': BaseAiTextGeneration
+	'@cf/meta/llama-3.2-1b-instruct': BaseAiTextGeneration
+	'@cf/deepseek-ai/deepseek-r1-distill-qwen-32b': BaseAiTextGeneration
+	'@cf/facebook/bart-large-cnn': BaseAiSummarization
+	'@cf/llava-hf/llava-1.5-7b-hf': BaseAiImageToText
+	'@cf/baai/bge-base-en-v1.5': Base_Ai_Cf_Baai_Bge_Base_En_V1_5
+	'@cf/openai/whisper': Base_Ai_Cf_Openai_Whisper
+	'@cf/meta/m2m100-1.2b': Base_Ai_Cf_Meta_M2M100_1_2B
+	'@cf/baai/bge-small-en-v1.5': Base_Ai_Cf_Baai_Bge_Small_En_V1_5
+	'@cf/baai/bge-large-en-v1.5': Base_Ai_Cf_Baai_Bge_Large_En_V1_5
+	'@cf/unum/uform-gen2-qwen-500m': Base_Ai_Cf_Unum_Uform_Gen2_Qwen_500M
+	'@cf/openai/whisper-tiny-en': Base_Ai_Cf_Openai_Whisper_Tiny_En
+	'@cf/openai/whisper-large-v3-turbo': Base_Ai_Cf_Openai_Whisper_Large_V3_Turbo
+	'@cf/baai/bge-m3': Base_Ai_Cf_Baai_Bge_M3
+	'@cf/black-forest-labs/flux-1-schnell': Base_Ai_Cf_Black_Forest_Labs_Flux_1_Schnell
+	'@cf/meta/llama-3.2-11b-vision-instruct': Base_Ai_Cf_Meta_Llama_3_2_11B_Vision_Instruct
+	'@cf/meta/llama-3.3-70b-instruct-fp8-fast': Base_Ai_Cf_Meta_Llama_3_3_70B_Instruct_Fp8_Fast
+	'@cf/meta/llama-guard-3-8b': Base_Ai_Cf_Meta_Llama_Guard_3_8B
+	'@cf/baai/bge-reranker-base': Base_Ai_Cf_Baai_Bge_Reranker_Base
+	'@cf/qwen/qwen2.5-coder-32b-instruct': Base_Ai_Cf_Qwen_Qwen2_5_Coder_32B_Instruct
+	'@cf/qwen/qwq-32b': Base_Ai_Cf_Qwen_Qwq_32B
+	'@cf/mistralai/mistral-small-3.1-24b-instruct': Base_Ai_Cf_Mistralai_Mistral_Small_3_1_24B_Instruct
+	'@cf/google/gemma-3-12b-it': Base_Ai_Cf_Google_Gemma_3_12B_It
+	'@cf/meta/llama-4-scout-17b-16e-instruct': Base_Ai_Cf_Meta_Llama_4_Scout_17B_16E_Instruct
+}
+type AiOptions = {
+	/**
+	 * Send requests as an asynchronous batch job, only works for supported models
+	 * https://developers.cloudflare.com/workers-ai/features/batch-api
+	 */
+	queueRequest?: boolean
+	gateway?: GatewayOptions
+	returnRawResponse?: boolean
+	prefix?: string
+	extraHeaders?: object
+}
+type ConversionResponse = {
+	name: string
+	mimeType: string
+	format: 'markdown'
+	tokens: number
+	data: string
+}
+type AiModelsSearchParams = {
+	author?: string
+	hide_experimental?: boolean
+	page?: number
+	per_page?: number
+	search?: string
+	source?: number
+	task?: string
+}
+type AiModelsSearchObject = {
+	id: string
+	source: number
+	name: string
+	description: string
+	task: {
+		id: string
+		name: string
+		description: string
+	}
+	tags: string[]
+	properties: {
+		property_id: string
+		value: string
+	}[]
+}
+interface InferenceUpstreamError extends Error {}
+interface AiInternalError extends Error {}
+type AiModelListType = Record<string, any>
+declare abstract class Ai<AiModelList extends AiModelListType = AiModels> {
+	aiGatewayLogId: string | null
+	gateway(gatewayId: string): AiGateway
+	autorag(autoragId: string): AutoRAG
+	run<
+		Name extends keyof AiModelList,
+		Options extends AiOptions,
+		InputOptions extends AiModelList[Name]['inputs'],
+	>(
+		model: Name,
+		inputs: InputOptions,
+		options?: Options
+	): Promise<
+		Options extends {
+			returnRawResponse: true
+		}
+			? Response
+			: InputOptions extends {
+						stream: true
+				  }
+				? ReadableStream
+				: AiModelList[Name]['postProcessedOutputs']
+	>
+	models(params?: AiModelsSearchParams): Promise<AiModelsSearchObject[]>
+	toMarkdown(
+		files: {
+			name: string
+			blob: Blob
+		}[],
+		options?: {
+			gateway?: GatewayOptions
+			extraHeaders?: object
+		}
+	): Promise<ConversionResponse[]>
+	toMarkdown(
+		files: {
+			name: string
+			blob: Blob
+		},
+		options?: {
+			gateway?: GatewayOptions
+			extraHeaders?: object
+		}
+	): Promise<ConversionResponse>
+}
+type GatewayRetries = {
+	maxAttempts?: 1 | 2 | 3 | 4 | 5
+	retryDelayMs?: number
+	backoff?: 'constant' | 'linear' | 'exponential'
+}
+type GatewayOptions = {
+	id: string
+	cacheKey?: string
+	cacheTtl?: number
+	skipCache?: boolean
+	metadata?: Record<string, number | string | boolean | null | bigint>
+	collectLog?: boolean
+	eventId?: string
+	requestTimeoutMs?: number
+	retries?: GatewayRetries
+}
+type AiGatewayPatchLog = {
+	score?: number | null
+	feedback?: -1 | 1 | null
+	metadata?: Record<string, number | string | boolean | null | bigint> | null
+}
+type AiGatewayLog = {
+	id: string
+	provider: string
+	model: string
+	model_type?: string
+	path: string
+	duration: number
+	request_type?: string
+	request_content_type?: string
+	status_code: number
+	response_content_type?: string
+	success: boolean
+	cached: boolean
+	tokens_in?: number
+	tokens_out?: number
+	metadata?: Record<string, number | string | boolean | null | bigint>
+	step?: number
+	cost?: number
+	custom_cost?: boolean
+	request_size: number
+	request_head?: string
+	request_head_complete: boolean
+	response_size: number
+	response_head?: string
+	response_head_complete: boolean
+	created_at: Date
+}
+type AIGatewayProviders =
+	| 'workers-ai'
+	| 'anthropic'
+	| 'aws-bedrock'
+	| 'azure-openai'
+	| 'google-vertex-ai'
+	| 'huggingface'
+	| 'openai'
+	| 'perplexity-ai'
+	| 'replicate'
+	| 'groq'
+	| 'cohere'
+	| 'google-ai-studio'
+	| 'mistral'
+	| 'grok'
+	| 'openrouter'
+	| 'deepseek'
+	| 'cerebras'
+	| 'cartesia'
+	| 'elevenlabs'
+	| 'adobe-firefly'
+type AIGatewayHeaders = {
+	'cf-aig-metadata': Record<string, number | string | boolean | null | bigint> | string
+	'cf-aig-custom-cost':
+		| {
+				per_token_in?: number
+				per_token_out?: number
+		  }
+		| {
+				total_cost?: number
+		  }
+		| string
+	'cf-aig-cache-ttl': number | string
+	'cf-aig-skip-cache': boolean | string
+	'cf-aig-cache-key': string
+	'cf-aig-event-id': string
+	'cf-aig-request-timeout': number | string
+	'cf-aig-max-attempts': number | string
+	'cf-aig-retry-delay': number | string
+	'cf-aig-backoff': string
+	'cf-aig-collect-log': boolean | string
+	Authorization: string
+	'Content-Type': string
+	[key: string]: string | number | boolean | object
+}
+type AIGatewayUniversalRequest = {
+	provider: AIGatewayProviders | string // eslint-disable-line
+	endpoint: string
+	headers: Partial<AIGatewayHeaders>
+	query: unknown
+}
+interface AiGatewayInternalError extends Error {}
+interface AiGatewayLogNotFound extends Error {}
+declare abstract class AiGateway {
+	patchLog(logId: string, data: AiGatewayPatchLog): Promise<void>
+	getLog(logId: string): Promise<AiGatewayLog>
+	run(
+		data: AIGatewayUniversalRequest | AIGatewayUniversalRequest[],
+		options?: {
+			gateway?: GatewayOptions
+			extraHeaders?: object
+		}
+	): Promise<Response>
+	getUrl(provider?: AIGatewayProviders | string): Promise<string> // eslint-disable-line
+}
+interface AutoRAGInternalError extends Error {}
+interface AutoRAGNotFoundError extends Error {}
+interface AutoRAGUnauthorizedError extends Error {}
+interface AutoRAGNameNotSetError extends Error {}
+type ComparisonFilter = {
+	key: string
+	type: 'eq' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte'
+	value: string | number | boolean
+}
+type CompoundFilter = {
+	type: 'and' | 'or'
+	filters: ComparisonFilter[]
+}
+type AutoRagSearchRequest = {
+	query: string
+	filters?: CompoundFilter | ComparisonFilter
+	max_num_results?: number
+	ranking_options?: {
+		ranker?: string
+		score_threshold?: number
+	}
+	rewrite_query?: boolean
+}
+type AutoRagAiSearchRequest = AutoRagSearchRequest & {
+	stream?: boolean
+}
+type AutoRagAiSearchRequestStreaming = Omit<AutoRagAiSearchRequest, 'stream'> & {
+	stream: true
+}
+type AutoRagSearchResponse = {
+	object: 'vector_store.search_results.page'
+	search_query: string
+	data: {
+		file_id: string
+		filename: string
+		score: number
+		attributes: Record<string, string | number | boolean | null>
+		content: {
+			type: 'text'
+			text: string
+		}[]
+	}[]
+	has_more: boolean
+	next_page: string | null
+}
+type AutoRagListResponse = {
+	id: string
+	enable: boolean
+	type: string
+	source: string
+	vectorize_name: string
+	paused: boolean
+	status: string
+}[]
+type AutoRagAiSearchResponse = AutoRagSearchResponse & {
+	response: string
+}
+declare abstract class AutoRAG {
+	list(): Promise<AutoRagListResponse>
+	search(params: AutoRagSearchRequest): Promise<AutoRagSearchResponse>
+	aiSearch(params: AutoRagAiSearchRequestStreaming): Promise<Response>
+	aiSearch(params: AutoRagAiSearchRequest): Promise<AutoRagAiSearchResponse>
+	aiSearch(params: AutoRagAiSearchRequest): Promise<AutoRagAiSearchResponse | Response>
+}
+interface BasicImageTransformations {
+	/**
+	 * Maximum width in image pixels. The value must be an integer.
+	 */
+	width?: number
+	/**
+	 * Maximum height in image pixels. The value must be an integer.
+	 */
+	height?: number
+	/**
+	 * Resizing mode as a string. It affects interpretation of width and height
+	 * options:
+	 *  - scale-down: Similar to contain, but the image is never enlarged. If
+	 *    the image is larger than given width or height, it will be resized.
+	 *    Otherwise its original size will be kept.
+	 *  - contain: Resizes to maximum size that fits within the given width and
+	 *    height. If only a single dimension is given (e.g. only width), the
+	 *    image will be shrunk or enlarged to exactly match that dimension.
+	 *    Aspect ratio is always preserved.
+	 *  - cover: Resizes (shrinks or enlarges) to fill the entire area of width
+	 *    and height. If the image has an aspect ratio different from the ratio
+	 *    of width and height, it will be cropped to fit.
+	 *  - crop: The image will be shrunk and cropped to fit within the area
+	 *    specified by width and height. The image will not be enlarged. For images
+	 *    smaller than the given dimensions it's the same as scale-down. For
+	 *    images larger than the given dimensions, it's the same as cover.
+	 *    See also trim.
+	 *  - pad: Resizes to the maximum size that fits within the given width and
+	 *    height, and then fills the remaining area with a background color
+	 *    (white by default). Use of this mode is not recommended, as the same
+	 *    effect can be more efficiently achieved with the contain mode and the
+	 *    CSS object-fit: contain property.
+	 *  - squeeze: Stretches and deforms to the width and height given, even if it
+	 *    breaks aspect ratio
+	 */
+	fit?: 'scale-down' | 'contain' | 'cover' | 'crop' | 'pad' | 'squeeze'
+	/**
+	 * When cropping with fit: "cover", this defines the side or point that should
+	 * be left uncropped. The value is either a string
+	 * "left", "right", "top", "bottom", "auto", or "center" (the default),
+	 * or an object {x, y} containing focal point coordinates in the original
+	 * image expressed as fractions ranging from 0.0 (top or left) to 1.0
+	 * (bottom or right), 0.5 being the center. {fit: "cover", gravity: "top"} will
+	 * crop bottom or left and right sides as necessary, but won’t crop anything
+	 * from the top. {fit: "cover", gravity: {x:0.5, y:0.2}} will crop each side to
+	 * preserve as much as possible around a point at 20% of the height of the
+	 * source image.
+	 */
+	gravity?:
+		| 'left'
+		| 'right'
+		| 'top'
+		| 'bottom'
+		| 'center'
+		| 'auto'
+		| 'entropy'
+		| BasicImageTransformationsGravityCoordinates
+	/**
+	 * Background color to add underneath the image. Applies only to images with
+	 * transparency (such as PNG). Accepts any CSS color (#RRGGBB, rgba(…),
+	 * hsl(…), etc.)
+	 */
+	background?: string
+	/**
+	 * Number of degrees (90, 180, 270) to rotate the image by. width and height
+	 * options refer to axes after rotation.
+	 */
+	rotate?: 0 | 90 | 180 | 270 | 360
+}
+interface BasicImageTransformationsGravityCoordinates {
+	x?: number
+	y?: number
+	mode?: 'remainder' | 'box-center'
+}
+/**
+ * In addition to the properties you can set in the RequestInit dict
+ * that you pass as an argument to the Request constructor, you can
+ * set certain properties of a `cf` object to control how Cloudflare
+ * features are applied to that new Request.
+ *
+ * Note: Currently, these properties cannot be tested in the
+ * playground.
+ */
+interface RequestInitCfProperties extends Record<string, unknown> {
+	cacheEverything?: boolean
+	/**
+	 * A request's cache key is what determines if two requests are
+	 * "the same" for caching purposes. If a request has the same cache key
+	 * as some previous request, then we can serve the same cached response for
+	 * both. (e.g. 'some-key')
+	 *
+	 * Only available for Enterprise customers.
+	 */
+	cacheKey?: string
+	/**
+	 * This allows you to append additional Cache-Tag response headers
+	 * to the origin response without modifications to the origin server.
+	 * This will allow for greater control over the Purge by Cache Tag feature
+	 * utilizing changes only in the Workers process.
+	 *
+	 * Only available for Enterprise customers.
+	 */
+	cacheTags?: string[]
+	/**
+	 * Force response to be cached for a given number of seconds. (e.g. 300)
+	 */
+	cacheTtl?: number
+	/**
+	 * Force response to be cached for a given number of seconds based on the Origin status code.
+	 * (e.g. { '200-299': 86400, '404': 1, '500-599': 0 })
+	 */
+	cacheTtlByStatus?: Record<string, number>
+	scrapeShield?: boolean
+	apps?: boolean
+	image?: RequestInitCfPropertiesImage
+	minify?: RequestInitCfPropertiesImageMinify
+	mirage?: boolean
+	polish?: 'lossy' | 'lossless' | 'off'
+	r2?: RequestInitCfPropertiesR2
+	/**
+	 * Redirects the request to an alternate origin server. You can use this,
+	 * for example, to implement load balancing across several origins.
+	 * (e.g.us-east.example.com)
+	 *
+	 * Note - For security reasons, the hostname set in resolveOverride must
+	 * be proxied on the same Cloudflare zone of the incoming request.
+	 * Otherwise, the setting is ignored. CNAME hosts are allowed, so to
+	 * resolve to a host under a different domain or a DNS only domain first
+	 * declare a CNAME record within your own zone’s DNS mapping to the
+	 * external hostname, set proxy on Cloudflare, then set resolveOverride
+	 * to point to that CNAME record.
+	 */
+	resolveOverride?: string
+}
+interface RequestInitCfPropertiesImageDraw extends BasicImageTransformations {
+	/**
+	 * Absolute URL of the image file to use for the drawing. It can be any of
+	 * the supported file formats. For drawing of watermarks or non-rectangular
+	 * overlays we recommend using PNG or WebP images.
+	 */
+	url: string
+	/**
+	 * Floating-point number between 0 (transparent) and 1 (opaque).
+	 * For example, opacity: 0.5 makes overlay semitransparent.
+	 */
+	opacity?: number
+	/**
+	 * - If set to true, the overlay image will be tiled to cover the entire
+	 *   area. This is useful for stock-photo-like watermarks.
+	 * - If set to "x", the overlay image will be tiled horizontally only
+	 *   (form a line).
+	 * - If set to "y", the overlay image will be tiled vertically only
+	 *   (form a line).
+	 */
+	repeat?: true | 'x' | 'y'
+	/**
+	 * Position of the overlay image relative to a given edge. Each property is
+	 * an offset in pixels. 0 aligns exactly to the edge. For example, left: 10
+	 * positions left side of the overlay 10 pixels from the left edge of the
+	 * image it's drawn over. bottom: 0 aligns bottom of the overlay with bottom
+	 * of the background image.
+	 *
+	 * Setting both left & right, or both top & bottom is an error.
+	 *
+	 * If no position is specified, the image will be centered.
+	 */
+	top?: number
+	left?: number
+	bottom?: number
+	right?: number
+}
+interface RequestInitCfPropertiesImage extends BasicImageTransformations {
+	/**
+	 * Device Pixel Ratio. Default 1. Multiplier for width/height that makes it
+	 * easier to specify higher-DPI sizes in <img srcset>.
+	 */
+	dpr?: number
+	/**
+	 * Allows you to trim your image. Takes dpr into account and is performed before
+	 * resizing or rotation.
+	 *
+	 * It can be used as:
+	 * - left, top, right, bottom - it will specify the number of pixels to cut
+	 *   off each side
+	 * - width, height - the width/height you'd like to end up with - can be used
+	 *   in combination with the properties above
+	 * - border - this will automatically trim the surroundings of an image based on
+	 *   it's color. It consists of three properties:
+	 *    - color: rgb or hex representation of the color you wish to trim (todo: verify the rgba bit)
+	 *    - tolerance: difference from color to treat as color
+	 *    - keep: the number of pixels of border to keep
+	 */
+	trim?:
+		| 'border'
+		| {
+				top?: number
+				bottom?: number
+				left?: number
+				right?: number
+				width?: number
+				height?: number
+				border?:
+					| boolean
+					| {
+							color?: string
+							tolerance?: number
+							keep?: number
+					  }
+		  }
+	/**
+	 * Quality setting from 1-100 (useful values are in 60-90 range). Lower values
+	 * make images look worse, but load faster. The default is 85. It applies only
+	 * to JPEG and WebP images. It doesn’t have any effect on PNG.
+	 */
+	quality?: number | 'low' | 'medium-low' | 'medium-high' | 'high'
+	/**
+	 * Output format to generate. It can be:
+	 *  - avif: generate images in AVIF format.
+	 *  - webp: generate images in Google WebP format. Set quality to 100 to get
+	 *    the WebP-lossless format.
+	 *  - json: instead of generating an image, outputs information about the
+	 *    image, in JSON format. The JSON object will contain image size
+	 *    (before and after resizing), source image’s MIME type, file size, etc.
+	 * - jpeg: generate images in JPEG format.
+	 * - png: generate images in PNG format.
+	 */
+	format?: 'avif' | 'webp' | 'json' | 'jpeg' | 'png' | 'baseline-jpeg' | 'png-force' | 'svg'
+	/**
+	 * Whether to preserve animation frames from input files. Default is true.
+	 * Setting it to false reduces animations to still images. This setting is
+	 * recommended when enlarging images or processing arbitrary user content,
+	 * because large GIF animations can weigh tens or even hundreds of megabytes.
+	 * It is also useful to set anim:false when using format:"json" to get the
+	 * response quicker without the number of frames.
+	 */
+	anim?: boolean
+	/**
+	 * What EXIF data should be preserved in the output image. Note that EXIF
+	 * rotation and embedded color profiles are always applied ("baked in" into
+	 * the image), and aren't affected by this option. Note that if the Polish
+	 * feature is enabled, all metadata may have been removed already and this
+	 * option may have no effect.
+	 *  - keep: Preserve most of EXIF metadata, including GPS location if there's
+	 *    any.
+	 *  - copyright: Only keep the copyright tag, and discard everything else.
+	 *    This is the default behavior for JPEG files.
+	 *  - none: Discard all invisible EXIF metadata. Currently WebP and PNG
+	 *    output formats always discard metadata.
+	 */
+	metadata?: 'keep' | 'copyright' | 'none'
+	/**
+	 * Strength of sharpening filter to apply to the image. Floating-point
+	 * number between 0 (no sharpening, default) and 10 (maximum). 1.0 is a
+	 * recommended value for downscaled images.
+	 */
+	sharpen?: number
+	/**
+	 * Radius of a blur filter (approximate gaussian). Maximum supported radius
+	 * is 250.
+	 */
+	blur?: number
+	/**
+	 * Overlays are drawn in the order they appear in the array (last array
+	 * entry is the topmost layer).
+	 */
+	draw?: RequestInitCfPropertiesImageDraw[]
+	/**
+	 * Fetching image from authenticated origin. Setting this property will
+	 * pass authentication headers (Authorization, Cookie, etc.) through to
+	 * the origin.
+	 */
+	'origin-auth'?: 'share-publicly'
+	/**
+	 * Adds a border around the image. The border is added after resizing. Border
+	 * width takes dpr into account, and can be specified either using a single
+	 * width property, or individually for each side.
+	 */
+	border?:
+		| {
+				color: string
+				width: number
+		  }
+		| {
+				color: string
+				top: number
+				right: number
+				bottom: number
+				left: number
+		  }
+	/**
+	 * Increase brightness by a factor. A value of 1.0 equals no change, a value
+	 * of 0.5 equals half brightness, and a value of 2.0 equals twice as bright.
+	 * 0 is ignored.
+	 */
+	brightness?: number
+	/**
+	 * Increase contrast by a factor. A value of 1.0 equals no change, a value of
+	 * 0.5 equals low contrast, and a value of 2.0 equals high contrast. 0 is
+	 * ignored.
+	 */
+	contrast?: number
+	/**
+	 * Increase exposure by a factor. A value of 1.0 equals no change, a value of
+	 * 0.5 darkens the image, and a value of 2.0 lightens the image. 0 is ignored.
+	 */
+	gamma?: number
+	/**
+	 * Increase contrast by a factor. A value of 1.0 equals no change, a value of
+	 * 0.5 equals low contrast, and a value of 2.0 equals high contrast. 0 is
+	 * ignored.
+	 */
+	saturation?: number
+	/**
+	 * Flips the images horizontally, vertically, or both. Flipping is applied before
+	 * rotation, so if you apply flip=h,rotate=90 then the image will be flipped
+	 * horizontally, then rotated by 90 degrees.
+	 */
+	flip?: 'h' | 'v' | 'hv'
+	/**
+	 * Slightly reduces latency on a cache miss by selecting a
+	 * quickest-to-compress file format, at a cost of increased file size and
+	 * lower image quality. It will usually override the format option and choose
+	 * JPEG over WebP or AVIF. We do not recommend using this option, except in
+	 * unusual circumstances like resizing uncacheable dynamically-generated
+	 * images.
+	 */
+	compression?: 'fast'
+}
+interface RequestInitCfPropertiesImageMinify {
+	javascript?: boolean
+	css?: boolean
+	html?: boolean
+}
+interface RequestInitCfPropertiesR2 {
+	/**
+	 * Colo id of bucket that an object is stored in
+	 */
+	bucketColoId?: number
+}
+/**
+ * Request metadata provided by Cloudflare's edge.
+ */
+type IncomingRequestCfProperties<HostMetadata = unknown> = IncomingRequestCfPropertiesBase &
+	IncomingRequestCfPropertiesBotManagementEnterprise &
+	IncomingRequestCfPropertiesCloudflareForSaaSEnterprise<HostMetadata> &
+	IncomingRequestCfPropertiesGeographicInformation &
+	IncomingRequestCfPropertiesCloudflareAccessOrApiShield
+interface IncomingRequestCfPropertiesBase extends Record<string, unknown> {
+	/**
+	 * [ASN](https://www.iana.org/assignments/as-numbers/as-numbers.xhtml) of the incoming request.
+	 *
+	 * @example 395747
+	 */
+	asn: number
+	/**
+	 * The organization which owns the ASN of the incoming request.
+	 *
+	 * @example "Google Cloud"
+	 */
+	asOrganization: string
+	/**
+	 * The original value of the `Accept-Encoding` header if Cloudflare modified it.
+	 *
+	 * @example "gzip, deflate, br"
+	 */
+	clientAcceptEncoding?: string
+	/**
+	 * The number of milliseconds it took for the request to reach your worker.
+	 *
+	 * @example 22
+	 */
+	clientTcpRtt?: number
+	/**
+	 * The three-letter [IATA](https://en.wikipedia.org/wiki/IATA_airport_code)
+	 * airport code of the data center that the request hit.
+	 *
+	 * @example "DFW"
+	 */
+	colo: string
+	/**
+	 * Represents the upstream's response to a
+	 * [TCP `keepalive` message](https://tldp.org/HOWTO/TCP-Keepalive-HOWTO/overview.html)
+	 * from cloudflare.
+	 *
+	 * For workers with no upstream, this will always be `1`.
+	 *
+	 * @example 3
+	 */
+	edgeRequestKeepAliveStatus: IncomingRequestCfPropertiesEdgeRequestKeepAliveStatus
+	/**
+	 * The HTTP Protocol the request used.
+	 *
+	 * @example "HTTP/2"
+	 */
+	httpProtocol: string
+	/**
+	 * The browser-requested prioritization information in the request object.
+	 *
+	 * If no information was set, defaults to the empty string `""`
+	 *
+	 * @example "weight=192;exclusive=0;group=3;group-weight=127"
+	 * @default ""
+	 */
+	requestPriority: string
+	/**
+	 * The TLS version of the connection to Cloudflare.
+	 * In requests served over plaintext (without TLS), this property is the empty string `""`.
+	 *
+	 * @example "TLSv1.3"
+	 */
+	tlsVersion: string
+	/**
+	 * The cipher for the connection to Cloudflare.
+	 * In requests served over plaintext (without TLS), this property is the empty string `""`.
+	 *
+	 * @example "AEAD-AES128-GCM-SHA256"
+	 */
+	tlsCipher: string
+	/**
+	 * Metadata containing the [`HELLO`](https://www.rfc-editor.org/rfc/rfc5246#section-7.4.1.2) and [`FINISHED`](https://www.rfc-editor.org/rfc/rfc5246#section-7.4.9) messages from this request's TLS handshake.
+	 *
+	 * If the incoming request was served over plaintext (without TLS) this field is undefined.
+	 */
+	tlsExportedAuthenticator?: IncomingRequestCfPropertiesExportedAuthenticatorMetadata
+}
+interface IncomingRequestCfPropertiesBotManagementBase {
+	/**
+	 * Cloudflare’s [level of certainty](https://developers.cloudflare.com/bots/concepts/bot-score/) that a request comes from a bot,
+	 * represented as an integer percentage between `1` (almost certainly a bot) and `99` (almost certainly human).
+	 *
+	 * @example 54
+	 */
+	score: number
+	/**
+	 * A boolean value that is true if the request comes from a good bot, like Google or Bing.
+	 * Most customers choose to allow this traffic. For more details, see [Traffic from known bots](https://developers.cloudflare.com/firewall/known-issues-and-faq/#how-does-firewall-rules-handle-traffic-from-known-bots).
+	 */
+	verifiedBot: boolean
+	/**
+	 * A boolean value that is true if the request originates from a
+	 * Cloudflare-verified proxy service.
+	 */
+	corporateProxy: boolean
+	/**
+	 * A boolean value that's true if the request matches [file extensions](https://developers.cloudflare.com/bots/reference/static-resources/) for many types of static resources.
+	 */
+	staticResource: boolean
+	/**
+	 * List of IDs that correlate to the Bot Management heuristic detections made on a request (you can have multiple heuristic detections on the same request).
+	 */
+	detectionIds: number[]
+}
+interface IncomingRequestCfPropertiesBotManagement {
+	/**
+	 * Results of Cloudflare's Bot Management analysis
+	 */
+	botManagement: IncomingRequestCfPropertiesBotManagementBase
+	/**
+	 * Duplicate of `botManagement.score`.
+	 *
+	 * @deprecated
+	 */
+	clientTrustScore: number
+}
+interface IncomingRequestCfPropertiesBotManagementEnterprise
+	extends IncomingRequestCfPropertiesBotManagement {
+	/**
+	 * Results of Cloudflare's Bot Management analysis
+	 */
+	botManagement: IncomingRequestCfPropertiesBotManagementBase & {
+		/**
+		 * A [JA3 Fingerprint](https://developers.cloudflare.com/bots/concepts/ja3-fingerprint/) to help profile specific SSL/TLS clients
+		 * across different destination IPs, Ports, and X509 certificates.
+		 */
+		ja3Hash: string
+	}
+}
+interface IncomingRequestCfPropertiesCloudflareForSaaSEnterprise<HostMetadata> {
+	/**
+	 * Custom metadata set per-host in [Cloudflare for SaaS](https://developers.cloudflare.com/cloudflare-for-platforms/cloudflare-for-saas/).
+	 *
+	 * This field is only present if you have Cloudflare for SaaS enabled on your account
+	 * and you have followed the [required steps to enable it]((https://developers.cloudflare.com/cloudflare-for-platforms/cloudflare-for-saas/domain-support/custom-metadata/)).
+	 */
+	hostMetadata: HostMetadata
+}
+interface IncomingRequestCfPropertiesCloudflareAccessOrApiShield {
+	/**
+	 * Information about the client certificate presented to Cloudflare.
+	 *
+	 * This is populated when the incoming request is served over TLS using
+	 * either Cloudflare Access or API Shield (mTLS)
+	 * and the presented SSL certificate has a valid
+	 * [Certificate Serial Number](https://ldapwiki.com/wiki/Certificate%20Serial%20Number)
+	 * (i.e., not `null` or `""`).
+	 *
+	 * Otherwise, a set of placeholder values are used.
+	 *
+	 * The property `certPresented` will be set to `"1"` when
+	 * the object is populated (i.e. the above conditions were met).
+	 */
+	tlsClientAuth:
+		| IncomingRequestCfPropertiesTLSClientAuth
+		| IncomingRequestCfPropertiesTLSClientAuthPlaceholder
+}
+/**
+ * Metadata about the request's TLS handshake
+ */
+interface IncomingRequestCfPropertiesExportedAuthenticatorMetadata {
+	/**
+	 * The client's [`HELLO` message](https://www.rfc-editor.org/rfc/rfc5246#section-7.4.1.2), encoded in hexadecimal
+	 *
+	 * @example "44372ba35fa1270921d318f34c12f155dc87b682cf36a790cfaa3ba8737a1b5d"
+	 */
+	clientHandshake: string
+	/**
+	 * The server's [`HELLO` message](https://www.rfc-editor.org/rfc/rfc5246#section-7.4.1.2), encoded in hexadecimal
+	 *
+	 * @example "44372ba35fa1270921d318f34c12f155dc87b682cf36a790cfaa3ba8737a1b5d"
+	 */
+	serverHandshake: string
+	/**
+	 * The client's [`FINISHED` message](https://www.rfc-editor.org/rfc/rfc5246#section-7.4.9), encoded in hexadecimal
+	 *
+	 * @example "084ee802fe1348f688220e2a6040a05b2199a761f33cf753abb1b006792d3f8b"
+	 */
+	clientFinished: string
+	/**
+	 * The server's [`FINISHED` message](https://www.rfc-editor.org/rfc/rfc5246#section-7.4.9), encoded in hexadecimal
+	 *
+	 * @example "084ee802fe1348f688220e2a6040a05b2199a761f33cf753abb1b006792d3f8b"
+	 */
+	serverFinished: string
+}
+/**
+ * Geographic data about the request's origin.
+ */
+interface IncomingRequestCfPropertiesGeographicInformation {
+	/**
+	 * The [ISO 3166-1 Alpha 2](https://www.iso.org/iso-3166-country-codes.html) country code the request originated from.
+	 *
+	 * If your worker is [configured to accept TOR connections](https://support.cloudflare.com/hc/en-us/articles/203306930-Understanding-Cloudflare-Tor-support-and-Onion-Routing), this may also be `"T1"`, indicating a request that originated over TOR.
+	 *
+	 * If Cloudflare is unable to determine where the request originated this property is omitted.
+	 *
+	 * The country code `"T1"` is used for requests originating on TOR.
+	 *
+	 * @example "GB"
+	 */
+	country?: Iso3166Alpha2Code | 'T1'
+	/**
+	 * If present, this property indicates that the request originated in the EU
+	 *
+	 * @example "1"
+	 */
+	isEUCountry?: '1'
+	/**
+	 * A two-letter code indicating the continent the request originated from.
+	 *
+	 * @example "AN"
+	 */
+	continent?: ContinentCode
+	/**
+	 * The city the request originated from
+	 *
+	 * @example "Austin"
+	 */
+	city?: string
+	/**
+	 * Postal code of the incoming request
+	 *
+	 * @example "78701"
+	 */
+	postalCode?: string
+	/**
+	 * Latitude of the incoming request
+	 *
+	 * @example "30.27130"
+	 */
+	latitude?: string
+	/**
+	 * Longitude of the incoming request
+	 *
+	 * @example "-97.74260"
+	 */
+	longitude?: string
+	/**
+	 * Timezone of the incoming request
+	 *
+	 * @example "America/Chicago"
+	 */
+	timezone?: string
+	/**
+	 * If known, the ISO 3166-2 name for the first level region associated with
+	 * the IP address of the incoming request
+	 *
+	 * @example "Texas"
+	 */
+	region?: string
+	/**
+	 * If known, the ISO 3166-2 code for the first-level region associated with
+	 * the IP address of the incoming request
+	 *
+	 * @example "TX"
+	 */
+	regionCode?: string
+	/**
+	 * Metro code (DMA) of the incoming request
+	 *
+	 * @example "635"
+	 */
+	metroCode?: string
+}
+/** Data about the incoming request's TLS certificate */
+interface IncomingRequestCfPropertiesTLSClientAuth {
+	/** Always `"1"`, indicating that the certificate was presented */
+	certPresented: '1'
+	/**
+	 * Result of certificate verification.
+	 *
+	 * @example "FAILED:self signed certificate"
+	 */
+	certVerified: Exclude<CertVerificationStatus, 'NONE'>
+	/** The presented certificate's revokation status.
+	 *
+	 * - A value of `"1"` indicates the certificate has been revoked
+	 * - A value of `"0"` indicates the certificate has not been revoked
+	 */
+	certRevoked: '1' | '0'
+	/**
+	 * The certificate issuer's [distinguished name](https://knowledge.digicert.com/generalinformation/INFO1745.html)
+	 *
+	 * @example "CN=cloudflareaccess.com, C=US, ST=Texas, L=Austin, O=Cloudflare"
+	 */
+	certIssuerDN: string
+	/**
+	 * The certificate subject's [distinguished name](https://knowledge.digicert.com/generalinformation/INFO1745.html)
+	 *
+	 * @example "CN=*.cloudflareaccess.com, C=US, ST=Texas, L=Austin, O=Cloudflare"
+	 */
+	certSubjectDN: string
+	/**
+	 * The certificate issuer's [distinguished name](https://knowledge.digicert.com/generalinformation/INFO1745.html) ([RFC 2253](https://www.rfc-editor.org/rfc/rfc2253.html) formatted)
+	 *
+	 * @example "CN=cloudflareaccess.com, C=US, ST=Texas, L=Austin, O=Cloudflare"
+	 */
+	certIssuerDNRFC2253: string
+	/**
+	 * The certificate subject's [distinguished name](https://knowledge.digicert.com/generalinformation/INFO1745.html) ([RFC 2253](https://www.rfc-editor.org/rfc/rfc2253.html) formatted)
+	 *
+	 * @example "CN=*.cloudflareaccess.com, C=US, ST=Texas, L=Austin, O=Cloudflare"
+	 */
+	certSubjectDNRFC2253: string
+	/** The certificate issuer's distinguished name (legacy policies) */
+	certIssuerDNLegacy: string
+	/** The certificate subject's distinguished name (legacy policies) */
+	certSubjectDNLegacy: string
+	/**
+	 * The certificate's serial number
+	 *
+	 * @example "00936EACBE07F201DF"
+	 */
+	certSerial: string
+	/**
+	 * The certificate issuer's serial number
+	 *
+	 * @example "2489002934BDFEA34"
+	 */
+	certIssuerSerial: string
+	/**
+	 * The certificate's Subject Key Identifier
+	 *
+	 * @example "BB:AF:7E:02:3D:FA:A6:F1:3C:84:8E:AD:EE:38:98:EC:D9:32:32:D4"
+	 */
+	certSKI: string
+	/**
+	 * The certificate issuer's Subject Key Identifier
+	 *
+	 * @example "BB:AF:7E:02:3D:FA:A6:F1:3C:84:8E:AD:EE:38:98:EC:D9:32:32:D4"
+	 */
+	certIssuerSKI: string
+	/**
+	 * The certificate's SHA-1 fingerprint
+	 *
+	 * @example "6b9109f323999e52259cda7373ff0b4d26bd232e"
+	 */
+	certFingerprintSHA1: string
+	/**
+	 * The certificate's SHA-256 fingerprint
+	 *
+	 * @example "acf77cf37b4156a2708e34c4eb755f9b5dbbe5ebb55adfec8f11493438d19e6ad3f157f81fa3b98278453d5652b0c1fd1d71e5695ae4d709803a4d3f39de9dea"
+	 */
+	certFingerprintSHA256: string
+	/**
+	 * The effective starting date of the certificate
+	 *
+	 * @example "Dec 22 19:39:00 2018 GMT"
+	 */
+	certNotBefore: string
+	/**
+	 * The effective expiration date of the certificate
+	 *
+	 * @example "Dec 22 19:39:00 2018 GMT"
+	 */
+	certNotAfter: string
+}
+/** Placeholder values for TLS Client Authorization */
+interface IncomingRequestCfPropertiesTLSClientAuthPlaceholder {
+	certPresented: '0'
+	certVerified: 'NONE'
+	certRevoked: '0'
+	certIssuerDN: ''
+	certSubjectDN: ''
+	certIssuerDNRFC2253: ''
+	certSubjectDNRFC2253: ''
+	certIssuerDNLegacy: ''
+	certSubjectDNLegacy: ''
+	certSerial: ''
+	certIssuerSerial: ''
+	certSKI: ''
+	certIssuerSKI: ''
+	certFingerprintSHA1: ''
+	certFingerprintSHA256: ''
+	certNotBefore: ''
+	certNotAfter: ''
+}
+/** Possible outcomes of TLS verification */
+declare type CertVerificationStatus =
+	/** Authentication succeeded */
+	| 'SUCCESS'
+	/** No certificate was presented */
+	| 'NONE'
+	/** Failed because the certificate was self-signed */
+	| 'FAILED:self signed certificate'
+	/** Failed because the certificate failed a trust chain check */
+	| 'FAILED:unable to verify the first certificate'
+	/** Failed because the certificate not yet valid */
+	| 'FAILED:certificate is not yet valid'
+	/** Failed because the certificate is expired */
+	| 'FAILED:certificate has expired'
+	/** Failed for another unspecified reason */
+	| 'FAILED'
+/**
+ * An upstream endpoint's response to a TCP `keepalive` message from Cloudflare.
+ */
+declare type IncomingRequestCfPropertiesEdgeRequestKeepAliveStatus =
+	| 0 /** Unknown */
+	| 1 /** no keepalives (not found) */
+	| 2 /** no connection re-use, opening keepalive connection failed */
+	| 3 /** no connection re-use, keepalive accepted and saved */
+	| 4 /** connection re-use, refused by the origin server (`TCP FIN`) */
+	| 5 /** connection re-use, accepted by the origin server */
+/** ISO 3166-1 Alpha-2 codes */
+declare type Iso3166Alpha2Code =
+	| 'AD'
+	| 'AE'
+	| 'AF'
+	| 'AG'
+	| 'AI'
+	| 'AL'
+	| 'AM'
+	| 'AO'
+	| 'AQ'
+	| 'AR'
+	| 'AS'
+	| 'AT'
+	| 'AU'
+	| 'AW'
+	| 'AX'
+	| 'AZ'
+	| 'BA'
+	| 'BB'
+	| 'BD'
+	| 'BE'
+	| 'BF'
+	| 'BG'
+	| 'BH'
+	| 'BI'
+	| 'BJ'
+	| 'BL'
+	| 'BM'
+	| 'BN'
+	| 'BO'
+	| 'BQ'
+	| 'BR'
+	| 'BS'
+	| 'BT'
+	| 'BV'
+	| 'BW'
+	| 'BY'
+	| 'BZ'
+	| 'CA'
+	| 'CC'
+	| 'CD'
+	| 'CF'
+	| 'CG'
+	| 'CH'
+	| 'CI'
+	| 'CK'
+	| 'CL'
+	| 'CM'
+	| 'CN'
+	| 'CO'
+	| 'CR'
+	| 'CU'
+	| 'CV'
+	| 'CW'
+	| 'CX'
+	| 'CY'
+	| 'CZ'
+	| 'DE'
+	| 'DJ'
+	| 'DK'
+	| 'DM'
+	| 'DO'
+	| 'DZ'
+	| 'EC'
+	| 'EE'
+	| 'EG'
+	| 'EH'
+	| 'ER'
+	| 'ES'
+	| 'ET'
+	| 'FI'
+	| 'FJ'
+	| 'FK'
+	| 'FM'
+	| 'FO'
+	| 'FR'
+	| 'GA'
+	| 'GB'
+	| 'GD'
+	| 'GE'
+	| 'GF'
+	| 'GG'
+	| 'GH'
+	| 'GI'
+	| 'GL'
+	| 'GM'
+	| 'GN'
+	| 'GP'
+	| 'GQ'
+	| 'GR'
+	| 'GS'
+	| 'GT'
+	| 'GU'
+	| 'GW'
+	| 'GY'
+	| 'HK'
+	| 'HM'
+	| 'HN'
+	| 'HR'
+	| 'HT'
+	| 'HU'
+	| 'ID'
+	| 'IE'
+	| 'IL'
+	| 'IM'
+	| 'IN'
+	| 'IO'
+	| 'IQ'
+	| 'IR'
+	| 'IS'
+	| 'IT'
+	| 'JE'
+	| 'JM'
+	| 'JO'
+	| 'JP'
+	| 'KE'
+	| 'KG'
+	| 'KH'
+	| 'KI'
+	| 'KM'
+	| 'KN'
+	| 'KP'
+	| 'KR'
+	| 'KW'
+	| 'KY'
+	| 'KZ'
+	| 'LA'
+	| 'LB'
+	| 'LC'
+	| 'LI'
+	| 'LK'
+	| 'LR'
+	| 'LS'
+	| 'LT'
+	| 'LU'
+	| 'LV'
+	| 'LY'
+	| 'MA'
+	| 'MC'
+	| 'MD'
+	| 'ME'
+	| 'MF'
+	| 'MG'
+	| 'MH'
+	| 'MK'
+	| 'ML'
+	| 'MM'
+	| 'MN'
+	| 'MO'
+	| 'MP'
+	| 'MQ'
+	| 'MR'
+	| 'MS'
+	| 'MT'
+	| 'MU'
+	| 'MV'
+	| 'MW'
+	| 'MX'
+	| 'MY'
+	| 'MZ'
+	| 'NA'
+	| 'NC'
+	| 'NE'
+	| 'NF'
+	| 'NG'
+	| 'NI'
+	| 'NL'
+	| 'NO'
+	| 'NP'
+	| 'NR'
+	| 'NU'
+	| 'NZ'
+	| 'OM'
+	| 'PA'
+	| 'PE'
+	| 'PF'
+	| 'PG'
+	| 'PH'
+	| 'PK'
+	| 'PL'
+	| 'PM'
+	| 'PN'
+	| 'PR'
+	| 'PS'
+	| 'PT'
+	| 'PW'
+	| 'PY'
+	| 'QA'
+	| 'RE'
+	| 'RO'
+	| 'RS'
+	| 'RU'
+	| 'RW'
+	| 'SA'
+	| 'SB'
+	| 'SC'
+	| 'SD'
+	| 'SE'
+	| 'SG'
+	| 'SH'
+	| 'SI'
+	| 'SJ'
+	| 'SK'
+	| 'SL'
+	| 'SM'
+	| 'SN'
+	| 'SO'
+	| 'SR'
+	| 'SS'
+	| 'ST'
+	| 'SV'
+	| 'SX'
+	| 'SY'
+	| 'SZ'
+	| 'TC'
+	| 'TD'
+	| 'TF'
+	| 'TG'
+	| 'TH'
+	| 'TJ'
+	| 'TK'
+	| 'TL'
+	| 'TM'
+	| 'TN'
+	| 'TO'
+	| 'TR'
+	| 'TT'
+	| 'TV'
+	| 'TW'
+	| 'TZ'
+	| 'UA'
+	| 'UG'
+	| 'UM'
+	| 'US'
+	| 'UY'
+	| 'UZ'
+	| 'VA'
+	| 'VC'
+	| 'VE'
+	| 'VG'
+	| 'VI'
+	| 'VN'
+	| 'VU'
+	| 'WF'
+	| 'WS'
+	| 'YE'
+	| 'YT'
+	| 'ZA'
+	| 'ZM'
+	| 'ZW'
+/** The 2-letter continent codes Cloudflare uses */
+declare type ContinentCode = 'AF' | 'AN' | 'AS' | 'EU' | 'NA' | 'OC' | 'SA'
+type CfProperties<HostMetadata = unknown> =
+	| IncomingRequestCfProperties<HostMetadata>
+	| RequestInitCfProperties
+interface D1Meta {
+	duration: number
+	size_after: number
+	rows_read: number
+	rows_written: number
+	last_row_id: number
+	changed_db: boolean
+	changes: number
+	/**
+	 * The region of the database instance that executed the query.
+	 */
+	served_by_region?: string
+	/**
+	 * True if-and-only-if the database instance that executed the query was the primary.
+	 */
+	served_by_primary?: boolean
+	timings?: {
+		/**
+		 * The duration of the SQL query execution by the database instance. It doesn't include any network time.
+		 */
+		sql_duration_ms: number
+	}
+}
+interface D1Response {
+	success: true
+	meta: D1Meta & Record<string, unknown>
+	error?: never
+}
+type D1Result<T = unknown> = D1Response & {
+	results: T[]
+}
+interface D1ExecResult {
+	count: number
+	duration: number
+}
+type D1SessionConstraint =
+	// Indicates that the first query should go to the primary, and the rest queries
+	// using the same D1DatabaseSession will go to any replica that is consistent with
+	// the bookmark maintained by the session (returned by the first query).
+	| 'first-primary'
+	// Indicates that the first query can go anywhere (primary or replica), and the rest queries
+	// using the same D1DatabaseSession will go to any replica that is consistent with
+	// the bookmark maintained by the session (returned by the first query).
+	| 'first-unconstrained'
+type D1SessionBookmark = string
+declare abstract class D1Database {
+	prepare(query: string): D1PreparedStatement
+	batch<T = unknown>(statements: D1PreparedStatement[]): Promise<D1Result<T>[]>
+	exec(query: string): Promise<D1ExecResult>
+	/**
+	 * Creates a new D1 Session anchored at the given constraint or the bookmark.
+	 * All queries executed using the created session will have sequential consistency,
+	 * meaning that all writes done through the session will be visible in subsequent reads.
+	 *
+	 * @param constraintOrBookmark Either the session constraint or the explicit bookmark to anchor the created session.
+	 */
+	withSession(constraintOrBookmark?: D1SessionBookmark | D1SessionConstraint): D1DatabaseSession
+	/**
+	 * @deprecated dump() will be removed soon, only applies to deprecated alpha v1 databases.
+	 */
+	dump(): Promise<ArrayBuffer>
+}
+declare abstract class D1DatabaseSession {
+	prepare(query: string): D1PreparedStatement
+	batch<T = unknown>(statements: D1PreparedStatement[]): Promise<D1Result<T>[]>
+	/**
+	 * @returns The latest session bookmark across all executed queries on the session.
+	 *          If no query has been executed yet, `null` is returned.
+	 */
+	getBookmark(): D1SessionBookmark | null
+}
+declare abstract class D1PreparedStatement {
+	bind(...values: unknown[]): D1PreparedStatement
+	first<T = unknown>(colName: string): Promise<T | null>
+	first<T = Record<string, unknown>>(): Promise<T | null>
+	run<T = Record<string, unknown>>(): Promise<D1Result<T>>
+	all<T = Record<string, unknown>>(): Promise<D1Result<T>>
+	raw<T = unknown[]>(options: { columnNames: true }): Promise<[string[], ...T[]]>
+	raw<T = unknown[]>(options?: { columnNames?: false }): Promise<T[]>
+}
+// `Disposable` was added to TypeScript's standard lib types in version 5.2.
+// To support older TypeScript versions, define an empty `Disposable` interface.
+// Users won't be able to use `using`/`Symbol.dispose` without upgrading to 5.2,
+// but this will ensure type checking on older versions still passes.
+// TypeScript's interface merging will ensure our empty interface is effectively
+// ignored when `Disposable` is included in the standard lib.
+interface Disposable {}
+/**
+ * An email message that can be sent from a Worker.
+ */
+interface EmailMessage {
+	/**
+	 * Envelope From attribute of the email message.
+	 */
+	readonly from: string
+	/**
+	 * Envelope To attribute of the email message.
+	 */
+	readonly to: string
+}
+/**
+ * An email message that is sent to a consumer Worker and can be rejected/forwarded.
+ */
+interface ForwardableEmailMessage extends EmailMessage {
+	/**
+	 * Stream of the email message content.
+	 */
+	readonly raw: ReadableStream<Uint8Array>
+	/**
+	 * An [Headers object](https://developer.mozilla.org/en-US/docs/Web/API/Headers).
+	 */
+	readonly headers: Headers
+	/**
+	 * Size of the email message content.
+	 */
+	readonly rawSize: number
+	/**
+	 * Reject this email message by returning a permanent SMTP error back to the connecting client including the given reason.
+	 * @param reason The reject reason.
+	 * @returns void
+	 */
+	setReject(reason: string): void
+	/**
+	 * Forward this email message to a verified destination address of the account.
+	 * @param rcptTo Verified destination address.
+	 * @param headers A [Headers object](https://developer.mozilla.org/en-US/docs/Web/API/Headers).
+	 * @returns A promise that resolves when the email message is forwarded.
+	 */
+	forward(rcptTo: string, headers?: Headers): Promise<void>
+	/**
+	 * Reply to the sender of this email message with a new EmailMessage object.
+	 * @param message The reply message.
+	 * @returns A promise that resolves when the email message is replied.
+	 */
+	reply(message: EmailMessage): Promise<void>
+}
+/**
+ * A binding that allows a Worker to send email messages.
+ */
+interface SendEmail {
+	send(message: EmailMessage): Promise<void>
+}
+declare abstract class EmailEvent extends ExtendableEvent {
+	readonly message: ForwardableEmailMessage
+}
+declare type EmailExportedHandler<Env = unknown> = (
+	message: ForwardableEmailMessage,
+	env: Env,
+	ctx: ExecutionContext
+) => void | Promise<void>
+declare module 'cloudflare:email' {
+	let _EmailMessage: {
+		prototype: EmailMessage
+		new (from: string, to: string, raw: ReadableStream | string): EmailMessage
+	}
+	export { _EmailMessage as EmailMessage }
+}
+interface Hyperdrive {
+	/**
+	 * Connect directly to Hyperdrive as if it's your database, returning a TCP socket.
+	 *
+	 * Calling this method returns an idential socket to if you call
+	 * `connect("host:port")` using the `host` and `port` fields from this object.
+	 * Pick whichever approach works better with your preferred DB client library.
+	 *
+	 * Note that this socket is not yet authenticated -- it's expected that your
+	 * code (or preferably, the client library of your choice) will authenticate
+	 * using the information in this class's readonly fields.
+	 */
+	connect(): Socket
+	/**
+	 * A valid DB connection string that can be passed straight into the typical
+	 * client library/driver/ORM. This will typically be the easiest way to use
+	 * Hyperdrive.
+	 */
+	readonly connectionString: string
+	/*
+	 * A randomly generated hostname that is only valid within the context of the
+	 * currently running Worker which, when passed into `connect()` function from
+	 * the "cloudflare:sockets" module, will connect to the Hyperdrive instance
+	 * for your database.
+	 */
+	readonly host: string
+	/*
+	 * The port that must be paired the the host field when connecting.
+	 */
+	readonly port: number
+	/*
+	 * The username to use when authenticating to your database via Hyperdrive.
+	 * Unlike the host and password, this will be the same every time
+	 */
+	readonly user: string
+	/*
+	 * The randomly generated password to use when authenticating to your
+	 * database via Hyperdrive. Like the host field, this password is only valid
+	 * within the context of the currently running Worker instance from which
+	 * it's read.
+	 */
+	readonly password: string
+	/*
+	 * The name of the database to connect to.
+	 */
+	readonly database: string
+}
+// Copyright (c) 2024 Cloudflare, Inc.
+// Licensed under the Apache 2.0 license found in the LICENSE file or at:
+//     https://opensource.org/licenses/Apache-2.0
+type ImageInfoResponse =
+	| {
+			format: 'image/svg+xml'
+	  }
+	| {
+			format: string
+			fileSize: number
+			width: number
+			height: number
+	  }
+type ImageTransform = {
+	width?: number
+	height?: number
+	background?: string
+	blur?: number
+	border?:
+		| {
+				color?: string
+				width?: number
+		  }
+		| {
+				top?: number
+				bottom?: number
+				left?: number
+				right?: number
+		  }
+	brightness?: number
+	contrast?: number
+	fit?: 'scale-down' | 'contain' | 'pad' | 'squeeze' | 'cover' | 'crop'
+	flip?: 'h' | 'v' | 'hv'
+	gamma?: number
+	gravity?:
+		| 'left'
+		| 'right'
+		| 'top'
+		| 'bottom'
+		| 'center'
+		| 'auto'
+		| 'entropy'
+		| {
+				x?: number
+				y?: number
+				mode: 'remainder' | 'box-center'
+		  }
+	rotate?: 0 | 90 | 180 | 270
+	saturation?: number
+	sharpen?: number
+	trim?:
+		| 'border'
+		| {
+				top?: number
+				bottom?: number
+				left?: number
+				right?: number
+				width?: number
+				height?: number
+				border?:
+					| boolean
+					| {
+							color?: string
+							tolerance?: number
+							keep?: number
+					  }
+		  }
+}
+type ImageDrawOptions = {
+	opacity?: number
+	repeat?: boolean | string
+	top?: number
+	left?: number
+	bottom?: number
+	right?: number
+}
+type ImageOutputOptions = {
+	format: 'image/jpeg' | 'image/png' | 'image/gif' | 'image/webp' | 'image/avif' | 'rgb' | 'rgba'
+	quality?: number
+	background?: string
+}
+interface ImagesBinding {
+	/**
+	 * Get image metadata (type, width and height)
+	 * @throws {@link ImagesError} with code 9412 if input is not an image
+	 * @param stream The image bytes
+	 */
+	info(stream: ReadableStream<Uint8Array>): Promise<ImageInfoResponse>
+	/**
+	 * Begin applying a series of transformations to an image
+	 * @param stream The image bytes
+	 * @returns A transform handle
+	 */
+	input(stream: ReadableStream<Uint8Array>): ImageTransformer
+}
+interface ImageTransformer {
+	/**
+	 * Apply transform next, returning a transform handle.
+	 * You can then apply more transformations, draw, or retrieve the output.
+	 * @param transform
+	 */
+	transform(transform: ImageTransform): ImageTransformer
+	/**
+	 * Draw an image on this transformer, returning a transform handle.
+	 * You can then apply more transformations, draw, or retrieve the output.
+	 * @param image The image (or transformer that will give the image) to draw
+	 * @param options The options configuring how to draw the image
+	 */
+	draw(
+		image: ReadableStream<Uint8Array> | ImageTransformer,
+		options?: ImageDrawOptions
+	): ImageTransformer
+	/**
+	 * Retrieve the image that results from applying the transforms to the
+	 * provided input
+	 * @param options Options that apply to the output e.g. output format
+	 */
+	output(options: ImageOutputOptions): Promise<ImageTransformationResult>
+}
+interface ImageTransformationResult {
+	/**
+	 * The image as a response, ready to store in cache or return to users
+	 */
+	response(): Response
+	/**
+	 * The content type of the returned image
+	 */
+	contentType(): string
+	/**
+	 * The bytes of the response
+	 */
+	image(): ReadableStream<Uint8Array>
+}
+interface ImagesError extends Error {
+	readonly code: number
+	readonly message: string
+	readonly stack?: string
+}
+type Params<P extends string = any> = Record<P, string | string[]>
+type EventContext<Env, P extends string, Data> = {
+	request: Request<unknown, IncomingRequestCfProperties<unknown>>
+	functionPath: string
+	waitUntil: (promise: Promise<any>) => void
+	passThroughOnException: () => void
+	next: (input?: Request | string, init?: RequestInit) => Promise<Response>
+	env: Env & {
+		ASSETS: {
+			fetch: typeof fetch
+		}
+	}
+	params: Params<P>
+	data: Data
+}
+type PagesFunction<
+	Env = unknown,
+	Params extends string = any,
+	Data extends Record<string, unknown> = Record<string, unknown>,
+> = (context: EventContext<Env, Params, Data>) => Response | Promise<Response>
+type EventPluginContext<Env, P extends string, Data, PluginArgs> = {
+	request: Request<unknown, IncomingRequestCfProperties<unknown>>
+	functionPath: string
+	waitUntil: (promise: Promise<any>) => void
+	passThroughOnException: () => void
+	next: (input?: Request | string, init?: RequestInit) => Promise<Response>
+	env: Env & {
+		ASSETS: {
+			fetch: typeof fetch
+		}
+	}
+	params: Params<P>
+	data: Data
+	pluginArgs: PluginArgs
+}
+type PagesPluginFunction<
+	Env = unknown,
+	Params extends string = any,
+	Data extends Record<string, unknown> = Record<string, unknown>,
+	PluginArgs = unknown,
+> = (context: EventPluginContext<Env, Params, Data, PluginArgs>) => Response | Promise<Response>
+declare module 'assets:*' {
+	export const onRequest: PagesFunction
+}
+// Copyright (c) 2022-2023 Cloudflare, Inc.
+// Licensed under the Apache 2.0 license found in the LICENSE file or at:
+//     https://opensource.org/licenses/Apache-2.0
+declare module 'cloudflare:pipelines' {
+	export abstract class PipelineTransformationEntrypoint<
+		Env = unknown,
+		I extends PipelineRecord = PipelineRecord,
+		O extends PipelineRecord = PipelineRecord,
+	> {
+		protected env: Env
+		protected ctx: ExecutionContext
+		constructor(ctx: ExecutionContext, env: Env)
+		/**
+		 * run recieves an array of PipelineRecord which can be
+		 * transformed and returned to the pipeline
+		 * @param records Incoming records from the pipeline to be transformed
+		 * @param metadata Information about the specific pipeline calling the transformation entrypoint
+		 * @returns A promise containing the transformed PipelineRecord array
+		 */
+		public run(records: I[], metadata: PipelineBatchMetadata): Promise<O[]>
+	}
+	export type PipelineRecord = Record<string, unknown>
+	export type PipelineBatchMetadata = {
+		pipelineId: string
+		pipelineName: string
+	}
+	export interface Pipeline<T extends PipelineRecord = PipelineRecord> {
+		/**
+		 * The Pipeline interface represents the type of a binding to a Pipeline
+		 *
+		 * @param records The records to send to the pipeline
+		 */
+		send(records: T[]): Promise<void>
+	}
+}
+// PubSubMessage represents an incoming PubSub message.
+// The message includes metadata about the broker, the client, and the payload
+// itself.
+// https://developers.cloudflare.com/pub-sub/
+interface PubSubMessage {
+	// Message ID
+	readonly mid: number
+	// MQTT broker FQDN in the form mqtts://BROKER.NAMESPACE.cloudflarepubsub.com:PORT
+	readonly broker: string
+	// The MQTT topic the message was sent on.
+	readonly topic: string
+	// The client ID of the client that published this message.
+	readonly clientId: string
+	// The unique identifier (JWT ID) used by the client to authenticate, if token
+	// auth was used.
+	readonly jti?: string
+	// A Unix timestamp (seconds from Jan 1, 1970), set when the Pub/Sub Broker
+	// received the message from the client.
+	readonly receivedAt: number
+	// An (optional) string with the MIME type of the payload, if set by the
+	// client.
+	readonly contentType: string
+	// Set to 1 when the payload is a UTF-8 string
+	// https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901063
+	readonly payloadFormatIndicator: number
+	// Pub/Sub (MQTT) payloads can be UTF-8 strings, or byte arrays.
+	// You can use payloadFormatIndicator to inspect this before decoding.
+	payload: string | Uint8Array
+}
+// JsonWebKey extended by kid parameter
+interface JsonWebKeyWithKid extends JsonWebKey {
+	// Key Identifier of the JWK
+	readonly kid: string
+}
+interface RateLimitOptions {
+	key: string
+}
+interface RateLimitOutcome {
+	success: boolean
+}
+interface RateLimit {
+	/**
+	 * Rate limit a request based on the provided options.
+	 * @see https://developers.cloudflare.com/workers/runtime-apis/bindings/rate-limit/
+	 * @returns A promise that resolves with the outcome of the rate limit.
+	 */
+	limit(options: RateLimitOptions): Promise<RateLimitOutcome>
+}
+// Namespace for RPC utility types. Unfortunately, we can't use a `module` here as these types need
+// to referenced by `Fetcher`. This is included in the "importable" version of the types which
+// strips all `module` blocks.
+declare namespace Rpc {
+	// Branded types for identifying `WorkerEntrypoint`/`DurableObject`/`Target`s.
+	// TypeScript uses *structural* typing meaning anything with the same shape as type `T` is a `T`.
+	// For the classes exported by `cloudflare:workers` we want *nominal* typing (i.e. we only want to
+	// accept `WorkerEntrypoint` from `cloudflare:workers`, not any other class with the same shape)
+	export const __RPC_STUB_BRAND: '__RPC_STUB_BRAND'
+	export const __RPC_TARGET_BRAND: '__RPC_TARGET_BRAND'
+	export const __WORKER_ENTRYPOINT_BRAND: '__WORKER_ENTRYPOINT_BRAND'
+	export const __DURABLE_OBJECT_BRAND: '__DURABLE_OBJECT_BRAND'
+	export const __WORKFLOW_ENTRYPOINT_BRAND: '__WORKFLOW_ENTRYPOINT_BRAND'
+	export interface RpcTargetBranded {
+		[__RPC_TARGET_BRAND]: never
+	}
+	export interface WorkerEntrypointBranded {
+		[__WORKER_ENTRYPOINT_BRAND]: never
+	}
+	export interface DurableObjectBranded {
+		[__DURABLE_OBJECT_BRAND]: never
+	}
+	export interface WorkflowEntrypointBranded {
+		[__WORKFLOW_ENTRYPOINT_BRAND]: never
+	}
+	export type EntrypointBranded =
+		| WorkerEntrypointBranded
+		| DurableObjectBranded
+		| WorkflowEntrypointBranded
+	// Types that can be used through `Stub`s
+	export type Stubable = RpcTargetBranded | ((...args: any[]) => any)
+	// Types that can be passed over RPC
+	// The reason for using a generic type here is to build a serializable subset of structured
+	//   cloneable composite types. This allows types defined with the "interface" keyword to pass the
+	//   serializable check as well. Otherwise, only types defined with the "type" keyword would pass.
+	type Serializable<T> =
+		// Structured cloneables
+		| BaseType
+		// Structured cloneable composites
+		| Map<
+				T extends Map<infer U, unknown> ? Serializable<U> : never,
+				T extends Map<unknown, infer U> ? Serializable<U> : never
+		  >
+		| Set<T extends Set<infer U> ? Serializable<U> : never>
+		| ReadonlyArray<T extends ReadonlyArray<infer U> ? Serializable<U> : never>
+		| {
+				[K in keyof T]: K extends number | string ? Serializable<T[K]> : never
+		  }
+		// Special types
+		| Stub<Stubable>
+		// Serialized as stubs, see `Stubify`
+		| Stubable
+	// Base type for all RPC stubs, including common memory management methods.
+	// `T` is used as a marker type for unwrapping `Stub`s later.
+	interface StubBase<T extends Stubable> extends Disposable {
+		[__RPC_STUB_BRAND]: T
+		dup(): this
+	}
+	export type Stub<T extends Stubable> = Provider<T> & StubBase<T>
+	// This represents all the types that can be sent as-is over an RPC boundary
+	type BaseType =
+		| void
+		| undefined
+		| null
+		| boolean
+		| number
+		| bigint
+		| string
+		| TypedArray
+		| ArrayBuffer
+		| DataView
+		| Date
+		| Error
+		| RegExp
+		| ReadableStream<Uint8Array>
+		| WritableStream<Uint8Array>
+		| Request
+		| Response
+		| Headers
+	// Recursively rewrite all `Stubable` types with `Stub`s
+	// prettier-ignore
+	type Stubify<T> = T extends Stubable ? Stub<T> : T extends Map<infer K, infer V> ? Map<Stubify<K>, Stubify<V>> : T extends Set<infer V> ? Set<Stubify<V>> : T extends Array<infer V> ? Array<Stubify<V>> : T extends ReadonlyArray<infer V> ? ReadonlyArray<Stubify<V>> : T extends BaseType ? T : T extends {
+        [key: string | number]: any;
+    } ? {
+        [K in keyof T]: Stubify<T[K]>;
+    } : T;
+	// Recursively rewrite all `Stub<T>`s with the corresponding `T`s.
+	// Note we use `StubBase` instead of `Stub` here to avoid circular dependencies:
+	// `Stub` depends on `Provider`, which depends on `Unstubify`, which would depend on `Stub`.
+	// prettier-ignore
+	type Unstubify<T> = T extends StubBase<infer V> ? V : T extends Map<infer K, infer V> ? Map<Unstubify<K>, Unstubify<V>> : T extends Set<infer V> ? Set<Unstubify<V>> : T extends Array<infer V> ? Array<Unstubify<V>> : T extends ReadonlyArray<infer V> ? ReadonlyArray<Unstubify<V>> : T extends BaseType ? T : T extends {
+        [key: string | number]: unknown;
+    } ? {
+        [K in keyof T]: Unstubify<T[K]>;
+    } : T;
+	type UnstubifyAll<A extends any[]> = {
+		[I in keyof A]: Unstubify<A[I]>
+	}
+	// Utility type for adding `Provider`/`Disposable`s to `object` types only.
+	// Note `unknown & T` is equivalent to `T`.
+	type MaybeProvider<T> = T extends object ? Provider<T> : unknown
+	type MaybeDisposable<T> = T extends object ? Disposable : unknown
+	// Type for method return or property on an RPC interface.
+	// - Stubable types are replaced by stubs.
+	// - Serializable types are passed by value, with stubable types replaced by stubs
+	//   and a top-level `Disposer`.
+	// Everything else can't be passed over PRC.
+	// Technically, we use custom thenables here, but they quack like `Promise`s.
+	// Intersecting with `(Maybe)Provider` allows pipelining.
+	// prettier-ignore
+	type Result<R> = R extends Stubable ? Promise<Stub<R>> & Provider<R> : R extends Serializable<R> ? Promise<Stubify<R> & MaybeDisposable<R>> & MaybeProvider<R> : never;
+	// Type for method or property on an RPC interface.
+	// For methods, unwrap `Stub`s in parameters, and rewrite returns to be `Result`s.
+	// Unwrapping `Stub`s allows calling with `Stubable` arguments.
+	// For properties, rewrite types to be `Result`s.
+	// In each case, unwrap `Promise`s.
+	type MethodOrProperty<V> = V extends (...args: infer P) => infer R
+		? (...args: UnstubifyAll<P>) => Result<Awaited<R>>
+		: Result<Awaited<V>>
+	// Type for the callable part of an `Provider` if `T` is callable.
+	// This is intersected with methods/properties.
+	type MaybeCallableProvider<T> = T extends (...args: any[]) => any ? MethodOrProperty<T> : unknown
+	// Base type for all other types providing RPC-like interfaces.
+	// Rewrites all methods/properties to be `MethodOrProperty`s, while preserving callable types.
+	// `Reserved` names (e.g. stub method names like `dup()`) and symbols can't be accessed over RPC.
+	export type Provider<
+		T extends object,
+		Reserved extends string = never,
+	> = MaybeCallableProvider<T> & {
+		[K in Exclude<keyof T, Reserved | symbol | keyof StubBase<never>>]: MethodOrProperty<T[K]>
+	}
+}
+declare namespace Cloudflare {
+	interface Env {}
+}
+declare module 'cloudflare:workers' {
+	export type RpcStub<T extends Rpc.Stubable> = Rpc.Stub<T>
+	export const RpcStub: {
+		new <T extends Rpc.Stubable>(value: T): Rpc.Stub<T>
+	}
+	export abstract class RpcTarget implements Rpc.RpcTargetBranded {
+		[Rpc.__RPC_TARGET_BRAND]: never
+	}
+	// `protected` fields don't appear in `keyof`s, so can't be accessed over RPC
+	export abstract class WorkerEntrypoint<Env = unknown> implements Rpc.WorkerEntrypointBranded {
+		[Rpc.__WORKER_ENTRYPOINT_BRAND]: never
+		protected ctx: ExecutionContext
+		protected env: Env
+		constructor(ctx: ExecutionContext, env: Env)
+		fetch?(request: Request): Response | Promise<Response>
+		tail?(events: TraceItem[]): void | Promise<void>
+		trace?(traces: TraceItem[]): void | Promise<void>
+		scheduled?(controller: ScheduledController): void | Promise<void>
+		queue?(batch: MessageBatch<unknown>): void | Promise<void>
+		test?(controller: TestController): void | Promise<void>
+	}
+	export abstract class DurableObject<Env = unknown> implements Rpc.DurableObjectBranded {
+		[Rpc.__DURABLE_OBJECT_BRAND]: never
+		protected ctx: DurableObjectState
+		protected env: Env
+		constructor(ctx: DurableObjectState, env: Env)
+		fetch?(request: Request): Response | Promise<Response>
+		alarm?(alarmInfo?: AlarmInvocationInfo): void | Promise<void>
+		webSocketMessage?(ws: WebSocket, message: string | ArrayBuffer): void | Promise<void>
+		webSocketClose?(
+			ws: WebSocket,
+			code: number,
+			reason: string,
+			wasClean: boolean
+		): void | Promise<void>
+		webSocketError?(ws: WebSocket, error: unknown): void | Promise<void>
+	}
+	export type WorkflowDurationLabel =
+		| 'second'
+		| 'minute'
+		| 'hour'
+		| 'day'
+		| 'week'
+		| 'month'
+		| 'year'
+	export type WorkflowSleepDuration = `${number} ${WorkflowDurationLabel}${'s' | ''}` | number
+	export type WorkflowDelayDuration = WorkflowSleepDuration
+	export type WorkflowTimeoutDuration = WorkflowSleepDuration
+	export type WorkflowRetentionDuration = WorkflowSleepDuration
+	export type WorkflowBackoff = 'constant' | 'linear' | 'exponential'
+	export type WorkflowStepConfig = {
+		retries?: {
+			limit: number
+			delay: WorkflowDelayDuration | number
+			backoff?: WorkflowBackoff
+		}
+		timeout?: WorkflowTimeoutDuration | number
+	}
+	export type WorkflowEvent<T> = {
+		payload: Readonly<T>
+		timestamp: Date
+		instanceId: string
+	}
+	export type WorkflowStepEvent<T> = {
+		payload: Readonly<T>
+		timestamp: Date
+		type: string
+	}
+	export abstract class WorkflowStep {
+		do<T extends Rpc.Serializable<T>>(name: string, callback: () => Promise<T>): Promise<T>
+		do<T extends Rpc.Serializable<T>>(
+			name: string,
+			config: WorkflowStepConfig,
+			callback: () => Promise<T>
+		): Promise<T>
+		sleep: (name: string, duration: WorkflowSleepDuration) => Promise<void>
+		sleepUntil: (name: string, timestamp: Date | number) => Promise<void>
+		waitForEvent<T extends Rpc.Serializable<T>>(
+			name: string,
+			options: {
+				type: string
+				timeout?: WorkflowTimeoutDuration | number
+			}
+		): Promise<WorkflowStepEvent<T>>
+	}
+	export abstract class WorkflowEntrypoint<
+		Env = unknown,
+		T extends Rpc.Serializable<T> | unknown = unknown,
+	> implements Rpc.WorkflowEntrypointBranded
+	{
+		[Rpc.__WORKFLOW_ENTRYPOINT_BRAND]: never
+		protected ctx: ExecutionContext
+		protected env: Env
+		constructor(ctx: ExecutionContext, env: Env)
+		run(event: Readonly<WorkflowEvent<T>>, step: WorkflowStep): Promise<unknown>
+	}
+	export const env: Cloudflare.Env
+}
+interface SecretsStoreSecret {
+	/**
+	 * Get a secret from the Secrets Store, returning a string of the secret value
+	 * if it exists, or throws an error if it does not exist
+	 */
+	get(): Promise<string>
+}
+declare module 'cloudflare:sockets' {
+	function _connect(address: string | SocketAddress, options?: SocketOptions): Socket
+	export { _connect as connect }
+}
+declare namespace TailStream {
+	interface Header {
+		readonly name: string
+		readonly value: string
+	}
+	interface FetchEventInfo {
+		readonly type: 'fetch'
+		readonly method: string
+		readonly url: string
+		readonly cfJson: string
+		readonly headers: Header[]
+	}
+	interface JsRpcEventInfo {
+		readonly type: 'jsrpc'
+		readonly methodName: string
+	}
+	interface ScheduledEventInfo {
+		readonly type: 'scheduled'
+		readonly scheduledTime: Date
+		readonly cron: string
+	}
+	interface AlarmEventInfo {
+		readonly type: 'alarm'
+		readonly scheduledTime: Date
+	}
+	interface QueueEventInfo {
+		readonly type: 'queue'
+		readonly queueName: string
+		readonly batchSize: number
+	}
+	interface EmailEventInfo {
+		readonly type: 'email'
+		readonly mailFrom: string
+		readonly rcptTo: string
+		readonly rawSize: number
+	}
+	interface TraceEventInfo {
+		readonly type: 'trace'
+		readonly traces: (string | null)[]
+	}
+	interface HibernatableWebSocketEventInfoMessage {
+		readonly type: 'message'
+	}
+	interface HibernatableWebSocketEventInfoError {
+		readonly type: 'error'
+	}
+	interface HibernatableWebSocketEventInfoClose {
+		readonly type: 'close'
+		readonly code: number
+		readonly wasClean: boolean
+	}
+	interface HibernatableWebSocketEventInfo {
+		readonly type: 'hibernatableWebSocket'
+		readonly info:
+			| HibernatableWebSocketEventInfoClose
+			| HibernatableWebSocketEventInfoError
+			| HibernatableWebSocketEventInfoMessage
+	}
+	interface Resume {
+		readonly type: 'resume'
+		readonly attachment?: any
+	}
+	interface CustomEventInfo {
+		readonly type: 'custom'
+	}
+	interface FetchResponseInfo {
+		readonly type: 'fetch'
+		readonly statusCode: number
+	}
+	type EventOutcome =
+		| 'ok'
+		| 'canceled'
+		| 'exception'
+		| 'unknown'
+		| 'killSwitch'
+		| 'daemonDown'
+		| 'exceededCpu'
+		| 'exceededMemory'
+		| 'loadShed'
+		| 'responseStreamDisconnected'
+		| 'scriptNotFound'
+	interface ScriptVersion {
+		readonly id: string
+		readonly tag?: string
+		readonly message?: string
+	}
+	interface Trigger {
+		readonly traceId: string
+		readonly invocationId: string
+		readonly spanId: string
+	}
+	interface Onset {
+		readonly type: 'onset'
+		readonly dispatchNamespace?: string
+		readonly entrypoint?: string
+		readonly executionModel: string
+		readonly scriptName?: string
+		readonly scriptTags?: string[]
+		readonly scriptVersion?: ScriptVersion
+		readonly trigger?: Trigger
+		readonly info:
+			| FetchEventInfo
+			| JsRpcEventInfo
+			| ScheduledEventInfo
+			| AlarmEventInfo
+			| QueueEventInfo
+			| EmailEventInfo
+			| TraceEventInfo
+			| HibernatableWebSocketEventInfo
+			| Resume
+			| CustomEventInfo
+	}
+	interface Outcome {
+		readonly type: 'outcome'
+		readonly outcome: EventOutcome
+		readonly cpuTime: number
+		readonly wallTime: number
+	}
+	interface Hibernate {
+		readonly type: 'hibernate'
+	}
+	interface SpanOpen {
+		readonly type: 'spanOpen'
+		readonly name: string
+		readonly info?: FetchEventInfo | JsRpcEventInfo | Attributes
+	}
+	interface SpanClose {
+		readonly type: 'spanClose'
+		readonly outcome: EventOutcome
+	}
+	interface DiagnosticChannelEvent {
+		readonly type: 'diagnosticChannel'
+		readonly channel: string
+		readonly message: any
+	}
+	interface Exception {
+		readonly type: 'exception'
+		readonly name: string
+		readonly message: string
+		readonly stack?: string
+	}
+	interface Log {
+		readonly type: 'log'
+		readonly level: 'debug' | 'error' | 'info' | 'log' | 'warn'
+		readonly message: string
+	}
+	interface Return {
+		readonly type: 'return'
+		readonly info?: FetchResponseInfo
+	}
+	interface Link {
+		readonly type: 'link'
+		readonly label?: string
+		readonly traceId: string
+		readonly invocationId: string
+		readonly spanId: string
+	}
+	interface Attribute {
+		readonly name: string
+		readonly value: string | string[] | boolean | boolean[] | number | number[] | bigint | bigint[]
+	}
+	interface Attributes {
+		readonly type: 'attributes'
+		readonly info: Attribute[]
+	}
+	interface TailEvent {
+		readonly traceId: string
+		readonly invocationId: string
+		readonly spanId: string
+		readonly timestamp: Date
+		readonly sequence: number
+		readonly event:
+			| Onset
+			| Outcome
+			| Hibernate
+			| SpanOpen
+			| SpanClose
+			| DiagnosticChannelEvent
+			| Exception
+			| Log
+			| Return
+			| Link
+			| Attributes
+	}
+	type TailEventHandler = (event: TailEvent) => void | Promise<void>
+	type TailEventHandlerName =
+		| 'outcome'
+		| 'hibernate'
+		| 'spanOpen'
+		| 'spanClose'
+		| 'diagnosticChannel'
+		| 'exception'
+		| 'log'
+		| 'return'
+		| 'link'
+		| 'attributes'
+	type TailEventHandlerObject = Record<TailEventHandlerName, TailEventHandler>
+	type TailEventHandlerType = TailEventHandler | TailEventHandlerObject
+}
+// Copyright (c) 2022-2023 Cloudflare, Inc.
+// Licensed under the Apache 2.0 license found in the LICENSE file or at:
+//     https://opensource.org/licenses/Apache-2.0
+/**
+ * Data types supported for holding vector metadata.
+ */
+type VectorizeVectorMetadataValue = string | number | boolean | string[]
+/**
+ * Additional information to associate with a vector.
+ */
+type VectorizeVectorMetadata =
+	| VectorizeVectorMetadataValue
+	| Record<string, VectorizeVectorMetadataValue>
+type VectorFloatArray = Float32Array | Float64Array
+interface VectorizeError {
+	code?: number
+	error: string
+}
+/**
+ * Comparison logic/operation to use for metadata filtering.
+ *
+ * This list is expected to grow as support for more operations are released.
+ */
+type VectorizeVectorMetadataFilterOp = '$eq' | '$ne'
+/**
+ * Filter criteria for vector metadata used to limit the retrieved query result set.
+ */
+type VectorizeVectorMetadataFilter = {
+	[field: string]:
+		| Exclude<VectorizeVectorMetadataValue, string[]>
+		| null
+		| {
+				[Op in VectorizeVectorMetadataFilterOp]?: Exclude<
+					VectorizeVectorMetadataValue,
+					string[]
+				> | null
+		  }
+}
+/**
+ * Supported distance metrics for an index.
+ * Distance metrics determine how other "similar" vectors are determined.
+ */
+type VectorizeDistanceMetric = 'euclidean' | 'cosine' | 'dot-product'
+/**
+ * Metadata return levels for a Vectorize query.
+ *
+ * Default to "none".
+ *
+ * @property all      Full metadata for the vector return set, including all fields (including those un-indexed) without truncation. This is a more expensive retrieval, as it requires additional fetching & reading of un-indexed data.
+ * @property indexed  Return all metadata fields configured for indexing in the vector return set. This level of retrieval is "free" in that no additional overhead is incurred returning this data. However, note that indexed metadata is subject to truncation (especially for larger strings).
+ * @property none     No indexed metadata will be returned.
+ */
+type VectorizeMetadataRetrievalLevel = 'all' | 'indexed' | 'none'
+interface VectorizeQueryOptions {
+	topK?: number
+	namespace?: string
+	returnValues?: boolean
+	returnMetadata?: boolean | VectorizeMetadataRetrievalLevel
+	filter?: VectorizeVectorMetadataFilter
+}
+/**
+ * Information about the configuration of an index.
+ */
+type VectorizeIndexConfig =
+	| {
+			dimensions: number
+			metric: VectorizeDistanceMetric
+	  }
+	| {
+			preset: string // keep this generic, as we'll be adding more presets in the future and this is only in a read capacity
+	  }
+/**
+ * Metadata about an existing index.
+ *
+ * This type is exclusively for the Vectorize **beta** and will be deprecated once Vectorize RC is released.
+ * See {@link VectorizeIndexInfo} for its post-beta equivalent.
+ */
+interface VectorizeIndexDetails {
+	/** The unique ID of the index */
+	readonly id: string
+	/** The name of the index. */
+	name: string
+	/** (optional) A human readable description for the index. */
+	description?: string
+	/** The index configuration, including the dimension size and distance metric. */
+	config: VectorizeIndexConfig
+	/** The number of records containing vectors within the index. */
+	vectorsCount: number
+}
+/**
+ * Metadata about an existing index.
+ */
+interface VectorizeIndexInfo {
+	/** The number of records containing vectors within the index. */
+	vectorCount: number
+	/** Number of dimensions the index has been configured for. */
+	dimensions: number
+	/** ISO 8601 datetime of the last processed mutation on in the index. All changes before this mutation will be reflected in the index state. */
+	processedUpToDatetime: number
+	/** UUIDv4 of the last mutation processed by the index. All changes before this mutation will be reflected in the index state. */
+	processedUpToMutation: number
+}
+/**
+ * Represents a single vector value set along with its associated metadata.
+ */
+interface VectorizeVector {
+	/** The ID for the vector. This can be user-defined, and must be unique. It should uniquely identify the object, and is best set based on the ID of what the vector represents. */
+	id: string
+	/** The vector values */
+	values: VectorFloatArray | number[]
+	/** The namespace this vector belongs to. */
+	namespace?: string
+	/** Metadata associated with the vector. Includes the values of other fields and potentially additional details. */
+	metadata?: Record<string, VectorizeVectorMetadata>
+}
+/**
+ * Represents a matched vector for a query along with its score and (if specified) the matching vector information.
+ */
+type VectorizeMatch = Pick<Partial<VectorizeVector>, 'values'> &
+	Omit<VectorizeVector, 'values'> & {
+		/** The score or rank for similarity, when returned as a result */
+		score: number
+	}
+/**
+ * A set of matching {@link VectorizeMatch} for a particular query.
+ */
+interface VectorizeMatches {
+	matches: VectorizeMatch[]
+	count: number
+}
+/**
+ * Results of an operation that performed a mutation on a set of vectors.
+ * Here, `ids` is a list of vectors that were successfully processed.
+ *
+ * This type is exclusively for the Vectorize **beta** and will be deprecated once Vectorize RC is released.
+ * See {@link VectorizeAsyncMutation} for its post-beta equivalent.
+ */
+interface VectorizeVectorMutation {
+	/* List of ids of vectors that were successfully processed. */
+	ids: string[]
+	/* Total count of the number of processed vectors. */
+	count: number
+}
+/**
+ * Result type indicating a mutation on the Vectorize Index.
+ * Actual mutations are processed async where the `mutationId` is the unique identifier for the operation.
+ */
+interface VectorizeAsyncMutation {
+	/** The unique identifier for the async mutation operation containing the changeset. */
+	mutationId: string
+}
+/**
+ * A Vectorize Vector Search Index for querying vectors/embeddings.
+ *
+ * This type is exclusively for the Vectorize **beta** and will be deprecated once Vectorize RC is released.
+ * See {@link Vectorize} for its new implementation.
+ */
+declare abstract class VectorizeIndex {
+	/**
+	 * Get information about the currently bound index.
+	 * @returns A promise that resolves with information about the current index.
+	 */
+	public describe(): Promise<VectorizeIndexDetails>
+	/**
+	 * Use the provided vector to perform a similarity search across the index.
+	 * @param vector Input vector that will be used to drive the similarity search.
+	 * @param options Configuration options to massage the returned data.
+	 * @returns A promise that resolves with matched and scored vectors.
+	 */
+	public query(
+		vector: VectorFloatArray | number[],
+		options?: VectorizeQueryOptions
+	): Promise<VectorizeMatches>
+	/**
+	 * Insert a list of vectors into the index dataset. If a provided id exists, an error will be thrown.
+	 * @param vectors List of vectors that will be inserted.
+	 * @returns A promise that resolves with the ids & count of records that were successfully processed.
+	 */
+	public insert(vectors: VectorizeVector[]): Promise<VectorizeVectorMutation>
+	/**
+	 * Upsert a list of vectors into the index dataset. If a provided id exists, it will be replaced with the new values.
+	 * @param vectors List of vectors that will be upserted.
+	 * @returns A promise that resolves with the ids & count of records that were successfully processed.
+	 */
+	public upsert(vectors: VectorizeVector[]): Promise<VectorizeVectorMutation>
+	/**
+	 * Delete a list of vectors with a matching id.
+	 * @param ids List of vector ids that should be deleted.
+	 * @returns A promise that resolves with the ids & count of records that were successfully processed (and thus deleted).
+	 */
+	public deleteByIds(ids: string[]): Promise<VectorizeVectorMutation>
+	/**
+	 * Get a list of vectors with a matching id.
+	 * @param ids List of vector ids that should be returned.
+	 * @returns A promise that resolves with the raw unscored vectors matching the id set.
+	 */
+	public getByIds(ids: string[]): Promise<VectorizeVector[]>
+}
+/**
+ * A Vectorize Vector Search Index for querying vectors/embeddings.
+ *
+ * Mutations in this version are async, returning a mutation id.
+ */
+declare abstract class Vectorize {
+	/**
+	 * Get information about the currently bound index.
+	 * @returns A promise that resolves with information about the current index.
+	 */
+	public describe(): Promise<VectorizeIndexInfo>
+	/**
+	 * Use the provided vector to perform a similarity search across the index.
+	 * @param vector Input vector that will be used to drive the similarity search.
+	 * @param options Configuration options to massage the returned data.
+	 * @returns A promise that resolves with matched and scored vectors.
+	 */
+	public query(
+		vector: VectorFloatArray | number[],
+		options?: VectorizeQueryOptions
+	): Promise<VectorizeMatches>
+	/**
+	 * Use the provided vector-id to perform a similarity search across the index.
+	 * @param vectorId Id for a vector in the index against which the index should be queried.
+	 * @param options Configuration options to massage the returned data.
+	 * @returns A promise that resolves with matched and scored vectors.
+	 */
+	public queryById(vectorId: string, options?: VectorizeQueryOptions): Promise<VectorizeMatches>
+	/**
+	 * Insert a list of vectors into the index dataset. If a provided id exists, an error will be thrown.
+	 * @param vectors List of vectors that will be inserted.
+	 * @returns A promise that resolves with a unique identifier of a mutation containing the insert changeset.
+	 */
+	public insert(vectors: VectorizeVector[]): Promise<VectorizeAsyncMutation>
+	/**
+	 * Upsert a list of vectors into the index dataset. If a provided id exists, it will be replaced with the new values.
+	 * @param vectors List of vectors that will be upserted.
+	 * @returns A promise that resolves with a unique identifier of a mutation containing the upsert changeset.
+	 */
+	public upsert(vectors: VectorizeVector[]): Promise<VectorizeAsyncMutation>
+	/**
+	 * Delete a list of vectors with a matching id.
+	 * @param ids List of vector ids that should be deleted.
+	 * @returns A promise that resolves with a unique identifier of a mutation containing the delete changeset.
+	 */
+	public deleteByIds(ids: string[]): Promise<VectorizeAsyncMutation>
+	/**
+	 * Get a list of vectors with a matching id.
+	 * @param ids List of vector ids that should be returned.
+	 * @returns A promise that resolves with the raw unscored vectors matching the id set.
+	 */
+	public getByIds(ids: string[]): Promise<VectorizeVector[]>
+}
+/**
+ * The interface for "version_metadata" binding
+ * providing metadata about the Worker Version using this binding.
+ */
+type WorkerVersionMetadata = {
+	/** The ID of the Worker Version using this binding */
+	id: string
+	/** The tag of the Worker Version using this binding */
+	tag: string
+	/** The timestamp of when the Worker Version was uploaded */
+	timestamp: string
+}
+interface DynamicDispatchLimits {
+	/**
+	 * Limit CPU time in milliseconds.
+	 */
+	cpuMs?: number
+	/**
+	 * Limit number of subrequests.
+	 */
+	subRequests?: number
+}
+interface DynamicDispatchOptions {
+	/**
+	 * Limit resources of invoked Worker script.
+	 */
+	limits?: DynamicDispatchLimits
+	/**
+	 * Arguments for outbound Worker script, if configured.
+	 */
+	outbound?: {
+		[key: string]: any
+	}
+}
+interface DispatchNamespace {
+	/**
+	 * @param name Name of the Worker script.
+	 * @param args Arguments to Worker script.
+	 * @param options Options for Dynamic Dispatch invocation.
+	 * @returns A Fetcher object that allows you to send requests to the Worker script.
+	 * @throws If the Worker script does not exist in this dispatch namespace, an error will be thrown.
+	 */
+	get(
+		name: string,
+		args?: {
+			[key: string]: any
+		},
+		options?: DynamicDispatchOptions
+	): Fetcher
+}
+declare module 'cloudflare:workflows' {
+	/**
+	 * NonRetryableError allows for a user to throw a fatal error
+	 * that makes a Workflow instance fail immediately without triggering a retry
+	 */
+	export class NonRetryableError extends Error {
+		public constructor(message: string, name?: string)
+	}
+}
+declare abstract class Workflow<PARAMS = unknown> {
+	/**
+	 * Get a handle to an existing instance of the Workflow.
+	 * @param id Id for the instance of this Workflow
+	 * @returns A promise that resolves with a handle for the Instance
+	 */
+	public get(id: string): Promise<WorkflowInstance>
+	/**
+	 * Create a new instance and return a handle to it. If a provided id exists, an error will be thrown.
+	 * @param options Options when creating an instance including id and params
+	 * @returns A promise that resolves with a handle for the Instance
+	 */
+	public create(options?: WorkflowInstanceCreateOptions<PARAMS>): Promise<WorkflowInstance>
+	/**
+	 * Create a batch of instances and return handle for all of them. If a provided id exists, an error will be thrown.
+	 * `createBatch` is limited at 100 instances at a time or when the RPC limit for the batch (1MiB) is reached.
+	 * @param batch List of Options when creating an instance including name and params
+	 * @returns A promise that resolves with a list of handles for the created instances.
+	 */
+	public createBatch(batch: WorkflowInstanceCreateOptions<PARAMS>[]): Promise<WorkflowInstance[]>
+}
+type WorkflowDurationLabel = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year'
+type WorkflowSleepDuration = `${number} ${WorkflowDurationLabel}${'s' | ''}` | number
+type WorkflowRetentionDuration = WorkflowSleepDuration
+interface WorkflowInstanceCreateOptions<PARAMS = unknown> {
+	/**
+	 * An id for your Workflow instance. Must be unique within the Workflow.
+	 */
+	id?: string
+	/**
+	 * The event payload the Workflow instance is triggered with
+	 */
+	params?: PARAMS
+	/**
+	 * The retention policy for Workflow instance.
+	 * Defaults to the maximum retention period available for the owner's account.
+	 */
+	retention?: {
+		successRetention?: WorkflowRetentionDuration
+		errorRetention?: WorkflowRetentionDuration
+	}
+}
+type InstanceStatus = {
+	status:
+		| 'queued' // means that instance is waiting to be started (see concurrency limits)
+		| 'running'
+		| 'paused'
+		| 'errored'
+		| 'terminated' // user terminated the instance while it was running
+		| 'complete'
+		| 'waiting' // instance is hibernating and waiting for sleep or event to finish
+		| 'waitingForPause' // instance is finishing the current work to pause
+		| 'unknown'
+	error?: string
+	output?: object
+}
+interface WorkflowError {
+	code?: number
+	message: string
+}
+declare abstract class WorkflowInstance {
+	public id: string
+	/**
+	 * Pause the instance.
+	 */
+	public pause(): Promise<void>
+	/**
+	 * Resume the instance. If it is already running, an error will be thrown.
+	 */
+	public resume(): Promise<void>
+	/**
+	 * Terminate the instance. If it is errored, terminated or complete, an error will be thrown.
+	 */
+	public terminate(): Promise<void>
+	/**
+	 * Restart the instance.
+	 */
+	public restart(): Promise<void>
+	/**
+	 * Returns the current status of the instance.
+	 */
+	public status(): Promise<InstanceStatus>
+	/**
+	 * Send an event to this instance.
+	 */
+	public sendEvent({ type, payload }: { type: string; payload: unknown }): Promise<void>
+}
diff --git a/templates/workflow/src/components/OnCanvasComponentPicker.tsx b/templates/workflow/src/components/OnCanvasComponentPicker.tsx
index c6e53088c3ea..63f7d709ec7d 100644
--- a/templates/workflow/src/components/OnCanvasComponentPicker.tsx
+++ b/templates/workflow/src/components/OnCanvasComponentPicker.tsx
@@ -14,7 +14,7 @@ import {
 	Vec,
 	VecModel,
 } from 'tldraw'
-import { ConnectionShape, getConnectionTerminals } from '../connection/ConnectionShapeUtil'
+import { getConnectionTerminals } from '../connection/ConnectionShapeUtil'
 import { NODE_WIDTH_PX } from '../constants'
 import { getNodeDefinitions, NodeType } from '../nodes/nodeTypes'
 import { NodeDefinition } from '../nodes/types/shared'
@@ -85,7 +85,7 @@ function OnCanvasComponentPickerDialog({
 			if (!container) return
 
 			const connection = editor.getShape(state.connectionShapeId)
-			if (!connection || !editor.isShapeOfType<ConnectionShape>(connection, 'connection')) {
+			if (!connection || !editor.isShapeOfType(connection, 'connection')) {
 				onClose()
 				return
 			}
@@ -156,7 +156,7 @@ function OnCanvasComponentPickerItem<T extends NodeType>({
 				if (!state) return
 
 				const connection = editor.getShape(state.connectionShapeId)
-				if (!connection || !editor.isShapeOfType<ConnectionShape>(connection, 'connection')) {
+				if (!connection || !editor.isShapeOfType(connection, 'connection')) {
 					onClose()
 					return
 				}
diff --git a/templates/workflow/src/components/WorkflowRegions.tsx b/templates/workflow/src/components/WorkflowRegions.tsx
index 076c9a6c8bc8..10262600c5d2 100644
--- a/templates/workflow/src/components/WorkflowRegions.tsx
+++ b/templates/workflow/src/components/WorkflowRegions.tsx
@@ -51,7 +51,7 @@ function findWorkflowRegions(editor: Editor): WorkflowRegion[] {
 
 	// Start visiting from all nodes in the current page
 	for (const node of editor.getCurrentPageShapes()) {
-		if (editor.isShapeOfType<NodeShape>(node, 'node')) {
+		if (editor.isShapeOfType(node, 'node')) {
 			visit(node)
 		}
 	}
diff --git a/templates/workflow/src/components/WorkflowToolbar.tsx b/templates/workflow/src/components/WorkflowToolbar.tsx
index 18b3a1c3cbec..a160fafeb25e 100644
--- a/templates/workflow/src/components/WorkflowToolbar.tsx
+++ b/templates/workflow/src/components/WorkflowToolbar.tsx
@@ -40,7 +40,7 @@ function createNodeShape(editor: Editor, shapeId: TLShapeId, center: Vec, node:
 
 	editor.run(() => {
 		// Create the shape with the node definition
-		editor.createShape<NodeShape>({
+		editor.createShape({
 			id: shapeId,
 			type: 'node',
 			props: { node },
@@ -81,7 +81,7 @@ export const overrides: TLUiOverrides = {
 				onDragStart: (_, info) => {
 					onDragFromToolbarToCreateShape(editor, info, {
 						createShape: (id) => {
-							editor.createShape<NodeShape>({
+							editor.createShape({
 								id,
 								type: 'node',
 								props: { node: nodeDef.getDefault() },
diff --git a/templates/workflow/src/connection/ConnectionBindingUtil.tsx b/templates/workflow/src/connection/ConnectionBindingUtil.tsx
index 78690134f818..389ed1514281 100644
--- a/templates/workflow/src/connection/ConnectionBindingUtil.tsx
+++ b/templates/workflow/src/connection/ConnectionBindingUtil.tsx
@@ -8,7 +8,7 @@ import {
 	createComputedCache,
 	Editor,
 	T,
-	TLBaseBinding,
+	TLBinding,
 	TLShapeId,
 } from 'tldraw'
 import { getNodePorts } from '../nodes/nodePorts'
@@ -17,20 +17,25 @@ import { onNodePortConnect, onNodePortDisconnect } from '../nodes/nodeTypes'
 import { PortId } from '../ports/Port'
 import { ConnectionShape } from './ConnectionShapeUtil'
 
+const CONNECTION_TYPE = 'connection'
+
+declare module 'tldraw' {
+	export interface TLGlobalBindingPropsMap {
+		[CONNECTION_TYPE]: {
+			portId: PortId
+			terminal: 'start' | 'end'
+		}
+	}
+}
+
 /**
  * A connection binding is a binding between a connection shape and a node shape. Usually, each
  * connection shape has two bindings: one for each end of the connection.
  */
-export type ConnectionBinding = TLBaseBinding<
-	'connection',
-	{
-		portId: PortId
-		terminal: 'start' | 'end'
-	}
->
+export type ConnectionBinding = TLBinding<typeof CONNECTION_TYPE>
 
 export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
-	static override type = 'connection' as const
+	static override type = CONNECTION_TYPE
 	static override props = {
 		portId: T.string,
 		terminal: T.literalEnum('start', 'end'),
@@ -53,7 +58,7 @@ export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
 	onAfterCreate({ binding }: BindingOnCreateOptions<ConnectionBinding>): void {
 		// Our ports system has an `onConnect` callback - call it when we create a connection
 		const node = this.editor.getShape(binding.toId)
-		if (!node || !this.editor.isShapeOfType<NodeShape>(node, 'node')) return
+		if (!node || !this.editor.isShapeOfType(node, 'node')) return
 		onNodePortConnect(this.editor, node, binding.props.portId)
 	}
 
@@ -68,8 +73,8 @@ export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
 			if (
 				!nodeBefore ||
 				!nodeAfter ||
-				!this.editor.isShapeOfType<NodeShape>(nodeBefore, 'node') ||
-				!this.editor.isShapeOfType<NodeShape>(nodeAfter, 'node')
+				!this.editor.isShapeOfType(nodeBefore, 'node') ||
+				!this.editor.isShapeOfType(nodeAfter, 'node')
 			) {
 				return
 			}
@@ -81,7 +86,7 @@ export class ConnectionBindingUtil extends BindingUtil<ConnectionBinding> {
 	onAfterDelete({ binding }: BindingOnDeleteOptions<ConnectionBinding>): void {
 		// When we're deleting a connection, we need to call the node's port disconnect callback
 		const node = this.editor.getShape(binding.toId)
-		if (!node || !this.editor.isShapeOfType<NodeShape>(node, 'node')) return
+		if (!node || !this.editor.isShapeOfType(node, 'node')) return
 		onNodePortDisconnect(this.editor, node, binding.props.portId)
 	}
 }
@@ -104,7 +109,7 @@ export function getConnectionBindings(
 const connectionBindingsCache = createComputedCache(
 	'connection bindings',
 	(editor: Editor, connection: ConnectionShape) => {
-		const bindings = editor.getBindingsFromShape<ConnectionBinding>(connection.id, 'connection')
+		const bindings = editor.getBindingsFromShape(connection.id, CONNECTION_TYPE)
 		let start, end
 		for (const binding of bindings) {
 			if (binding.props.terminal === 'start') {
@@ -130,7 +135,7 @@ export function getConnectionBindingPositionInPageSpace(
 ) {
 	// Find the shape that this binding is bound to
 	const targetShape = editor.getShape(binding.toId)
-	if (!targetShape || !editor.isShapeOfType<NodeShape>(targetShape, 'node')) return null
+	if (!targetShape || !editor.isShapeOfType(targetShape, 'node')) return null
 
 	// Find the port in the shape that the connection is bound to
 	const port = getNodePorts(editor, targetShape)?.[binding.props.portId]
@@ -154,7 +159,7 @@ export function createOrUpdateConnectionBinding(
 	const targetId = typeof target === 'string' ? target : target.id
 
 	const existingMany = editor
-		.getBindingsFromShape<ConnectionBinding>(connectionId, 'connection')
+		.getBindingsFromShape(connectionId, CONNECTION_TYPE)
 		.filter((b) => b.props.terminal === props.terminal)
 
 	// if we've somehow ended up with too many bindings, delete the extras
@@ -171,7 +176,7 @@ export function createOrUpdateConnectionBinding(
 		})
 	} else {
 		editor.createBinding({
-			type: 'connection',
+			type: CONNECTION_TYPE,
 			fromId: connectionId,
 			toId: targetId,
 			props,
@@ -186,7 +191,7 @@ export function removeConnectionBinding(
 	terminal: 'start' | 'end'
 ) {
 	const existing = editor
-		.getBindingsFromShape<ConnectionBinding>(connection, 'connection')
+		.getBindingsFromShape(connection, CONNECTION_TYPE)
 		.filter((b) => b.props.terminal === terminal)
 
 	editor.deleteBindings(existing)
diff --git a/templates/workflow/src/connection/ConnectionShapeUtil.tsx b/templates/workflow/src/connection/ConnectionShapeUtil.tsx
index be9dc5f1e3b6..b1c5b7318a7a 100644
--- a/templates/workflow/src/connection/ConnectionShapeUtil.tsx
+++ b/templates/workflow/src/connection/ConnectionShapeUtil.tsx
@@ -7,9 +7,9 @@ import {
 	RecordProps,
 	SVGContainer,
 	ShapeUtil,
-	TLBaseShape,
 	TLHandle,
 	TLHandleDragInfo,
+	TLShape,
 	Vec,
 	VecLike,
 	VecModel,
@@ -36,6 +36,17 @@ import {
 } from './ConnectionBindingUtil'
 import { insertNodeWithinConnection } from './insertNodeWithinConnection'
 
+const CONNECTION_TYPE = 'connection'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		[CONNECTION_TYPE]: {
+			start: VecModel
+			end: VecModel
+		}
+	}
+}
+
 /**
  * A connection shape is a directed connection between two node shapes. It has a start point, and an
  * end point. These are called "terminals" in the code.
@@ -45,16 +56,10 @@ import { insertNodeWithinConnection } from './insertNodeWithinConnection'
  * the connection, but only when there isn't a binding (ie while dragging the connection). When the
  * ends are bound, the position is derived from the connected shape instead.
  */
-export type ConnectionShape = TLBaseShape<
-	'connection',
-	{
-		start: VecModel
-		end: VecModel
-	}
->
+export type ConnectionShape = TLShape<typeof CONNECTION_TYPE>
 
 export class ConnectionShapeUtil extends ShapeUtil<ConnectionShape> {
-	static override type = 'connection' as const
+	static override type = CONNECTION_TYPE
 	static override props: RecordProps<ConnectionShape> = {
 		start: vecModelValidator,
 		end: vecModelValidator,
diff --git a/templates/workflow/src/connection/insertNodeWithinConnection.tsx b/templates/workflow/src/connection/insertNodeWithinConnection.tsx
index 40f1d19ead70..c8bb7de80d66 100644
--- a/templates/workflow/src/connection/insertNodeWithinConnection.tsx
+++ b/templates/workflow/src/connection/insertNodeWithinConnection.tsx
@@ -2,7 +2,6 @@ import { Box, createShapeId, Editor, TLShapeId } from 'tldraw'
 import { onCanvasComponentPickerState } from '../components/OnCanvasComponentPicker'
 import { DEFAULT_NODE_SPACING_PX, NODE_WIDTH_PX } from '../constants'
 import { getNodePortConnections, getNodePorts } from '../nodes/nodePorts'
-import { NodeShape } from '../nodes/NodeShapeUtil'
 import { createOrUpdateConnectionBinding, getConnectionBindings } from './ConnectionBindingUtil'
 import { ConnectionShape } from './ConnectionShapeUtil'
 
@@ -36,7 +35,7 @@ export function insertNodeWithinConnection(editor: Editor, connection: Connectio
 
 			// create the new node
 			const newNodeId = createShapeId()
-			editor.createShape<NodeShape>({
+			editor.createShape({
 				type: 'node',
 				id: newNodeId,
 				x: newNodeX,
@@ -62,7 +61,7 @@ export function insertNodeWithinConnection(editor: Editor, connection: Connectio
 
 			// create a new connection between the new node and the end of the original connection
 			const newConnectionId = createShapeId()
-			editor.createShape<ConnectionShape>({
+			editor.createShape({
 				type: 'connection',
 				id: newConnectionId,
 			})
@@ -99,8 +98,8 @@ function moveNodesIfNeeded(editor: Editor, newNodeId: TLShapeId, rootNodeId: TLS
 	if (
 		!rootNode ||
 		!newNode ||
-		!editor.isShapeOfType<NodeShape>(rootNode, 'node') ||
-		!editor.isShapeOfType<NodeShape>(newNode, 'node')
+		!editor.isShapeOfType(rootNode, 'node') ||
+		!editor.isShapeOfType(newNode, 'node')
 	) {
 		return
 	}
@@ -115,7 +114,7 @@ function moveNodesIfNeeded(editor: Editor, newNodeId: TLShapeId, rootNodeId: TLS
 
 	function visit(nodeId: TLShapeId, parentExpandedBounds: Box) {
 		const node = editor.getShape(nodeId)
-		if (!node || !editor.isShapeOfType<NodeShape>(node, 'node')) return
+		if (!node || !editor.isShapeOfType(node, 'node')) return
 
 		// if this node has already been visited, we need to continue on from the nudge we
 		// calculated last time:
@@ -159,7 +158,7 @@ function moveNodesIfNeeded(editor: Editor, newNodeId: TLShapeId, rootNodeId: TLS
 				},
 				...Array.from(toNudgeRight.entries()).map(([id, nudge]) => ({
 					id,
-					type: 'node',
+					type: 'node' as const,
 					x: nudge.initialX + nudge.amount,
 				})),
 			],
diff --git a/templates/workflow/src/connection/keepConnectionsAtBottom.tsx b/templates/workflow/src/connection/keepConnectionsAtBottom.tsx
index 7ec99b1af823..89e0a29e9f75 100644
--- a/templates/workflow/src/connection/keepConnectionsAtBottom.tsx
+++ b/templates/workflow/src/connection/keepConnectionsAtBottom.tsx
@@ -90,7 +90,7 @@ export function keepConnectionsAtBottom(editor: Editor) {
 					id: shape.id,
 					type: shape.type,
 					index: newIndex,
-				})
+				} as const)
 			}
 		}
 
diff --git a/templates/workflow/src/execution/ExecutionGraph.tsx b/templates/workflow/src/execution/ExecutionGraph.tsx
index f3ff12513681..d1228e5b3e00 100644
--- a/templates/workflow/src/execution/ExecutionGraph.tsx
+++ b/templates/workflow/src/execution/ExecutionGraph.tsx
@@ -42,7 +42,7 @@ export class ExecutionGraph {
 			if (this.nodesById.has(nodeId)) continue
 
 			const node = this.editor.getShape(nodeId)
-			if (!node || !this.editor.isShapeOfType<NodeShape>(node, 'node')) continue
+			if (!node || !this.editor.isShapeOfType(node, 'node')) continue
 
 			const connections = getNodePortConnections(this.editor, node)
 
@@ -136,13 +136,13 @@ export class ExecutionGraph {
 			state: 'executing',
 		})
 
-		this.editor.updateShape<NodeShape>({
+		this.editor.updateShape({
 			id: nodeId,
 			type: node.shape.type,
 			props: { isOutOfDate: true },
 		})
 		const outputs = await executeNode(this.editor, node.shape, inputs)
-		this.editor.updateShape<NodeShape>({
+		this.editor.updateShape({
 			id: nodeId,
 			type: node.shape.type,
 			props: { isOutOfDate: false },
diff --git a/templates/workflow/src/nodes/NodeShapeUtil.tsx b/templates/workflow/src/nodes/NodeShapeUtil.tsx
index f6d4fc17b666..f74a041ed3b0 100644
--- a/templates/workflow/src/nodes/NodeShapeUtil.tsx
+++ b/templates/workflow/src/nodes/NodeShapeUtil.tsx
@@ -8,8 +8,8 @@ import {
 	resizeBox,
 	ShapeUtil,
 	T,
-	TLBaseShape,
 	TLResizeInfo,
+	TLShape,
 	useEditor,
 	useUniqueSafeId,
 	useValue,
@@ -21,12 +21,20 @@ import { getNodeOutputPortInfo, getNodePorts } from './nodePorts'
 import { getNodeDefinition, getNodeHeightPx, NodeBody, NodeType } from './nodeTypes'
 import { NodeValue, STOP_EXECUTION } from './types/shared'
 
-// Define our custom node shape type that extends tldraw's base shape system
-export type NodeShape = TLBaseShape<'node', { node: NodeType; isOutOfDate: boolean }>
+const NODE_TYPE = 'node'
+
+declare module 'tldraw' {
+	export interface TLGlobalShapePropsMap {
+		// Define our custom node shape type that extends tldraw's base shape system
+		[NODE_TYPE]: { node: NodeType; isOutOfDate: boolean }
+	}
+}
+
+export type NodeShape = TLShape<typeof NODE_TYPE>
 
 // This class extends tldraw's ShapeUtil to define how our custom node shapes behave
 export class NodeShapeUtil extends ShapeUtil<NodeShape> {
-	static override type = 'node' as const
+	static override type = NODE_TYPE
 	static override props: RecordProps<NodeShape> = {
 		node: NodeType,
 		isOutOfDate: T.boolean,
diff --git a/templates/workflow/src/nodes/nodePorts.tsx b/templates/workflow/src/nodes/nodePorts.tsx
index 6662bc4b1f92..245360b90d02 100644
--- a/templates/workflow/src/nodes/nodePorts.tsx
+++ b/templates/workflow/src/nodes/nodePorts.tsx
@@ -2,7 +2,7 @@
  * This file contains functions for working with ports and connections on nodes.
  */
 import { createComputedCache, Editor, TLShapeId } from 'tldraw'
-import { ConnectionBinding, getConnectionBindings } from '../connection/ConnectionBindingUtil'
+import { getConnectionBindings } from '../connection/ConnectionBindingUtil'
 import { PortId } from '../ports/Port'
 import { NodeShape } from './NodeShapeUtil'
 import { getNodeOutputInfo, getNodeTypePorts } from './nodeTypes'
@@ -42,7 +42,7 @@ export function getNodePortConnections(
 const nodePortConnectionsCache = createComputedCache(
 	'port connections',
 	(editor: Editor, node: NodeShape) => {
-		const bindings = editor.getBindingsToShape<ConnectionBinding>(node.id, 'connection')
+		const bindings = editor.getBindingsToShape(node.id, 'connection')
 
 		const connections: NodePortConnection[] = []
 		for (const binding of bindings) {
@@ -142,7 +142,7 @@ export function getAllConnectedNodes(
 		if (!nodeId) continue
 
 		const node = editor.getShape(nodeId)
-		if (!node || !editor.isShapeOfType<NodeShape>(node, 'node')) continue
+		if (!node || !editor.isShapeOfType(node, 'node')) continue
 
 		if (found.has(node.id)) continue
 		found.add(node.id)
diff --git a/templates/workflow/src/nodes/types/EarthquakeNode.tsx b/templates/workflow/src/nodes/types/EarthquakeNode.tsx
index f08782ba1ce4..160e693ba0e5 100644
--- a/templates/workflow/src/nodes/types/EarthquakeNode.tsx
+++ b/templates/workflow/src/nodes/types/EarthquakeNode.tsx
@@ -88,7 +88,7 @@ export class EarthquakeNodeDefinition extends NodeDefinition<EarthquakeNode> {
 
 			if (data.features.length === 0) {
 				// Update node with no data state
-				this.editor.updateShape<NodeShape>({
+				this.editor.updateShape({
 					id: shape.id,
 					type: shape.type,
 					props: {
@@ -115,7 +115,7 @@ export class EarthquakeNodeDefinition extends NodeDefinition<EarthquakeNode> {
 			}
 
 			// Update node with fetched data
-			this.editor.updateShape<NodeShape>({
+			this.editor.updateShape({
 				id: shape.id,
 				type: shape.type,
 				props: {
@@ -134,7 +134,7 @@ export class EarthquakeNodeDefinition extends NodeDefinition<EarthquakeNode> {
 			console.error('Failed to fetch earthquake data:', error)
 
 			// Update node with error state
-			this.editor.updateShape<NodeShape>({
+			this.editor.updateShape({
 				id: shape.id,
 				type: shape.type,
 				props: {
diff --git a/templates/workflow/src/nodes/types/shared.tsx b/templates/workflow/src/nodes/types/shared.tsx
index 345e892f42a2..a78752846a3b 100644
--- a/templates/workflow/src/nodes/types/shared.tsx
+++ b/templates/workflow/src/nodes/types/shared.tsx
@@ -91,7 +91,7 @@ export function updateNode<T extends NodeType>(
 	update: (node: T) => T,
 	isOutOfDate: boolean = true
 ) {
-	editor.updateShape<NodeShape>({
+	editor.updateShape({
 		id: shape.id,
 		type: shape.type,
 		props: { node: update(shape.props.node as T), isOutOfDate },
diff --git a/templates/workflow/src/ports/PointingPort.tsx b/templates/workflow/src/ports/PointingPort.tsx
index 0492dc1488fb..1a07933d9499 100644
--- a/templates/workflow/src/ports/PointingPort.tsx
+++ b/templates/workflow/src/ports/PointingPort.tsx
@@ -4,7 +4,6 @@ import {
 	createOrUpdateConnectionBinding,
 	getConnectionBindings,
 } from '../connection/ConnectionBindingUtil'
-import { ConnectionShape } from '../connection/ConnectionShapeUtil.tsx'
 import { getNextConnectionIndex } from '../connection/keepConnectionsAtBottom'
 import {
 	DEFAULT_NODE_SPACING_PX,
@@ -146,7 +145,7 @@ export class PointingPort extends StateNode {
 			.getPointInShapeSpace(connectionShapeId, targetPositionInPageSpace)
 			.addXY(0, NODE_HEADER_HEIGHT_PX + NODE_ROW_HEADER_GAP_PX + NODE_ROW_HEIGHT_PX / 2)
 
-		this.editor.updateShape<ConnectionShape>({
+		this.editor.updateShape({
 			id: connectionShapeId,
 			type: 'connection',
 			props: {
@@ -193,8 +192,7 @@ export class PointingPort extends StateNode {
 			onClose: () => {
 				// If the connection isn't fully connected, delete it
 				const connection = this.editor.getShape(connectionShapeId)
-				if (!connection || !this.editor.isShapeOfType<ConnectionShape>(connection, 'connection'))
-					return
+				if (!connection || !this.editor.isShapeOfType(connection, 'connection')) return
 
 				const bindings = getConnectionBindings(this.editor, connection)
 				if (!bindings.start || !bindings.end) {
diff --git a/templates/workflow/src/ports/Port.tsx b/templates/workflow/src/ports/Port.tsx
index dba263d0ca57..62de8aa617eb 100644
--- a/templates/workflow/src/ports/Port.tsx
+++ b/templates/workflow/src/ports/Port.tsx
@@ -1,7 +1,6 @@
 import classNames from 'classnames'
 import { TLShapeId, useEditor, useValue, VecModel } from 'tldraw'
 import { getNodePortConnections, getNodePorts } from '../nodes/nodePorts'
-import { NodeShape } from '../nodes/NodeShapeUtil'
 import { portState } from './portState'
 
 export type PortId = string
@@ -33,7 +32,7 @@ export function Port({ shapeId, portId }: { shapeId: TLShapeId; portId: PortId }
 		'port',
 		() => {
 			const shape = editor.getShape(shapeId)
-			if (!shape || !editor.isShapeOfType<NodeShape>(shape, 'node')) return null
+			if (!shape || !editor.isShapeOfType(shape, 'node')) return null
 			return getNodePorts(editor, shape)?.[portId]
 		},
 		[shapeId, portId, editor]
diff --git a/templates/workflow/src/ports/getPortAtPoint.tsx b/templates/workflow/src/ports/getPortAtPoint.tsx
index 47b8e826bfdf..93fb0cd4f93a 100644
--- a/templates/workflow/src/ports/getPortAtPoint.tsx
+++ b/templates/workflow/src/ports/getPortAtPoint.tsx
@@ -1,6 +1,5 @@
 import { Editor, Vec, VecLike } from 'tldraw'
 import { getNodePortConnections, getNodePorts } from '../nodes/nodePorts'
-import { NodeShape } from '../nodes/NodeShapeUtil'
 import { ShapePort } from './Port'
 
 export function getPortAtPoint(
@@ -12,10 +11,10 @@ export function getPortAtPoint(
 	const shape = editor.getShapeAtPoint(point, {
 		hitInside: true,
 		// only node shapes can have ports
-		filter: (shape) => editor.isShapeOfType<NodeShape>(shape, 'node'),
+		filter: (shape) => editor.isShapeOfType(shape, 'node'),
 		...opts,
 	})
-	if (!shape || !editor.isShapeOfType<NodeShape>(shape, 'node')) return null
+	if (!shape || !editor.isShapeOfType(shape, 'node')) return null
 
 	// get the ports on that shape
 	const ports = getNodePorts(editor, shape)
diff --git a/yarn.lock b/yarn.lock
index 54bd47abb498..e84c6aca8391 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -416,6 +416,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@asteasolutions/zod-to-openapi@npm:^7.3.0":
+  version: 7.3.4
+  resolution: "@asteasolutions/zod-to-openapi@npm:7.3.4"
+  dependencies:
+    openapi3-ts: "npm:^4.1.2"
+  peerDependencies:
+    zod: ^3.20.2
+  checksum: 10/05e336e3c94264000abb03a71743925e3a48d10771afa8cdd9e1cf0a944cc82b3371d272d961fa63584e8ee26bda43aa9fba2737f503e6853ff20f5cf30a718a
+  languageName: node
+  linkType: hard
+
 "@aws-crypto/crc32@npm:5.2.0":
   version: 5.2.0
   resolution: "@aws-crypto/crc32@npm:5.2.0"
@@ -1848,6 +1859,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@bare-ts/lib@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@bare-ts/lib@npm:0.4.0"
+  checksum: 10/c4f1940c714c9626d84cc1c6e3ce6d9897ed6ceed7d6b19a0d1c945daaa8e18cb954c3f7f99682fc815e0c2b800954ac190f96515a510f5cd820046bab62bc44
+  languageName: node
+  linkType: hard
+
+"@bare-ts/lib@npm:~0.3.0":
+  version: 0.3.0
+  resolution: "@bare-ts/lib@npm:0.3.0"
+  checksum: 10/06b5de1746c1cb2063521f5f45a59fcf869768b2e9962696e257bd8013f29b407d60ddcd366c09128348c72dc5ea7144810241adce09e9bb73e36c73a23433c0
+  languageName: node
+  linkType: hard
+
 "@bcoe/v8-coverage@npm:^1.0.2":
   version: 1.0.2
   resolution: "@bcoe/v8-coverage@npm:1.0.2"
@@ -1862,6 +1887,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@cbor-extract/cbor-extract-darwin-arm64@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@cbor-extract/cbor-extract-darwin-arm64@npm:2.2.0"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@cbor-extract/cbor-extract-darwin-x64@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@cbor-extract/cbor-extract-darwin-x64@npm:2.2.0"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@cbor-extract/cbor-extract-linux-arm64@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@cbor-extract/cbor-extract-linux-arm64@npm:2.2.0"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@cbor-extract/cbor-extract-linux-arm@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@cbor-extract/cbor-extract-linux-arm@npm:2.2.0"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@cbor-extract/cbor-extract-linux-x64@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@cbor-extract/cbor-extract-linux-x64@npm:2.2.0"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@cbor-extract/cbor-extract-win32-x64@npm:2.2.0":
+  version: 2.2.0
+  resolution: "@cbor-extract/cbor-extract-win32-x64@npm:2.2.0"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@clack/core@npm:1.0.0-alpha.1, @clack/core@npm:^1.0.0-alpha.1":
   version: 1.0.0-alpha.1
   resolution: "@clack/core@npm:1.0.0-alpha.1"
@@ -1896,21 +1963,47 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@clerk/clerk-react@npm:^5.22.8":
-  version: 5.22.8
-  resolution: "@clerk/clerk-react@npm:5.22.8"
+"@clerk/clerk-react@npm:^5.53.3":
+  version: 5.53.3
+  resolution: "@clerk/clerk-react@npm:5.53.3"
   dependencies:
-    "@clerk/shared": "npm:^2.20.16"
-    "@clerk/types": "npm:^4.44.2"
-    tslib: "npm:2.4.1"
+    "@clerk/shared": "npm:^3.28.3"
+    "@clerk/types": "npm:^4.95.1"
+    tslib: "npm:2.8.1"
   peerDependencies:
     react: ^18.0.0 || ^19.0.0 || ^19.0.0-0
     react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-0
-  checksum: 10/5d693ca70dd4abaa564996f88d34325fa2c660215f15581114db801bc39ceb1f240061ae1175a9d1784db91e01e22349000dd646f2e80a618a1bd9f9e8a0cf98
+  checksum: 10/29e76f59885108e7aa56f503585efdc90605f4c306babbe236976f761fe5d005ed3550cf9c76ca1ffca0603ea52a813c9779b289fb9023ec27f8b97b6155dbf2
   languageName: node
   linkType: hard
 
-"@clerk/shared@npm:^2.20.14, @clerk/shared@npm:^2.20.16":
+"@clerk/elements@npm:^0.23.74":
+  version: 0.23.74
+  resolution: "@clerk/elements@npm:0.23.74"
+  dependencies:
+    "@clerk/clerk-react": "npm:^5.53.3"
+    "@clerk/shared": "npm:^3.28.3"
+    "@clerk/types": "npm:^4.95.1"
+    "@radix-ui/primitive": "npm:^1.1.3"
+    "@radix-ui/react-form": "npm:^0.1.8"
+    "@radix-ui/react-slot": "npm:^1.2.3"
+    "@xstate/react": "npm:^6.0.0"
+    client-only: "npm:^0.0.1"
+    tslib: "npm:2.8.1"
+    type-fest: "npm:^4.41.0"
+    xstate: "npm:^5.20.2"
+  peerDependencies:
+    next: ^13.5.4 || ^14.0.3 || ^15
+    react: ^18.0.0 || ^19.0.0 || ^19.0.0-0
+    react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-0
+  peerDependenciesMeta:
+    next:
+      optional: true
+  checksum: 10/c11247cda6825a2e844368a9b4e9cad539cb5f8cef851d5108547b8ee9326ca95bed80bc76d2aba2d3d2eb37eb44b538074cbe12f5be4ab1c572210c4eb5a589
+  languageName: node
+  linkType: hard
+
+"@clerk/shared@npm:^2.20.14":
   version: 2.20.16
   resolution: "@clerk/shared@npm:2.20.16"
   dependencies:
@@ -1932,6 +2025,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@clerk/shared@npm:^3.28.3":
+  version: 3.28.3
+  resolution: "@clerk/shared@npm:3.28.3"
+  dependencies:
+    "@clerk/types": "npm:^4.95.1"
+    dequal: "npm:2.0.3"
+    glob-to-regexp: "npm:0.4.1"
+    js-cookie: "npm:3.0.5"
+    std-env: "npm:^3.9.0"
+    swr: "npm:2.3.4"
+  peerDependencies:
+    react: ^18.0.0 || ^19.0.0 || ^19.0.0-0
+    react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-0
+  peerDependenciesMeta:
+    react:
+      optional: true
+    react-dom:
+      optional: true
+  checksum: 10/9145532d1f030fa83a37fa0f7ae9702a29333169f354f369a8d730d4e01582e239a4c22d023f7894b822807b3024e915f8170f8c1425429a3b6f6471e37c27a0
+  languageName: node
+  linkType: hard
+
 "@clerk/testing@npm:^1.4.15":
   version: 1.4.15
   resolution: "@clerk/testing@npm:1.4.15"
@@ -1952,12 +2067,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@clerk/types@npm:^4.44.0, @clerk/types@npm:^4.44.2":
-  version: 4.44.2
-  resolution: "@clerk/types@npm:4.44.2"
+"@clerk/types@npm:^4.44.0, @clerk/types@npm:^4.44.2, @clerk/types@npm:^4.95.1":
+  version: 4.95.1
+  resolution: "@clerk/types@npm:4.95.1"
   dependencies:
-    csstype: "npm:3.1.1"
-  checksum: 10/db18b80b43d3713daccfda09644d09164b19f672616efd12e795884f878ff41444b141d12dd307ae1d85f489933b4ef4bafac1b317a855571ba5ec53cc09a3e3
+    csstype: "npm:3.1.3"
+  checksum: 10/9a7f3ee66a331575801ccef60ecd39800155d0b3b61bbc832f91004e9223f42923786d452ceff738897b11c4b3b562785df2b05c637387d57c02ebd08923a799
   languageName: node
   linkType: hard
 
@@ -3478,6 +3593,61 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hono/node-server@npm:^1.19.5":
+  version: 1.19.5
+  resolution: "@hono/node-server@npm:1.19.5"
+  peerDependencies:
+    hono: ^4
+  checksum: 10/fb1945f683742739acca673e0827c386c642c4edefb1bdbfb5ee0f464191cbcc845eda2544c5e34722c5281281c7164c4d953b7f3604ab0d98ede22d9c62d189
+  languageName: node
+  linkType: hard
+
+"@hono/node-ws@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@hono/node-ws@npm:1.2.0"
+  dependencies:
+    ws: "npm:^8.17.0"
+  peerDependencies:
+    "@hono/node-server": ^1.11.1
+    hono: ^4.6.0
+  checksum: 10/aa08d3994c238ebddab3435d07bb9f35fb88b5d280a6d10177c04cbc53858b2e6b05d4bb06d5f5c2afabf5327ffb3e2cf32764d1b22f0a38d3f67294266415ed
+  languageName: node
+  linkType: hard
+
+"@hono/standard-validator@npm:^0.1.3":
+  version: 0.1.5
+  resolution: "@hono/standard-validator@npm:0.1.5"
+  peerDependencies:
+    "@standard-schema/spec": 1.0.0
+    hono: ">=3.9.0"
+  checksum: 10/ac3b0aa9e43f28716939b3e30d03d0a1769be250189ee219e96b7cbf44fa6c346a18d8afe274d37a760e885adc74d87f324c21dbdf3915a4f78937977ade6047
+  languageName: node
+  linkType: hard
+
+"@hono/zod-openapi@npm:^0.19.10":
+  version: 0.19.10
+  resolution: "@hono/zod-openapi@npm:0.19.10"
+  dependencies:
+    "@asteasolutions/zod-to-openapi": "npm:^7.3.0"
+    "@hono/zod-validator": "npm:^0.7.1"
+    openapi3-ts: "npm:^4.5.0"
+  peerDependencies:
+    hono: ">=4.3.6"
+    zod: ">=3.0.0"
+  checksum: 10/879d5b579d27823f5a46d24e27a8f57970d839bb700a9ffc1f7f2970612092a4bc95ebdf5920d23bb565b545b825d084f52e707db8ccab764056497e45e39a2a
+  languageName: node
+  linkType: hard
+
+"@hono/zod-validator@npm:^0.7.1":
+  version: 0.7.4
+  resolution: "@hono/zod-validator@npm:0.7.4"
+  peerDependencies:
+    hono: ">=3.9.0"
+    zod: ^3.25.0 || ^4.0.0
+  checksum: 10/de90d806400f0d9dba91171ca0a5ecba7ce90ae029fa486457792b05ace41d84cec7deba92bb941e4eb2869caa184f52947e53bf7340567371bef250b3a4a891
+  languageName: node
+  linkType: hard
+
 "@humanfs/core@npm:^0.19.1":
   version: 0.19.1
   resolution: "@humanfs/core@npm:0.19.1"
@@ -5257,6 +5427,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pinojs/redact@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@pinojs/redact@npm:0.4.0"
+  checksum: 10/2210ffb6b38357853d47239fd0532cc9edb406325270a81c440a35cece22090127c30c2ead3eefa3e608f2244087485308e515c431f4f69b6bd2e16cbd32812b
+  languageName: node
+  linkType: hard
+
 "@pkgjs/parseargs@npm:^0.11.0":
   version: 0.11.0
   resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -5316,6 +5493,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@posthog/core@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@posthog/core@npm:1.4.0"
+  checksum: 10/af18ac7fd26b902abacf96a19383b6062300011812c8ea16e890ef9c607fdb31c5b8c0e245a27a55d2f20bc98e4ad5f7342027f902cf5071f0d88f2682b47cd5
+  languageName: node
+  linkType: hard
+
 "@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/aspromise@npm:1.1.2"
@@ -5403,6 +5587,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/primitive@npm:1.1.3, @radix-ui/primitive@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "@radix-ui/primitive@npm:1.1.3"
+  checksum: 10/ee27abbff0d6d305816e9314655eb35e72478ba47416bc9d5cb0581728be35e3408cfc0748313837561d635f0cb7dfaae26e61831f0e16c0fd7d669a612f2cb0
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-accessible-icon@npm:1.1.7":
   version: 1.1.7
   resolution: "@radix-ui/react-accessible-icon@npm:1.1.7"
@@ -5809,6 +6000,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@radix-ui/react-form@npm:^0.1.8":
+  version: 0.1.8
+  resolution: "@radix-ui/react-form@npm:0.1.8"
+  dependencies:
+    "@radix-ui/primitive": "npm:1.1.3"
+    "@radix-ui/react-compose-refs": "npm:1.1.2"
+    "@radix-ui/react-context": "npm:1.1.2"
+    "@radix-ui/react-id": "npm:1.1.1"
+    "@radix-ui/react-label": "npm:2.1.7"
+    "@radix-ui/react-primitive": "npm:2.1.3"
+  peerDependencies:
+    "@types/react": "*"
+    "@types/react-dom": "*"
+    react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    "@types/react-dom":
+      optional: true
+  checksum: 10/62b57000820150b7938e71f324abcf562cec69e3352b52b6d28436bffc52243ae938e6b22555118431c973491f48050a959c4489880b2af113729af59a8489f8
+  languageName: node
+  linkType: hard
+
 "@radix-ui/react-hover-card@npm:1.1.14":
   version: 1.1.14
   resolution: "@radix-ui/react-hover-card@npm:1.1.14"
@@ -6331,7 +6546,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@radix-ui/react-slot@npm:1.2.3":
+"@radix-ui/react-slot@npm:1.2.3, @radix-ui/react-slot@npm:^1.2.3":
   version: 1.2.3
   resolution: "@radix-ui/react-slot@npm:1.2.3"
   dependencies:
@@ -6780,6 +6995,58 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rivetkit/engine-runner-protocol@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@ea8ef90505afd87a43a711ceb9892efe17b98c4c":
+  version: 25.8.1
+  resolution: "@rivetkit/engine-runner-protocol@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+  dependencies:
+    "@bare-ts/lib": "npm:^0.4.0"
+  checksum: 10/873c09a2679e427e37333efa3b441f0ea88cba8d8b807cab1a4ffbc594ad7221c978f0b5a1bf8339336a8b73fca88a24a8c2f33962b492a46a0b7b7f285882b1
+  languageName: node
+  linkType: hard
+
+"@rivetkit/engine-runner@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@ea8ef90505afd87a43a711ceb9892efe17b98c4c":
+  version: 25.8.1
+  resolution: "@rivetkit/engine-runner@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+  dependencies:
+    "@rivetkit/engine-runner-protocol": "https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner-protocol@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+    pino: "npm:^9.9.5"
+    uuid: "npm:^12.0.0"
+    ws: "npm:^8.18.3"
+  checksum: 10/07cc823e1c5ac46b767f1575849374cd3361fda38925432b1beaa1d894d7cec9bb30080979643f42d254f82fc30b56cc4281284bc927b7124c5646f0b78cdee6
+  languageName: node
+  linkType: hard
+
+"@rivetkit/fast-json-patch@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "@rivetkit/fast-json-patch@npm:3.1.2"
+  checksum: 10/ec8a905a080bc9b075f126b608c8b5a2f00745e01c3e11176a1f0d615cfe4fa6cfb6d4adf287939321e516ad1283e7b0bef1e1899b7c8041b3fb20ecbaf513b4
+  languageName: node
+  linkType: hard
+
+"@rivetkit/framework-base@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/framework-base@ea8ef90505afd87a43a711ceb9892efe17b98c4c":
+  version: 2.0.20
+  resolution: "@rivetkit/framework-base@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/framework-base@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+  dependencies:
+    "@tanstack/store": "npm:^0.7.1"
+    rivetkit: "https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+  checksum: 10/679a5095627012d897c62dca89eee982ad3377f2730c261f6d70f39d3ffa0f54014bba8f31bdd33fd269311352ae31c6165cced57e3159531c17a9943c312374
+  languageName: node
+  linkType: hard
+
+"@rivetkit/react@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/react@ea8ef90":
+  version: 2.0.20
+  resolution: "@rivetkit/react@https://pkg.pr.new/rivet-dev/rivet/@rivetkit/react@ea8ef90"
+  dependencies:
+    "@rivetkit/framework-base": "https://pkg.pr.new/rivet-dev/rivet/@rivetkit/framework-base@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+    "@tanstack/react-store": "npm:^0.7.1"
+    rivetkit: "https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+  peerDependencies:
+    react: ^18 || ^19
+    react-dom: ^18 || ^19
+  checksum: 10/5c8f66e7027c19e2762759c2d4fa83da6635d78f17b5d5ab6283d7003650b4dd0706f5be9970c1aedbda18d5f0f6b9c773848cd851a07da4128666fd26a1f25d
+  languageName: node
+  linkType: hard
+
 "@rocicorp/lock@npm:^1.0.4":
   version: 1.0.4
   resolution: "@rocicorp/lock@npm:1.0.4"
@@ -8440,6 +8707,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tanstack/react-store@npm:^0.7.1":
+  version: 0.7.7
+  resolution: "@tanstack/react-store@npm:0.7.7"
+  dependencies:
+    "@tanstack/store": "npm:0.7.7"
+    use-sync-external-store: "npm:^1.5.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10/3726a25d031cd9588dbf77ed76ba1f04a753746429234eac04a2b4fdad1001afc9e4a80f4297bfeed682935d6029eabb544d97d62879d6de7291e98ebc4ee4fc
+  languageName: node
+  linkType: hard
+
 "@tanstack/react-virtual@npm:^3.8.1":
   version: 3.11.3
   resolution: "@tanstack/react-virtual@npm:3.11.3"
@@ -8452,6 +8732,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tanstack/store@npm:0.7.7, @tanstack/store@npm:^0.7.1":
+  version: 0.7.7
+  resolution: "@tanstack/store@npm:0.7.7"
+  checksum: 10/d278780a3b6e634fce4359481c4908c86180f0bb817cdbf65703e1ca9c1cdc5ad7a2bc13baa505357724d176541254783295d28e192b5fd0dff09f1b322000a5
+  languageName: node
+  linkType: hard
+
 "@tanstack/virtual-core@npm:3.11.3":
   version: 3.11.3
   resolution: "@tanstack/virtual-core@npm:3.11.3"
@@ -8840,22 +9127,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tldraw/analytics-worker@workspace:apps/analytics-worker":
+  version: 0.0.0-use.local
+  resolution: "@tldraw/analytics-worker@workspace:apps/analytics-worker"
+  dependencies:
+    "@cloudflare/workers-types": "npm:^4.20250913.0"
+    esbuild: "npm:^0.25.6"
+    lazyrepo: "npm:0.0.0-alpha.27"
+    typescript: "npm:^5.8.3"
+    wrangler: "npm:^4.37.1"
+  languageName: unknown
+  linkType: soft
+
 "@tldraw/analytics@workspace:apps/analytics":
   version: 0.0.0-use.local
   resolution: "@tldraw/analytics@workspace:apps/analytics"
   dependencies:
+    "@cloudflare/workers-types": "npm:^4.20250913.0"
     "@types/js-cookie": "npm:^3.0.6"
-    "@types/react": "npm:^18.3.18"
-    "@types/react-dom": "npm:^18.3.5"
-    "@vitejs/plugin-react": "npm:^4.6.0"
     js-cookie: "npm:^3.0.5"
-    posthog-js: "npm:^1.248.1"
-    radix-ui: "npm:^1.4.2"
-    react: "npm:^18.3.1"
-    react-dom: "npm:^18.3.1"
-    react-ga4: "npm:^2.1.0"
+    posthog-js: "npm:^1.281.0"
     typescript: "npm:^5.8.3"
     vite: "npm:^7.0.1"
+    vitest: "npm:^3.2.4"
+    wrangler: "npm:^4.37.1"
   languageName: unknown
   linkType: soft
 
@@ -10218,6 +10513,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/retry@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@types/retry@npm:0.12.2"
+  checksum: 10/e5675035717b39ce4f42f339657cae9637cf0c0051cf54314a6a2c44d38d91f6544be9ddc0280587789b6afd056be5d99dbe3e9f4df68c286c36321579b1bf4a
+  languageName: node
+  linkType: hard
+
 "@types/semver@npm:^7.5.8":
   version: 7.5.8
   resolution: "@types/semver@npm:7.5.8"
@@ -11328,6 +11630,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@xstate/react@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@xstate/react@npm:6.0.0"
+  dependencies:
+    use-isomorphic-layout-effect: "npm:^1.1.2"
+    use-sync-external-store: "npm:^1.2.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    xstate: ^5.20.0
+  peerDependenciesMeta:
+    xstate:
+      optional: true
+  checksum: 10/bf6cbc5f8c3972c3e3c77935102297c2db524b7d4c2e07655c46d5a3800abede627ad86fc023e3666306bd60f520a18143fe408a06eb4e8483c42aadfb2a24e9
+  languageName: node
+  linkType: hard
+
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
@@ -12775,6 +13093,49 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cbor-extract@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "cbor-extract@npm:2.2.0"
+  dependencies:
+    "@cbor-extract/cbor-extract-darwin-arm64": "npm:2.2.0"
+    "@cbor-extract/cbor-extract-darwin-x64": "npm:2.2.0"
+    "@cbor-extract/cbor-extract-linux-arm": "npm:2.2.0"
+    "@cbor-extract/cbor-extract-linux-arm64": "npm:2.2.0"
+    "@cbor-extract/cbor-extract-linux-x64": "npm:2.2.0"
+    "@cbor-extract/cbor-extract-win32-x64": "npm:2.2.0"
+    node-gyp: "npm:latest"
+    node-gyp-build-optional-packages: "npm:5.1.1"
+  dependenciesMeta:
+    "@cbor-extract/cbor-extract-darwin-arm64":
+      optional: true
+    "@cbor-extract/cbor-extract-darwin-x64":
+      optional: true
+    "@cbor-extract/cbor-extract-linux-arm":
+      optional: true
+    "@cbor-extract/cbor-extract-linux-arm64":
+      optional: true
+    "@cbor-extract/cbor-extract-linux-x64":
+      optional: true
+    "@cbor-extract/cbor-extract-win32-x64":
+      optional: true
+  bin:
+    download-cbor-prebuilds: bin/download-prebuilds.js
+  checksum: 10/c23bb69059407c1d7847d4347e9453336d0f1dfe0c82cf4cb0e91a48feb7d2ea453244b2b5823f7fe7e699745a29bab44fcb5e341fa940d290fab41a970db3ba
+  languageName: node
+  linkType: hard
+
+"cbor-x@npm:^1.6.0":
+  version: 1.6.0
+  resolution: "cbor-x@npm:1.6.0"
+  dependencies:
+    cbor-extract: "npm:^2.2.0"
+  dependenciesMeta:
+    cbor-extract:
+      optional: true
+  checksum: 10/2e7dabbd920414ab2333324f3de79d5ebbbc465e8ec14a4c1b23714902ad149a94dfaed6a3c2370f6cd57ea47261df30a7b432d5960094d38c788e8c91093c3c
+  languageName: node
+  linkType: hard
+
 "ccount@npm:^2.0.0":
   version: 2.0.1
   resolution: "ccount@npm:2.0.1"
@@ -13129,7 +13490,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"client-only@npm:0.0.1":
+"client-only@npm:0.0.1, client-only@npm:^0.0.1":
   version: 0.0.1
   resolution: "client-only@npm:0.0.1"
   checksum: 10/0c16bf660dadb90610553c1d8946a7fdfb81d624adea073b8440b7d795d5b5b08beb3c950c6a2cf16279365a3265158a236876d92bce16423c485c322d7dfaf8
@@ -13714,14 +14075,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csstype@npm:3.1.1":
-  version: 3.1.1
-  resolution: "csstype@npm:3.1.1"
-  checksum: 10/a945162578fe5a90d40950646ab289cec8966dfacc7e5220be832d87773684c969d91920e0d5f9a0c4503aca1f9fa91134a822ebc9c2f9e01e3836ebc6369b25
-  languageName: node
-  linkType: hard
-
-"csstype@npm:^3.0.2, csstype@npm:^3.1.3":
+"csstype@npm:3.1.3, csstype@npm:^3.0.2, csstype@npm:^3.1.3":
   version: 3.1.3
   resolution: "csstype@npm:3.1.3"
   checksum: 10/f593cce41ff5ade23f44e77521e3a1bcc2c64107041e1bf6c3c32adc5187d0d60983292fda326154d20b01079e24931aa5b08e4467cc488b60bb1e7f6d478ade
@@ -14056,6 +14410,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"detect-libc@npm:^2.0.1":
+  version: 2.1.2
+  resolution: "detect-libc@npm:2.1.2"
+  checksum: 10/b736c8d97d5d46164c0d1bed53eb4e6a3b1d8530d460211e2d52f1c552875e706c58a5376854e4e54f8b828c9cada58c855288c968522eb93ac7696d65970766
+  languageName: node
+  linkType: hard
+
 "detect-node-es@npm:^1.1.0":
   version: 1.1.0
   resolution: "detect-node-es@npm:1.1.0"
@@ -14244,7 +14605,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dotcom@workspace:apps/dotcom/client"
   dependencies:
-    "@clerk/clerk-react": "npm:^5.22.8"
+    "@clerk/clerk-react": "npm:^5.53.3"
+    "@clerk/elements": "npm:^0.23.74"
     "@clerk/testing": "npm:^1.4.15"
     "@formatjs/cli": "npm:^6.5.1"
     "@playwright/test": "npm:^1.50.0"
@@ -14280,7 +14642,7 @@ __metadata:
     lazyrepo: "npm:0.0.0-alpha.27"
     lodash.pick: "npm:^4.4.0"
     pg: "npm:^8.13.1"
-    posthog-js: "npm:^1.248.1"
+    posthog-js: "npm:^1.281.0"
     qrcode: "npm:^1.5.4"
     radix-ui: "npm:^1.4.2"
     react: "npm:^18.3.1"
@@ -14288,6 +14650,7 @@ __metadata:
     react-ga4: "npm:^2.1.0"
     react-helmet-async: "npm:^1.3.0"
     react-intl: "npm:^6.8.9"
+    react-markdown: "npm:^10.1.0"
     react-router-dom: "npm:^6.28.2"
     regexgen: "npm:^1.3.0"
     tldraw: "workspace:*"
@@ -17531,6 +17894,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"hono@npm:^4.7.0":
+  version: 4.10.2
+  resolution: "hono@npm:4.10.2"
+  checksum: 10/92223307d2340fdb25c657363908b4ee679e28a2b9fae3767201a5b923d8a71f5588ec8f9d041ebd4876f8eb06c0a8f5044990ce290b8e5bc37b25a371de393d
+  languageName: node
+  linkType: hard
+
 "hookable@npm:^5.5.3":
   version: 5.5.3
   resolution: "hookable@npm:5.5.3"
@@ -18430,6 +18800,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-network-error@npm:^1.0.0":
+  version: 1.3.0
+  resolution: "is-network-error@npm:1.3.0"
+  checksum: 10/56dc0b8ed9c0bb72202058f172ad0c3121cf68772e8cbba343d3775f6e2ec7877d423cbcea45f4cedcd345de8693de1b52dfe0c6fc15d652c4aa98c2abf0185a
+  languageName: node
+  linkType: hard
+
 "is-number-object@npm:^1.1.1":
   version: 1.1.1
   resolution: "is-number-object@npm:1.1.1"
@@ -21319,6 +21696,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nanoevents@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "nanoevents@npm:9.1.0"
+  checksum: 10/77abbc15c4efc15518a0075b604e5db045e5d6184f4d08892c771928a84f53b1dd46138902213f66e8a9989e6c930168ca6441b80ff9098aec83c01a782bd42b
+  languageName: node
+  linkType: hard
+
 "nanoid@npm:3.3.1":
   version: 3.3.1
   resolution: "nanoid@npm:3.3.1"
@@ -21554,6 +21938,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-gyp-build-optional-packages@npm:5.1.1":
+  version: 5.1.1
+  resolution: "node-gyp-build-optional-packages@npm:5.1.1"
+  dependencies:
+    detect-libc: "npm:^2.0.1"
+  bin:
+    node-gyp-build-optional-packages: bin.js
+    node-gyp-build-optional-packages-optional: optional.js
+    node-gyp-build-optional-packages-test: build-test.js
+  checksum: 10/96dbeeba03fe5b9e86e1dc4491d7932cbf4c23f4ef8e63fb83bbbdcaf4553d8cbd5f23b9bc3632cb76a0739524f4b64f829daa5b608ebd72285ffdb03a9bdd81
+  languageName: node
+  linkType: hard
+
 "node-gyp-build@npm:^4.2.2":
   version: 4.8.0
   resolution: "node-gyp-build@npm:4.8.0"
@@ -21949,6 +22346,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"on-change@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "on-change@npm:5.0.1"
+  checksum: 10/e22dbdb5dcc5b4686b759df5874c6fc83c5959ec2a27b1edbfd8b48e64fb22d6dca15da025cc3b4e49619b24642ad7d7bb3bb32b39cf8f84da0ffbf9134535b6
+  languageName: node
+  linkType: hard
+
 "on-exit-leak-free@npm:^2.1.0":
   version: 2.1.2
   resolution: "on-exit-leak-free@npm:2.1.2"
@@ -22054,6 +22458,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"openapi3-ts@npm:^4.1.2, openapi3-ts@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "openapi3-ts@npm:4.5.0"
+  dependencies:
+    yaml: "npm:^2.8.0"
+  checksum: 10/83fc89459fc3b36049990a2b57eeff1b93d65550d110dcee3f822fd4bc009a0c3fae26d1064aced0736b72f31299f4cdef56c862fe95cf82384a182d30b76a4a
+  languageName: node
+  linkType: hard
+
 "opencontrol@npm:0.0.6":
   version: 0.0.6
   resolution: "opencontrol@npm:0.0.6"
@@ -22280,6 +22693,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-retry@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "p-retry@npm:6.2.1"
+  dependencies:
+    "@types/retry": "npm:0.12.2"
+    is-network-error: "npm:^1.0.0"
+    retry: "npm:^0.13.1"
+  checksum: 10/7104ef13703b155d70883b0d3654ecc03148407d2711a4516739cf93139e8bec383451e14925e25e3c1ae04dbace3ed53c26dc3853c1e9b9867fcbdde25f4cdc
+  languageName: node
+  linkType: hard
+
 "p-some@npm:^5.0.0":
   version: 5.0.0
   resolution: "p-some@npm:5.0.0"
@@ -22839,6 +23263,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pino@npm:^9.5.0, pino@npm:^9.9.5":
+  version: 9.14.0
+  resolution: "pino@npm:9.14.0"
+  dependencies:
+    "@pinojs/redact": "npm:^0.4.0"
+    atomic-sleep: "npm:^1.0.0"
+    on-exit-leak-free: "npm:^2.1.0"
+    pino-abstract-transport: "npm:^2.0.0"
+    pino-std-serializers: "npm:^7.0.0"
+    process-warning: "npm:^5.0.0"
+    quick-format-unescaped: "npm:^4.0.3"
+    real-require: "npm:^0.2.0"
+    safe-stable-stringify: "npm:^2.3.1"
+    sonic-boom: "npm:^4.0.1"
+    thread-stream: "npm:^3.0.0"
+  bin:
+    pino: bin.js
+  checksum: 10/918e1fc764885150cb2b4fae8249a0ece53275020a7ca389f994fa2fbbb17b6353cd736c2db3a3794fbac0351f8e3d58411fabe127e875e24151a8fa4cd0b2b5
+  languageName: node
+  linkType: hard
+
 "pirates@npm:^4.0.1":
   version: 4.0.6
   resolution: "pirates@npm:4.0.6"
@@ -23074,23 +23519,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"posthog-js@npm:^1.248.1":
-  version: 1.248.1
-  resolution: "posthog-js@npm:1.248.1"
+"posthog-js@npm:^1.281.0":
+  version: 1.281.0
+  resolution: "posthog-js@npm:1.281.0"
   dependencies:
+    "@posthog/core": "npm:1.4.0"
     core-js: "npm:^3.38.1"
     fflate: "npm:^0.4.8"
     preact: "npm:^10.19.3"
     web-vitals: "npm:^4.2.4"
-  peerDependencies:
-    "@rrweb/types": 2.0.0-alpha.17
-    rrweb-snapshot: 2.0.0-alpha.17
-  peerDependenciesMeta:
-    "@rrweb/types":
-      optional: true
-    rrweb-snapshot:
-      optional: true
-  checksum: 10/b9a11b29eb13fac827138e5e9e008b07bad3f7e3cf0bbd5acdac662982006ccc525c7a4d728b81149642428745714ee4c47a01ab70ecff767714bf3161b6e587
+  checksum: 10/2f5f4c64d95bdb99958a04f3744bf0c3445d51921f26889de682c394212672539589372b37b9090ad6de1f873a4b4effbe8fb2e02081a5bbfd5538bfca50b561
   languageName: node
   linkType: hard
 
@@ -24721,6 +25159,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"retry@npm:^0.13.1":
+  version: 0.13.1
+  resolution: "retry@npm:0.13.1"
+  checksum: 10/6125ec2e06d6e47e9201539c887defba4e47f63471db304c59e4b82fc63c8e89ca06a77e9d34939a9a42a76f00774b2f46c0d4a4cbb3e287268bd018ed69426d
+  languageName: node
+  linkType: hard
+
 "reusify@npm:^1.0.4":
   version: 1.0.4
   resolution: "reusify@npm:1.0.4"
@@ -24779,6 +25224,76 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rivetkit@https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90":
+  version: 2.0.20
+  resolution: "rivetkit@https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90"
+  dependencies:
+    "@bare-ts/lib": "npm:~0.3.0"
+    "@hono/standard-validator": "npm:^0.1.3"
+    "@hono/zod-openapi": "npm:^0.19.10"
+    "@rivetkit/engine-runner": "https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+    "@rivetkit/fast-json-patch": "npm:^3.1.2"
+    cbor-x: "npm:^1.6.0"
+    hono: "npm:^4.7.0"
+    invariant: "npm:^2.2.4"
+    nanoevents: "npm:^9.1.0"
+    on-change: "npm:^5.0.1"
+    p-retry: "npm:^6.2.1"
+    pino: "npm:^9.5.0"
+    zod: "npm:^3.25.76"
+  peerDependencies:
+    "@hono/node-server": ^1.14.0
+    "@hono/node-ws": ^1.1.1
+    eventsource: ^4.0.0
+    ws: ^8.0.0
+  peerDependenciesMeta:
+    "@hono/node-server":
+      optional: true
+    "@hono/node-ws":
+      optional: true
+    eventsource:
+      optional: true
+    ws:
+      optional: true
+  checksum: 10/54ce2b4b0116236412a14345d2e818f4d16e9a0fcb103c8f76e1fd94665a65e5953a63a9f037d1f4befb6a543cbb0a859ea2cb9583c1c58e4174af52355aaee2
+  languageName: node
+  linkType: hard
+
+"rivetkit@https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90505afd87a43a711ceb9892efe17b98c4c":
+  version: 2.0.20
+  resolution: "rivetkit@https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+  dependencies:
+    "@bare-ts/lib": "npm:~0.3.0"
+    "@hono/standard-validator": "npm:^0.1.3"
+    "@hono/zod-openapi": "npm:^0.19.10"
+    "@rivetkit/engine-runner": "https://pkg.pr.new/rivet-dev/rivet/@rivetkit/engine-runner@ea8ef90505afd87a43a711ceb9892efe17b98c4c"
+    "@rivetkit/fast-json-patch": "npm:^3.1.2"
+    cbor-x: "npm:^1.6.0"
+    hono: "npm:^4.7.0"
+    invariant: "npm:^2.2.4"
+    nanoevents: "npm:^9.1.0"
+    on-change: "npm:^5.0.1"
+    p-retry: "npm:^6.2.1"
+    pino: "npm:^9.5.0"
+    zod: "npm:^3.25.76"
+  peerDependencies:
+    "@hono/node-server": ^1.14.0
+    "@hono/node-ws": ^1.1.1
+    eventsource: ^4.0.0
+    ws: ^8.0.0
+  peerDependenciesMeta:
+    "@hono/node-server":
+      optional: true
+    "@hono/node-ws":
+      optional: true
+    eventsource:
+      optional: true
+    ws:
+      optional: true
+  checksum: 10/54ce2b4b0116236412a14345d2e818f4d16e9a0fcb103c8f76e1fd94665a65e5953a63a9f037d1f4befb6a543cbb0a859ea2cb9583c1c58e4174af52355aaee2
+  languageName: node
+  linkType: hard
+
 "rollup@npm:^4.43.0":
   version: 4.46.2
   resolution: "rollup@npm:4.46.2"
@@ -26529,6 +27044,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"swr@npm:2.3.4":
+  version: 2.3.4
+  resolution: "swr@npm:2.3.4"
+  dependencies:
+    dequal: "npm:^2.0.3"
+    use-sync-external-store: "npm:^1.4.0"
+  peerDependencies:
+    react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10/a0898f2d8471c03d7e983e0362f88d08ed4d8579ee45e26a4c9bc9e71b342abd821d7b2f2247f96c41534bd7e56ced4d15150c1b21e38a256548e831aa3cdfa6
+  languageName: node
+  linkType: hard
+
 "swr@npm:^2.2.0, swr@npm:^2.2.5":
   version: 2.3.6
   resolution: "swr@npm:2.3.6"
@@ -27004,6 +27531,33 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"tldraw-sync-rivet@workspace:templates/sync-rivet":
+  version: 0.0.0-use.local
+  resolution: "tldraw-sync-rivet@workspace:templates/sync-rivet"
+  dependencies:
+    "@hono/node-server": "npm:^1.19.5"
+    "@hono/node-ws": "npm:^1.2.0"
+    "@rivetkit/react": "https://pkg.pr.new/rivet-dev/rivet/@rivetkit/react@ea8ef90"
+    "@tldraw/sync": "workspace:*"
+    "@tldraw/sync-core": "workspace:*"
+    "@tldraw/tlschema": "workspace:*"
+    "@types/lodash.throttle": "npm:^4.1.9"
+    "@types/react": "npm:^18.3.18"
+    "@types/react-dom": "npm:^18.3.5"
+    "@vitejs/plugin-react-swc": "npm:^3.10.2"
+    concurrently: "npm:^9.1.2"
+    itty-router: "npm:^5.0.18"
+    lodash.throttle: "npm:^4.1.1"
+    react: "npm:^18.3.1"
+    react-dom: "npm:^18.3.1"
+    react-router-dom: "npm:^6.28.2"
+    rivetkit: "https://pkg.pr.new/rivet-dev/rivet/rivetkit@ea8ef90"
+    tldraw: "workspace:*"
+    typescript: "npm:^5.8.3"
+    vite: "npm:^7.0.1"
+  languageName: unknown
+  linkType: soft
+
 "tldraw-vite-example@workspace:templates/vite":
   version: 0.0.0-use.local
   resolution: "tldraw-vite-example@workspace:templates/vite"
@@ -27473,7 +28027,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.2, tslib@npm:^2.7.0, tslib@npm:^2.8.0, tslib@npm:^2.8.1":
+"tslib@npm:2, tslib@npm:2.8.1, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.2, tslib@npm:^2.7.0, tslib@npm:^2.8.0, tslib@npm:^2.8.1":
   version: 2.8.1
   resolution: "tslib@npm:2.8.1"
   checksum: 10/3e2e043d5c2316461cb54e5c7fe02c30ef6dccb3384717ca22ae5c6b5bc95232a6241df19c622d9c73b809bea33b187f6dbc73030963e29950c2141bc32a79f7
@@ -27567,7 +28121,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^4.15.0, type-fest@npm:^4.26.1, type-fest@npm:^4.31.0":
+"type-fest@npm:^4.15.0, type-fest@npm:^4.26.1, type-fest@npm:^4.31.0, type-fest@npm:^4.41.0":
   version: 4.41.0
   resolution: "type-fest@npm:4.41.0"
   checksum: 10/617ace794ac0893c2986912d28b3065ad1afb484cad59297835a0807dc63286c39e8675d65f7de08fafa339afcb8fe06a36e9a188b9857756ae1e92ee8bda212
@@ -28157,6 +28711,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use-isomorphic-layout-effect@npm:^1.1.2":
+  version: 1.2.1
+  resolution: "use-isomorphic-layout-effect@npm:1.2.1"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 10/a52155ffa7d67a5107ef2033ae2c63f5290c3e3b198de30d4d4f78cd7921e1ab1ea31eeec387defb67ef61adb672d3b8d25b54b7dcc089bacc4f885abde96e9d
+  languageName: node
+  linkType: hard
+
 "use-sidecar@npm:^1.1.3":
   version: 1.1.3
   resolution: "use-sidecar@npm:1.1.3"
@@ -28248,6 +28814,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^12.0.0":
+  version: 12.0.0
+  resolution: "uuid@npm:12.0.0"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 10/18079c61ec2ca899d8df034ed543dc4844ec14d3bddc3099149d4c076a28c76dfc7434bcc5fafae8799f894da6acaa055bd7e97eedb6cba2840994f02849b801
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^8.0.0, uuid@npm:^8.3.0":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
@@ -29145,7 +29720,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.0.0, ws@npm:^8.16.0, ws@npm:^8.18.0, ws@npm:^8.18.1":
+"ws@npm:^8.0.0, ws@npm:^8.16.0, ws@npm:^8.17.0, ws@npm:^8.18.0, ws@npm:^8.18.1, ws@npm:^8.18.3":
   version: 8.18.3
   resolution: "ws@npm:8.18.3"
   peerDependencies:
@@ -29250,6 +29825,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"xstate@npm:^5.20.2":
+  version: 5.23.0
+  resolution: "xstate@npm:5.23.0"
+  checksum: 10/b39d6b354460b48b1abafec1ec67d874ea8eea0674c0a85bcfef2d1f50be7c5b07632fbc07e32f163d4b11e8f1d75cf1ed0c91180e9759acd64b4bbde6fa580d
+  languageName: node
+  linkType: hard
+
 "xtend@npm:^4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
@@ -29301,6 +29883,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yaml@npm:^2.8.0":
+  version: 2.8.1
+  resolution: "yaml@npm:2.8.1"
+  bin:
+    yaml: bin.mjs
+  checksum: 10/eae07b3947d405012672ec17ce27348aea7d1fa0534143355d24a43a58f5e05652157ea2182c4fe0604f0540be71f99f1173f9d61018379404507790dff17665
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:20.2.4":
   version: 20.2.4
   resolution: "yargs-parser@npm:20.2.4"
@@ -29558,6 +30149,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"zod@npm:^3.25.76":
+  version: 3.25.76
+  resolution: "zod@npm:3.25.76"
+  checksum: 10/f0c963ec40cd96858451d1690404d603d36507c1fc9682f2dae59ab38b578687d542708a7fdbf645f77926f78c9ed558f57c3d3aa226c285f798df0c4da16995
+  languageName: node
+  linkType: hard
+
 "zod@npm:^4.1.8":
   version: 4.1.12
   resolution: "zod@npm:4.1.12"