diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7beee5e66e7..ce86a49fd08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Release Notes
 
+## Unreleased
+
+### What's new
+- Generate a `STATAMIC_SITE_KEY` on install to identify a project across environments. A site key is not a license — attach one with `php please license` or the Control Panel. Sites with a `STATAMIC_LICENSE_KEY` are left alone.
+- Add `php please site:fresh-key` for cloned templates, plus a matching "Generate new key" action in the Licensing utility for when someone else linked your key first.
+- Generate a missing site key from the Control Panel Licensing utility.
+- Clarify Licensing purchase actions with a checkout summary modal.
+- Drive the Licensing utility from a single primary action (generate / link / buy / add domain) based on whether the site is linked to a statamic.com account.
+
 ## 6.31.0 (2026-09-01)
 
 ### What's new
@@ -37,7 +46,6 @@
 - French translations [#15303](https://github.com/statamic/cms/issues/15303) by @ebeauchamps
 
 
-
 ## 6.30.0 (2026-08-28)
 
 ### What's new
diff --git a/config/system.php b/config/system.php
index 58b05476185..19083d18fbf 100644
--- a/config/system.php
+++ b/config/system.php
@@ -2,6 +2,20 @@
 
 return [
 
+    /*
+    |--------------------------------------------------------------------------
+    | Site Key
+    |--------------------------------------------------------------------------
+    |
+    | Identifies this project across environments. Generated on install.
+    | A site key is not a license — attach a license on statamic.com.
+    |
+    | https://statamic.dev/licensing
+    |
+    */
+
+    'site_key' => env('STATAMIC_SITE_KEY'),
+
     /*
     |--------------------------------------------------------------------------
     | License Key
@@ -9,6 +23,7 @@
     |
     | The license key for the corresponding domain from your Statamic account.
     | Without a key entered, your app will be considered to be in Trial Mode.
+    | Legacy alias for site_key — still accepted.
     |
     | https://statamic.dev/licensing#trial-mode
     |
@@ -16,6 +31,19 @@
 
     'license_key' => env('STATAMIC_LICENSE_KEY'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Licensing Endpoints
+    |--------------------------------------------------------------------------
+    |
+    | Override these in local/dev to point at a statamic.com worktree.
+    |
+    */
+
+    'licensing_url' => env('STATAMIC_LICENSING_URL', 'https://statamic.com'),
+
+    'outpost_url' => env('STATAMIC_OUTPOST_URL', 'https://outpost.statamic.com/v3/query'),
+
     /*
     |--------------------------------------------------------------------------
     | Enable Multi-site
diff --git a/lang/en/messages.php b/lang/en/messages.php
index 19d1cdad492..90c1510465a 100644
--- a/lang/en/messages.php
+++ b/lang/en/messages.php
@@ -164,16 +164,33 @@
     'licensing_error_invalid_domain' => 'Invalid domain',
     'licensing_error_invalid_edition' => 'License is for :edition edition',
     'licensing_error_no_domains' => 'No domains defined',
-    'licensing_error_no_site_key' => 'No site license key',
+    'licensing_error_no_site_key' => 'No site key',
     'licensing_error_outside_license_range' => 'License valid for versions :start and :end',
-    'licensing_error_unknown_site' => 'Unknown site',
+    'licensing_error_unknown_site' => 'Site key not recognized',
     'licensing_error_unlicensed' => 'Unlicensed',
-    'licensing_incorrect_key_format_body' => 'Your site key format is incorrect. Site keys are 16-character alphanumeric strings. Get your current key from your account at <a href="https://statamic.com" class="underline">statamic.com</a>. Do not use legacy UUID license keys.',
+    'licensing_incorrect_key_format_body' => 'Your site key format is incorrect. Site keys look like <code>site_</code> followed by 26 characters, or a legacy 16-character alphanumeric key. Get your current key from your account at <a href="https://statamic.com" class="underline">statamic.com</a>. Do not use UUID license keys.',
     'licensing_incorrect_key_format_heading' => 'Incorrect site key format',
     'licensing_production_alert' => 'This site is running Statamic Pro and commercial addons on a production domain. To continue using these features, please ensure you have valid licenses.',
     'licensing_production_alert_addons' => 'This site is using commercial addons on a production domain. To continue using these features, please ensure you have valid licenses.',
     'licensing_production_alert_renew_statamic' => 'Your Statamic Pro license needs to be renewed to use this version. Please update your license or downgrade your Statamic version to continue.',
     'licensing_production_alert_statamic' => 'This site is running Statamic Pro on a production domain. To continue using Pro features, please ensure you have a valid license.',
+    'licensing_site_key_already_exists' => 'This site already has a key.',
+    'licensing_site_key_found' => 'Site key found — no license attached yet. Run `php please license` to attach one.',
+    'licensing_site_key_generated' => 'Site key generated. Commit .env.example so other environments pick it up.',
+    'licensing_site_key_missing' => 'This site does not have a site key yet. Generate one from the Licensing utility.',
+    'licensing_fresh_key_unavailable' => 'A new site key can only be generated before this key has been linked to an account.',
+    'licensing_fresh_key_prompt' => 'This site key is already linked to a different account. Generate a new key so this project gets its own identity.',
+    'licensing_fresh_key_confirm' => 'Generate a new site key? Any other environment using the old key will need to be updated.',
+    'licensing_not_connected' => 'This site key isn\'t linked to a statamic.com account yet.',
+    'licensing_connected_unlicensed' => 'This site is linked to a statamic.com account but has no license attached.',
+    'licensing_connected_needs_renewal' => 'This site\'s Statamic Pro license needs to be renewed.',
+    'licensing_renew_pro_description' => 'Your Statamic Pro license does not cover this version. Renew to keep using it, or downgrade to a version in range.',
+    'licensing_refresh_instructions' => 'License data refreshes from statamic.com hourly. Use Refresh after you make changes there.',
+    'licensing_buy_addon_detail' => ':author',
+    'licensing_buy_addons_description' => 'These commercial addons need a license for :site.',
+    'licensing_buy_mixed_description' => ':site needs Statamic Pro and commercial addon licenses.',
+    'licensing_buy_pro_description' => 'Statamic Pro unlocks users, revisions, Git, multi-site, and more. One license per production site.',
+    'licensing_buy_pro_detail' => 'Per site. First year, then $99/year to renew.',
     'licensing_sync_instructions' => 'License data syncs from statamic.com hourly. Use the sync button to check for any recent changes you\'ve made.',
     'licensing_trial_mode_alert' => 'This site is using Statamic Pro and commercial addons in trial mode. Valid licenses will be required when you\'re ready to launch.',
     'licensing_trial_mode_alert_addons' => 'This site is using commercial addons in trial mode. Valid licenses will be required when you\'re ready to launch.',
diff --git a/resources/js/components/LicensingAlert.vue b/resources/js/components/LicensingAlert.vue
index 8518c9e7888..a205d9950cd 100644
--- a/resources/js/components/LicensingAlert.vue
+++ b/resources/js/components/LicensingAlert.vue
@@ -1,19 +1,41 @@
 <script setup>
 import { Modal, Description, Button } from '@/components/ui';
-import { computed, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import useStatamicPageProps from '@/composables/page-props.js';
 import { router } from '@inertiajs/vue3';
+import statamicMark from '@/../svg/statamic-mark-lime.svg?raw';
 
 const { licensing } = useStatamicPageProps();
 const { alert } = licensing;
 const message = ref(alert?.message);
 const testing = ref(alert?.testing);
 const manageUrl = ref(alert?.manageUrl);
+const handoffUrl = ref(alert?.handoffUrl);
+const siteUrl = ref(alert?.siteUrl);
+const refreshUrl = ref(alert?.refreshUrl);
+const mintUrl = ref(alert?.mintUrl);
+const primaryAction = ref(alert?.primaryAction);
+const connected = ref(alert?.connected);
+const minting = ref(false);
+const awaitingReturn = ref(false);
 const key = 'statamic.snooze_license_banner';
 const open = ref(localStorage.getItem(key) < new Date().valueOf());
 const snoozeMinutes = computed(() => testing.value ? (24 * 60) : 5);
 const snoozeMilliseconds = computed(() => snoozeMinutes.value * 60 * 1000);
 
+function mint() {
+    if (!mintUrl.value || minting.value) {
+        return;
+    }
+
+    minting.value = true;
+    router.post(mintUrl.value, {}, {
+        onFinish: () => {
+            minting.value = false;
+        },
+    });
+}
+
 function snooze() {
     open.value = false;
     localStorage.setItem(key, new Date(Date.now() + snoozeMilliseconds.value).valueOf());
@@ -23,6 +45,35 @@ function manageLicenses() {
     snooze();
     router.get(manageUrl.value);
 }
+
+function markOutbound() {
+    awaitingReturn.value = true;
+}
+
+function maybeRefresh() {
+    if (!awaitingReturn.value || !refreshUrl.value) {
+        return;
+    }
+
+    awaitingReturn.value = false;
+    router.visit(refreshUrl.value);
+}
+
+function onVisibilityChange() {
+    if (document.visibilityState === 'visible') {
+        maybeRefresh();
+    }
+}
+
+onMounted(() => {
+    document.addEventListener('visibilitychange', onVisibilityChange);
+    window.addEventListener('focus', maybeRefresh);
+});
+
+onUnmounted(() => {
+    document.removeEventListener('visibilitychange', onVisibilityChange);
+    window.removeEventListener('focus', maybeRefresh);
+});
 </script>
 
 <template>
@@ -42,7 +93,49 @@ function manageLicenses() {
         <template #footer>
             <div class="flex items-center justify-end space-x-3 pt-3 pb-1">
                 <Button @click="snooze" :text="__('Snooze')" variant="ghost" tabindex="-1" />
-                <Button v-if="manageUrl" @click="manageLicenses" :text="__('Manage Licenses')" />
+                <Button v-if="manageUrl" @click="manageLicenses" :text="__('View details')" variant="ghost" />
+                <Button
+                    v-if="!connected && manageUrl"
+                    :text="__('Buy Licenses')"
+                    @click="manageLicenses"
+                />
+                <Button
+                    v-if="primaryAction === 'mint'"
+                    :disabled="minting"
+                    variant="primary"
+                    :text="__('Generate site key')"
+                    @click="mint"
+                />
+                <Button
+                    v-if="connected && primaryAction === 'buy' && manageUrl"
+                    variant="primary"
+                    :text="__('Buy Licenses')"
+                    @click="manageLicenses"
+                />
+                <Button
+                    v-if="connected && primaryAction === 'renew' && manageUrl"
+                    variant="primary"
+                    :text="__('Renew License')"
+                    @click="manageLicenses"
+                />
+                <Button
+                    v-if="connected && primaryAction === 'domain'"
+                    :href="siteUrl"
+                    target="_blank"
+                    variant="primary"
+                    :text="__('Add domain on statamic.com')"
+                    @click="markOutbound"
+                />
+                <Button
+                    v-if="handoffUrl && !connected"
+                    :href="handoffUrl"
+                    target="_blank"
+                    variant="primary"
+                    :icon="statamicMark"
+                    :text="__('Link to Account')"
+                    class="[&>svg]:opacity-100!"
+                    @click="markOutbound"
+                />
             </div>
         </template>
     </Modal>
diff --git a/resources/js/pages/utilities/Licensing.vue b/resources/js/pages/utilities/Licensing.vue
index df462d6b4dc..4d8c75c4a87 100644
--- a/resources/js/pages/utilities/Licensing.vue
+++ b/resources/js/pages/utilities/Licensing.vue
@@ -1,6 +1,9 @@
 <script setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import { router } from '@inertiajs/vue3';
 import Head from '@/pages/layout/Head.vue';
-import { Header, Button, Card, CardPanel, Panel, Heading, Table, TableRow, TableCell, Badge, DocsCallout } from '@ui';
+import { Header, Button, Card, CardPanel, Panel, Heading, Badge, DocsCallout, Modal, ModalClose, Description } from '@ui';
+import statamicMark from '@/../svg/statamic-mark-lime.svg?raw';
 
 const props = defineProps([
     'requestError',
@@ -9,10 +12,87 @@ const props = defineProps([
     'addons',
     'unlistedAddons',
     'configCached',
-    'addToCartUrl',
+    'purchase',
+    'primaryAction',
     'usingLicenseKeyFile',
     'refreshUrl',
+    'mintUrl',
+    'freshUrl',
 ]);
+
+const minting = ref(false);
+const refreshingKey = ref(false);
+
+function freshKey() {
+    if (!props.freshUrl || refreshingKey.value) {
+        return;
+    }
+
+    if (!confirm(__('statamic::messages.licensing_fresh_key_confirm'))) {
+        return;
+    }
+
+    refreshingKey.value = true;
+    router.post(props.freshUrl, {}, {
+        onFinish: () => {
+            refreshingKey.value = false;
+        },
+    });
+}
+const buyModalOpen = ref(false);
+const awaitingReturn = ref(false);
+const checking = ref(false);
+
+function mint() {
+    if (!props.mintUrl || minting.value) {
+        return;
+    }
+
+    minting.value = true;
+    router.post(props.mintUrl, {}, {
+        onFinish: () => {
+            minting.value = false;
+        },
+    });
+}
+
+function markOutbound() {
+    awaitingReturn.value = true;
+}
+
+function maybeRefresh() {
+    if (!awaitingReturn.value || checking.value) {
+        return;
+    }
+
+    awaitingReturn.value = false;
+    checking.value = true;
+    router.visit(props.refreshUrl, {
+        onFinish: () => {
+            checking.value = false;
+        },
+    });
+}
+
+function onVisibilityChange() {
+    if (document.visibilityState === 'visible') {
+        maybeRefresh();
+    }
+}
+
+function statusDotClass(valid) {
+    return valid ? 'bg-green-500' : 'bg-red-500 dark:bg-red-600';
+}
+
+onMounted(() => {
+    document.addEventListener('visibilitychange', onVisibilityChange);
+    window.addEventListener('focus', maybeRefresh);
+});
+
+onUnmounted(() => {
+    document.removeEventListener('visibilitychange', onVisibilityChange);
+    window.removeEventListener('focus', maybeRefresh);
+});
 </script>
 
 <template>
@@ -21,21 +101,46 @@ const props = defineProps([
 
         <Header :title="__('Licensing')" icon="license">
             <Button
-                :href="site.url"
-                target="_blank"
-                :text="__('Manage on statamic.com')"
+                :href="refreshUrl"
+                :text="checking ? __('Checking statamic.com…') : __('Refresh')"
+                :disabled="checking"
+                v-tooltip="__('statamic::messages.licensing_refresh_instructions')"
+            />
+            <Button
+                v-if="site.key && !site.connected && purchase"
+                :text="purchase.label"
+                @click="buyModalOpen = true"
+            />
+            <Button
+                v-if="!site.key && mintUrl"
+                variant="primary"
+                :text="__('Generate site key')"
+                :disabled="minting"
+                @click="mint"
             />
             <Button
-                v-if="addToCartUrl"
-                :href="addToCartUrl"
+                v-if="site.connected && (primaryAction === 'buy' || primaryAction === 'renew')"
+                variant="primary"
+                :text="purchase.label"
+                @click="buyModalOpen = true"
+            />
+            <Button
+                v-if="site.connected && primaryAction === 'domain'"
+                :href="site.url"
                 target="_blank"
-                :text="__('Buy Licenses')"
+                variant="primary"
+                :text="__('Add domain on Statamic.com')"
+                @click="markOutbound"
             />
             <Button
-                :href="refreshUrl"
+                v-if="site.key && !site.connected && site.handoffUrl"
+                :href="site.handoffUrl"
+                target="_blank"
                 variant="primary"
-                :text="__('Sync')"
-                v-tooltip="__('statamic::messages.licensing_sync_instructions')"
+                :icon="statamicMark"
+                :text="__('Link to Account')"
+                class="[&>svg]:opacity-100!"
+                @click="markOutbound"
             />
         </Header>
 
@@ -57,94 +162,167 @@ const props = defineProps([
 
             <Panel :heading="__('Site')">
                 <Card class="py-0!">
-                    <Table class="w-full">
-                        <TableRow>
-                            <TableCell class="w-64 font-bold">
-                                <div class="flex gap-2 sm:gap-3">
-                                    <span class="little-dot mt-[0.45rem]" :class="site.valid ? 'bg-green-500' : 'bg-red-500 dark:bg-red-600'" />
-                                    {{ site.key ?? __('No license key') }}
-                                </div>
-                            </TableCell>
-                            <TableCell class="relative">
-                                {{ site.domain?.url ?? '' }}
-                                <span v-if="site.hasMultipleDomains" class="text-xs">
-                                ({{ __('and :count more', { count: site.additionalDomainCount }) }})
-                            </span>
-                            </TableCell>
-                            <TableCell class="text-end">
+                    <div class="divide-y divide-gray-200 text-sm dark:divide-gray-700">
+                        <div class="flex items-center gap-4 px-3 py-3">
+                            <div class="flex flex-1 shrink-0 items-center gap-2 font-bold sm:gap-3">
+                                <span class="little-dot" :class="statusDotClass(site.valid)" />
+                                <a :href="site.url" target="_blank" class="truncate underline" @click="markOutbound">
+                                    {{ site.name || site.key || __('No site key') }}
+                                </a>
+                                <Badge v-if="site.key" :color="site.connected ? 'green' : 'amber'" size="sm">
+                                    {{ site.connected ? __('Linked') : __('Not linked') }}
+                                </Badge>
+                            </div>
+                            <div class="flex shrink-0 items-center justify-end gap-2">
+                                <ui-badge color="green" :prepend="__('Site Key')" v-if="site.key">{{ site.key }}</ui-badge>
                                 <Badge v-if="site.invalidReason" color="red">
                                     {{ site.invalidReason }}
                                 </Badge>
-                            </TableCell>
-                        </TableRow>
-                    </Table>
+                            </div>
+                        </div>
+                        <div
+                            v-for="domain in site.domains"
+                            :key="domain.url"
+                            class="flex items-center gap-4 px-3 py-3"
+                        >
+                            <div class="w-72 shrink-0 truncate ps-5">
+                                {{ domain.url }}
+                            </div>
+                            <div class="min-w-0 flex-1" />
+                            <div class="w-52 shrink-0 text-end">
+                                <Badge v-if="domain.environment" :prepend="__('Environment')">
+                                    {{ domain.environment === 'production' ? __('Production') : __('Testing') }}
+                                </Badge>
+                            </div>
+                        </div>
+                        <div v-if="freshUrl" class="flex items-center gap-4 px-3 py-3">
+                            <p class="min-w-0 flex-1 text-gray-700 dark:text-gray-400">
+                                {{ __('statamic::messages.licensing_fresh_key_prompt') }}
+                            </p>
+                            <Button
+                                size="sm"
+                                :text="__('Generate new key')"
+                                :disabled="refreshingKey"
+                                @click="freshKey"
+                            />
+                        </div>
+                    </div>
                 </Card>
             </Panel>
 
             <Panel :heading="__('Core')">
                 <Card class="py-0!">
-                    <Table class="w-full">
-                        <TableRow>
-                            <TableCell class="w-64 font-bold">
-                                <div class="flex gap-2 sm:gap-3">
-                                    <span class="little-dot mt-[0.45rem]" :class="statamic.valid ? 'bg-green-500' : 'bg-red-500'" />
-                                    <span>
+                    <div class="divide-y divide-gray-200 text-sm dark:divide-gray-700">
+                        <div class="flex items-center gap-4 px-3 py-3">
+                            <div class="flex w-72 shrink-0 items-center gap-2 font-bold sm:gap-3">
+                                <span class="little-dot" :class="statusDotClass(statamic.valid)" />
+                                <span>
                                     {{ __('Statamic') }}
                                     <span v-if="statamic.pro" class="text-pink">{{ __('Pro') }}</span>
                                     <template v-else>{{ __('Free') }}</template>
                                 </span>
-                                </div>
-                            </TableCell>
-                            <TableCell>{{ statamic.version }}</TableCell>
-                            <TableCell class="text-end">
+                            </div>
+                            <div class="min-w-0 flex-1 truncate">{{ statamic.version }}</div>
+                            <div class="w-52 shrink-0 text-end">
                                 <Badge v-if="statamic.invalidReason" color="red">
                                     {{ statamic.invalidReason }}
                                 </Badge>
-                            </TableCell>
-                        </TableRow>
-                    </Table>
+                            </div>
+                        </div>
+                    </div>
                 </Card>
             </Panel>
 
             <Panel v-if="addons.length" :heading="__('Addons')">
                 <Card class="py-0!">
-                    <Table class="w-full">
-                        <TableRow v-for="addon in addons" :key="addon.name">
-                            <TableCell class="w-64">
-                                <div class="flex gap-2 sm:gap-3">
-                                    <span class="little-dot mt-[0.45rem]" :class="addon.valid ? 'bg-green-' : 'bg-red-500'" />
-                                    <span class="font-bold">
-                                    <a :href="addon.marketplaceUrl" class="underline">{{ addon.name }}</a>
-                                </span>
-                                    <div v-if="addon.edition" class="ms-auto">
-                                        <Badge>{{ addon.edition }}</Badge>
-                                    </div>
-                                </div>
-                            </TableCell>
-                            <TableCell>{{ addon.version }}</TableCell>
-                            <TableCell class="text-red-600 text-end">{{ addon.invalidReason }}</TableCell>
-                        </TableRow>
-                    </Table>
+                    <div class="divide-y divide-gray-200 text-sm dark:divide-gray-700">
+                        <div v-for="addon in addons" :key="addon.name" class="flex items-center gap-4 px-3 py-3">
+                            <div class="flex w-72 shrink-0 items-center gap-2 sm:gap-3">
+                                <span class="little-dot" :class="statusDotClass(addon.valid)" />
+                                <a :href="addon.marketplaceUrl" class="truncate font-bold underline">{{ addon.name }}</a>
+                                <Badge v-if="addon.edition">{{ addon.edition }}</Badge>
+                            </div>
+                            <div class="min-w-0 flex-1 truncate">{{ addon.version }}</div>
+                            <div class="w-52 shrink-0 text-end">
+                                <Badge v-if="addon.invalidReason" color="red">
+                                    {{ addon.invalidReason }}
+                                </Badge>
+                            </div>
+                        </div>
+                    </div>
                 </Card>
             </Panel>
 
             <Panel v-if="unlistedAddons.length" :heading="__('Unlisted Addons')">
                 <Card class="py-0!">
-                    <Table class="w-full">
-                        <TableRow v-for="addon in unlistedAddons" :key="addon.name">
-                            <TableCell class="w-64">
-                                <div class="flex gap-2 sm:gap-3">
-                                    <span class="little-dot mt-[0.45rem] bg-green-500" />
-                                    {{ addon.name }}
-                                </div>
-                            </TableCell>
-                            <TableCell>{{ addon.version }}</TableCell>
-                        </TableRow>
-                    </Table>
+                    <div class="divide-y divide-gray-200 text-sm dark:divide-gray-700">
+                        <div v-for="addon in unlistedAddons" :key="addon.name" class="flex items-center gap-4 px-3 py-3">
+                            <div class="flex w-72 shrink-0 items-center gap-2 sm:gap-3">
+                                <span class="little-dot bg-green-500" />
+                                <span class="truncate">{{ addon.name }}</span>
+                            </div>
+                            <div class="min-w-0 flex-1 truncate">{{ addon.version }}</div>
+                            <div class="w-52 shrink-0" />
+                        </div>
+                    </div>
                 </Card>
             </Panel>
         </section>
 
         <DocsCallout :topic="__('Licensing')" url="licensing" />
+
+        <Modal
+            v-if="purchase"
+            v-model:open="buyModalOpen"
+            :title="purchase.title"
+            icon="license"
+            blur
+        >
+            <div class="space-y-4">
+                <Description :text="purchase.description" />
+
+                <Card class="py-0!">
+                    <div class="divide-y divide-gray-200 text-sm dark:divide-gray-700">
+                        <div
+                            v-for="item in purchase.items"
+                            :key="item.name"
+                            class="flex items-center gap-3 px-3 py-3"
+                        >
+                            <img
+                                v-if="item.thumbnail"
+                                :src="item.thumbnail"
+                                :alt="item.name"
+                                class="size-10 shrink-0 rounded object-cover"
+                            >
+                            <div class="min-w-0 flex-1">
+                                <div class="font-medium text-gray-950 dark:text-gray-100">
+                                    <a v-if="item.url" :href="item.url" target="_blank" class="underline">{{ item.name }}</a>
+                                    <template v-else>{{ item.name }}</template>
+                                </div>
+                                <Description v-if="item.detail" :text="item.detail" />
+                            </div>
+                            <div v-if="item.price" class="shrink-0 font-medium text-gray-950 dark:text-gray-100">
+                                {{ item.price }}
+                            </div>
+                        </div>
+                    </div>
+                </Card>
+            </div>
+
+            <template #footer>
+                <div class="flex items-center justify-end space-x-3 pt-3 pb-1">
+                    <ModalClose>
+                        <Button variant="ghost" :text="__('Cancel')" />
+                    </ModalClose>
+                    <Button
+                        variant="primary"
+                        :href="purchase.checkoutUrl"
+                        target="_blank"
+                        :text="__('Checkout on statamic.com')"
+                        @click="markOutbound(); buyModalOpen = false"
+                    />
+                </div>
+            </template>
+        </Modal>
     </div>
 </template>
diff --git a/src/CP/Utilities/CoreUtilities.php b/src/CP/Utilities/CoreUtilities.php
index 4558be328cb..9b82d3af7c3 100644
--- a/src/CP/Utilities/CoreUtilities.php
+++ b/src/CP/Utilities/CoreUtilities.php
@@ -70,6 +70,8 @@ public static function boot()
             ->docsUrl(Statamic::docsUrl('licensing'))
             ->routes(function ($router) {
                 $router->get('refresh', [LicensingController::class, 'refresh'])->name('refresh');
+                $router->post('mint', [LicensingController::class, 'mint'])->name('mint');
+                $router->post('fresh', [LicensingController::class, 'fresh'])->name('fresh');
             });
 
         if (config('statamic.git.enabled') && Statamic::pro()) {
diff --git a/src/Config.php b/src/Config.php
index 950779ea750..a8880bf5a2e 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -53,19 +53,24 @@ public function getAppKey()
     }
 
     /**
-     * Get the license key.
+     * Get the effective site/license key.
+     *
+     * A legacy STATAMIC_LICENSE_KEY is a private, paid credential and always wins.
+     * STATAMIC_SITE_KEY is the public project identifier used when no legacy key is set.
      *
      * @return string|null
      */
     public function getLicenseKey()
     {
-        $key = $this->get('statamic.system.license_key');
+        foreach (['statamic.system.license_key', 'statamic.system.site_key'] as $configKey) {
+            $key = $this->get($configKey);
 
-        if (! $key || $key == '') {
-            return null;
+            if ($key) {
+                return $key;
+            }
         }
 
-        return $key;
+        return null;
     }
 
     public function getSite($locale = null)
diff --git a/src/Console/Commands/Install.php b/src/Console/Commands/Install.php
index 2bf7592c910..667d5e2bc0b 100644
--- a/src/Console/Commands/Install.php
+++ b/src/Console/Commands/Install.php
@@ -8,6 +8,7 @@
 use Statamic\Console\Composer\Json as ComposerJson;
 use Statamic\Console\RunsInPlease;
 use Statamic\Facades\File;
+use Statamic\Licensing\SiteKey;
 use Statamic\Statamic;
 
 class Install extends Command
@@ -35,7 +36,8 @@ class Install extends Command
      */
     public function handle()
     {
-        $this->addons()
+        $this->mintSiteKey()
+            ->addons()
             ->createFiles()
             ->publish()
             ->runCallbacks()
@@ -44,6 +46,17 @@ public function handle()
             ->runUpdateScripts();
     }
 
+    public function mintSiteKey(): self
+    {
+        $key = app(SiteKey::class)->ensure();
+
+        if ($key) {
+            $this->laravel['config']['statamic.system.site_key'] = $key;
+        }
+
+        return $this;
+    }
+
     protected function addons()
     {
         $this->call('statamic:addons:discover');
diff --git a/src/Console/Commands/License.php b/src/Console/Commands/License.php
new file mode 100644
index 00000000000..d64ec7d2ba3
--- /dev/null
+++ b/src/Console/Commands/License.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace Statamic\Console\Commands;
+
+use Illuminate\Console\Command;
+use Statamic\Console\EnhancesCommands;
+use Statamic\Console\RunsInPlease;
+use Statamic\Facades\Config;
+use Statamic\Licensing\DeviceFlow;
+use Statamic\Licensing\LicenseManager;
+use Statamic\Licensing\SiteKey;
+
+class License extends Command
+{
+    use EnhancesCommands, RunsInPlease;
+
+    protected $signature = 'statamic:license
+        { --poll-once : Check status once and exit (for tests) }';
+
+    protected $description = 'Link this site to a statamic.com account';
+
+    public function handle(DeviceFlow $flow, SiteKey $siteKey, LicenseManager $licenses): int
+    {
+        $key = Config::getLicenseKey() ?: $siteKey->ensure();
+
+        if ($siteKey->isValid($key)) {
+            $this->laravel['config']['statamic.system.site_key'] = $key;
+        }
+
+        $licenses->refresh();
+
+        if (($exit = $this->exitIfAlreadyResolved($licenses)) !== null) {
+            return $exit;
+        }
+
+        try {
+            $session = $flow->start($key, $this->host());
+        } catch (\Throwable $e) {
+            $this->components->error($e->getMessage());
+
+            return self::FAILURE;
+        }
+
+        $this->components->info('Open this URL and confirm the code:');
+        $this->line($session['url']);
+        $this->newLine();
+        $this->line('  '.$session['code']);
+        $this->newLine();
+
+        $status = $this->waitForCompletion($flow, $session);
+
+        if ($status !== 'complete') {
+            $this->components->warn('Still waiting. Run this command again after you finish on statamic.com.');
+
+            return self::FAILURE;
+        }
+
+        $licenses->refresh();
+        $this->components->info('Site linked to your account. License status will refresh on the next Outpost check.');
+
+        return self::SUCCESS;
+    }
+
+    private function exitIfAlreadyResolved(LicenseManager $licenses): ?int
+    {
+        if ($licenses->usingLicenseKeyFile()) {
+            $this->components->info('This site is using an offline license key file.');
+
+            return self::SUCCESS;
+        }
+
+        if ($licenses->requestFailed()) {
+            return null;
+        }
+
+        return match ($licenses->primaryAction()) {
+            null => $this->alreadyResolved('This site is already licensed.'),
+            'buy', 'renew' => $this->alreadyResolved('This site is already linked to a statamic.com account.', $licenses->site()->url()),
+            'domain' => $this->alreadyResolved('This site is linked to a statamic.com account, but this domain is not on the site record.', $licenses->site()->url()),
+            default => null,
+        };
+    }
+
+    private function alreadyResolved(string $message, ?string $url = null): int
+    {
+        $this->components->info($message);
+
+        if ($url) {
+            $this->line($url);
+        }
+
+        return self::SUCCESS;
+    }
+
+    private function waitForCompletion(DeviceFlow $flow, array $session): string
+    {
+        $attempts = $this->option('poll-once') ? 1 : 60;
+        $status = 'pending';
+
+        for ($i = 0; $i < $attempts; $i++) {
+            if ($i > 0 && ! $this->option('poll-once')) {
+                sleep($session['interval']);
+            }
+
+            try {
+                $status = $flow->poll($session['device_code'])['status'];
+            } catch (\Throwable $e) {
+                $this->components->error($e->getMessage());
+
+                return 'error';
+            }
+
+            if (in_array($status, ['complete', 'expired'], true)) {
+                return $status;
+            }
+        }
+
+        return $status;
+    }
+
+    private function host(): string
+    {
+        return parse_url((string) config('app.url'), PHP_URL_HOST) ?: 'localhost';
+    }
+}
diff --git a/src/Console/Commands/ProEnable.php b/src/Console/Commands/ProEnable.php
index 00337e0f3c0..0b5aaae2eb3 100644
--- a/src/Console/Commands/ProEnable.php
+++ b/src/Console/Commands/ProEnable.php
@@ -135,7 +135,8 @@ protected function promptToSetLicenseKey()
         ));
 
         if ($licenseKey === '') {
-            $this->components->warn('Add `STATAMIC_LICENSE_KEY=...` to your `.env` before or when your site goes live.');
+            $this->components->info('Link this site to your statamic.com account anytime with `php please license`.');
+            $this->components->warn('Or add `STATAMIC_LICENSE_KEY=...` to your `.env` before or when your site goes live.');
 
             return;
         }
diff --git a/src/Console/Commands/SiteFreshKey.php b/src/Console/Commands/SiteFreshKey.php
new file mode 100644
index 00000000000..5481bb792be
--- /dev/null
+++ b/src/Console/Commands/SiteFreshKey.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Statamic\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\ConfirmableTrait;
+use Statamic\Console\EnhancesCommands;
+use Statamic\Console\RunsInPlease;
+use Statamic\Licensing\SiteKey;
+
+class SiteFreshKey extends Command
+{
+    use ConfirmableTrait, EnhancesCommands, RunsInPlease;
+
+    protected $signature = 'statamic:site:fresh-key
+        { --force : Force the operation to run when in production }';
+
+    protected $description = 'Generate a new site key (for cloned templates)';
+
+    public function handle(SiteKey $siteKey): int
+    {
+        if (! $this->confirmToProceed()) {
+            return self::FAILURE;
+        }
+
+        $key = $siteKey->write($siteKey->generate());
+
+        $this->laravel['config']['statamic.system.site_key'] = $key;
+
+        $this->components->info('Generated a new site key.');
+        $this->line($key);
+
+        return self::SUCCESS;
+    }
+}
diff --git a/src/Http/Controllers/CP/LicensingController.php b/src/Http/Controllers/CP/LicensingController.php
index 4de7c2f5d40..8f1507c165d 100644
--- a/src/Http/Controllers/CP/LicensingController.php
+++ b/src/Http/Controllers/CP/LicensingController.php
@@ -2,8 +2,13 @@
 
 namespace Statamic\Http\Controllers\CP;
 
+use Facades\Statamic\Marketplace\Marketplace;
+use Illuminate\Support\Str;
 use Inertia\Inertia;
+use Statamic\Facades\Config;
 use Statamic\Licensing\LicenseManager as Licenses;
+use Statamic\Licensing\SiteKey;
+use Statamic\Statamic;
 
 use function Statamic\trans as __;
 
@@ -14,16 +19,20 @@ public function show(Licenses $licenses)
         $site = $licenses->site();
         $statamic = $licenses->statamic();
         $addons = $licenses->addons()->filter->existsOnMarketplace();
+        $alreadyLinked = $this->alreadyLinkedConflict();
+        $connected = $alreadyLinked ? false : $site->isConnected();
+        $primaryAction = $alreadyLinked ? 'connect' : $licenses->primaryAction();
 
         return Inertia::render('utilities/Licensing', [
             'requestError' => $licenses->requestFailed(),
             'site' => [
                 'url' => $site->url(),
+                'handoffUrl' => $site->handoffUrl(),
                 'key' => $site->key(),
+                'name' => $site->name(),
                 'valid' => $site->valid(),
-                'domain' => $site->domain(),
-                'hasMultipleDomains' => $site->hasMultipleDomains(),
-                'additionalDomainCount' => $site->additionalDomainCount(),
+                'connected' => $connected,
+                'domains' => $site->domains()->values()->all(),
                 'invalidReason' => $site->invalidReason(),
                 'usesIncorrectKeyFormat' => $site->key() && $site->usesIncorrectKeyFormat(),
             ],
@@ -46,12 +55,85 @@ public function show(Licenses $licenses)
                 'version' => $addon->version(),
             ])->values(),
             'configCached' => app()->configurationIsCached(),
-            'addToCartUrl' => $this->addToCartUrl($site, $statamic, $addons),
+            'purchase' => $this->purchase($site, $statamic, $addons),
+            'primaryAction' => $primaryAction,
             'usingLicenseKeyFile' => $licenses->usingLicenseKeyFile(),
             'refreshUrl' => cp_route('utilities.licensing.refresh'),
+            'mintUrl' => $site->key() ? null : cp_route('utilities.licensing.mint'),
+            'freshUrl' => $this->shouldOfferFreshKey($licenses) ? cp_route('utilities.licensing.fresh') : null,
         ]);
     }
 
+    /**
+     * Replace this project's site key with a brand new one.
+     *
+     * The escape hatch for when a public repo was cloned and someone else linked
+     * the original key first. Only available before this key has been linked.
+     */
+    public function fresh(SiteKey $siteKey, Licenses $licenses)
+    {
+        if (! $this->canMintFreshKey($licenses)) {
+            return redirect()
+                ->cpRoute('utilities.licensing')
+                ->with('error', __('statamic::messages.licensing_fresh_key_unavailable'));
+        }
+
+        $key = $siteKey->write($siteKey->generate());
+        config(['statamic.system.site_key' => $key]);
+        $licenses->refresh();
+        session()->forget('licensing.already_linked');
+
+        return redirect()
+            ->cpRoute('utilities.licensing')
+            ->with('success', __('statamic::messages.licensing_site_key_generated'));
+    }
+
+    private function shouldOfferFreshKey(Licenses $licenses): bool
+    {
+        return $this->alreadyLinkedConflict() && $this->canMintFreshKey($licenses);
+    }
+
+    private function alreadyLinkedConflict(): bool
+    {
+        if (request()->boolean('already_linked')) {
+            session(['licensing.already_linked' => true]);
+        }
+
+        return (bool) session('licensing.already_linked');
+    }
+
+    private function canMintFreshKey(Licenses $licenses): bool
+    {
+        if (config('statamic.system.license_key') || $licenses->usingLicenseKeyFile()) {
+            return false;
+        }
+
+        $site = $licenses->site();
+
+        if (! app(SiteKey::class)->isValid($site->key())) {
+            return false;
+        }
+
+        return $this->alreadyLinkedConflict() || ! $site->isConnected();
+    }
+
+    public function mint(SiteKey $siteKey, Licenses $licenses)
+    {
+        if (Config::getLicenseKey()) {
+            return redirect()
+                ->cpRoute('utilities.licensing')
+                ->with('error', __('statamic::messages.licensing_site_key_already_exists'));
+        }
+
+        $key = $siteKey->mint();
+        config(['statamic.system.site_key' => $key]);
+        $licenses->refresh();
+
+        return redirect()
+            ->cpRoute('utilities.licensing')
+            ->with('success', __('statamic::messages.licensing_site_key_generated'));
+    }
+
     public function refresh(Licenses $licenses)
     {
         $licenses->refresh();
@@ -61,12 +143,81 @@ public function refresh(Licenses $licenses)
             ->with('success', __('Data updated'));
     }
 
+    public function purchase($site, $statamic, $addons): ?array
+    {
+        $unlicensedAddons = $addons->reject->valid();
+        $needsStatamic = ! $statamic->valid();
+
+        if (! $needsStatamic && $unlicensedAddons->isEmpty()) {
+            return null;
+        }
+
+        $catalog = $this->marketplaceCatalog($needsStatamic, $unlicensedAddons);
+        $items = collect();
+        $siteName = filled($site?->name()) ? $site->name() : null;
+
+        if ($needsStatamic) {
+            $core = $catalog->get('statamic/cms', []);
+            $items->push([
+                'name' => __('Statamic Pro'),
+                'detail' => $siteName ?: __('statamic::messages.licensing_buy_pro_detail'),
+                'url' => rtrim(config('statamic.system.licensing_url', 'https://statamic.com'), '/').'/pricing',
+                'price' => $this->formatPrice($core['price'] ?? null),
+                'thumbnail' => $core['thumbnail'] ?? null,
+            ]);
+        }
+
+        foreach ($unlicensedAddons as $addon) {
+            $market = $catalog->get($addon->addon()->id(), []);
+            $items->push([
+                'name' => $addon->name(),
+                'detail' => ($market['seller_name'] ?? null)
+                    ?: $addon->addon()->developer()
+                    ?: (isset($market['seller']) ? Str::headline($market['seller']) : null),
+                'url' => $addon->addon()->marketplaceUrl(),
+                'price' => $this->formatPrice($market['price'] ?? null),
+                'thumbnail' => $market['thumbnail'] ?? null,
+            ]);
+        }
+
+        $needsRenewal = $needsStatamic && $unlicensedAddons->isEmpty() && $statamic->needsRenewal();
+
+        $label = match (true) {
+            $needsRenewal => __('Renew License'),
+            $needsStatamic && $unlicensedAddons->isEmpty() => __('Buy Statamic Pro'),
+            ! $needsStatamic => __('Buy Addon Licenses'),
+            default => __('Buy Licenses'),
+        };
+
+        $siteLabel = $siteName ?? __('this site');
+        $description = match (true) {
+            $needsRenewal => __('statamic::messages.licensing_renew_pro_description'),
+            $needsStatamic && $unlicensedAddons->isEmpty() => __('statamic::messages.licensing_buy_pro_description'),
+            ! $needsStatamic => __('statamic::messages.licensing_buy_addons_description', ['site' => $siteLabel]),
+            default => __('statamic::messages.licensing_buy_mixed_description', ['site' => $siteLabel]),
+        };
+
+        return [
+            'label' => $label,
+            'title' => $label,
+            'description' => $description,
+            'items' => $items->values()->all(),
+            'checkoutUrl' => $this->addToCartUrl($site, $statamic, $unlicensedAddons),
+        ];
+    }
+
     public function addToCartUrl($site, $statamic, $addons)
     {
-        return 'https://statamic.com/cart/bulk-add?'.http_build_query([
+        $unlicensedAddons = $addons->reject->valid();
+
+        if ($statamic->valid() && $unlicensedAddons->isEmpty()) {
+            return null;
+        }
+
+        return rtrim(config('statamic.system.licensing_url', 'https://statamic.com'), '/').'/cart/bulk-add?'.http_build_query([
             'site' => $site->key(),
             'statamic' => ! $statamic->valid(),
-            'products' => $addons->reject->valid()->map->addon()->map(function ($addon) {
+            'products' => $unlicensedAddons->map->addon()->map(function ($addon) {
                 $product = $addon->marketplaceId();
                 if ($edition = $addon->edition()) {
                     $product .= ':'.$edition;
@@ -76,4 +227,37 @@ public function addToCartUrl($site, $statamic, $addons)
             })->implode(','),
         ]);
     }
+
+    private function marketplaceCatalog(bool $needsStatamic, $addons)
+    {
+        $packages = collect($addons)->map(fn ($addon) => [
+            'package' => $addon->addon()->id(),
+            'version' => $addon->version(),
+            'edition' => $addon->edition(),
+        ]);
+
+        if ($needsStatamic) {
+            $packages->push([
+                'package' => 'statamic/cms',
+                'version' => Statamic::version(),
+            ]);
+        }
+
+        if ($packages->isEmpty()) {
+            return collect();
+        }
+
+        return Marketplace::packages($packages->values()->all());
+    }
+
+    private function formatPrice($price): ?string
+    {
+        if ($price === null || $price === '' || (float) $price <= 0) {
+            return null;
+        }
+
+        $price = (float) $price;
+
+        return '$'.(fmod($price, 1.0) === 0.0 ? (int) $price : number_format($price, 2));
+    }
 }
diff --git a/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php b/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php
index 1fc91378565..085f315c7a7 100644
--- a/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php
+++ b/src/Http/Middleware/CP/HandleAuthenticatedInertiaRequests.php
@@ -82,6 +82,16 @@ private function licensing()
             'alert' => ($alert = $licenses->licensingAlert()) ? [
                 ...$alert,
                 'manageUrl' => User::current()->can('access licensing utility') ? cp_route('utilities.licensing') : null,
+                'handoffUrl' => $licenses->site()->handoffUrl(),
+                'siteUrl' => $licenses->site()->url(),
+                'refreshUrl' => User::current()->can('access licensing utility')
+                    ? cp_route('utilities.licensing.refresh')
+                    : null,
+                'primaryAction' => $licenses->primaryAction(),
+                'connected' => $licenses->site()->isConnected(),
+                'mintUrl' => $licenses->primaryAction() === 'mint' && User::current()->can('access licensing utility')
+                    ? cp_route('utilities.licensing.mint')
+                    : null,
             ] : null,
         ];
     }
diff --git a/src/Licensing/DeviceFlow.php b/src/Licensing/DeviceFlow.php
new file mode 100644
index 00000000000..11f5eea63de
--- /dev/null
+++ b/src/Licensing/DeviceFlow.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Statamic\Licensing;
+
+use Illuminate\Support\Facades\Http;
+use RuntimeException;
+
+class DeviceFlow
+{
+    public const START_URL = 'https://statamic.com/licensing/device';
+
+    public const POLL_URL = 'https://statamic.com/licensing/device/poll';
+
+    /**
+     * @return array{url: string, code: string, device_code: string, interval: int}
+     */
+    public function start(string $key, string $host): array
+    {
+        $response = Http::acceptJson()->asJson()->timeout(10)->post($this->startUrl(), [
+            'key' => $key,
+            'host' => $host,
+            'name' => config('app.name'),
+        ]);
+
+        if (! $response->successful()) {
+            throw new RuntimeException('Unable to start the licensing flow.');
+        }
+
+        return [
+            'url' => $response->json('url'),
+            'code' => $response->json('code'),
+            'device_code' => $response->json('device_code'),
+            'interval' => (int) ($response->json('interval') ?: 5),
+        ];
+    }
+
+    /**
+     * @return array{status: string}
+     */
+    public function poll(string $deviceCode): array
+    {
+        $response = Http::acceptJson()->asJson()->timeout(10)->post($this->pollUrl(), [
+            'device_code' => $deviceCode,
+        ]);
+
+        if (! $response->successful()) {
+            throw new RuntimeException('Unable to check licensing status.');
+        }
+
+        return [
+            'status' => $response->json('status', 'pending'),
+        ];
+    }
+
+    public function startUrl(): string
+    {
+        return rtrim(config('statamic.system.licensing_url', 'https://statamic.com'), '/').'/licensing/device';
+    }
+
+    public function pollUrl(): string
+    {
+        return $this->startUrl().'/poll';
+    }
+}
diff --git a/src/Licensing/LicenseManager.php b/src/Licensing/LicenseManager.php
index 6246233f858..27b257f87f3 100644
--- a/src/Licensing/LicenseManager.php
+++ b/src/Licensing/LicenseManager.php
@@ -143,9 +143,15 @@ public function licensingAlert()
         return [
             'testing' => $isTestDomain = $this->isOnTestDomain(),
             'message' => $this->invalidLicenseMessage($isTestDomain),
+            'hasSiteKey' => $this->hasSiteKey(),
         ];
     }
 
+    public function hasSiteKey(): bool
+    {
+        return (bool) $this->site()->key();
+    }
+
     public function requestFailureMessage()
     {
         if ($this->usingLicenseKeyFile()) {
@@ -169,28 +175,60 @@ private function invalidLicenseMessage($isTestDomain)
     {
         if ($isTestDomain) {
             if ($this->onlyAddonsAreInvalid()) {
-                return __('statamic::messages.licensing_trial_mode_alert_addons');
+                $message = __('statamic::messages.licensing_trial_mode_alert_addons');
+            } elseif ($this->onlyStatamicIsInvalid()) {
+                $message = __('statamic::messages.licensing_trial_mode_alert_statamic');
+            } else {
+                $message = __('statamic::messages.licensing_trial_mode_alert');
             }
+        } elseif ($this->onlyAddonsAreInvalid()) {
+            $message = __('statamic::messages.licensing_production_alert_addons');
+        } elseif ($this->onlyStatamicIsInvalid()) {
+            $message = $this->statamicNeedsRenewal()
+                ? __('statamic::messages.licensing_production_alert_renew_statamic')
+                : __('statamic::messages.licensing_production_alert_statamic');
+        } else {
+            $message = __('statamic::messages.licensing_production_alert');
+        }
 
-            if ($this->onlyStatamicIsInvalid()) {
-                return __('statamic::messages.licensing_trial_mode_alert_statamic');
-            }
+        return $message.' '.$this->identityMessage();
+    }
+
+    public function primaryAction(): ?string
+    {
+        $site = $this->site();
 
-            return __('statamic::messages.licensing_trial_mode_alert');
+        if (! $site->key()) {
+            return 'mint';
         }
 
-        if ($this->onlyAddonsAreInvalid()) {
-            return __('statamic::messages.licensing_production_alert_addons');
+        if (! $site->isConnected()) {
+            return 'connect';
         }
 
-        if ($this->onlyStatamicIsInvalid()) {
-            if ($this->statamicNeedsRenewal()) {
-                return __('statamic::messages.licensing_production_alert_renew_statamic');
-            }
+        if ($site->hasInvalidDomain()) {
+            return 'domain';
+        }
+
+        if ($this->statamicNeedsRenewal() && $this->onlyStatamicIsInvalid()) {
+            return 'renew';
+        }
+
+        return $this->invalid() ? 'buy' : null;
+    }
+
+    private function identityMessage(): string
+    {
+        if (! $this->hasSiteKey()) {
+            return __('statamic::messages.licensing_site_key_missing');
+        }
 
-            return __('statamic::messages.licensing_production_alert_statamic');
+        if ($this->site()->isConnected() && $this->statamicNeedsRenewal()) {
+            return __('statamic::messages.licensing_connected_needs_renewal');
         }
 
-        return __('statamic::messages.licensing_production_alert');
+        return $this->site()->isConnected()
+            ? __('statamic::messages.licensing_connected_unlicensed')
+            : __('statamic::messages.licensing_not_connected');
     }
 }
diff --git a/src/Licensing/Outpost.php b/src/Licensing/Outpost.php
index 01e8baec3fc..776ff601d0e 100644
--- a/src/Licensing/Outpost.php
+++ b/src/Licensing/Outpost.php
@@ -18,6 +18,7 @@
 use RuntimeException;
 use Statamic\Facades;
 use Statamic\Facades\Addon;
+use Statamic\Facades\Config;
 use Statamic\Statamic;
 use Statamic\Support\Arr;
 
@@ -81,7 +82,7 @@ private function performRequest()
             return $this->licenseKeyFileResponse();
         }
 
-        $response = $this->client->request('POST', self::ENDPOINT, [
+        $response = $this->client->request('POST', $this->endpoint(), [
             'headers' => ['accept' => 'application/json'],
             'json' => $this->payload(),
             'timeout' => self::REQUEST_TIMEOUT,
@@ -114,7 +115,8 @@ private function licenseKeyFileResponse()
     public function payload()
     {
         return [
-            'key' => config('statamic.system.license_key'),
+            'key' => Config::getLicenseKey(),
+            'name' => config('app.name'),
             'host' => request()->getHost(),
             'ip' => request()->server('SERVER_ADDR'),
             'port' => request()->server('SERVER_PORT'),
@@ -159,7 +161,7 @@ private function hasCachedResponse()
 
     private function payloadHasChanged($previous, $current)
     {
-        $exclude = ['host', 'ip', 'port', 'php_version'];
+        $exclude = ['ip', 'port', 'php_version'];
 
         return Arr::except($previous, $exclude) !== Arr::except($current, $exclude);
     }
@@ -238,6 +240,11 @@ public function usingLicenseKeyFile()
         return File::exists($this->licenseKeyPath());
     }
 
+    private function endpoint(): string
+    {
+        return config('statamic.system.outpost_url', self::ENDPOINT);
+    }
+
     private function licenseKeyPath()
     {
         return storage_path('license.key');
diff --git a/src/Licensing/SiteKey.php b/src/Licensing/SiteKey.php
new file mode 100644
index 00000000000..fa068b14ac4
--- /dev/null
+++ b/src/Licensing/SiteKey.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Statamic\Licensing;
+
+use Illuminate\Support\Facades\File;
+
+class SiteKey
+{
+    public const PREFIX = 'site_';
+
+    public const ENTROPY_LENGTH = 26;
+
+    public function generate(): string
+    {
+        $alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $entropy = '';
+
+        for ($i = 0; $i < self::ENTROPY_LENGTH; $i++) {
+            $entropy .= $alphabet[random_int(0, strlen($alphabet) - 1)];
+        }
+
+        return self::PREFIX.$entropy;
+    }
+
+    public function isValid(?string $key): bool
+    {
+        return (bool) preg_match('/^'.preg_quote(self::PREFIX, '/').'[a-zA-Z0-9]{'.self::ENTROPY_LENGTH.'}$/', (string) $key);
+    }
+
+    public function runningInCi(): bool
+    {
+        if (app()->runningUnitTests()) {
+            return filter_var($_SERVER['STATAMIC_TEST_CI'] ?? false, FILTER_VALIDATE_BOOLEAN);
+        }
+
+        return filter_var($_SERVER['CI'] ?? $_ENV['CI'] ?? getenv('CI'), FILTER_VALIDATE_BOOLEAN);
+    }
+
+    /**
+     * Make sure this install has a site key, minting one if needed.
+     *
+     * Nothing is minted in CI, or when the install already uses a legacy
+     * STATAMIC_LICENSE_KEY (those sites opt in to site keys from statamic.com).
+     */
+    public function ensure(?string $envPath = null, ?string $examplePath = null): ?string
+    {
+        $envPath ??= base_path('.env');
+        $examplePath ??= base_path('.env.example');
+
+        if ($this->runningInCi() || $this->hasLegacyLicenseKey($envPath)) {
+            return $this->populatedValue($envPath)
+                ?? $this->populatedValue($examplePath);
+        }
+
+        $envPath ??= base_path('.env');
+        $examplePath ??= base_path('.env.example');
+
+        $existing = $this->populatedValue($envPath) ?? $this->populatedValue($examplePath);
+
+        if ($existing) {
+            $this->fillIfBlank($envPath, $existing);
+            $this->fillIfBlank($examplePath, $existing);
+
+            return $existing;
+        }
+
+        return $this->mint($envPath, $examplePath);
+    }
+
+    public function hasLegacyLicenseKey(?string $envPath = null): bool
+    {
+        $envPath ??= base_path('.env');
+
+        return (bool) $this->populatedValue($envPath, 'STATAMIC_LICENSE_KEY');
+    }
+
+    /**
+     * Mint a site key for this install.
+     *
+     * Only reads STATAMIC_SITE_KEY from .env — never .env.example. Cloned repos
+     * pick up a shared key through ensure(), but an explicit mint always creates
+     * a fresh identity so "Generate site key" does not resurrect a claimed example key.
+     */
+    public function mint(?string $envPath = null, ?string $examplePath = null): string
+    {
+        $envPath ??= base_path('.env');
+        $examplePath ??= base_path('.env.example');
+
+        if ($key = $this->populatedValue($envPath)) {
+            $this->fillIfBlank($examplePath, $key);
+
+            return $key;
+        }
+
+        return $this->write($this->generate(), $envPath, $examplePath);
+    }
+
+    public function write(string $key, ?string $envPath = null, ?string $examplePath = null): string
+    {
+        $envPath ??= base_path('.env');
+        $examplePath ??= base_path('.env.example');
+
+        $this->writeKey($envPath, $key);
+        $this->writeKey($examplePath, $key);
+
+        return $key;
+    }
+
+    private function populatedValue(string $path, string $variable = 'STATAMIC_SITE_KEY'): ?string
+    {
+        if (! File::exists($path)) {
+            return null;
+        }
+
+        if (! preg_match('/^'.preg_quote($variable, '/').'=(.+)$/m', File::get($path), $matches)) {
+            return null;
+        }
+
+        $value = trim($matches[1], " \t\"'");
+
+        return $value !== '' ? $value : null;
+    }
+
+    private function fillIfBlank(string $path, string $key): void
+    {
+        if ($this->populatedValue($path)) {
+            return;
+        }
+
+        $this->writeKey($path, $key);
+    }
+
+    private function writeKey(string $path, string $key): void
+    {
+        $line = 'STATAMIC_SITE_KEY='.$key;
+
+        if (! File::exists($path)) {
+            File::put($path, $line."\n");
+
+            return;
+        }
+
+        $contents = File::get($path);
+
+        if (preg_match('/^#?\s*STATAMIC_SITE_KEY=.*$/m', $contents)) {
+            File::put($path, preg_replace('/^#?\s*STATAMIC_SITE_KEY=.*$/m', $line, $contents, 1));
+
+            return;
+        }
+
+        File::put($path, rtrim($contents)."\n".$line."\n");
+    }
+}
diff --git a/src/Licensing/SiteLicense.php b/src/Licensing/SiteLicense.php
index 4ebe8a115d1..f69a23db389 100644
--- a/src/Licensing/SiteLicense.php
+++ b/src/Licensing/SiteLicense.php
@@ -2,18 +2,63 @@
 
 namespace Statamic\Licensing;
 
+use Statamic\Facades\Config;
 use Statamic\Support\Arr;
 
 class SiteLicense extends License
 {
     public function key()
     {
-        return config('statamic.system.license_key');
+        return Config::getLicenseKey();
+    }
+
+    public function name(): ?string
+    {
+        return Arr::get($this->response, 'name');
+    }
+
+    public function isConnected(): bool
+    {
+        return (bool) Arr::get($this->response, 'claimed', false);
+    }
+
+    public function valid()
+    {
+        if ($this->shouldHideUnlinkedDomainReason()) {
+            return true;
+        }
+
+        return parent::valid();
+    }
+
+    public function invalidReason()
+    {
+        if ($this->shouldHideUnlinkedDomainReason()) {
+            return;
+        }
+
+        return parent::invalidReason();
+    }
+
+    public function hasInvalidDomain(): bool
+    {
+        return Arr::get($this->response, 'reason') === 'invalid_domain';
+    }
+
+    private function shouldHideUnlinkedDomainReason(): bool
+    {
+        return ! $this->isConnected() && Arr::get($this->response, 'reason') === 'no_domains';
     }
 
     public function usesIncorrectKeyFormat()
     {
-        return ! preg_match('/^[a-zA-Z0-9]{16}$/', $this->key());
+        $key = $this->key();
+
+        if (! $key) {
+            return false;
+        }
+
+        return ! preg_match('/^(?:site_[a-zA-Z0-9]{26}|[a-zA-Z0-9]{16})$/', $key);
     }
 
     public function hasDomains()
@@ -47,7 +92,7 @@ public function domains()
 
     public function url()
     {
-        $url = 'https://statamic.com/account/sites';
+        $url = rtrim(config('statamic.system.licensing_url', 'https://statamic.com'), '/').'/account/sites';
 
         if ($key = $this->key()) {
             $url .= '/'.$key;
@@ -57,4 +102,18 @@ public function url()
 
         return $url;
     }
+
+    public function handoffUrl(): ?string
+    {
+        if (! $key = $this->key()) {
+            return null;
+        }
+
+        return rtrim(config('statamic.system.licensing_url', 'https://statamic.com'), '/').'/account/licensing/handoff?'.http_build_query(array_filter([
+            'key' => $key,
+            'name' => config('app.name'),
+            'host' => request()->getHost(),
+            'return' => url(cp_route('utilities.licensing')),
+        ]));
+    }
 }
diff --git a/src/Marketplace/Client.php b/src/Marketplace/Client.php
index e692b71eb6b..7f35c71709b 100644
--- a/src/Marketplace/Client.php
+++ b/src/Marketplace/Client.php
@@ -38,8 +38,8 @@ class Client
      */
     public function __construct()
     {
-        if ($domain = env('STATAMIC_DOMAIN')) {
-            $this->domain = $domain;
+        if ($domain = env('STATAMIC_DOMAIN') ?: $this->customLicensingUrl()) {
+            $this->domain = $this->normalizeDomain($domain);
             $this->verifySsl = false;
         }
     }
@@ -90,6 +90,24 @@ public function requestEndpoint(string $endpoint): string
         return collect([$this->domain, self::API_PREFIX, $endpoint])->implode('/');
     }
 
+    private function customLicensingUrl(): ?string
+    {
+        $url = rtrim((string) config('statamic.system.licensing_url'), '/');
+
+        return $url && $url !== 'https://statamic.com' ? $url : null;
+    }
+
+    private function normalizeDomain(string $domain): string
+    {
+        $domain = rtrim($domain, '/');
+
+        if (! preg_match('#^https?://#', $domain)) {
+            $domain = 'https://'.$domain;
+        }
+
+        return $domain;
+    }
+
     private function requestCacheKey(string $endpoint, array $params = []): string
     {
         return 'marketplace-'.md5($endpoint.json_encode($params));
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index 05bb28b501f..25a0c9df310 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -327,7 +327,7 @@ protected function addAboutCommandInfo()
         AboutCommand::add('Statamic', [
             'Version' => fn () => Statamic::version().' '.(Statamic::pro() ? '<fg=yellow;options=bold>PRO</>' : 'Solo'),
             'Addons' => $addons->count(),
-            'License Key' => fn () => Config::getLicenseKey() ? 'Set' : 'Not set',
+            'Site Key' => fn () => Config::getLicenseKey() ? 'Set' : 'Not set',
             'Stache Watcher' => fn () => $this->stacheWatcher(),
             'Static Caching' => config('statamic.static_caching.strategy') ?: 'Disabled',
             'Sites' => fn () => $this->sitesAboutCommandInfo(),
diff --git a/src/Providers/ConsoleServiceProvider.php b/src/Providers/ConsoleServiceProvider.php
index 8d058c405ed..7a5e8efee41 100644
--- a/src/Providers/ConsoleServiceProvider.php
+++ b/src/Providers/ConsoleServiceProvider.php
@@ -21,6 +21,7 @@ class ConsoleServiceProvider extends ServiceProvider
         Commands\InstallEloquentDriver::class,
         Commands\InstallSsg::class,
         Commands\FlatCamp::class,
+        Commands\License::class,
         Commands\LicenseSet::class,
         Commands\MakeAction::class,
         Commands\MakeAddon::class,
@@ -58,6 +59,7 @@ class ConsoleServiceProvider extends ServiceProvider
         Commands\ImportRoles::class,
         Commands\ImportUsers::class,
         Commands\ProEnable::class,
+        Commands\SiteFreshKey::class,
     ];
 
     public function boot()
diff --git a/src/StarterKits/LicenseManager.php b/src/StarterKits/LicenseManager.php
index 9e1fa4bc04c..59593b49c9a 100644
--- a/src/StarterKits/LicenseManager.php
+++ b/src/StarterKits/LicenseManager.php
@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
 use Statamic\Console\NullConsole;
+use Statamic\Facades\Config;
 
 use function Laravel\Prompts\text;
 
@@ -25,7 +26,7 @@ final class LicenseManager
     public function __construct(string $package, ?string $licenseKey = null, ?Command $console = null, bool $isInteractive = false)
     {
         $this->package = $package;
-        $this->licenseKey = $licenseKey ?? config('statamic.system.license_key');
+        $this->licenseKey = $licenseKey ?? Config::getLicenseKey();
         $this->console = $console ?? new NullConsole;
         $this->isInteractive = $isInteractive;
     }
@@ -53,7 +54,7 @@ public function completeInstall(): void
     {
         Http::post(self::OUTPOST_ENDPOINT.'installed', [
             'license' => $this->licenseKey,
-            'configured_site_license' => config('statamic.system.license_key'),
+            'configured_site_license' => Config::getLicenseKey(),
             'package' => $this->package,
         ]);
     }
@@ -141,7 +142,7 @@ private function outpostValidatesLicense(): bool
 
         $response = Http::post(self::OUTPOST_ENDPOINT.'validate', [
             'license' => $this->licenseKey,
-            'configured_site_license' => config('statamic.system.license_key'),
+            'configured_site_license' => Config::getLicenseKey(),
             'package' => $this->package,
         ]);
 
diff --git a/tests/CP/Licensing/AddToCartUrlTest.php b/tests/CP/Licensing/AddToCartUrlTest.php
new file mode 100644
index 00000000000..60770184ee0
--- /dev/null
+++ b/tests/CP/Licensing/AddToCartUrlTest.php
@@ -0,0 +1,346 @@
+<?php
+
+namespace Tests\CP\Licensing;
+
+use Facades\Statamic\Marketplace\Marketplace;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Http\Controllers\CP\LicensingController;
+use Tests\TestCase;
+
+class AddToCartUrlTest extends TestCase
+{
+    #[Test]
+    public function it_returns_null_when_everything_is_licensed()
+    {
+        $statamic = new class
+        {
+            public function valid()
+            {
+                return true;
+            }
+        };
+
+        $this->assertNull($this->controller()->addToCartUrl(null, $statamic, collect()));
+    }
+
+    #[Test]
+    public function it_returns_a_url_when_statamic_is_unlicensed()
+    {
+        $site = new class
+        {
+            public function key()
+            {
+                return 'site_abcdefghijklmnopqrstuvwxyz';
+            }
+        };
+
+        $statamic = new class
+        {
+            public function valid()
+            {
+                return false;
+            }
+        };
+
+        $url = $this->controller()->addToCartUrl($site, $statamic, collect());
+
+        $this->assertStringContainsString('cart/bulk-add', $url);
+        $this->assertStringContainsString('statamic=1', $url);
+        $this->assertStringContainsString('site_abcdefghijklmnopqrstuvwxyz', $url);
+    }
+
+    #[Test]
+    public function it_returns_a_url_when_an_addon_is_unlicensed()
+    {
+        $site = new class
+        {
+            public function key()
+            {
+                return 'site_abcdefghijklmnopqrstuvwxyz';
+            }
+        };
+
+        $statamic = new class
+        {
+            public function valid()
+            {
+                return true;
+            }
+        };
+
+        $addon = new class
+        {
+            public function valid()
+            {
+                return false;
+            }
+
+            public function edition()
+            {
+                return 'pro';
+            }
+
+            public function addon()
+            {
+                return new class
+                {
+                    public function id()
+                    {
+                        return 'statamic/seo-pro';
+                    }
+
+                    public function marketplaceId()
+                    {
+                        return 'statamic/seo-pro';
+                    }
+
+                    public function edition()
+                    {
+                        return 'pro';
+                    }
+                };
+            }
+        };
+
+        $url = $this->controller()->addToCartUrl($site, $statamic, collect([$addon]));
+
+        $this->assertStringContainsString('statamic/seo-pro:pro', urldecode($url));
+    }
+
+    #[Test]
+    public function purchase_is_null_when_everything_is_licensed()
+    {
+        $statamic = new class
+        {
+            public function valid()
+            {
+                return true;
+            }
+        };
+
+        $this->assertNull($this->controller()->purchase(null, $statamic, collect()));
+    }
+
+    #[Test]
+    public function purchase_labels_statamic_pro_when_only_core_is_unlicensed()
+    {
+        $purchase = $this->controller()->purchase($this->site(), $this->statamic(valid: false), collect());
+
+        $this->assertEquals('Buy Statamic Pro', $purchase['label']);
+        $this->assertEquals('Statamic Pro', $purchase['items'][0]['name']);
+        $this->assertEquals('Per site. First year, then $99/year to renew.', $purchase['items'][0]['detail']);
+        $this->assertNull($purchase['items'][0]['price']);
+        $this->assertStringContainsString('cart/bulk-add', $purchase['checkoutUrl']);
+    }
+
+    #[Test]
+    public function purchase_uses_site_name_from_statamic_com_when_present()
+    {
+        $purchase = $this->controller()->purchase(
+            $this->site(name: 'Wayne Enterprises'),
+            $this->statamic(valid: false),
+            collect()
+        );
+
+        $this->assertEquals('Wayne Enterprises', $purchase['items'][0]['detail']);
+    }
+
+    #[Test]
+    public function purchase_labels_addon_licenses_when_only_addons_are_unlicensed()
+    {
+        $purchase = $this->controller()->purchase($this->site(name: 'Wayne Enterprises'), $this->statamic(), collect([$this->unlicensedAddon()]));
+
+        $this->assertEquals('Buy Addon Licenses', $purchase['label']);
+        $this->assertEquals('SEO Pro', $purchase['items'][0]['name']);
+        $this->assertNull($purchase['items'][0]['price']);
+        $this->assertEquals('These commercial addons need a license for Wayne Enterprises.', $purchase['description']);
+    }
+
+    #[Test]
+    public function purchase_includes_marketplace_price_and_thumbnail()
+    {
+        Marketplace::shouldReceive('packages')
+            ->once()
+            ->andReturn(collect([
+                'statamic/seo-pro' => [
+                    'price' => 55,
+                    'thumbnail' => 'https://statamic.com/img/seo-pro.png',
+                    'seller_name' => 'Statamic',
+                ],
+            ]));
+
+        $purchase = $this->controller()->purchase($this->site(), $this->statamic(), collect([$this->unlicensedAddon()]));
+
+        $this->assertEquals('$55', $purchase['items'][0]['price']);
+        $this->assertEquals('https://statamic.com/img/seo-pro.png', $purchase['items'][0]['thumbnail']);
+        $this->assertEquals('Statamic', $purchase['items'][0]['detail']);
+    }
+
+    #[Test]
+    public function purchase_uses_seller_slug_when_seller_name_is_missing()
+    {
+        Marketplace::shouldReceive('packages')
+            ->once()
+            ->andReturn(collect([
+                'statamic/seo-pro' => [
+                    'seller' => 'statamic',
+                ],
+            ]));
+
+        $purchase = $this->controller()->purchase($this->site(), $this->statamic(), collect([$this->unlicensedAddon(developer: null)]));
+
+        $this->assertEquals('Statamic', $purchase['items'][0]['detail']);
+    }
+
+    #[Test]
+    public function purchase_labels_licenses_when_core_and_addons_are_unlicensed()
+    {
+        $purchase = $this->controller()->purchase($this->site(), $this->statamic(valid: false), collect([$this->unlicensedAddon()]));
+
+        $this->assertEquals('Buy Licenses', $purchase['label']);
+        $this->assertCount(2, $purchase['items']);
+    }
+
+    #[Test]
+    public function purchase_is_available_when_the_site_is_not_connected()
+    {
+        $purchase = $this->controller()->purchase(
+            $this->site(connected: false),
+            $this->statamic(valid: false),
+            collect([$this->unlicensedAddon()])
+        );
+
+        $this->assertEquals('Buy Licenses', $purchase['label']);
+        $this->assertCount(2, $purchase['items']);
+    }
+
+    #[Test]
+    public function purchase_labels_renew_when_statamic_needs_renewal()
+    {
+        $purchase = $this->controller()->purchase(
+            $this->site(),
+            $this->statamic(valid: false, needsRenewal: true),
+            collect()
+        );
+
+        $this->assertEquals('Renew License', $purchase['label']);
+        $this->assertEquals('Your Statamic Pro license does not cover this version. Renew to keep using it, or downgrade to a version in range.', $purchase['description']);
+    }
+
+    private function site(?string $name = null, bool $connected = true): object
+    {
+        return new class($name, $connected)
+        {
+            public function __construct(private ?string $name, private bool $connected)
+            {
+            }
+
+            public function key()
+            {
+                return 'site_abcdefghijklmnopqrstuvwxyz';
+            }
+
+            public function name()
+            {
+                return $this->name;
+            }
+
+            public function isConnected()
+            {
+                return $this->connected;
+            }
+        };
+    }
+
+    private function statamic(bool $valid = true, bool $needsRenewal = false): object
+    {
+        return new class($valid, $needsRenewal)
+        {
+            public function __construct(private bool $valid, private bool $needsRenewal)
+            {
+            }
+
+            public function valid()
+            {
+                return $this->valid;
+            }
+
+            public function needsRenewal()
+            {
+                return $this->needsRenewal;
+            }
+        };
+    }
+
+    private function unlicensedAddon(?string $developer = 'Statamic'): object
+    {
+        return new class($developer)
+        {
+            public function __construct(private ?string $developer)
+            {
+            }
+
+            public function valid()
+            {
+                return false;
+            }
+
+            public function name()
+            {
+                return 'SEO Pro';
+            }
+
+            public function version()
+            {
+                return '7.x-dev';
+            }
+
+            public function edition()
+            {
+                return 'pro';
+            }
+
+            public function addon()
+            {
+                $developer = $this->developer;
+
+                return new class($developer)
+                {
+                    public function __construct(private ?string $developer)
+                    {
+                    }
+
+                    public function id()
+                    {
+                        return 'statamic/seo-pro';
+                    }
+
+                    public function marketplaceId()
+                    {
+                        return 'statamic/seo-pro';
+                    }
+
+                    public function edition()
+                    {
+                        return 'pro';
+                    }
+
+                    public function marketplaceUrl()
+                    {
+                        return 'https://statamic.com/addons/statamic/seo-pro';
+                    }
+
+                    public function developer()
+                    {
+                        return $this->developer;
+                    }
+                };
+            }
+        };
+    }
+
+    private function controller(): LicensingController
+    {
+        return $this->app->make(LicensingController::class);
+    }
+}
diff --git a/tests/CP/Licensing/FreshSiteKeyTest.php b/tests/CP/Licensing/FreshSiteKeyTest.php
new file mode 100644
index 00000000000..97d4a229b6a
--- /dev/null
+++ b/tests/CP/Licensing/FreshSiteKeyTest.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace Tests\CP\Licensing;
+
+use Illuminate\Filesystem\Filesystem;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Statamic\Licensing\Outpost;
+use Statamic\Licensing\SiteKey;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class FreshSiteKeyTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private Filesystem $files;
+
+    private string $envPath;
+
+    private string $examplePath;
+
+    private string $oldKey = 'site_abcdefghijklmnopqrstuvwxyz';
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->files = app(Filesystem::class);
+        $this->envPath = base_path('.env');
+        $this->examplePath = base_path('.env.example');
+
+        $this->files->put($this->envPath, "APP_NAME=Statamic\nSTATAMIC_SITE_KEY={$this->oldKey}\n");
+        $this->files->put($this->examplePath, "APP_NAME=Statamic\nSTATAMIC_SITE_KEY={$this->oldKey}\n");
+
+        config([
+            'statamic.system.site_key' => $this->oldKey,
+            'statamic.system.license_key' => null,
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        $this->files->delete($this->envPath);
+        $this->files->delete($this->examplePath);
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_generates_a_fresh_key_for_an_unlinked_site()
+    {
+        $this->fakeOutpost(['site' => ['claimed' => false]]);
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->post(cp_route('utilities.licensing.fresh'))
+            ->assertRedirect(cp_route('utilities.licensing'))
+            ->assertSessionHas('success');
+
+        preg_match('/^STATAMIC_SITE_KEY=(.+)$/m', $this->files->get($this->envPath), $matches);
+
+        $this->assertTrue((new SiteKey)->isValid($matches[1] ?? null));
+        $this->assertNotEquals($this->oldKey, $matches[1]);
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$matches[1], $this->files->get($this->examplePath));
+        $this->assertEquals($matches[1], config('statamic.system.site_key'));
+    }
+
+    #[Test]
+    public function it_refuses_once_the_site_is_linked()
+    {
+        $this->fakeOutpost(['site' => ['claimed' => true]]);
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->post(cp_route('utilities.licensing.fresh'))
+            ->assertRedirect(cp_route('utilities.licensing'))
+            ->assertSessionHas('error');
+
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$this->oldKey, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_allows_a_fresh_key_after_a_failed_claim_even_if_outpost_says_claimed()
+    {
+        $this->fakeOutpost(['site' => ['claimed' => true]]);
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->withSession(['licensing.already_linked' => true])
+            ->post(cp_route('utilities.licensing.fresh'))
+            ->assertRedirect(cp_route('utilities.licensing'))
+            ->assertSessionHas('success')
+            ->assertSessionMissing('licensing.already_linked');
+
+        preg_match('/^STATAMIC_SITE_KEY=(.+)$/m', $this->files->get($this->envPath), $matches);
+
+        $this->assertTrue((new SiteKey)->isValid($matches[1] ?? null));
+        $this->assertNotEquals($this->oldKey, $matches[1]);
+    }
+
+    #[Test]
+    public function it_refuses_when_a_legacy_license_key_is_in_use()
+    {
+        config(['statamic.system.license_key' => 'aRadLicenseKey42']);
+        $this->fakeOutpost(['site' => ['claimed' => false]]);
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->post(cp_route('utilities.licensing.fresh'))
+            ->assertRedirect(cp_route('utilities.licensing'))
+            ->assertSessionHas('error');
+
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$this->oldKey, $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_denies_access_without_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->post(cp_route('utilities.licensing.fresh'))
+            ->assertRedirect('/cp');
+
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$this->oldKey, $this->files->get($this->envPath));
+    }
+
+    private function fakeOutpost(array $response): void
+    {
+        $outpost = $this->mock(Outpost::class);
+        $outpost->shouldReceive('response')->andReturn(array_merge([
+            'public' => true,
+            'statamic' => ['valid' => false, 'reason' => 'unlicensed'],
+            'packages' => [],
+        ], $response));
+        $outpost->shouldReceive('usingLicenseKeyFile')->andReturn(false);
+        $outpost->shouldReceive('clearCachedResponse');
+    }
+}
diff --git a/tests/CP/Licensing/MintSiteKeyTest.php b/tests/CP/Licensing/MintSiteKeyTest.php
new file mode 100644
index 00000000000..0acd967a5e5
--- /dev/null
+++ b/tests/CP/Licensing/MintSiteKeyTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\CP\Licensing;
+
+use Illuminate\Filesystem\Filesystem;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Facades\User;
+use Statamic\Licensing\SiteKey;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class MintSiteKeyTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private Filesystem $files;
+
+    private string $envPath;
+
+    private string $examplePath;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->files = app(Filesystem::class);
+        $this->envPath = base_path('.env');
+        $this->examplePath = base_path('.env.example');
+
+        $this->files->put($this->envPath, "APP_NAME=Statamic\n");
+        $this->files->put($this->examplePath, "APP_NAME=Statamic\nSTATAMIC_SITE_KEY=\n");
+
+        config([
+            'statamic.system.site_key' => null,
+            'statamic.system.license_key' => null,
+        ]);
+    }
+
+    public function tearDown(): void
+    {
+        $this->files->delete($this->envPath);
+        $this->files->delete($this->examplePath);
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_mints_a_site_key_from_the_control_panel()
+    {
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->from(cp_route('utilities.licensing'))
+            ->post(cp_route('utilities.licensing.mint'))
+            ->assertRedirect(cp_route('utilities.licensing'))
+            ->assertSessionHas('success');
+
+        preg_match('/^STATAMIC_SITE_KEY=(.+)$/m', $this->files->get($this->envPath), $matches);
+
+        $this->assertTrue((new SiteKey)->isValid($matches[1] ?? null));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$matches[1], $this->files->get($this->examplePath));
+    }
+
+    #[Test]
+    public function it_does_not_overwrite_an_existing_key()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this
+            ->actingAs(User::make()->makeSuper()->save())
+            ->post(cp_route('utilities.licensing.mint'))
+            ->assertRedirect(cp_route('utilities.licensing'))
+            ->assertSessionHas('error');
+
+        $this->assertStringNotContainsString('STATAMIC_SITE_KEY=site_', $this->files->get($this->envPath));
+    }
+
+    #[Test]
+    public function it_denies_access_without_permission()
+    {
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+
+        $this
+            ->actingAs($user)
+            ->post(cp_route('utilities.licensing.mint'))
+            ->assertRedirect('/cp');
+
+        $this->assertStringNotContainsString('STATAMIC_SITE_KEY=', $this->files->get($this->envPath));
+    }
+}
diff --git a/tests/Console/Commands/InstallMintsSiteKeyTest.php b/tests/Console/Commands/InstallMintsSiteKeyTest.php
new file mode 100644
index 00000000000..c0ffd67c589
--- /dev/null
+++ b/tests/Console/Commands/InstallMintsSiteKeyTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use Illuminate\Filesystem\Filesystem;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Console\Commands\Install;
+use Statamic\Licensing\SiteKey;
+use Tests\TestCase;
+
+class InstallMintsSiteKeyTest extends TestCase
+{
+    private Filesystem $files;
+
+    private string $envPath;
+
+    private string $examplePath;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->files = app(Filesystem::class);
+        $this->envPath = base_path('.env');
+        $this->examplePath = base_path('.env.example');
+
+        $this->files->put($this->envPath, "APP_NAME=Statamic\n");
+        $this->files->put($this->examplePath, "APP_NAME=Statamic\nSTATAMIC_SITE_KEY=\n");
+    }
+
+    public function tearDown(): void
+    {
+        $this->files->delete($this->envPath);
+        $this->files->delete($this->examplePath);
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_mints_a_site_key_into_env_files()
+    {
+        $command = $this->app->make(Install::class);
+        $command->setLaravel($this->app);
+        $command->mintSiteKey();
+
+        $env = $this->files->get($this->envPath);
+        preg_match('/^STATAMIC_SITE_KEY=(.+)$/m', $env, $matches);
+
+        $this->assertTrue((new SiteKey)->isValid($matches[1] ?? null));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$matches[1], $this->files->get($this->examplePath));
+        $this->assertEquals($matches[1], config('statamic.system.site_key'));
+    }
+
+    #[Test]
+    public function it_does_not_overwrite_an_existing_site_key()
+    {
+        $this->files->put($this->envPath, "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+
+        $command = $this->app->make(Install::class);
+        $command->setLaravel($this->app);
+        $command->mintSiteKey();
+
+        $this->assertStringContainsString('STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz', $this->files->get($this->envPath));
+        $this->assertEquals('site_abcdefghijklmnopqrstuvwxyz', config('statamic.system.site_key'));
+    }
+
+    #[Test]
+    public function it_does_not_mint_for_a_site_with_a_legacy_license_key()
+    {
+        $this->files->put($this->envPath, "APP_NAME=Statamic\nSTATAMIC_LICENSE_KEY=aRadLicenseKey42\n");
+
+        $command = $this->app->make(Install::class);
+        $command->setLaravel($this->app);
+        $command->mintSiteKey();
+
+        $this->assertStringNotContainsString('STATAMIC_SITE_KEY=', $this->files->get($this->envPath));
+        $this->assertMatchesRegularExpression('/^STATAMIC_SITE_KEY=\s*$/m', $this->files->get($this->examplePath));
+        $this->assertNull(config('statamic.system.site_key'));
+    }
+
+    #[Test]
+    public function it_does_not_mint_in_ci()
+    {
+        $_SERVER['STATAMIC_TEST_CI'] = 'true';
+
+        try {
+            $command = $this->app->make(Install::class);
+            $command->setLaravel($this->app);
+            $command->mintSiteKey();
+
+            $this->assertStringNotContainsString('STATAMIC_SITE_KEY=', $this->files->get($this->envPath));
+            $this->assertMatchesRegularExpression('/^STATAMIC_SITE_KEY=\s*$/m', $this->files->get($this->examplePath));
+        } finally {
+            unset($_SERVER['STATAMIC_TEST_CI']);
+        }
+    }
+}
diff --git a/tests/Console/Commands/LicenseTest.php b/tests/Console/Commands/LicenseTest.php
new file mode 100644
index 00000000000..4bbfaaeb262
--- /dev/null
+++ b/tests/Console/Commands/LicenseTest.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use Illuminate\Support\Facades\Http;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Licensing\DeviceFlow;
+use Statamic\Licensing\LicenseManager;
+use Statamic\Licensing\SiteLicense;
+use Tests\TestCase;
+
+class LicenseTest extends TestCase
+{
+    #[Test]
+    public function it_starts_the_device_flow_when_the_site_is_not_connected()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses('connect');
+
+        Http::fake([
+            DeviceFlow::START_URL => Http::response([
+                'url' => 'https://statamic.com/account/licensing/device/AB12-CD34',
+                'code' => 'AB12-CD34',
+                'device_code' => 'dev_123',
+                'interval' => 1,
+            ]),
+            DeviceFlow::POLL_URL => Http::response([
+                'status' => 'complete',
+            ]),
+        ]);
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('https://statamic.com/account/licensing/device/AB12-CD34')
+            ->expectsOutputToContain('AB12-CD34')
+            ->assertSuccessful();
+
+        Http::assertSent(fn ($request) => $request->url() === DeviceFlow::START_URL
+            && $request['key'] === 'site_abcdefghijklmnopqrstuvwxyz'
+            && $request['name'] === config('app.name'));
+    }
+
+    #[Test]
+    public function it_skips_the_device_flow_when_already_licensed()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses(null);
+
+        Http::fake();
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('already licensed')
+            ->assertSuccessful();
+
+        Http::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_skips_the_device_flow_when_already_connected()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses('buy');
+
+        Http::fake();
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('already linked')
+            ->expectsOutputToContain('https://statamic.com/account/sites/site_abcdefghijklmnopqrstuvwxyz')
+            ->assertSuccessful();
+
+        Http::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_skips_the_device_flow_when_the_license_needs_renewal()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses('renew');
+
+        Http::fake();
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('already linked')
+            ->expectsOutputToContain('https://statamic.com/account/sites/site_abcdefghijklmnopqrstuvwxyz')
+            ->assertSuccessful();
+
+        Http::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_skips_the_device_flow_when_the_domain_is_invalid()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses('domain');
+
+        Http::fake();
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('this domain is not on the site record')
+            ->expectsOutputToContain('https://statamic.com/account/sites/site_abcdefghijklmnopqrstuvwxyz')
+            ->assertSuccessful();
+
+        Http::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_skips_the_device_flow_when_using_a_license_key_file()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses('connect', usingLicenseKeyFile: true);
+
+        Http::fake();
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('offline license key file')
+            ->assertSuccessful();
+
+        Http::assertNothingSent();
+    }
+
+    #[Test]
+    public function it_starts_the_device_flow_when_outpost_cannot_be_reached()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->mockLicenses('connect', requestFailed: true);
+
+        Http::fake([
+            DeviceFlow::START_URL => Http::response([
+                'url' => 'https://statamic.com/account/licensing/device/AB12-CD34',
+                'code' => 'AB12-CD34',
+                'device_code' => 'dev_123',
+                'interval' => 1,
+            ]),
+            DeviceFlow::POLL_URL => Http::response([
+                'status' => 'complete',
+            ]),
+        ]);
+
+        $this->artisan('statamic:license', ['--poll-once' => true])
+            ->expectsOutputToContain('AB12-CD34')
+            ->assertSuccessful();
+    }
+
+    private function mockLicenses(?string $action, bool $usingLicenseKeyFile = false, bool $requestFailed = false): void
+    {
+        $licenses = $this->mock(LicenseManager::class);
+        $licenses->shouldReceive('refresh');
+        $licenses->shouldReceive('usingLicenseKeyFile')->andReturn($usingLicenseKeyFile);
+        $licenses->shouldReceive('requestFailed')->andReturn($requestFailed);
+        $licenses->shouldReceive('primaryAction')->andReturn($action);
+        $licenses->shouldReceive('site')->andReturn(new SiteLicense([
+            'key' => 'site_abcdefghijklmnopqrstuvwxyz',
+        ]));
+    }
+}
diff --git a/tests/Console/Commands/ProEnableTest.php b/tests/Console/Commands/ProEnableTest.php
index 6c7ebb042ed..e1c7c7cccff 100644
--- a/tests/Console/Commands/ProEnableTest.php
+++ b/tests/Console/Commands/ProEnableTest.php
@@ -294,7 +294,8 @@ public function it_mentions_setting_license_key_later_when_left_blank()
         $this
             ->artisan('statamic:pro:enable')
             ->expectsQuestion('If you have a Statamic license key, paste it now', '')
-            ->expectsOutputToContain('Add `STATAMIC_LICENSE_KEY=...` to your `.env` before or when your site goes live.');
+            ->expectsOutputToContain('php please license')
+            ->expectsOutputToContain('STATAMIC_LICENSE_KEY=...');
     }
 
     #[Test]
diff --git a/tests/Console/Commands/SiteFreshKeyTest.php b/tests/Console/Commands/SiteFreshKeyTest.php
new file mode 100644
index 00000000000..1ece197d0c8
--- /dev/null
+++ b/tests/Console/Commands/SiteFreshKeyTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Tests\Console\Commands;
+
+use Illuminate\Filesystem\Filesystem;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Licensing\SiteKey;
+use Tests\TestCase;
+
+class SiteFreshKeyTest extends TestCase
+{
+    private Filesystem $files;
+
+    private string $envPath;
+
+    private string $examplePath;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->files = app(Filesystem::class);
+        $this->envPath = base_path('.env');
+        $this->examplePath = base_path('.env.example');
+
+        $this->files->put($this->envPath, "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+        $this->files->put($this->examplePath, "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+    }
+
+    public function tearDown(): void
+    {
+        $this->files->delete($this->envPath);
+        $this->files->delete($this->examplePath);
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_regenerates_the_site_key_in_both_env_files()
+    {
+        $this->artisan('statamic:site:fresh-key')
+            ->assertSuccessful();
+
+        preg_match('/^STATAMIC_SITE_KEY=(.+)$/m', $this->files->get($this->envPath), $matches);
+
+        $this->assertTrue((new SiteKey)->isValid($matches[1] ?? null));
+        $this->assertNotEquals('site_abcdefghijklmnopqrstuvwxyz', $matches[1]);
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$matches[1], $this->files->get($this->examplePath));
+        $this->assertEquals($matches[1], config('statamic.system.site_key'));
+    }
+}
diff --git a/tests/Facades/ConfigTest.php b/tests/Facades/ConfigTest.php
index 86391460dd4..3f2869a3d11 100644
--- a/tests/Facades/ConfigTest.php
+++ b/tests/Facades/ConfigTest.php
@@ -65,6 +65,20 @@ public function gets_license_key()
         $this->assertNull(Config::getLicenseKey());
     }
 
+    #[Test]
+    public function gets_license_key_prefers_legacy_license_key()
+    {
+        config([
+            'statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz',
+            'statamic.system.license_key' => 'legacy',
+        ]);
+
+        $this->assertEquals('legacy', Config::getLicenseKey());
+
+        config(['statamic.system.license_key' => '']);
+        $this->assertEquals('site_abcdefghijklmnopqrstuvwxyz', Config::getLicenseKey());
+    }
+
     #[Test]
     public function gets_site()
     {
diff --git a/tests/Licensing/LicenseManagerTest.php b/tests/Licensing/LicenseManagerTest.php
index 44a37e27384..cdc09574ba9 100644
--- a/tests/Licensing/LicenseManagerTest.php
+++ b/tests/Licensing/LicenseManagerTest.php
@@ -187,6 +187,140 @@ public function it_checks_for_request_failures()
         });
     }
 
+    #[Test]
+    public function licensing_alert_distinguishes_identity_from_license()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $alert = $this->managerWithResponse([
+            'public' => false,
+            'statamic' => ['valid' => false, 'reason' => 'unlicensed'],
+            'packages' => [],
+        ])->licensingAlert();
+
+        $this->assertTrue($alert['testing']);
+        $this->assertTrue($alert['hasSiteKey']);
+        $this->assertStringContainsString('isn\'t linked to a statamic.com account', $alert['message']);
+        $this->assertStringContainsString('trial mode', $alert['message']);
+        $this->assertEquals('connect', $this->managerWithResponse([
+            'public' => false,
+            'site' => ['claimed' => false],
+            'statamic' => ['valid' => false, 'reason' => 'unlicensed'],
+            'packages' => [],
+        ])->primaryAction());
+    }
+
+    #[Test]
+    public function licensing_alert_notes_a_missing_site_key()
+    {
+        config([
+            'statamic.system.site_key' => null,
+            'statamic.system.license_key' => null,
+        ]);
+
+        $alert = $this->managerWithResponse([
+            'public' => true,
+            'statamic' => ['valid' => false, 'reason' => 'unlicensed'],
+            'packages' => [],
+        ])->licensingAlert();
+
+        $this->assertFalse($alert['hasSiteKey']);
+        $this->assertArrayNotHasKey('sharedKey', $alert);
+        $this->assertStringContainsString('does not have a site key', $alert['message']);
+    }
+
+    #[Test]
+    public function licensing_alert_notes_a_connected_site_without_a_license()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $alert = $this->managerWithResponse([
+            'public' => true,
+            'site' => ['claimed' => true],
+            'statamic' => ['valid' => false, 'reason' => 'unlicensed'],
+            'packages' => [],
+        ])->licensingAlert();
+
+        $this->assertStringContainsString('linked to a statamic.com account but has no license', $alert['message']);
+        $this->assertStringNotContainsString('php please license', $alert['message']);
+    }
+
+    #[Test]
+    public function licensing_alert_notes_a_connected_site_that_needs_renewal()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $alert = $this->managerWithResponse([
+            'public' => true,
+            'site' => ['claimed' => true],
+            'statamic' => ['valid' => false, 'reason' => 'outside_license_range', 'range' => ['5', '5']],
+            'packages' => [],
+        ])->licensingAlert();
+
+        $this->assertStringContainsString('needs to be renewed', $alert['message']);
+        $this->assertStringNotContainsString('has no license attached', $alert['message']);
+        $this->assertEquals('renew', $this->managerWithResponse([
+            'public' => true,
+            'site' => ['claimed' => true, 'valid' => true],
+            'statamic' => ['valid' => false, 'reason' => 'outside_license_range'],
+            'packages' => [],
+        ])->primaryAction());
+    }
+
+    #[Test]
+    public function primary_action_follows_connection_state()
+    {
+        config([
+            'statamic.system.site_key' => null,
+            'statamic.system.license_key' => null,
+        ]);
+
+        $this->assertEquals('mint', $this->managerWithResponse([
+            'statamic' => ['valid' => true],
+            'packages' => [],
+        ])->primaryAction());
+
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->assertEquals('connect', $this->managerWithResponse([
+            'site' => ['claimed' => false],
+            'statamic' => ['valid' => false],
+            'packages' => [],
+        ])->primaryAction());
+
+        $this->assertEquals('domain', $this->managerWithResponse([
+            'site' => ['claimed' => true, 'reason' => 'invalid_domain', 'valid' => false],
+            'statamic' => ['valid' => false],
+            'packages' => [],
+        ])->primaryAction());
+
+        $this->assertEquals('buy', $this->managerWithResponse([
+            'site' => ['claimed' => true, 'valid' => true],
+            'statamic' => ['valid' => false, 'reason' => 'unlicensed'],
+            'packages' => [],
+        ])->primaryAction());
+
+        $this->assertEquals('renew', $this->managerWithResponse([
+            'site' => ['claimed' => true, 'valid' => true],
+            'statamic' => ['valid' => false, 'reason' => 'outside_license_range'],
+            'packages' => [],
+        ])->primaryAction());
+
+        $this->assertEquals('buy', $this->managerWithResponse([
+            'site' => ['claimed' => true, 'valid' => true],
+            'statamic' => ['valid' => false, 'reason' => 'outside_license_range'],
+            'packages' => [
+                'foo/bar' => ['valid' => false],
+            ],
+        ])->primaryAction());
+
+        $this->assertNull($this->managerWithResponse([
+            'site' => ['claimed' => true, 'valid' => true],
+            'statamic' => ['valid' => true],
+            'packages' => [],
+        ])->primaryAction());
+    }
+
     private function managerWithResponse(array $response)
     {
         $outpost = $this->mock(Outpost::class);
diff --git a/tests/Licensing/OutpostTest.php b/tests/Licensing/OutpostTest.php
index 17a02670a96..89fc99737c0 100644
--- a/tests/Licensing/OutpostTest.php
+++ b/tests/Licensing/OutpostTest.php
@@ -42,6 +42,7 @@ public function it_builds_the_request_payload()
 
         $this->assertEquals([
             'key' => 'test-key',
+            'name' => config('app.name'),
             'host' => 'localhost',
             'ip' => '123.123.123.123',
             'port' => 123,
@@ -56,6 +57,28 @@ public function it_builds_the_request_payload()
         ], $this->outpost()->payload());
     }
 
+    #[Test]
+    public function the_payload_key_prefers_a_legacy_license_key_over_the_site_key()
+    {
+        config([
+            'statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz',
+            'statamic.system.license_key' => 'legacy-license',
+        ]);
+
+        $this->assertEquals('legacy-license', $this->outpost()->payload()['key']);
+    }
+
+    #[Test]
+    public function the_payload_key_falls_back_to_the_site_key()
+    {
+        config([
+            'statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz',
+            'statamic.system.license_key' => null,
+        ]);
+
+        $this->assertEquals('site_abcdefghijklmnopqrstuvwxyz', $this->outpost()->payload()['key']);
+    }
+
     #[Test]
     public function it_contacts_the_outpost_and_caches_the_response()
     {
@@ -97,7 +120,6 @@ public function the_cached_response_is_used_when_only_the_environment_has_change
         $outpost = $this->outpostWithJsonResponse(['newer' => 'response']);
 
         $payload = $outpost->payload();
-        $payload['host'] = 'some-other-host.com';
         $payload['ip'] = '9.9.9.9';
         $payload['port'] = null;
         $payload['php_version'] = '1.2.3';
@@ -110,6 +132,22 @@ public function the_cached_response_is_used_when_only_the_environment_has_change
         $this->assertEquals($testCachedResponse, $outpost->response());
     }
 
+    #[Test]
+    public function the_cached_response_is_not_reused_when_the_host_has_changed()
+    {
+        $outpost = $this->outpostWithJsonResponse(['newer' => 'response']);
+
+        $payload = $outpost->payload();
+        $payload['host'] = 'some-other-host.com';
+
+        $this->setCachedResponse([
+            'cached' => 'response',
+            'payload' => $payload,
+        ]);
+
+        $this->assertArraySubset(['newer' => 'response'], $outpost->response());
+    }
+
     #[Test]
     public function license_key_file_is_used_when_it_exists()
     {
diff --git a/tests/Licensing/SiteKeyTest.php b/tests/Licensing/SiteKeyTest.php
new file mode 100644
index 00000000000..4ab1155ef25
--- /dev/null
+++ b/tests/Licensing/SiteKeyTest.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Tests\Licensing;
+
+use Illuminate\Support\Facades\File;
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Licensing\SiteKey;
+use Tests\TestCase;
+
+class SiteKeyTest extends TestCase
+{
+    private string $dir;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $this->dir = sys_get_temp_dir().'/statamic-site-key-'.uniqid();
+        File::makeDirectory($this->dir);
+    }
+
+    public function tearDown(): void
+    {
+        File::deleteDirectory($this->dir);
+
+        parent::tearDown();
+    }
+
+    #[Test]
+    public function it_generates_a_valid_site_key()
+    {
+        $key = (new SiteKey)->generate();
+
+        $this->assertTrue((new SiteKey)->isValid($key));
+        $this->assertMatchesRegularExpression('/^site_[a-zA-Z0-9]{26}$/', $key);
+    }
+
+    #[Test]
+    public function it_writes_a_generated_key_to_blank_env_files()
+    {
+        File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\n");
+        File::put($example = $this->dir.'/.env.example', "APP_NAME=Statamic\nSTATAMIC_SITE_KEY=\n");
+
+        $key = (new SiteKey)->ensure($env, $example);
+
+        $this->assertTrue((new SiteKey)->isValid($key));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$key, File::get($env));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$key, File::get($example));
+    }
+
+    #[Test]
+    public function it_does_not_overwrite_a_populated_env_key()
+    {
+        File::put($env = $this->dir.'/.env', "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+        File::put($example = $this->dir.'/.env.example', "APP_NAME=Statamic\n");
+
+        $key = (new SiteKey)->ensure($env, $example);
+
+        $this->assertEquals('site_abcdefghijklmnopqrstuvwxyz', $key);
+        $this->assertEquals("STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n", File::get($env));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz', File::get($example));
+    }
+
+    #[Test]
+    public function it_does_not_mint_in_ci()
+    {
+        $_SERVER['STATAMIC_TEST_CI'] = 'true';
+
+        try {
+            File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\n");
+            File::put($example = $this->dir.'/.env.example', "APP_NAME=Statamic\n");
+
+            $this->assertNull((new SiteKey)->ensure($env, $example));
+            $this->assertStringNotContainsString('STATAMIC_SITE_KEY=', File::get($env));
+        } finally {
+            unset($_SERVER['STATAMIC_TEST_CI']);
+        }
+    }
+
+    #[Test]
+    public function it_does_not_mint_when_a_legacy_license_key_is_in_use()
+    {
+        File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\nSTATAMIC_LICENSE_KEY=aRadLicenseKey42\n");
+        File::put($example = $this->dir.'/.env.example', "APP_NAME=Statamic\nSTATAMIC_SITE_KEY=\n");
+
+        $this->assertTrue((new SiteKey)->hasLegacyLicenseKey($env));
+        $this->assertNull((new SiteKey)->ensure($env, $example));
+        $this->assertStringNotContainsString('STATAMIC_SITE_KEY=', File::get($env));
+        $this->assertMatchesRegularExpression('/^STATAMIC_SITE_KEY=\s*$/m', File::get($example));
+    }
+
+    #[Test]
+    public function a_blank_legacy_license_key_does_not_block_minting()
+    {
+        File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\nSTATAMIC_LICENSE_KEY=\n");
+        File::put($example = $this->dir.'/.env.example', "APP_NAME=Statamic\n");
+
+        $this->assertFalse((new SiteKey)->hasLegacyLicenseKey($env));
+        $this->assertTrue((new SiteKey)->isValid((new SiteKey)->ensure($env, $example)));
+    }
+
+    #[Test]
+    public function it_copies_a_site_key_from_example_on_ensure()
+    {
+        File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\n");
+        File::put($example = $this->dir.'/.env.example', "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+
+        $key = (new SiteKey)->ensure($env, $example);
+
+        $this->assertEquals('site_abcdefghijklmnopqrstuvwxyz', $key);
+        $this->assertStringContainsString('STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz', File::get($env));
+    }
+
+    #[Test]
+    public function mint_ignores_a_key_in_example_and_generates_a_fresh_one()
+    {
+        File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\n");
+        File::put($example = $this->dir.'/.env.example', "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+
+        $key = (new SiteKey)->mint($env, $example);
+
+        $this->assertNotEquals('site_abcdefghijklmnopqrstuvwxyz', $key);
+        $this->assertTrue((new SiteKey)->isValid($key));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$key, File::get($env));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY='.$key, File::get($example));
+    }
+
+    #[Test]
+    public function mint_writes_even_in_ci()
+    {
+        $_SERVER['STATAMIC_TEST_CI'] = 'true';
+
+        try {
+            File::put($env = $this->dir.'/.env', "APP_NAME=Statamic\n");
+            File::put($example = $this->dir.'/.env.example', "APP_NAME=Statamic\nSTATAMIC_SITE_KEY=\n");
+
+            $key = (new SiteKey)->mint($env, $example);
+
+            $this->assertTrue((new SiteKey)->isValid($key));
+            $this->assertStringContainsString('STATAMIC_SITE_KEY='.$key, File::get($env));
+        } finally {
+            unset($_SERVER['STATAMIC_TEST_CI']);
+        }
+    }
+
+    #[Test]
+    public function write_overwrites_both_files()
+    {
+        File::put($env = $this->dir.'/.env', "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+        File::put($example = $this->dir.'/.env.example', "STATAMIC_SITE_KEY=site_abcdefghijklmnopqrstuvwxyz\n");
+
+        $key = (new SiteKey)->write('site_zyxwvutsrqponmlkjihgfedcba', $env, $example);
+
+        $this->assertEquals('site_zyxwvutsrqponmlkjihgfedcba', $key);
+        $this->assertStringContainsString('STATAMIC_SITE_KEY=site_zyxwvutsrqponmlkjihgfedcba', File::get($env));
+        $this->assertStringContainsString('STATAMIC_SITE_KEY=site_zyxwvutsrqponmlkjihgfedcba', File::get($example));
+    }
+}
diff --git a/tests/Licensing/SiteLicenseTest.php b/tests/Licensing/SiteLicenseTest.php
index 98dc967d137..8f38559256b 100644
--- a/tests/Licensing/SiteLicenseTest.php
+++ b/tests/Licensing/SiteLicenseTest.php
@@ -23,6 +23,39 @@ public function it_gets_the_key()
         $this->assertEquals('test-key', $this->license()->key());
     }
 
+    #[Test]
+    public function it_prefers_the_legacy_license_key_over_the_site_key()
+    {
+        config([
+            'statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz',
+            'statamic.system.license_key' => 'aRadLicenseKey42',
+        ]);
+
+        $this->assertEquals('aRadLicenseKey42', $this->license()->key());
+    }
+
+    #[Test]
+    public function it_uses_the_site_key_when_there_is_no_legacy_license_key()
+    {
+        config([
+            'statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz',
+            'statamic.system.license_key' => null,
+        ]);
+
+        $this->assertEquals('site_abcdefghijklmnopqrstuvwxyz', $this->license()->key());
+    }
+
+    #[Test]
+    public function it_falls_back_to_the_legacy_license_key()
+    {
+        config([
+            'statamic.system.site_key' => null,
+            'statamic.system.license_key' => 'aRadLicenseKey42',
+        ]);
+
+        $this->assertEquals('aRadLicenseKey42', $this->license()->key());
+    }
+
     #[Test]
     public function it_checks_for_incorrect_key_format()
     {
@@ -39,18 +72,88 @@ public function it_checks_for_correct_key_format()
         $this->assertFalse($this->license()->usesIncorrectKeyFormat());
     }
 
+    #[Test]
+    public function it_accepts_the_site_key_format()
+    {
+        config(['statamic.system.site_key' => 'site_abcdefghijklmnopqrstuvwxyz']);
+
+        $this->assertFalse($this->license()->usesIncorrectKeyFormat());
+    }
+
+    #[Test]
+    public function it_rejects_a_truncated_site_key()
+    {
+        config(['statamic.system.site_key' => 'site_tooshort']);
+
+        $this->assertTrue($this->license()->usesIncorrectKeyFormat());
+    }
+
+    #[Test]
+    public function it_does_not_flag_a_missing_key_as_incorrect_format()
+    {
+        config([
+            'statamic.system.site_key' => null,
+            'statamic.system.license_key' => null,
+        ]);
+
+        $this->assertFalse($this->license()->usesIncorrectKeyFormat());
+    }
+
     #[Test]
     public function it_gets_the_url_with_a_key()
     {
         config(['statamic.system.license_key' => 'test-key']);
 
         $this->assertEquals('https://statamic.com/account/sites/test-key', $this->license()->url());
+        $this->assertEquals('https://statamic.com/account/licensing/handoff?'.http_build_query([
+            'key' => 'test-key',
+            'name' => config('app.name'),
+            'host' => request()->getHost(),
+            'return' => url(cp_route('utilities.licensing')),
+        ]), $this->license()->handoffUrl());
     }
 
     #[Test]
     public function it_gets_the_edit_url_without_a_key()
     {
         $this->assertEquals('https://statamic.com/account/sites/create', $this->license()->url());
+        $this->assertNull($this->license()->handoffUrl());
+    }
+
+    #[Test]
+    public function it_gets_the_registered_site_name()
+    {
+        $this->assertNull($this->license()->name());
+        $this->assertEquals('Wayne Enterprises', $this->license(['name' => 'Wayne Enterprises'])->name());
+    }
+
+    #[Test]
+    public function it_knows_whether_the_site_is_connected()
+    {
+        $this->assertFalse($this->license()->isConnected());
+        $this->assertFalse($this->license(['claimed' => false])->isConnected());
+        $this->assertTrue($this->license(['claimed' => true])->isConnected());
+    }
+
+    #[Test]
+    public function it_hides_missing_domains_until_the_site_is_linked()
+    {
+        $unlinked = $this->license(['valid' => false, 'reason' => 'no_domains', 'claimed' => false]);
+
+        $this->assertTrue($unlinked->valid());
+        $this->assertNull($unlinked->invalidReason());
+
+        $linked = $this->license(['valid' => false, 'reason' => 'no_domains', 'claimed' => true]);
+
+        $this->assertFalse($linked->valid());
+        $this->assertEquals(__('statamic::messages.licensing_error_no_domains'), $linked->invalidReason());
+    }
+
+    #[Test]
+    public function it_knows_whether_the_domain_is_invalid()
+    {
+        $this->assertFalse($this->license()->hasInvalidDomain());
+        $this->assertTrue($this->license(['reason' => 'invalid_domain'])->hasInvalidDomain());
     }
 
     #[Test]
diff --git a/tests/Marketplace/ClientTest.php b/tests/Marketplace/ClientTest.php
new file mode 100644
index 00000000000..6296343166a
--- /dev/null
+++ b/tests/Marketplace/ClientTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Marketplace;
+
+use PHPUnit\Framework\Attributes\Test;
+use Statamic\Marketplace\Client;
+use Tests\TestCase;
+
+class ClientTest extends TestCase
+{
+    #[Test]
+    public function it_uses_the_production_marketplace_by_default()
+    {
+        $this->assertEquals(
+            'https://statamic.com/api/v1/marketplace/packages',
+            (new Client)->requestEndpoint('packages')
+        );
+    }
+
+    #[Test]
+    public function it_adds_a_scheme_to_statamic_domain()
+    {
+        $this->app->instance('env', 'testing');
+        putenv('STATAMIC_DOMAIN=statamic.com.test');
+        $_ENV['STATAMIC_DOMAIN'] = 'statamic.com.test';
+
+        $this->assertEquals(
+            'https://statamic.com.test/api/v1/marketplace/packages',
+            (new Client)->requestEndpoint('packages')
+        );
+
+        putenv('STATAMIC_DOMAIN');
+        unset($_ENV['STATAMIC_DOMAIN']);
+    }
+
+    #[Test]
+    public function it_falls_back_to_a_custom_licensing_url()
+    {
+        config(['statamic.system.licensing_url' => 'https://statamic.com.test']);
+
+        $this->assertEquals(
+            'https://statamic.com.test/api/v1/marketplace/packages',
+            (new Client)->requestEndpoint('packages')
+        );
+    }
+}