fix: correct webhook translation

fix: complete Chinese frontend localization
feat: add Chinese translations
2026-08-23 15:25:02 +08:00 · 2026-08-23 15:05:45 +08:00 · 2026-08-23 11:58:02 +08:00 · 2026-08-12 20:12:18 +00:00 · 2026-08-12 21:11:05 +01:00 · 2026-08-08 12:38:59 +00:00
160 changed files with 38361 additions and 4197 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -60,3 +60,7 @@ pnpm-debug.log

 # Cloud compose (separate deployment)
 cloud/
+
+# Local temporary caches
+.pnpm-store
+v8-compile-cache-0
--- a/.env.example
+++ b/.env.example
@@ -23,8 +23,8 @@ SMTP_REJECT_UNAUTHORIZED= # set to "false" to accept invalid certs
 NEXT_PUBLIC_DISABLE_EMAIL=

 # S3 storage (optional)
-S3_REGION=
-S3_ENDPOINT=
+S3_REGION= # required for AWS S3 (e.g. us-east-1); ignored by most S3-compatible providers — defaults to us-east-1 if unset
+S3_ENDPOINT= # set for S3-compatible providers (MinIO, R2, Spaces, etc.); leave blank for AWS S3
 S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_FORCE_PATH_STYLE=
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,6 +7,9 @@ assignees: ''

 ---

+> [!IMPORTANT]
+> Wait for a maintainer to approve this issue before opening a PR. We'll signal approval with a comment or label. Feature PRs without an approved issue will be closed.
+
 ## ✨ Feature Request

 **Is your feature request related to a problem? Please describe.**
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,24 @@
+## Description
+
+<!-- What does this PR do? Why? -->
+
+## Type of change
+
+- [ ] Bug fix
+- [ ] Feature (requires an approved issue — see below)
+- [ ] Refactor / chore
+- [ ] Documentation
+
+## Checklist
+
+- [ ] I have linked the related issue below
+- [ ] My code follows the existing style and conventions
+- [ ] I have tested my changes locally
+- [ ] I have included screenshots for any UI changes
+
+## Linked issue
+
+Closes #<!-- issue number -->
+
+> **Feature PRs without a linked, approved issue will be closed without review.**
+> Open or comment on a [feature request](https://github.com/kanbn/kan/issues/new?template=feature_request.md) first and wait for maintainer approval before building.
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@
 node_modules
 .pnp
 .pnp.js
+.pnpm/
+.pnpm-store/
+v8-compile-cache-0/

 # testing
 coverage
@@ -55,4 +58,7 @@ i18n.cache
 # pgdata
 /apps/web/pgdata

-.claude
+# local scripts
+scripts/
+
+.claude
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,52 +1,54 @@
 # Contributing to Kan

-Thank you for your interest in contributing to Kan! This document provides guidelines and instructions for contributing to the project.
+Thank you for your interest in contributing to Kan!

-## Getting Started
+## Before you start
+
+**Open an issue before writing code for a new feature.**
+
+Feature PRs opened without a prior approved issue will be closed without review - not because the idea is bad, but because we can't review code for features we haven't aligned on yet. This protects your time as much as ours.
+
+The process is:
+
+1. Open a [feature request](https://github.com/kanbn/kan/issues/new?template=feature_request.md) and describe what you want to build
+2. Wait for a maintainer to respond and signal approval (we aim to respond within a few days)
+3. Once approved, open a PR that links the issue
+
+Bug fixes and documentation improvements don't need prior approval - just open a PR.
+
+---
+
+## Getting started

 1. Fork the repository
 2. Clone your fork: `git clone https://github.com/YOUR-USERNAME/kan.git`
-3. Create a new branch: `git checkout -b feat/your-feature-name`
+3. Create a branch: `git checkout -b feat/your-feature-name` or `fix/your-fix-name`
 4. Install dependencies: `pnpm install`
 5. Copy `.env.example` to `.env` and configure your environment variables
 6. Make your changes
-7. Commit your changes: `git commit -m "feat: description of changes"`
-8. Push to your fork: `git push origin feat/your-feature-name`
-9. Open a Pull Request
+7. Commit using [conventional commits](https://www.conventionalcommits.org/): `git commit -m "feat: description"`
+8. Push and open a Pull Request

-## Development Guidelines
+## Pull request expectations

-### Code Style
+- Link the related issue (required for features)
+- Write a clear description of what changed and why
+- Include screenshots for any UI changes
+- Keep PRs focused - one feature or fix per PR
+- All CI checks must pass before review

- Follow the existing code style
- Use meaningful variable and function names
- Add comments for complex logic
+## Code style
+
+- Follow the existing patterns in the codebase
+- Use meaningful names - avoid comments that just restate what the code does
 - Keep functions focused and concise

-### Commits
+## Need help?

- Use clear and descriptive commit messages
- Reference issue numbers when applicable
- Keep commits focused on single changes
-
-### Pull Requests
-
- Provide a clear description of the changes
- Include screenshots for UI changes
- Keep PRs focused on a single feature/fix
-
-## Need Help?
-
- Join our [Discord server](https://discord.gg/e6ejRb6CmT) for questions
- Check existing issues and pull requests
+- Join our [Discord server](https://discord.gg/e6ejRb6CmT)
+- Check existing issues and PRs before opening new ones
 - Email [henry@kan.bn](mailto:henry@kan.bn) for major concerns

-## Code of Conduct
-
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms.
-
-We aim to foster an inclusive and welcoming community. Harassment and abusive behavior will not be tolerated.
-
 ## License

 By contributing to Kan, you agree that your contributions will be licensed under the AGPLv3 License.
--- a/README.md
+++ b/README.md
@@ -170,53 +170,180 @@ pnpm dev

 ## Environment Variables 🔐

-| Variable                                  | Description                                               | Required                              | Example                                                     |
-| ----------------------------------------- | --------------------------------------------------------- | ------------------------------------- | ----------------------------------------------------------- |
-| `POSTGRES_URL`                            | PostgreSQL connection URL                                 | To use external database              | `postgres://user:pass@localhost:5432/db`                    |
-| `REDIS_URL`                               | Redis connection URL                                      | For rate limiting (optional)          | `redis://localhost:6379` or `redis://redis:6379` (Docker)   |
-| `EMAIL_FROM`                              | Sender email address                                      | For Email                             | `"Kan <hello@mail.kan.bn>"`                                 |
-| `SMTP_HOST`                               | SMTP server hostname                                      | For Email                             | `smtp.resend.com`                                           |
-| `SMTP_PORT`                               | SMTP server port                                          | For Email                             | `465`                                                       |
-| `SMTP_USER`                               | SMTP username/email                                       | No                                    | `resend`                                                    |
-| `SMTP_PASSWORD`                           | SMTP password/token                                       | No                                    | `re_xxxx`                                                   |
-| `SMTP_SECURE`                             | Use secure SMTP connection (defaults to true if not set)  | For Email                             | `true`                                                      |
-| `SMTP_REJECT_UNAUTHORIZED`                | Reject invalid certificates (defaults to true if not set) | For Email                             | `false`                                                     |
-| `NEXT_PUBLIC_DISABLE_EMAIL`               | To disable all email features                             | For Email                             | `true`                                                      |
-| `NEXT_PUBLIC_BASE_URL`                    | Base URL of your installation                             | Yes                                   | `http://localhost:3000`                                     |
-| `NEXT_API_BODY_SIZE_LIMIT`                | Maximum API request body size (defaults to 1mb)           | No                                    | `50mb`                                                      |
-| `BETTER_AUTH_ALLOWED_DOMAINS`             | Comma-separated list of allowed domains for OIDC logins   | For OIDC/Social login                 | `example.com,subsidiary.com`                                |
-| `BETTER_AUTH_SECRET`                      | Auth encryption secret                                    | Yes                                   | Random 32+ char string                                      |
-| `BETTER_AUTH_TRUSTED_ORIGINS`             | Allowed callback origins                                  | No                                    | `http://localhost:3000,http://localhost:3001`               |
-| `GOOGLE_CLIENT_ID`                        | Google OAuth client ID                                    | For Google login                      | `xxx.apps.googleusercontent.com`                            |
-| `GOOGLE_CLIENT_SECRET`                    | Google OAuth client secret                                | For Google login                      | `xxx`                                                       |
-| `DISCORD_CLIENT_ID`                       | Discord OAuth client ID                                   | For Discord login                     | `xxx`                                                       |
-| `DISCORD_CLIENT_SECRET`                   | Discord OAuth client secret                               | For Discord login                     | `xxx`                                                       |
-| `GITHUB_CLIENT_ID`                        | GitHub OAuth client ID                                    | For GitHub login                      | `xxx`                                                       |
-| `GITHUB_CLIENT_SECRET`                    | GitHub OAuth client secret                                | For GitHub login                      | `xxx`                                                       |
-| `OIDC_CLIENT_ID`                          | Generic OIDC client ID                                    | For OIDC login                        | `xxx`                                                       |
-| `OIDC_CLIENT_SECRET`                      | Generic OIDC client secret                                | For OIDC login                        | `xxx`                                                       |
-| `OIDC_DISCOVERY_URL`                      | OIDC discovery URL                                        | For OIDC login                        | `https://auth.example.com/.well-known/openid-configuration` |
-| `TRELLO_APP_API_KEY`                      | Trello app API key                                        | For Trello import                     | `xxx`                                                       |
-| `TRELLO_APP_API_SECRET`                   | Trello app API secret                                     | For Trello import                     | `xxx`                                                       |
-| `S3_REGION`                               | S3 storage region                                         | For file uploads                      | `WEUR`                                                      |
-| `S3_ENDPOINT`                             | S3 endpoint URL                                           | For file uploads                      | `https://xxx.r2.cloudflarestorage.com`                      |
-| `S3_ACCESS_KEY_ID`                        | S3 access key                                             | For file uploads (optional with IRSA) | `xxx`                                                       |
-| `S3_SECRET_ACCESS_KEY`                    | S3 secret key                                             | For file uploads (optional with IRSA) | `xxx`                                                       |
-| `S3_FORCE_PATH_STYLE`                     | Use path-style URLs for S3                                | For file uploads                      | `true`                                                      |
-| `S3_AVATAR_UPLOAD_LIMIT`                  | Maximum avatar file size in bytes                         | For file uploads                      | `2097152` (2MB)                                             |
-| `NEXT_PUBLIC_STORAGE_URL`                 | Storage service URL                                       | For file uploads                      | `https://storage.kanbn.com`                                 |
-| `NEXT_PUBLIC_STORAGE_DOMAIN`              | Storage domain name                                       | For file uploads                      | `kanbn.com`                                                 |
-| `NEXT_PUBLIC_USE_VIRTUAL_HOSTED_URLS`     | Use virtual-hosted style URLs (bucket.domain.com)         | For file uploads (optional)           | `true`                                                      |
-| `NEXT_PUBLIC_AVATAR_BUCKET_NAME`          | S3 bucket name for avatars                                | For file uploads                      | `avatars`                                                   |
-| `NEXT_PUBLIC_ATTACHMENTS_BUCKET_NAME`     | S3 bucket name for attachments                            | For file uploads                      | `attachments`                                               |
-| `NEXT_PUBLIC_ALLOW_CREDENTIALS`           | Allow email & password login                              | For authentication                    | `true`                                                      |
-| `NEXT_PUBLIC_DISABLE_SIGN_UP`             | Disable sign up                                           | For authentication                    | `false`                                                     |
-| `NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY` | Hide “Powered by kan.bn” on public boards (self-host)     | For white labelling                   | `true`                                                      |
-| `KAN_ADMIN_API_KEY`                       | Admin API key for stats and admin endpoints               | For admin/monitoring                  | `your-secret-admin-key`                                     |
-| `LOG_LEVEL`                               | Log verbosity level (debug, info, warn, error)            | No (defaults to debug in dev, info in prod) | `info`                                                 |
+| Variable                                  | Description                                               | Required                                    | Example                                                     |
+| ----------------------------------------- | --------------------------------------------------------- | ------------------------------------------- | ----------------------------------------------------------- |
+| `POSTGRES_URL`                            | PostgreSQL connection URL                                 | To use external database                    | `postgres://user:pass@localhost:5432/db`                    |
+| `REDIS_URL`                               | Redis connection URL                                      | For rate limiting (optional)                | `redis://localhost:6379` or `redis://redis:6379` (Docker)   |
+| `EMAIL_FROM`                              | Sender email address                                      | For Email                                   | `"Kan <hello@mail.kan.bn>"`                                 |
+| `SMTP_HOST`                               | SMTP server hostname                                      | For Email                                   | `smtp.resend.com`                                           |
+| `SMTP_PORT`                               | SMTP server port                                          | For Email                                   | `465`                                                       |
+| `SMTP_USER`                               | SMTP username/email                                       | No                                          | `resend`                                                    |
+| `SMTP_PASSWORD`                           | SMTP password/token                                       | No                                          | `re_xxxx`                                                   |
+| `SMTP_SECURE`                             | Use secure SMTP connection (defaults to true if not set)  | For Email                                   | `true`                                                      |
+| `SMTP_REJECT_UNAUTHORIZED`                | Reject invalid certificates (defaults to true if not set) | For Email                                   | `false`                                                     |
+| `NEXT_PUBLIC_DISABLE_EMAIL`               | To disable all email features                             | For Email                                   | `true`                                                      |
+| `NEXT_PUBLIC_BASE_URL`                    | Base URL of your installation                             | Yes                                         | `http://localhost:3000`                                     |
+| `NEXT_API_BODY_SIZE_LIMIT`                | Maximum API request body size (defaults to 1mb)           | No                                          | `50mb`                                                      |
+| `BETTER_AUTH_ALLOWED_DOMAINS`             | Comma-separated list of allowed domains for OIDC logins   | For OIDC/Social login                       | `example.com,subsidiary.com`                                |
+| `BETTER_AUTH_SECRET`                      | Auth encryption secret                                    | Yes                                         | Random 32+ char string                                      |
+| `BETTER_AUTH_TRUSTED_ORIGINS`             | Allowed callback origins                                  | No                                          | `http://localhost:3000,http://localhost:3001`               |
+| `GOOGLE_CLIENT_ID`                        | Google OAuth client ID                                    | For Google login                            | `xxx.apps.googleusercontent.com`                            |
+| `GOOGLE_CLIENT_SECRET`                    | Google OAuth client secret                                | For Google login                            | `xxx`                                                       |
+| `DISCORD_CLIENT_ID`                       | Discord OAuth client ID                                   | For Discord login                           | `xxx`                                                       |
+| `DISCORD_CLIENT_SECRET`                   | Discord OAuth client secret                               | For Discord login                           | `xxx`                                                       |
+| `GITHUB_CLIENT_ID`                        | GitHub OAuth client ID                                    | For GitHub login                            | `xxx`                                                       |
+| `GITHUB_CLIENT_SECRET`                    | GitHub OAuth client secret                                | For GitHub login                            | `xxx`                                                       |
+| `OIDC_CLIENT_ID`                          | Generic OIDC client ID                                    | For OIDC login                              | `xxx`                                                       |
+| `OIDC_CLIENT_SECRET`                      | Generic OIDC client secret                                | For OIDC login                              | `xxx`                                                       |
+| `OIDC_DISCOVERY_URL`                      | OIDC discovery URL                                        | For OIDC login                              | `https://auth.example.com/.well-known/openid-configuration` |
+| `TRELLO_APP_API_KEY`                      | Trello app API key                                        | For Trello import                           | `xxx`                                                       |
+| `TRELLO_APP_API_SECRET`                   | Trello app API secret                                     | For Trello import                           | `xxx`                                                       |
+| `S3_REGION`                               | S3 storage region                                         | For file uploads                            | `WEUR`                                                      |
+| `S3_ENDPOINT`                             | S3 endpoint URL                                           | For file uploads                            | `https://xxx.r2.cloudflarestorage.com`                      |
+| `S3_ACCESS_KEY_ID`                        | S3 access key                                             | For file uploads (optional with IRSA)       | `xxx`                                                       |
+| `S3_SECRET_ACCESS_KEY`                    | S3 secret key                                             | For file uploads (optional with IRSA)       | `xxx`                                                       |
+| `S3_FORCE_PATH_STYLE`                     | Use path-style URLs for S3                                | For file uploads                            | `true`                                                      |
+| `S3_AVATAR_UPLOAD_LIMIT`                  | Maximum avatar file size in bytes                         | For file uploads                            | `2097152` (2MB)                                             |
+| `NEXT_PUBLIC_STORAGE_URL`                 | Storage service URL                                       | For file uploads                            | `https://storage.kanbn.com`                                 |
+| `NEXT_PUBLIC_STORAGE_DOMAIN`              | Storage domain name                                       | For file uploads                            | `kanbn.com`                                                 |
+| `NEXT_PUBLIC_USE_VIRTUAL_HOSTED_URLS`     | Use virtual-hosted style URLs (bucket.domain.com)         | For file uploads (optional)                 | `true`                                                      |
+| `NEXT_PUBLIC_AVATAR_BUCKET_NAME`          | S3 bucket name for avatars                                | For file uploads                            | `avatars`                                                   |
+| `NEXT_PUBLIC_ATTACHMENTS_BUCKET_NAME`     | S3 bucket name for attachments                            | For file uploads                            | `attachments`                                               |
+| `NEXT_PUBLIC_ALLOW_CREDENTIALS`           | Allow email & password login                              | For authentication                          | `true`                                                      |
+| `NEXT_PUBLIC_DISABLE_SIGN_UP`             | Disable sign up                                           | For authentication                          | `false`                                                     |
+| `NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY` | Hide “Powered by kan.bn” on public boards (self-host)     | For white labelling                         | `true`                                                      |
+| `KAN_ADMIN_API_KEY`                       | Admin API key for stats and admin endpoints               | For admin/monitoring                        | `your-secret-admin-key`                                     |
+| `LOG_LEVEL`                               | Log verbosity level (debug, info, warn, error)            | No (defaults to debug in dev, info in prod) | `info`                                                      |

 See `.env.example` for a complete list of supported environment variables.

+## MCP Server (AI Control) 🤖
+
+Kan ships with a [Model Context Protocol](https://modelcontextprotocol.io) (MCP) server that lets any MCP-compatible AI client — GitHub Copilot, Claude Desktop, Cursor, Codex, and others — read and control your Kan instance using natural language.
+
+### Prerequisites
+
+- Node.js 18+
+- A running Kan instance (self-hosted or cloud)
+- A Kan API key (Settings → API Keys → Create key)
+
+### Installation
+
+You do **not** need to clone this repository. The recommended way is to use `npx`, which runs the server on-demand and always uses the latest version — no global install required:
+
+```bash
+npx -y @kan/mcp
+```
+
+Alternatively, install it globally:
+
+```bash
+npm install -g @kan/mcp
+kan-mcp
+```
+
+### Configuration
+
+The server is configured via two environment variables:
+
+| Variable        | Description                         | Example                        |
+| --------------- | ----------------------------------- | ------------------------------ |
+| `KAN_BASE_URL`  | Base URL of your Kan instance       | `https://your-kan.example.com` |
+| `KAN_API_TOKEN` | API key from your Kan user settings | `kan_xxxxxxxxxxxx`             |
+
+#### GitHub Copilot (VS Code)
+
+Add the following to your VS Code `mcp.json` (open it via **MCP: Open User MCP Configuration** from the Command Palette):
+
+```json
+{
+  "servers": {
+    "kan": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["-y", "@kan/mcp"],
+      "env": {
+        "KAN_BASE_URL": "https://your-kan-instance.com",
+        "KAN_API_TOKEN": "kan_your_api_key_here"
+      }
+    }
+  }
+}
+```
+
+Then use Copilot in **Agent mode** to interact with Kan.
+
+#### Claude Desktop
+
+Add to `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS) or `%APPDATA%\Claude\claude_desktop_config.json` (Windows):
+
+```json
+{
+  "mcpServers": {
+    "kan": {
+      "command": "npx",
+      "args": ["-y", "@kan/mcp"],
+      "env": {
+        "KAN_BASE_URL": "https://your-kan-instance.com",
+        "KAN_API_TOKEN": "kan_your_api_key_here"
+      }
+    }
+  }
+}
+```
+
+#### Cursor / Codex / other clients
+
+Use the same `command` + `args` + `env` pattern above — all MCP stdio clients follow the same format.
+
+### Example prompts
+
+Once connected, you can ask your AI assistant things like:
+
+**Browsing**
+
+- _"List all my workspaces"_
+- _"Show me all boards in the Marketing workspace"_
+- _"What cards are in the Backlog list of the Q3 Planning board?"_
+- _"Get the full details of card X including comments and checklists"_
+
+**Managing cards**
+
+- _"Create a card called 'Fix login bug' in the To Do list of the Dev board"_
+- _"Move the 'API redesign' card to the In Progress list"_
+- _"Set a due date of next Friday on the 'Write docs' card"_
+- _"Add a comment to the 'Deploy to prod' card saying the deployment is blocked"_
+- _"Duplicate the 'Sprint template' card into the new Sprint 4 list"_
+- _"Mark the 'Setup CI' checklist item as complete"_
+
+**Organisation**
+
+- _"Add the 'urgent' label to all cards assigned to me in the Backend board"_
+- _"Create a 'Release checklist' checklist on the v2.0 card with items: smoke test, update changelog, tag release"_
+- _"What tasks are assigned to @alice in the Mechanics Rework board?"_
+
+**Workspace management**
+
+- _"Create a new workspace called 'Client Projects'"_
+- _"Invite bob@example.com to the Marketing workspace as a member"_
+- _"Create a new board called 'Sprint 5' in the Dev workspace with lists: Backlog, In Progress, Done"_
+- _"Search for anything related to 'authentication' across the Dev workspace"_
+
+### Available tools
+
+The MCP server exposes 46 tools across 7 resource types:
+
+| Resource          | Tools                                                               |
+| ----------------- | ------------------------------------------------------------------- |
+| Workspaces        | list, find by name, get, create, update, delete, search, check slug |
+| Boards            | list, find by name, get, get by slug, create, update, delete        |
+| Lists             | create, update, delete                                              |
+| Cards             | create, get, update, delete, duplicate, get activities              |
+| Card interactions | add/update/delete comment, toggle label, toggle member              |
+| Checklists        | create, update, delete, create item, update item, delete item       |
+| Labels            | get, create, update, delete                                         |
+| Members           | invite, remove, update role, manage invite links                    |
+
 ## Contributing 🤝

 We welcome contributions! Please read our [contribution guidelines](CONTRIBUTING.md) before submitting a pull request.
@@ -227,6 +354,12 @@ We welcome contributions! Please read our [contribution guidelines](CONTRIBUTING
  <img src="https://contrib.rocks/image?repo=kanbn/kan" />
 </a>

+## Sponsors ❤️
+
+[<img height="100" alt="image" src="https://github.com/user-attachments/assets/e331c71f-ac86-46a6-bceb-ce276de094b0" />](https://www.testmuai.com)
+
+Proudly sponsored by [TestMu AI (formerly LambdaTest)](https://www.testmuai.com) - an AI-native testing cloud platform built for modern engineering teams. Covering everything from autonomous test creation and fast execution to testing AI agents like chatbots and voice assistants. If you're serious about testing, go check them out.
+
 ## License 📝

 Kan is licensed under the [AGPLv3 license](LICENSE).
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -11,6 +11,7 @@ RUN apk update && \
    apk add --no-cache libc6-compat && \
    rm -rf /var/cache/apk/* /tmp/* || true && \
    corepack enable && \
+    corepack prepare pnpm@9.14.2 --activate && \
    npm install turbo@2.3.1 --global && \
    pnpm config set store-dir ~/.pnpm-store

@@ -109,13 +110,15 @@ ENV PORT=3000
 ENV HOSTNAME=0.0.0.0

 # Copy the standalone Next.js server
-COPY --from=builder /app/apps/web/.next/standalone/ ./
+COPY --chown=1000:1000 --from=builder /app/apps/web/.next/standalone/ ./
 # Copy static assets and public files
-COPY --from=builder /app/apps/web/.next/static/ ./apps/web/.next/static/
-COPY --from=builder /app/apps/web/public/ ./apps/web/public/
+COPY --chown=1000:1000 --from=builder /app/apps/web/.next/static/ ./apps/web/.next/static/
+COPY --chown=1000:1000 --from=builder /app/apps/web/public/ ./apps/web/public/

 # Copy bootstrap script for runtime env var injection
-COPY apps/web/bootstrap.cjs ./bootstrap.cjs
+COPY --chown=1000:1000 apps/web/bootstrap.cjs ./bootstrap.cjs
+
+USER 1000:1000

 EXPOSE 3000
 CMD ["bootstrap.cjs"]
--- a/apps/web/i18n.json
+++ b/apps/web/i18n.json
@@ -2,7 +2,7 @@
  "version": "1.10",
  "locale": {
    "source": "en",
-    "targets": ["fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR"]
+    "targets": ["fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR", "zh-CN"]
  },
  "buckets": {
    "json": {
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
@@ -88,6 +88,12 @@ checksums:
    7L01XJ/message: c46571856723b03262fd33f511116298
    7L01XJ/origin/0/0: feacdaf2791aaddec128f463ffa2e807
    7L01XJ/translation: c46571856723b03262fd33f511116298
+    JEt3q7/message: 233710e683076c7eb6400a5c5ddd1d2a
+    JEt3q7/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    JEt3q7/translation: 233710e683076c7eb6400a5c5ddd1d2a
+    mkehy7/message: 71c4ebc206483ae49a2bd3dd7b6038ba
+    mkehy7/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    mkehy7/translation: 71c4ebc206483ae49a2bd3dd7b6038ba
    F6pfE9/message: 3e1ec025c4a50830bbb9ad57a176630a
    F6pfE9/origin/0/0: 4b563046ba98abb3777fb1c3560866aa
    F6pfE9/origin/1/0: f64cd62b620f454998523af2a4330278
@@ -224,7 +230,8 @@ checksums:
    Z3krJD/origin/0/0: e9da4b3a0eedd68ed126437194a482fe
    Z3krJD/translation: 0077436d9f37bfd64f3ae076a5a05040
    WnEwDO/message: 2959fd276248208b65cb27ed46b20135
-    WnEwDO/origin/0/0: d6f5120f072a821219608624f361384e
+    WnEwDO/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    WnEwDO/origin/1/0: d6f5120f072a821219608624f361384e
    WnEwDO/translation: 2959fd276248208b65cb27ed46b20135
    j1%2BHPc/message: baf4c3cd580291f41458f9ed28102c49
    j1%2BHPc/origin/0/0: 9d4260644f1a12f41d6b72574eeb111c
@@ -377,6 +384,9 @@ checksums:
    i0ZMQl/message: f739058266a2cb6a3d7cca14de09c69a
    i0ZMQl/origin/0/0: 0ad2af981579a62b084b3d41462c5546
    i0ZMQl/translation: f739058266a2cb6a3d7cca14de09c69a
+    wE3hGS/message: 1b3bccc465ad34111956b1c705c52031
+    wE3hGS/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    wE3hGS/translation: 1b3bccc465ad34111956b1c705c52031
    wewm3j/message: 985c0177744ec56d8dac84f66ec284ca
    wewm3j/origin/0/0: bcd95e286f12800a3e7ee0a71feb3ca5
    wewm3j/translation: 985c0177744ec56d8dac84f66ec284ca
@@ -529,26 +539,34 @@ checksums:
    dEgA5A/origin/1/0: a50c4fbde8da6e0a77c4e0aef0b44dea
    dEgA5A/origin/2/0: 97bd206a05414e2a571020d64e166093
    dEgA5A/origin/3/0: 522726bb62051656dc0d165185d6b451
-    dEgA5A/origin/4/0: b2059fa4b8b99cc10440da26475b234c
-    dEgA5A/origin/5/0: 2a382c1cdf010f01a8e95c3e05f6df53
-    dEgA5A/origin/6/0: d55f532bb5ae247e3a018978be0da463
-    dEgA5A/origin/7/0: 4b4f55c033add8db69178563832227c6
-    dEgA5A/origin/8/0: 68450df287fb46ea629e818732c1291a
-    dEgA5A/origin/9/0: 15ea2dfd5eae4e05b226b1320103476e
-    dEgA5A/origin/10/0: 03c00909b41be01231cd3e843c8ee44e
-    dEgA5A/origin/11/0: 0627e0040ca4939c9a57349e98c51797
-    dEgA5A/origin/12/0: 15792234f408027822ee71ccddde6f9b
-    dEgA5A/origin/13/0: 5c60161e173f5eae9276d8e4c70b4ebb
-    dEgA5A/origin/14/0: a1fde3fcce608870830f168f027727ff
-    dEgA5A/origin/15/0: 83911e3eacbad4583e2b1647a784d154
-    dEgA5A/origin/16/0: dbad0c8d7863cb41f5495264f82e7081
+    dEgA5A/origin/4/0: f8e87f3fc3dc63bc7961601feb860fa8
+    dEgA5A/origin/5/0: b2059fa4b8b99cc10440da26475b234c
+    dEgA5A/origin/6/0: 2a382c1cdf010f01a8e95c3e05f6df53
+    dEgA5A/origin/7/0: d55f532bb5ae247e3a018978be0da463
+    dEgA5A/origin/8/0: 4b4f55c033add8db69178563832227c6
+    dEgA5A/origin/9/0: 68450df287fb46ea629e818732c1291a
+    dEgA5A/origin/10/0: 15ea2dfd5eae4e05b226b1320103476e
+    dEgA5A/origin/11/0: 03c00909b41be01231cd3e843c8ee44e
+    dEgA5A/origin/12/0: 0627e0040ca4939c9a57349e98c51797
+    dEgA5A/origin/13/0: 15792234f408027822ee71ccddde6f9b
+    dEgA5A/origin/14/0: 5c60161e173f5eae9276d8e4c70b4ebb
+    dEgA5A/origin/15/0: a1fde3fcce608870830f168f027727ff
+    dEgA5A/origin/16/0: 83911e3eacbad4583e2b1647a784d154
+    dEgA5A/origin/17/0: dbad0c8d7863cb41f5495264f82e7081
    dEgA5A/translation: 2e2a849c2223911717de8caa2c71bade
    kryGs%2B/message: bba0beaced7ea954ceb980f2b022ffee
    kryGs%2B/origin/0/0: 15fd9c05fc09ccbbb54aadc4aa5e5501
    kryGs%2B/translation: bba0beaced7ea954ceb980f2b022ffee
    sU2uWc/message: 3fe52244676faf64e5266b6713d01e07
    sU2uWc/origin/0/0: 97bd206a05414e2a571020d64e166093
+    sU2uWc/origin/1/0: 1b05beba6bdd908015fa8e798717f024
    sU2uWc/translation: 3fe52244676faf64e5266b6713d01e07
+    9trBXW/message: 0035c67fb6f70992effb263b0b30e6d4
+    9trBXW/origin/0/0: 1b05beba6bdd908015fa8e798717f024
+    9trBXW/translation: 0035c67fb6f70992effb263b0b30e6d4
+    AgE2vR/message: a295a7050379531f9f56ada01c32e8e1
+    AgE2vR/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    AgE2vR/translation: a295a7050379531f9f56ada01c32e8e1
    fEY2vP/message: 91509e2f92b0b3b11330b6983139fdbf
    fEY2vP/origin/0/0: 15fd9c05fc09ccbbb54aadc4aa5e5501
    fEY2vP/origin/1/0: 15fd9c05fc09ccbbb54aadc4aa5e5501
@@ -582,8 +600,9 @@ checksums:
    pFGfsR/origin/0/0: 82383b95848d24b9311ceaef0ec94bb6
    pFGfsR/translation: b0d0be4f63c16552b3aa795af29240d1
    5IXWmO/message: e9a430fcd298def74212238df0f680d6
-    5IXWmO/origin/0/0: 4a1be3707d14c696a16f453d132fb248
-    5IXWmO/origin/1/0: d6f5120f072a821219608624f361384e
+    5IXWmO/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    5IXWmO/origin/1/0: 4a1be3707d14c696a16f453d132fb248
+    5IXWmO/origin/2/0: d6f5120f072a821219608624f361384e
    5IXWmO/translation: e9a430fcd298def74212238df0f680d6
    GnRmu4/message: 5eb5de823f7ca5a4d97bb41e6a3f675a
    GnRmu4/origin/0/0: a2dd1fc876bd42b9db7ca7aaa57ac5e2
@@ -595,6 +614,10 @@ checksums:
    zMquA7/message: 38ff8d574865bb71d2f620bc4ba98c20
    zMquA7/origin/0/0: 15ea2dfd5eae4e05b226b1320103476e
    zMquA7/translation: 38ff8d574865bb71d2f620bc4ba98c20
+    5EMoSo/message: d5825bc247cfd3e52e233f7dab8051c6
+    5EMoSo/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    5EMoSo/origin/1/0: 619b4be43b9080346366c4bf6ba2253d
+    5EMoSo/translation: d5825bc247cfd3e52e233f7dab8051c6
    VHS0aJ/message: 31d0962985c83a29558c98a765bb1b16
    VHS0aJ/origin/0/0: 15792234f408027822ee71ccddde6f9b
    VHS0aJ/translation: 31d0962985c83a29558c98a765bb1b16
@@ -614,9 +637,10 @@ checksums:
    RRn9jf/origin/1/0: d6f5120f072a821219608624f361384e
    RRn9jf/translation: 210b6ff8727f976182ec3f29ea3c7667
    yz7wBu/message: 2c2e22f8424a1031de89063bd0022e16
-    yz7wBu/origin/0/0: 15fd9c05fc09ccbbb54aadc4aa5e5501
-    yz7wBu/origin/1/0: afee530613110e248ffde6b56872ebed
-    yz7wBu/origin/2/0: dcafca531d4dce1faef7788feabfb048
+    yz7wBu/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    yz7wBu/origin/1/0: 15fd9c05fc09ccbbb54aadc4aa5e5501
+    yz7wBu/origin/2/0: afee530613110e248ffde6b56872ebed
+    yz7wBu/origin/3/0: dcafca531d4dce1faef7788feabfb048
    yz7wBu/translation: 2c2e22f8424a1031de89063bd0022e16
    TcXcmk/message: a2da6c2339301e7c3ddf068c4ff9f7e8
    TcXcmk/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
@@ -734,6 +758,9 @@ checksums:
    uvH2xS/message: ecc2617544a6d385d18678577fa112fd
    uvH2xS/origin/0/0: 97bd206a05414e2a571020d64e166093
    uvH2xS/translation: ecc2617544a6d385d18678577fa112fd
+    7mrkyO/message: d3853b58e9b736eefb0f9bf400daf4d7
+    7mrkyO/origin/0/0: 1b05beba6bdd908015fa8e798717f024
+    7mrkyO/translation: d3853b58e9b736eefb0f9bf400daf4d7
    9PaIxv/message: da95932e7a1465a5d21aa3b855a46dc2
    9PaIxv/origin/0/0: c0b59968b2b234167c488a05cc38710b
    9PaIxv/translation: da95932e7a1465a5d21aa3b855a46dc2
@@ -912,6 +939,9 @@ checksums:
    f8fH8W/message: 991b75727b6784c1a063a7462b76186d
    f8fH8W/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
    f8fH8W/translation: 991b75727b6784c1a063a7462b76186d
+    Uf%2B1DF/message: e5b4d2df65d6676318682404de4e38d3
+    Uf%2B1DF/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    Uf%2B1DF/translation: e5b4d2df65d6676318682404de4e38d3
    Odv3J6/message: f3cc49ba2dc3f9c33917f8a749d68bf5
    Odv3J6/origin/0/0: 9d4260644f1a12f41d6b72574eeb111c
    Odv3J6/translation: f3cc49ba2dc3f9c33917f8a749d68bf5
@@ -993,6 +1023,7 @@ checksums:
    BTDPLo/message: f6a33afcf5ff1489551c94867e083dca
    BTDPLo/origin/0/0: 97bd206a05414e2a571020d64e166093
    BTDPLo/origin/1/0: 0eeeb7e68164ff118040918f1ef00a7a
+    BTDPLo/origin/2/0: 1b05beba6bdd908015fa8e798717f024
    BTDPLo/translation: f6a33afcf5ff1489551c94867e083dca
    06EQqT/message: e9f56489fb395a890ae2557200c29a36
    06EQqT/origin/0/0: 97bd206a05414e2a571020d64e166093
@@ -1118,6 +1149,9 @@ checksums:
    rarRW%2F/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
    rarRW%2F/origin/1/0: 8628ddb6f4ded25c0f17e2cbda8207d3
    rarRW%2F/translation: 91553b606a6ebed3534cd2e5635ce004
+    sZixXc/message: db4e3e372abb1ac510c62b14d544f0f8
+    sZixXc/origin/0/0: 0627e0040ca4939c9a57349e98c51797
+    sZixXc/translation: db4e3e372abb1ac510c62b14d544f0f8
    sVBn4K/message: 0d7979a25d290123ed8b8906bf468f1a
    sVBn4K/origin/0/0: d465da67c0a870d198eb7f313569c137
    sVBn4K/translation: 0d7979a25d290123ed8b8906bf468f1a
@@ -1131,8 +1165,7 @@ checksums:
    x0kMO%2F/origin/0/0: 30791e26a172d47d3cb0693e82679246
    x0kMO%2F/translation: 9da6c012e1b512d8c7fbd812626c4675
    YaZDYI/message: 57cc47581c7faaffb3b1721b6352b576
-    YaZDYI/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
-    YaZDYI/origin/1/0: dbad0c8d7863cb41f5495264f82e7081
+    YaZDYI/origin/0/0: dbad0c8d7863cb41f5495264f82e7081
    YaZDYI/translation: 57cc47581c7faaffb3b1721b6352b576
    lsgnzd/message: 934c6867d9bdbe6099b2c0f5a3107f78
    lsgnzd/origin/0/0: ff4a160eca5f8da4f075fd1dd6061fa6
@@ -1241,6 +1274,9 @@ checksums:
    2POOFK/origin/4/0: 9737a9cef0646ff4bbd942b1924b9a2c
    2POOFK/origin/5/0: fadd5a5b6963ec5f261072f7e8d2140b
    2POOFK/translation: 0326365539c004f6088656f692602078
+    8LLt89/message: 9a78178dc1874543d35153ae325e2811
+    8LLt89/origin/0/0: 619b4be43b9080346366c4bf6ba2253d
+    8LLt89/translation: 9a78178dc1874543d35153ae325e2811
    uP4V6I/message: 2d403501f0488ec7d4eac979faf051a2
    uP4V6I/origin/0/0: fadd5a5b6963ec5f261072f7e8d2140b
    uP4V6I/translation: 2d403501f0488ec7d4eac979faf051a2
@@ -1377,6 +1413,9 @@ checksums:
    2Py5S%2F/message: fe1183a7439299210d8ab7379b8f4d01
    2Py5S%2F/origin/0/0: 83911e3eacbad4583e2b1647a784d154
    2Py5S%2F/translation: fe1183a7439299210d8ab7379b8f4d01
+    VOwhhz/message: 613f43526ea128b2749f70878f10008c
+    VOwhhz/origin/0/0: 1b05beba6bdd908015fa8e798717f024
+    VOwhhz/translation: 613f43526ea128b2749f70878f10008c
    iwr7AP/message: 27c24b56895defecd10b0171b39bc93f
    iwr7AP/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
    iwr7AP/translation: 27c24b56895defecd10b0171b39bc93f
@@ -1461,6 +1500,9 @@ checksums:
    "%2BdjOzj/origin/0/0": faa852a0c0e3c81fe948e394029c1ba5
    "%2BdjOzj/origin/1/0": 8628ddb6f4ded25c0f17e2cbda8207d3
    "%2BdjOzj/translation": ade922db1be6b26bc979565ce5de2bc7
+    M2zwdn/message: 4c9c0d43434ad63a70e8f956d1900602
+    M2zwdn/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    M2zwdn/translation: 4c9c0d43434ad63a70e8f956d1900602
    qPP4lD/message: 03eeed2d715e770259f722ba48a61ab3
    qPP4lD/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
    qPP4lD/translation: 03eeed2d715e770259f722ba48a61ab3
@@ -1527,6 +1569,12 @@ checksums:
    iQmbPb/message: ac2bcac75151e2fcd9eb768cea275a77
    iQmbPb/origin/0/0: 98e2302d0d8d12ce65c4140b87450673
    iQmbPb/translation: ac2bcac75151e2fcd9eb768cea275a77
+    aDzbuM/message: b6cb6ee4c4dd2cbe0d5d6a0088dcd731
+    aDzbuM/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    aDzbuM/translation: b6cb6ee4c4dd2cbe0d5d6a0088dcd731
+    K3LUJr/message: 6dd9358a22160ebed51ab3f36e2bb0b1
+    K3LUJr/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    K3LUJr/translation: 6dd9358a22160ebed51ab3f36e2bb0b1
    1njn7W/message: bb78ea2c6edd8662676c81a8a13ecb93
    1njn7W/origin/0/0: 358ea1b5babb2e9ccbf1a4c9f89dd3a5
    1njn7W/translation: bb78ea2c6edd8662676c81a8a13ecb93
@@ -1600,11 +1648,17 @@ checksums:
    W%2FElkg/message: 1f527cd6d1ed602930bcaa303f503b51
    W%2FElkg/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
    W%2FElkg/translation: 1f527cd6d1ed602930bcaa303f503b51
+    NwiNTb/message: 9840dd63c40b860a9de1488a07b86828
+    NwiNTb/origin/0/0: 619b4be43b9080346366c4bf6ba2253d
+    NwiNTb/translation: 9840dd63c40b860a9de1488a07b86828
    OvoEq7/message: 1606dc30b369856b9dba1fe9aec425d2
    OvoEq7/origin/0/0: 1d6b5f88cdad160a67842f6b65387448
    OvoEq7/origin/1/0: 1d6b5f88cdad160a67842f6b65387448
    OvoEq7/origin/2/0: 7493592314bc3b96ad96127a949ba1ba
    OvoEq7/translation: 1606dc30b369856b9dba1fe9aec425d2
+    GnG6Oy/message: c7910e9020804dbe5c7022044c669e68
+    GnG6Oy/origin/0/0: 619b4be43b9080346366c4bf6ba2253d
+    GnG6Oy/translation: c7910e9020804dbe5c7022044c669e68
    wlQNTg/message: 0932e80cba1e3e0a7f52bb67ff31da32
    wlQNTg/origin/0/0: 94d3e20c29bb517dd394711d7524e478
    wlQNTg/origin/1/0: db1e755dc7d73e037f425111bf7c30a6
@@ -1631,12 +1685,21 @@ checksums:
    vneRvS/message: e228107df80015377112d41f4f155cb3
    vneRvS/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
    vneRvS/translation: e228107df80015377112d41f4f155cb3
+    sZ%2FWDz/message: 4ae9f1cf0c53ebe8852574353d83d252
+    sZ%2FWDz/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    sZ%2FWDz/translation: 4ae9f1cf0c53ebe8852574353d83d252
+    VvCMyU/message: a70262481fb1e9e3ff2506b5c3efa03d
+    VvCMyU/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    VvCMyU/translation: a70262481fb1e9e3ff2506b5c3efa03d
    51UCsN/message: ce14fde5e972c2b5276c25ddded817c4
    51UCsN/origin/0/0: 0eeeb7e68164ff118040918f1ef00a7a
    51UCsN/translation: ce14fde5e972c2b5276c25ddded817c4
    J4%2BOTA/message: 6ad27e803483208b5313660b7b5791d3
    J4%2BOTA/origin/0/0: fd0e66cef8d46e96bcf3143a12f9b6db
    J4%2BOTA/translation: 6ad27e803483208b5313660b7b5791d3
+    S3wq2O/message: 9268b9b2e31373e5ac2e29c19d08e1ef
+    S3wq2O/origin/0/0: 0ad2af981579a62b084b3d41462c5546
+    S3wq2O/translation: 9268b9b2e31373e5ac2e29c19d08e1ef
    BOqTi5/message: 11edf0427766c26db541d46379dc3c16
    BOqTi5/placeholders/0/0: 9db68a4b386b9fa1fd1d5797c32be100
    BOqTi5/placeholders/1/0: b837a9e8bd06b58be95699b3ee663f43
@@ -1737,6 +1800,9 @@ checksums:
    TXO5TM/message: 7f1ed5d777cade7d62303e9e591bbf63
    TXO5TM/origin/0/0: feacdaf2791aaddec128f463ffa2e807
    TXO5TM/translation: 7f1ed5d777cade7d62303e9e591bbf63
+    HOMO91/message: 8a7b468d8a18e30de7743e4d5841c87f
+    HOMO91/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    HOMO91/translation: 8a7b468d8a18e30de7743e4d5841c87f
    hXMFoN/message: cedf633d99c77ff4356e089f2d98c0a6
    hXMFoN/origin/0/0: fc0c18a095a68277a0f90a115942683b
    hXMFoN/translation: cedf633d99c77ff4356e089f2d98c0a6
@@ -1811,6 +1877,9 @@ checksums:
    Uworke/message: 213d63da450f35dabb3ab0e35e29feed
    Uworke/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
    Uworke/translation: 213d63da450f35dabb3ab0e35e29feed
+    nG7mus/message: 03326832c645f4ddb873a6e7eab8a639
+    nG7mus/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    nG7mus/translation: 03326832c645f4ddb873a6e7eab8a639
    IrZaAn/message: 1fcebe9ddb46f722a57f195efddc695d
    IrZaAn/origin/0/0: 0627e0040ca4939c9a57349e98c51797
    IrZaAn/translation: 1fcebe9ddb46f722a57f195efddc695d
@@ -1823,6 +1892,9 @@ checksums:
    vwGkYB/message: 4c30501d085eaccea47af34212bb26a7
    vwGkYB/origin/0/0: 0627e0040ca4939c9a57349e98c51797
    vwGkYB/translation: 4c30501d085eaccea47af34212bb26a7
+    Xlkxmi/message: 3251e7239a9b349a86d5785a113cd6b9
+    Xlkxmi/origin/0/0: 0627e0040ca4939c9a57349e98c51797
+    Xlkxmi/translation: 3251e7239a9b349a86d5785a113cd6b9
    lpIMne/message: 37ca1f4e0afc9a0b8e9617f767103c92
    lpIMne/origin/0/0: 0627e0040ca4939c9a57349e98c51797
    lpIMne/translation: 37ca1f4e0afc9a0b8e9617f767103c92
@@ -1867,6 +1939,9 @@ checksums:
    Oi%2BJ%2BN/message: 313804fe615d51e0f0cbd599161d1ade
    Oi%2BJ%2BN/origin/0/0: 15ea2dfd5eae4e05b226b1320103476e
    Oi%2BJ%2BN/translation: 313804fe615d51e0f0cbd599161d1ade
+    GdgCoi/message: c6a08c771f97d86b02cf10d8f5f2d788
+    GdgCoi/origin/0/0: 619b4be43b9080346366c4bf6ba2253d
+    GdgCoi/translation: c6a08c771f97d86b02cf10d8f5f2d788
    Iqh0Uv/message: 0cc9dcd6ac624383e9977f66d4b3b777
    Iqh0Uv/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
    Iqh0Uv/origin/1/0: eb63312c63f6c8d2a5b6520c89012123
@@ -1937,19 +2012,18 @@ checksums:
    tyHiOa/origin/34/0: afee530613110e248ffde6b56872ebed
    tyHiOa/origin/35/0: afee530613110e248ffde6b56872ebed
    tyHiOa/origin/36/0: 8628ddb6f4ded25c0f17e2cbda8207d3
-    tyHiOa/origin/37/0: 8628ddb6f4ded25c0f17e2cbda8207d3
-    tyHiOa/origin/38/0: 7493592314bc3b96ad96127a949ba1ba
+    tyHiOa/origin/37/0: 7493592314bc3b96ad96127a949ba1ba
+    tyHiOa/origin/38/0: 69d8634b177fdf937764b406fd477547
    tyHiOa/origin/39/0: 69d8634b177fdf937764b406fd477547
-    tyHiOa/origin/40/0: 69d8634b177fdf937764b406fd477547
-    tyHiOa/origin/41/0: 03c00909b41be01231cd3e843c8ee44e
-    tyHiOa/origin/42/0: 5c60161e173f5eae9276d8e4c70b4ebb
-    tyHiOa/origin/43/0: 83911e3eacbad4583e2b1647a784d154
-    tyHiOa/origin/44/0: d465da67c0a870d198eb7f313569c137
-    tyHiOa/origin/45/0: 33bf266228f835e12c0bfb0e5efb3be9
-    tyHiOa/origin/46/0: ff48991e314b0b3e989a4dac59860fd5
-    tyHiOa/origin/47/0: 30791e26a172d47d3cb0693e82679246
-    tyHiOa/origin/48/0: dbad0c8d7863cb41f5495264f82e7081
-    tyHiOa/origin/49/0: 0dccc39d0debbf3e089cb6d292de762b
+    tyHiOa/origin/40/0: 03c00909b41be01231cd3e843c8ee44e
+    tyHiOa/origin/41/0: 5c60161e173f5eae9276d8e4c70b4ebb
+    tyHiOa/origin/42/0: 83911e3eacbad4583e2b1647a784d154
+    tyHiOa/origin/43/0: d465da67c0a870d198eb7f313569c137
+    tyHiOa/origin/44/0: 33bf266228f835e12c0bfb0e5efb3be9
+    tyHiOa/origin/45/0: ff48991e314b0b3e989a4dac59860fd5
+    tyHiOa/origin/46/0: 30791e26a172d47d3cb0693e82679246
+    tyHiOa/origin/47/0: dbad0c8d7863cb41f5495264f82e7081
+    tyHiOa/origin/48/0: 0dccc39d0debbf3e089cb6d292de762b
    tyHiOa/translation: 21ffcf0b00e7cd7b64f7454a95762e1d
    PZCqeW/message: 325dea6dd0348a27a6818db2c1340c98
    PZCqeW/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
@@ -1960,8 +2034,10 @@ checksums:
    fuwKpE/origin/1/0: fd0e66cef8d46e96bcf3143a12f9b6db
    fuwKpE/origin/2/0: fc0c18a095a68277a0f90a115942683b
    fuwKpE/origin/3/0: 1b05beba6bdd908015fa8e798717f024
-    fuwKpE/origin/4/0: 9c8b544f5db130cd7c5eda9064ba3957
-    fuwKpE/origin/5/0: faa8a2576972b4eb31565d8ea6098f43
+    fuwKpE/origin/4/0: 1b05beba6bdd908015fa8e798717f024
+    fuwKpE/origin/5/0: 1b05beba6bdd908015fa8e798717f024
+    fuwKpE/origin/6/0: 9c8b544f5db130cd7c5eda9064ba3957
+    fuwKpE/origin/7/0: faa8a2576972b4eb31565d8ea6098f43
    fuwKpE/translation: 346a18a54564881c888b95873d03df44
    nYNMZZ/message: d5a8a1b38eaf02d02cd6ac2211b42a92
    nYNMZZ/origin/0/0: 97bd206a05414e2a571020d64e166093
@@ -1992,7 +2068,8 @@ checksums:
    3fPjUY/origin/2/0: fadd5a5b6963ec5f261072f7e8d2140b
    3fPjUY/translation: 682b3c9feab30112b4454cb5bb7974b1
    oyRjD%2F/message: 76a09fd843b496610f8cf1dced417b62
-    oyRjD%2F/origin/0/0: 7493592314bc3b96ad96127a949ba1ba
+    oyRjD%2F/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    oyRjD%2F/origin/1/0: 7493592314bc3b96ad96127a949ba1ba
    oyRjD%2F/translation: 76a09fd843b496610f8cf1dced417b62
    Qtzfdk/message: a898be9e4610706b9b8146a209e8ba16
    Qtzfdk/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
@@ -2136,6 +2213,13 @@ checksums:
    SkCNhl/message: 137017b2b3e885c4894ca8c899af5bc2
    SkCNhl/origin/0/0: 89a76a14edc1c0b7876d79d7571bb8fb
    SkCNhl/translation: 137017b2b3e885c4894ca8c899af5bc2
+    66Jmqh/message: 5f56ef5447d5d3ae81d26936ca8e6758
+    66Jmqh/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    66Jmqh/translation: 5f56ef5447d5d3ae81d26936ca8e6758
+    MpFIca/message: 6e3f470ef5468c5195ae09f518b4dea4
+    MpFIca/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    MpFIca/origin/1/0: 7493592314bc3b96ad96127a949ba1ba
+    MpFIca/translation: 6e3f470ef5468c5195ae09f518b4dea4
    e1v%2BJ3/message: 9aeca4f286e14966ef1c32d2abc74584
    e1v%2BJ3/origin/0/0: f64cd62b620f454998523af2a4330278
    e1v%2BJ3/translation: 9aeca4f286e14966ef1c32d2abc74584
@@ -2151,6 +2235,9 @@ checksums:
    zYRVNp/message: 8b36455dd5b43e56d2ab06e522c3bacc
    zYRVNp/origin/0/0: 97bd206a05414e2a571020d64e166093
    zYRVNp/translation: 8b36455dd5b43e56d2ab06e522c3bacc
+    NM2hyD/message: dfd9e9abdca731ba9ca3fcff645b575e
+    NM2hyD/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    NM2hyD/translation: dfd9e9abdca731ba9ca3fcff645b575e
    wgNoIs/message: eedc7cdb02de467c15dc418a066a77f2
    wgNoIs/origin/0/0: 3c57a918258af4b44c187f58d203345f
    wgNoIs/origin/1/0: 3c57a918258af4b44c187f58d203345f
@@ -2179,11 +2266,20 @@ checksums:
    v3YoMA/message: 3fff865dc00435f82896fc302ea45630
    v3YoMA/origin/0/0: eb63312c63f6c8d2a5b6520c89012123
    v3YoMA/translation: 3fff865dc00435f82896fc302ea45630
+    GXGbXi/message: 8686cb61f9bd3cd7ed100cc3af819458
+    GXGbXi/origin/0/0: 627b72cd19a7154ae1c28cbd7ca0c730
+    GXGbXi/translation: 8686cb61f9bd3cd7ed100cc3af819458
    8AbRER/message: 3cb81c4829857556f5d117c9a23f7bcc
    8AbRER/origin/0/0: 81b173297e9c022d9ebde5f7018c95f9
    8AbRER/origin/1/0: 0eeeb7e68164ff118040918f1ef00a7a
    8AbRER/origin/2/0: 2201bf679c663a732d7f1b3c3ce3897f
    8AbRER/translation: 3cb81c4829857556f5d117c9a23f7bcc
+    2gHjVM/message: 873c4eb14a7e32e7fd7793047b6028a1
+    2gHjVM/origin/0/0: 627b72cd19a7154ae1c28cbd7ca0c730
+    2gHjVM/origin/1/0: 627b72cd19a7154ae1c28cbd7ca0c730
+    2gHjVM/origin/2/0: 0627e0040ca4939c9a57349e98c51797
+    2gHjVM/origin/3/0: 0627e0040ca4939c9a57349e98c51797
+    2gHjVM/translation: 873c4eb14a7e32e7fd7793047b6028a1
    Eit43O/message: b5d9a1edd988f455041aee9fa7fb3d63
    Eit43O/origin/0/0: 1d6b5f88cdad160a67842f6b65387448
    Eit43O/translation: b5d9a1edd988f455041aee9fa7fb3d63
@@ -2224,6 +2320,13 @@ checksums:
    n1ekoW/message: ec7b8f314fe9bc6591006707484ede61
    n1ekoW/origin/0/0: 6cda8b872e4902cbc0191d9375adf4ef
    n1ekoW/translation: ec7b8f314fe9bc6591006707484ede61
+    jbGGzf/message: 7f18a6418cc7eb05158cff67247bc966
+    jbGGzf/placeholders/partnerName/0: f182b91b0442585d06f8bf9545912628
+    jbGGzf/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    jbGGzf/translation: 7f18a6418cc7eb05158cff67247bc966
+    4dGN6E/message: dd086c229fd7cc0247d4c1b5c6f096a8
+    4dGN6E/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    4dGN6E/translation: dd086c229fd7cc0247d4c1b5c6f096a8
    fcWrnU/message: 6d842546a84e919c519bf8cbffdf25a0
    fcWrnU/origin/0/0: 15ea2dfd5eae4e05b226b1320103476e
    fcWrnU/origin/1/0: 69d8634b177fdf937764b406fd477547
@@ -2266,6 +2369,12 @@ checksums:
    6sKjjx/message: 50861c0881fe87a77412417e5ffb3fbb
    6sKjjx/origin/0/0: 15ea2dfd5eae4e05b226b1320103476e
    6sKjjx/translation: 50861c0881fe87a77412417e5ffb3fbb
+    J9%2BzIR/message: d719cefeec51f2a6dd01064715a1fccc
+    J9%2BzIR/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    J9%2BzIR/translation: d719cefeec51f2a6dd01064715a1fccc
+    r%2BdxEH/message: c3d9e1523d1401870fbf56fa8bce8f8b
+    r%2BdxEH/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    r%2BdxEH/translation: c3d9e1523d1401870fbf56fa8bce8f8b
    vnS6Rf/message: 003f7f93d44b0f5c2e40bf24e7af3bd7
    vnS6Rf/origin/0/0: c0b59968b2b234167c488a05cc38710b
    vnS6Rf/translation: 003f7f93d44b0f5c2e40bf24e7af3bd7
@@ -2273,15 +2382,22 @@ checksums:
    R6pB8R/origin/0/0: 09a6a32f9a6b415e81b4d2f8181a0e6b
    R6pB8R/translation: e5cb0428f1ac6485688f120d78742875
    veIDCY/message: 4be2811a8f3455618032ccb59e40658b
-    veIDCY/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
-    veIDCY/origin/1/0: dbad0c8d7863cb41f5495264f82e7081
+    veIDCY/origin/0/0: dbad0c8d7863cb41f5495264f82e7081
    veIDCY/translation: 4be2811a8f3455618032ccb59e40658b
+    4%2BJaWo/message: e346e4ed7d138dcc873db187922369da
+    4%2BJaWo/origin/0/0: 94d3e20c29bb517dd394711d7524e478
+    4%2BJaWo/origin/1/0: 94d3e20c29bb517dd394711d7524e478
+    4%2BJaWo/origin/2/0: 94d3e20c29bb517dd394711d7524e478
+    4%2BJaWo/translation: e346e4ed7d138dcc873db187922369da
    Y8yzGg/message: 396a94648584067cc5795f7b32d3d663
    Y8yzGg/origin/0/0: 82a5cf8d69f098641eb357bf102cd504
    Y8yzGg/translation: 396a94648584067cc5795f7b32d3d663
    uAQUqI/message: 4e1fcce15854d824919b4a582c697c90
    uAQUqI/origin/0/0: dc1a240d2d0cccb102c67ca311d4e457
    uAQUqI/translation: 4e1fcce15854d824919b4a582c697c90
+    hQRttt/message: 7c91ef5f747eea9f77a9c4f23e19fb2e
+    hQRttt/origin/0/0: b1f4eb6768222ea825703105f6014486
+    hQRttt/translation: 7c91ef5f747eea9f77a9c4f23e19fb2e
    WYDptz/message: 05f2b4abfc36def17756a6969983cf86
    WYDptz/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
    WYDptz/translation: 05f2b4abfc36def17756a6969983cf86
@@ -2310,7 +2426,8 @@ checksums:
    KM6m8p/translation: c621ea9404a37af289def443b309bf1b
    bff61F/message: 3f0ae9c914f16ceb9a0d7db868f4aa20
    bff61F/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
-    bff61F/origin/1/0: 7493592314bc3b96ad96127a949ba1ba
+    bff61F/origin/1/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    bff61F/origin/2/0: 7493592314bc3b96ad96127a949ba1ba
    bff61F/translation: 3f0ae9c914f16ceb9a0d7db868f4aa20
    CAL6E9/message: b63448c05270497973ac4407047dae02
    CAL6E9/origin/0/0: c0b59968b2b234167c488a05cc38710b
@@ -2343,6 +2460,14 @@ checksums:
    NnH3pK/message: 82a46f197779af4dde92e7e5f9336ccf
    NnH3pK/origin/0/0: dc1a240d2d0cccb102c67ca311d4e457
    NnH3pK/translation: 82a46f197779af4dde92e7e5f9336ccf
+    InJcdo/message: 1b2364c95fd318d99cc502745beac94a
+    InJcdo/origin/0/0: f64cd62b620f454998523af2a4330278
+    InJcdo/origin/1/0: dc1a240d2d0cccb102c67ca311d4e457
+    InJcdo/translation: 1b2364c95fd318d99cc502745beac94a
+    zDNL2V/message: 6e053a87e63372e903c16a06de25c9a3
+    zDNL2V/origin/0/0: f64cd62b620f454998523af2a4330278
+    zDNL2V/origin/1/0: dc1a240d2d0cccb102c67ca311d4e457
+    zDNL2V/translation: 6e053a87e63372e903c16a06de25c9a3
    itgYbC/message: efe14181bc517316e3ab3258d72d2ff9
    itgYbC/origin/0/0: f64cd62b620f454998523af2a4330278
    itgYbC/origin/1/0: dc1a240d2d0cccb102c67ca311d4e457
@@ -2353,9 +2478,16 @@ checksums:
    nhMhRr/message: 07edd8c50685a52c0969d711df26d768
    nhMhRr/origin/0/0: 1fd8ccf586705354bcae6e1186108fc7
    nhMhRr/translation: 07edd8c50685a52c0969d711df26d768
+    ssK7k%2B/message: 4321c1f033c350419ad198aaafe3b6fd
+    ssK7k%2B/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    ssK7k%2B/translation: 4321c1f033c350419ad198aaafe3b6fd
    NcFrgC/message: bd15a7b3d8b4bce18cd42682ea1ec164
    NcFrgC/origin/0/0: 0ad2af981579a62b084b3d41462c5546
    NcFrgC/translation: bd15a7b3d8b4bce18cd42682ea1ec164
+    ZWk38w/message: 0a6b07963240d329f206e280282e36da
+    ZWk38w/placeholders/0/0: 9622afa3aca4038b79417d808a505c87
+    ZWk38w/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    ZWk38w/translation: 0a6b07963240d329f206e280282e36da
    C6gv54/message: 1573c77059bc92df17e661befda8d9b7
    C6gv54/origin/0/0: 0ad2af981579a62b084b3d41462c5546
    C6gv54/translation: 1573c77059bc92df17e661befda8d9b7
@@ -2428,6 +2560,9 @@ checksums:
    mwBdZ2/message: b49224632bd6c3b7f5e462912aeb1081
    mwBdZ2/origin/0/0: 5c60161e173f5eae9276d8e4c70b4ebb
    mwBdZ2/translation: b49224632bd6c3b7f5e462912aeb1081
+    PV7XRK/message: 408b8862ad5ec9027eeec59b129ad18f
+    PV7XRK/origin/0/0: 6cda8b872e4902cbc0191d9375adf4ef
+    PV7XRK/translation: 408b8862ad5ec9027eeec59b129ad18f
    duf3Nr/message: b455329e2a71da677acab91d3a00bad6
    duf3Nr/origin/0/0: ff4a160eca5f8da4f075fd1dd6061fa6
    duf3Nr/translation: b455329e2a71da677acab91d3a00bad6
@@ -2437,6 +2572,9 @@ checksums:
    kp6L3T/message: b7eadb89c615874f416d9658d0428c4c
    kp6L3T/origin/0/0: 30791e26a172d47d3cb0693e82679246
    kp6L3T/translation: b7eadb89c615874f416d9658d0428c4c
+    pEb95p/message: 1d4c2a0ec7e4c707a4470fa4262b495d
+    pEb95p/origin/0/0: 1b05beba6bdd908015fa8e798717f024
+    pEb95p/translation: 1d4c2a0ec7e4c707a4470fa4262b495d
    MHrjPM/message: 344e64395eaff6822a57d18623853e1a
    MHrjPM/origin/0/0: a50c4fbde8da6e0a77c4e0aef0b44dea
    MHrjPM/translation: 344e64395eaff6822a57d18623853e1a
@@ -2484,6 +2622,9 @@ checksums:
    LeM5RY/message: dfeac280858332082ad34d2623a59863
    LeM5RY/origin/0/0: 0dccc39d0debbf3e089cb6d292de762b
    LeM5RY/translation: dfeac280858332082ad34d2623a59863
+    5MPY04/message: 661f2e21a85fbe1281b141a8041c8778
+    5MPY04/origin/0/0: 1b05beba6bdd908015fa8e798717f024
+    5MPY04/translation: 661f2e21a85fbe1281b141a8041c8778
    W1ewR0/message: ddcac5d14d48358b043a9487b42eec16
    W1ewR0/origin/0/0: fc0c18a095a68277a0f90a115942683b
    W1ewR0/origin/1/0: 1b05beba6bdd908015fa8e798717f024
@@ -2503,6 +2644,9 @@ checksums:
    YcyP2z/origin/0/0: 3161dd30737e7d849d4ccc30a28bada9
    YcyP2z/origin/1/0: 3161dd30737e7d849d4ccc30a28bada9
    YcyP2z/translation: 7495f1434c9188849bffd015811d5337
+    c1vOQR/message: 640ab5162eed616a7235d68376a016ed
+    c1vOQR/origin/0/0: f64cd62b620f454998523af2a4330278
+    c1vOQR/translation: 640ab5162eed616a7235d68376a016ed
    MxQXhL/message: c1c949477e121d73ed6683eddf9cd874
    MxQXhL/origin/0/0: ff4a160eca5f8da4f075fd1dd6061fa6
    MxQXhL/origin/1/0: 69d8634b177fdf937764b406fd477547
@@ -2522,9 +2666,16 @@ checksums:
    2QGEbi/message: 550198b2c87f06726a843c79c1026ed9
    2QGEbi/origin/0/0: 4b4f55c033add8db69178563832227c6
    2QGEbi/translation: 550198b2c87f06726a843c79c1026ed9
+    23nvb2/message: b9dedce59b5594ee2a88bf5d55d6dfac
+    23nvb2/origin/0/0: a1fde3fcce608870830f168f027727ff
+    23nvb2/translation: b9dedce59b5594ee2a88bf5d55d6dfac
    Oo4E6p/message: af985cf72c47df76e2f2139a427d9948
    Oo4E6p/origin/0/0: 97bd206a05414e2a571020d64e166093
+    Oo4E6p/origin/1/0: 1b05beba6bdd908015fa8e798717f024
    Oo4E6p/translation: af985cf72c47df76e2f2139a427d9948
+    d196%2F6/message: 64c37452b5ff985b44f1347ce0ef659f
+    d196%2F6/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    d196%2F6/translation: 64c37452b5ff985b44f1347ce0ef659f
    K7k9u3/message: 1cf9d227042f6a65adba38cb7296830d
    K7k9u3/origin/0/0: fd0e66cef8d46e96bcf3143a12f9b6db
    K7k9u3/translation: 1cf9d227042f6a65adba38cb7296830d
@@ -2543,6 +2694,10 @@ checksums:
    Q60WUZ/message: 4284c33aed2f2c5e004ed0a7d7d9bf87
    Q60WUZ/origin/0/0: 69d8634b177fdf937764b406fd477547
    Q60WUZ/translation: 4284c33aed2f2c5e004ed0a7d7d9bf87
+    KNK33q/message: a606d59661b59b5e2e9ab58e8cbc143b
+    KNK33q/origin/0/0: f64cd62b620f454998523af2a4330278
+    KNK33q/origin/1/0: dc1a240d2d0cccb102c67ca311d4e457
+    KNK33q/translation: a606d59661b59b5e2e9ab58e8cbc143b
    T7Mywq/message: 62899897d7bffcb1df3af77d460f0881
    T7Mywq/origin/0/0: 0ad2af981579a62b084b3d41462c5546
    T7Mywq/translation: 62899897d7bffcb1df3af77d460f0881
@@ -2585,6 +2740,9 @@ checksums:
    TFv5tM/message: 4f2240aeff6f7275feb33ca3f608e48c
    TFv5tM/origin/0/0: 7493592314bc3b96ad96127a949ba1ba
    TFv5tM/translation: 4f2240aeff6f7275feb33ca3f608e48c
+    V1o9Jo/message: 7b212f1c2fdc370974f859b08349b0c6
+    V1o9Jo/origin/0/0: f64cd62b620f454998523af2a4330278
+    V1o9Jo/translation: 7b212f1c2fdc370974f859b08349b0c6
    It4%2FFS/message: ae1527c2765592f13980acb66997e570
    It4%2FFS/origin/0/0: 0ad2af981579a62b084b3d41462c5546
    It4%2FFS/translation: ae1527c2765592f13980acb66997e570
@@ -2628,6 +2786,9 @@ checksums:
    7Ufoyg/message: 5c418701b27b9acbc5dd199719007362
    7Ufoyg/origin/0/0: 9737a9cef0646ff4bbd942b1924b9a2c
    7Ufoyg/translation: 5c418701b27b9acbc5dd199719007362
+    uXKtPH/message: 8a95d730b360db6041001450aa751ab4
+    uXKtPH/origin/0/0: 619b4be43b9080346366c4bf6ba2253d
+    uXKtPH/translation: 8a95d730b360db6041001450aa751ab4
    mx8%2B1u/message: f2949ca2dc18b0063af92e60779abb65
    mx8%2B1u/origin/0/0: c0b59968b2b234167c488a05cc38710b
    mx8%2B1u/origin/1/0: c0b59968b2b234167c488a05cc38710b
@@ -2637,6 +2798,9 @@ checksums:
    8AwlaR/message: acb1fdc14ed875815ae9f8a5254bc634
    8AwlaR/origin/0/0: 15ea2dfd5eae4e05b226b1320103476e
    8AwlaR/translation: acb1fdc14ed875815ae9f8a5254bc634
+    i5yNAO/message: 478092018a27a4e588cb5c70968ef11a
+    i5yNAO/origin/0/0: 7493592314bc3b96ad96127a949ba1ba
+    i5yNAO/translation: 478092018a27a4e588cb5c70968ef11a
    Ws%2B3X%2B/message: 905b10eeb09fdc5ac7fc757e935ee757
    Ws%2B3X%2B/origin/0/0: fadd5a5b6963ec5f261072f7e8d2140b
    Ws%2B3X%2B/translation: 905b10eeb09fdc5ac7fc757e935ee757
@@ -2670,10 +2834,12 @@ checksums:
    zERArS/placeholders/0/0: 06f23520ebabfffed4999b5bcf61c9cd
    zERArS/origin/0/0: 1d6b5f88cdad160a67842f6b65387448
    zERArS/translation: aca196d729401d8adc5c8ca9d558840e
+    kwkhPe/message: 63c3b52882e0d779859307d672c178c2
+    kwkhPe/origin/0/0: 7493592314bc3b96ad96127a949ba1ba
+    kwkhPe/origin/1/0: 15ea2dfd5eae4e05b226b1320103476e
+    kwkhPe/translation: 63c3b52882e0d779859307d672c178c2
    IelE1h/message: 972773025e763ddf53273df6d37a729a
-    IelE1h/origin/0/0: 94d3e20c29bb517dd394711d7524e478
-    IelE1h/origin/1/0: dbad0c8d7863cb41f5495264f82e7081
-    IelE1h/origin/2/0: 5f6c4a0c9be5098099167871ae1564af
+    IelE1h/origin/0/0: dbad0c8d7863cb41f5495264f82e7081
    IelE1h/translation: 972773025e763ddf53273df6d37a729a
    cWtfn1/message: 9a91ea70f5eb55aac96640bf0fd7feff
    cWtfn1/origin/0/0: 69d8634b177fdf937764b406fd477547
@@ -2746,12 +2912,22 @@ checksums:
    "%2BEkBs0/message": 69d1d2575f2e73b08ac622bde0a45b4d
    "%2BEkBs0/origin/0/0": d1e1d7ccce60e05570bedfbb93fc9416
    "%2BEkBs0/translation": 69d1d2575f2e73b08ac622bde0a45b4d
+    7sdSkl/message: 6132de0281f288a30690bb2218089951
+    7sdSkl/placeholders/magicLinkRecipient/0: 63ab7807b81db57469a3b7fa40e6826e
+    7sdSkl/origin/0/0: 055278d1067f7350adbbc1eaf446e43c
+    7sdSkl/translation: 6132de0281f288a30690bb2218089951
    9y1RcT/message: 2dfa121e0ff1914e08068308a81973c0
    9y1RcT/origin/0/0: d77eb1f90f2fa86a55181629d88d237a
    9y1RcT/translation: 2dfa121e0ff1914e08068308a81973c0
+    an6ayw/message: 2d39f6440ad379e417193dbfaa265b5f
+    an6ayw/origin/0/0: f64cd62b620f454998523af2a4330278
+    an6ayw/translation: 2d39f6440ad379e417193dbfaa265b5f
    GdWB%2BV/message: 6a15a9b926ecd2c91454e9da19c6049e
    GdWB%2BV/origin/0/0: f64cd62b620f454998523af2a4330278
    GdWB%2BV/translation: 6a15a9b926ecd2c91454e9da19c6049e
+    LnaC5y/message: 229d2a9159e17f243cf317b9bd7d471c
+    LnaC5y/origin/0/0: a1fde3fcce608870830f168f027727ff
+    LnaC5y/translation: 229d2a9159e17f243cf317b9bd7d471c
    2X4ecw/message: fcefd247ec76a372002d2cffac3c5b0f
    2X4ecw/origin/0/0: a1fde3fcce608870830f168f027727ff
    2X4ecw/translation: fcefd247ec76a372002d2cffac3c5b0f
@@ -2765,6 +2941,9 @@ checksums:
    8iP9oQ/origin/0/0: f64cd62b620f454998523af2a4330278
    8iP9oQ/origin/1/0: dc1a240d2d0cccb102c67ca311d4e457
    8iP9oQ/translation: 5c07446c838d07572c6b40621507e951
+    kxZ7LS/message: 41ebcdff41ce85329915754faf7140c0
+    kxZ7LS/origin/0/0: f64cd62b620f454998523af2a4330278
+    kxZ7LS/translation: 41ebcdff41ce85329915754faf7140c0
    3d54Wj/message: d67dc42810694fd1344a9a9545aca1e7
    3d54Wj/origin/0/0: f64cd62b620f454998523af2a4330278
    3d54Wj/translation: d67dc42810694fd1344a9a9545aca1e7
@@ -2883,6 +3062,9 @@ checksums:
    vAj6xG/message: a6152a41b2d8f64d5a657e5b8bc808a9
    vAj6xG/origin/0/0: 4980d8e27a628e7cd9a70b839d844083
    vAj6xG/translation: a6152a41b2d8f64d5a657e5b8bc808a9
+    tUL16u/message: 9064ca54e8a3ad28c03a173bc7b01184
+    tUL16u/origin/0/0: f8e87f3fc3dc63bc7961601feb860fa8
+    tUL16u/translation: 9064ca54e8a3ad28c03a173bc7b01184
    h2FKMV/message: 11d928b1993d95d54a95f85f8ae5016d
    h2FKMV/origin/0/0: 6812b79a8fdc3527586b523d4c137340
    h2FKMV/origin/1/0: 85d0a3237fa9329fba3f0278a2cd7284
@@ -2908,12 +3090,22 @@ checksums:
    MdN5zD/message: e2e816f2b7a13b1056d79e7f25088664
    MdN5zD/origin/0/0: 0dccc39d0debbf3e089cb6d292de762b
    MdN5zD/translation: e2e816f2b7a13b1056d79e7f25088664
+    ZhQoZn/message: b05a1191bf048d76e7d6c1c3e76ce1fd
+    ZhQoZn/origin/0/0: 0627e0040ca4939c9a57349e98c51797
+    ZhQoZn/translation: b05a1191bf048d76e7d6c1c3e76ce1fd
    2SePRT/message: 257b840726f972f384243a72767f880f
    2SePRT/origin/0/0: 6cda8b872e4902cbc0191d9375adf4ef
    2SePRT/translation: 257b840726f972f384243a72767f880f
    uOqaMC/message: 24fc6cdc8740f37a83df85f582f03293
    uOqaMC/origin/0/0: 6cda8b872e4902cbc0191d9375adf4ef
    uOqaMC/translation: 24fc6cdc8740f37a83df85f582f03293
+    QriiAI/message: 37a6b38e70fdfef1e2208ede67aeab98
+    QriiAI/placeholders/0/0: 4ab04dd216aebb6485be0c4b94d5ca6b
+    QriiAI/origin/0/0: 8628ddb6f4ded25c0f17e2cbda8207d3
+    QriiAI/translation: 37a6b38e70fdfef1e2208ede67aeab98
+    8Zjc7q/message: 65609a209e74f230563a7c8d7258a83c
+    8Zjc7q/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    8Zjc7q/translation: 65609a209e74f230563a7c8d7258a83c
    GoDLB9/message: 8c8d944e07388c5877effdb2c2803dcf
    GoDLB9/origin/0/0: 5c60161e173f5eae9276d8e4c70b4ebb
    GoDLB9/translation: 8c8d944e07388c5877effdb2c2803dcf
@@ -2938,9 +3130,18 @@ checksums:
    PELbXB/message: 6984aed03bbcd94041c5dd20f62e56ed
    PELbXB/origin/0/0: 9d4260644f1a12f41d6b72574eeb111c
    PELbXB/translation: 6984aed03bbcd94041c5dd20f62e56ed
+    ygpeZ8/message: 59444b15ae58f987931a4746f4c77a0b
+    ygpeZ8/origin/0/0: 278a40eb45b1219f424703d0abc1d273
+    ygpeZ8/translation: 59444b15ae58f987931a4746f4c77a0b
+    "%2BA6Wuq/message": 36d33d3622921dbb1475da2acb98f754
+    "%2BA6Wuq/origin/0/0": 278a40eb45b1219f424703d0abc1d273
+    "%2BA6Wuq/translation": 36d33d3622921dbb1475da2acb98f754
    Ozt2vv/message: 8f730f68d52b7efa727aa0784282ebcb
    Ozt2vv/origin/0/0: 0627e0040ca4939c9a57349e98c51797
    Ozt2vv/translation: 8f730f68d52b7efa727aa0784282ebcb
+    EuK5ez/message: d262a1ba9ebeea549d982f9cf85a6c18
+    EuK5ez/origin/0/0: 0627e0040ca4939c9a57349e98c51797
+    EuK5ez/translation: d262a1ba9ebeea549d982f9cf85a6c18
    "%2FtOdd2/message": 099e1780348cd7bf617721344371a430
    "%2FtOdd2/origin/0/0": 03c00909b41be01231cd3e843c8ee44e
    "%2FtOdd2/translation": 099e1780348cd7bf617721344371a430
--- a/apps/web/lingui.config.ts
+++ b/apps/web/lingui.config.ts
@@ -3,7 +3,7 @@ import { formatter } from "@lingui/format-json";


 export default defineConfig({
-  locales: ["en", "fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR"],
+  locales: ["en", "fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR", "zh-CN"],
  sourceLocale: "en",
  catalogs: [
    {
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -27,13 +27,13 @@
    "@kan/api": "workspace:*",
    "@kan/auth": "workspace:*",
    "@kan/db": "workspace:^",
+    "@kan/email": "workspace:^",
    "@kan/logger": "workspace:^",
    "@kan/shared": "workspace:^",
    "@lingui/babel-preset-react": "^2.9.2",
    "@lingui/conf": "^5.3.2",
    "@lingui/macro": "^5.3.2",
    "@lingui/react": "^5.3.2",
-    "@novu/api": "^3.11.0",
    "@t3-oss/env-nextjs": "^0.11.1",
    "@tailwindcss/typography": "^0.5.16",
    "@tanstack/react-query": "catalog:",
--- a/apps/web/src/components/AuthForm.tsx
+++ b/apps/web/src/components/AuthForm.tsx
@@ -46,6 +46,7 @@ interface FormValues {
 interface AuthProps {
  setIsMagicLinkSent: (value: boolean, recipient: string) => void;
  isSignUp?: boolean;
+  callbackURL?: string;
 }

 const EmailSchema = z.object({
@@ -152,7 +153,11 @@ const availableSocialProviders = {
  },
 };

-export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
+export function Auth({
+  setIsMagicLinkSent,
+  isSignUp,
+  callbackURL: callbackURLProp,
+}: AuthProps) {
  const [isCloudEnv, setIsCloudEnv] = useState(false);
  const [isLoginWithProviderPending, setIsLoginWithProviderPending] =
    useState<null | AuthProvider>(null);
@@ -165,7 +170,7 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
  const passwordRef = useRef<HTMLInputElement | null>(null);

  const redirect = useSearchParams().get("next");
-  const callbackURL = redirect ?? "/boards";
+  const callbackURL = callbackURLProp ?? redirect ?? "/boards";

  // Safely get environment variables on client side to avoid hydration mismatch
  useEffect(() => {
--- a/apps/web/src/components/CommandPallette.tsx
+++ b/apps/web/src/components/CommandPallette.tsx
@@ -33,6 +33,7 @@ type SearchResult =
      boardPublicId: string;
      boardName: string;
      listName: string;
+      cardNumber: number | null;
      updatedAt: Date | null;
      createdAt: Date;
      type: "card";
@@ -159,8 +160,17 @@ export default function CommandPallette({
                            )}
                          </div>
                          <div className="min-w-0 flex-1 text-left">
-                            <div className="truncate text-sm font-bold text-light-900 dark:text-dark-900">
-                              {result.title}
+                            <div className="flex items-center gap-2">
+                              <div className="truncate text-sm font-bold text-light-900 dark:text-dark-900">
+                                {result.title}
+                              </div>
+                              {result.type === "card" &&
+                                result.cardNumber != null &&
+                                workspace.cardPrefix && (
+                                  <span className="flex-shrink-0 text-xs text-light-600 dark:text-dark-600">
+                                    {workspace.cardPrefix}-{result.cardNumber}
+                                  </span>
+                                )}
                            </div>
                            {result.type === "card" && (
                              <div className="truncate text-xs text-light-700 dark:text-dark-700">
--- a/apps/web/src/components/Dashboard.tsx
+++ b/apps/web/src/components/Dashboard.tsx
@@ -1,6 +1,7 @@
-import { useTheme } from "next-themes";
-import { useRouter } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
+import { t } from "@lingui/core/macro";
 import { env } from "next-runtime-env";
+import { useTheme } from "next-themes";
 import { useEffect, useRef, useState } from "react";
 import {
  TbLayoutSidebarLeftCollapse,
@@ -13,8 +14,12 @@ import { authClient } from "@kan/auth/client";

 import { useClickOutside } from "~/hooks/useClickOutside";
 import { useModal } from "~/providers/modal";
+import { usePopup } from "~/providers/popup";
 import { useWorkspace, WorkspaceProvider } from "~/providers/workspace";
 import { api } from "~/utils/api";
+import { ChangePasswordFormConfirmation } from "~/views/settings/components/ChangePasswordConfirmation";
+import Button from "./Button";
+import Modal from "./modal";
 import SideNavigation from "./SideNavigation";

 interface DashboardProps {
@@ -43,9 +48,11 @@ export default function Dashboard({
  hasRightPanel = false,
 }: DashboardProps) {
  const { resolvedTheme } = useTheme();
-  const { openModal } = useModal();
+  const { openModal, closeModal, modalContentType } = useModal();
  const { availableWorkspaces, hasLoaded } = useWorkspace();
+  const { showPopup } = usePopup();
  const router = useRouter();
+  const searchParams = useSearchParams();

  const { data: session, isPending: sessionLoading } = authClient.useSession();
  const { data: user, isLoading: userLoading } = api.user.getUser.useQuery(
@@ -99,16 +106,67 @@ export default function Dashboard({
    }
  });

+  useEffect(() => {
+    const partnerActivated = searchParams.get("partner_activated");
+    const partnerError = searchParams.get("partner_error");
+
+    if (partnerActivated) {
+      showPopup({
+        header: t`License activated`,
+        message: t`Your license has been activated successfully.`,
+        icon: "success",
+      });
+      const params = new URLSearchParams(searchParams.toString());
+      params.delete("partner_activated");
+      router.replace(`?${params.toString()}`);
+    } else if (partnerError) {
+      const messages: Record<string, string> = {
+        invalid_license: t`That license key could not be found. Please contact support.`,
+        license_inactive: t`Your license is not active. Please check your account.`,
+        missing_license: t`No license key was provided. Please try activating again.`,
+      };
+      showPopup({
+        header: t`License activation failed`,
+        message:
+          messages[partnerError] ??
+          t`Something went wrong during license activation.`,
+        icon: "error",
+      });
+      const params = new URLSearchParams(searchParams.toString());
+      params.delete("partner_error");
+      router.replace(`?${params.toString()}`);
+    }
+  }, [searchParams, showPopup, router]);
+
  useEffect(() => {
    if (hasLoaded && availableWorkspaces.length === 0) {
      if (env("NEXT_PUBLIC_KAN_ENV") === "cloud") {
-        router.push(`/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`);
+        router.push(
+          `/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`,
+        );
      } else {
        openModal("NEW_WORKSPACE", undefined, undefined, false);
      }
    }
  }, [hasLoaded, availableWorkspaces.length, openModal, router]);

+  useEffect(() => {
+    const isCredentialsEnabled =
+      env("NEXT_PUBLIC_ALLOW_CREDENTIALS")?.toLowerCase() === "true";
+
+    if (
+      !userLoading &&
+      user &&
+      isCredentialsEnabled &&
+      user.hasMagicLinkAccount &&
+      !user.hasPassword &&
+      !sessionStorage.getItem("set_password_prompted")
+    ) {
+      sessionStorage.setItem("set_password_prompted", "1");
+      openModal("SET_PASSWORD_PROMPT");
+    }
+  }, [user, userLoading, openModal]);
+
  const isDarkMode = resolvedTheme === "dark";

  return (
@@ -203,6 +261,30 @@ export default function Dashboard({
          </div>
        </div>
      </div>
+
+      <Modal
+        modalSize="sm"
+        isVisible={modalContentType === "SET_PASSWORD_PROMPT"}
+      >
+        {user?.hasPassword ? (
+          <div className="p-5">
+            <h2 className="pb-4 text-base font-medium dark:text-white">{t`Password already set`}</h2>
+            <p className="mb-6 text-sm text-light-900">
+              {t`Your account already has a password. You can change it from your account settings.`}
+            </p>
+            <Button
+              variant="secondary"
+              onClick={closeModal}
+              fullWidth
+              size="lg"
+            >
+              {t`Close`}
+            </Button>
+          </div>
+        ) : (
+          <ChangePasswordFormConfirmation hasPassword={false} />
+        )}
+      </Modal>
    </>
  );
 }
--- a/apps/web/src/components/Editor.tsx
+++ b/apps/web/src/components/Editor.tsx
@@ -10,6 +10,7 @@ import { t } from "@lingui/core/macro";
 import Link from "@tiptap/extension-link";
 import Mention from "@tiptap/extension-mention";
 import Placeholder from "@tiptap/extension-placeholder";
+import Typography from "@tiptap/extension-typography";
 import {
  BubbleMenu,
  EditorContent,
@@ -17,7 +18,6 @@ import {
  ReactRenderer,
  useEditor,
 } from "@tiptap/react";
-import Typography from "@tiptap/extension-typography";
 import StarterKit from "@tiptap/starter-kit";
 import Suggestion from "@tiptap/suggestion";
 import {
@@ -85,7 +85,7 @@ export interface RenderSuggestionsProps {
 export interface WorkspaceMember {
  publicId: string;
  user: {
-    id: string;
+    id: string | null;
    name: string | null;
    image: string | null;
  } | null;
@@ -180,13 +180,13 @@ const RenderSuggestions = () => {

      if (!props.clientRect) return;

-      popup[0]?.setProps({
+      popup?.[0]?.setProps({
        getReferenceClientRect: props.clientRect,
      });
    },
    onKeyDown(props: SuggestionKeyDownProps): boolean {
      if (props.event.key === "Escape") {
-        popup[0]?.hide();
+        popup?.[0]?.hide();
        return true;
      }

@@ -199,7 +199,7 @@ const RenderSuggestions = () => {
      );
    },
    onExit() {
-      popup[0]?.destroy();
+      popup?.[0]?.destroy();
      reactRenderer.destroy();
    },
  };
@@ -308,11 +308,11 @@ const renderMentionSuggestions = () => {
    onUpdate(props: any) {
      reactRenderer.updateProps(props);
      if (!props.clientRect) return;
-      popup[0]?.setProps({ getReferenceClientRect: props.clientRect });
+      popup?.[0]?.setProps({ getReferenceClientRect: props.clientRect });
    },
    onKeyDown(props: SuggestionKeyDownProps) {
      if (props.event.key === "Escape") {
-        popup[0]?.hide();
+        popup?.[0]?.hide();
        return true;
      }
      return (
@@ -324,7 +324,7 @@ const renderMentionSuggestions = () => {
      );
    },
    onExit() {
-      popup[0]?.destroy();
+      popup?.[0]?.destroy();
      reactRenderer.destroy();
    },
  };
@@ -440,6 +440,7 @@ export default function Editor({
  content,
  onChange,
  onBlur,
+  onSubmit,
  readOnly = false,
  workspaceMembers,
  enableYouTubeEmbed = true,
@@ -449,6 +450,7 @@ export default function Editor({
  content: string | null;
  onChange?: (value: string) => void;
  onBlur?: () => void;
+  onSubmit?: () => void;
  readOnly?: boolean;
  workspaceMembers: WorkspaceMember[];
  enableYouTubeEmbed?: boolean;
@@ -457,6 +459,21 @@ export default function Editor({
 }) {
  const containerRef = useRef<HTMLDivElement>(null);

+  // useEditor is created once (empty deps below), so keep the latest callbacks
+  // in refs to avoid the editor capturing stale closures on re-render.
+  const onChangeRef = useRef(onChange);
+  const onBlurRef = useRef(onBlur);
+  const onSubmitRef = useRef(onSubmit);
+  useEffect(() => {
+    onChangeRef.current = onChange;
+  }, [onChange]);
+  useEffect(() => {
+    onBlurRef.current = onBlur;
+  }, [onBlur]);
+  useEffect(() => {
+    onSubmitRef.current = onSubmit;
+  }, [onSubmit]);
+
  const editor = useEditor(
    {
      extensions: [
@@ -474,12 +491,12 @@ export default function Editor({
          autolink: true,
          linkOnPaste: true,
        }),
-        Markdown,
+        Markdown.configure({ transformPastedText: true }),
        Placeholder.configure({
          placeholder: readOnly
            ? ""
-            : placeholder ??
-              t`Add description... (type '/' to open commands or '@' to mention)`,
+            : (placeholder ??
+              t`Add description... (type '/' to open commands or '@' to mention)`),
        }),
        SlashCommands.configure({
          commandItems: getCommandItems(disableHeadings),
@@ -497,24 +514,26 @@ export default function Editor({
          suggestion: {
            char: "@",
            items: ({ query }: { query: string }) => {
-              const withEmail = workspaceMembers.filter((member) => member.email);
-              
+              const withEmail = workspaceMembers.filter(
+                (member) => member.email,
+              );
+
              const mapped = withEmail.map((member: WorkspaceMember) => ({
                id: member.publicId,
                label: member?.user?.name?.trim() || member.email || "",
                image: member?.user?.image ?? null,
              }));
-              
+
              const all: MentionItem[] = mapped.filter(
                (item) => item.label && item.label.length > 0,
              );
-              
+
              const q = query.toLowerCase().trim();
-              
+
              if (q === "") {
                return all;
              }
-              
+
              const filtered = all.filter((u) =>
                u.label.toLowerCase().includes(q),
              );
@@ -540,20 +559,20 @@ export default function Editor({
          },
        }),
        Typography.configure({
-            openDoubleQuote: false,
-            closeDoubleQuote: false,
-            openSingleQuote: false,
-            closeSingleQuote: false,
-            oneHalf: false,
-            oneQuarter: false,
-            threeQuarters: false,
-            superscriptTwo: false,
-            superscriptThree: false,
+          openDoubleQuote: false,
+          closeDoubleQuote: false,
+          openSingleQuote: false,
+          closeSingleQuote: false,
+          oneHalf: false,
+          oneQuarter: false,
+          threeQuarters: false,
+          superscriptTwo: false,
+          superscriptThree: false,
        }),
        ...(enableYouTubeEmbed ? [YouTubeNode] : []),
      ],
      content,
-      onUpdate: ({ editor }) => onChange?.(editor.getHTML()),
+      onUpdate: ({ editor }) => onChangeRef.current?.(editor.getHTML()),
      onBlur: ({ event }) => {
        if (
          document
@@ -563,13 +582,20 @@ export default function Editor({
          return;
        // Only trigger onBlur if the click was outside both the editor and menu
        if (!containerRef.current?.contains(event.relatedTarget as Node)) {
-          onBlur?.();
+          onBlurRef.current?.();
        }
      },
      editorProps: {
        attributes: {
          class: "outline-none focus:outline-none focus-visible:ring-0",
        },
+        handleKeyDown: (_view, event) => {
+          if ((event.metaKey || event.ctrlKey) && event.key === "Enter") {
+            onSubmitRef.current?.();
+            return true;
+          }
+          return false;
+        },
      },
      editable: !readOnly,
      injectCSS: false,
@@ -587,6 +613,16 @@ export default function Editor({
    }
  }, [content, editor]);

+  // useEditor captures `readOnly` once at creation time (empty deps above), so
+  // explicitly sync `editable` when the prop changes. Without this the editor
+  // gets stuck read-only when `readOnly` flips from true to false after mount
+  // (e.g. card permissions resolving slower than the card data on first load).
+  useEffect(() => {
+    if (!editor) return;
+    if (editor.isEditable === !readOnly) return;
+    editor.setEditable(!readOnly);
+  }, [editor, readOnly]);
+
  return (
    <div ref={containerRef}>
      <style jsx global>{`
--- a/apps/web/src/components/NewWorkspaceForm.tsx
+++ b/apps/web/src/components/NewWorkspaceForm.tsx
@@ -96,6 +96,7 @@ export function NewWorkspaceForm() {
          description: values.description,
          slug: values.slug,
          plan: values.plan,
+          cardPrefix: values.cardPrefix,
          role: "admin",
          weekStartDay: 1,
        });
--- a/apps/web/src/components/SideNavigation.tsx
+++ b/apps/web/src/components/SideNavigation.tsx
@@ -4,7 +4,7 @@ import { Button } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
 import { env } from "next-runtime-env";
 import { useTheme } from "next-themes";
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { HiBolt } from "react-icons/hi2";
 import {
  TbLayoutSidebarLeftCollapse,
@@ -28,7 +28,7 @@ import ButtonComponent from "~/components/Button";
 import ReactiveButton from "~/components/ReactiveButton";
 import UserMenu from "~/components/UserMenu";
 import WorkspaceMenu from "~/components/WorkspaceMenu";
-import { useModal } from "~/providers/modal";
+import { useLinguiContext } from "~/providers/lingui";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";

@@ -51,9 +51,9 @@ export default function SideNavigation({
 }: SideNavigationProps) {
  const router = useRouter();
  const { workspace } = useWorkspace();
+  const { locale } = useLinguiContext();
  const [isCollapsed, setIsCollapsed] = useState(false);
  const [isInitialised, setIsInitialised] = useState(false);
-  const { openModal } = useModal();

  const { data: workspaceData } = api.workspace.byId.useQuery(
    { workspacePublicId: workspace.publicId },
@@ -94,56 +94,59 @@ export default function SideNavigation({
    href: string;
    icon: object;
    keyboardShortcut: KeyboardShortcut;
-  }[] = [
-    {
-      name: t`Boards`,
-      href: "/boards",
-      icon: isDarkMode ? boardsIconDark : boardsIconLight,
-      keyboardShortcut: {
-        type: "SEQUENCE",
-        strokes: [{ key: "G" }, { key: "B" }],
-        action: () => router.push("/boards"),
-        group: "NAVIGATION",
-        description: t`Go to boards`,
+  }[] = useMemo(
+    () => [
+      {
+        name: t`Boards`,
+        href: "/boards",
+        icon: isDarkMode ? boardsIconDark : boardsIconLight,
+        keyboardShortcut: {
+          type: "SEQUENCE",
+          strokes: [{ key: "G" }, { key: "B" }],
+          action: () => router.push("/boards"),
+          group: "NAVIGATION",
+          description: t`Go to boards`,
+        },
      },
-    },
-    {
-      name: t`Templates`,
-      href: "/templates",
-      icon: isDarkMode ? templatesIconDark : templatesIconLight,
-      keyboardShortcut: {
-        type: "SEQUENCE",
-        strokes: [{ key: "G" }, { key: "T" }],
-        action: () => router.push("/templates"),
-        group: "NAVIGATION",
-        description: t`Go to templates`,
+      {
+        name: t`Templates`,
+        href: "/templates",
+        icon: isDarkMode ? templatesIconDark : templatesIconLight,
+        keyboardShortcut: {
+          type: "SEQUENCE",
+          strokes: [{ key: "G" }, { key: "T" }],
+          action: () => router.push("/templates"),
+          group: "NAVIGATION",
+          description: t`Go to templates`,
+        },
      },
-    },
-    {
-      name: t`Members`,
-      href: "/members",
-      icon: isDarkMode ? membersIconDark : membersIconLight,
-      keyboardShortcut: {
-        type: "SEQUENCE",
-        strokes: [{ key: "G" }, { key: "M" }],
-        action: () => router.push("/members"),
-        group: "NAVIGATION",
-        description: t`Go to members`,
+      {
+        name: t`Members`,
+        href: "/members",
+        icon: isDarkMode ? membersIconDark : membersIconLight,
+        keyboardShortcut: {
+          type: "SEQUENCE",
+          strokes: [{ key: "G" }, { key: "M" }],
+          action: () => router.push("/members"),
+          group: "NAVIGATION",
+          description: t`Go to members`,
+        },
      },
-    },
-    {
-      name: t`Settings`,
-      href: "/settings",
-      icon: isDarkMode ? settingsIconDark : settingsIconLight,
-      keyboardShortcut: {
-        type: "SEQUENCE",
-        strokes: [{ key: "G" }, { key: "S" }],
-        action: () => router.push("/settings"),
-        group: "NAVIGATION",
-        description: t`Go to settings`,
+      {
+        name: t`Settings`,
+        href: "/settings",
+        icon: isDarkMode ? settingsIconDark : settingsIconLight,
+        keyboardShortcut: {
+          type: "SEQUENCE",
+          strokes: [{ key: "G" }, { key: "S" }],
+          action: () => router.push("/settings"),
+          group: "NAVIGATION",
+          description: t`Go to settings`,
+        },
      },
-    },
-  ];
+    ],
+    [isDarkMode, locale, router],
+  );

  const toggleCollapse = () => {
    setIsCollapsed(!isCollapsed);
@@ -223,21 +226,19 @@ export default function SideNavigation({
                  <ButtonComponent
                    iconLeft={<HiBolt />}
                    variant="secondary"
-                    href="/settings/workspace?upgrade=pro"
-                    aria-label="Upgrade to Pro"
-                    title="Upgrade to Pro"
+                    href={`/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/settings/billing")}`}
+                    aria-label={t`Start free trial`}
+                    title={t`Start free trial`}
                    iconOnly
-                    onClick={() => openModal("UPGRADE_TO_PRO")}
                  />
                ) : (
                  <ButtonComponent
                    iconLeft={<HiBolt />}
                    fullWidth
                    variant="secondary"
-                    href="/settings/workspace?upgrade=pro"
-                    onClick={() => openModal("UPGRADE_TO_PRO")}
+                    href={`/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/settings/billing")}`}
                  >
-                    {t`Upgrade to Pro`}
+                    {t`Start free trial`}
                  </ButtonComponent>
                )}
              </div>
--- a/apps/web/src/components/Tooltip.tsx
+++ b/apps/web/src/components/Tooltip.tsx
@@ -1,6 +1,6 @@
 import type { ReactNode } from "react";
 import type { Root } from "react-dom/client";
-import type { Placement } from "tippy.js";
+import type { Placement, Instance as TippyInstance } from "tippy.js";
 import { useEffect, useRef } from "react";
 import { createRoot } from "react-dom/client";
 import tippy from "tippy.js";
@@ -20,16 +20,16 @@ export function Tooltip({
 }: TooltipProps) {
  const triggerRef = useRef<HTMLDivElement>(null);
  const rootRef = useRef<Root | null>(null);
+  const tippyRef = useRef<TippyInstance | null>(null);
+  const contentRef = useRef(content);
+  contentRef.current = content;

  useEffect(() => {
    if (!triggerRef.current) return;

-    if (!content) return;
-
    const container = document.createElement("div");
    const root = createRoot(container);
    rootRef.current = root;
-    root.render(content);

    const instance = tippy(triggerRef.current, {
      content: container,
@@ -39,12 +39,33 @@ export function Tooltip({
      theme: "tooltip",
      touch: false,
    });
+    tippyRef.current = instance;
+
+    if (contentRef.current) {
+      root.render(contentRef.current);
+    } else {
+      instance.disable();
+    }

    return () => {
      instance.destroy();
-      rootRef.current?.unmount();
+      tippyRef.current = null;
+      root.unmount();
+      rootRef.current = null;
    };
-  }, [content, placement, delay]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [placement, delay]);
+
+  useEffect(() => {
+    if (!content) {
+      tippyRef.current?.disable();
+      return;
+    }
+    if (tippyRef.current) {
+      tippyRef.current.enable();
+      rootRef.current?.render(content);
+    }
+  }, [content]);

  return (
    <div ref={triggerRef} className="inline-flex">
--- a/apps/web/src/components/WorkspaceMenu.tsx
+++ b/apps/web/src/components/WorkspaceMenu.tsx
@@ -1,14 +1,16 @@
+import { useRouter } from "next/navigation";
 import { Button, Menu, Transition } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
-import { useRouter } from "next/navigation";
 import { env } from "next-runtime-env";
-import { Fragment, useState } from "react";
+import { Fragment, useMemo, useState } from "react";
 import { HiCheck, HiMagnifyingGlass } from "react-icons/hi2";
 import { twMerge } from "tailwind-merge";

 import { useKeyboardShortcut } from "~/providers/keyboard-shortcuts";
+import { useLinguiContext } from "~/providers/lingui";
 import { useModal } from "~/providers/modal";
 import { useWorkspace } from "~/providers/workspace";
+import { api } from "~/utils/api";
 import CommandPallette from "./CommandPallette";
 import { Tooltip } from "./Tooltip";

@@ -19,21 +21,29 @@ export default function WorkspaceMenu({
 }) {
  const { workspace, isLoading, availableWorkspaces, switchWorkspace } =
    useWorkspace();
+  const { locale } = useLinguiContext();
  const { openModal } = useModal();
+  const { data: hasPartnerSlot } =
+    api.workspace.hasAvailablePartnerSlot.useQuery();
  const router = useRouter();
  const [isOpen, setIsOpen] = useState(false);

-  const { tooltipContent: commandPaletteShortcutTooltipContent } =
-    useKeyboardShortcut({
-      type: "PRESS",
+  const commandPaletteShortcut = useMemo(
+    () => ({
+      type: "PRESS" as const,
      stroke: {
        key: "k",
-        modifiers: ["META"],
+        modifiers: ["META"] as ("META" | "CONTROL" | "ALT" | "SHIFT")[],
      },
      action: () => setIsOpen(true),
      description: t`Open command menu`,
-      group: "GENERAL",
-    });
+      group: "GENERAL" as const,
+    }),
+    [locale],
+  );
+
+  const { tooltipContent: commandPaletteShortcutTooltipContent } =
+    useKeyboardShortcut(commandPaletteShortcut);

  return (
    <>
@@ -150,11 +160,19 @@ export default function WorkspaceMenu({
            <div className="border-t-[1px] border-light-600 p-1 dark:border-dark-500">
              <Menu.Item>
                <button
-                  onClick={() =>
-                    env("NEXT_PUBLIC_KAN_ENV") === "cloud"
-                      ? router.push(`/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`)
-                      : openModal("NEW_WORKSPACE")
-                  }
+                  onClick={() => {
+                    if (env("NEXT_PUBLIC_KAN_ENV") !== "cloud") {
+                      openModal("NEW_WORKSPACE");
+                    } else if (hasPartnerSlot) {
+                      router.push(
+                        `/onboarding/workspace?partner=1&returnUrl=${encodeURIComponent(window.location.pathname)}`,
+                      );
+                    } else {
+                      router.push(
+                        `/onboarding/select-plan?returnUrl=${encodeURIComponent(window.location.pathname)}`,
+                      );
+                    }
+                  }}
                  className="flex w-full items-center justify-between rounded-[5px] px-3 py-2 text-left text-xs text-neutral-900 hover:bg-light-200 dark:text-dark-1000 dark:hover:bg-dark-400"
                >
                  {t`Create workspace`}
--- a/apps/web/src/env.ts
+++ b/apps/web/src/env.ts
@@ -52,8 +52,9 @@ export const env = createEnv({
    VK_CLIENT_SECRET: z.string().optional(),
    LINKEDIN_CLIENT_ID: z.string().optional(),
    LINKEDIN_CLIENT_SECRET: z.string().optional(),
-    NOVU_API_KEY: z.string().optional(),
-    EMAIL_UNSUBSCRIBE_SECRET: z.string().optional(),
+    SUBSCRIBER_API_URL: z.string().url().optional(),
+    SUBSCRIBER_API_KEY: z.string().optional(),
+    SUBSCRIBER_ENVIRONMENT_ID: z.string().optional(),
    // Generic OIDC Provider
    OIDC_CLIENT_ID: z.string().optional(),
    OIDC_CLIENT_SECRET: z.string().optional(),
--- a/apps/web/src/hooks/useLocalisation.ts
+++ b/apps/web/src/hooks/useLocalisation.ts
@@ -1,6 +1,6 @@
 import type { Locale as DateFnsLocale } from "date-fns";
 import { useLingui } from "@lingui/react";
-import { de, enGB, es, fr, it, nl, pl, ru, ptBR} from "date-fns/locale";
+import { de, enGB, es, fr, it, nl, pl, ptBR, ru, zhCN } from "date-fns/locale";

 import type { Locale } from "~/locales";
 import { useLinguiContext } from "~/providers/lingui";
@@ -19,7 +19,8 @@ export function useLocalisation() {
    nl,
    ru,
    pl,
-    "pt-BR": ptBR,
+    ptbr: ptBR,
+    "zh-CN": zhCN,
  };

  const currentDateLocale = dateLocaleMap[locale] ?? enGB;
--- a/apps/web/src/hooks/useModalFormState.ts
+++ b/apps/web/src/hooks/useModalFormState.ts
@@ -1,4 +1,5 @@
-import { useEffect } from "react";
+import { useCallback, useEffect, useRef } from "react";
+
 import { useModal } from "~/providers/modal";

 interface UseModalFormStateOptions<T> {
@@ -12,25 +13,43 @@ export function useModalFormState<T extends Record<string, any>>({
  initialValues,
  resetOnClose = false,
 }: UseModalFormStateOptions<T>) {
-  const { modalContentType, isOpen, getModalState, setModalState, clearModalState } = useModal();
-  
+  const {
+    modalContentType,
+    isOpen,
+    getModalState,
+    setModalState,
+    clearModalState,
+  } = useModal();
+
  const isCurrentModal = modalContentType === modalType;
  const savedState = getModalState(modalType) as T | undefined;
-  
+
  // get current form state (using the saved values if available, otherwise the initial values)
  const formState = savedState || initialValues;

-  const saveFormState = (state: Partial<T>) => {
-    if (!isCurrentModal) return;
-    
-    const currentState = getModalState(modalType) || initialValues;
-    const newState = { ...currentState, ...state };
-    setModalState(modalType, newState);
-  };
+  // Keep refs so the callbacks below stay stable across re-renders.
+  const modalTypeRef = useRef(modalType);
+  const initialValuesRef = useRef(initialValues);
+  const getModalStateRef = useRef(getModalState);
+  modalTypeRef.current = modalType;
+  initialValuesRef.current = initialValues;
+  getModalStateRef.current = getModalState;

-  const clearFormState = () => {
-    clearModalState(modalType);
-  };
+  const saveFormState = useCallback(
+    (state: Partial<T>) => {
+      const type = modalTypeRef.current;
+      const currentState =
+        getModalStateRef.current(type) ?? initialValuesRef.current;
+      const newState = { ...currentState, ...state };
+      setModalState(type, newState);
+    },
+    // setModalState is stable (useCallback with [] deps in ModalProvider)
+    [setModalState],
+  );
+
+  const clearFormState = useCallback(() => {
+    clearModalState(modalTypeRef.current);
+  }, [clearModalState]);

  useEffect(() => {
    if (resetOnClose && !isOpen && savedState) {
@@ -45,4 +64,4 @@ export function useModalFormState<T extends Record<string, any>>({
    isCurrentModal,
    hasSavedState: !!savedState,
  };
-} 
+}
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
--- a/apps/web/src/locales/de/messages.ts
+++ b/apps/web/src/locales/de/messages.ts
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
--- a/apps/web/src/locales/en/messages.ts
+++ b/apps/web/src/locales/en/messages.ts
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
--- a/apps/web/src/locales/es/messages.ts
+++ b/apps/web/src/locales/es/messages.ts
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
--- a/apps/web/src/locales/fr/messages.ts
+++ b/apps/web/src/locales/fr/messages.ts
--- a/apps/web/src/locales/index.ts
+++ b/apps/web/src/locales/index.ts
@@ -7,12 +7,14 @@ export const locales = [
  "nl",
  "ru",
  "pl",
-  "ptbr"
+  "ptbr",
+  "zh-CN",
 ] as const;

 export type Locale = (typeof locales)[number];

-export const defaultLocale: Locale = "en";
+// 自托管实例默认使用简体中文，用户仍可在设置中切换其他语言。
+export const defaultLocale: Locale = "zh-CN";

 export const localeNames: Record<Locale, string> = {
  en: "English",
@@ -24,4 +26,5 @@ export const localeNames: Record<Locale, string> = {
  ru: "Русский",
  pl: "Polski",
  ptbr: "Português",
+  "zh-CN": "简体中文",
 };
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
--- a/apps/web/src/locales/it/messages.ts
+++ b/apps/web/src/locales/it/messages.ts
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
--- a/apps/web/src/locales/nl/messages.ts
+++ b/apps/web/src/locales/nl/messages.ts
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
--- a/apps/web/src/locales/pl/messages.ts
+++ b/apps/web/src/locales/pl/messages.ts
--- a/apps/web/src/locales/pt-BR/messages.json
+++ b/apps/web/src/locales/pt-BR/messages.json
--- a/apps/web/src/locales/pt-BR/messages.ts
+++ b/apps/web/src/locales/pt-BR/messages.ts
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
--- a/apps/web/src/locales/ru/messages.ts
+++ b/apps/web/src/locales/ru/messages.ts
--- a/apps/web/src/locales/zh-CN/messages.json
+++ b/apps/web/src/locales/zh-CN/messages.json
--- a/apps/web/src/locales/zh-CN/messages.ts
+++ b/apps/web/src/locales/zh-CN/messages.ts
--- a/apps/web/src/pages/_app.tsx
+++ b/apps/web/src/pages/_app.tsx
@@ -82,8 +82,8 @@ const MyApp: AppType = ({ Component, pageProps }: AppPropsWithLayout) => {
      )}
      <script src="/__ENV.js" />
      <main className="font-sans">
-        <KeyboardShortcutProvider>
-          <LinguiProviderWrapper>
+        <LinguiProviderWrapper>
+          <KeyboardShortcutProvider>
            <FontSizeProvider>
              <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
                <ModalProvider>
@@ -99,8 +99,8 @@ const MyApp: AppType = ({ Component, pageProps }: AppPropsWithLayout) => {
                </ModalProvider>
              </ThemeProvider>
            </FontSizeProvider>
-          </LinguiProviderWrapper>
-        </KeyboardShortcutProvider>
+          </KeyboardShortcutProvider>
+        </LinguiProviderWrapper>
      </main>
    </>
  );
--- a/apps/web/src/pages/api/partner/_utils.ts
+++ b/apps/web/src/pages/api/partner/_utils.ts
@@ -0,0 +1,20 @@
+export type WorkspacePlan = "free" | "team" | "pro" | "enterprise";
+
+export interface TierConfig {
+  plan: WorkspacePlan;
+  seats: number | null;
+  unlimitedSeats: boolean;
+  workspaceSlots: number;
+}
+
+const TIER_MAP: Record<number, TierConfig> = {
+  1: { plan: "team", seats: 5, unlimitedSeats: false, workspaceSlots: 1 },
+  2: { plan: "pro", seats: 15, unlimitedSeats: false, workspaceSlots: 2 },
+  3: { plan: "pro", seats: null, unlimitedSeats: true, workspaceSlots: 4 },
+};
+
+export function tierConfig(tier: number): TierConfig {
+  const config = TIER_MAP[tier];
+  if (!config) throw new Error(`Unknown partner tier: ${tier}`);
+  return config;
+}
--- a/apps/web/src/pages/api/partner/callback.ts
+++ b/apps/web/src/pages/api/partner/callback.ts
@@ -0,0 +1,144 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import { createNextApiContext } from "@kan/api/trpc";
+import { withApiLogging } from "@kan/api/utils/apiLogging";
+import { withRateLimit } from "@kan/api/utils/rateLimit";
+import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
+import { createLogger } from "@kan/logger";
+
+import { tierConfig } from "./_utils";
+
+const log = createLogger("api");
+
+interface TokenResponse {
+  access_token: string;
+  token_type: string;
+}
+
+interface OAuthLicenseResponse {
+  license_key: string;
+  status: string;
+}
+
+interface LicenseDetailResponse {
+  license_key: string;
+  status: string;
+  tier: number;
+}
+
+async function exchangeCodeForToken(code: string): Promise<TokenResponse> {
+  const tokenUrl = process.env.PARTNER_TOKEN_URL;
+  const clientId = process.env.PARTNER_CLIENT_ID;
+  const clientSecret = process.env.PARTNER_CLIENT_SECRET;
+  const redirectUrl = process.env.PARTNER_REDIRECT_URL;
+  if (!tokenUrl) throw new Error("PARTNER_TOKEN_URL not configured");
+  if (!clientId) throw new Error("PARTNER_CLIENT_ID not configured");
+  if (!clientSecret) throw new Error("PARTNER_CLIENT_SECRET not configured");
+  if (!redirectUrl) throw new Error("PARTNER_REDIRECT_URL not configured");
+
+  const res = await fetch(tokenUrl, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    body: new URLSearchParams({
+      grant_type: "authorization_code",
+      code,
+      client_id: clientId,
+      client_secret: clientSecret,
+      redirect_uri: redirectUrl,
+    }),
+  });
+
+  if (!res.ok) throw new Error(`Token exchange failed: ${res.status}`);
+  return res.json() as Promise<TokenResponse>;
+}
+
+async function fetchOAuthLicense(
+  accessToken: string,
+): Promise<OAuthLicenseResponse> {
+  const oauthLicenseUrl = process.env.PARTNER_OAUTH_LICENSE_URL;
+  if (!oauthLicenseUrl)
+    throw new Error("PARTNER_OAUTH_LICENSE_URL not configured");
+
+  const res = await fetch(`${oauthLicenseUrl}?access_token=${accessToken}`);
+  if (!res.ok) throw new Error(`OAuth license fetch failed: ${res.status}`);
+  return res.json() as Promise<OAuthLicenseResponse>;
+}
+
+async function fetchLicenseDetail(
+  licenseKey: string,
+): Promise<LicenseDetailResponse> {
+  const licenseApiUrl = process.env.PARTNER_LICENSE_API_URL;
+  const apiKey = process.env.PARTNER_API_KEY;
+  if (!licenseApiUrl) throw new Error("PARTNER_LICENSE_API_URL not configured");
+  if (!apiKey) throw new Error("PARTNER_API_KEY not configured");
+
+  const apiKeyHeader = process.env.PARTNER_API_KEY_HEADER;
+  if (!apiKeyHeader) throw new Error("PARTNER_API_KEY_HEADER not configured");
+
+  const res = await fetch(`${licenseApiUrl}/${licenseKey}`, {
+    headers: { [apiKeyHeader]: apiKey },
+  });
+  if (!res.ok) throw new Error(`License detail fetch failed: ${res.status}`);
+  return res.json() as Promise<LicenseDetailResponse>;
+}
+
+export default withRateLimit(
+  { points: 20, duration: 60 },
+  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
+    if (req.method !== "GET") {
+      return res.status(405).json({ message: "Method not allowed" });
+    }
+
+    const { code } = req.query;
+
+    if (!code || typeof code !== "string") {
+      return res.status(200).json({ message: "OK" });
+    }
+
+    let license: LicenseDetailResponse;
+
+    try {
+      const tokenData = await exchangeCodeForToken(code);
+      const oauthLicense = await fetchOAuthLicense(tokenData.access_token);
+      license = await fetchLicenseDetail(oauthLicense.license_key);
+    } catch (err) {
+      log.error({ err }, "Partner OAuth flow failed");
+      return res.redirect(`/partner/activate?error=oauth_failed`);
+    }
+
+    const { db, user } = await createNextApiContext(req);
+
+    const cfg = tierConfig(license.tier);
+    const status = license.status === "active" ? "active" : "inactive";
+
+    // Ensure subscription slots exist — webhook may have already created them
+    const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
+      db,
+      license.license_key,
+    );
+    if (existing.length === 0) {
+      await subscriptionRepo.createPartnerLicenseSlots(
+        db,
+        license.license_key,
+        {
+          plan: cfg.plan,
+          status,
+          partnerTier: license.tier,
+          seats: cfg.seats,
+          unlimitedSeats: cfg.unlimitedSeats,
+        },
+        cfg.workspaceSlots,
+      );
+    }
+
+    if (!user) {
+      return res.redirect(
+        `/partner/activate?license_key=${encodeURIComponent(license.license_key)}`,
+      );
+    }
+
+    return res.redirect(
+      `/api/partner/link?license_key=${encodeURIComponent(license.license_key)}`,
+    );
+  }),
+);
--- a/apps/web/src/pages/api/partner/link.ts
+++ b/apps/web/src/pages/api/partner/link.ts
@@ -0,0 +1,98 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import { createNextApiContext } from "@kan/api/trpc";
+import { withApiLogging } from "@kan/api/utils/apiLogging";
+import { withRateLimit } from "@kan/api/utils/rateLimit";
+import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
+import * as workspaceRepo from "@kan/db/repository/workspace.repo";
+
+export default withRateLimit(
+  { points: 20, duration: 60 },
+  withApiLogging(async (req: NextApiRequest, res: NextApiResponse) => {
+    if (req.method !== "GET") {
+      return res.status(405).json({ message: "Method not allowed" });
+    }
+
+    const { license_key } = req.query;
+
+    if (!license_key || typeof license_key !== "string") {
+      return res.redirect("/boards?partner_error=missing_license");
+    }
+
+    const { db, user } = await createNextApiContext(req);
+
+    if (!user) {
+      return res.redirect(
+        `/login?next=${encodeURIComponent(`/api/partner/link?license_key=${license_key}`)}`,
+      );
+    }
+
+    const allSlots = await subscriptionRepo.getAllByPartnerLicenseKey(
+      db,
+      license_key,
+    );
+
+    if (!allSlots.length) {
+      return res.redirect("/boards?partner_error=invalid_license");
+    }
+
+    const activeSlots = allSlots.filter((s) =>
+      ["active", "trialing"].includes(s.status),
+    );
+
+    if (!activeSlots.length) {
+      return res.redirect("/boards?partner_error=license_inactive");
+    }
+
+    const unlinkedSlot = activeSlots.find((s) => !s.referenceId);
+
+    if (!unlinkedSlot) {
+      return res.redirect("/boards?partner_activated=1");
+    }
+
+    const linkedIds = new Set(
+      activeSlots.filter((s) => s.referenceId).map((s) => s.referenceId!),
+    );
+
+    const memberships = await workspaceRepo.getAllByUserId(db, user.id);
+    const availableWorkspace = memberships
+      .map((m) => m.workspace)
+      .find((w) => w && !w.deletedAt && !linkedIds.has(w.publicId));
+
+    if (!availableWorkspace) {
+      return res.redirect(
+        `/onboarding/workspace?license_key=${encodeURIComponent(license_key)}`,
+      );
+    }
+
+    await subscriptionRepo.updateById(db, unlinkedSlot.id, {
+      referenceId: availableWorkspace.publicId,
+    });
+
+    await workspaceRepo.update(db, availableWorkspace.publicId, {
+      plan: unlinkedSlot.plan as "free" | "team" | "pro" | "enterprise",
+    });
+
+    const remainingUnlinked = activeSlots.filter(
+      (s) => !s.referenceId && s.id !== unlinkedSlot.id,
+    );
+
+    if (remainingUnlinked.length > 0) {
+      const updatedLinkedIds = new Set([
+        ...linkedIds,
+        availableWorkspace.publicId,
+      ]);
+      const hasMoreAvailableWorkspace = memberships
+        .map((m) => m.workspace)
+        .some((w) => w && !w.deletedAt && !updatedLinkedIds.has(w.publicId));
+
+      if (hasMoreAvailableWorkspace) {
+        return res.redirect(
+          `/api/partner/link?license_key=${encodeURIComponent(license_key)}`,
+        );
+      }
+    }
+
+    return res.redirect("/boards?partner_activated=1");
+  }),
+);
--- a/apps/web/src/pages/api/partner/webhook.ts
+++ b/apps/web/src/pages/api/partner/webhook.ts
@@ -0,0 +1,418 @@
+import { createHmac, timingSafeEqual } from "crypto";
+import type { NextApiRequest, NextApiResponse } from "next";
+import type { Readable } from "node:stream";
+
+import type { dbClient } from "@kan/db/client";
+import { createNextApiContext } from "@kan/api/trpc";
+import { withApiLogging } from "@kan/api/utils/apiLogging";
+import { cancelWorkspaceAccess } from "@kan/api/utils/workspace";
+import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
+import * as workspaceRepo from "@kan/db/repository/workspace.repo";
+import { createLogger } from "@kan/logger";
+import { getActiveSubscriptions } from "@kan/shared/utils";
+
+import type { TierConfig } from "./_utils";
+import { tierConfig } from "./_utils";
+
+const log = createLogger("api");
+
+async function createAndLinkSlots(
+  db: dbClient,
+  licenseKey: string,
+  cfg: TierConfig,
+  tier: number,
+  alreadyLinkedReferenceIds: Set<string>,
+  count: number,
+) {
+  const linkedId = [...alreadyLinkedReferenceIds][0];
+  let autoLinked = 0;
+
+  if (linkedId) {
+    const linkedWorkspace = await workspaceRepo.getByPublicId(db, linkedId);
+
+    if (linkedWorkspace?.createdBy) {
+      const owned = await workspaceRepo.getAllOwnedByUserId(
+        db,
+        linkedWorkspace.createdBy,
+      );
+
+      const candidates = owned.filter(
+        (w) => !alreadyLinkedReferenceIds.has(w.publicId),
+      );
+
+      if (candidates.length > 0) {
+        const existingSubs =
+          await subscriptionRepo.getAllActivePartnerSubsByWorkspaceIds(
+            db,
+            candidates.map((w) => w.publicId),
+          );
+        const alreadySubscribed = new Set(
+          existingSubs
+            .map((s) => s.referenceId)
+            .filter((id): id is string => !!id),
+        );
+
+        const available = candidates
+          .filter((w) => !alreadySubscribed.has(w.publicId))
+          .slice(0, count);
+
+        if (available.length > 0) {
+          const newSlots = await subscriptionRepo.createPartnerLicenseSlots(
+            db,
+            licenseKey,
+            {
+              plan: cfg.plan,
+              status: "active",
+              partnerTier: tier,
+              seats: cfg.seats,
+              unlimitedSeats: cfg.unlimitedSeats,
+            },
+            available.length,
+          );
+
+          await Promise.all(
+            available.map((workspace, i) => {
+              const slot = newSlots[i];
+              if (!slot) return;
+              return Promise.all([
+                subscriptionRepo.updateById(db, slot.id, {
+                  referenceId: workspace.publicId,
+                }),
+                workspaceRepo.update(db, workspace.publicId, {
+                  plan: cfg.plan,
+                }),
+              ]);
+            }),
+          );
+
+          autoLinked = available.length;
+        }
+      }
+    }
+  }
+
+  const remaining = count - autoLinked;
+  if (remaining > 0) {
+    await subscriptionRepo.createPartnerLicenseSlots(
+      db,
+      licenseKey,
+      {
+        plan: cfg.plan,
+        status: "active",
+        partnerTier: tier,
+        seats: cfg.seats,
+        unlimitedSeats: cfg.unlimitedSeats,
+      },
+      remaining,
+    );
+  }
+}
+
+async function buffer(readable: Readable) {
+  const chunks: Buffer[] = [];
+  for await (const chunk of readable) {
+    chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+  }
+  return Buffer.concat(chunks);
+}
+
+function verifySignature(
+  rawBody: string,
+  signature: string,
+  timestamp: string,
+): boolean {
+  const secret = process.env.PARTNER_API_KEY;
+  if (!secret) return false;
+
+  const ts = Number(timestamp);
+  if (isNaN(ts) || Date.now() - ts > 300_000) return false;
+
+  const payload = `${timestamp}${rawBody}`;
+  const expected = createHmac("sha256", secret).update(payload).digest("hex");
+
+  try {
+    return timingSafeEqual(Buffer.from(signature), Buffer.from(expected));
+  } catch {
+    return false;
+  }
+}
+
+function hasReferenceId<T extends { referenceId: string | null | undefined }>(
+  s: T,
+): s is T & { referenceId: string } {
+  return !!s.referenceId;
+}
+
+interface WebhookPayload {
+  event:
+    | "purchase"
+    | "activate"
+    | "deactivate"
+    | "upgrade"
+    | "downgrade"
+    | "migrate";
+  license_key: string;
+  license_status: string;
+  tier: number;
+  prev_license_key?: string;
+}
+
+export default withApiLogging(
+  async (req: NextApiRequest, res: NextApiResponse) => {
+    if (req.method !== "POST") {
+      return res.status(405).json({ message: "Method not allowed" });
+    }
+
+    const signatureHeader = process.env.PARTNER_SIGNATURE_HEADER;
+    const timestampHeader = process.env.PARTNER_TIMESTAMP_HEADER;
+
+    if (!signatureHeader || !timestampHeader) {
+      log.error("Webhook signature headers not configured");
+      return res.status(500).json({ message: "Server misconfiguration" });
+    }
+
+    const signature = req.headers[signatureHeader] as string | undefined;
+    const timestamp = req.headers[timestampHeader] as string | undefined;
+
+    if (!signature || !timestamp) {
+      return res.status(400).json({ message: "Missing signature headers" });
+    }
+
+    const buf = await buffer(req as unknown as Readable);
+    const rawBody = buf.toString("utf8");
+
+    if (!verifySignature(rawBody, signature, timestamp)) {
+      return res.status(401).json({ message: "Invalid signature" });
+    }
+
+    const payload = JSON.parse(rawBody) as WebhookPayload;
+    const { event, license_key, license_status, tier, prev_license_key } =
+      payload;
+
+    log.info({ headers: req.headers, payload }, "partner webhook received");
+
+    const { db } = await createNextApiContext(req);
+
+    switch (event) {
+      case "purchase":
+      case "activate": {
+        const cfg = tierConfig(tier);
+        const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
+          db,
+          license_key,
+        );
+        const status = event === "activate" ? "active" : license_status;
+
+        if (existing.length === 0) {
+          await subscriptionRepo.createPartnerLicenseSlots(
+            db,
+            license_key,
+            {
+              plan: cfg.plan,
+              status,
+              partnerTier: tier,
+              seats: cfg.seats,
+              unlimitedSeats: cfg.unlimitedSeats,
+            },
+            cfg.workspaceSlots,
+          );
+        } else {
+          await subscriptionRepo.updateAllByPartnerLicenseKey(db, license_key, {
+            plan: cfg.plan,
+            status,
+            partnerTier: tier,
+            seats: cfg.seats,
+            unlimitedSeats: cfg.unlimitedSeats,
+          });
+        }
+        break;
+      }
+
+      case "deactivate": {
+        const allSlots = await subscriptionRepo.getAllByPartnerLicenseKey(
+          db,
+          license_key,
+        );
+
+        await Promise.all(
+          allSlots.filter(hasReferenceId).map(async (slot) => {
+            const siblingSubs = await subscriptionRepo.getByReferenceId(
+              db,
+              slot.referenceId,
+            );
+            const hasOtherActiveSub = getActiveSubscriptions(siblingSubs).some(
+              (s) => s.id !== slot.id,
+            );
+            if (!hasOtherActiveSub) {
+              await cancelWorkspaceAccess(db, slot.referenceId);
+            }
+          }),
+        );
+
+        await subscriptionRepo.updateAllByPartnerLicenseKey(db, license_key, {
+          plan: "free",
+          status: "canceled",
+          unlimitedSeats: false,
+          seats: null,
+        });
+
+        break;
+      }
+
+      case "upgrade":
+      case "downgrade": {
+        const lookupKey = prev_license_key ?? license_key;
+        const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
+          db,
+          lookupKey,
+        );
+
+        if (existing.length === 0) break;
+
+        const cfg = tierConfig(tier);
+        const newCount = cfg.workspaceSlots;
+
+        // Prefer keeping linked slots; among linked, keep in insertion order (LIFO removal)
+        const preferKeep = [
+          ...existing.filter((s) => s.referenceId),
+          ...existing.filter((s) => !s.referenceId),
+        ];
+
+        const slotsToKeep = preferKeep.slice(0, newCount);
+        const slotsToRemove = preferKeep.slice(newCount);
+
+        await Promise.all([
+          ...slotsToKeep.map((slot) =>
+            subscriptionRepo.updateById(db, slot.id, {
+              plan: cfg.plan,
+              seats: cfg.seats,
+              unlimitedSeats: cfg.unlimitedSeats,
+              partnerTier: tier,
+              status: "active",
+              ...(prev_license_key ? { partnerLicenseKey: license_key } : {}),
+            }),
+          ),
+          ...slotsToKeep
+            .filter(hasReferenceId)
+            .map((s) =>
+              workspaceRepo.update(db, s.referenceId, { plan: cfg.plan }),
+            ),
+        ]);
+
+        if (newCount > existing.length) {
+          const linkedIds = new Set(
+            slotsToKeep.filter(hasReferenceId).map((s) => s.referenceId),
+          );
+          await createAndLinkSlots(
+            db,
+            license_key,
+            cfg,
+            tier,
+            linkedIds,
+            newCount - existing.length,
+          );
+        }
+
+        if (slotsToRemove.length > 0) {
+          await Promise.all([
+            ...slotsToRemove
+              .filter(hasReferenceId)
+              .map((s) => cancelWorkspaceAccess(db, s.referenceId)),
+            ...slotsToRemove.map((s) =>
+              subscriptionRepo.updateById(db, s.id, {
+                plan: "free",
+                status: "inactive",
+                unlimitedSeats: false,
+                seats: null,
+              }),
+            ),
+          ]);
+        }
+
+        break;
+      }
+
+      case "migrate": {
+        if (!prev_license_key) break;
+
+        const existing = await subscriptionRepo.getAllByPartnerLicenseKey(
+          db,
+          prev_license_key,
+        );
+        if (existing.length === 0) break;
+
+        const cfg = tierConfig(tier);
+        const newCount = cfg.workspaceSlots;
+
+        const preferKeep = [
+          ...existing.filter((s) => s.referenceId),
+          ...existing.filter((s) => !s.referenceId),
+        ];
+
+        const slotsToKeep = preferKeep.slice(0, newCount);
+        const slotsToRemove = preferKeep.slice(newCount);
+
+        await Promise.all([
+          ...slotsToKeep.map((slot) =>
+            subscriptionRepo.updateById(db, slot.id, {
+              partnerLicenseKey: license_key,
+              plan: cfg.plan,
+              status: "active",
+              partnerTier: tier,
+              seats: cfg.seats,
+              unlimitedSeats: cfg.unlimitedSeats,
+            }),
+          ),
+          ...slotsToKeep
+            .filter(hasReferenceId)
+            .map((s) =>
+              workspaceRepo.update(db, s.referenceId, { plan: cfg.plan }),
+            ),
+        ]);
+
+        if (newCount > existing.length) {
+          const linkedIds = new Set(
+            slotsToKeep.filter(hasReferenceId).map((s) => s.referenceId),
+          );
+          await createAndLinkSlots(
+            db,
+            license_key,
+            cfg,
+            tier,
+            linkedIds,
+            newCount - existing.length,
+          );
+        }
+
+        if (slotsToRemove.length > 0) {
+          await Promise.all([
+            ...slotsToRemove
+              .filter(hasReferenceId)
+              .map((s) => cancelWorkspaceAccess(db, s.referenceId)),
+            ...slotsToRemove.map((s) =>
+              subscriptionRepo.updateById(db, s.id, {
+                plan: "free",
+                status: "inactive",
+                unlimitedSeats: false,
+                seats: null,
+              }),
+            ),
+          ]);
+        }
+
+        break;
+      }
+
+      default:
+        log.warn({ event }, "Unhandled partner webhook event");
+    }
+
+    return res.status(200).json({ success: true, event });
+  },
+);
+
+export const config = {
+  api: {
+    bodyParser: false,
+  },
+};
--- a/apps/web/src/pages/api/stripe/webhook.ts
+++ b/apps/web/src/pages/api/stripe/webhook.ts
@@ -64,7 +64,10 @@ export default async function handler(
          meta.userId &&
          meta.userEmail
        ) {
-          const existing = await workspaceRepo.getByPublicId(db, meta.workspacePublicId);
+          const existing = await workspaceRepo.getByPublicId(
+            db,
+            meta.workspacePublicId,
+          );

          if (!existing) {
            const slug = meta.workspaceSlug ?? meta.workspacePublicId;
@@ -90,10 +93,10 @@ export default async function handler(
            });
          }
        } else {
-          // Existing workspace upgrade — update plan (and slug for pro)
          await workspaceRepo.update(db, meta.workspacePublicId, {
            plan,
-            ...(plan === "pro" && meta.workspaceSlug && { slug: meta.workspaceSlug }),
+            ...(plan === "pro" &&
+              meta.workspaceSlug && { slug: meta.workspaceSlug }),
          });
        }

--- a/apps/web/src/pages/api/unsubscribe.ts
+++ b/apps/web/src/pages/api/unsubscribe.ts
@@ -1,108 +0,0 @@
-import type { NextApiRequest, NextApiResponse } from "next";
-import { Novu } from "@novu/api";
-import { jwtVerify } from "jose";
-import { z } from "zod";
-
-import { withApiLogging } from "@kan/api/utils/apiLogging";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
-
-import { env } from "~/env";
-
-const requestSchema = z.object({
-  token: z.string().min(1),
-});
-
-const tokenPayloadSchema = z.object({
-  subscriberId: z.string(),
-});
-
-type ResponseData =
-  | { success: true }
-  | { success: false; error: string; code?: string };
-
-const textEncoder = new TextEncoder();
-
-export default withRateLimit(
-  { points: 100, duration: 60 },
-  withApiLogging(
-    async (req: NextApiRequest, res: NextApiResponse<ResponseData>) => {
-      if (process.env.NEXT_PUBLIC_KAN_ENV !== "cloud") {
-        return res.status(404).json({
-          success: false,
-          error: "Unsubscribe endpoint is not available.",
-          code: "UNAVAILABLE",
-        });
-      }
-
-      if (req.method !== "POST") {
-        res.setHeader("Allow", "POST");
-        return res.status(405).json({
-          success: false,
-          error: "Method not allowed.",
-          code: "METHOD_NOT_ALLOWED",
-        });
-      }
-
-      const parsedBody = requestSchema.safeParse(req.body);
-
-      if (!parsedBody.success) {
-        return res.status(400).json({
-          success: false,
-          error: "Invalid request payload.",
-          code: "BAD_REQUEST",
-        });
-      }
-
-      if (!env.EMAIL_UNSUBSCRIBE_SECRET || !env.NOVU_API_KEY) {
-        return res.status(500).json({
-          success: false,
-          error: "Unsubscribe service is not configured.",
-          code: "NOT_CONFIGURED",
-        });
-      }
-
-      let payload: z.infer<typeof tokenPayloadSchema>;
-
-      try {
-        const verified = await jwtVerify(
-          parsedBody.data.token,
-          textEncoder.encode(env.EMAIL_UNSUBSCRIBE_SECRET),
-          {
-            // We intentionally do not use exp/iat claims –
-            // tokens are long-lived and validated only by signature + payload.
-            clockTolerance: "0s",
-          },
-        );
-        payload = tokenPayloadSchema.parse(verified.payload);
-      } catch {
-        return res.status(401).json({
-          success: false,
-          error: "Your unsubscribe link is invalid or has expired.",
-          code: "INVALID_TOKEN",
-        });
-      }
-
-      const novu = new Novu({ secretKey: env.NOVU_API_KEY });
-
-      try {
-        await novu.subscribers.preferences.update(
-          {
-            channels: {
-              email: false,
-            },
-          },
-          payload.subscriberId,
-        );
-      } catch (error) {
-        return res.status(502).json({
-          success: false,
-          error:
-            "We could not update your email preferences right now. Please try again later.",
-          code: "NOVU_ERROR",
-        });
-      }
-
-      return res.status(200).json({ success: true });
-    },
-  ),
-);
--- a/apps/web/src/pages/api/upload/attachment.ts
+++ b/apps/web/src/pages/api/upload/attachment.ts
@@ -67,8 +67,15 @@ export default withRateLimit(
        return res.status(400).json({ error: "File too large" });
      }

-      const originalFilenameHeader =
+      const rawFilenameHeader =
        (req.headers["x-original-filename"] as string | undefined) ?? "file";
+      const originalFilenameHeader = (() => {
+        try {
+          return decodeURIComponent(rawFilenameHeader);
+        } catch {
+          return rawFilenameHeader;
+        }
+      })();

      const sanitizedFilename = originalFilenameHeader
        .replace(/[^a-zA-Z0-9._-]/g, "_")
--- a/apps/web/src/pages/api/upload/avatar.ts
+++ b/apps/web/src/pages/api/upload/avatar.ts
@@ -64,8 +64,15 @@ export default withRateLimit(
        return res.status(400).json({ error: "File too large" });
      }

-      const originalFilenameHeader =
+      const rawFilenameHeader =
        (req.headers["x-original-filename"] as string | undefined) ?? "file";
+      const originalFilenameHeader = (() => {
+        try {
+          return decodeURIComponent(rawFilenameHeader);
+        } catch {
+          return rawFilenameHeader;
+        }
+      })();

      const sanitizedFilename = originalFilenameHeader
        .replace(/[^a-zA-Z0-9._-]/g, "_")
--- a/apps/web/src/pages/partner/activate.tsx
+++ b/apps/web/src/pages/partner/activate.tsx
@@ -0,0 +1,117 @@
+import Link from "next/link";
+import { useRouter, useSearchParams } from "next/navigation";
+import { t } from "@lingui/core/macro";
+import { Trans } from "@lingui/react/macro";
+import { env } from "next-runtime-env";
+import { useEffect, useState } from "react";
+
+import { authClient } from "@kan/auth/client";
+
+import { Auth } from "~/components/AuthForm";
+import { PageHead } from "~/components/PageHead";
+import PatternedBackground from "~/components/PatternedBackground";
+
+export default function PartnerActivatePage() {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const licenseKey = searchParams.get("license_key");
+  const error = searchParams.get("error");
+
+  const partnerName = env("NEXT_PUBLIC_PARTNER_NAME");
+
+  const { data: session, isPending } = authClient.useSession();
+  const [isMagicLinkSent, setIsMagicLinkSent] = useState(false);
+  const [magicLinkRecipient, setMagicLinkRecipient] = useState("");
+
+  useEffect(() => {
+    if (licenseKey) {
+      localStorage.setItem("partnerLicenseKey", licenseKey);
+    }
+  }, [licenseKey]);
+
+  useEffect(() => {
+    if (!isPending && session?.user && licenseKey) {
+      router.push(
+        `/api/partner/link?license_key=${encodeURIComponent(licenseKey)}`,
+      );
+    } else if (!isPending && session?.user && !licenseKey) {
+      router.push("/boards");
+    }
+  }, [session, isPending, licenseKey, router]);
+
+  if (isPending || (session?.user && licenseKey)) return null;
+
+  return (
+    <>
+      <PageHead title={t`Activate | kan.bn`} />
+      <main className="h-screen bg-light-100 pt-20 dark:bg-dark-50 sm:pt-0">
+        <div className="justify-top flex h-full flex-col items-center px-4 sm:justify-center">
+          <div className="z-10 flex w-full flex-col items-center">
+            <Link href="/">
+              <h1 className="mb-6 text-lg font-bold tracking-tight text-light-1000 dark:text-dark-1000">
+                kan.bn
+              </h1>
+            </Link>
+            <p className="mb-2 text-3xl font-bold tracking-tight text-light-1000 dark:text-dark-1000">
+              {isMagicLinkSent ? t`Check your inbox` : t`Activate your account`}
+            </p>
+            <p className="mb-10 text-sm text-light-800 dark:text-dark-800">
+              {isMagicLinkSent ? (
+                <Trans>We sent a link to {magicLinkRecipient}</Trans>
+              ) : partnerName ? (
+                <Trans>
+                  Sign in or create an account to activate your {partnerName}{" "}
+                  license
+                </Trans>
+              ) : (
+                t`Sign in or create an account to activate your license`
+              )}
+            </p>
+
+            {error && (
+              <div className="mb-4 w-full rounded-md bg-red-50 px-4 py-3 text-sm text-red-700 dark:bg-red-900/20 dark:text-red-400 sm:max-w-md">
+                {t`Something went wrong during activation. Please try again.`}
+              </div>
+            )}
+
+            {!isMagicLinkSent && (
+              <div className="w-full rounded-lg border border-light-500 bg-light-300 px-4 py-10 dark:border-dark-400 dark:bg-dark-200 sm:max-w-md lg:px-10">
+                <div className="sm:mx-auto sm:w-full sm:max-w-sm">
+                  <Auth
+                    setIsMagicLinkSent={(val, recipient) => {
+                      setIsMagicLinkSent(val);
+                      setMagicLinkRecipient(recipient);
+                    }}
+                    callbackURL={
+                      licenseKey
+                        ? `/api/partner/link?license_key=${encodeURIComponent(licenseKey)}`
+                        : "/boards"
+                    }
+                  />
+                </div>
+              </div>
+            )}
+
+            <p className="mt-4 text-sm text-light-1000 dark:text-dark-1000">
+              <Trans>
+                Already have an account?{" "}
+                <span className="underline">
+                  <Link
+                    href={
+                      licenseKey
+                        ? `/login?next=${encodeURIComponent(`/api/partner/link?license_key=${licenseKey}`)}`
+                        : "/login"
+                    }
+                  >
+                    Sign in
+                  </Link>
+                </span>
+              </Trans>
+            </p>
+          </div>
+          <PatternedBackground />
+        </div>
+      </main>
+    </>
+  );
+}
--- a/apps/web/src/pages/unsubscribe/index.tsx
+++ b/apps/web/src/pages/unsubscribe/index.tsx
@@ -1,110 +0,0 @@
-import { useRouter } from "next/router";
-import { t } from "@lingui/core/macro";
-import { useEffect, useState } from "react";
-
-import Button from "~/components/Button";
-import { PageHead } from "~/components/PageHead";
-import PatternedBackground from "~/components/PatternedBackground";
-
-type UnsubscribeStatus = "idle" | "processing" | "success" | "error";
-
-export default function UnsubscribePage() {
-  const router = useRouter();
-  const [token, setToken] = useState("");
-  const [status, setStatus] = useState<UnsubscribeStatus>("idle");
-  const [errorMessage, setErrorMessage] = useState<string | null>(null);
-
-  useEffect(() => {
-    if (!router.isReady) return;
-    const value = router.query.token;
-    if (typeof value === "string") {
-      setToken(value);
-    } else if (Array.isArray(value)) {
-      setToken(value[0] ?? "");
-    } else {
-      setToken("");
-    }
-  }, [router.isReady, router.query.token]);
-
-  const handleUnsubscribe = async () => {
-    if (!token) {
-      setStatus("error");
-      setErrorMessage(
-        t`Your unsubscribe link is missing a token. Please open the latest email and try again.`,
-      );
-      return;
-    }
-
-    setStatus("processing");
-    setErrorMessage(null);
-
-    try {
-      const response = await fetch("/api/unsubscribe", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ token }),
-      });
-
-      if (!response.ok) {
-        const payload = (await response.json().catch(() => null)) as {
-          error?: string;
-        } | null;
-
-        throw new Error(
-          payload?.error ??
-            "We couldn't update your preferences. Please try again.",
-        );
-      }
-
-      setStatus("success");
-    } catch (error) {
-      setStatus("error");
-      setErrorMessage(
-        t`We couldn't update your preferences. Please try again.`,
-      );
-    }
-  };
-
-  const title = t`Unsubscribe`;
-
-  return (
-    <>
-      <PageHead title={`${title} | kan.bn`} />
-      <div className="relative flex min-h-screen items-center justify-center px-4 py-12 sm:px-6 lg:px-8">
-        <PatternedBackground />
-        <div className="z-10 w-full max-w-md space-y-6">
-          <div>
-            <h1 className="mt-6 text-center text-3xl font-bold tracking-tight text-light-1000 dark:text-dark-1000">
-              {t`Do you want to unsubscribe?`}
-            </h1>
-            <p className="mt-4 text-center text-sm text-light-900 dark:text-dark-800">
-              {t`Confirm your email preferences:`}
-            </p>
-          </div>
-
-          <div className="flex justify-center">
-            <Button
-              onClick={handleUnsubscribe}
-              disabled={status === "success"}
-              isLoading={status === "processing"}
-              variant="primary"
-              size="md"
-            >
-              {t`Unsubscribe`}
-            </Button>
-          </div>
-          {status === "success" && (
-            <p className="text-center text-sm text-light-900 dark:text-dark-800">
-              {t`You have been unsubscribed!`}
-            </p>
-          )}
-          {status === "error" && (
-            <p className="mx-auto max-w-[300px] text-center text-sm font-medium text-red-600 dark:text-red-400">
-              {errorMessage}
-            </p>
-          )}
-        </div>
-      </div>
-    </>
-  );
-}
--- a/apps/web/src/pages/upgrade/select-plan.tsx
+++ b/apps/web/src/pages/upgrade/select-plan.tsx
@@ -0,0 +1,31 @@
+import { useRouter } from "next/navigation";
+import { env } from "next-runtime-env";
+import { useEffect } from "react";
+
+import { authClient } from "@kan/auth/client";
+
+import { PageHead } from "~/components/PageHead";
+import SelectPlanView from "~/views/onboarding/select-plan";
+
+export default function UpgradeSelectPlanPage() {
+  const router = useRouter();
+  const { data: session, isPending } = authClient.useSession();
+
+  useEffect(() => {
+    if (!isPending && !session?.user) {
+      router.push("/login");
+    }
+    if (!isPending && env("NEXT_PUBLIC_KAN_ENV") !== "cloud") {
+      router.push("/boards");
+    }
+  }, [session, isPending, router]);
+
+  if (isPending || !session?.user) return null;
+
+  return (
+    <>
+      <PageHead title="Upgrade | kan.bn" />
+      <SelectPlanView />
+    </>
+  );
+}
--- a/apps/web/src/providers/keyboard-shortcuts.tsx
+++ b/apps/web/src/providers/keyboard-shortcuts.tsx
@@ -20,6 +20,7 @@ import { HiXMark } from "react-icons/hi2";

 import { env } from "~/env";
 import { useEventListener } from "~/hooks/useEventListener";
+import { useLinguiContext } from "~/providers/lingui";

 const ModifierKey = {
  CONTROL: "CONTROL",
@@ -160,6 +161,7 @@ export function KeyboardShortcutProvider({
  const sequenceTimeoutRef = useRef<NodeJS.Timeout | null>(null);

  const [isLegendOpen, setIsLegendOpen] = useState(false);
+  const { locale } = useLinguiContext();

  const openLegendShortcut: KeyboardShortcut = useMemo(
    () => ({
@@ -172,7 +174,7 @@ export function KeyboardShortcutProvider({
      description: t`Open keyboard shortcuts`,
      group: ShortcutGroup.GENERAL,
    }),
-    [setIsLegendOpen],
+    [locale],
  );

  const handleKeyDown = useCallback((event: KeyboardEvent) => {
--- a/apps/web/src/providers/lingui.tsx
+++ b/apps/web/src/providers/lingui.tsx
@@ -35,10 +35,31 @@ function detectBrowserLocale(availableLocales: readonly string[]): Locale {
  const browserLanguages = navigator.languages || [navigator.language];

  for (const browserLang of browserLanguages) {
-    const langCode = browserLang.split("-")[0];
+    const normalizedLocale = browserLang.toLowerCase();
+    const exactLocale = availableLocales.find(
+      (availableLocale) => availableLocale.toLowerCase() === normalizedLocale,
+    );

-    if (langCode && availableLocales.includes(langCode.toLowerCase())) {
-      return langCode.toLowerCase() as Locale;
+    if (exactLocale) {
+      return exactLocale as Locale;
+    }
+
+    const languageCode = normalizedLocale.split("-")[0];
+
+    if (languageCode === "zh" && availableLocales.includes("zh-CN")) {
+      return "zh-CN";
+    }
+
+    if (languageCode === "pt" && availableLocales.includes("ptbr")) {
+      return "ptbr";
+    }
+
+    const baseLocale = availableLocales.find(
+      (availableLocale) => availableLocale.toLowerCase() === languageCode,
+    );
+
+    if (baseLocale) {
+      return baseLocale as Locale;
    }
  }

@@ -49,7 +70,7 @@ export function LinguiProviderWrapper({
  children,
  initialLocale = defaultLocale,
 }: LinguiProviderProps) {
-  const [locale, setLocale] = useState<Locale>(defaultLocale);
+  const [locale, setLocale] = useState<Locale>(initialLocale);
  const [isHydrated, setIsHydrated] = useState(false);

  initializeI18n();
--- a/apps/web/src/providers/popup.tsx
+++ b/apps/web/src/providers/popup.tsx
@@ -1,4 +1,4 @@
-import { createContext, useContext, useState } from "react";
+import { createContext, useCallback, useContext, useState } from "react";

 interface PopupContextType {
  isOpen: boolean;
@@ -25,24 +25,27 @@ export const PopupProvider: React.FC<Props> = ({ children }) => {
  const [popupMessage, setPopupMessage] = useState("");
  const [popupIcon, setPopupIcon] = useState("");

-  const showPopup = ({
-    header,
-    message,
-    icon,
-  }: {
-    header: string;
-    message: string;
-    icon: string;
-  }) => {
-    setIsOpen(true);
-    setPopupHeader(header);
-    setPopupMessage(message);
-    setPopupIcon(icon);
-  };
+  const showPopup = useCallback(
+    ({
+      header,
+      message,
+      icon,
+    }: {
+      header: string;
+      message: string;
+      icon: string;
+    }) => {
+      setIsOpen(true);
+      setPopupHeader(header);
+      setPopupMessage(message);
+      setPopupIcon(icon);
+    },
+    [],
+  );

-  const hidePopup = () => {
+  const hidePopup = useCallback(() => {
    setIsOpen(false);
-  };
+  }, []);

  return (
    <PopupContext.Provider
--- a/apps/web/src/providers/workspace.tsx
+++ b/apps/web/src/providers/workspace.tsx
@@ -20,6 +20,7 @@ interface Workspace {
  plan: "free" | "team" | "pro" | "enterprise" | undefined;
  role: "admin" | "member" | "guest";
  weekStartDay: 0 | 1 | 6;
+  cardPrefix: string;
 }

 const initialWorkspace: Workspace = {
@@ -30,6 +31,7 @@ const initialWorkspace: Workspace = {
  plan: "free" as const,
  role: "member",
  weekStartDay: 1,
+  cardPrefix: "",
 };

 const initialAvailableWorkspaces: Workspace[] = [];
@@ -56,9 +58,12 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
  const pollAttemptsRef = React.useRef(0);
  const MAX_POLL_ATTEMPTS = 5;

-  const { data, isLoading } = api.workspace.all.useQuery(undefined, {
-    refetchInterval: pendingWorkspaceId ? 2000 : false,
-  });
+  const { data, isLoading, isFetching } = api.workspace.all.useQuery(
+    undefined,
+    {
+      refetchInterval: pendingWorkspaceId ? 2000 : false,
+    },
+  );
  const utils = api.useUtils();

  const switchWorkspace = (_workspace: Workspace) => {
@@ -74,7 +79,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({

  useEffect(() => {
    if (!data?.length) {
-      if (!isLoading) setHasLoaded(true);
+      if (!isLoading && !isFetching) setHasLoaded(true);
      return;
    }

@@ -90,6 +95,7 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
        description: workspace.description,
        plan: workspace.plan,
        weekStartDay: workspace.weekStartDay,
+        cardPrefix: workspace.cardPrefix,
        hasLoaded: true,
      })) as Workspace[];

@@ -97,53 +103,72 @@ export const WorkspaceProvider: React.FC<{ children: ReactNode }> = ({
    }

    if (storedWorkspaceId !== null) {
-      const newData = data;
-      const selectedWorkspace = newData.find(
+      const selectedWorkspace = data.find(
        ({ workspace }) => workspace.publicId === storedWorkspaceId,
      );

      if (!selectedWorkspace?.workspace) {
-        pollAttemptsRef.current += 1;
-        if (pollAttemptsRef.current >= MAX_POLL_ATTEMPTS) {
-          setPendingWorkspaceId(null);
+        if (pendingWorkspaceId) {
+          pollAttemptsRef.current += 1;
+          if (pollAttemptsRef.current >= MAX_POLL_ATTEMPTS) {
+            setPendingWorkspaceId(null);
+            localStorage.removeItem("workspacePublicId");
+          } else {
+            return;
+          }
+        } else {
+          // Clear stale workspacePublicId from localStorage
+          localStorage.removeItem("workspacePublicId");
        }
+      } else {
+        pollAttemptsRef.current = 0;
+        setPendingWorkspaceId(null);
+
+        setWorkspace({
+          publicId: selectedWorkspace.workspace.publicId,
+          name: selectedWorkspace.workspace.name,
+          slug: selectedWorkspace.workspace.slug,
+          plan: selectedWorkspace.workspace.plan,
+          description: selectedWorkspace.workspace.description,
+          role: selectedWorkspace.role as "admin" | "member" | "guest",
+          weekStartDay: selectedWorkspace.workspace.weekStartDay as 0 | 1 | 6,
+          cardPrefix: selectedWorkspace.workspace.cardPrefix,
+        });
+
+        if (workspacePublicId) {
+          router.push(`/boards`);
+          localStorage.setItem("workspacePublicId", workspacePublicId);
+        }
+
+        setHasLoaded(true);
        return;
      }
-
-      pollAttemptsRef.current = 0;
-      setPendingWorkspaceId(null);
-
-      setWorkspace({
-        publicId: selectedWorkspace.workspace.publicId,
-        name: selectedWorkspace.workspace.name,
-        slug: selectedWorkspace.workspace.slug,
-        plan: selectedWorkspace.workspace.plan,
-        description: selectedWorkspace.workspace.description,
-        role: selectedWorkspace.role,
-        weekStartDay: selectedWorkspace.workspace.weekStartDay as 0 | 1 | 6,
-      });
-
-      if (workspacePublicId) {
-        router.push(`/boards`);
-        localStorage.setItem("workspacePublicId", workspacePublicId);
-      }
-    } else {
-      const primaryWorkspace = data[0]?.workspace;
-      const primaryWorkspaceRole = data[0]?.role;
-
-      if (!primaryWorkspace || !primaryWorkspaceRole) return;
-      localStorage.setItem("workspacePublicId", primaryWorkspace.publicId);
-      setWorkspace({
-        publicId: primaryWorkspace.publicId,
-        name: primaryWorkspace.name,
-        slug: primaryWorkspace.slug,
-        plan: primaryWorkspace.plan,
-        description: primaryWorkspace.description,
-        role: primaryWorkspaceRole,
-        weekStartDay: primaryWorkspace.weekStartDay as 0 | 1 | 6,
-      });
    }
-  }, [data, isLoading, workspacePublicId, router]);
+
+    const primaryWorkspace = data[0]?.workspace;
+    const primaryWorkspaceRole = data[0]?.role;
+
+    if (!primaryWorkspace || !primaryWorkspaceRole) return;
+    localStorage.setItem("workspacePublicId", primaryWorkspace.publicId);
+    setWorkspace({
+      publicId: primaryWorkspace.publicId,
+      name: primaryWorkspace.name,
+      slug: primaryWorkspace.slug,
+      plan: primaryWorkspace.plan,
+      description: primaryWorkspace.description,
+      role: primaryWorkspaceRole as "admin" | "member" | "guest",
+      weekStartDay: primaryWorkspace.weekStartDay as 0 | 1 | 6,
+      cardPrefix: primaryWorkspace.cardPrefix,
+    });
+    setHasLoaded(true);
+  }, [
+    data,
+    isLoading,
+    isFetching,
+    workspacePublicId,
+    pendingWorkspaceId,
+    router,
+  ]);

  return (
    <WorkspaceContext.Provider
--- a/apps/web/src/utils/i18n.ts
+++ b/apps/web/src/utils/i18n.ts
@@ -3,6 +3,7 @@ import { i18n } from "@lingui/core";
 import type { Locale } from "~/locales";
 import { defaultLocale } from "~/locales";
 import { messages as enMessages } from "~/locales/en/messages";
+import { messages as zhCNMessages } from "~/locales/zh-CN/messages";

 const loadMessages = async (locale: Locale) => {
  switch (locale) {
@@ -22,8 +23,10 @@ const loadMessages = async (locale: Locale) => {
      return (await import("~/locales/ru/messages")).messages;
    case "pl":
      return (await import("~/locales/pl/messages")).messages;
-    case "pt-BR":
-      return (await import("~/locales/pt-BR/messages")).messages;
+    case "ptbr":
+      return (await import("~/locales/ptbr/messages")).messages;
+    case "zh-CN":
+      return (await import("~/locales/zh-CN/messages")).messages;
    default:
      return enMessages;
  }
@@ -32,11 +35,15 @@ const loadMessages = async (locale: Locale) => {
 let isInitialized = false;
 const loadedLocales = new Set<string>();

-export function initializeI18n(locale: Locale = defaultLocale) {
+export function initializeI18n() {
  if (!isInitialized) {
-    i18n.load(defaultLocale, enMessages);
+    // 首屏同步加载中英文，避免默认语言激活前出现中英混排。
+    i18n.load("en", enMessages);
+    i18n.load("zh-CN", zhCNMessages);
    i18n.activate(defaultLocale);
    loadedLocales.add(defaultLocale);
+    loadedLocales.add("en");
+    loadedLocales.add("zh-CN");
    isInitialized = true;
  }

--- a/apps/web/src/views/auth/login/index.tsx
+++ b/apps/web/src/views/auth/login/index.tsx
@@ -26,7 +26,7 @@ export default function LoginPage() {

  const { data } = authClient.useSession();

-  if (data?.user.id) router.push("/boards");
+  if (data?.user.id) router.push(redirect ?? "/boards");

  return (
    <>
--- a/apps/web/src/views/auth/signup/index.tsx
+++ b/apps/web/src/views/auth/signup/index.tsx
@@ -21,7 +21,7 @@ export default function SignUpPage() {

  const { data } = authClient.useSession();

-  if (data?.user.id) router.push("/boards");
+  if (data?.user.id) router.push(redirect ?? "/boards");

  const handleMagicLinkSent = (value: boolean, recipient: string) => {
    setIsMagicLinkSent(value);
--- a/apps/web/src/views/board/components/BoardDropdown.tsx
+++ b/apps/web/src/views/board/components/BoardDropdown.tsx
@@ -1,6 +1,7 @@
 import { useRouter } from "next/router";
 import { t } from "@lingui/core/macro";
 import {
+  HiArrowRightOnRectangle,
  HiEllipsisHorizontal,
  HiLink,
  HiOutlineDocumentDuplicate,
@@ -88,7 +89,7 @@ export default function BoardDropdown({
  const isArchiveActionPending = updateBoard.isPending;

  const items = [
-    ...(isTemplate && canCreateBoard
+    ...(!isTemplate && canCreateBoard
      ? [
        {
          label: t`Make template`,
@@ -119,6 +120,17 @@ export default function BoardDropdown({
        },
      ]
      : []),
+    ...(!isTemplate && canEditBoard
+      ? [
+        {
+          label: t`Move to workspace`,
+          action: () => openModal("MOVE_BOARD"),
+          icon: (
+            <HiArrowRightOnRectangle className="h-[16px] w-[16px] text-dark-900" />
+          ),
+        },
+      ]
+      : []),
    {
      label: isFavorite
        ? t`Remove from favorites`
--- a/apps/web/src/views/board/components/Card.tsx
+++ b/apps/web/src/views/board/components/Card.tsx
@@ -16,6 +16,7 @@ import { getAvatarUrl } from "~/utils/helpers";

 const Card = ({
  title,
+  ticketNumber,
  labels,
  members,
  checklists,
@@ -25,6 +26,7 @@ const Card = ({
  dueDate,
 }: {
  title: string;
+  ticketNumber?: string | null;
  labels: { name: string; colourCode: string | null }[];
  members: {
    publicId: string;
@@ -67,6 +69,11 @@ const Card = ({

  return (
    <div className="flex flex-col overflow-hidden rounded-md border border-light-200 bg-light-50 px-3 py-2 text-sm text-neutral-900 dark:border-dark-200 dark:bg-dark-200 dark:text-dark-1000 dark:hover:bg-dark-300">
+      {ticketNumber && (
+        <span className="mb-1 text-xs text-light-700 dark:text-dark-800">
+          {ticketNumber}
+        </span>
+      )}
      <span className="break-words">{title}</span>
      {labels.length ||
      members.length ||
--- a/apps/web/src/views/board/components/DeleteBoardConfirmation.tsx
+++ b/apps/web/src/views/board/components/DeleteBoardConfirmation.tsx
@@ -14,6 +14,7 @@ export function DeleteBoardConfirmation({
 }) {
  const router = useRouter();
  const { closeModal } = useModal();
+  const boardTypeLabel = isTemplate ? t`template` : t`board`;

  const deleteBoard = api.board.delete.useMutation({
    onSuccess: () => {
@@ -33,7 +34,7 @@ export function DeleteBoardConfirmation({
    <div className="p-5">
      <div className="flex w-full flex-col justify-between pb-4">
        <h2 className="text-md pb-4 font-medium text-neutral-900 dark:text-dark-1000">
-          {t`Are you sure you want to delete this ${isTemplate ? "template" : "board"}?`}
+          {t`Are you sure you want to delete this ${boardTypeLabel}?`}
        </h2>
        <p className="text-sm font-medium text-light-900 dark:text-dark-900">
          {t`This action can't be undone.`}
--- a/apps/web/src/views/board/components/List.tsx
+++ b/apps/web/src/views/board/components/List.tsx
@@ -95,7 +95,7 @@ export default function List({
          ref={provided.innerRef}
          {...provided.draggableProps}
          {...provided.dragHandleProps}
-          className="dark-text-dark-1000 mr-5 h-fit min-w-[18rem] max-w-[18rem] rounded-md border border-light-400 bg-light-300 py-2 pl-2 pr-1 text-neutral-900 dark:border-dark-300 dark:bg-dark-100"
+          className="dark-text-dark-1000 mr-5 h-fit min-w-[18rem] max-w-[18rem] snap-start rounded-md border border-light-400 bg-light-300 py-2 pl-2 pr-1 text-neutral-900 dark:border-dark-300 dark:bg-dark-100 md:snap-align-none"
        >
          <div className="mb-2 flex justify-between">
            <form
@@ -118,7 +118,7 @@ export default function List({
                }
              >
                <button
-                  className="mx-1 inline-flex h-fit items-center rounded-md p-1 px-1 text-sm font-semibold text-dark-50 hover:bg-light-400 disabled:opacity-60 disabled:cursor-not-allowed dark:hover:bg-dark-200"
+                  className="mx-1 inline-flex h-fit items-center rounded-md p-1 px-1 text-sm font-semibold text-dark-50 hover:bg-light-400 disabled:cursor-not-allowed disabled:opacity-60 dark:hover:bg-dark-200"
                  onClick={() => openNewCardForm(list.publicId)}
                  disabled={!canCreateCard}
                >
--- a/apps/web/src/views/board/components/MoveBoardForm.tsx
+++ b/apps/web/src/views/board/components/MoveBoardForm.tsx
@@ -0,0 +1,113 @@
+import { useRouter } from "next/navigation";
+import { t } from "@lingui/core/macro";
+import { useState } from "react";
+
+import Button from "~/components/Button";
+import { useModal } from "~/providers/modal";
+import { usePopup } from "~/providers/popup";
+import { useWorkspace } from "~/providers/workspace";
+import { api } from "~/utils/api";
+
+export function MoveBoardForm({
+  boardPublicId,
+}: {
+  boardPublicId: string;
+}) {
+  const router = useRouter();
+  const { closeModal } = useModal();
+  const { showPopup } = usePopup();
+  const { workspace, availableWorkspaces, switchWorkspace } = useWorkspace();
+  const [targetWorkspacePublicId, setTargetWorkspacePublicId] = useState("");
+
+  const otherWorkspaces = availableWorkspaces.filter(
+    (ws) => ws.publicId !== workspace.publicId && ws.role !== "guest",
+  );
+
+  const moveBoard = api.board.move.useMutation({
+    onSuccess: () => {
+      const targetWorkspace = availableWorkspaces.find(
+        (ws) => ws.publicId === targetWorkspacePublicId,
+      );
+      closeModal();
+      showPopup({
+        header: t`Board moved`,
+        message: t`The board has been moved to ${targetWorkspace?.name ?? t`the workspace`}.`,
+        icon: "success",
+      });
+      if (targetWorkspace) {
+        switchWorkspace(targetWorkspace);
+      } else {
+        router.push("/boards");
+      }
+    },
+    onError: (error) => {
+      showPopup({
+        header: t`Unable to move board`,
+        message: error.message,
+        icon: "error",
+      });
+    },
+  });
+
+  const handleMoveBoard = () => {
+    if (!targetWorkspacePublicId) return;
+    moveBoard.mutate({
+      boardPublicId,
+      targetWorkspacePublicId,
+    });
+  };
+
+  return (
+    <div className="p-5">
+      <div className="flex w-full flex-col justify-between pb-4">
+        <h2 className="text-md pb-4 font-medium text-neutral-900 dark:text-dark-1000">
+          {t`Move board to another workspace`}
+        </h2>
+        {otherWorkspaces.length === 0 ? (
+          <p className="text-sm font-medium text-light-900 dark:text-dark-900">
+            {t`You don't have any other workspaces to move this board to.`}
+          </p>
+        ) : (
+          <>
+            <label
+              htmlFor="target-workspace"
+              className="mb-2 text-sm font-medium text-light-900 dark:text-dark-900"
+            >
+              {t`Destination workspace`}
+            </label>
+            <select
+              id="target-workspace"
+              value={targetWorkspacePublicId}
+              onChange={(e) => setTargetWorkspacePublicId(e.target.value)}
+              className="block w-full rounded-md border-0 bg-dark-300 bg-white/5 py-1.5 text-sm shadow-sm ring-1 ring-inset ring-light-600 placeholder:text-dark-800 focus:ring-2 focus:ring-inset focus:ring-light-700 dark:text-dark-1000 dark:ring-dark-700 dark:focus:ring-dark-700 sm:leading-6"
+            >
+              <option value="">{t`Select a workspace`}</option>
+              {otherWorkspaces.map((ws) => (
+                <option key={ws.publicId} value={ws.publicId}>
+                  {ws.name}
+                </option>
+              ))}
+            </select>
+            <p className="mt-3 text-sm text-light-800 dark:text-dark-800">
+              {t`Card member assignments will be cleared when moving to a different workspace.`}
+            </p>
+          </>
+        )}
+      </div>
+      <div className="mt-5 flex justify-end space-x-2 sm:mt-6">
+        <Button onClick={() => closeModal()} variant="secondary">
+          {t`Cancel`}
+        </Button>
+        {otherWorkspaces.length > 0 && (
+          <Button
+            onClick={handleMoveBoard}
+            isLoading={moveBoard.isPending}
+            disabled={!targetWorkspacePublicId}
+          >
+            {t`Move board`}
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
--- a/apps/web/src/views/board/components/NewCardForm.tsx
+++ b/apps/web/src/views/board/components/NewCardForm.tsx
@@ -146,6 +146,10 @@ export function NewCardForm({
              listId: 2,
              description: "",
              dueDate: args.dueDate ?? null,
+              cardNumber: null,
+              comments: [],
+              checklists: [],
+              attachments: [],
              labels: oldBoard.labels.filter((label) =>
                args.labelPublicIds.includes(label.publicId),
              ),
--- a/apps/web/src/views/board/components/VisibilityButton.tsx
+++ b/apps/web/src/views/board/components/VisibilityButton.tsx
@@ -42,12 +42,13 @@ const VisibilityButton = ({
  }, [visibility]);

  const isPublic = stateVisibility === "public";
+  const visibilityLabel = isPublic ? t`public` : t`private`;

  const updateBoardVisibility = api.board.update.useMutation({
    onSuccess: () => {
      showPopup({
        header: t`Board visibility updated`,
-        message: t`The visibility of your board has been set to ${isPublic ? "public" : "private"}.`,
+        message: t`The visibility of your board has been set to ${visibilityLabel}.`,
        icon: "success",
      });
    },
--- a/apps/web/src/views/board/index.tsx
+++ b/apps/web/src/views/board/index.tsx
@@ -2,10 +2,10 @@ import type { DropResult } from "react-beautiful-dnd";
 import Link from "next/link";
 import { useParams } from "next/navigation";
 import { useRouter } from "next/router";
-import { env } from "next-runtime-env";
 import { t } from "@lingui/core/macro";
 import { keepPreviousData } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
+import { env } from "next-runtime-env";
+import { useEffect, useMemo, useState } from "react";
 import { DragDropContext, Draggable } from "react-beautiful-dnd";
 import { useForm } from "react-hook-form";
 import {
@@ -49,6 +49,7 @@ import { DeleteBoardConfirmation } from "./components/DeleteBoardConfirmation";
 import { DeleteListConfirmation } from "./components/DeleteListConfirmation";
 import Filters from "./components/Filters";
 import List from "./components/List";
+import { MoveBoardForm } from "./components/MoveBoardForm";
 import { NewCardForm } from "./components/NewCardForm";
 import { NewListForm } from "./components/NewListForm";
 import { NewTemplateForm } from "./components/NewTemplateForm";
@@ -84,21 +85,26 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
  const { canCreateList, canEditList, canEditCard, canEditBoard } =
    usePermissions();

-  const { tooltipContent: createListShortcutTooltipContent } =
-    useKeyboardShortcut({
-      type: "PRESS",
-      stroke: { key: "C" },
-      action: () => boardId && canCreateList && openNewListForm(boardId),
-      description: t`Create new list`,
-      group: "ACTIONS",
-    });
-
  const boardId = params?.boardId
    ? Array.isArray(params.boardId)
      ? params.boardId[0]
      : params.boardId
    : null;

+  const createListShortcut = useMemo(
+    () => ({
+      type: "PRESS" as const,
+      stroke: { key: "C" },
+      action: () => boardId && canCreateList && openNewListForm(boardId),
+      description: t`Create new list`,
+      group: "ACTIONS" as const,
+    }),
+    [boardId, canCreateList],
+  );
+
+  const { tooltipContent: createListShortcutTooltipContent } =
+    useKeyboardShortcut(createListShortcut);
+
  const updateBoard = api.board.update.useMutation();

  const { register, handleSubmit, setValue } = useForm<UpdateBoardInput>({
@@ -460,6 +466,13 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
          />
        </Modal>

+        <Modal
+          modalSize="sm"
+          isVisible={isOpen && modalContentType === "MOVE_BOARD"}
+        >
+          <MoveBoardForm boardPublicId={boardId ?? ""} />
+        </Modal>
+
        <Modal
          modalSize="sm"
          isVisible={isOpen && modalContentType === "CREATE_TEMPLATE"}
@@ -527,7 +540,7 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
  return (
    <>
      <PageHead
-        title={`${boardData?.name ?? (isTemplate ? t`Board` : t`Template`)} | ${workspace.name ?? t`Workspace`}`}
+        title={`${boardData?.name ?? (isTemplate ? t`Template` : t`Board`)} | ${workspace.name ?? t`Workspace`}`}
      />
      <div className="relative flex h-full flex-col">
        <PatternedBackground />
@@ -554,7 +567,7 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
          )}
          {!boardData && !isLoading && (
            <p className="order-2 block p-0 py-0 font-bold leading-[2.3rem] tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem] md:order-1">
-              {t`${isTemplate ? "Template" : "Board"} not found`}
+              {isTemplate ? t`Template not found` : t`Board not found`}
            </p>
          )}
          <div className="order-1 mb-4 flex items-center justify-end space-x-2 md:order-2 md:mb-0">
@@ -634,7 +647,7 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
        <div
          ref={scrollRef}
          onMouseDown={onMouseDown}
-          className={`scrollbar-w-none scrollbar-track-rounded-[4px] scrollbar-thumb-rounded-[4px] scrollbar-h-[8px] z-0 flex-1 overflow-y-hidden overflow-x-scroll overscroll-contain scrollbar scrollbar-track-light-200 scrollbar-thumb-light-400 dark:scrollbar-track-dark-100 dark:scrollbar-thumb-dark-300`}
+          className={`scrollbar-w-none scrollbar-track-rounded-[4px] scrollbar-thumb-rounded-[4px] scrollbar-h-[8px] z-0 flex-1 snap-x snap-mandatory scroll-pl-[10px] overflow-y-hidden overflow-x-scroll overscroll-contain scrollbar scrollbar-track-light-200 scrollbar-thumb-light-400 dark:scrollbar-track-dark-100 dark:scrollbar-thumb-dark-300 md:snap-none`}
        >
          {isLoading ? (
            <div className="ml-[2rem] flex">
@@ -681,11 +694,11 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                  >
                    {(provided) => (
                      <div
-                        className="flex"
+                        className="flex w-max"
                        ref={provided.innerRef}
                        {...provided.droppableProps}
                      >
-                        <div className="min-w-[2rem]" />
+                        <div className="min-w-[10px] md:min-w-[2rem]" />
                        {boardData.lists.map((list, index) => (
                          <List
                            index={index}
@@ -757,6 +770,11 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                                        >
                                          <Card
                                            title={card.title}
+                                            ticketNumber={
+                                              card.cardNumber != null
+                                                ? `${boardData.workspace.cardPrefix}-${card.cardNumber}`
+                                                : null
+                                            }
                                            labels={card.labels}
                                            members={card.members}
                                            checklists={card.checklists ?? []}
@@ -777,7 +795,7 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                            </Droppable>
                          </List>
                        ))}
-                        <div className="min-w-[0.75rem]" />
+                        <div className="min-w-[calc(100vw-18rem)] md:min-w-[0.75rem]" />
                        {provided.placeholder}
                      </div>
                    )}
--- a/apps/web/src/views/boards/components/BoardsList.tsx
+++ b/apps/web/src/views/boards/components/BoardsList.tsx
@@ -14,6 +14,8 @@ export function BoardsList({ isTemplate, archived = false }: { isTemplate?: bool
  const { workspace } = useWorkspace();
  const { openModal } = useModal();
  const { canCreateBoard } = usePermissions();
+  const boardTypeLabel = isTemplate ? t`template` : t`board`;
+  const boardLabel = isTemplate ? t`templates` : t`boards`;

  const utils = api.useUtils();
  const updateBoard = api.board.update.useMutation({
@@ -60,10 +62,10 @@ export function BoardsList({ isTemplate, archived = false }: { isTemplate?: bool
        <div className="flex flex-col items-center">
          <HiOutlineRectangleStack className="h-10 w-10 text-light-800 dark:text-dark-800" />
          <p className="mb-2 mt-4 text-[14px] font-bold text-light-1000 dark:text-dark-950">
-            {archived ? t`No archived boards` : t`No ${isTemplate ? "templates" : "boards"}`}
+            {archived ? t`No archived boards` : t`No ${boardLabel}`}
          </p>
          <p className="text-[14px] text-light-900 dark:text-dark-900">
-            {archived ? t`Boards you archive will appear here.` : t`Get started by creating a new ${isTemplate ? "template" : "board"}`}
+            {archived ? t`Boards you archive will appear here.` : t`Get started by creating a new ${boardTypeLabel}`}
          </p>
        </div>
        <Tooltip
@@ -77,7 +79,7 @@ export function BoardsList({ isTemplate, archived = false }: { isTemplate?: bool
            }}
            disabled={!canCreateBoard}
          >
-            {t`Create new ${isTemplate ? "template" : "board"}`}
+            {t`Create new ${boardTypeLabel}`}
          </Button>
        </Tooltip>
      </div>
--- a/apps/web/src/views/boards/components/NewBoardForm.tsx
+++ b/apps/web/src/views/boards/components/NewBoardForm.tsx
@@ -32,6 +32,7 @@ interface NewBoardInputWithTemplate {
 }

 export function NewBoardForm({ isTemplate }: { isTemplate?: boolean }) {
+  const boardTypeLabel = isTemplate ? t`template` : t`board`;
  const utils = api.useUtils();
  const { closeModal } = useModal();
  const router = useRouter();
@@ -117,7 +118,7 @@ export function NewBoardForm({ isTemplate }: { isTemplate?: boolean }) {
    <form onSubmit={handleSubmit(onSubmit)}>
      <div className="px-5 pt-5">
        <div className="text-neutral-9000 flex w-full items-center justify-between pb-4 dark:text-dark-1000">
-          <h2 className="text-sm font-bold">{t`New ${isTemplate ? "template" : "board"}`}</h2>
+          <h2 className="text-sm font-bold">{t`New ${boardTypeLabel}`}</h2>
          <button
            type="button"
            className="hover:bg-li ght-300 rounded p-1 focus:outline-none dark:hover:bg-dark-300"
@@ -163,7 +164,7 @@ export function NewBoardForm({ isTemplate }: { isTemplate?: boolean }) {
        )}
        <div>
          <Button type="submit" isLoading={createBoard.isPending}>
-            {t`Create ${isTemplate ? "template" : "board"}`}
+            {t`Create ${boardTypeLabel}`}
          </Button>
        </div>
      </div>
--- a/apps/web/src/views/boards/index.tsx
+++ b/apps/web/src/views/boards/index.tsx
@@ -5,8 +5,12 @@ import {
  ListboxOptions,
 } from "@headlessui/react";
 import { t } from "@lingui/core/macro";
-import { HiArrowDownTray, HiChevronDown, HiOutlinePlusSmall } from "react-icons/hi2";
-import { useState } from "react";
+import { useMemo, useState } from "react";
+import {
+  HiArrowDownTray,
+  HiChevronDown,
+  HiOutlinePlusSmall,
+} from "react-icons/hi2";

 import Button from "~/components/Button";
 import FeedbackModal from "~/components/FeedbackModal";
@@ -22,35 +26,41 @@ import { BoardsList } from "./components/BoardsList";
 import { ImportBoardsForm } from "./components/ImportBoardsForm";
 import { NewBoardForm } from "./components/NewBoardForm";

-const boardsTabs = [
-  { key: "boards" as const, label: t`Active` },
-  { key: "archived" as const, label: t`Archived` },
-];
-
 export default function BoardsPage({ isTemplate }: { isTemplate?: boolean }) {
  const { openModal, modalContentType, isOpen } = useModal();
  const { workspace } = useWorkspace();
  const [activeTab, setActiveTab] = useState<"boards" | "archived">("boards");
  const { canCreateBoard } = usePermissions();
+  const boardLabel = isTemplate ? t`Templates` : t`Boards`;
+  const boardTypeLabel = isTemplate ? t`template` : t`board`;
+  const boardsTabs = [
+    { key: "boards" as const, label: t`Active` },
+    { key: "archived" as const, label: t`Archived` },
+  ];

-  const { tooltipContent: createModalShortcutTooltipContent } =
-    useKeyboardShortcut({
-      type: "PRESS",
+  const createBoardShortcut = useMemo(
+    () => ({
+      type: "PRESS" as const,
      stroke: { key: "C" },
      action: () => canCreateBoard && openModal("NEW_BOARD"),
-      description: t`Create new ${isTemplate ? "template" : "board"}`,
-      group: "ACTIONS",
-    });
+      description: t`Create new ${boardTypeLabel}`,
+      group: "ACTIONS" as const,
+    }),
+    [boardTypeLabel, canCreateBoard, isTemplate, openModal],
+  );
+
+  const { tooltipContent: createModalShortcutTooltipContent } =
+    useKeyboardShortcut(createBoardShortcut);

  return (
    <>
      <PageHead
-        title={t`${isTemplate ? "Templates" : "Boards"} | ${workspace.name ?? t`Workspace`}`}
+        title={t`${boardLabel} | ${workspace.name ?? t`Workspace`}`}
      />
      <div className="m-auto h-full max-w-[1100px] p-8 px-5 md:px-28 md:py-12">
        <div className="relative z-10 mb-8 flex w-full items-center justify-between">
          <h1 className="font-bold tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
-            {t`${isTemplate ? "Templates" : "Boards"}`}
+            {boardLabel}
          </h1>
          <div className="flex gap-2">
            {!isTemplate && (
@@ -137,7 +147,7 @@ export default function BoardsPage({ isTemplate }: { isTemplate?: boolean }) {
                  onChange={(tab) => setActiveTab(tab)}
                >
                  <div className="relative mb-4">
-                    <ListboxButton className="w-full appearance-none rounded-md border-0 bg-light-50 py-3 pl-3 pr-10 text-left text-sm font-semibold text-light-1000 shadow-sm ring-1 ring-inset ring-light-300  dark:bg-dark-50 dark:text-dark-1000 dark:ring-dark-300 dark:focus:ring-dark-500">
+                    <ListboxButton className="w-full appearance-none rounded-md border-0 bg-light-50 py-3 pl-3 pr-10 text-left text-sm font-semibold text-light-1000 shadow-sm ring-1 ring-inset ring-light-300 dark:bg-dark-50 dark:text-dark-1000 dark:ring-dark-300 dark:focus:ring-dark-500">
                      {boardsTabs.find((tab) => tab.key === activeTab)?.label ??
                        "Select a tab"}
                      <HiChevronDown
@@ -151,9 +161,10 @@ export default function BoardsPage({ isTemplate }: { isTemplate?: boolean }) {
                          key={tab.key}
                          value={tab.key}
                          className={({ selected }) =>
-                            `relative cursor-pointer select-none py-2 pl-3 pr-9 ${selected
-                              ? "font-bold text-light-1000 dark:text-dark-1000"
-                              : "font-normal text-light-1000 dark:text-dark-1000"
+                            `relative cursor-pointer select-none py-2 pl-3 pr-9 ${
+                              selected
+                                ? "font-bold text-light-1000 dark:text-dark-1000"
+                                : "font-normal text-light-1000 dark:text-dark-1000"
                            }`
                          }
                        >
@@ -175,10 +186,11 @@ export default function BoardsPage({ isTemplate }: { isTemplate?: boolean }) {
                        key={tab.key}
                        type="button"
                        onClick={() => setActiveTab(tab.key)}
-                        className={`whitespace-nowrap px-1 py-0 mt-2 mb-8 text-sm font-semibold transition-colors focus:outline-none ${activeTab === tab.key
-                          ? "border-light-1000 text-light-1000 dark:border-dark-1000 dark:text-dark-1000"
-                          : "border-transparent text-light-900 hover:border-light-950 hover:text-light-950 dark:text-dark-900 dark:hover:border-white/20 dark:hover:text-dark-950"
-                          }`}
+                        className={`mb-8 mt-2 whitespace-nowrap px-1 py-0 text-sm font-semibold transition-colors focus:outline-none ${
+                          activeTab === tab.key
+                            ? "border-light-1000 text-light-1000 dark:border-dark-1000 dark:text-dark-1000"
+                            : "border-transparent text-light-900 hover:border-light-950 hover:text-light-950 dark:text-dark-900 dark:hover:border-white/20 dark:hover:text-dark-950"
+                        }`}
                      >
                        {tab.label}
                      </button>
--- a/apps/web/src/views/card/components/ActivityList.tsx
+++ b/apps/web/src/views/card/components/ActivityList.tsx
@@ -525,7 +525,6 @@ const ActivityList = ({
              comment={activity.comment?.comment}
              isEdited={!!activity.comment?.updatedAt}
              isAuthor={activity.comment?.createdBy === sessionData?.user.id}
-              isAdmin={isAdmin ?? false}
              isViewOnly={!!isViewOnly}
            />
          );
--- a/apps/web/src/views/card/components/AttachmentUpload.tsx
+++ b/apps/web/src/views/card/components/AttachmentUpload.tsx
@@ -1,4 +1,5 @@
 import { t } from "@lingui/core/macro";
+import { env } from "next-runtime-env";
 import { useRef, useState } from "react";
 import { HiOutlinePaperClip } from "react-icons/hi";
 import { HiCheckBadge } from "react-icons/hi2";
@@ -7,7 +8,6 @@ import { twMerge } from "tailwind-merge";
 import Button from "~/components/Button";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
-import { env } from "next-runtime-env";
 import { api } from "~/utils/api";
 import { invalidateCard } from "~/utils/cardInvalidation";

@@ -30,7 +30,7 @@ export function AttachmentUpload({ cardPublicId }: { cardPublicId: string }) {
          method: "POST",
          headers: {
            "Content-Type": file.type,
-            "x-original-filename": file.name,
+            "x-original-filename": encodeURIComponent(file.name),
          },
          body: file,
        },
--- a/apps/web/src/views/card/components/Dropdown.tsx
+++ b/apps/web/src/views/card/components/Dropdown.tsx
@@ -1,8 +1,10 @@
 import { t } from "@lingui/core/macro";
 import {
  HiEllipsisHorizontal,
+  HiHashtag,
  HiLink,
  HiOutlineCheckCircle,
+  HiOutlineDocumentDuplicate,
  HiOutlineTrash,
 } from "react-icons/hi2";

@@ -12,24 +14,52 @@ import Dropdown from "~/components/Dropdown";
 import { usePermissions } from "~/hooks/usePermissions";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
+import { api } from "~/utils/api";

 export default function CardDropdown({
  cardPublicId,
  isTemplate,
  boardPublicId,
  cardCreatedBy,
+  ticketNumber,
+  listPublicId,
+  cardIndex,
 }: {
  cardPublicId: string;
  isTemplate?: boolean;
  boardPublicId?: string;
  cardCreatedBy?: string | null;
+  ticketNumber?: string | null;
+  listPublicId?: string;
+  cardIndex?: number;
 }) {
  const { openModal } = useModal();
  const { showPopup } = usePopup();
  const { canEditCard, canDeleteCard } = usePermissions();
  const { data: session } = authClient.useSession();
+  const utils = api.useUtils();
  const isCreator = cardCreatedBy && session?.user.id === cardCreatedBy;

+  const duplicateCard = api.card.duplicate.useMutation({
+    onSuccess: () => {
+      showPopup({
+        header: t`Card duplicated`,
+        icon: "success",
+        message: t`Card duplicated successfully.`,
+      });
+    },
+    onError: () => {
+      showPopup({
+        header: t`Unable to duplicate card`,
+        icon: "error",
+        message: t`Please try again.`,
+      });
+    },
+    onSettled: async () => {
+      await utils.board.byId.invalidate();
+    },
+  });
+
  const handleCopyCardLink = async () => {
    const path =
      isTemplate && boardPublicId
@@ -53,12 +83,40 @@ export default function CardDropdown({
    }
  };

+  const handleCopyTicketId = async () => {
+    if (!ticketNumber) return;
+    try {
+      await navigator.clipboard.writeText(ticketNumber);
+      showPopup({
+        header: t`ID copied`,
+        icon: "success",
+        message: t`Ticket ID copied to clipboard`,
+      });
+    } catch (error) {
+      console.error(error);
+      showPopup({
+        header: t`Unable to copy ID`,
+        icon: "error",
+        message: t`Please try again.`,
+      });
+    }
+  };
+
  const items = [
    {
      label: t`Copy card link`,
      action: handleCopyCardLink,
      icon: <HiLink className="h-[16px] w-[16px] text-dark-900" />,
    },
+    ...(ticketNumber
+      ? [
+          {
+            label: t`Copy ticket ID`,
+            action: handleCopyTicketId,
+            icon: <HiHashtag className="h-[16px] w-[16px] text-dark-900" />,
+          },
+        ]
+      : []),
    ...(canEditCard
      ? [
          {
@@ -68,6 +126,24 @@ export default function CardDropdown({
              <HiOutlineCheckCircle className="h-[16px] w-[16px] text-dark-900" />
            ),
          },
+          {
+            label: t`Duplicate card`,
+            action: () => {
+              if (!listPublicId || cardIndex === undefined) return;
+              duplicateCard.mutate({
+                cardPublicId,
+                listPublicId,
+                index: cardIndex + 1,
+                copyLabels: true,
+                copyMembers: true,
+                copyChecklists: true,
+              });
+            },
+            icon: (
+              <HiOutlineDocumentDuplicate className="h-[16px] w-[16px] text-dark-900" />
+            ),
+            disabled: duplicateCard.isPending || !listPublicId,
+          },
        ]
      : []),
    ...(canDeleteCard || isCreator
--- a/apps/web/src/views/card/components/NewCommentForm.tsx
+++ b/apps/web/src/views/card/components/NewCommentForm.tsx
@@ -2,9 +2,10 @@ import { t } from "@lingui/core/macro";
 import { useForm } from "react-hook-form";
 import { HiOutlineArrowUp } from "react-icons/hi2";

-import Editor from "~/components/Editor";
 import type { WorkspaceMember } from "~/components/Editor";
+import Editor from "~/components/Editor";
 import LoadingSpinner from "~/components/LoadingSpinner";
+import { Tooltip } from "~/components/Tooltip";
 import { usePermissions } from "~/hooks/usePermissions";
 import { usePopup } from "~/providers/popup";
 import { api } from "~/utils/api";
@@ -51,6 +52,21 @@ const NewCommentForm = ({
    });
  };

+  const isMac =
+    typeof navigator !== "undefined" && navigator.userAgent.includes("Mac");
+
+  const submitTooltip = (
+    <div className="flex flex-row items-center gap-2 text-[11px]">
+      {t`Submit`}
+      <span className="inline-flex items-center justify-center rounded border border-light-400 bg-light-200 px-1.5 py-0.5 font-mono text-[8px] font-semibold text-neutral-900 dark:border-dark-400 dark:bg-dark-200 dark:text-dark-950">
+        {isMac ? "⌘" : "Ctrl"}
+      </span>
+      <span className="inline-flex items-center justify-center rounded border border-light-400 bg-light-200 px-1.5 py-0.5 font-mono text-[8px] font-semibold text-neutral-900 dark:border-dark-400 dark:bg-dark-200 dark:text-dark-950">
+        Enter
+      </span>
+    </div>
+  );
+
  if (!canCreateComment) {
    return null;
  }
@@ -63,23 +79,26 @@ const NewCommentForm = ({
      <Editor
        content={watch("comment")}
        onChange={(value) => setValue("comment", value)}
+        onSubmit={handleSubmit(onSubmit)}
        workspaceMembers={workspaceMembers}
        enableYouTubeEmbed={false}
        placeholder={t`Add comment... (type '/' to open commands or '@' to mention)`}
        disableHeadings={true}
      />
      <div className="flex justify-end">
-        <button
-          type="submit"
-          disabled={addCommentMutation.isPending}
-          className="flex h-8 w-8 items-center justify-center rounded-full border border-light-600 bg-light-300 hover:bg-light-400 disabled:opacity-50 dark:border-dark-400 dark:bg-dark-200 dark:hover:bg-dark-400"
-        >
-          {addCommentMutation.isPending ? (
-            <LoadingSpinner size="sm" />
-          ) : (
-            <HiOutlineArrowUp />
-          )}
-        </button>
+        <Tooltip content={submitTooltip} placement="top">
+          <button
+            type="submit"
+            disabled={addCommentMutation.isPending}
+            className="flex h-8 w-8 items-center justify-center rounded-full border border-light-600 bg-light-300 hover:bg-light-400 disabled:opacity-50 dark:border-dark-400 dark:bg-dark-200 dark:hover:bg-dark-400"
+          >
+            {addCommentMutation.isPending ? (
+              <LoadingSpinner size="sm" />
+            ) : (
+              <HiOutlineArrowUp />
+            )}
+          </button>
+        </Tooltip>
      </div>
    </form>
  );
--- a/apps/web/src/views/card/index.tsx
+++ b/apps/web/src/views/card/index.tsx
@@ -185,7 +185,11 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
    ? router.query.cardId[0]
    : router.query.cardId;

-  const { data: card, isLoading, error } = api.card.byId.useQuery(
+  const {
+    data: card,
+    isLoading,
+    error,
+  } = api.card.byId.useQuery(
    { cardPublicId: cardId ?? "" },
    { enabled: !!cardId && cardId.length >= 12 },
  );
@@ -340,6 +344,15 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
                >
                  {board?.name}
                </Link>
+                {card.cardNumber != null &&
+                  card.list.board.workspace.cardPrefix && (
+                    <>
+                      <IoChevronForwardSharp className="h-[10px] w-[10px] text-light-900 dark:text-dark-900" />
+                      <span className="whitespace-nowrap text-sm font-bold leading-[1.5rem] text-light-700 dark:text-dark-800">
+                        {card.list.board.workspace.cardPrefix}-{card.cardNumber}
+                      </span>
+                    </>
+                  )}
              </div>
              <div className="flex items-center gap-2">
                <Dropdown
@@ -347,6 +360,14 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
                  isTemplate={isTemplate}
                  boardPublicId={boardId}
                  cardCreatedBy={card?.createdBy}
+                  ticketNumber={
+                    card.cardNumber != null &&
+                    card.list.board.workspace.cardPrefix
+                      ? `${card.list.board.workspace.cardPrefix}-${card.cardNumber}`
+                      : null
+                  }
+                  listPublicId={card?.list.publicId}
+                  cardIndex={card?.index}
                />
                <Link
                  href={`/${isTemplate ? "templates" : "boards"}/${boardId}`}
--- a/apps/web/src/views/invite/index.tsx
+++ b/apps/web/src/views/invite/index.tsx
@@ -36,6 +36,17 @@ export default function InvitePage() {
        return router.push(`/boards`);
      }

+      if (
+        error.data?.code === "FORBIDDEN" &&
+        error.message === "SEAT_LIMIT_REACHED"
+      ) {
+        setError(
+          t`This workspace has reached its member limit. The workspace owner will need to upgrade their plan.`,
+        );
+        setIsProcessing(false);
+        return;
+      }
+
      setError(
        error.message ||
          t`Failed to accept invitation. Please try again later, or contact customer support.`,
--- a/apps/web/src/views/members/components/InviteMemberForm.tsx
+++ b/apps/web/src/views/members/components/InviteMemberForm.tsx
@@ -13,7 +13,6 @@ import { z } from "zod";

 import type { InviteMemberInput } from "@kan/api/types";
 import type { Subscription } from "@kan/shared/utils";
-import { authClient } from "@kan/auth/client";
 import { getSubscriptionByPlan } from "@kan/shared/utils";

 import Button from "~/components/Button";
@@ -25,15 +24,15 @@ import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";

 export function InviteMemberForm({
-  numberOfMembers,
  subscriptions,
  unlimitedSeats,
-  userId,
+  memberCount,
+  seatLimit,
 }: {
-  numberOfMembers: number;
  subscriptions: Subscription[] | undefined;
  unlimitedSeats: boolean;
-  userId: string | undefined;
+  memberCount: number;
+  seatLimit: number | null;
 }) {
  const utils = api.useUtils();
  const [isShareInviteLinkEnabled, setIsShareInviteLinkEnabled] =
@@ -98,6 +97,15 @@ export function InviteMemberForm({
          message: t`User is already a member of this workspace`,
          icon: "error",
        });
+      } else if (
+        error.data?.code === "FORBIDDEN" &&
+        error.message === "SEAT_LIMIT_REACHED"
+      ) {
+        showPopup({
+          header: t`Seat limit reached`,
+          message: t`You've reached your ${seatLimit ?? 0}-seat limit. Please upgrade your plan to add more members.`,
+          icon: "error",
+        });
      } else {
        showPopup({
          header: t`Error inviting member`,
@@ -153,6 +161,9 @@ export function InviteMemberForm({

  const hasTeamSubscription = !!teamSubscription;
  const hasProSubscription = !!proSubscription;
+  const isPartnerTier = !!(
+    teamSubscription?.partnerTier ?? proSubscription?.partnerTier
+  );

  let isYearly = false;
  let price = t`$10/month`;
@@ -175,13 +186,13 @@ export function InviteMemberForm({
    inviteMember.mutate(member);
  };

+  const isFreePlan =
+    env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
+    !hasTeamSubscription &&
+    !hasProSubscription;
+
  const handleInviteLinkToggle = async () => {
-    if (
-      env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-      !hasTeamSubscription &&
-      !hasProSubscription
-    )
-      return handleUpgrade();
+    if (isFreePlan) return;

    setIsLoadingInviteLink(true);

@@ -219,31 +230,6 @@ export function InviteMemberForm({
    }
  };

-  const handleUpgrade = async () => {
-    const { data, error } = await authClient.subscription.upgrade({
-      plan: "team",
-      referenceId: workspace.publicId,
-      metadata: { userId },
-      seats: numberOfMembers,
-      successUrl: "/members",
-      cancelUrl: "/members",
-      returnUrl: "/members",
-      disableRedirect: true,
-    });
-
-    if (data?.url) {
-      window.location.href = data.url;
-    }
-
-    if (error) {
-      showPopup({
-        header: t`Error upgrading subscription`,
-        message: t`Please try again later, or contact customer support.`,
-        icon: "error",
-      });
-    }
-  };
-
  useEffect(() => {
    const emailElement: HTMLElement | null =
      document.querySelector<HTMLElement>("#email");
@@ -270,11 +256,7 @@ export function InviteMemberForm({
          <Input
            id="email"
            placeholder={t`Email`}
-            disabled={
-              env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-              !hasTeamSubscription &&
-              !hasProSubscription
-            }
+            disabled={isFreePlan}
            {...register("email", { required: true })}
            onKeyDown={async (e) => {
              if (e.key === "Enter") {
@@ -285,78 +267,92 @@ export function InviteMemberForm({
            errorMessage={errors.email?.message}
          />
        )}
-        {(!isEmailEnabled || (isShareInviteLinkEnabled && inviteLink)) && (
-          <div className="my-4">
-            <div className="relative">
-              <Input
-                value={inviteLink}
-                className="pr-10 text-sm text-light-900 dark:text-dark-900"
-                readOnly
-              />
-              <button
-                type="button"
-                className="absolute inset-y-0 right-0 flex items-center pr-3 text-light-900 hover:text-light-950 dark:text-dark-900 dark:hover:text-dark-950"
-                onClick={copyToClipboard}
-              >
-                {copied ? (
-                  <HiMiniCheck className="h-5 w-5 text-green-600" />
-                ) : (
-                  <HiOutlineDocumentDuplicate className="h-5 w-5" />
-                )}
-              </button>
+        {!isFreePlan &&
+          (!isEmailEnabled || (isShareInviteLinkEnabled && inviteLink)) && (
+            <div className="my-4">
+              <div className="relative">
+                <Input
+                  value={inviteLink}
+                  className="pr-10 text-sm text-light-900 dark:text-dark-900"
+                  readOnly
+                />
+                <button
+                  type="button"
+                  className="absolute inset-y-0 right-0 flex items-center pr-3 text-light-900 hover:text-light-950 dark:text-dark-900 dark:hover:text-dark-950"
+                  onClick={copyToClipboard}
+                >
+                  {copied ? (
+                    <HiMiniCheck className="h-5 w-5 text-green-600" />
+                  ) : (
+                    <HiOutlineDocumentDuplicate className="h-5 w-5" />
+                  )}
+                </button>
+              </div>
+              <div className="mt-2 flex items-start gap-1">
+                <HiInformationCircle className="mt-0.5 h-4 w-4 text-dark-900" />
+                <p className="text-xs text-gray-500 dark:text-dark-900">
+                  {t`Anyone with this link can join your workspace`}
+                </p>
+              </div>
            </div>
-            <div className="mt-2 flex items-start gap-1">
-              <HiInformationCircle className="mt-0.5 h-4 w-4 text-dark-900" />
-              <p className="text-xs text-gray-500 dark:text-dark-900">
-                {t`Anyone with this link can join your workspace`}
-              </p>
-            </div>
-          </div>
-        )}
+          )}

-        {env("NEXT_PUBLIC_KAN_ENV") === "cloud" && (
-          <div className="mt-3 rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
-            {hasTeamSubscription || hasProSubscription ? (
-              <div>
+        {env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
+          (isPartnerTier && seatLimit !== null ? (
+            <div className="mt-3 rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
+              <div className="flex items-center justify-between">
                <span className="font-medium text-emerald-500 dark:text-emerald-400">
-                  {hasTeamSubscription ? t`Team Plan` : t`Pro Plan ∞`}
+                  {hasTeamSubscription ? t`Team Plan` : t`Pro Plan`}
                </span>
-                <p className="mt-1">
-                  {unlimitedSeats
-                    ? t`You have unlimited seats with your Pro Plan. There is no additional charge for new members!`
-                    : t`Adding a new member will cost an additional ${price} (${billingType}) per seat.`}
-                </p>
-              </div>
-            ) : (
-              <div>
-                <span className="font-medium text-light-950 dark:text-dark-950">
-                  {t`Free Plan`}
+                <span className="text-light-900 dark:text-dark-900">
+                  {memberCount} / {seatLimit} {t`seats`}
                </span>
-                <p className="mt-1">
-                  {t`Inviting members requires a Team Plan. You'll be redirected to upgrade your workspace.`}
-                </p>
              </div>
-            )}
-          </div>
-        )}
+            </div>
+          ) : !unlimitedSeats ? (
+            <div className="mt-3 rounded-md bg-light-100 p-3 text-xs text-light-900 dark:bg-dark-200 dark:text-dark-900">
+              {hasTeamSubscription || hasProSubscription ? (
+                <div>
+                  <span className="font-medium text-emerald-500 dark:text-emerald-400">
+                    {hasTeamSubscription ? t`Team Plan` : t`Pro Plan ∞`}
+                  </span>
+                  <p className="mt-1">
+                    {t`Adding a new member will cost an additional ${price} (${billingType}) per seat.`}
+                  </p>
+                </div>
+              ) : (
+                <div>
+                  <span className="font-medium text-light-950 dark:text-dark-950">
+                    {t`Free Plan`}
+                  </span>
+                  <p className="mt-1">
+                    {t`Inviting members requires a Team or Pro plan. You'll be redirected to upgrade your workspace.`}
+                  </p>
+                </div>
+              )}
+            </div>
+          ) : null)}
      </div>

      <div className="mt-12 flex items-center justify-end space-x-4 border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
-        <Toggle
-          label={
-            isShareInviteLinkEnabled
-              ? t`Deactivate invite link`
-              : t`Create invite link`
-          }
-          isChecked={isShareInviteLinkEnabled}
-          onChange={handleInviteLinkToggle}
-        />
+        {!isFreePlan && (
+          <Toggle
+            label={
+              isShareInviteLinkEnabled
+                ? t`Deactivate invite link`
+                : t`Create invite link`
+            }
+            isChecked={isShareInviteLinkEnabled}
+            onChange={handleInviteLinkToggle}
+          />
+        )}
        <div>
-          {env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-          !hasTeamSubscription &&
-          !hasProSubscription ? (
-            <Button type="button" onClick={handleUpgrade}>
-              {t`Start 14 day free trial`}
+          {isFreePlan ? (
+            <Button
+              type="button"
+              href={`/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/members")}`}
+            >
+              {t`Choose plan`}
            </Button>
          ) : (
            <Button
--- a/apps/web/src/views/members/index.tsx
+++ b/apps/web/src/views/members/index.tsx
@@ -11,7 +11,11 @@ import { twMerge } from "tailwind-merge";

 import type { Subscription } from "@kan/shared/utils";
 import { authClient } from "@kan/auth/client";
-import { getSubscriptionByPlan, hasUnlimitedSeats } from "@kan/shared/utils";
+import {
+  getSeatLimit,
+  getSubscriptionByPlan,
+  hasUnlimitedSeats,
+} from "@kan/shared/utils";

 import Avatar from "~/components/Avatar";
 import Button from "~/components/Button";
@@ -27,8 +31,8 @@ import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 import { getAvatarUrl } from "~/utils/helpers";
 import { DeleteMemberConfirmation } from "./components/DeleteMemberConfirmation";
-import { InviteMemberForm } from "./components/InviteMemberForm";
 import { EditMemberPermissionsModal } from "./components/EditMemberPermissionsModal";
+import { InviteMemberForm } from "./components/InviteMemberForm";

 export default function MembersPage() {
  const { modalContentType, openModal, isOpen } = useModal();
@@ -76,6 +80,23 @@ export default function MembersPage() {

  const unlimitedSeats = hasUnlimitedSeats(subscriptions);

+  const isProPlan =
+    !!proSubscription ||
+    workspace.plan === "pro" ||
+    workspace.plan === "enterprise";
+  const isTeamPlan = !!teamSubscription || workspace.plan === "team";
+  const isPaidPlan = isProPlan || isTeamPlan;
+
+  const activeMembers = data?.members.length ?? 0;
+  const seatLimit = getSeatLimit(subscriptions);
+  const memberCount =
+    data?.members.filter((m) => m.status === "active" || m.status === "invited")
+      .length ?? 0;
+  const totalSeats =
+    teamSubscription?.seats ??
+    proSubscription?.seats ??
+    (isPaidPlan ? null : 1);
+
  const TableRow = ({
    memberPublicId,
    memberId,
@@ -144,8 +165,8 @@ export default function MembersPage() {
                    {memberName}
                  </p>
                </div>
-                {((workspace.role === "admin" ||
-                  data?.showEmailsToMembers === true) ||
+                {(workspace.role === "admin" ||
+                  data?.showEmailsToMembers === true ||
                  showSkeleton) && (
                  <p
                    className={twMerge(
@@ -180,8 +201,7 @@ export default function MembersPage() {
                <div className="relative inline-flex items-center">
                  <span className="inline-flex items-center gap-1 rounded-md bg-emerald-500/10 px-1.5 py-0.5 text-[10px] font-medium text-emerald-400 ring-1 ring-inset ring-emerald-500/20 sm:text-[11px]">
                    {memberRole &&
-                      memberRole.charAt(0).toUpperCase() +
-                        memberRole.slice(1)}
+                      memberRole.charAt(0).toUpperCase() + memberRole.slice(1)}
                    {canEditMember && session?.user.id !== memberId && (
                      <HiChevronDown className="h-3 w-3" />
                    )}
@@ -264,38 +284,42 @@ export default function MembersPage() {
            </h1>
          </div>
          <div className="flex items-center gap-3">
-            {env("NEXT_PUBLIC_KAN_ENV") === "cloud" && (
+            {env("NEXT_PUBLIC_KAN_ENV") === "cloud" && !!data && (
              <>
-                {!proSubscription && !teamSubscription && (
+                {!isPaidPlan && (
                  <Link
-                    href="/settings/workspace?upgrade=pro"
+                    href={`/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/members")}`}
                    className="hidden items-center rounded-full border border-emerald-300 bg-emerald-50 px-3 py-1 text-center text-xs text-emerald-400 dark:border-emerald-700 dark:bg-emerald-950 dark:text-emerald-400 lg:flex"
                  >
                    <HiBolt />
-                    <span className="ml-1 font-medium">
-                      {t`Launch offer: Get unlimited members with Pro`}
-                    </span>
+                    <span className="ml-1 font-medium">{t`Upgrade`}</span>
                  </Link>
                )}
                <div
                  className={twMerge(
                    "flex items-center rounded-full border px-3 py-1 text-center text-xs",
-                    teamSubscription || proSubscription
+                    isPaidPlan
                      ? "border-emerald-300 bg-emerald-50 text-emerald-400 dark:border-emerald-700 dark:bg-emerald-950 dark:text-emerald-400"
                      : "border-light-300 bg-light-50 text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900",
                  )}
                >
                  <span className="font-medium">
-                    {proSubscription
+                    {isProPlan
                      ? t`Pro Plan`
-                      : teamSubscription
+                      : isTeamPlan
                        ? t`Team Plan`
                        : t`Free Plan`}
-                    {proSubscription && unlimitedSeats && (
-                      <span className="ml-1 text-xs">∞</span>
-                    )}
                  </span>
                </div>
+                {isPaidPlan && (unlimitedSeats || totalSeats !== null) && (
+                  <div className="flex items-center rounded-full border border-light-300 bg-light-50 px-3 py-1 text-center text-xs text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900">
+                    <span className="font-medium">
+                      {unlimitedSeats
+                        ? t`Unlimited seats`
+                        : `${activeMembers}/${totalSeats} ${t`seats`}`}
+                    </span>
+                  </div>
+                )}
              </>
            )}
            <Button
@@ -384,10 +408,10 @@ export default function MembersPage() {
            isVisible={isOpen && modalContentType === "INVITE_MEMBER"}
          >
            <InviteMemberForm
-              userId={session?.user.id}
-              numberOfMembers={data?.members.length ?? 1}
              subscriptions={subscriptions}
              unlimitedSeats={unlimitedSeats}
+              memberCount={memberCount}
+              seatLimit={seatLimit}
            />
          </Modal>

--- a/apps/web/src/views/onboarding/select-plan/index.tsx
+++ b/apps/web/src/views/onboarding/select-plan/index.tsx
@@ -1,6 +1,6 @@
 import { useRouter, useSearchParams } from "next/navigation";
-import { t } from "@lingui/core/macro";
 import { Radio, RadioGroup } from "@headlessui/react";
+import { t } from "@lingui/core/macro";
 import { AnimatePresence, motion } from "framer-motion";
 import { useState } from "react";
 import { HiUser } from "react-icons/hi2";
@@ -48,6 +48,11 @@ export default function SelectPlanView() {
    (searchParams.get("billing") as Billing | null) ?? "annual",
  );
  const returnUrl = searchParams.get("returnUrl") ?? "/boards";
+  const workspacePublicId =
+    searchParams.get("workspacePublicId") ??
+    (typeof window !== "undefined"
+      ? localStorage.getItem("workspacePublicId")
+      : null);
  const { data: workspaces } = api.workspace.all.useQuery();
  const { data: session } = authClient.useSession();
  const { data: user } = api.user.getUser.useQuery(undefined, {
@@ -96,18 +101,44 @@ export default function SelectPlanView() {
    },
  ];

+  const buildSelectPlanUrl = (plan: PlanId, b: Billing) => {
+    const base = `/onboarding/select-plan?plan=${plan}&billing=${b}&returnUrl=${encodeURIComponent(returnUrl)}`;
+    return workspacePublicId
+      ? `${base}&workspacePublicId=${workspacePublicId}`
+      : base;
+  };
+
  const handleSelectPlan = (plan: PlanId) => {
    setSelected(plan);
-    router.replace(`/onboarding/select-plan?plan=${plan}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`);
+    router.replace(buildSelectPlanUrl(plan, billing));
  };

  const handleSetBilling = (b: Billing) => {
    setBilling(b);
-    router.replace(`/onboarding/select-plan?plan=${selected}&billing=${b}&returnUrl=${encodeURIComponent(returnUrl)}`);
+    router.replace(buildSelectPlanUrl(selected, b));
  };

-  const handleContinue = () =>
-    router.push(`/onboarding/workspace?plan=${selected}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`);
+  const handleContinue = async () => {
+    if (workspacePublicId && selected !== "solo") {
+      const response = await fetch("/api/stripe/create_checkout_session", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          plan: selected,
+          billing,
+          workspacePublicId,
+          successUrl: returnUrl,
+          cancelUrl: returnUrl,
+        }),
+      });
+      const { url } = (await response.json()) as { url: string };
+      if (url) window.location.href = url;
+      return;
+    }
+    router.push(
+      `/onboarding/workspace?plan=${selected}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`,
+    );
+  };

  const handleCancel = () => router.push(returnUrl);

@@ -209,7 +240,11 @@ export default function SelectPlanView() {
                  {t`Cancel`}
                </Button>
              )}
-              <Button onClick={handleContinue}>{t`Continue`}</Button>
+              <Button onClick={() => void handleContinue()}>
+                {workspacePublicId && selected !== "solo"
+                  ? t`Upgrade`
+                  : t`Continue`}
+              </Button>
            </div>
          </div>

--- a/apps/web/src/views/onboarding/workspace-details/index.tsx
+++ b/apps/web/src/views/onboarding/workspace-details/index.tsx
@@ -39,7 +39,17 @@ export default function WorkspaceNameView() {
  const plan = searchParams.get("plan") ?? "solo";
  const billing = searchParams.get("billing") ?? "annual";
  const returnUrl = searchParams.get("returnUrl") ?? "/boards";
+  const licenseKeyParam = searchParams.get("license_key");
+  const isLicenseFlow =
+    !!licenseKeyParam || searchParams.get("partner") === "1";
  const { showPopup } = usePopup();
+
+  useEffect(() => {
+    if (licenseKeyParam) {
+      localStorage.setItem("partnerLicenseKey", licenseKeyParam);
+    }
+  }, [licenseKeyParam]);
+
  const [isProToggle, setIsProToggle] = useState(plan === "pro");
  const effectivePlan = isProToggle ? "pro" : plan;

@@ -94,7 +104,16 @@ export default function WorkspaceNameView() {
      if (!workspace.publicId) return;
      localStorage.setItem("workspacePublicId", workspace.publicId);
      void utils.workspace.all.invalidate();
-      router.push("/boards");
+      void utils.workspace.hasAvailablePartnerSlot.invalidate();
+      const storedLicenseKey = localStorage.getItem("partnerLicenseKey");
+      if (storedLicenseKey) {
+        localStorage.removeItem("partnerLicenseKey");
+        router.push(
+          `/api/partner/link?license_key=${encodeURIComponent(storedLicenseKey)}`,
+        );
+      } else {
+        router.push("/boards");
+      }
    },
    onError: () => {
      showPopup({
@@ -110,7 +129,7 @@ export default function WorkspaceNameView() {
  const handleContinue = async () => {
    if (!name.trim()) return;

-    if (effectivePlan === "solo") {
+    if (effectivePlan === "solo" || isLicenseFlow) {
      createWorkspace.mutate({
        name: name.trim(),
        ...(description.trim() && { description: description.trim() }),
@@ -193,50 +212,52 @@ export default function WorkspaceNameView() {
                  maxLength={64}
                />

-                <div className="space-y-2">
-                  <Input
-                    placeholder={t`your-workspace`}
-                    value={isProToggle ? slug : t`your-workspace`}
-                    onChange={(e) => {
-                      setSlugManuallyEdited(true);
-                      setSlug(
-                        e.target.value
-                          .toLowerCase()
-                          .replace(/[^a-z0-9\s-]/g, "")
-                          .replace(/\s+/g, "-")
-                          .replace(/-+/g, "-")
-                          .slice(0, 60),
-                      );
-                    }}
-                    disabled={!isProToggle}
-                    prefix="kan.bn/"
-                    className={
-                      !isProToggle ? "cursor-not-allowed opacity-50" : ""
-                    }
-                    errorMessage={slugError}
-                    iconRight={
-                      !isProToggle ? (
-                        <Tooltip
-                          content={
-                            <span className="text-xs">{t`Custom usernames require upgrading to a Pro plan`}</span>
-                          }
-                          placement="top"
-                          delay={0}
-                        >
-                          <HiInformationCircle className="h-4 w-4 leading-[0] text-dark-700 dark:text-dark-700" />
-                        </Tooltip>
-                      ) : isProToggle && slug.length >= 3 ? (
-                        isTyping || slugAvailability.isPending ? (
-                          <LoadingSpinner />
-                        ) : isSlugAvailable ? (
-                          <HiCheck className="h-4 w-4 text-white" />
+                {!isLicenseFlow && (
+                  <div className="space-y-2">
+                    <Input
+                      placeholder={t`your-workspace`}
+                      value={isProToggle ? slug : t`your-workspace`}
+                      onChange={(e) => {
+                        setSlugManuallyEdited(true);
+                        setSlug(
+                          e.target.value
+                            .toLowerCase()
+                            .replace(/[^a-z0-9\s-]/g, "")
+                            .replace(/\s+/g, "-")
+                            .replace(/-+/g, "-")
+                            .slice(0, 60),
+                        );
+                      }}
+                      disabled={!isProToggle}
+                      prefix="kan.bn/"
+                      className={
+                        !isProToggle ? "cursor-not-allowed opacity-50" : ""
+                      }
+                      errorMessage={slugError}
+                      iconRight={
+                        !isProToggle ? (
+                          <Tooltip
+                            content={
+                              <span className="text-xs">{t`Custom usernames require upgrading to a Pro plan`}</span>
+                            }
+                            placement="top"
+                            delay={0}
+                          >
+                            <HiInformationCircle className="h-4 w-4 leading-[0] text-dark-700 dark:text-dark-700" />
+                          </Tooltip>
+                        ) : isProToggle && slug.length >= 3 ? (
+                          isTyping || slugAvailability.isPending ? (
+                            <LoadingSpinner />
+                          ) : isSlugAvailable ? (
+                            <HiCheck className="h-4 w-4 text-white" />
+                          ) : null
                        ) : null
-                      ) : null
-                    }
-                  />
-                </div>
+                      }
+                    />
+                  </div>
+                )}

-                {plan !== "pro" && (
+                {!isLicenseFlow && plan !== "pro" && (
                  <div className="pb-2">
                    <Toggle
                      isChecked={isProToggle}
@@ -265,16 +286,18 @@ export default function WorkspaceNameView() {

            <div className="mt-6 flex flex-wrap items-center justify-between gap-3">
              <div className="ml-auto flex gap-2">
-                <Button
-                  variant="ghost"
-                  onClick={() =>
-                    router.replace(
-                      `/onboarding/select-plan?plan=${effectivePlan}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`,
-                    )
-                  }
-                >
-                  {t`Back`}
-                </Button>
+                {!isLicenseFlow && (
+                  <Button
+                    variant="ghost"
+                    onClick={() =>
+                      router.replace(
+                        `/onboarding/select-plan?plan=${effectivePlan}&billing=${billing}&returnUrl=${encodeURIComponent(returnUrl)}`,
+                      )
+                    }
+                  >
+                    {t`Back`}
+                  </Button>
+                )}
                <Button
                  onClick={() => void handleContinue()}
                  disabled={
--- a/apps/web/src/views/public/board/CardModal.tsx
+++ b/apps/web/src/views/public/board/CardModal.tsx
@@ -95,8 +95,28 @@ export function CardModal({
      <div className="flex h-full w-full flex-col overflow-hidden">
        <div className="h-full p-8">
          <div className="mb-6">
-            <div className="flex w-full items-center justify-between">
-              <div className="absolute right-[2rem] top-[2rem] flex items-center gap-1">
+            <div className="flex w-full items-start justify-between gap-4">
+              <div className="flex-1">
+                {isLoading ? (
+                  <div className="flex space-x-2">
+                    <div className="h-[2.3rem] w-[300px] animate-pulse rounded-[5px] bg-light-300 dark:bg-dark-300" />
+                  </div>
+                ) : (
+                  <>
+                    {data?.cardNumber != null &&
+                      data.list.board.workspace.cardPrefix && (
+                        <span className="mb-1 block text-xs font-medium text-light-700 dark:text-dark-800">
+                          {data.list.board.workspace.cardPrefix}-
+                          {data.cardNumber}
+                        </span>
+                      )}
+                    <h1 className="font-bold leading-[2.3rem] tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
+                      {data?.title}
+                    </h1>
+                  </>
+                )}
+              </div>
+              <div className="flex flex-shrink-0 items-center gap-1">
                <button
                  type="button"
                  onClick={handleCopyCardLink}
@@ -134,17 +154,6 @@ export function CardModal({
                  />
                </button>
              </div>
-              {isLoading ? (
-                <div className="flex space-x-2">
-                  <div className="h-[2.3rem] w-[300px] animate-pulse rounded-[5px] bg-light-300 dark:bg-dark-300" />
-                </div>
-              ) : (
-                <>
-                  <h1 className="pr-8 font-bold leading-[2.3rem] tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem]">
-                    {data?.title}
-                  </h1>
-                </>
-              )}
            </div>
            {labels.length > 0 && (
              <div className="mt-2">
--- a/apps/web/src/views/public/board/index.tsx
+++ b/apps/web/src/views/public/board/index.tsx
@@ -165,7 +165,7 @@ export default function PublicBoardView() {
          <div
            ref={scrollRef}
            onMouseDown={onMouseDown}
-            className="scrollbar-w-none scrollbar-track-rounded-[4px] scrollbar-thumb-rounded-[4px] scrollbar-h-[8px] relative h-full flex-1 overflow-y-hidden overflow-x-scroll overscroll-contain scrollbar scrollbar-track-light-200 scrollbar-thumb-light-400 dark:scrollbar-track-dark-100 dark:scrollbar-thumb-dark-300"
+            className="scrollbar-w-none scrollbar-track-rounded-[4px] scrollbar-thumb-rounded-[4px] scrollbar-h-[8px] relative h-full flex-1 snap-x snap-mandatory scroll-pl-[10px] overflow-y-hidden overflow-x-scroll overscroll-contain scrollbar scrollbar-track-light-200 scrollbar-thumb-light-400 dark:scrollbar-track-dark-100 dark:scrollbar-thumb-dark-300 md:snap-none"
          >
            {isLoading || !router.isReady ? (
              <div className="ml-[2rem] flex">
@@ -188,11 +188,11 @@ export default function PublicBoardView() {
              </div>
            ) : (
              <div className="flex">
-                <div className="min-w-[2rem]" />
+                <div className="min-w-[10px] md:min-w-[2rem]" />
                {data?.lists.map((list) => (
                  <div
                    key={list.publicId}
-                    className="dark-text-dark-1000 mr-5 h-fit min-w-[18rem] max-w-[18rem] rounded-md border border-light-400 bg-light-300 py-2 pl-2 pr-1 text-neutral-900 dark:border-dark-300 dark:bg-dark-100"
+                    className="dark-text-dark-1000 mr-5 h-fit min-w-[18rem] max-w-[18rem] snap-start rounded-md border border-light-400 bg-light-300 py-2 pl-2 pr-1 text-neutral-900 dark:border-dark-300 dark:bg-dark-100 md:snap-align-none"
                  >
                    <div className="flex justify-between">
                      <span className="mb-4 block px-4 pt-1 text-sm font-medium text-neutral-900 dark:text-dark-1000">
@@ -234,7 +234,7 @@ export default function PublicBoardView() {
                    </div>
                  </div>
                ))}
-                <div className="min-w-[0.75rem]" />
+                <div className="min-w-[calc(100vw-18rem)] md:min-w-[0.75rem]" />
              </div>
            )}
          </div>
--- a/apps/web/src/views/settings/AccountSettings.tsx
+++ b/apps/web/src/views/settings/AccountSettings.tsx
@@ -85,17 +85,19 @@ export default function AccountSettings() {
        {isCredentialsEnabled && (
          <div className="mb-8 border-t border-light-300 dark:border-dark-300">
            <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
-              {t`Change Password`}
+              {data?.hasPassword ? t`Change Password` : t`Set Password`}
            </h2>
            <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
-              {t`You are about to change your password.`}
+              {data?.hasPassword
+                ? t`You are about to change your password.`
+                : t`Set a password to enable password-based login.`}
            </p>
            <div className="mt-4">
              <Button
                variant="secondary"
                onClick={() => openModal("CHANGE_PASSWORD")}
              >
-                {t`Change Password`}
+                {data?.hasPassword ? t`Change Password` : t`Set Password`}
              </Button>
            </div>
          </div>
@@ -113,7 +115,7 @@ export default function AccountSettings() {
        modalSize="sm"
        isVisible={isOpen && modalContentType === "CHANGE_PASSWORD"}
      >
-        <ChangePasswordFormConfirmation />
+        <ChangePasswordFormConfirmation hasPassword={data?.hasPassword ?? false} />
      </Modal>

      {/* Global modals */}
--- a/apps/web/src/views/settings/BillingSettings.tsx
+++ b/apps/web/src/views/settings/BillingSettings.tsx
@@ -1,4 +1,6 @@
+import { useRouter } from "next/navigation";
 import { t } from "@lingui/core/macro";
+import { env } from "next-runtime-env";
 import { HiMiniArrowTopRightOnSquare } from "react-icons/hi2";

 import Button from "~/components/Button";
@@ -7,24 +9,49 @@ import Modal from "~/components/modal";
 import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
 import { PageHead } from "~/components/PageHead";
 import { useModal } from "~/providers/modal";
+import { useWorkspace } from "~/providers/workspace";
+import { api } from "~/utils/api";

 export default function BillingSettings() {
  const { modalContentType, isOpen } = useModal();
+  const router = useRouter();
+  const isCloud = env("NEXT_PUBLIC_KAN_ENV") === "cloud";
+  const { workspace } = useWorkspace();
+
+  const { data: workspaceData } = api.workspace.byId.useQuery(
+    { workspacePublicId: workspace.publicId },
+    { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
+  );
+
+  const subscription = workspaceData?.subscriptions.find((s) =>
+    ["active", "trialing", "past_due"].includes(s.status),
+  );
+
+  const planLabel = (() => {
+    if (!subscription) return t`Free (1 member)`;
+    if (subscription.unlimitedSeats) {
+      const name =
+        subscription.plan.charAt(0).toUpperCase() + subscription.plan.slice(1);
+      return `${name} (${t`unlimited members`})`;
+    }
+    if (subscription.seats != null) {
+      const name =
+        subscription.plan.charAt(0).toUpperCase() + subscription.plan.slice(1);
+      return `${name} (${subscription.seats} ${subscription.seats === 1 ? t`member` : t`members`})`;
+    }
+    return (
+      subscription.plan.charAt(0).toUpperCase() + subscription.plan.slice(1)
+    );
+  })();

  const handleOpenBillingPortal = async () => {
    try {
      const response = await fetch("/api/stripe/create_billing_session", {
        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
+        headers: { "Content-Type": "application/json" },
      });
-
      const { url } = (await response.json()) as { url: string };
-
-      if (url) {
-        window.location.href = url;
-      }
+      if (url) window.location.href = url;
    } catch (error) {
      console.error("Error creating billing session:", error);
    }
@@ -34,6 +61,28 @@ export default function BillingSettings() {
    <>
      <PageHead title={t`Settings | Billing`} />

+      <div className="border-t border-light-300 dark:border-dark-300">
+        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
+          {t`Plan`}
+        </h2>
+        <p className="mb-8 text-sm text-neutral-500 dark:text-dark-900">
+          {planLabel}
+        </p>
+        {!subscription && isCloud && (
+          <div className="mb-8">
+            <Button
+              onClick={() =>
+                router.push(
+                  `/upgrade/select-plan?plan=pro&workspacePublicId=${workspace.publicId}&returnUrl=${encodeURIComponent("/settings/billing")}`,
+                )
+              }
+            >
+              {t`Choose plan`}
+            </Button>
+          </div>
+        )}
+      </div>
+
      <div className="mb-8 border-t border-light-300 dark:border-dark-300">
        <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
          {t`Billing`}
--- a/apps/web/src/views/settings/WorkspaceSettings.tsx
+++ b/apps/web/src/views/settings/WorkspaceSettings.tsx
@@ -1,11 +1,6 @@
-import { useRouter } from "next/router";
 import { t } from "@lingui/core/macro";
-import { env } from "next-runtime-env";
-import { useEffect, useState } from "react";
-import { HiBolt } from "react-icons/hi2";

 import type { Subscription } from "@kan/shared/utils";
-import { hasActiveSubscription } from "@kan/shared/utils";

 import Button from "~/components/Button";
 import FeedbackModal from "~/components/FeedbackModal";
@@ -17,43 +12,21 @@ import { useModal } from "~/providers/modal";
 import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 import { DeleteWorkspaceConfirmation } from "./components/DeleteWorkspaceConfirmation";
+import UpdateWeekStartDayForm from "./components/UpdateWeekStartDayForm";
 import UpdateWorkspaceDescriptionForm from "./components/UpdateWorkspaceDescriptionForm";
 import UpdateWorkspaceEmailVisibilityForm from "./components/UpdateWorkspaceEmailVisibilityForm";
 import UpdateWorkspaceNameForm from "./components/UpdateWorkspaceNameForm";
 import UpdateWorkspaceUrlForm from "./components/UpdateWorkspaceUrlForm";
-import UpdateWeekStartDayForm from "./components/UpdateWeekStartDayForm";
-import { UpgradeToProConfirmation } from "./components/UpgradeToProConfirmation";

 export default function WorkspaceSettings() {
  const { modalContentType, openModal, isOpen } = useModal();
  const { workspace } = useWorkspace();
  const { canEditWorkspace } = usePermissions();
-  const router = useRouter();
-  const { data } = api.user.getUser.useQuery();
-  const [hasOpenedUpgradeModal, setHasOpenedUpgradeModal] = useState(false);
-
  const { data: workspaceData } = api.workspace.byId.useQuery(
    { workspacePublicId: workspace.publicId },
    { enabled: !!workspace.publicId && workspace.publicId.length >= 12 },
  );

-  const subscriptions = workspaceData?.subscriptions as
-    | Subscription[]
-    | undefined;
-
-  // Open upgrade modal if upgrade=pro is in URL params
-  useEffect(() => {
-    if (
-      router.query.upgrade === "pro" &&
-      env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-      !hasActiveSubscription(subscriptions, "pro") &&
-      !hasOpenedUpgradeModal
-    ) {
-      openModal("UPGRADE_TO_PRO");
-      setHasOpenedUpgradeModal(true);
-    }
-  }, [router.query.upgrade, subscriptions, openModal, hasOpenedUpgradeModal]);
-
  return (
    <>
      <PageHead title={t`Settings | Workspace`} />
@@ -107,19 +80,6 @@ export default function WorkspaceSettings() {
          disabled={!canEditWorkspace}
        />

-        {env("NEXT_PUBLIC_KAN_ENV") === "cloud" &&
-          !hasActiveSubscription(subscriptions, "pro") &&
-          !hasActiveSubscription(subscriptions, "team") && (
-            <div className="my-8">
-              <Button
-                onClick={() => openModal("UPGRADE_TO_PRO")}
-                iconRight={<HiBolt />}
-              >
-                {t`Upgrade to Pro`}
-              </Button>
-            </div>
-          )}
-
        <div className="border-t border-light-300 dark:border-dark-300">
          <h2 className="mb-4 mt-8 text-[14px] font-bold text-neutral-900 dark:text-dark-1000">
            {t`Delete workspace`}
@@ -146,16 +106,6 @@ export default function WorkspaceSettings() {
      >
        <DeleteWorkspaceConfirmation />
      </Modal>
-      <Modal
-        modalSize="sm"
-        isVisible={isOpen && modalContentType === "UPGRADE_TO_PRO"}
-      >
-        <UpgradeToProConfirmation
-          userId={data?.id ?? ""}
-          workspacePublicId={workspace.publicId}
-        />
-      </Modal>
-
      {/* Global modals */}
      <Modal
        modalSize="md"
--- a/apps/web/src/views/settings/components/Avatar.tsx
+++ b/apps/web/src/views/settings/components/Avatar.tsx
@@ -172,7 +172,7 @@ export default function Avatar({
          method: "POST",
          headers: {
            "Content-Type": blob.type,
-            "x-original-filename": fileName,
+            "x-original-filename": encodeURIComponent(fileName),
          },
          body: blob,
        },
--- a/apps/web/src/views/settings/components/ChangePasswordConfirmation.tsx
+++ b/apps/web/src/views/settings/components/ChangePasswordConfirmation.tsx
@@ -2,7 +2,6 @@ import { useRouter } from "next/navigation";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { t } from "@lingui/core/macro";
 import { useMutation } from "@tanstack/react-query";
-import { env } from "next-runtime-env";
 import { useForm } from "react-hook-form";
 import { z } from "zod";

@@ -14,27 +13,43 @@ import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
 import { api } from "~/utils/api";

-const FormSchema = z
-  .object({
-    currentPassword: z.string().min(1, t`Current password is required`),
+const buildSchema = (hasPassword: boolean) => {
+  const base = z.object({
+    currentPassword: hasPassword
+      ? z.string().min(1, t`Current password is required`)
+      : z.string().optional(),
    newPassword: z
      .string()
      .min(8, t`Password must be at least 8 characters`)
      .min(1, t`New password is required`),
    confirmPassword: z.string().min(1, t`Please confirm your new password`),
-  })
-  .refine((data) => data.newPassword === data.confirmPassword, {
-    message: t`Passwords do not match`,
-    path: ["confirmPassword"],
-  })
-  .refine((data) => data.currentPassword !== data.newPassword, {
-    message: t`New password must be different from current password`,
-    path: ["newPassword"],
  });

-type FormValues = z.infer<typeof FormSchema>;
+  return base
+    .refine((data) => data.newPassword === data.confirmPassword, {
+      message: t`Passwords do not match`,
+      path: ["confirmPassword"],
+    })
+    .refine(
+      (data) => !hasPassword || data.currentPassword !== data.newPassword,
+      {
+        message: t`New password must be different from current password`,
+        path: ["newPassword"],
+      },
+    );
+};

-export function ChangePasswordFormConfirmation() {
+interface FormValues {
+  currentPassword?: string;
+  newPassword: string;
+  confirmPassword: string;
+}
+
+interface Props {
+  hasPassword: boolean;
+}
+
+export function ChangePasswordFormConfirmation({ hasPassword }: Props) {
  const { closeModal } = useModal();
  const { showPopup } = usePopup();
  const router = useRouter();
@@ -47,15 +62,24 @@ export function ChangePasswordFormConfirmation() {
    reset,
    setError,
  } = useForm<FormValues>({
-    resolver: zodResolver(FormSchema),
+    resolver: zodResolver(buildSchema(hasPassword)),
    mode: "onChange",
  });

+  const setPasswordMutation = api.user.setPassword.useMutation();
+
  const changePasswordMutation = useMutation({
    mutationFn: async (data: FormValues) => {
+      if (!hasPassword) {
+        await setPasswordMutation.mutateAsync({
+          newPassword: data.newPassword,
+        });
+        return;
+      }
+
      const response = await authClient.changePassword({
        newPassword: data.newPassword,
-        currentPassword: data.currentPassword,
+        currentPassword: data.currentPassword ?? "",
        revokeOtherSessions: true,
      });

@@ -66,12 +90,18 @@ export function ChangePasswordFormConfirmation() {
    onSuccess: async () => {
      closeModal();
      showPopup({
-        header: t`Password Changed`,
-        message: t`Your password has been changed.`,
+        header: hasPassword ? t`Password Changed` : t`Password Set`,
+        message: hasPassword
+          ? t`Your password has been changed.`
+          : t`Your password has been set.`,
        icon: "success",
      });

-      utils.invalidate();
+      if (!hasPassword) {
+        sessionStorage.removeItem("set_password_prompted");
+      }
+
+      utils.user.getUser.invalidate();
      reset();
      router.push("/");
    },
@@ -86,7 +116,9 @@ export function ChangePasswordFormConfirmation() {
      } else {
        closeModal();
        showPopup({
-          header: t`Error Changing Password`,
+          header: hasPassword
+            ? t`Error Changing Password`
+            : t`Error Setting Password`,
          message: t`An unexpected error occurred. Please try again later.`,
          icon: "error",
        });
@@ -106,27 +138,33 @@ export function ChangePasswordFormConfirmation() {
  return (
    <div className="p-5">
      <div className="flex w-full flex-col justify-between pb-4">
-        <h2 className="text-md pb-4 font-medium dark:text-white">{t`Change Password`}</h2>
+        <h2 className="pb-4 text-base font-medium dark:text-white">
+          {hasPassword ? t`Change Password` : t`Set Password`}
+        </h2>
        <p className="mb-4 text-sm text-light-900">
-          {t`Enter your current password and choose a new secure password.`}
+          {hasPassword
+            ? t`Enter your current password and choose a new secure password.`
+            : t`You signed in without a password. Set a password to enable password-based login.`}
        </p>
      </div>

      <form onSubmit={handleSubmit(onSubmit)}>
        <div className="space-y-2">
-          <div>
-            <Input
-              id="currentPassword"
-              type="password"
-              {...register("currentPassword")}
-              placeholder={t`Enter your current password`}
-            />
-            {errors.currentPassword && (
-              <p className="mt-2 text-xs text-red-400">
-                {errors.currentPassword.message}
-              </p>
-            )}
-          </div>
+          {hasPassword && (
+            <div>
+              <Input
+                id="currentPassword"
+                type="password"
+                {...register("currentPassword")}
+                placeholder={t`Enter your current password`}
+              />
+              {errors.currentPassword && (
+                <p className="mt-2 text-xs text-red-400">
+                  {errors.currentPassword.message}
+                </p>
+              )}
+            </div>
+          )}

          <div>
            <Input
@@ -175,7 +213,7 @@ export function ChangePasswordFormConfirmation() {
            fullWidth
            size="lg"
          >
-            {t`Change Password`}
+            {hasPassword ? t`Change Password` : t`Set Password`}
          </Button>
        </div>
      </form>
--- a/apps/web/src/views/settings/components/DeleteWebhookConfirmation.tsx
+++ b/apps/web/src/views/settings/components/DeleteWebhookConfirmation.tsx
@@ -13,20 +13,29 @@ interface DeleteWebhookConfirmationProps {
 export function DeleteWebhookConfirmation({
  workspacePublicId,
 }: DeleteWebhookConfirmationProps) {
-  const { closeModal, entityId: webhookPublicId, entityLabel: webhookName } = useModal();
+  const {
+    closeModal,
+    entityId: webhookPublicId,
+    entityLabel: webhookName,
+  } = useModal();
  const { showPopup } = usePopup();
  const utils = api.useUtils();

  const deleteWebhookMutation = api.webhook.delete.useMutation({
    onSuccess: () => {
      void utils.webhook.list.invalidate({ workspacePublicId });
-      showPopup({ message: t`Webhook deleted successfully`, type: "success" });
+      showPopup({
+        header: t`Webhook deleted`,
+        message: t`Webhook deleted successfully`,
+        icon: "success",
+      });
      closeModal();
    },
    onError: (error) => {
      showPopup({
+        header: t`Unable to delete webhook`,
        message: error.message || t`Failed to delete webhook`,
-        type: "error",
+        icon: "error",
      });
    },
  });
@@ -35,7 +44,7 @@ export function DeleteWebhookConfirmation({
    if (!webhookPublicId) return;
    deleteWebhookMutation.mutate({
      workspacePublicId,
-      webhookPublicId: webhookPublicId as string,
+      webhookPublicId: webhookPublicId,
    });
  };

--- a/apps/web/src/views/settings/components/NewWebhookModal.tsx
+++ b/apps/web/src/views/settings/components/NewWebhookModal.tsx
@@ -44,7 +44,12 @@ export function NewWebhookModal({
  workspacePublicId,
  isEdit = false,
 }: NewWebhookModalProps) {
-  const { closeModal, entityId: webhookPublicId, getModalState, clearModalState } = useModal();
+  const {
+    closeModal,
+    entityId: webhookPublicId,
+    getModalState,
+    clearModalState,
+  } = useModal();
  const { showPopup } = usePopup();
  const [isTestingWebhook, setIsTestingWebhook] = useState(false);

@@ -101,13 +106,18 @@ export function NewWebhookModal({
  const createWebhookMutation = api.webhook.create.useMutation({
    onSuccess: () => {
      void utils.webhook.list.invalidate({ workspacePublicId });
-      showPopup({ message: t`Webhook created successfully`, type: "success" });
+      showPopup({
+        header: t`Webhook created`,
+        message: t`Webhook created successfully`,
+        icon: "success",
+      });
      closeModal();
    },
    onError: (error) => {
      showPopup({
+        header: t`Unable to create webhook`,
        message: error.message || t`Failed to create webhook`,
-        type: "error",
+        icon: "error",
      });
    },
  });
@@ -115,13 +125,18 @@ export function NewWebhookModal({
  const updateWebhookMutation = api.webhook.update.useMutation({
    onSuccess: () => {
      void utils.webhook.list.invalidate({ workspacePublicId });
-      showPopup({ message: t`Webhook updated successfully`, type: "success" });
+      showPopup({
+        header: t`Webhook updated`,
+        message: t`Webhook updated successfully`,
+        icon: "success",
+      });
      closeModal();
    },
    onError: (error) => {
      showPopup({
+        header: t`Unable to update webhook`,
        message: error.message || t`Failed to update webhook`,
-        type: "error",
+        icon: "error",
      });
    },
  });
@@ -129,19 +144,25 @@ export function NewWebhookModal({
  const testWebhookMutation = api.webhook.test.useMutation({
    onSuccess: (result) => {
      if (result.success) {
-        showPopup({ message: t`Test webhook sent successfully!`, type: "success" });
+        showPopup({
+          header: t`Test sent`,
+          message: t`Test webhook sent successfully!`,
+          icon: "success",
+        });
      } else {
        showPopup({
+          header: t`Test failed`,
          message: result.error || t`Webhook test failed`,
-          type: "error",
+          icon: "error",
        });
      }
      setIsTestingWebhook(false);
    },
    onError: (error) => {
      showPopup({
+        header: t`Unable to test webhook`,
        message: error.message || t`Failed to test webhook`,
-        type: "error",
+        icon: "error",
      });
      setIsTestingWebhook(false);
    },
@@ -151,7 +172,7 @@ export function NewWebhookModal({
    if (isEdit && webhookPublicId) {
      updateWebhookMutation.mutate({
        workspacePublicId,
-        webhookPublicId: webhookPublicId as string,
+        webhookPublicId: webhookPublicId,
        name: data.name,
        url: data.url,
        secret: data.secret || undefined,
@@ -174,11 +195,12 @@ export function NewWebhookModal({
    setIsTestingWebhook(true);
    testWebhookMutation.mutate({
      workspacePublicId,
-      webhookPublicId: webhookPublicId as string,
+      webhookPublicId: webhookPublicId,
    });
  };

-  const isPending = createWebhookMutation.isPending || updateWebhookMutation.isPending;
+  const isPending =
+    createWebhookMutation.isPending || updateWebhookMutation.isPending;

  return (
    <form onSubmit={handleSubmit(onSubmit)}>
@@ -231,7 +253,11 @@ export function NewWebhookModal({
            <Input
              id="secret"
              type="password"
-              placeholder={isEdit ? t`Enter new secret to update` : t`HMAC secret for signature verification`}
+              placeholder={
+                isEdit
+                  ? t`Enter new secret to update`
+                  : t`HMAC secret for signature verification`
+              }
              {...register("secret")}
              errorMessage={errors.secret?.message}
            />
@@ -252,7 +278,7 @@ export function NewWebhookModal({
                  {webhookEvents.map((event) => (
                    <label
                      key={event}
-                      className="flex items-center space-x-2 cursor-pointer"
+                      className="flex cursor-pointer items-center space-x-2"
                    >
                      <input
                        type="checkbox"
@@ -262,11 +288,11 @@ export function NewWebhookModal({
                            field.onChange([...field.value, event]);
                          } else {
                            field.onChange(
-                              field.value.filter((v) => v !== event)
+                              field.value.filter((v) => v !== event),
                            );
                          }
                        }}
-                        className="h-4 w-4 rounded border-light-400 text-primary-600 focus:ring-primary-500 dark:border-dark-400"
+                        className="text-primary-600 focus:ring-primary-500 h-4 w-4 rounded border-light-400 dark:border-dark-400"
                      />
                      <span className="text-sm text-light-900 dark:text-dark-900">
                        {event}
@@ -277,17 +303,19 @@ export function NewWebhookModal({
              )}
            />
            {errors.events && (
-              <p className="mt-1 text-xs text-red-500">{errors.events.message}</p>
+              <p className="mt-1 text-xs text-red-500">
+                {errors.events.message}
+              </p>
            )}
          </div>

          {isEdit && (
            <div>
-              <label className="flex items-center space-x-2 cursor-pointer">
+              <label className="flex cursor-pointer items-center space-x-2">
                <input
                  type="checkbox"
                  {...register("active")}
-                  className="h-4 w-4 rounded border-light-400 text-primary-600 focus:ring-primary-500 dark:border-dark-400"
+                  className="text-primary-600 focus:ring-primary-500 h-4 w-4 rounded border-light-400 dark:border-dark-400"
                />
                <span className="text-sm text-light-900 dark:text-dark-900">
                  {t`Active`}
--- a/apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx
+++ b/apps/web/src/views/settings/components/UpdateWeekStartDayForm.tsx
@@ -36,7 +36,7 @@ export default function UpdateWeekStartDayForm({
    setValue(newValue);
    updateWorkspace.mutate({
      workspacePublicId,
-      weekStartDay: newValue,
+      weekStartDay: newValue as 0 | 1 | 6,
    });
  };

--- a/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
+++ b/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
@@ -20,7 +20,7 @@ const UpdateWorkspaceUrlForm = ({
 }: {
  workspacePublicId: string;
  workspaceUrl: string;
-  workspacePlan: "free" | "pro" | "enterprise";
+  workspacePlan: "free" | "team" | "pro" | "enterprise";
  disabled?: boolean;
 }) => {
  const utils = api.useUtils();
--- a/apps/web/src/views/settings/components/WebhookList.tsx
+++ b/apps/web/src/views/settings/components/WebhookList.tsx
@@ -171,18 +171,20 @@ export default function WebhookList({ workspacePublicId }: WebhookListProps) {
  const testWebhookMutation = api.webhook.test.useMutation({
    onSuccess: (result) => {
      if (result.success) {
-        showPopup({ message: t`Test webhook sent successfully!`, type: "success" });
+        showPopup({ header: t`Test sent`, message: t`Test webhook sent successfully!`, icon: "success" });
      } else {
        showPopup({
+          header: t`Test failed`,
          message: result.error || t`Webhook test failed`,
-          type: "error",
+          icon: "error",
        });
      }
    },
    onError: (error) => {
      showPopup({
+        header: t`Unable to test webhook`,
        message: error.message || t`Failed to test webhook`,
-        type: "error",
+        icon: "error",
      });
    },
  });
--- a/cloud/docker-compose.yml
+++ b/cloud/docker-compose.yml
@@ -61,9 +61,9 @@ services:
      - SMTP_REJECT_UNAUTHORIZED=${SMTP_REJECT_UNAUTHORIZED}

      # Notifications
-      - NOVU_API_KEY=${NOVU_API_KEY}
-      - DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL}
-      - EMAIL_UNSUBSCRIBE_SECRET=${EMAIL_UNSUBSCRIBE_SECRET}
+      - SUBSCRIBER_API_URL=${SUBSCRIBER_API_URL}
+      - SUBSCRIBER_API_KEY=${SUBSCRIBER_API_KEY}
+      - SUBSCRIBER_ENVIRONMENT_ID=${SUBSCRIBER_ENVIRONMENT_ID}

      # S3 storage
      - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
@@ -99,6 +99,19 @@ services:
      - NEXT_PUBLIC_UMAMI_ID=${NEXT_PUBLIC_UMAMI_ID}
      - NEXT_PUBLIC_POSTHOG_KEY=${NEXT_PUBLIC_POSTHOG_KEY}
      - NEXT_PUBLIC_POSTHOG_HOST=${NEXT_PUBLIC_POSTHOG_HOST}
+
+      # Partner config (optional)
+      - NEXT_PUBLIC_PARTNER_NAME=${NEXT_PUBLIC_PARTNER_NAME}
+      - PARTNER_CLIENT_ID=${PARTNER_CLIENT_ID}
+      - PARTNER_CLIENT_SECRET=${PARTNER_CLIENT_SECRET}
+      - PARTNER_REDIRECT_URL=${PARTNER_REDIRECT_URL}
+      - PARTNER_TOKEN_URL=${PARTNER_TOKEN_URL}
+      - PARTNER_OAUTH_LICENSE_URL=${PARTNER_OAUTH_LICENSE_URL}
+      - PARTNER_LICENSE_API_URL=${PARTNER_LICENSE_API_URL}
+      - PARTNER_API_KEY=${PARTNER_API_KEY}
+      - PARTNER_API_KEY_HEADER=${PARTNER_API_KEY_HEADER}
+      - PARTNER_SIGNATURE_HEADER=${PARTNER_SIGNATURE_HEADER}
+      - PARTNER_TIMESTAMP_HEADER=${PARTNER_TIMESTAMP_HEADER}
    depends_on:
      migrator:
        condition: service_completed_successfully
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -5,36 +5,40 @@
  "type": "module",
  "exports": {
    ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./src/index.ts",
      "default": "./src/index.ts"
    },
    "./root": {
-      "types": "./dist/root.d.ts",
+      "types": "./src/root.ts",
      "default": "./src/root.ts"
    },
    "./trpc": {
-      "types": "./dist/trpc.d.ts",
+      "types": "./src/trpc.ts",
      "default": "./src/trpc.ts"
    },
    "./types": {
-      "types": "./dist/types.d.ts",
+      "types": "./src/types/router.types.ts",
      "default": "./src/types/router.types.ts"
    },
    "./openapi": {
-      "types": "./dist/openapi.d.ts",
+      "types": "./src/openapi.ts",
      "default": "./src/openapi.ts"
    },
    "./utils/rateLimit": {
-      "types": "./dist/utils/rateLimit.d.ts",
+      "types": "./src/utils/rateLimit.ts",
      "default": "./src/utils/rateLimit.ts"
    },
    "./utils/apiLogging": {
-      "types": "./dist/utils/apiLogging.d.ts",
+      "types": "./src/utils/apiLogging.ts",
      "default": "./src/utils/apiLogging.ts"
    },
    "./utils/permissions": {
-      "types": "./dist/utils/permissions.d.ts",
+      "types": "./src/utils/permissions.ts",
      "default": "./src/utils/permissions.ts"
+    },
+    "./utils/workspace": {
+      "types": "./src/utils/workspace.ts",
+      "default": "./src/utils/workspace.ts"
    }
  },
  "license": "GPL-3.0",
--- a/packages/api/src/routers/board-move.test.ts
+++ b/packages/api/src/routers/board-move.test.ts
@@ -0,0 +1,268 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { TRPCError } from "@trpc/server";
+
+// Mock all imports used by board.ts before importing the router
+vi.mock("@kan/db/repository/board.repo", () => ({
+  getBoardForMove: vi.fn(),
+  isBoardSlugAvailable: vi.fn(),
+  moveToWorkspace: vi.fn(),
+  getIdByPublicId: vi.fn(),
+  getByPublicId: vi.fn(),
+  getWithListIdsByPublicId: vi.fn(),
+  getWithLatestListIndexByPublicId: vi.fn(),
+  getWorkspaceAndBoardIdByBoardPublicId: vi.fn(),
+  create: vi.fn(),
+  update: vi.fn(),
+  updatePositions: vi.fn(),
+  archive: vi.fn(),
+  deleteBoard: vi.fn(),
+  getAllByWorkspaceId: vi.fn(),
+  createFavorite: vi.fn(),
+  deleteFavorite: vi.fn(),
+  getFavorite: vi.fn(),
+}));
+
+vi.mock("@kan/db/repository/workspace.repo", () => ({
+  getByPublicId: vi.fn(),
+}));
+
+vi.mock("@kan/db/repository/card.repo", () => ({
+  getByPublicId: vi.fn(),
+  create: vi.fn(),
+  update: vi.fn(),
+}));
+
+vi.mock("@kan/db/repository/cardActivity.repo", () => ({
+  create: vi.fn(),
+}));
+
+vi.mock("@kan/db/repository/label.repo", () => ({
+  create: vi.fn(),
+  getById: vi.fn(),
+  getByPublicId: vi.fn(),
+}));
+
+vi.mock("@kan/db/repository/list.repo", () => ({
+  create: vi.fn(),
+  getByPublicId: vi.fn(),
+}));
+
+vi.mock("../utils/permissions", () => ({
+  assertCanEdit: vi.fn(),
+  assertCanDelete: vi.fn(),
+  assertPermission: vi.fn(),
+}));
+
+vi.mock("@kan/shared/utils", () => ({
+  generateSlug: vi.fn((name: string) => name.toLowerCase().replace(/\s+/g, "-")),
+  generateUID: vi.fn(() => "abc123"),
+  generateAvatarUrl: vi.fn(),
+  convertDueDateFiltersToRanges: vi.fn(),
+}));
+
+vi.mock("@kan/shared/constants", () => ({
+  colours: [],
+}));
+
+import * as boardRepo from "@kan/db/repository/board.repo";
+import * as workspaceRepo from "@kan/db/repository/workspace.repo";
+import { assertCanEdit, assertPermission } from "../utils/permissions";
+
+const mockGetBoardForMove = boardRepo.getBoardForMove as ReturnType<typeof vi.fn>;
+const mockIsBoardSlugAvailable = boardRepo.isBoardSlugAvailable as ReturnType<typeof vi.fn>;
+const mockMoveToWorkspace = boardRepo.moveToWorkspace as ReturnType<typeof vi.fn>;
+const mockWorkspaceGetByPublicId = workspaceRepo.getByPublicId as ReturnType<typeof vi.fn>;
+const mockAssertCanEdit = assertCanEdit as ReturnType<typeof vi.fn>;
+const mockAssertPermission = assertPermission as ReturnType<typeof vi.fn>;
+
+describe("board.move", () => {
+  const mockDb = {} as never;
+  const mockUser = { id: "user-123", name: "Test User", email: "test@example.com" };
+  const mockInput = {
+    boardPublicId: "brd-123456789",
+    targetWorkspacePublicId: "ws-target-789",
+  };
+  const mockBoard = {
+    id: 1,
+    name: "My Board",
+    slug: "my-board",
+    type: "board" as const,
+    isArchived: false,
+    workspaceId: 10,
+    createdBy: "user-123",
+  };
+  const mockTargetWorkspace = { id: 20, publicId: "ws-target-789" };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockAssertCanEdit.mockResolvedValue(undefined);
+    mockAssertPermission.mockResolvedValue(undefined);
+  });
+
+  it("throws UNAUTHORIZED when user is not authenticated", async () => {
+    const { boardRouter } = await import("./board");
+    const ctx = { user: null, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("throws NOT_FOUND when board does not exist", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(null);
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("throws BAD_REQUEST for template boards", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce({ ...mockBoard, type: "template" });
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("throws BAD_REQUEST for archived boards", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce({ ...mockBoard, isArchived: true });
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("checks board:edit permission on source workspace", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockAssertCanEdit.mockRejectedValueOnce(
+      new TRPCError({ code: "FORBIDDEN", message: "No permission" }),
+    );
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+
+    expect(mockAssertCanEdit).toHaveBeenCalledWith(
+      mockDb,
+      mockUser.id,
+      mockBoard.workspaceId,
+      "board:edit",
+      mockBoard.createdBy,
+    );
+  });
+
+  it("throws NOT_FOUND when target workspace does not exist", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockWorkspaceGetByPublicId.mockResolvedValueOnce(null);
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("throws NOT_FOUND when target workspace is soft-deleted", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockWorkspaceGetByPublicId.mockResolvedValueOnce({
+      ...mockTargetWorkspace,
+      deletedAt: new Date(),
+    });
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("throws BAD_REQUEST when target is the same workspace", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockWorkspaceGetByPublicId.mockResolvedValueOnce({
+      id: mockBoard.workspaceId,
+      publicId: "ws-target-789",
+    });
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+  });
+
+  it("checks board:create permission on target workspace", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockWorkspaceGetByPublicId.mockResolvedValueOnce(mockTargetWorkspace);
+    mockAssertPermission.mockRejectedValueOnce(
+      new TRPCError({ code: "FORBIDDEN", message: "No permission" }),
+    );
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await expect(
+      boardRouter.createCaller(ctx).move(mockInput),
+    ).rejects.toThrow(TRPCError);
+
+    expect(mockAssertPermission).toHaveBeenCalledWith(
+      mockDb,
+      mockUser.id,
+      mockTargetWorkspace.id,
+      "board:create",
+    );
+  });
+
+  it("appends UID suffix when slug conflicts in target workspace", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockWorkspaceGetByPublicId.mockResolvedValueOnce(mockTargetWorkspace);
+    mockIsBoardSlugAvailable.mockResolvedValueOnce(false);
+    mockMoveToWorkspace.mockResolvedValueOnce(undefined);
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    await boardRouter.createCaller(ctx).move(mockInput);
+
+    expect(mockMoveToWorkspace).toHaveBeenCalledWith(
+      mockDb,
+      mockBoard.id,
+      mockTargetWorkspace.id,
+      "my-board-abc123",
+    );
+  });
+
+  it("moves board successfully with available slug", async () => {
+    const { boardRouter } = await import("./board");
+    mockGetBoardForMove.mockResolvedValueOnce(mockBoard);
+    mockWorkspaceGetByPublicId.mockResolvedValueOnce(mockTargetWorkspace);
+    mockIsBoardSlugAvailable.mockResolvedValueOnce(true);
+    mockMoveToWorkspace.mockResolvedValueOnce(undefined);
+
+    const ctx = { user: mockUser, db: mockDb } as never;
+
+    const result = await boardRouter.createCaller(ctx).move(mockInput);
+
+    expect(result).toEqual({ success: true });
+    expect(mockMoveToWorkspace).toHaveBeenCalledWith(
+      mockDb,
+      mockBoard.id,
+      mockTargetWorkspace.id,
+      "my-board",
+    );
+  });
+});
--- a/packages/api/src/routers/board.ts
+++ b/packages/api/src/routers/board.ts
@@ -644,6 +644,119 @@ export const boardRouter = createTRPCRouter({
        }
      }

+      return { success: true };
+    }),
+  move: protectedProcedure
+    .meta({
+      openapi: {
+        method: "POST",
+        path: "/boards/{boardPublicId}/move",
+        summary: "Move board to another workspace",
+        description:
+          "Moves a board and all its contents to a different workspace",
+        tags: ["Boards"],
+        protect: true,
+      },
+    })
+    .input(
+      z.object({
+        boardPublicId: z.string().min(12),
+        targetWorkspacePublicId: z.string().min(12),
+      }),
+    )
+    .output(z.object({ success: z.boolean() }))
+    .mutation(async ({ ctx, input }) => {
+      const userId = ctx.user?.id;
+
+      if (!userId)
+        throw new TRPCError({
+          message: `User not authenticated`,
+          code: "UNAUTHORIZED",
+        });
+
+      // Get source board
+      const board = await boardRepo.getBoardForMove(
+        ctx.db,
+        input.boardPublicId,
+      );
+
+      if (!board)
+        throw new TRPCError({
+          message: `Board with public ID ${input.boardPublicId} not found`,
+          code: "NOT_FOUND",
+        });
+
+      if (board.type === "template")
+        throw new TRPCError({
+          message: `Templates cannot be moved between workspaces`,
+          code: "BAD_REQUEST",
+        });
+
+      if (board.isArchived)
+        throw new TRPCError({
+          message: `Archived boards cannot be moved. Unarchive the board first.`,
+          code: "BAD_REQUEST",
+        });
+
+      // Check permission to edit board in source workspace
+      await assertCanEdit(
+        ctx.db,
+        userId,
+        board.workspaceId,
+        "board:edit",
+        board.createdBy ?? null,
+      );
+
+      // Get target workspace. workspaceRepo.getByPublicId does not yet
+      // filter soft-deleted workspaces (legacy: same is true for several
+      // peer callers); guard at this call site so we never move a board
+      // into a tombstoned workspace. A wider fix to make the repo treat
+      // deleted-as-not-found is a separate concern.
+      const targetWorkspace = await workspaceRepo.getByPublicId(
+        ctx.db,
+        input.targetWorkspacePublicId,
+      );
+
+      if (!targetWorkspace || targetWorkspace.deletedAt)
+        throw new TRPCError({
+          message: `Target workspace not found`,
+          code: "NOT_FOUND",
+        });
+
+      if (targetWorkspace.id === board.workspaceId)
+        throw new TRPCError({
+          message: `Board is already in this workspace`,
+          code: "BAD_REQUEST",
+        });
+
+      // Check permission to create boards in target workspace
+      await assertPermission(
+        ctx.db,
+        userId,
+        targetWorkspace.id,
+        "board:create",
+      );
+
+      let slug = board.slug ?? generateSlug(board.name);
+
+      const isSlugAvailable = await boardRepo.isBoardSlugAvailable(
+        ctx.db,
+        slug,
+        targetWorkspace.id,
+      );
+
+      if (!isSlugAvailable) {
+        slug = `${slug}-${generateUID()}`;
+      }
+
+      // Move the board
+      await boardRepo.moveToWorkspace(
+        ctx.db,
+        board.id,
+        targetWorkspace.id,
+        slug,
+      );
+
      return { success: true };
    }),
  checkSlugAvailability: publicProcedure
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shiyue	994bf5c7e0	fix: correct webhook translation Some checks failed Translate / translate (push) Has been cancelled Details	2026-08-23 15:25:02 +08:00
shiyue	61123f708d	fix: complete Chinese frontend localization	2026-08-23 15:05:45 +08:00
shiyue	5a8a478386	feat: add Chinese translations	2026-08-23 11:58:02 +08:00
hjball	02b367fcaa	chore: update translations	2026-08-12 20:12:18 +00:00
Henry	f9aaebc4b5	fix: prevent maximum update depth exceeded error (#549 )	2026-08-12 21:11:05 +01:00
hjball	56af094c50	chore: update translations	2026-08-08 12:38:59 +00:00
Henry	e9ebd06eaa	feat(cloud): replace novu for all notification triggers	2026-08-08 13:37:51 +01:00
Henry	b4e9dd3811	feat(cloud): sync subscriber preferences on unsubscribe	2026-08-03 11:53:29 +01:00
Henry	d6aa82e070	feat(cloud): create subscribers	2026-07-31 16:25:25 +01:00
Henry	4291d7bc8c	chore: add scripts to gitignore	2026-07-29 12:58:06 +01:00
hjball	5c72968d44	chore: update translations	2026-07-29 11:50:09 +00:00
Henry	5b586f4871	fix(cloud): default to active workspace on upgrade path	2026-07-29 12:49:00 +01:00
Andrey O	fee82e5e73	fix(mcp): map card.comment content field for Kan API (#540 ) The MCP add_card_comment and update_card_comment tools send `{ content }` to Kan API, but the API expects `{ comment }`. This causes a 400 Bad Request ("comment: Required") when trying to add or update card comments. Fixed by mapping `{ comment: content }` in both tool handlers. Co-authored-by: Craft Agent <agents-noreply@craft.do>	2026-07-27 21:18:55 +01:00
hjball	03a043784a	chore: update translations	2026-07-27 20:16:05 +00:00
Anatoly Rubinshteyn	395dbfae04	fix(editor): guard tippy instance in suggestion handlers (#543 ) The popup variable stays undefined when onStart bails out early because props.clientRect is missing, so popup[0] throws instead of no-oping. Use optional chaining on the array itself.	2026-07-27 21:14:51 +01:00
hjball	9ec4bedd9a	chore: compile translations	2026-07-08 09:55:44 +00:00
hjball	ca694595c7	chore: update translations	2026-07-08 09:55:40 +00:00
Henry	0500d5171d	feat: allow submitting comments via keyboard shortcut (#533 )	2026-07-08 10:54:16 +01:00
hjball	a15e193f66	chore: update translations	2026-06-30 11:00:57 +00:00
Henry	019ecbc364	fix: correct template creation condition in BoardDropdown (#529 )	2026-06-30 11:59:43 +01:00
hjball	82b2b4a8e1	chore: compile translations	2026-06-30 10:21:13 +00:00
hjball	c1adb2d4dd	chore: update translations	2026-06-30 10:21:09 +00:00
Nick Meinhold	25ed4e39b3	feat: move boards between workspaces (#458 ) * feat: add ability to move boards between workspaces Implements the "Move to workspace" feature (#344) allowing users to relocate a board and all its contents (lists, cards, labels, checklists, comments, activity) to a different workspace. Key design decisions: - Card member assignments are cleared on move (they reference workspace-scoped members that may not exist in the target workspace) - Comments and activity history are preserved (they reference global user IDs, not workspace members) - Slug conflicts in the target workspace are auto-resolved by appending a UID suffix - Permission model: requires board:edit in source workspace and board:create in target workspace - Templates and archived boards cannot be moved Co-Authored-By: Claude <noreply@anthropic.com> * refactor: consolidate board queries in move mutation Address review feedback: - Consolidate 3 separate board queries into a single findFirst() that fetches all needed fields (id, name, slug, type, isArchived, workspaceId, createdBy) - Fix slug fallback to use board.name instead of publicId for human-readable URLs Co-Authored-By: Claude <noreply@anthropic.com> * fix: filter guest workspaces from move board destination list Guests typically lack board:create permission in the target workspace, so showing them as destinations leads to a confusing server rejection. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * refactor: extract getBoardForMove repo function Moves the inline board query from the move mutation into the repo layer, consistent with how every other board mutation fetches data. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * test: add unit tests for board.move mutation 10 test cases covering auth, validation, permissions, slug conflict resolution, and the happy path. Follows webhook.test.ts patterns. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: mark locale files as linguist-generated GitHub will now auto-collapse compiled translation files (messages.json, messages.ts, messages.po) in PR diffs and exclude them from language stats. This makes PRs that touch i18n strings much easier to review. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: remove locale file changes from PR Reverts locale file diffs and .gitattributes to match main, per review feedback. The locale changes were unrelated translation updates that inflated the PR diff. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * chore: remove locale file changes from PR Per @hjball's review: locale compilation/translations are handled automatically on merge to main, so this PR shouldn't carry them. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: align locale files with upstream/main Previous removal commit used local main, which had drifted from upstream. Re-syncing to upstream/main so the PR carries no locale diff. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(board-move): tighten deletedAt handling per review Three changes addressing @hjball's review comments, all about the schema treating deletedAt as optional metadata while the move-board flow needs it as a load-bearing invariant. 1. getBoardForMove now filters isNull(deletedAt). Moving a tombstoned board has no defensible semantics. Replaces the implicit "the board exists in the table" check with an explicit "the board is not soft-deleted" check. 2. Move-flow's clearing of cardToWorkspaceMembers now spans every card under every list ever associated with this board, including soft-deleted ones. If we leave member assignments on a deleted card and that card is later restored, the assignments would resurrect rogue references to workspace members from the OLD workspace. Removed the isNull filters on both lists and cards in that loop. 3. Move-flow now refuses to move into a soft-deleted target workspace. workspaceRepo.getByPublicId did not previously project deletedAt; extended its column selection so the call-site guard in board.move can check it. (A wider fix to make the repo treat deleted-as-not-found across all 14+ callers is left for a separate PR — narrow scope here.) Plus one regression test: throws NOT_FOUND when target workspace is soft-deleted. All 11 board-move tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>	2026-06-30 11:19:39 +01:00
Henry	a994c061ac	fix: prevent cross-tenant comment deletion and edit	2026-06-25 17:11:08 +01:00
Henry	6e1d821b35	fix: list dnd when board exceeds viewport width (#526 )	2026-06-25 17:00:07 +01:00
Henry	120504ab58	feat: tweak mobile list snapping	2026-06-25 16:38:13 +01:00
Max K.	ebb19584a2	feat: add mobile list snap scrolling (#510 )	2026-06-25 16:05:27 +01:00
hjball	410f4c481e	chore: update translations	2026-06-25 15:01:34 +00:00
JayDataEngineer	9d7a82d381	fix: sync Editor editable state with readOnly prop (#523 ) The rich-text Editor (used for card descriptions) creates its Tiptap instance once via useEditor with an empty dependency array. This means the initial value of `editable: !readOnly` is captured at mount time and never updated, and the onChange/onBlur callbacks are frozen as the first-render closures. In CardPage, the description Editor mounts as soon as the card query resolves but before the permissions query resolves, so `readOnly` is `true` and onChange/onBlur are `undefined` at that moment. When permissions resolve a moment later and `canEdit` flips to `true`, the Editor never becomes editable — leaving the description stuck read-only even for workspace admins. Fix mirrors the existing pattern in PlainTextEditor.tsx: - Use refs for onChange/onBlur so the editor reads the latest values - Add a useEffect that calls editor.setEditable(!readOnly) when the readOnly prop changes Co-authored-by: Jay <CodeEngineering@pm.me>	2026-06-25 16:00:13 +01:00
hjball	f369ebeaa8	chore: compile translations	2026-06-11 15:45:43 +00:00
hajorappe	0fbe198fa2	fix: improve German translations in /de/messages.json (#514 ) Improved German translations for better readability.	2026-06-11 16:44:09 +01:00
Morfixx	81b67df9e3	feat: kan mcp server (#485 ) * feat: kan mcp server initial attempt * fix: card was missing options and added default fallbacks * fix: label creating with better information for colors and presets	2026-06-10 09:10:22 +01:00
Henry	4f3b49716d	chore: improve contribution guidelines and add PR template	2026-06-09 15:30:59 +01:00
Henry	1347cc562c	fix: encode attachment filename header to support non-ASCII characters (#519 )	2026-06-09 12:16:51 +01:00
Henry	2893e95597	fix(cloud): free partner subscription slot when workspace is deleted	2026-05-31 21:21:36 +01:00
Henry	89654c20b0	fix(partner): scope auto-claim to owned workspaces and guard against active subs	2026-05-30 12:51:21 +01:00
hjball	4442e67832	chore: update translations	2026-05-29 22:53:24 +00:00
Henry	d7e8b5ae6b	feat: reset checklist items to default when duplicating	2026-05-29 23:51:48 +01:00
Henry	03e1e19464	fix: ensure upgrade/downgrade paths for migrate requests	2026-05-29 23:48:01 +01:00
hjball	a3353acf44	chore: compile translations	2026-05-29 22:29:11 +00:00
hjball	a4a807ed1d	chore: update translations	2026-05-29 22:29:06 +00:00
Henry	6b8ada8d90	feat: duplicate card via dropdown	2026-05-29 23:27:21 +01:00
hjball	22899cd14c	chore: update translations	2026-05-29 21:59:33 +00:00
Henry	833c69a73e	cloud: enable workspace slots for partners	2026-05-29 22:58:09 +01:00
hjball	d9cf363302	chore: update translations	2026-05-25 21:01:17 +00:00
Henry	9212b1ca2e	fix: adjust layout of card prefix on public modal	2026-05-25 21:59:57 +01:00
hjball	ede2475796	chore: update translations	2026-05-25 20:49:46 +00:00
Henry	e32ad1cd32	fix(cloud): hide empty notice box for pro subscriptions	2026-05-25 21:48:27 +01:00
hjball	bac22021ad	chore: update translations	2026-05-21 21:53:34 +00:00
Henry	8d8cfa3bae	feat(cloud): pause members when subscription is cancelled	2026-05-21 22:52:17 +01:00
hjball	971348a397	chore: compile translations	2026-05-21 20:39:43 +00:00
hjball	d3920cd246	chore: update translations	2026-05-21 20:39:39 +00:00
Henry	5af375825b	fix: reliably select workspace on login (#507 )	2026-05-21 21:38:09 +01:00
Henry	861416a18e	feat(cloud): set seat limit checks for partner member invitations (#506 )	2026-05-21 21:36:57 +01:00
Henry	a7e78ad580	fix: respect redirect param on login and signup pages (#504 )	2026-05-21 21:36:02 +01:00
Henry	f288047a6a	fix: run web container as non-root user (UID 1000) (#501 )	2026-05-21 21:35:47 +01:00
hjball	edb88525c0	chore: compile translations	2026-05-18 22:21:55 +00:00
hjball	d69051611c	chore: update translations	2026-05-18 22:21:52 +00:00
Henry	cf566e04c6	feat(cloud): improved upgrade journey	2026-05-18 23:20:11 +01:00
Henry	6ea622e7f7	fix(cloud): use prev_licence_key for upgrade/downgrade handler	2026-05-16 23:38:04 +01:00
Danny Halarewich	0e7b7a072c	fix(editor): convert pasted markdown to formatted content (#498 ) The tiptap-markdown extension was registered with default config, where `transformPastedText` defaults to false. As a result, pasting markdown text into card descriptions resulted in literal characters (e.g. '# heading' shown as a paragraph of text) rather than rendered formatting. Typing markdown shortcuts in the editor already worked because that goes through a different path. Programmatic writes via the API also work because they bypass the editor entirely. Only paste was affected. Enabling `transformPastedText: true` makes pasted markdown behave as users intuitively expect, matching the typed-markdown UX. Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-16 23:03:06 +01:00
Nick Meinhold	f801d2a7eb	fix(s3): default S3_REGION to us-east-1 instead of empty string (#495 ) The AWS SDK throws "Region is missing" when S3Client is constructed with an empty-string region, so any S3 feature (avatars, attachments, presigned URL generation) is silently broken when S3_REGION is unset — even though .env.example ships it unset and env.ts declares it optional. The schema and the runtime disagreed about whether the var was required. Default to "us-east-1" in createS3Client. S3-compatible providers (MinIO, Backblaze B2, R2, DigitalOcean Spaces, Wasabi) ignore the region entirely; real AWS S3 users should set S3_REGION explicitly to their bucket's actual region (clarified in .env.example). Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-16 22:56:48 +01:00
Nick Meinhold	d9157b6218	fix(workspace): point package "types" exports at src/, not stale dist/ (#496 ) Each workspace package had its exports map pointing `types` at `./dist/...d.ts` while `default` pointed at `./src/...ts`. The dist directory is a build artifact only refreshed when someone runs `pnpm build` in that package — meaning every other package in the monorepo typechecks against last week's type signatures. Concrete failure mode: contributor edits a function in packages/shared/src/utils/foo.ts (changes a parameter type, adds a new export, etc.), runs `pnpm typecheck` from root, sees green. The check actually validated against the stale dist/.d.ts. Real type errors stay invisible until CI builds shared first, by which point the diff is already pushed. Fix: point `types` at the same `src/` paths the runtime resolves to. TypeScript reads .ts source as types fine when consumers share the same TS version, which a monorepo guarantees. Verified end-to-end: adding a new export to shared and immediately typechecking @kan/api now picks it up without rebuilding shared, and breaking a return type immediately fails the consumer's typecheck. Applied to @kan/api, @kan/db, @kan/logger, @kan/shared. @kan/email is intentionally left as-is because its source is .tsx (JSX) — pointing types at .tsx would force every consumer to enable --jsx in their tsconfig, which is a worse cascade than the stale dist problem we're solving. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-16 22:55:07 +01:00
hjball	711ff7f610	chore: update translations	2026-05-16 21:36:10 +00:00
Henry	742e8a1fab	fix(cloud): prevent reprompting users to onboard after first signup	2026-05-16 22:34:59 +01:00
hjball	69ed5fd8f2	chore: compile translations	2026-05-16 21:25:37 +00:00
hjball	e21830138d	chore: update translations	2026-05-16 21:25:33 +00:00
Henry	f38533590d	feat(cloud): fix upgrade/downgrade and migrate webhook handler	2026-05-16 22:23:59 +01:00
hjball	7d52e4eb88	chore: compile translations	2026-05-15 21:34:55 +00:00
hjball	692123433b	chore: update translations	2026-05-15 21:34:51 +00:00
Henry	8436644966	feat(cloud): improve partner onboarding	2026-05-15 22:33:18 +01:00
Henry	0c2b670baf	Update README.md	2026-05-15 21:01:42 +01:00
Henry	584fe13244	fix(cloud): allow callback without code	2026-05-14 14:38:34 +01:00
Henry	cc6804c21d	fix(cloud): update license key on conflict	2026-05-14 14:02:17 +01:00
Henry	8512946102	fix(cloud): partner webhook integration	2026-05-14 13:42:36 +01:00
Henry	6bebb14855	feat(cloud): add partner config to docker compose	2026-05-14 13:22:06 +01:00
hjball	0adb68d547	chore: update translations	2026-05-13 21:12:51 +00:00
Henry	e26c122d76	fix: add card number fields to zod schemas	2026-05-13 22:11:29 +01:00
hjball	95321c1c0d	chore: update translations	2026-05-13 20:41:18 +00:00
Henry	f459c489f9	fix: broken migrations	2026-05-13 21:39:47 +01:00
hjball	460008d340	chore: compile translations	2026-05-12 21:40:38 +00:00
hjball	4371fe2d4d	chore: update translations	2026-05-12 21:40:34 +00:00
Henry	60d8e1bd83	feat(cloud): partner integration (#493 ) * feat: add partnerLicenseKey and partnerTier to subscription schema * feat: add repo funcs * feat: set up partner webhook handler	2026-05-12 22:39:07 +01:00
Henry	4459fbb4b2	fix: pin pnpm version in dockerfile to prevent corepack fetching latest	2026-05-11 15:49:34 +01:00
hjball	507c553778	chore: update translations	2026-05-11 12:45:01 +00:00
Henry	3d9e859b31	refactor: small tweaks to password reset flow	2026-05-11 13:43:38 +01:00
hjball	54dcd08d9a	chore: compile translations	2026-05-11 12:42:35 +00:00
hjball	468aeef8b6	chore: update translations	2026-05-11 12:42:31 +00:00
Morfixx	71205b67dc	fix: unable to change password when using magic link (#484 ) * fix: fixed password not resetting & added password prompt with save guards * fix: migrated to using setPassword	2026-05-11 13:40:59 +01:00
Midas	607672718c	Add cardPublicId to card webhook payloads (#490 ) * Add cardPublicId to card webhook payloads * fix: include card publicId in webhook payloads Add data.card.publicId to webhook payloads while keeping data.card.id for compatibility, and update card/webhook call sites and tests so webhook consumers can reliably use public IDs.	2026-05-11 13:22:21 +01:00
Henry	dd262ee50f	fix: allow reordering without supplying an index when updating cards (#492 )	2026-05-11 13:18:07 +01:00
Henry	82c8eef0c2	Update README.md	2026-05-05 21:50:50 +01:00
hjball	ea116268ff	chore: update translations	2026-05-05 20:49:45 +00:00
Henry	74384d841e	Update README.md	2026-05-05 21:48:29 +01:00
hjball	c0962e9f70	chore: compile translations	2026-04-28 21:31:18 +00:00
hjball	3e6aec2d6b	chore: update translations	2026-04-28 21:31:14 +00:00
Florent Azonnoudo	4658b2961c	feat: add ticket numbers to cards with workspace prefix (#443 ) * feat: add ticket numbers to cards with workspace prefix - Add cardNumber to cards - Add cardPrefix/cardCounter to workspace - Populate initial prefixes and numbers via new migration - Introduce generateWorkspacePrefix util and export it - Include cardNumber in card-related API responses and search results - Render and display tickets as PREFIX-NUMBER in UI - Update Card component to accept ticketNumber - Update CardModal and board cards to show number when available - Add cardNumber to CommandPalette search results type * feat: regen migration * feat: enhance card and workspace schemas with cardNumber and indexing - Updated the card repository to allocate card numbers atomically per workspace. - Modified the card schema to include a cardNumber field and added an index on listId and cardNumber for improved query performance. - Enhanced the workspace schema to include an index on cardPrefix for optimized lookups. - Adjusted the migration journal to reflect the new schema changes and their timestamps. - Updated the regex in workspace repository to allow alphanumeric prefixes in ticket IDs. --------- Co-authored-by: Henry <henry_ball@hotmail.co.uk>	2026-04-28 22:29:41 +01:00
hjball	bc8b5463b3	chore: compile translations	2026-04-20 21:37:14 +00:00
hjball	9eee59a877	chore: update translations	2026-04-20 21:37:10 +00:00
Henry	e32e400976	chore: clean up types (#476 )	2026-04-20 22:35:39 +01:00