ENH - refine admin panel navigation style

.github/scripts/validate-repository.mjs

@@ -17,8 +17,6 @@ for (const requiredFragment of [
   "fx_version 'cerulean'",
   "node_version '22'",
   "use_experimental_fxv2_oal 'yes'",
-  "'source/server/nui_build_check.lua'",
-  "'source/html/sounds/**'",
   "ui_page 'source/html/index.html'",
 ]) {
   if (!manifest.includes(requiredFragment)) {

.github/workflows/release.yml

@@ -119,5 +119,5 @@ jobs:
               "${archive}.sha256" \
               --verify-tag \
               --generate-notes \
-              --title "$GITHUB_REF_NAME Beta"
+              --title "Sky Phone $GITHUB_REF_NAME"
           fi

AGENTS.md

@@ -92,23 +92,6 @@ as project instructions, not as optional documentation.
   proof.
 - Do not hand-edit generated frontend output.
 
-## Phone Configurator parity (mandatory)
-
-- Every new, changed, renamed, moved, or removed configurable value in
-  `sky_phone/config/config.lua` or `sky_phone/config/media.lua` **must** be
-  reflected in the in-game Phone Configurator in the same change. Config-only
-  changes without matching Configurator support are incomplete and must not be
-  committed or merged.
-- Keep the Configurator's runtime schema, defaults, value types, fixed versus
-  extensible collection rules, labels, descriptions, English and German
-  locales, SQL persistence, validation, and save/load roundtrip aligned with
-  the Lua configuration.
-- The Configurator must remain complete when file-based configuration is
-  disabled. Do not introduce a setting that can only be managed by editing Lua
-  after `Config.PhoneConfigurator.Enabled` is enabled.
-- Add or update contract/fixture coverage so configuration parity regressions
-  fail automated checks.
-
 ## Working method and verification
 
 1. Trace the relevant client, server, NUI, configuration, persistence, and event

README.md

@@ -29,7 +29,7 @@
 <p align="center">
   <a href="https://www.sky-systems.net/shop/phone#live-demo"><strong>Live demo</strong></a>
   &nbsp;&bull;&nbsp;
-  <a href="https://github.com/sky-systems/sky_phone/releases/latest"><strong>Download for free</strong></a>
+  <a href="https://github.com/sky-systems/sky_phone"><strong>Download for free</strong></a>
   &nbsp;&bull;&nbsp;
   <a href="https://discord.gg/sky-systems"><strong>Discord support</strong></a>
 </p>
@@ -44,7 +44,7 @@ Sky Phone is a **free and open-source FiveM phone script** built to give serious
 
 This is not a cut-down free alternative. Sky Phone includes the core experience server owners and players expect from a leading paid FiveM phone, plus full source access, no purchase price, no feature paywalls, and no forced ecosystem lock-in.
 
-The production frontend is included in the published release package, so a normal server installation does not require Node.js or pnpm. GitHub's automatically generated source archives do not contain that build.
+The production frontend is included, so a normal server installation does not require Node.js or pnpm.
 
 ## Why Sky Phone stands out
 
@@ -86,10 +86,10 @@ Sky Phone is built to be the **free FiveM phone you can choose without accepting
 | Layer | Supported options |
 | --- | --- |
 | **Frameworks** | ESX Legacy, QBCore, Qbox |
-| **Inventories** | ak47_inventory, codem-inventory, core_inventory, jaksam_inventory, jpr-inventory, lj-inventory, mf-inventory, one_inventory, origen_inventory, ox_inventory, ps-inventory, qb-inventory, qs-inventory, smx-inventory, tgiann-inventory, hex_4_inventory, and native ESX inventory |
+| **Inventories** | ox_inventory, qb-inventory, lj-inventory, qs-inventory, codem-inventory, core_inventory, mf-inventory, smx-inventory, hex_4_inventory, and native ESX inventory |
 | **Calls** | YACA, PMA Voice, SaltyChat |
 | **Radio** | YACA, PMA Voice, SaltyChat |
-| **Housing** | RTX Housing, Quasar Housing, TGIANN House, VMS Housing, RX Housing, NoLag Properties, SN Properties, ESX Property, qbx_properties |
+| **Housing** | RTX Housing, Quasar Housing, VMS Housing, RX Housing, NoLag Properties, SN Properties, ESX Property, qbx_properties |
 | **Garages** | Built-in/custom data and a broad set of popular garage providers configured through the bridge |
 | **Custom app contracts** | Sky Phone, LB Phone, 17Movement, High Phone, Quasar Smartphone, YSeries |
 | **Languages** | English, German |
@@ -121,33 +121,20 @@ Sky Phone is built to be the **free FiveM phone you can choose without accepting
 | **Framework** | ESX Legacy (`es_extended`), QBCore (`qb-core`), or Qbox (`qbx_core`) |
 | **Inventory** | Choose one supported adapter from the table below |
 
-| Inventory (configuration value) | Metadata support | Unique Phones | Notes |
+| Inventory | Metadata support | Unique Phones | Notes |
 | --- | --- | --- | --- |
-| `jaksam_inventory` (`jaksam`) | Yes | Yes | Direct per-slot metadata; usable items are registered through jaksam_inventory |
-| `qs-inventory` (`qs`) | Yes | Yes | Full per-slot metadata |
-| `ps-inventory` (`ps`) | Yes | Yes | QBCore only; uses item `info` metadata |
-| `codem-inventory` (`codem`) | Yes | Yes | Full per-slot metadata |
-| `tgiann-inventory` (`tgiann`) | Yes | Yes | Per-slot metadata; item definitions must enable `hasMetadata` |
-| `core_inventory` (`core`) | Yes | Yes | Full per-slot metadata |
-| `jpr-inventory` (`jpr`) | Yes | Yes | QBCore only; uses item `info` metadata |
-| `origen_inventory` (`origen`) | Yes | Yes | Full per-slot metadata |
-| `ak47_inventory` (`ak47`) | Yes | Yes | Uses per-slot item `info` metadata |
-| `one_inventory` (`one`) | Yes | Yes | Full per-slot metadata |
-| `ox_inventory` (`ox`) | Yes | Yes | Full per-item phone and physical SIM metadata |
-| `mf-inventory` (`mf`) | Yes | Yes | ESX only |
-| `smx-inventory` (`smx`) | Yes | Yes | ESX only; one metadata record per configured item name through the player metadata bridge |
-| `lj-inventory` (`lj`) | Yes | Yes | QBCore inventory with item `info` metadata |
-| `qb-inventory` (`qb`) | Yes | Yes | Uses item `info` metadata |
-| `hex_4_inventory` (`hex`) | **No metadata support** | **No, Unique Phones are not possible** | ESX only; Sky Phone automatically disables unique phones and physical SIM cards |
-| Native ESX inventory (`esx`) | **No metadata support** | **No, Unique Phones are not possible** | Count-based items; Sky Phone automatically disables unique phones and physical SIM cards |
+| `ox_inventory` | Yes | Yes | Full per-item phone and physical SIM metadata |
+| `qb-inventory` | Yes | Yes | Uses item `info` metadata |
+| `lj-inventory` | Yes | Yes | QBCore inventory with item `info` metadata |
+| `qs-inventory` | Yes | Yes | Full per-slot metadata |
+| `codem-inventory` | Yes | Yes | Full per-slot metadata |
+| `core_inventory` | Yes | Yes | Full per-slot metadata |
+| `mf-inventory` | Yes | Yes | Supported with ESX |
+| `smx-inventory` | Yes | Yes | Supported with ESX through the player metadata bridge |
+| `hex_4_inventory` | **No metadata support** | **No, Unique Phones are not possible** | ESX only; set `Config.Phone.Unique = false` and `Config.Sim.Enabled = false` |
+| Native ESX inventory | **No metadata support** | **No, Unique Phones are not possible** | Count-based items; set `Config.Phone.Unique = false` and `Config.Sim.Enabled = false` |
 
-`hex_4_inventory` and native ESX inventory cannot persist per-item metadata. Sky Phone therefore forces `Config.Phone.Unique` and `Config.Sim.Enabled` to `false` at runtime whenever either adapter is active.
-
-`Config.Bridge.Inventory = "auto"` detects framework-compatible adapters in the table order. This deliberately matches the Sky inventory priority so a dedicated inventory is selected before a compatibility resource it may run beside. You may configure either the short value shown in parentheses or the exact resource name.
-
-The adapters shared with `sky_base` are implemented locally inside Sky Phone. Installing or starting `sky_base` is not required; Sky Phone remains a standalone resource.
-
-For configuration parity with `sky_base`, `qb-inv` is accepted as an alias for `qb`, while `qbox` selects the Qbox-native `ox_inventory` adapter.
+`hex_4_inventory` and native ESX inventory cannot persist per-item metadata. Unique Phones and physical SIM cards are therefore unavailable with these adapters.
 
 ### Voice
 
@@ -173,8 +160,8 @@ Start the selected voice resource before Sky Phone.
 
 ## Quick installation
 
-1. Download and extract the latest published [Sky Phone release](https://github.com/sky-systems/sky_phone/releases/latest). Do not use GitHub's automatically generated "Source code" archives for a server installation because they do not contain the built frontend.
-2. Copy the included resource into your FiveM resources directory and keep its folder name `sky_phone`.
+1. Copy the resource into your FiveM resources directory.
+2. Keep the resource folder name `sky_phone`.
 3. Start `oxmysql`, your framework, inventory, and voice resource before Sky Phone.
 4. Review `sky_phone/config/config.lua` and `sky_phone/config/media.lua`.
 5. Add the required inventory items.
@@ -195,13 +182,6 @@ Replace the example framework, inventory, and voice resources with the providers
 
 Sky Phone creates and upgrades its database tables automatically. A manual SQL import is normally not required.
 
-### How players open the phone
-
-- Give the player the item configured in `Config.Phone.Item` (default: `phone`).
-- Players can use that inventory item or press the configured keybind (default: `F1`).
-- The keybind still verifies server-side that the player owns a configured phone item; it does not bypass inventory ownership.
-- A SIM card is **not required to open or use the phone itself**. With `Config.Sim.Enabled = true`, only cellular features such as calls and messages require an inserted SIM.
-
 ## Configuration
 
 Customer settings are organized in:
@@ -216,7 +196,6 @@ The files contain clearly separated sections for:
 | Section | Purpose |
 | --- | --- |
 | `Config.Bridge` | Framework, inventory, language, callback timeout, and debug mode |
-| `Config.CommandPermissions` | Fixed groups for the admin panel, test data, verification commands, and social moderation |
 | `Config.Phone` | Phone item, movement, unique-device mode, and development command |
 | `Config.Sim` | Physical or virtual SIM behavior and number formatting |
 | `Config.Calls` / `Config.Radio` | Voice providers, call behavior, radio limits, and permissions |
@@ -232,44 +211,6 @@ The files contain clearly separated sections for:
 
 Restart `sky_phone` after changing Lua configuration.
 
-### In-game phone configurator
-
-Set the switch at the beginning of `config/config.lua` to use SQL-backed configuration:
-
-```lua
-Config.PhoneConfigurator = {
-    Enabled = true,
-}
-```
-
-When enabled, the generated `source/shared/config_default.lua` is the shipped first-run baseline.
-The frontend build recreates this file from `config.lua` and the server-only `media.lua`; do not edit
-the generated snapshot directly. Sky Phone creates the `sky_phone_configurator` table automatically,
-loads its saved values before framework and phone
-modules initialize, and exposes the editor through `/phonepanel`. Nothing autosaves: stage changes
-in the Phone Configurator tool and press the green check. Saving verifies both SQL payloads and then
-applies the new server, client, media, app, item, command, provider, animation, and UI values through
-Sky Phone's internal runtime refresh. It does not execute a resource restart command.
-
-Every configurable `Config.*` value from `config.lua`, including server-only sections, and every
-value from `Config.Media` is discovered automatically. The bootstrap switch and
-`Config.CommandPermissions` intentionally remain file-owned: the switch decides whether SQL
-configuration is loaded, while permissions must remain authoritative outside the panel. The fixed
-permission table is never displayed or overwritten by the Phone Configurator, and its stable keys do
-not change when their commands are renamed in the panel. Lists, nested objects, vectors,
-and numeric-keyed Lua tables use structured editors instead of raw JSON. Shipped schema rows stay
-editable but cannot be renamed, converted, or removed. Every list and table still accepts any number
-of additional rows; administrator-added rows remain removable. Company job keys are intentionally
-fully removable because `Config.Companies.Definitions` is a freely managed job collection.
-
-ESX and QBCore use the groups listed in `Config.CommandPermissions`. Qbox checks the configured ACE
-objects first and then its framework groups. The standard Qbox `permissions.cfg` grants the `admin`
-ACE to `group.admin`, so an identifier assigned to `group.admin` can open `/phonepanel` with the
-shipped `phonepanel` permission list. Restart `sky_phone` after changing fixed permissions.
-
-Media API keys and server peppers are never returned in plaintext to the NUI. Existing secrets are
-shown only as configured and are replaced only when an administrator enters a new value.
-
 ### Language
 
 Available locales:
@@ -374,9 +315,9 @@ Default entries for unique phones with physical SIM cards:
 
 Do not configure an LB Phone client event or client export. Sky Phone registers the usable items through its server-side inventory adapter.
 
-The server registers `Config.Phone.Item` as usable for every supported inventory adapter: `ak47`, `codem`, `core`, `jaksam`, `jpr`, `lj`, `mf`, `one`, `origen`, `ox`, `ps`, `qb`, `qs`, `smx`, `tgiann`, `hex`, and `esx`. Resource startup fails visibly if the selected adapter or its resource is unavailable.
+The server registers `Config.Phone.Item` as usable for every supported inventory adapter: `ox`, `qb`, `lj`, `qs`, `codem`, `core`, `mf`, `smx`, `hex`, and `esx`. Resource startup fails visibly if the selected adapter cannot complete that registration.
 
-The `hex` and `esx` adapters use ESX's count-based item API, which cannot persist per-item phone or physical SIM metadata. Sky Phone automatically forces `Config.Phone.Unique = false` and `Config.Sim.Enabled = false` while either adapter is active. `auto` selects `hex` when `hex_4_inventory` is started and otherwise falls back to `esx` on an ESX server when no metadata-capable inventory is detected.
+The `hex` and `esx` adapters use ESX's count-based item API. They require both `Config.Phone.Unique = false` and `Config.Sim.Enabled = false` because this API cannot persist per-item phone or physical SIM metadata. `auto` selects `hex` when `hex_4_inventory` is started and otherwise falls back to `esx` on an ESX server when no metadata-capable inventory is detected.
 
 ### QBCore-style item tables
 
@@ -385,67 +326,6 @@ The `hex` and `esx` adapters use ESX's count-based item API, which cannot persis
 - Physical SIM items must always be unique.
 - SIM items are not required when `Config.Sim.Enabled = false`.
 
-Example for `qb-inventory`, `lj-inventory`, `ps-inventory`, and `jpr-inventory`:
-
-```lua
-phone = {
-    name = "phone",
-    label = "iFruit Phone",
-    weight = 200,
-    type = "item",
-    image = "phone.png",
-    unique = true,
-    useable = true,
-    shouldClose = true,
-    description = "A personal mobile phone",
-},
-
-sky_phone_sim_registered = {
-    name = "sky_phone_sim_registered",
-    label = "Registered SIM",
-    weight = 5,
-    type = "item",
-    image = "sky_phone_sim_registered.png",
-    unique = true,
-    useable = true,
-    shouldClose = true,
-},
-
-sky_phone_sim_anonymous = {
-    name = "sky_phone_sim_anonymous",
-    label = "Anonymous SIM",
-    weight = 5,
-    type = "item",
-    image = "sky_phone_sim_anonymous.png",
-    unique = true,
-    useable = true,
-    shouldClose = true,
-},
-```
-
-For `tgiann-inventory`, set `hasMetadata = true`, `useable = true`, and `shouldClose = true` on all three item definitions. Follow the inventory's own item schema for the remaining adapters; the required behavior is always the same: a unique phone or physical SIM must occupy its own slot and its metadata table must survive moving, dropping, storing, and trading the item.
-
-### Unique Phones and metadata
-
-Sky Phone owns the metadata values and writes them server-side. Do not pre-generate IMEIs or phone numbers in item definitions:
-
-| Item | Metadata written by Sky Phone |
-| --- | --- |
-| Phone | `imei`; when a SIM is inserted, also `sim_id`, `phone_number`, and `formatted_number` |
-| Physical SIM | `sim_metadata_version`, `sim_id`, `phone_number`, `formatted_number`, `sim_type`, and registration details where applicable |
-
-When a metadata-capable phone item is used for the first time, Sky Phone reserves an IMEI and writes it back to that exact slot. Existing metadata is preserved. The adapter then reads the slot again and rejects the operation if the inventory did not persist the requested values.
-
-For reliable Unique Phones:
-
-- Set `Config.Phone.Unique = true`.
-- Make the phone item non-stackable/unique. Every phone slot must contain exactly one item.
-- If `Config.Sim.Enabled = true`, make both physical SIM items non-stackable/unique and metadata-capable too.
-- Do not use inventory conversion, admin, crafting, or shop scripts that strip item metadata. Copying an item with its metadata also copies its IMEI; duplicated IMEIs are reported in the server console.
-- When changing inventory systems, migrate the complete item metadata table. Without the old `imei`, the next use creates a new device identity and does not automatically attach the old handset data.
-
-With `Config.Phone.Unique = false`, the handset identity is stored once per framework character instead of on each phone item. The phone item may stack. Physical SIMs still require per-item metadata, so `Config.Sim.Enabled` must be `false` on `hex` and native `esx`.
-
 ## Phone and SIM modes
 
 The two mode switches are independent:
@@ -464,7 +344,7 @@ With unique phones, using an inventory item selects that exact handset whenever
 
 | SIM mode | Behavior |
 | --- | --- |
-| `Enabled = true` | The phone opens with or without a SIM. A registered or anonymous physical SIM item is required only for cellular service such as calls and messages. |
+| `Enabled = true` | A registered or anonymous physical SIM item is required for cellular service. |
 | `Enabled = false` | Sky Phone creates a persistent automatic number for devices without a SIM. Physical SIM items are not required. |
 
 When changing these modes on an existing production server, restart the resource and test with a copy of the database first. The first phone used after switching to non-unique mode may adopt an existing valid IMEI so its local data is preserved.
@@ -650,15 +530,11 @@ Select the provider under `Config.Garage.System`. Vehicle images use the configu
 
 ### Housing
 
-Select `rtx`, `quasar`, `tgiann`, `vms`, `rx`, `nolag`, `sn`, `esx_property`, or `qbx_properties` under `Config.Housing.System`. Automatic mode uses `Config.Housing.AutoPriority` and keeps the existing `esx_property` and `qbx_properties` defaults ahead of newly supported providers. Select a provider explicitly when multiple housing resources are running. Each bridge exposes only the capabilities supported by the documented provider API. The TGIANN bridge expects `tgiann-core` to start before `tgiann-house`, lists server-authorized owner properties, and supports entrance waypoints; TGIANN does not publish stable external contracts for keyholders, lock controls, CCTV, or live garage status.
+Select `rtx`, `quasar`, `vms`, `rx`, `nolag`, `sn`, `esx_property`, or `qbx_properties` under `Config.Housing.System`. Automatic mode uses `Config.Housing.AutoPriority` and keeps the existing `esx_property` and `qbx_properties` defaults ahead of newly supported providers. Select a provider explicitly when multiple housing resources are running. Each bridge exposes only the capabilities supported by the documented provider API.
 
 ### Companies
 
-Company jobs, public profiles, service numbers, services, permissions, locations, and default
-availability are configured under `Config.Companies.Definitions`. Definitions are not limited to the
-shipped jobs: add any number of company IDs in the in-game configurator and fill the freely
-configurable `Job` value in the automatically generated full company template. Existing job keys can
-also be removed; the remaining Companies settings stay available as normal individual fields.
+Company jobs, public profiles, service numbers, services, permissions, locations, and default availability are configured under `Config.Companies.Definitions`.
 
 ### Weazel News
 
@@ -726,20 +602,12 @@ pnpm build
 
 ### The phone item does nothing
 
-- A warning that the inventory returned no configured phone item means an item definition, `Config.Phone.Item`, inventory selection, or player ownership problem. It is not caused by a missing SIM card.
 - Confirm the framework and inventory are supported and started first.
 - Confirm the item name matches `Config.Phone.Item`.
 - Confirm the item is usable.
 - In unique mode, confirm the phone is non-stackable.
 - Check the server console for inventory adapter warnings.
 
-### The resource starts but the phone UI is missing
-
-- On startup, the server console prints `SKY PHONE UI BUILD IS MISSING OR INCOMPLETE`, lists the missing or invalid packaged files, and shows repository-native build commands.
-- Install the latest published release package rather than GitHub's automatically generated source archive.
-- Confirm `sky_phone/source/html/index.html`, `assets`, `img`, and `sounds` exist.
-- Developers working from source must run the frontend production build before starting the resource.
-
 ### Calls connect without audio
 
 - Confirm the configured voice resource is running.

frontend/build.cjs

@@ -2,49 +2,15 @@ const fs = require('node:fs')
 const path = require('node:path')
 
 const frontendRoot = __dirname
-const resourceDirectory = path.join(frontendRoot, '..', 'sky_phone')
 const sourceDirectory = path.join(frontendRoot, 'dist')
-const targetDirectory = path.join(resourceDirectory, 'source', 'html')
-const configDefaultPath = path.join(
-  resourceDirectory,
+const targetDirectory = path.join(
+  frontendRoot,
+  '..',
+  'sky_phone',
   'source',
-  'shared',
-  'config_default.lua',
+  'html',
 )
 
-function readLuaSource(...segments) {
-  return fs
-    .readFileSync(path.join(resourceDirectory, ...segments), 'utf8')
-    .replace(/\r\n?/g, '\n')
-    .trimEnd()
-}
-
-function generateConfigDefault() {
-  const configSource = readLuaSource('config', 'config.lua').replace(
-    /\n?-- CONFIG_DEFAULT_EXCLUDE_START[\s\S]*?-- CONFIG_DEFAULT_EXCLUDE_END\n?/g,
-    '\n',
-  )
-  const mediaSource = readLuaSource('config', 'media.lua')
-  const generatedSource = [
-    '-- GENERATED by frontend/build.cjs from config/config.lua and config/media.lua - do not edit.',
-    '-- Escrowed snapshot of the shipped defaults used by the Phone Configurator.',
-    'local realConfig = Config',
-    'Config = {}',
-    '',
-    configSource,
-    '',
-    mediaSource,
-    '',
-    'ConfigDefaults = Config',
-    'Config = realConfig',
-    '',
-  ].join('\n')
-
-  fs.mkdirSync(path.dirname(configDefaultPath), { recursive: true })
-  fs.writeFileSync(configDefaultPath, generatedSource, 'utf8')
-  console.log(`Generated Phone Configurator defaults at ${configDefaultPath}`)
-}
-
 if (!fs.existsSync(sourceDirectory)) {
   throw new Error(
     'Missing frontend/dist. Run vite build before publishing the NUI.',
@@ -62,5 +28,4 @@ const normalizedIndex = fs
   .replace(/\n[ \t]*\n([ \t]*<\/body>)/g, '\n$1')
 fs.writeFileSync(targetIndex, normalizedIndex)
 
-generateConfigDefault()
 console.log(`Published NUI to ${targetDirectory}`)

frontend/src/App.vue

@@ -71,7 +71,7 @@ import type {
   CompanyChangedPayload,
   CompanyUnreadCounts,
 } from '@/types/companies'
-import type { PhoneCall, PhoneNumberFormat } from '@/types/phone'
+import type { PhoneCall } from '@/types/phone'
 import type { DynamicIslandActivity } from '@/types/dynamicIsland'
 import type { EasyShareEvent } from '@/types/easyshare'
 import type { CryptoMarketChangedData } from '@/types/crypto'
@@ -85,8 +85,6 @@ import { formatTimer } from '@/utils/clock'
 import { parsePhonePreferences } from '@/utils/preferences'
 import { getHairlinePixelStyle } from '@/utils/rendering'
 import { isTextInputElement } from '@/utils/textInputFocus'
-import { configurePhoneNumberFormat } from '@/utils/phone'
-import { consumeEscape } from '@/utils/keyboard'
 import { isTrustedRootMessageSource } from '@/utils/windowMessages'
 import SpringboardView from '@/views/SpringboardView.vue'
 
@@ -141,7 +139,6 @@ type NavigationEventData = {
 type SimPickerPayload = {
   choices: SimPhoneChoice[]
   number: string
-  phoneNumberFormat?: PhoneNumberFormat
 }
 
 type NotificationEventData = Omit<PhoneNotificationInput, 'device'> & {
@@ -503,7 +500,6 @@ function getViewportScale(): number {
 }
 
 function hydratePhone(payload: PhoneOpenPayload): void {
-  configurePhoneNumberFormat(payload.phoneNumberFormat)
   if (payload.device?.imei) {
     companies.bindDeviceScope(
       payload.device.imei,
@@ -531,17 +527,8 @@ function hydratePhone(payload: PhoneOpenPayload): void {
   clock.hydrate(payload.device?.data.alarms?.payload)
   games.hydrate(payload.device?.data.games?.payload)
   media.hydrate(payload.device?.data.media?.payload)
-  appStore.hydrate(payload.device?.data.apps?.payload, payload.disabledApps)
+  appStore.hydrate(payload.device?.data.apps?.payload)
   widgets.hydrate(payload.device?.data.widgets?.payload)
-
-  const currentAppId = route.params.appId
-  if (
-    typeof currentAppId === 'string' &&
-    isPhoneAppId(currentAppId) &&
-    !appStore.isInstalled(currentAppId)
-  ) {
-    void router.push('/')
-  }
 }
 
 function getInstalledNavigationAppIds(): string[] {
@@ -1259,9 +1246,7 @@ function onMessage(event: MessageEvent<AppMessage>): void {
       loadUnlockedPhoneData()
     }
   } else if (event.data?.type === 'sim:picker' && event.data.data) {
-    const payload = event.data.data as unknown as SimPickerPayload
-    configurePhoneNumberFormat(payload.phoneNumberFormat)
-    simPicker.value = payload
+    simPicker.value = event.data.data as unknown as SimPickerPayload
   } else if (event.data?.type === 'sim:picker-close') {
     simPicker.value = null
   }
@@ -1316,17 +1301,20 @@ async function closePhone(): Promise<void> {
 function onKeydown(event: KeyboardEvent): void {
   if (event.key !== 'Escape') return
   if (simPicker.value) {
-    if (!consumeEscape(event)) return
+    event.preventDefault()
     void closeSimPicker()
     return
   }
 
-  if (!phone.isOpen || activitySuspended.value || !consumeEscape(event)) return
-  if (controlCenterOpened.value) {
-    controlCenterOpened.value = false
-    return
-  }
-  void closePhone()
+  queueMicrotask(() => {
+    if (event.defaultPrevented || !phone.isOpen || activitySuspended.value)
+      return
+    if (controlCenterOpened.value) {
+      controlCenterOpened.value = false
+      return
+    }
+    void closePhone()
+  })
 }
 
 function onSystemColorSchemeChange(event: MediaQueryListEvent): void {
@@ -1883,8 +1871,6 @@ onBeforeUnmount(() => {
                 class="phone-screen"
                 :class="{
                   'phone-screen--app': isAppRoute || isDevelopmentRoute,
-                  'phone-screen--camera-landscape':
-                    activeAppId === 'camera' && phone.cameraLandscape,
                   'phone-app--light': !displayedDarkMode,
                   [`phone-app--${phone.preferences.settings.graphicsMode}`]: true,
                 }"

frontend/src/AppDevelopmentPreview.contract.test.ts

@@ -70,31 +70,6 @@ describe('browser development preview contract', () => {
     expect(source).toContain(':device-pixel-ratio="browserDevicePixelRatio"')
   })
 
-  it('clips composited app and overlay layers to the curved display', () => {
-    expect(mainCss).toMatch(
-      /\.phone-screen\s*\{[^}]*--phone-screen-radius:\s*40px;[^}]*overflow:\s*hidden;[^}]*border-radius:\s*var\(--phone-screen-radius\);[^}]*clip-path:\s*inset\(0 round var\(--phone-screen-radius\)\);/s,
-    )
-  })
-
-  it('replaces the CEF button focus rectangle around the home indicator', () => {
-    expect(mainCss).toMatch(
-      /\.phone-home-indicator:focus\s*\{[^}]*outline:\s*none;/s,
-    )
-    expect(mainCss).toMatch(
-      /\.phone-home-indicator:focus-visible span\s*\{[^}]*0 0 0 2px #0a84ff,/s,
-    )
-  })
-
-  it('consumes Escape synchronously before FiveM can open the pause menu', () => {
-    expect(source).toContain("import { consumeEscape } from '@/utils/keyboard'")
-    expect(source).toContain(
-      'if (!phone.isOpen || activitySuspended.value || !consumeEscape(event)) return',
-    )
-    expect(source).not.toMatch(
-      /function onKeydown\(event: KeyboardEvent\): void \{[\s\S]*?queueMicrotask/,
-    )
-  })
-
   it('maps the visible device side controls to phone actions', () => {
     expect(source).toContain('@click="toggleHardwareAlertMute"')
     expect(source).toContain('@click="changeHardwareAlertVolume(10)"')

frontend/src/assets/main.css

@@ -460,8 +460,6 @@ button {
   }
 }
 .phone-screen {
-  --phone-screen-radius: 40px;
-  --phone-screen-portrait-ratio: 2.30951;
   position: relative;
   container-type: size;
   margin: auto;
@@ -470,14 +468,7 @@ button {
   height: 98%;
   overflow: hidden;
   background: #08080a;
-  border-radius: var(--phone-screen-radius);
-  clip-path: inset(0 round var(--phone-screen-radius));
-}
-.phone-screen--camera-landscape {
-  background: transparent;
-}
-.phone-screen--camera-landscape .springboard {
-  visibility: hidden;
+  border-radius: 40px;
 }
 .phone-app {
   position: absolute !important;
@@ -858,14 +849,6 @@ button {
   border-radius: 10px;
   box-shadow: 0 1px 4px #0008;
 }
-.phone-home-indicator:focus {
-  outline: none;
-}
-.phone-home-indicator:focus-visible span {
-  box-shadow:
-    0 0 0 2px #0a84ff,
-    0 1px 4px #0008;
-}
 .phone-home-indicator--interactive {
   cursor: pointer;
 }
@@ -3256,9 +3239,6 @@ button {
   backface-visibility: hidden;
   will-change: transform, border-radius, opacity;
 }
-.app-window--camera-landscape {
-  background: transparent;
-}
 .app-window--citywarn {
   backface-visibility: visible;
   filter: none;

frontend/src/companiesEmergencyRequests.contract.test.ts

@@ -1,147 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-const config = readFileSync(
-  new URL('../../sky_phone/config/config.lua', import.meta.url),
-  'utf8',
-).replace(/\r\n/g, '\n')
-const companiesServer = readFileSync(
-  new URL('../../sky_phone/source/server/companies.lua', import.meta.url),
-  'utf8',
-).replace(/\r\n/g, '\n')
-const configuratorServer = readFileSync(
-  new URL(
-    '../../sky_phone/source/server/phone_configurator.lua',
-    import.meta.url,
-  ),
-  'utf8',
-).replace(/\r\n/g, '\n')
-const testServer = readFileSync(
-  new URL('../testserver/index.cjs', import.meta.url),
-  'utf8',
-).replace(/\r\n/g, '\n')
-
-function sourceBlock(source: string, startMarker: string, endMarker: string) {
-  const start = source.indexOf(startMarker)
-  const end = source.indexOf(endMarker, start)
-
-  expect(start).toBeGreaterThanOrEqual(0)
-  expect(end).toBeGreaterThan(start)
-  return source.slice(start, end)
-}
-
-describe('Companies emergency request contract', () => {
-  it('ships non-emergency police assistance as a requestable service', () => {
-    const police = sourceBlock(
-      config,
-      '            police = {',
-      '            ambulance = {',
-    )
-    const mockPolice = sourceBlock(
-      testServer,
-      'const companyProfiles = [',
-      '  {\n    acceptsRequests: false,\n    announcement: null,',
-    )
-
-    expect(police).toContain('Emergency = true')
-    expect(police).toContain('AcceptsRequests = true')
-    expect(police).toContain('Id = "police-assistance"')
-    expect(police).toContain('RequestsEnabled = true')
-    expect(mockPolice).toContain('acceptsRequests: true')
-    expect(mockPolice).toContain("name: 'Los Santos Police Department'")
-    expect(mockPolice).toContain("id: 'police-assistance'")
-  })
-
-  it('authorizes configured emergency companies through the normal request gates', () => {
-    const validation = sourceBlock(
-      companiesServer,
-      'local function validate_configuration(configuration)',
-      'local function seed_companies()',
-    )
-    const payload = sourceBlock(
-      companiesServer,
-      'local function company_payload(',
-      'local function public_company(',
-    )
-    const createRequest = sourceBlock(
-      companiesServer,
-      'Bridge.Callbacks.Register("sky_phone:companies:create-request"',
-      'Bridge.Callbacks.Register("sky_phone:companies:cancel-request"',
-    )
-    const updateProfile = sourceBlock(
-      companiesServer,
-      'Bridge.Callbacks.Register("sky_phone:companies:update-profile"',
-      'Bridge.Callbacks.Register("sky_phone:companies:update-hours"',
-    )
-
-    expect(validation).not.toContain(
-      'definition.Emergency and definition.AcceptsRequests',
-    )
-    expect(payload).toContain(
-      'acceptsRequests = tonumber(row.accepts_requests) == 1,',
-    )
-    expect(payload).not.toContain('not definition.Emergency')
-    expect(createRequest).toContain(
-      'if not definition or not definition.Public then',
-    )
-    expect(createRequest).not.toContain('definition.Emergency')
-    expect(createRequest).toContain('SELECT `accepts_requests`')
-    expect(createRequest).toContain('AND `requests_enabled` = 1')
-    expect(updateProfile).not.toContain('member.definition.Emergency')
-  })
-
-  it('migrates existing requestable emergency profiles exactly once', () => {
-    const migration = sourceBlock(
-      companiesServer,
-      'local function migrate_requestable_emergency_companies()',
-      'local function tombstone_removed_companies()',
-    )
-    const refresh = sourceBlock(
-      companiesServer,
-      'local function refresh_runtime_configuration()',
-      '\n\nrefresh_runtime_configuration()',
-    )
-
-    expect(migration).toContain('sky-phone:companies:requestable-emergency:v1')
-    expect(migration).toContain(
-      'if definition.Emergency and definition.AcceptsRequests then',
-    )
-    expect(migration).toContain('SET `accepts_requests` = 1')
-    expect(migration).toContain('INSERT IGNORE INTO `sky_phone_migrations`')
-    expect(migration).toContain('Bridge.Database.Transaction(statements)')
-    expect(refresh.indexOf('seed_companies()')).toBeLessThan(
-      refresh.indexOf('migrate_requestable_emergency_companies()'),
-    )
-    expect(
-      refresh.indexOf('migrate_requestable_emergency_companies()'),
-    ).toBeLessThan(refresh.indexOf('tombstone_removed_companies()'))
-  })
-
-  it('migrates the existing Phone Configurator police defaults', () => {
-    const migration = sourceBlock(
-      configuratorServer,
-      'local function migrate_police_request_defaults()',
-      '\n\ndefault_config = {}',
-    )
-
-    expect(migration).toContain('sky-phone:configurator:police-requests:v1')
-    expect(migration).toContain('police.AcceptsRequests == false')
-    expect(migration).toContain('next(police.Services) == nil')
-    expect(migration).toContain(
-      'police.AcceptsRequests = defaults.AcceptsRequests',
-    )
-    expect(migration).toContain(
-      'police.Services = copy_value(defaults.Services)',
-    )
-    expect(migration).toContain('SET `config_payload` = ?')
-    expect(migration).toContain('`revision` = `revision` + 1')
-    expect(migration).toContain('INSERT IGNORE INTO `sky_phone_migrations`')
-    expect(migration).toContain('Bridge.Database.Transaction(statements)')
-    expect(migration).toContain('apply_stored_row(read_stored_row())')
-    expect(migration).toContain('apply_runtime_configuration()')
-    expect(configuratorServer).toContain(
-      'Bridge.Database.AfterMigration("sky_phone", migrate_police_request_defaults)',
-    )
-  })
-})

frontend/src/companiesServiceLineMessages.contract.test.ts

@@ -1,133 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-function source(path: string): string {
-  return readFileSync(new URL(path, import.meta.url), 'utf8').replace(
-    /\r\n/g,
-    '\n',
-  )
-}
-
-function sourceBlock(
-  value: string,
-  startMarker: string,
-  endMarker: string,
-): string {
-  const start = value.indexOf(startMarker)
-  const end = value.indexOf(endMarker, start)
-
-  expect(start).toBeGreaterThanOrEqual(0)
-  expect(end).toBeGreaterThan(start)
-  return value.slice(start, end)
-}
-
-const companiesServer = source('../../sky_phone/source/server/companies.lua')
-const messagesServer = source('../../sky_phone/source/server/messages.lua')
-const databaseMigration = source('../../sky_phone/source/server/db_migrate.lua')
-const configDefaults = source(
-  '../../sky_phone/source/shared/config_default.lua',
-)
-const messagesApp = source('./views/apps/MessagesApp.vue')
-const phoneFallbacks = source('./stores/phone.ts')
-const locales = ['en', 'de', 'es'].map((locale) =>
-  source(`../../sky_phone/config/locales/${locale}.lua`),
-)
-
-describe('Companies service-line message routing contract', () => {
-  it('enables the police service line and persists an indexed route channel', () => {
-    const police = sourceBlock(
-      configDefaults,
-      '            police = {',
-      '            ambulance = {',
-    )
-    const schema = sourceBlock(
-      databaseMigration,
-      '        name = "sky_phone_company_requests",',
-      '        name = "sky_phone_company_request_reads",',
-    )
-
-    expect(police).toContain('Number = "911"')
-    expect(police).toContain('CanMessage = true')
-    expect(schema).toContain(
-      "name = \"channel\", type = \"ENUM('app','service_line') NOT NULL DEFAULT 'app'\"",
-    )
-    expect(schema).toContain(
-      'name = "idx_sky_phone_company_requests_service_line"',
-    )
-  })
-
-  it('resolves short service numbers before the normal SIM-number path', () => {
-    const resolver = sourceBlock(
-      messagesServer,
-      'local function resolve_message_recipient(value)',
-      '\n\nlocal function shared_contact',
-    )
-    const send = sourceBlock(
-      messagesServer,
-      'Bridge.Callbacks.Register("sky_phone:messages:send"',
-      '\n\nend)',
-    )
-
-    expect(resolver).toContain('SkyPhoneCompanies.GetServiceLine(value)')
-    expect(resolver).toContain('return service_line.number, service_line')
-    expect(messagesServer.match(/resolve_message_recipient\(/g)?.length).toBe(4)
-    expect(send).toContain('service_line_text_only')
-    expect(send).toContain('SkyPhoneCompanies.RouteServiceLineMessage')
-    expect(send.indexOf('RouteServiceLineMessage')).toBeLessThan(
-      send.indexOf('SELECT s.`id`, s.`phone_number`'),
-    )
-  })
-
-  it('atomically mirrors inbound SMS into one active company request', () => {
-    const route = sourceBlock(
-      companiesServer,
-      'function SkyPhoneCompanies.RouteServiceLineMessage(source, data)',
-      'Bridge.Callbacks.Register("sky_phone:companies:create-request"',
-    )
-
-    expect(route).toContain('current_device(source, false)')
-    expect(route).toContain('service_line.canMessage')
-    expect(route).toContain('UPDATE `sky_phone_sims`')
-    expect(route).toContain("`channel` = 'service_line'")
-    expect(route).toContain('AND NOT EXISTS (')
-    expect(route).toContain('INSERT INTO `sky_phone_company_request_messages`')
-    expect(route).toContain('INSERT INTO `sky_phone_sms_messages`')
-    expect(route).toContain('Bridge.Database.Transaction(statements)')
-    expect(route).toContain('emit_request_change(row, true, true, source)')
-    expect(route).toContain('"sky_phone:companies:notification"')
-  })
-
-  it('mirrors authorized company replies back to the customer SMS thread', () => {
-    const sendMessage = sourceBlock(
-      companiesServer,
-      'Bridge.Callbacks.Register("sky_phone:companies:send-message"',
-      'Bridge.Callbacks.Register("sky_phone:companies:claim-request"',
-    )
-
-    expect(sendMessage).toContain('access.row.channel == "service_line"')
-    expect(
-      sendMessage.match(/INSERT INTO `sky_phone_sms_messages`/g)?.length,
-    ).toBe(2)
-    expect(sendMessage).toContain("message.`sender_type` = 'customer'")
-    expect(sendMessage).toContain("message.`sender_type` = 'company'")
-    expect(sendMessage).toContain('"sky_phone:messages:changed"')
-    expect(sendMessage).toContain('"sky_phone:messages:new"')
-  })
-
-  it('keeps service-line composition text-only in every shipped locale', () => {
-    expect(messagesApp).toContain(
-      "() => activeContact.value?.source === 'company'",
-    )
-    expect(messagesApp).toContain(
-      'activeCanMessage && !activeServiceLine && attachmentMenuOpen',
-    )
-    expect(messagesApp).toContain('v-if="!activeServiceLine"')
-    expect(messagesApp).toContain('v-else-if="!activeServiceLine"')
-    expect(messagesApp).toContain("'service_line_text_only'")
-    expect(phoneFallbacks).toContain('service_line_text_only:')
-    for (const locale of locales) {
-      expect(locale).toContain('service_line_text_only =')
-    }
-  })
-})

frontend/src/companyConfiguratorCreation.contract.test.ts

@@ -1,139 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-const companiesServer = readFileSync(
-  new URL('../../sky_phone/source/server/companies.lua', import.meta.url),
-  'utf8',
-).replace(/\r\n/g, '\n')
-const configuratorServer = readFileSync(
-  new URL(
-    '../../sky_phone/source/server/phone_configurator.lua',
-    import.meta.url,
-  ),
-  'utf8',
-).replace(/\r\n/g, '\n')
-const englishLocale = readFileSync(
-  new URL('../../sky_phone/config/locales/en.lua', import.meta.url),
-  'utf8',
-)
-const germanLocale = readFileSync(
-  new URL('../../sky_phone/config/locales/de.lua', import.meta.url),
-  'utf8',
-)
-const spanishLocale = readFileSync(
-  new URL('../../sky_phone/config/locales/es.lua', import.meta.url),
-  'utf8',
-)
-
-describe('company configurator creation contract', () => {
-  it('publishes complete defaults for newly added company definitions', () => {
-    expect(configuratorServer).toContain(
-      'local function company_definition_entry_default(company_id, configuration)',
-    )
-    expect(configuratorServer).toContain(
-      'local function next_available_company_service_number(configuration)',
-    )
-    expect(configuratorServer).toContain(
-      'entryDefault = company_definition_entry_default()',
-    )
-    expect(configuratorServer).toContain('Routing = "round_robin"')
-    expect(configuratorServer).toContain('RequestsEnabled = true')
-  })
-
-  it('validates the candidate runtime config before encoding or writing SQL', () => {
-    const save = configuratorServer.slice(
-      configuratorServer.indexOf('function SkyPhoneConfigurator.Save('),
-    )
-    const validation = save.indexOf(
-      'SkyPhoneCompanies.ValidateConfiguration(candidate_config)',
-    )
-    const encoding = save.indexOf(
-      'local config_encoded = encode_payload(next_config, "config")',
-    )
-    const update = save.indexOf('UPDATE `%s`')
-
-    expect(validation).toBeGreaterThanOrEqual(0)
-    expect(validation).toBeLessThan(encoding)
-    expect(validation).toBeLessThan(update)
-    expect(save).toContain(
-      'return { success = false, error = "invalid_company_configuration" }',
-    )
-  })
-
-  it('validates into isolated registries before replacing the live company state', () => {
-    expect(companiesServer).toContain(
-      'function SkyPhoneCompanies.ValidateConfiguration(configuration)',
-    )
-    expect(companiesServer).toContain(
-      'local validated, validation_error = validate_configuration(configuration)',
-    )
-    expect(companiesServer).toContain('definitions = validated.definitions')
-    expect(companiesServer).toContain(
-      'definition_ids = validated.definition_ids',
-    )
-  })
-
-  it('localizes rejected company configurations in every shipped locale', () => {
-    for (const locale of [englishLocale, germanLocale, spanishLocale]) {
-      expect(locale).toContain('invalid_company_configuration =')
-    }
-  })
-
-  it('repairs company rows created by the legacy blank schema before Companies starts', () => {
-    const migration = configuratorServer.slice(
-      configuratorServer.indexOf(
-        'local function migrate_blank_company_definitions()',
-      ),
-      configuratorServer.indexOf(
-        'local function migrate_police_request_defaults()',
-      ),
-    )
-    const blankRegistration = configuratorServer.indexOf(
-      'Bridge.Database.AfterMigration("sky_phone", migrate_blank_company_definitions)',
-    )
-    const policeRegistration = configuratorServer.indexOf(
-      'Bridge.Database.AfterMigration("sky_phone", migrate_police_request_defaults)',
-    )
-
-    expect(migration).toContain(
-      'sky-phone:configurator:company-definition-defaults:v1',
-    )
-    expect(migration).toContain('company_definition_entry_default(')
-    expect(migration).toContain('Bridge.Database.Transaction(statements)')
-    expect(migration).toContain('SET `config_payload` = ?')
-    expect(migration).toContain('`revision` = `revision` + 1')
-    expect(blankRegistration).toBeGreaterThanOrEqual(0)
-    expect(blankRegistration).toBeLessThan(policeRegistration)
-  })
-
-  it('enables persisted police service-line messaging before Companies starts', () => {
-    const migration = configuratorServer.slice(
-      configuratorServer.indexOf(
-        'local function migrate_police_service_line_messaging()',
-      ),
-      configuratorServer.indexOf('\n\ndefault_config = {}'),
-    )
-    const policeRegistration = configuratorServer.indexOf(
-      'Bridge.Database.AfterMigration("sky_phone", migrate_police_request_defaults)',
-    )
-    const messageRegistration = configuratorServer.indexOf(
-      'Bridge.Database.AfterMigration("sky_phone", migrate_police_service_line_messaging)',
-    )
-
-    expect(migration).toContain(
-      'sky-phone:configurator:service-line-messaging:v2',
-    )
-    expect(migration).toContain('line.CanMessage ~= true')
-    expect(migration).toContain('line.CanMessage = true')
-    expect(migration).toContain('Bridge.Database.Transaction(statements)')
-    expect(migration).toContain('SET `config_payload` = ?')
-    expect(migration).toContain('`revision` = `revision` + 1')
-    expect(migration).toContain('apply_stored_row(read_stored_row())')
-    expect(migration).toContain('apply_runtime_configuration()')
-    expect(messageRegistration).toBeGreaterThan(policeRegistration)
-    expect(companiesServer).not.toContain(
-      'enables messaging without a virtual service-line message router',
-    )
-  })
-})

frontend/src/components/AdminPanel.contract.test.ts

@@ -6,10 +6,6 @@ const source = readFileSync(
   new URL('./AdminPanel.vue', import.meta.url),
   'utf8',
 )
-const agentInstructions = readFileSync(
-  new URL('../../../AGENTS.md', import.meta.url),
-  'utf8',
-)
 const app = readFileSync(new URL('../App.vue', import.meta.url), 'utf8')
 const apps = readFileSync(new URL('../config/apps.ts', import.meta.url), 'utf8')
 const store = readFileSync(
@@ -54,59 +50,10 @@ const config = readFileSync(
   new URL('../../../sky_phone/config/config.lua', import.meta.url),
   'utf8',
 )
-const configDefaultsSource = config.replace(
-  /\r?\n?-- CONFIG_DEFAULT_EXCLUDE_START[\s\S]*?-- CONFIG_DEFAULT_EXCLUDE_END\r?\n?/g,
-  '\n',
-)
-const mediaConfig = readFileSync(
-  new URL('../../../sky_phone/config/media.lua', import.meta.url),
-  'utf8',
-)
 const schema = readFileSync(
   new URL('../../../sky_phone/sql/install.sql', import.meta.url),
   'utf8',
 )
-const manifest = readFileSync(
-  new URL('../../../sky_phone/fxmanifest.lua', import.meta.url),
-  'utf8',
-)
-const configuratorServer = readFileSync(
-  new URL(
-    '../../../sky_phone/source/server/phone_configurator.lua',
-    import.meta.url,
-  ),
-  'utf8',
-)
-const configDefault = readFileSync(
-  new URL(
-    '../../../sky_phone/source/shared/config_default.lua',
-    import.meta.url,
-  ),
-  'utf8',
-)
-const frontendBuild = readFileSync(
-  new URL('../../build.cjs', import.meta.url),
-  'utf8',
-)
-const configuratorClient = readFileSync(
-  new URL(
-    '../../../sky_phone/source/client/phone_configurator.lua',
-    import.meta.url,
-  ),
-  'utf8',
-)
-const mediaImportServer = readFileSync(
-  new URL('../../../sky_phone/source/server/media_import.lua', import.meta.url),
-  'utf8',
-)
-const configuratorValueEditor = readFileSync(
-  new URL('./AdminConfigValueEditor.vue', import.meta.url),
-  'utf8',
-)
-const configInputWidth = readFileSync(
-  new URL('../directives/configInputWidth.ts', import.meta.url),
-  'utf8',
-)
 
 describe('standalone admin panel contracts', () => {
   it('renders as a dedicated full-screen editor outside the phone shell', () => {
@@ -133,7 +80,6 @@ describe('standalone admin panel contracts', () => {
     expect(source).not.toContain('admin-panel-brand__mark')
     expect(source).not.toContain('admin-panel-profile-heading__status')
     expect(source).not.toContain('backdrop-filter: blur(2px)')
-    expect(source).not.toContain("t('overview.recent')")
 
     for (const tab of [
       'overview',
@@ -145,36 +91,18 @@ describe('standalone admin panel contracts', () => {
       'calls',
       'moderation',
       'audit',
-      'configurator',
     ]) {
       expect(source).toContain(`selectTab('${tab}')`)
       expect(source).toContain(`t('tabs.${tab}')`)
     }
   })
 
-  it('uses a fixed blue accent and replaces appearance controls with live statistics', () => {
+  it('removes manual reload and applies a persistent global accent choice', () => {
     expect(source).not.toContain('<RefreshCw')
     expect(source).not.toContain("kind: 'refresh'")
-    expect(source).not.toContain("'sky-phone-admin-accent'")
-    expect(source).not.toContain("'sky-phone-admin-font-family'")
-    expect(source).not.toContain("'sky-phone-admin-font-size'")
-    expect(source).not.toContain("t('appearance.")
-    expect(source).toContain('--admin-accent: #00b8e4')
-    expect(source).toContain('class="admin-panel-statistics-layout"')
-    expect(source).toContain('class="admin-panel-activity-grid"')
-    expect(source).toContain('class="admin-panel-coverage-list"')
-    expect(source).toContain('statisticsTimer = window.setInterval')
-    expect(source).toContain('15_000')
-    expect(server).toContain('AS `messages_today`')
-    expect(server).toContain('AS `calls_today`')
-    expect(server).toContain('AS `active_devices`')
-    expect(server).toContain('auditEntries = tonumber(stats.audit_entries)')
+    expect(source).toContain("'sky-phone-admin-accent'")
+    expect(source).toContain(':style="{ \'--admin-accent\': accentColor }"')
     expect(source).toContain('color-mix(in srgb, var(--admin-green)')
-    expect(source).toContain('--admin-toggle-on: #63d471')
-    expect(source).toContain('background: var(--admin-toggle-on)')
-    expect(configuratorValueEditor).toContain(
-      'background: var(--admin-toggle-on)',
-    )
   })
 
   it('stages app changes locally and saves them only from the toolbar action', () => {
@@ -188,22 +116,6 @@ describe('standalone admin panel contracts', () => {
     )
   })
 
-  it('applies global bundled-app availability to phones and admin management', () => {
-    expect(config).toContain('Config.Apps = {')
-    expect(config).toContain('memory = true,')
-    expect(config).toContain('weather = true,')
-    expect(configDefault).toContain('Config.Apps = {')
-    expect(configuratorServer).toContain('Apps = true,')
-    expect(phoneServer).toContain('function SkyPhone.IsAppEnabled(app_id)')
-    expect(phoneServer).toContain('function SkyPhone.GetDisabledApps()')
-    expect(phoneServer).toContain('disabledApps = SkyPhone.GetDisabledApps()')
-    expect(server).toContain('if not SkyPhone.IsAppEnabled(app_id) then')
-    expect(server).toContain('disabledApps = SkyPhone.GetDisabledApps()')
-    expect(store).toContain('disabledApps: [] as string[]')
-    expect(store).toContain('disabledAppsFromConfigurator(response.data)')
-    expect(source).toContain('!admin.disabledApps.includes(app.id)')
-  })
-
   it('connects every operation through the standard NUI callback bridge', () => {
     expect(bridge).toContain('admin = [[')
     for (const endpoint of [
@@ -215,8 +127,6 @@ describe('standalone admin panel contracts', () => {
       'admin:reset-passcode',
       'admin:change-number',
       'admin:factory-reset',
-      'admin:configurator',
-      'admin:save-configurator',
     ]) {
       expect(store).toContain(endpoint)
     }
@@ -250,21 +160,18 @@ describe('standalone admin panel contracts', () => {
   it('authorizes every server request without requiring a phone session', () => {
     expect(server).not.toContain('SkyPhone.RequireSession(source)')
     expect(server).toContain(
-      'Bridge.Framework.HasPermission(source, "phonepanel")',
+      'Bridge.Framework.HasAdminGroup(source, Config.AdminPanel.AdminGroups)',
     )
     expect(server).toContain('Config.AdminPanel.ReadRequestsPerMinute')
     expect(server).toContain('Config.AdminPanel.ActionRequestsPerMinute')
     expect(server).toContain('Config.AdminPanel.CredentialRevealsPerMinute')
     expect(config).toContain('Config.AdminPanel = {')
-    expect(config).toContain('Config.CommandPermissions = {')
-    expect(config).not.toContain('AdminGroups =')
   })
 
   it('opens directly from the configurable command with dedicated focus', () => {
-    expect(config).toContain('Command = "phonepanel"')
-    expect(server).toContain('local command_name = Config.AdminPanel.Command')
+    expect(config).toContain('Command = "phoneadmin"')
     expect(server).toContain(
-      'RegisterCommand(command_name, function(command_source)',
+      'RegisterCommand(Config.AdminPanel.Command, function(command_source)',
     )
     expect(server).toContain(
       'TriggerClientEvent("sky_phone:admin:launch", player_source)',
@@ -296,228 +203,4 @@ describe('standalone admin panel contracts', () => {
       'CREATE TABLE IF NOT EXISTS `sky_phone_admin_audit`',
     )
   })
-
-  it('loads the SQL phone configurator before framework-owned configuration is read', () => {
-    expect(agentInstructions).toContain('Phone Configurator parity (mandatory)')
-    expect(agentInstructions).toContain(
-      'changes without matching Configurator support are incomplete',
-    )
-    expect(config).toMatch(
-      /Config\.PhoneConfigurator\s*=\s*\{[\s\S]*?Enabled\s*=\s*true[\s\S]*?Config\.Bridge\s*=/,
-    )
-    expect(schema).toContain(
-      'CREATE TABLE IF NOT EXISTS `sky_phone_configurator`',
-    )
-    expect(
-      manifest.indexOf("'source/shared/config_default.lua'"),
-    ).toBeGreaterThan(manifest.indexOf("'config/media.lua'"))
-    expect(manifest.indexOf("'source/shared/config_default.lua'")).toBeLessThan(
-      manifest.indexOf("'source/server/phone_configurator.lua'"),
-    )
-    expect(
-      manifest.indexOf("'source/server/phone_configurator.lua'"),
-    ).toBeLessThan(manifest.indexOf("'source/bridge/server/framework.lua'"))
-    expect(
-      manifest.indexOf("'source/client/phone_configurator.lua'"),
-    ).toBeLessThan(manifest.indexOf("'source/bridge/client/framework.lua'"))
-    expect(configuratorServer).toContain('AND `revision` = ?')
-    expect(configuratorServer).toContain('configurator_enabled')
-    expect(configuratorServer).toMatch(
-      /for key, value in pairs\(ConfigDefaults\)[\s\S]*?key ~= "Media"[\s\S]*?key ~= "PhoneConfigurator"/,
-    )
-    expect(configuratorServer).toContain(
-      'default_media = serialize_value(ConfigDefaults.Media)',
-    )
-    expect(configDefault).toContain(
-      'GENERATED by frontend/build.cjs from config/config.lua and config/media.lua',
-    )
-    expect(configDefault).toContain('local realConfig = Config')
-    expect(configDefault).toContain('ConfigDefaults = Config')
-    expect(configDefault.replace(/\r\n?/g, '\n').trimEnd()).toBe(
-      [
-        '-- GENERATED by frontend/build.cjs from config/config.lua and config/media.lua - do not edit.',
-        '-- Escrowed snapshot of the shipped defaults used by the Phone Configurator.',
-        'local realConfig = Config',
-        'Config = {}',
-        '',
-        configDefaultsSource.replace(/\r\n?/g, '\n').trimEnd(),
-        '',
-        mediaConfig.replace(/\r\n?/g, '\n').trimEnd(),
-        '',
-        'ConfigDefaults = Config',
-        'Config = realConfig',
-      ].join('\n'),
-    )
-    expect(frontendBuild).toContain("readLuaSource('config', 'config.lua')")
-    expect(frontendBuild).toContain("readLuaSource('config', 'media.lua')")
-    expect(frontendBuild).toContain("'config_default.lua'")
-    expect(configDefault).not.toContain('Config.PhoneConfigurator')
-    expect(configDefault).not.toContain('Config.CommandPermissions')
-    expect(configuratorServer).toContain(
-      'build_sections("config", stored_config',
-    )
-    expect(configuratorServer).toContain('build_sections("media", stored_media')
-    expect(configuratorServer).toContain('sensitive_path')
-    expect(configuratorServer).toContain('restore_redacted_values')
-    expect(configuratorServer).toContain(
-      '{ __skyType = "map", entries = entries }',
-    )
-    expect(configuratorServer).toContain('validate_structured_value')
-    expect(configuratorServer).toContain('validate_locked_structure')
-    expect(configuratorServer).toContain('build_structure(default_value')
-    expect(configuratorServer).toContain('path == "Companies.Definitions"')
-    expect(configuratorServer).toContain('flatten_company_fields')
-    expect(configuratorServer).toContain('structure.mutableKeys')
-    expect(configuratorServer).toContain('local function empty_structure(')
-    expect(configuratorServer).toContain('template = items[1]')
-    expect(configuratorServer).toContain('structure.template')
-    expect(configuratorServer).toContain('if not structure.fields[key] then')
-    expect(configuratorServer).toContain('field.type == "stringOrFalse"')
-    expect(configuratorServer).not.toContain('Config.Media = client_payload')
-    expect(configuratorServer).toContain(
-      'apply_runtime_table(Config[key], value)',
-    )
-    expect(configuratorServer).toContain(
-      'apply_runtime_table(Config.Media, runtime_media)',
-    )
-    expect(configuratorServer).toContain('local function read_stored_row()')
-    expect(configuratorServer).toContain('local function apply_stored_row(row)')
-    expect(configuratorServer).toContain(
-      'persisted_row.media_payload ~= media_encoded',
-    )
-    expect(configuratorServer).toContain(
-      'Phone configurator SQL verification failed',
-    )
-    expect(server).not.toContain('ExecuteCommand(("restart %s")')
-    expect(configuratorServer).not.toContain('clear_runtime_table')
-    expect(configuratorServer).toContain(
-      'TriggerEvent("sky_phone:configurator:serverUpdated", revision)',
-    )
-    expect(configuratorServer).toContain(
-      'function SkyPhoneConfigurator.Broadcast(target)',
-    )
-    expect(configuratorServer).toContain('SkyPhoneConfigurator.Broadcast(-1)')
-    expect(configuratorServer).toContain('through the internal runtime refresh')
-    expect(configuratorClient).toContain(
-      'Bridge.Callbacks.Trigger("sky_phone:configurator:runtime"',
-    )
-    expect(configuratorClient).toContain(
-      'apply_runtime_table(Config[key], value)',
-    )
-    expect(configuratorClient).not.toContain('clear_runtime_table')
-    expect(configuratorClient).toContain(
-      'TriggerEvent("sky_phone:configurator:updated"',
-    )
-    expect(phoneClient).toMatch(
-      /AddEventHandler\("sky_phone:configurator:updated"[\s\S]*?SkyPhoneLocales\.Resolve\(Config\.Bridge\.Locale\)[\s\S]*?SkyPhoneApps\.SendCatalog\(\)[\s\S]*?type = "device:updated"/,
-    )
-    expect(server).toContain(
-      'AddEventHandler("sky_phone:configurator:serverUpdated"',
-    )
-    expect(phoneServer).toContain('register_configured_phone_item()')
-    expect(phoneServer).toContain(
-      'AddEventHandler("sky_phone:configurator:serverUpdated"',
-    )
-    expect(simServer).toContain('refresh_sim_types()')
-    expect(simServer).toContain(
-      'AddEventHandler("sky_phone:configurator:serverUpdated"',
-    )
-    expect(mediaImportServer).toContain('local website = {}')
-    expect(mediaImportServer).toContain('website._adapter = adapter')
-    expect(mediaImportServer).not.toContain('definition._adapter = adapter')
-    expect(mediaImportServer).toMatch(
-      /AddEventHandler\("sky_phone:configurator:serverUpdated"[\s\S]*?if initialized then[\s\S]*?build_registry\(\)/,
-    )
-    expect(source).toContain('class="admin-panel-rail__configurator"')
-    expect(source).toContain(
-      '.admin-panel-rail .admin-panel-rail__configurator',
-    )
-    expect(source).toContain('<AdminConfigValueEditor')
-    expect(source).toContain('function configuratorFieldRepeatsSection(')
-    expect(source).toContain('v-if="!configuratorFieldRepeatsSection(field)"')
-    expect(source).toContain('class="admin-panel-config-scopes"')
-    expect(source).toContain("selectConfiguratorScope('config')")
-    expect(source).toContain("selectConfiguratorScope('media')")
-    expect(source).not.toContain('class="admin-panel-config-meta"')
-    expect(configuratorValueEditor).toContain('function addListRow()')
-    expect(configuratorValueEditor).toContain('function addTableField()')
-    expect(configuratorValueEditor).toContain(
-      'const canExtendTable = computed(',
-    )
-    expect(configuratorValueEditor).toContain(
-      'tableStructure.value.mutableKeys === true',
-    )
-    expect(configuratorValueEditor).toContain(
-      'const usesFixedTableLayout = computed(',
-    )
-    expect(configuratorValueEditor).toContain(
-      "'is-fixed-table': usesFixedTableLayout",
-    )
-    expect(configuratorValueEditor).toContain('v-if="!usesFixedTableLayout"')
-    expect(configuratorValueEditor).toContain(
-      '.config-structured-editor.is-fixed-table',
-    )
-    expect(configuratorValueEditor).toContain('v-else-if="canExtendTable"')
-    expect(configuratorValueEditor).toContain('function removeListRow(')
-    expect(configuratorValueEditor).toContain('function removeTableField(')
-    expect(configuratorValueEditor).toContain('function addMapEntry()')
-    expect(configuratorValueEditor).toContain('function updateMapKey(')
-    expect(configuratorValueEditor).toContain('fixedMapEntryStructure(current)')
-    expect(configuratorValueEditor).toContain('listStructure?.items[index]')
-    expect(configuratorValueEditor).toContain('function listItemStructure(')
-    expect(configuratorValueEditor).toContain('const listTemplate = computed(')
-    expect(configuratorValueEditor).toContain('function structureTypeLabel(')
-    expect(configuratorValueEditor).toContain(
-      'class="config-structured-editor__fixed-type"',
-    )
-    expect(configuratorValueEditor).toContain(
-      'const rootTableTabs = computed<RootTableTab[]>(',
-    )
-    expect(configuratorValueEditor).toContain(
-      'class="config-structured-editor__tabs"',
-    )
-    expect(configuratorValueEditor).toContain(
-      'class="config-structured-editor__tab-panel"',
-    )
-    expect(source).toContain(':tab-label="configuratorSubtabLabel"')
-    expect(source).toContain('configurator.table.subtabs.${key}')
-    expect(configuratorValueEditor).toContain(
-      'props.tabLabel?.(key, tableValue.value[key]) ?? key',
-    )
-    expect(source).toContain('v-config-input-width')
-    expect(configuratorValueEditor).toContain('v-config-input-width')
-    expect(configInputWidth).toContain("input.addEventListener('input'")
-    expect(configInputWidth).toContain('input.scrollWidth')
-    expect(source).toContain('filter: drop-shadow')
-    expect(source).toContain("input[type='number']::-webkit-inner-spin-button")
-    expect(configuratorValueEditor).toContain(
-      "input[type='number']::-webkit-inner-spin-button",
-    )
-    expect(source).toContain('justify-self: start')
-    expect(configuratorValueEditor).toContain('function tableFieldStructure(')
-    expect(configuratorValueEditor).toContain('function isFixedTableField(')
-    expect(configuratorValueEditor).toContain('function blankCollectionValue(')
-    expect(configuratorValueEditor).toContain('blankFromConfiguratorStructure')
-    expect(configuratorValueEditor).toContain('createMutableTableEntry(')
-    expect(source).toContain("'is-structured': field.type === 'json'")
-    expect(configuratorValueEditor).toContain('function isStructuredValue(')
-    expect(configuratorValueEditor).toContain(
-      'class="config-structured-editor__add-field is-list"',
-    )
-    expect(configuratorValueEditor).toContain(
-      'class="config-structured-editor__actions"',
-    )
-    expect(configuratorValueEditor).toContain('function toggleStructuredEntry(')
-    expect(configuratorValueEditor).toContain(
-      'class="config-structured-editor__section-toggle"',
-    )
-    expect(configuratorValueEditor).toContain(':aria-expanded=')
-    expect(configuratorValueEditor).toContain(
-      '@media (prefers-reduced-motion: reduce)',
-    )
-    expect(configuratorValueEditor).toContain(
-      '.config-structured-editor__property.has-structured-value',
-    )
-    expect(configuratorValueEditor).not.toContain('<textarea')
-  })
 })

frontend/src/components/EasyShareSheet.contract.test.ts

@@ -24,13 +24,4 @@ describe('EasyShareSheet Sky UI contract', () => {
       /\.easyshare-history\s*\{[^}]*overflow:\s*hidden[^}]*background:\s*var\(--easyshare-list-surface\)/s,
     )
   })
-
-  it('only exposes and opens installed share destinations', () => {
-    expect(source).toContain("if (appStore.isInstalled('flare'))")
-    expect(source).toContain("if (appStore.isInstalled('darkchat'))")
-    expect(source).toContain('.filter((id) => appStore.isInstalled(id))')
-    expect(source).toContain('if (!appStore.isInstalled(kind)) return')
-    expect(source).toContain('if (!appStore.isInstalled(appId)) return')
-    expect(source).not.toContain('appStore.homeLayout.hidden.includes')
-  })
 })

frontend/src/components/EasyShareSheet.vue

@@ -67,7 +67,7 @@ const sharePeople = computed(() => {
   }> = []
   const phoneNumbers = new Set<string>()
 
-  if (appStore.isInstalled('flare')) {
+  if (!appStore.homeLayout.hidden.includes('flare')) {
     for (const match of flare.matches) {
       people.push({
         avatar: match.profile.photoUrls[0],
@@ -102,7 +102,7 @@ const sharePeople = computed(() => {
     phoneNumbers.add(contact.phone_number)
   }
 
-  if (appStore.isInstalled('darkchat')) {
+  if (!appStore.homeLayout.hidden.includes('darkchat')) {
     for (const conversation of darkChat.conversations.slice(0, 8)) {
       people.push({
         kind: 'darkchat',
@@ -116,7 +116,7 @@ const sharePeople = computed(() => {
 })
 const shareApps = computed(() =>
   (easyShare.payload ? easyShareDestinationAppIds(easyShare.payload) : [])
-    .filter((id) => appStore.isInstalled(id))
+    .filter((id) => !appStore.homeLayout.hidden.includes(id))
     .flatMap((id) => {
       const app = getPhoneApp(id)
       return app ? [{ app, id }] : []
@@ -195,21 +195,18 @@ function endDrag(event: PointerEvent): void {
 }
 
 function shareToChat(kind: EasyShareChatApp, targetId: string): void {
-  if (!appStore.isInstalled(kind)) return
   if (!easyShare.prepareChatDraft(kind, targetId)) return
   close()
   void router.push(`/apps/${kind}`)
 }
 
 function openChatApp(kind: EasyShareChatApp): void {
-  if (!appStore.isInstalled(kind)) return
   if (!easyShare.prepareChatDraft(kind)) return
   close()
   void router.push(`/apps/${kind}`)
 }
 
 function openShareApp(appId: EasyShareDestinationApp): void {
-  if (!appStore.isInstalled(appId)) return
   if (appId === 'messages' || appId === 'darkchat' || appId === 'flare') {
     openChatApp(appId)
     return

frontend/src/components/HomeFolderInteraction.contract.test.ts

@@ -26,10 +26,6 @@ const mainCss = readFileSync(
   new URL('../assets/main.css', import.meta.url),
   'utf8',
 )
-const openedFolderAppBlocks =
-  overlaySource.match(/<AppIcon\b[\s\S]*?\/>/g) ?? []
-const homeFolderIconBlocks =
-  springboardSource.match(/<HomeFolderIcon\b[\s\S]*?\/>/g) ?? []
 
 describe('Home folder interaction contract', () => {
   it('opens folders from edit mode and starts dragging only after movement', () => {
@@ -40,7 +36,7 @@ describe('Home folder interaction contract', () => {
     expect(iconSource).not.toContain('props.editMode || suppressClick.value')
   })
 
-  it('keeps whole-folder dragging aligned at every phone scale', () => {
+  it('keeps folder app dragging aligned at every phone scale', () => {
     expect(dragSource).toContain("'.springboard-page, .home-folder-panel'")
     expect(dragSource).toContain('viewportWidth: bounds.width')
     expect(dragSource).not.toContain("getPropertyValue('zoom')")
@@ -51,60 +47,6 @@ describe('Home folder interaction contract', () => {
     )
   })
 
-  it('routes whole folders from both the grid and dock through the shared drag portal', () => {
-    expect(homeFolderIconBlocks).toHaveLength(2)
-    for (const area of ['grid', 'dock'] as const) {
-      const block = homeFolderIconBlocks.find((candidate) =>
-        candidate.includes(`data-home-area="${area}"`),
-      )
-
-      expect(block).toBeDefined()
-      expect(block).toContain(':external-drag-visual="homeDragVisualActive"')
-      expect(block).toContain('@dragcancel="stopHomeDrag"')
-      expect(block).toContain('@dragend="finishHomeDrag"')
-      expect(block).toContain('@dragmove="moveHomeDrag"')
-      expect(block).toContain(`@dragstart="startHomeDrag('${area}',`)
-    }
-  })
-
-  it('uses the external viewport visual for apps dragged from an opened folder', () => {
-    expect(openedFolderAppBlocks).toHaveLength(1)
-    expect(overlaySource).toMatch(/externalDragVisual\??:\s*boolean/)
-    expect(openedFolderAppBlocks[0]).toContain(
-      ':external-drag-visual="externalDragVisual"',
-    )
-    expect(appIconSource).toContain('externalDragVisual?: boolean')
-    expect(appIconSource).toContain('app-icon-item--drag-source')
-  })
-
-  it('forwards opened-folder pointer start, move, and cancellation to the parent session', () => {
-    expect(overlaySource).toMatch(
-      /function startFolderAppDrag\(index: number, event: PointerEvent\)/,
-    )
-    expect(overlaySource).toContain("emit('dragstart', index, event)")
-    expect(overlaySource).toContain("emit('dragmove', event)")
-    expect(overlaySource).toContain("emit('dragcancel')")
-    expect(openedFolderAppBlocks[0]).toContain(
-      '@dragstart="startFolderAppDrag(entry.index, $event)"',
-    )
-    expect(openedFolderAppBlocks[0]).toContain('@dragmove="moveFolderAppDrag"')
-    expect(openedFolderAppBlocks[0]).toContain(
-      '@dragcancel="stopFolderAppDrag"',
-    )
-  })
-
-  it('hit-tests the opened folder panel and app targets in normalized viewport coordinates', () => {
-    expect(overlaySource).toContain('readPhoneViewportGeometry')
-    expect(overlaySource).toContain('phoneViewportRectContainsPoint')
-    expect(overlaySource).toContain('folderDragViewportRect(panel)')
-    expect(overlaySource).toContain('folderDragViewportRect(element)')
-    expect(overlaySource).toMatch(/geometry\?\.rect\(element\)/)
-    expect(overlaySource).not.toContain(
-      'panelElement.value?.getBoundingClientRect()',
-    )
-    expect(overlaySource).not.toContain('document.elementsFromPoint')
-  })
-
   it('edits the folder name inline with Sky UI controls', () => {
     expect(overlaySource).toContain('<SkyField')
     expect(overlaySource).toContain('home-folder-heading--editing')
@@ -121,9 +63,8 @@ describe('Home folder interaction contract', () => {
     expect(springboardSource).toContain(
       '@drag-outside-change="folderDraggingOutside = $event"',
     )
-    expect(overlaySource).toContain('if (draggingIndex.value === null) return')
     expect(overlaySource).toContain(
-      'if (!draggingOutside.value && !isPointerInsidePanel(event))',
+      'if (draggingIndex.value === null || draggingOutside.value) return',
     )
     expect(overlaySource).toContain(
       'draggingOutside.value || !isPointerInsidePanel(event)',

frontend/src/components/HomeFolderOverlay.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Check, Pencil, X } from 'lucide-vue-next'
-import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
 
 import AppIcon from '@/components/AppIcon.vue'
 import { usePhoneStore } from '@/stores/phone'
@@ -11,35 +11,20 @@ import {
   HOME_FOLDER_PAGE_SIZE,
   type HomeFolder,
 } from '@/utils/homeLayout'
-import {
-  phoneViewportRectContainsPoint,
-  readPhoneViewportGeometry,
-  type PhoneViewportGeometry,
-  type PhoneViewportRect,
-} from '@/utils/phoneViewportGeometry'
 
 type FolderAppEntry = {
   app: PhoneAppDefinition
   index: number
 }
 
-const props = withDefaults(
-  defineProps<{
-    apps: FolderAppEntry[]
-    editMode: boolean
-    externalDragVisual?: boolean
-    folder: HomeFolder
-    renameOnOpen: boolean
-  }>(),
-  {
-    externalDragVisual: false,
-  },
-)
+const props = defineProps<{
+  apps: FolderAppEntry[]
+  editMode: boolean
+  folder: HomeFolder
+  renameOnOpen: boolean
+}>()
 const emit = defineEmits<{
   close: []
-  dragcancel: []
-  dragmove: [event: PointerEvent]
-  dragstart: [index: number, event: PointerEvent]
   'drag-outside-change': [outside: boolean]
   edit: []
   extract: [index: number, event: PointerEvent]
@@ -58,7 +43,6 @@ const renameOpened = ref(false)
 const renameDraft = ref('')
 let pagePointerStart = 0
 let pagePointerId: number | null = null
-let dragGeometry: PhoneViewportGeometry | null = null
 
 const folderName = computed(
   () => props.folder.name || phone.t('Home.folders.defaultName'),
@@ -129,48 +113,25 @@ function saveRename(): void {
   renameOpened.value = false
 }
 
-function startFolderAppDrag(index: number, event: PointerEvent): void {
+function startFolderAppDrag(index: number): void {
   draggingIndex.value = index
-  dragGeometry = readPhoneViewportGeometry(panelElement.value)
   setDraggingOutside(false)
-  emit('dragstart', index, event)
-}
-
-function fallbackViewportRect(element: Element): PhoneViewportRect {
-  const bounds = element.getBoundingClientRect()
-  return {
-    bottom: bounds.bottom,
-    height: bounds.height,
-    left: bounds.left,
-    right: bounds.right,
-    top: bounds.top,
-    width: bounds.width,
-  }
-}
-
-function folderDragViewportRect(element: Element): PhoneViewportRect {
-  const geometry = dragGeometry ?? readPhoneViewportGeometry(element)
-  return geometry?.rect(element) ?? fallbackViewportRect(element)
 }
 
 function isPointerInsidePanel(event: PointerEvent): boolean {
-  const panel = panelElement.value
+  const panelBounds = panelElement.value?.getBoundingClientRect()
+  if (!panelBounds) return false
   return (
-    panel !== null &&
-    phoneViewportRectContainsPoint(
-      folderDragViewportRect(panel),
-      event.clientX,
-      event.clientY,
-    )
+    event.clientX >= panelBounds.left &&
+    event.clientX <= panelBounds.right &&
+    event.clientY >= panelBounds.top &&
+    event.clientY <= panelBounds.bottom
   )
 }
 
 function moveFolderAppDrag(event: PointerEvent): void {
-  if (draggingIndex.value === null) return
-  if (!draggingOutside.value && !isPointerInsidePanel(event)) {
-    setDraggingOutside(true)
-  }
-  emit('dragmove', event)
+  if (draggingIndex.value === null || draggingOutside.value) return
+  if (!isPointerInsidePanel(event)) setDraggingOutside(true)
 }
 
 function setDraggingOutside(outside: boolean): void {
@@ -184,52 +145,31 @@ function finishFolderAppDrag(event: PointerEvent): void {
   const shouldExtract = draggingOutside.value || !isPointerInsidePanel(event)
   draggingIndex.value = null
   if (sourceIndex === null) {
-    dragGeometry = null
     setDraggingOutside(false)
-    emit('dragcancel')
     return
   }
   if (shouldExtract) {
     emit('extract', sourceIndex, event)
-    dragGeometry = null
     setDraggingOutside(false)
     return
   }
   setDraggingOutside(false)
 
-  const target = Array.from(
-    panelElement.value?.querySelectorAll<HTMLElement>(
-      '[data-folder-app-index]',
-    ) ?? [],
-  ).find(
-    (element) =>
-      Number(element.dataset.folderAppIndex) !== sourceIndex &&
-      phoneViewportRectContainsPoint(
-        folderDragViewportRect(element),
-        event.clientX,
-        event.clientY,
-      ),
-  )
-  if (!target) {
-    dragGeometry = null
-    emit('dragcancel')
-    return
-  }
+  const target = document
+    .elementsFromPoint(event.clientX, event.clientY)
+    .map((element) => element.closest<HTMLElement>('[data-folder-app-index]'))
+    .find(
+      (element) =>
+        element && Number(element.dataset.folderAppIndex) !== sourceIndex,
+    )
+  if (!target) return
   const targetIndex = Number(target.dataset.folderAppIndex)
-  dragGeometry = null
-  if (!Number.isInteger(targetIndex)) {
-    emit('dragcancel')
-    return
-  }
-  emit('move', sourceIndex, targetIndex)
+  if (Number.isInteger(targetIndex)) emit('move', sourceIndex, targetIndex)
 }
 
 function stopFolderAppDrag(): void {
-  const wasDragging = draggingIndex.value !== null
   draggingIndex.value = null
-  dragGeometry = null
   setDraggingOutside(false)
-  if (wasDragging) emit('dragcancel')
 }
 
 function goToPage(page: number): void {
@@ -255,11 +195,6 @@ function finishPageSwipe(event: PointerEvent): void {
   }
   pagePointerId = null
 }
-
-onBeforeUnmount(() => {
-  stopFolderAppDrag()
-  pagePointerId = null
-})
 </script>
 
 <template>
@@ -355,11 +290,10 @@ onBeforeUnmount(() => {
                 :app="entry.app"
                 :data-folder-app-index="entry.index"
                 :edit-mode="editMode"
-                :external-drag-visual="externalDragVisual"
                 @dragcancel="stopFolderAppDrag"
                 @dragend="finishFolderAppDrag"
                 @dragmove="moveFolderAppDrag"
-                @dragstart="startFolderAppDrag(entry.index, $event)"
+                @dragstart="startFolderAppDrag(entry.index)"
                 @edit="emit('edit')"
               />
             </div>

frontend/src/components/PhoneMediaCapture.vue

@@ -14,12 +14,6 @@ import { isTrustedRootMessageSource } from '@/utils/windowMessages'
 
 type RecordingChunk = { blob: Blob; durationMs: number }
 type PendingVideo = { blob: Blob; fileName: string }
-type UploadFailureDebug = {
-  correlationId: string
-  message: string
-  stage: string
-  status?: number
-}
 
 const canvasRef = ref<HTMLCanvasElement | null>(null)
 const pendingVideos = new Map<string, PendingVideo>()
@@ -136,10 +130,7 @@ function cleanupRecording(): void {
       try {
         activeRecorder.stop()
       } catch (error) {
-        console.error(
-          '[Camera] Could not stop the failed media recorder.',
-          error,
-        )
+        console.error('[Camera] Could not stop the failed media recorder.', error)
       }
     }
   }
@@ -254,7 +245,8 @@ async function startRecording(data: Record<string, unknown>): Promise<void> {
   const activeRecorder = recorder
   removeRecorderErrorListener = bindMediaRecorderError(
     activeRecorder,
-    () => generation === recordingGeneration && recorder === activeRecorder,
+    () =>
+      generation === recordingGeneration && recorder === activeRecorder,
     (event) => {
       console.error('[Camera] Media recorder failed while recording.', event)
       cleanupRecording()
@@ -425,32 +417,8 @@ async function capturePhotoBlob(ready: UploadReady): Promise<Blob> {
   }
 }
 
-async function failUpload(
-  requestId: string,
-  error: string,
-  debug: UploadFailureDebug,
-): Promise<void> {
-  console.error('[Sky Phone Media] Upload failed.', {
-    correlationId: debug.correlationId,
-    detail: debug.message,
-    error,
-    stage: debug.stage,
-    status: debug.status,
-  })
-  const response = await nuiCall('media:failUpload', {
-    correlationId: debug.correlationId,
-    debugMessage: debug.message,
-    debugStage: debug.stage,
-    debugStatus: debug.status,
-    error,
-    requestId,
-  })
-  if (!response.success) {
-    console.error('[Sky Phone Media] Could not forward upload diagnostics.', {
-      correlationId: debug.correlationId,
-      error: response.error,
-    })
-  }
+async function failUpload(requestId: string, error: string): Promise<void> {
+  await nuiCall('media:failUpload', { error, requestId })
 }
 
 async function uploadReady(ready: UploadReady): Promise<void> {
@@ -467,87 +435,49 @@ async function uploadReady(ready: UploadReady): Promise<void> {
       blob = await capturePhotoBlob(ready)
       fileName = `camera-${ready.correlationId}.${ready.photo?.Encoding ?? 'jpg'}`
     }
-  } catch (error) {
-    await failUpload(ready.requestId, 'capture_failed', {
-      correlationId: ready.correlationId,
-      message: error instanceof Error ? error.message : String(error),
-      stage: 'capture',
-    })
+  } catch {
+    await failUpload(ready.requestId, 'capture_failed')
     return
   }
 
-  console.info('[Sky Phone Media] Capture prepared for upload.', {
-    bytes: blob.size,
-    correlationId: ready.correlationId,
-    mimeType: blob.type,
-    type: ready.mediaType,
-  })
-
   const form = new FormData()
   form.append('file', blob, fileName)
+  form.append(
+    'metadata',
+    JSON.stringify({ captureToken: ready.captureToken, source: 'sky_phone' }),
+  )
   const controller = new AbortController()
   const timeout = window.setTimeout(
     () => controller.abort(),
     ready.uploadTimeoutMs ?? 25000,
   )
-  let debugStage = 'provider_request'
-  let debugStatus: number | undefined
   try {
     const response = await fetch(ready.presignedUrl, {
       body: form,
       method: 'POST',
       signal: controller.signal,
     })
-    debugStatus = response.status
-    debugStage = 'provider_response'
-    console.info('[Sky Phone Media] FiveManage upload responded.', {
-      correlationId: ready.correlationId,
-      status: response.status,
-    })
     const text = await response.text()
     const body = JSON.parse(text) as {
       data?: { id?: string; url?: string }
-      error?: string
       id?: string
-      message?: string
       url?: string
     }
     const uploaded = body.data ?? body
     if (!response.ok || !uploaded.id || !uploaded.url) {
-      throw new Error(
-        (typeof body.error === 'string' && body.error) ||
-          (typeof body.message === 'string' && body.message) ||
-          'upload_failed',
-      )
+      throw new Error('upload_failed')
     }
-    debugStage = 'completion_callback'
-    const completion = await nuiCall('media:completeUpload', {
-      correlationId: ready.correlationId,
+    await nuiCall('media:completeUpload', {
       remoteId: uploaded.id,
       requestId: ready.requestId,
       url: uploaded.url,
     })
-    if (!completion.success) {
-      throw new Error(completion.error ?? 'completion_callback_failed')
-    }
-    console.info(
-      '[Sky Phone Media] Upload completion forwarded to the server.',
-      {
-        correlationId: ready.correlationId,
-      },
-    )
   } catch (error) {
     await failUpload(
       ready.requestId,
       error instanceof DOMException && error.name === 'AbortError'
         ? 'upload_timeout'
         : 'upload_failed',
-      {
-        correlationId: ready.correlationId,
-        message: error instanceof Error ? error.message : String(error),
-        stage: debugStage,
-        status: debugStatus,
-      },
     )
   } finally {
     window.clearTimeout(timeout)
@@ -593,12 +523,7 @@ function onMessage(event: MessageEvent): void {
       )
     }
   } else if (message.type === 'media:uploadReady') {
-    const ready = message.data as UploadReady
-    console.info('[Sky Phone Media] Upload-ready received.', {
-      correlationId: ready.correlationId,
-      type: ready.mediaType,
-    })
-    void uploadReady(ready)
+    void uploadReady(message.data as UploadReady)
   } else if (message.type === 'media:uploadResult') {
     const correlationId = String(message.data?.correlationId ?? '')
     if (correlationId) pendingVideos.delete(correlationId)

frontend/src/components/PhoneMemoRecorder.vue

@@ -365,7 +365,6 @@ async function stopRecording(data: Record<string, unknown>): Promise<void> {
       mimeType,
       note: finalMetadata.note,
       pinned: finalMetadata.pinned,
-      sizeBytes: blob.size,
       title: finalMetadata.title,
       waveform,
     }
@@ -459,6 +458,14 @@ async function uploadReady(ready: MemoUploadReady): Promise<void> {
   pending.requestId = ready.requestId
   const form = new FormData()
   form.append('file', pending.blob, pending.fileName)
+  form.append(
+    'metadata',
+    JSON.stringify({
+      captureToken: ready.captureToken,
+      purpose: 'memo',
+      source: 'sky_phone',
+    }),
+  )
   const controller = new AbortController()
   pending.abortController = controller
   const timeout = window.setTimeout(

frontend/src/components/PhoneSetupAssistant.vue

@@ -61,22 +61,16 @@ const passcodeError = ref('')
 const passcodeLength = ref<4 | 6>(phone.security.length === 4 ? 4 : 6)
 const notificationsEnabled = ref(true)
 const notificationSounds = ref(true)
-const selectedApps = ref<BuiltinPhoneAppId[]>(
-  (['banking', 'garage', 'skyride'] as const).filter((id) =>
-    appStore.isAvailable(id),
-  ),
-)
+const selectedApps = ref<BuiltinPhoneAppId[]>(['banking', 'garage', 'skyride'])
 const setupCompleteBusy = ref(false)
 const setupCompleteError = ref('')
 
-const setupApps = computed(() =>
-  (
-    ['banking', 'garage', 'skyride', 'citymarkt', 'picstagram', 'snake'] as const
-  ).flatMap((id) => {
-    const app = getPhoneApp(id)
-    return app && appStore.isAvailable(id) ? [app] : []
-  }),
-)
+const setupApps = (
+  ['banking', 'garage', 'skyride', 'citymarkt', 'picstagram', 'snake'] as const
+).flatMap((id) => {
+  const app = getPhoneApp(id)
+  return app ? [app] : []
+})
 const wallpaperChoices = WALLPAPER_IDS
 const progress = computed(() => `${((step.value + 1) / 10) * 100}%`)
 const displayName = computed(() => {

frontend/src/directives/configInputWidth.ts

@@ -1,26 +0,0 @@
-import type { Directive } from 'vue'
-
-const inputListeners = new WeakMap<HTMLInputElement, () => void>()
-const MINIMUM_INPUT_WIDTH = 42
-
-function syncInputWidth(input: HTMLInputElement): void {
-  input.style.width = '1px'
-  input.style.width = `${Math.max(MINIMUM_INPUT_WIDTH, Math.ceil(input.scrollWidth) + 2)}px`
-}
-
-export const vConfigInputWidth: Directive<HTMLInputElement> = {
-  mounted(input) {
-    const listener = () => syncInputWidth(input)
-    inputListeners.set(input, listener)
-    input.addEventListener('input', listener)
-    syncInputWidth(input)
-  },
-  updated(input) {
-    syncInputWidth(input)
-  },
-  beforeUnmount(input) {
-    const listener = inputListeners.get(input)
-    if (listener) input.removeEventListener('input', listener)
-    inputListeners.delete(input)
-  },
-}

frontend/src/housingProviders.contract.test.ts

@@ -1,63 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-const readResourceFile = (path: string) =>
-  readFileSync(
-    new URL(`../../sky_phone/${path}`, import.meta.url),
-    'utf8',
-  ).replace(/\r\n/g, '\n')
-
-describe('housing provider contracts', () => {
-  it('registers TGIANN House with server-authorized owner properties', () => {
-    const adapter = readResourceFile('source/bridge/server/housing/tgiann.lua')
-
-    expect(adapter).toContain('local resource_name = "tgiann-house"')
-    expect(adapter).toContain('FROM `tgiann_house`')
-    expect(adapter).toContain('WHERE `owner` = ?')
-    expect(adapter).toContain('Bridge.Framework.GetIdentifier(source)')
-    expect(adapter).toContain(
-      'Bridge.Housing.RegisterProvider(provider_name, {',
-    )
-    expect(adapter).toContain('return nil, "property_access_denied"')
-    expect(adapter).not.toContain('`houseKeys`')
-    expect(adapter).not.toContain('tgiann-house:getPlayerHouses')
-  })
-
-  it('uses the published client export for entrance waypoints only', () => {
-    const adapter = readResourceFile('source/bridge/client/housing/tgiann.lua')
-
-    expect(adapter).toContain(
-      'return exports[resource_name]:getHouseData(house)',
-    )
-    expect(adapter).toContain(
-      'Bridge.Normalize.Coordinates(house_data.doorCoord)',
-    )
-    expect(adapter).toContain(
-      'Bridge.Housing.RegisterClientProvider(provider_name, {',
-    )
-    expect(adapter).toContain('SetNewWaypoint(')
-    expect(adapter).not.toContain('enterHouse(')
-    expect(adapter).not.toContain('forceOpenDoorHouse')
-  })
-
-  it('advertises TGIANN in housing configuration and documentation', () => {
-    const config = readResourceFile('config/config.lua')
-    const readme = readFileSync(
-      new URL('../../README.md', import.meta.url),
-      'utf8',
-    )
-
-    expect(config).toContain(
-      '"rtx", "quasar", "tgiann", "vms", "rx", "nolag", "sn"',
-    )
-    expect(readme).toContain('Quasar Housing, TGIANN House, VMS Housing')
-    expect(readme).toContain('`quasar`, `tgiann`, `vms`')
-    expect(readme).toContain(
-      'expects `tgiann-core` to start before `tgiann-house`',
-    )
-    expect(readme).toContain(
-      'lists server-authorized owner properties, and supports entrance waypoints',
-    )
-  })
-})

frontend/src/mediaConfig.server.contract.test.ts

@@ -1,103 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-const mediaConfig = readFileSync(
-  new URL('../../sky_phone/config/media.lua', import.meta.url),
-  'utf8',
-)
-const manifest = readFileSync(
-  new URL('../../sky_phone/fxmanifest.lua', import.meta.url),
-  'utf8',
-)
-const mediaProviderConfig = readFileSync(
-  new URL(
-    '../../sky_phone/source/server/media_provider_config.lua',
-    import.meta.url,
-  ),
-  'utf8',
-)
-const mediaImportAdapter = readFileSync(
-  new URL(
-    '../../sky_phone/source/server/media_import/fivemanage.lua',
-    import.meta.url,
-  ),
-  'utf8',
-)
-const mediaServer = readFileSync(
-  new URL('../../sky_phone/source/server/media.lua', import.meta.url),
-  'utf8',
-)
-const memoServer = readFileSync(
-  new URL('../../sky_phone/source/server/memos.lua', import.meta.url),
-  'utf8',
-)
-const mediaCapture = readFileSync(
-  new URL('./components/PhoneMediaCapture.vue', import.meta.url),
-  'utf8',
-)
-const memoRecorder = readFileSync(
-  new URL('./components/PhoneMemoRecorder.vue', import.meta.url),
-  'utf8',
-)
-
-describe('FiveManage server configuration contract', () => {
-  it('keeps the provider token in the server-only media config', () => {
-    expect(mediaConfig).toMatch(/FiveManage\s*=\s*{\s*ApiKey\s*=/)
-    expect(mediaProviderConfig).toContain(
-      'return trim_key(Config.Media.FiveManage.ApiKey)',
-    )
-    expect(mediaProviderConfig).not.toContain('GetConvar')
-  })
-
-  it('uses one resolver for Camera uploads and FiveManage imports', () => {
-    expect(
-      manifest.indexOf("'source/server/media_provider_config.lua'"),
-    ).toBeLessThan(manifest.indexOf("'source/server/media_import.lua'"))
-    expect(mediaServer).toContain(
-      'SkyPhoneMediaProviderConfig.FiveManageApiKey()',
-    )
-    expect(mediaImportAdapter).toContain(
-      'SkyPhoneMediaProviderConfig.FiveManageApiKey(website.ApiKey)',
-    )
-  })
-
-  it('uses the direct FiveManage upload response flow for Camera and voice memos', () => {
-    expect(mediaConfig).not.toContain('VerificationRetryDelaysMs')
-    expect(mediaCapture).toContain("form.append('file', blob, fileName)")
-    expect(mediaCapture).not.toContain("form.append('path'")
-    expect(mediaCapture).not.toContain("form.append(\n    'metadata'")
-    expect(memoRecorder).toContain(
-      "form.append('file', pending.blob, pending.fileName)",
-    )
-    expect(memoRecorder).not.toContain("form.append('path'")
-    expect(memoRecorder).not.toContain("form.append(\n    'metadata'")
-    expect(mediaServer).toContain(
-      'Accepting the direct FiveManage upload response',
-    )
-    expect(mediaServer).toContain('remote_id = remote_id')
-    expect(mediaServer).toContain('url = uploaded_url')
-    expect(mediaServer).not.toContain('"HEAD"')
-    expect(mediaServer).not.toContain('authenticated upload-path lookup')
-  })
-
-  it('allowlists the FiveManage API and media hosts', () => {
-    expect(mediaServer).toContain('["api.fivemanage.com"] = true')
-    expect(mediaServer).toContain('["fmapi.net"] = true')
-    expect(mediaServer).toContain(
-      'uploaded_host:lower() ~= "r2.fivemanage.com"',
-    )
-  })
-
-  it('validates and preserves the recorded memo size before upload', () => {
-    expect(memoRecorder).toContain('sizeBytes: blob.size')
-    expect(memoServer).toContain(
-      'local size_bytes = tonumber(data.sizeBytes)',
-    )
-    expect(memoServer).toContain(
-      'size_bytes < 1 or size_bytes > Config.Memos.MaximumBytes',
-    )
-    expect(memoServer).toContain('size_bytes = memo.size_bytes')
-    expect(mediaServer).toContain('size = state.size_bytes')
-  })
-})

frontend/src/mediaUploadDebug.contract.test.ts

@@ -1,21 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-const mediaCapture = readFileSync(
-  new URL('./components/PhoneMediaCapture.vue', import.meta.url),
-  'utf8',
-)
-const mediaServer = readFileSync(
-  new URL('../../sky_phone/source/server/media.lua', import.meta.url),
-  'utf8',
-)
-
-describe('media upload diagnostics contracts', () => {
-  it('forwards browser upload failure context to the server log', () => {
-    expect(mediaCapture).toContain("let debugStage = 'provider_request'")
-    expect(mediaCapture).toContain('debugStatus: debug.status')
-    expect(mediaServer).toContain('Client-reported upload failure')
-    expect(mediaServer).toContain('diagnostic_text(data.debugMessage, 240)')
-  })
-})

frontend/src/permissions.contract.test.ts

@@ -1,89 +0,0 @@
-import { readFileSync } from 'node:fs'
-
-import { describe, expect, it } from 'vitest'
-
-function source(path: string): string {
-  return readFileSync(new URL(path, import.meta.url), 'utf8')
-}
-
-const config = source('../../sky_phone/config/config.lua')
-const configDefault = source('../../sky_phone/source/shared/config_default.lua')
-const framework = source('../../sky_phone/source/bridge/server/framework.lua')
-const qbox = source('../../sky_phone/source/bridge/server/frameworks/qbox.lua')
-const configurator = source(
-  '../../sky_phone/source/server/phone_configurator.lua',
-)
-const configuratorFixture = source('../testserver/configurator-fixture.cjs')
-
-describe('fixed server permissions', () => {
-  it('defines every protected phone capability only in config.lua', () => {
-    expect(config).toContain('Config.CommandPermissions = {')
-    for (const permission of [
-      'phonepanel',
-      'phonetestdata',
-      'fliptokverify',
-      'picstagramverify',
-      'picstagramadmin',
-    ]) {
-      expect(config).toMatch(new RegExp(`\\s${permission} = \\{`))
-    }
-    expect(config).not.toContain('AdminGroups =')
-    expect(configDefault).not.toContain('Config.PhoneConfigurator')
-    expect(configDefault).not.toContain('Config.CommandPermissions')
-    expect(configDefault).not.toContain('AdminGroups =')
-  })
-
-  it('keeps fixed permissions outside SQL and removes legacy group fields', () => {
-    expect(configurator).toContain('key ~= "CommandPermissions"')
-    expect(configurator).toContain('if key ~= "CommandPermissions" then')
-    expect(configuratorFixture).toContain('delete config.CommandPermissions')
-    for (const path of [
-      'AdminPanel.AdminGroups',
-      'TestData.AdminGroups',
-      'FlipTok.AdminGroups',
-      'Picstagram.AdminGroups',
-    ]) {
-      expect(configurator).toContain(`["${path}"] = true`)
-    }
-    expect(configurator).toContain(
-      'SKY PHONE CONFIGURATION FILES ARE DISABLED',
-    )
-    expect(configurator).toContain(
-      '^1 Runtime settings from config.lua and media.lua are DISABLED.^0',
-    )
-    expect(configurator).toContain(
-      '^1 Configure all phone and media settings IN GAME through /phonepanel.^0',
-    )
-    expect(configurator).toContain(
-      '^1 Only Config.PhoneConfigurator.Enabled and Config.CommandPermissions remain file-based.^0',
-    )
-  })
-
-  it('authorizes Qbox through ACE before retaining framework group support', () => {
-    expect(framework).toContain(
-      'local groups = Config.CommandPermissions[permission]',
-    )
-    expect(qbox).toContain(
-      'if IsPlayerAceAllowed(tostring(source), group) then',
-    )
-    expect(qbox.indexOf('IsPlayerAceAllowed')).toBeLessThan(
-      qbox.indexOf('exports.qbx_core:HasGroup'),
-    )
-  })
-
-  it('uses stable permission identifiers for every protected operation', () => {
-    const expectations = [
-      ['../../sky_phone/source/server/admin.lua', 'phonepanel'],
-      ['../../sky_phone/source/server/testdata.lua', 'phonetestdata'],
-      ['../../sky_phone/source/server/fliptok.lua', 'fliptokverify'],
-      ['../../sky_phone/source/server/picstagram.lua', 'picstagramverify'],
-      ['../../sky_phone/source/server/picstagram.lua', 'picstagramadmin'],
-    ] as const
-
-    for (const [path, permission] of expectations) {
-      expect(source(path)).toContain(
-        `Bridge.Framework.HasPermission(source, "${permission}")`,
-      )
-    }
-  })
-})

frontend/src/phoneInventory.contract.test.ts

@@ -3,27 +3,17 @@ import { readFileSync } from 'node:fs'
 import { describe, expect, it } from 'vitest'
 
 const readResourceFile = (path: string) =>
-  readFileSync(
-    new URL(`../../sky_phone/${path}`, import.meta.url),
-    'utf8',
-  ).replace(/\r\n/g, '\n')
+  readFileSync(new URL(`../../sky_phone/${path}`, import.meta.url), 'utf8').replace(/\r\n/g, '\n')
 const readFrontendFile = (path: string) =>
   readFileSync(new URL(path, import.meta.url), 'utf8')
 
 const inventoryAdapters = [
-  ['jaksam', 'source/bridge/server/inventory/jaksam.lua'],
   ['ox', 'source/bridge/server/inventory/ox.lua'],
   ['qb', 'source/bridge/server/inventory/qb.lua'],
   ['lj', 'source/bridge/server/inventory/qb.lua'],
   ['qs', 'source/bridge/server/inventory/qs.lua'],
-  ['ps', 'source/bridge/server/inventory/ps.lua'],
   ['codem', 'source/bridge/server/inventory/codem.lua'],
-  ['tgiann', 'source/bridge/server/inventory/tgiann.lua'],
   ['core', 'source/bridge/server/inventory/core.lua'],
-  ['jpr', 'source/bridge/server/inventory/jpr.lua'],
-  ['origen', 'source/bridge/server/inventory/origen.lua'],
-  ['ak47', 'source/bridge/server/inventory/ak47.lua'],
-  ['one', 'source/bridge/server/inventory/one.lua'],
   ['mf', 'source/bridge/server/inventory/mf.lua'],
   ['smx', 'source/bridge/server/inventory/smx.lua'],
   ['hex', 'source/bridge/server/inventory/esx.lua'],
@@ -44,73 +34,22 @@ describe('phone inventory contracts', () => {
     const phoneServer = readResourceFile('source/server/phone.lua')
 
     expect(phoneServer).toContain(
-      'Bridge.Inventory.RegisterUsableItem(item_name, function(...)',
-    )
-    expect(phoneServer).toContain('if Config.Phone.Item == item_name then')
-    expect(phoneServer).toContain(
-      'if not Bridge.Inventory.RegisterUsableItem(item_name, function(...)',
+      'Bridge.Inventory.RegisterUsableItem(Config.Phone.Item, open_phone)',
     )
+    expect(phoneServer).toContain('if not usable_registered then')
   })
 
-  it('uses One Inventory slot ids and authoritative slot reads', () => {
-    const adapter = readResourceFile(
-      'source/bridge/server/inventory/one.lua',
-    )
-
-    expect(adapter).toContain('inventory:GetSlotIdsWithItem(')
-    expect(adapter).toContain(
-      'local normalized = Bridge.Inventory.GetSlot(source, slot_id)',
-    )
-    expect(adapter).not.toContain('inventory:SearchInventory(')
-    expect(adapter).toContain(
-      'inventory:SetItemMetadata(source, slot.slot, requested_metadata) == false',
-    )
-  })
-
-  it('serializes and rate-limits phone bootstrap requests on both sides', () => {
-    const phoneClient = readResourceFile('source/client/main.lua')
-    const phoneServer = readResourceFile('source/server/phone.lua')
-
-    expect(phoneClient).toContain('local function request_phone_open(')
-    expect(phoneClient).toMatch(
-      /request_phone_open\(callback_name\)[\s\S]*?open_requested = true[\s\S]*?Bridge\.Callbacks\.Trigger\(callback_name, \{\}\)/,
-    )
-    expect(phoneClient).toMatch(
-      /RegisterNetEvent\("sky_phone:device:error"[\s\S]*?if not is_open then[\s\S]*?open_requested = false/,
-    )
-    expect(phoneServer).toContain('local phone_open_in_progress = {}')
-    expect(phoneServer).toContain(
-      'SkyPhone.AllowOperation(source, "phone_open", request_limit, 60)',
-    )
-    expect(phoneServer).toContain(
-      'pcall(perform_phone_open, source, used_item)',
-    )
-  })
-
-  it('auto-detects registered inventories and forces metadata-free adapters into compatible modes', () => {
+  it('auto-detects HEX and limits count-based ESX inventories to metadata-free modes', () => {
     const inventoryBridge = readResourceFile(
       'source/bridge/server/inventory.lua',
     )
 
     expect(inventoryBridge).toContain(
-      '{ name = "hex", resource = "hex_4_inventory", framework = "esx", metadata = false },',
-    )
-    expect(inventoryBridge).toContain(
-      'GetResourceState(adapter.resource) == "started"',
-    )
-    expect(inventoryBridge).toContain('configured_inventory = adapter.name')
-    expect(inventoryBridge).toContain('selected_adapter.metadata == false')
-    expect(inventoryBridge).toContain('Config.Phone.Unique = false')
-    expect(inventoryBridge).toContain('Config.Sim.Enabled = false')
-    expect(inventoryBridge).toContain(
-      'does not support item metadata; unique phones and physical SIM cards were disabled automatically',
-    )
-    expect(inventoryBridge).toContain(
-      'AddEventHandler("sky_phone:configurator:serverUpdated"',
-    )
-    expect(inventoryBridge).not.toContain(
-      'cannot store unique phone or physical SIM metadata',
+      'GetResourceState("hex_4_inventory") == "started"',
     )
+    expect(inventoryBridge).toContain('configured_inventory = "hex"')
+    expect(inventoryBridge).toContain('Config.Phone.Unique ~= false')
+    expect(inventoryBridge).toContain('Config.Sim.Enabled ~= false')
   })
 
   it('provides the LB IsOpen export alias from the authoritative client state', () => {
@@ -161,15 +100,9 @@ describe('phone inventory contracts', () => {
     expect(equippedNumberExport).toBeDefined()
     expect(equippedNumberResolver).toBeDefined()
     expect(equippedNumberExport).toContain('type(player) == "number"')
-    expect(equippedNumberExport).toContain(
-      'online_source_for_identifier(player)',
-    )
-    expect(phoneServer).toContain(
-      'Bridge.Inventory.GetSlotsWithItem(source, Config.Phone.Item)',
-    )
-    expect(phoneServer).toContain(
-      'return resolve_equipped_phone_number(player)',
-    )
+    expect(equippedNumberExport).toContain('online_source_for_identifier(player)')
+    expect(phoneServer).toContain('Bridge.Inventory.GetSlotsWithItem(source, Config.Phone.Item)')
+    expect(phoneServer).toContain('return resolve_equipped_phone_number(player)')
     expect(equippedNumberExport).not.toContain('tonumber(player)')
     expect(equippedNumberExport).not.toContain('equipped_phone_numbers[player]')
     expect(equippedNumberResolver).not.toContain('return cached_number')
@@ -201,10 +134,10 @@ describe('phone inventory contracts', () => {
       'SkyPhoneCompatibility.RegisterExportAlias("lb-phone", "ToggleOpen"',
     )
     expect(phoneClient).toContain(
-      'local result = Bridge.Callbacks.Trigger(callback_name, {})',
+      'local result = Bridge.Callbacks.Trigger("sky_phone:device:open-request", {})',
     )
     expect(phoneClient).toMatch(
-      /result\.success == true[\s\S]*open_requested = false[\s\S]*open_without_focus = false[\s\S]*return false/,
+      /result\.success ~= true[\s\S]*open_without_focus = false[\s\S]*return false/,
     )
     expect(phoneBridge).toContain(
       'SkyPhoneCompatibility.RegisterExportAlias("lb-phone", "IsPhoneOnScreen"',
@@ -224,9 +157,7 @@ describe('phone inventory contracts', () => {
     expect(phoneClient).toContain(
       'TriggerEvent("sky_phone:client:phoneToggled", false)',
     )
-    expect(phoneBridge).toContain(
-      'TriggerEvent("lb-phone:numberChanged", phone_number)',
-    )
+    expect(phoneBridge).toContain('TriggerEvent("lb-phone:numberChanged", phone_number)')
     expect(phoneBridge).toContain('TriggerEvent("lb-phone:phoneToggled", open)')
   })
 
@@ -279,54 +210,28 @@ describe('phone inventory contracts', () => {
     expect(mediaServer).toContain(
       'TriggerEvent("sky_phone:server:galleryMediaDeleted", src, phone_number, deleted_link)',
     )
-    expect(phoneBridge).toContain(
-      'TriggerEvent("lb-phone:phoneNumberGenerated"',
-    )
+    expect(phoneBridge).toContain('TriggerEvent("lb-phone:phoneNumberGenerated"')
     expect(phoneBridge).toContain('TriggerEvent("lb-phone:factoryReset"')
     expect(phoneBridge).toContain('TriggerEvent("lb-phone:deletedFromGallery"')
   })
 
-  it('keeps the phone key mapping command stable so FiveM user rebindings persist', () => {
+  it('opens from a configurable F1 mapping without client-provided device identity', () => {
     const config = readResourceFile('config/config.lua')
     const phoneClient = readResourceFile('source/client/main.lua')
     const phoneServer = readResourceFile('source/server/phone.lua')
 
     expect(config).toContain('Keybind = "F1"')
-    expect(phoneClient).toContain('local phone_key_mapping_registered = false')
-    expect(phoneClient).toContain('refresh_phone_key_mapping = function()')
-    expect(phoneClient).toMatch(
-      /RegisterKeyMapping\(\s*"sky_phone_toggle",\s*locale\.Controls\.OpenPhone,\s*"keyboard",\s*key_name\s*\)/,
-    )
-    expect(phoneClient).not.toContain('sky_phone_toggle_config_')
-    expect(phoneClient).not.toContain('key_mapping_revision')
     expect(phoneClient).toContain(
-      'request_phone_open("sky_phone:device:open-request")',
+      'RegisterKeyMapping("sky_phone_toggle", locale.Controls.OpenPhone, "keyboard", Config.Phone.Keybind)',
+    )
+    expect(phoneClient).toContain(
+      'Bridge.Callbacks.Trigger("sky_phone:device:open-request", {})',
     )
     expect(phoneServer).toContain(
       'Bridge.Callbacks.Register("sky_phone:device:open-request", function(source)',
     )
   })
 
-  it('applies development command changes immediately without a resource restart', () => {
-    const phoneClient = readResourceFile('source/client/main.lua')
-
-    expect(phoneClient).toContain('local active_development_command = nil')
-    expect(phoneClient).toContain('refresh_development_command = function()')
-    expect(phoneClient).toContain(
-      'local command_name = Config.Phone.DevelopmentCommand and Config.Command or nil',
-    )
-    expect(phoneClient).toContain('RegisterCommand(command_name, function()')
-    expect(phoneClient).toContain(
-      'if active_development_command == command_name and Config.Phone.DevelopmentCommand then',
-    )
-    expect(phoneClient).toContain(
-      'TriggerEvent("chat:removeSuggestion", "/" .. active_development_command)',
-    )
-    expect(phoneClient).toMatch(
-      /AddEventHandler\("sky_phone:configurator:updated", function\(\)[\s\S]*?refresh_development_command\(\)/,
-    )
-  })
-
   it('opens a running live activity with Space without affecting normal gameplay', () => {
     const phoneClient = readResourceFile('source/client/main.lua')
 
@@ -357,7 +262,7 @@ describe('phone inventory contracts', () => {
     const phoneServer = readResourceFile('source/server/phone.lua')
     const migration = readResourceFile('source/server/db_migrate.lua')
 
-    expect(phoneServer).toContain('if Config.Phone.Unique == false then')
+    expect(phoneServer).toContain('if not unique_phones then')
     expect(phoneServer).toContain('return map_character_device(source, slot)')
     expect(phoneServer).toContain('FROM `sky_phone_character_devices`')
     expect(phoneServer).toContain('WHERE `owner_identifier` = ?')

frontend/src/stores/admin.ts

@@ -5,8 +5,6 @@ import type {
   AdminActivityResponse,
   AdminBootstrap,
   AdminCallActivity,
-  AdminConfigurator,
-  AdminConfiguratorChange,
   AdminCredential,
   AdminMessageActivity,
   AdminPlayerDetail,
@@ -15,42 +13,14 @@ import type {
 } from '@/types/admin'
 import { nuiCall, type NuiResponse } from '@/utils/nui'
 
-const EMPTY_STATS: AdminStats = {
-  accounts: 0,
-  activeDevices: 0,
-  auditEntries: 0,
-  auditToday: 0,
-  callsToday: 0,
-  devices: 0,
-  linkedDevices: 0,
-  messagesToday: 0,
-  online: 0,
-  simDevices: 0,
-}
-
-function disabledAppsFromConfigurator(
-  configurator: AdminConfigurator,
-): string[] {
-  const apps = configurator.sections
-    .flatMap((section) => section.fields)
-    .find((field) => field.scope === 'config' && field.path === 'Apps')?.value
-  if (!apps || typeof apps !== 'object' || Array.isArray(apps)) return []
-
-  return Object.entries(apps)
-    .filter(([, enabled]) => enabled === false)
-    .map(([appId]) => appId)
-    .sort()
-}
+const EMPTY_STATS: AdminStats = { accounts: 0, devices: 0, online: 0 }
 
 export const useAdminStore = defineStore('admin', {
   state: () => ({
     actionKey: '',
     activityKey: '',
     audit: [] as AdminAuditEntry[],
-    configurator: null as AdminConfigurator | null,
-    configuratorLoading: false,
     detailLoading: false,
-    disabledApps: [] as string[],
     error: '',
     initialized: false,
     loading: false,
@@ -73,9 +43,6 @@ export const useAdminStore = defineStore('admin', {
         return false
       }
       this.players = response.data.players
-      this.disabledApps = Array.isArray(response.data.disabledApps)
-        ? response.data.disabledApps
-        : []
       this.stats = response.data.stats
       this.audit = response.data.audit
       this.error = ''
@@ -167,44 +134,6 @@ export const useAdminStore = defineStore('admin', {
       this.error = ''
       return true
     },
-    async loadConfigurator(): Promise<boolean> {
-      this.configuratorLoading = true
-      const response = await nuiCall<AdminConfigurator>('admin:configurator')
-      this.configuratorLoading = false
-      if (!response.success || !response.data) {
-        this.error = response.error ?? 'request_failed'
-        return false
-      }
-      this.configurator = response.data
-      this.disabledApps = disabledAppsFromConfigurator(response.data)
-      this.error = ''
-      return true
-    },
-    async saveConfigurator(
-      changes: AdminConfiguratorChange[],
-    ): Promise<NuiResponse<AdminConfigurator>> {
-      const current = this.configurator
-      if (!current) return { error: 'request_failed', success: false }
-
-      this.actionKey = 'configurator:save'
-      const response = await nuiCall<AdminConfigurator>(
-        'admin:save-configurator',
-        {
-          changes,
-          revision: current.revision,
-        },
-      )
-      this.actionKey = ''
-      if (response.success && response.data) {
-        this.configurator = response.data
-        this.disabledApps = disabledAppsFromConfigurator(response.data)
-        this.error = ''
-      } else {
-        if (response.data) this.configurator = response.data
-        this.error = response.error ?? 'request_failed'
-      }
-      return response
-    },
     async resetPasscode(
       source: number,
       imei: string,

frontend/src/stores/app-store.test.ts

@@ -75,21 +75,6 @@ describe('app store', () => {
     }
   })
 
-  it('removes server-disabled apps without forgetting device claims', () => {
-    const apps = useAppStoreStore()
-
-    apps.hydrate({ claimedApps: ['weather', 'snake'] }, ['weather'])
-
-    expect(apps.isAvailable('weather')).toBe(false)
-    expect(apps.isInstalled('weather')).toBe(false)
-    expect(apps.homeLayout.grid).not.toContain('weather')
-    expect(apps.claimedApps).toContain('weather')
-    expect(apps.isInstalled('snake')).toBe(true)
-
-    apps.hydrate({ claimedApps: apps.claimedApps }, [])
-    expect(apps.isInstalled('weather')).toBe(true)
-  })
-
   it('drops the retired admin app from persisted phone layouts', () => {
     const apps = useAppStoreStore()
 
@@ -264,23 +249,6 @@ describe('app store', () => {
     expect(apps.homeLayout.hidden).not.toContain('snake')
   })
 
-  it('uninstalls claimed Banking and Picstagram apps from every app state', () => {
-    const apps = useAppStoreStore()
-    apps.hydrate({ claimedApps: ['banking', 'picstagram'] })
-    mocks.phone.saveDeviceNamespace.mockClear()
-
-    for (const appId of ['banking', 'picstagram'] as const) {
-      expect(apps.isInstalled(appId)).toBe(true)
-      expect(apps.uninstallApp(appId)).toBe(true)
-      expect(apps.isInstalled(appId)).toBe(false)
-      expect(apps.claimedApps).not.toContain(appId)
-      expect(apps.uninstalledApps).toContain(appId)
-      expect(apps.homeLayout.hidden).toContain(appId)
-    }
-
-    expect(mocks.phone.saveDeviceNamespace).toHaveBeenCalledTimes(2)
-  })
-
   it('hydrates persisted removals while rejecting protected and invalid ids', () => {
     const apps = useAppStoreStore()
 
@@ -491,41 +459,6 @@ describe('app store', () => {
     expect(mocks.phone.saveDeviceNamespace).toHaveBeenCalledTimes(5)
   })
 
-  it('materializes a trailing page only for a successful folder extraction', () => {
-    const apps = useAppStoreStore()
-    apps.hydrate(null)
-
-    const notesIndex = apps.homeLayout.grid.indexOf('notes')
-    const settingsIndex = apps.homeLayout.grid.indexOf('settings')
-    const folderId = apps.createHomeFolder(
-      'grid',
-      notesIndex,
-      'grid',
-      settingsIndex,
-      'Utilities',
-    )
-    expect(folderId).toBeTruthy()
-
-    const originalPageCount = apps.homeLayout.pageCount
-    const targetPage = originalPageCount + 1
-    const targetIndex = originalPageCount * HOME_GRID_PAGE_SIZE
-    expect(apps.homeLayout.grid[targetIndex]).toBeUndefined()
-
-    expect(
-      apps.extractHomeFolderApp('missing-folder', 0, 'grid', targetIndex),
-    ).toBe(false)
-    expect(apps.homeLayout.pageCount).toBe(originalPageCount)
-    expect(apps.homeLayout.grid[targetIndex]).toBeUndefined()
-
-    mocks.phone.saveDeviceNamespace.mockClear()
-    expect(apps.extractHomeFolderApp(folderId!, 0, 'grid', targetIndex)).toBe(
-      true,
-    )
-    expect(apps.homeLayout.pageCount).toBe(targetPage)
-    expect(apps.homeLayout.grid[targetIndex]).toBe('settings')
-    expect(mocks.phone.saveDeviceNamespace).toHaveBeenCalledTimes(1)
-  })
-
   it('does not commit an installation to a different phone', () => {
     vi.useFakeTimers()
     const apps = useAppStoreStore()

frontend/src/stores/app-store.ts

@@ -19,7 +19,6 @@ import {
   createDefaultHomeLayout,
   deleteHomePage,
   extractHomeFolderApp,
-  HOME_GRID_PAGE_SIZE,
   moveHomeFolderApp,
   moveHomeApp,
   moveHomeAppToGridPage,
@@ -46,49 +45,28 @@ const pendingInstallations = new WeakMap<
   Map<LaunchablePhoneAppId, PendingInstallation>
 >()
 
-function isAppDisabled(
-  appId: LaunchablePhoneAppId,
-  disabledApps: readonly LaunchablePhoneAppId[],
-): boolean {
-  return disabledApps.includes(appId)
-}
-
-function getDefaultGridIds(
-  disabledApps: readonly LaunchablePhoneAppId[] = [],
-): LaunchablePhoneAppId[] {
-  return PHONE_APPS.filter(
-    (app) => app.dockOrder === null && !isAppDisabled(app.id, disabledApps),
-  )
+function getDefaultGridIds(): LaunchablePhoneAppId[] {
+  return PHONE_APPS.filter((app) => app.dockOrder === null)
     .sort((a, b) => a.gridOrder - b.gridOrder)
     .map((app) => app.id)
 }
 
-function getDefaultDockIds(
-  disabledApps: readonly LaunchablePhoneAppId[] = [],
-): LaunchablePhoneAppId[] {
-  return PHONE_APPS.filter(
-    (app) => app.dockOrder !== null && !isAppDisabled(app.id, disabledApps),
-  )
+function getDefaultDockIds(): LaunchablePhoneAppId[] {
+  return PHONE_APPS.filter((app) => app.dockOrder !== null)
     .sort((a, b) => (a.dockOrder ?? 0) - (b.dockOrder ?? 0))
     .map((app) => app.id)
 }
 
-function getDefaultInstalledIds(
-  disabledApps: readonly LaunchablePhoneAppId[] = [],
-): LaunchablePhoneAppId[] {
+function getDefaultInstalledIds(): LaunchablePhoneAppId[] {
   return PHONE_APPS.filter((app) => {
-    if (app.adminOnly || isAppDisabled(app.id, disabledApps)) return false
+    if (app.adminOnly) return false
     return isExternalPhoneApp(app)
       ? app.defaultInstalled
       : DEFAULT_INSTALLED_PHONE_APP_IDS.has(app.id)
   }).map((app) => app.id)
 }
 
-function isProtectedHomeApp(
-  appId: LaunchablePhoneAppId,
-  disabledApps: readonly LaunchablePhoneAppId[],
-): boolean {
-  if (isAppDisabled(appId, disabledApps)) return false
+function isProtectedHomeApp(appId: LaunchablePhoneAppId): boolean {
   const app = getPhoneApp(appId)
   return app
     ? !isPhoneAppRemovable(app)
@@ -126,7 +104,6 @@ function hasUninstalledBuiltinApp(
 export const useAppStoreStore = defineStore('app-store', {
   state: () => ({
     claimedApps: [] as LaunchablePhoneAppId[],
-    disabledApps: [] as LaunchablePhoneAppId[],
     uninstalledApps: [] as LaunchablePhoneAppId[],
     homeLayout: createDefaultHomeLayout(
       getDefaultInstalledIds(),
@@ -153,7 +130,6 @@ export const useAppStoreStore = defineStore('app-store', {
       return true
     },
     claimApp(id: LaunchablePhoneAppId): void {
-      if (!this.isAvailable(id)) return
       this.uninstalledApps = this.uninstalledApps.filter(
         (appId) => appId !== id,
       )
@@ -174,7 +150,6 @@ export const useAppStoreStore = defineStore('app-store', {
       this.installingApps = {}
     },
     installApp(id: LaunchablePhoneAppId): void {
-      if (!this.isAvailable(id)) return
       const installed = this.isInstalled(id)
       if (
         this.installingApps[id] ||
@@ -216,10 +191,6 @@ export const useAppStoreStore = defineStore('app-store', {
           )
           return
         }
-        if (!this.isAvailable(id)) {
-          delete this.installingApps[id]
-          return
-        }
         if (reportInstall && !isExternalPhoneApp(getPhoneApp(id))) {
           delete this.installingApps[id]
           console.error(
@@ -249,14 +220,8 @@ export const useAppStoreStore = defineStore('app-store', {
       installations.set(id, { deviceImei, timer, token })
       pendingInstallations.set(this, installations)
     },
-    hydrate(payload: unknown, disabledApps: unknown = []): void {
+    hydrate(payload: unknown): void {
       this.cancelPendingInstalls()
-      this.disabledApps = Array.isArray(disabledApps)
-        ? disabledApps.filter(
-            (id): id is LaunchablePhoneAppId =>
-              typeof id === 'string' && isPhoneAppId(id),
-          )
-        : []
       const data = payload as {
         claimedApps?: unknown
         homeLayout?: unknown
@@ -291,22 +256,16 @@ export const useAppStoreStore = defineStore('app-store', {
           })
         : []
       const installedIds = [
-        ...new Set([
-          ...getDefaultInstalledIds(this.disabledApps),
-          ...this.claimedApps,
-        ]),
-      ].filter(
-        (id) =>
-          !this.uninstalledApps.includes(id) && this.isAvailable(id),
-      )
+        ...new Set([...getDefaultInstalledIds(), ...this.claimedApps]),
+      ].filter((id) => !this.uninstalledApps.includes(id))
       const removedLegacyDefaults = hasUninstalledBuiltinApp(
         data?.homeLayout,
         installedIds,
       )
       const defaults = createDefaultHomeLayout(
         installedIds,
-        getDefaultGridIds(this.disabledApps),
-        getDefaultDockIds(this.disabledApps),
+        getDefaultGridIds(),
+        getDefaultDockIds(),
       )
       const parsedHomeLayout = parseHomeLayout(
         data?.homeLayout,
@@ -318,9 +277,8 @@ export const useAppStoreStore = defineStore('app-store', {
       const removedDockGridDuplicates =
         normalizedHomeLayout !== parsedHomeLayout
       this.homeLayout = normalizedHomeLayout
-      const protectedHiddenAppIds = this.homeLayout.hidden.filter((appId) =>
-        isProtectedHomeApp(appId, this.disabledApps),
-      )
+      const protectedHiddenAppIds =
+        this.homeLayout.hidden.filter(isProtectedHomeApp)
       for (const appId of protectedHiddenAppIds) {
         this.homeLayout = restoreHomeApp(this.homeLayout, appId)
       }
@@ -352,11 +310,7 @@ export const useAppStoreStore = defineStore('app-store', {
         this.persist()
       }
     },
-    isAvailable(appId: LaunchablePhoneAppId): boolean {
-      return !isAppDisabled(appId, this.disabledApps)
-    },
     isInstalled(appId: LaunchablePhoneAppId): boolean {
-      if (!this.isAvailable(appId)) return false
       const app = getPhoneApp(appId)
       if (app?.adminOnly) return false
       if (this.uninstalledApps.includes(appId)) return false
@@ -368,18 +322,12 @@ export const useAppStoreStore = defineStore('app-store', {
     },
     reconcileCatalog(): void {
       const installedIds = [
-        ...new Set([
-          ...getDefaultInstalledIds(this.disabledApps),
-          ...this.claimedApps,
-        ]),
-      ].filter(
-        (id) =>
-          !this.uninstalledApps.includes(id) && this.isAvailable(id),
-      )
+        ...new Set([...getDefaultInstalledIds(), ...this.claimedApps]),
+      ].filter((id) => !this.uninstalledApps.includes(id))
       const defaults = createDefaultHomeLayout(
         installedIds,
-        getDefaultGridIds(this.disabledApps),
-        getDefaultDockIds(this.disabledApps),
+        getDefaultGridIds(),
+        getDefaultDockIds(),
       )
       const previous = JSON.stringify(this.homeLayout)
       this.homeLayout = removeDockGridDuplicates(
@@ -387,7 +335,7 @@ export const useAppStoreStore = defineStore('app-store', {
       )
 
       for (const appId of [...this.homeLayout.hidden]) {
-        if (isProtectedHomeApp(appId, this.disabledApps)) {
+        if (isProtectedHomeApp(appId)) {
           this.homeLayout = restoreHomeApp(this.homeLayout, appId)
         }
       }
@@ -397,7 +345,6 @@ export const useAppStoreStore = defineStore('app-store', {
       }
     },
     recordLaunch(appId: LaunchablePhoneAppId): void {
-      if (!this.isAvailable(appId)) return
       this.launchCounts[appId] = (this.launchCounts[appId] ?? 0) + 1
       this.persist()
     },
@@ -520,35 +467,25 @@ export const useAppStoreStore = defineStore('app-store', {
       to: HomeArea,
       targetIndex: number,
     ): boolean {
-      let sourceLayout = this.homeLayout
-      if (to === 'grid' && Number.isInteger(targetIndex) && targetIndex >= 0) {
-        const targetPage = Math.floor(targetIndex / HOME_GRID_PAGE_SIZE) + 1
-        while (sourceLayout.pageCount < targetPage) {
-          const expanded = addHomePage(sourceLayout)
-          if (expanded === sourceLayout) return false
-          sourceLayout = expanded
-        }
-      }
       const next = extractHomeFolderApp(
-        sourceLayout,
+        this.homeLayout,
         folderId,
         sourceIndex,
         to,
         targetIndex,
       )
-      if (next === sourceLayout) return false
+      if (next === this.homeLayout) return false
       this.homeLayout = next
       this.persist()
       return true
     },
     removeHomeApp(appId: LaunchablePhoneAppId): void {
-      if (isProtectedHomeApp(appId, this.disabledApps)) return
+      if (isProtectedHomeApp(appId)) return
 
       this.homeLayout = removeHomeApp(this.homeLayout, appId)
       this.persist()
     },
     restoreHomeApp(appId: LaunchablePhoneAppId): void {
-      if (!this.isAvailable(appId)) return
       this.homeLayout = restoreHomeApp(this.homeLayout, appId)
       this.persist()
     },

frontend/src/stores/phone-locale-contract.test.ts

@@ -10,22 +10,14 @@ type LuaToken = {
 }
 
 const frontendSourceDirectory = fileURLToPath(new URL('../', import.meta.url))
-const localeDirectory = fileURLToPath(
-  new URL('../../../sky_phone/config/locales/', import.meta.url),
+const englishLocaleSource = readFileSync(
+  new URL('../../../sky_phone/config/locales/en.lua', import.meta.url),
+  'utf8',
 )
-const localeSources = new Map(
-  readdirSync(localeDirectory, { withFileTypes: true })
-    .filter((entry) => entry.isFile() && entry.name.endsWith('.lua'))
-    .map((entry) => [
-      entry.name.replace(/\.lua$/, ''),
-      readFileSync(join(localeDirectory, entry.name), 'utf8'),
-    ]),
+const germanLocaleSource = readFileSync(
+  new URL('../../../sky_phone/config/locales/de.lua', import.meta.url),
+  'utf8',
 )
-const englishLocaleSource = localeSources.get('en')
-const germanLocaleSource = localeSources.get('de')
-if (!englishLocaleSource || !germanLocaleSource) {
-  throw new Error('The bundled English and German phone locales are required.')
-}
 const phoneStoreSource = readFileSync(
   new URL('./phone.ts', import.meta.url),
   'utf8',
@@ -126,29 +118,6 @@ function collectLuaLocaleValues(source: string): Map<string, string> {
   }
 
   parseTable([])
-  while (position < tokens.length) {
-    const assignment = tokens.findIndex(
-      (token, index) => index >= position && token.kind === '=',
-    )
-    if (assignment < 0) break
-    const nui = tokens.findIndex(
-      (token, index) =>
-        index >= position && index < assignment && token.value === 'Nui',
-    )
-    if (nui < 0) {
-      position = assignment + 1
-      continue
-    }
-    const path = [
-      'Nui',
-      ...tokens
-        .slice(nui + 1, assignment)
-        .filter((token) => token.kind === 'word')
-        .map((token) => token.value),
-    ]
-    position = assignment + 1
-    parseValue(path)
-  }
   return values
 }
 
@@ -156,10 +125,6 @@ function collectPlaceholders(value: string): string[] {
   return [...new Set(value.match(/\{[A-Za-z0-9_]+\}/g) ?? [])].sort()
 }
 
-function collectNumberTokens(value: string): string[] {
-  return value.match(/\d+/g) ?? []
-}
-
 function collectDefaultLocalePaths(source: string): Set<string> {
   const ast = ts.createSourceFile(
     'phone.ts',
@@ -235,26 +200,10 @@ function collectFrontendFiles(directory: string): string[] {
 }
 
 describe('phone locale contract', () => {
-  const localeValues = new Map(
-    [...localeSources].map(([locale, source]) => [
-      locale,
-      collectLuaLocaleValues(source),
-    ]),
-  )
-  const englishValues = localeValues.get('en')!
-  const germanValues = localeValues.get('de')!
-  const translatedLocaleValues = [...localeValues].filter(
-    ([locale]) => locale !== 'en',
-  )
+  const englishValues = collectLuaLocaleValues(englishLocaleSource)
+  const germanValues = collectLuaLocaleValues(germanLocaleSource)
   const englishPaths = new Set(englishValues.keys())
 
-  it.each([...localeSources])(
-    'registers the %s locale under its file name',
-    (locale, source) => {
-      expect(source.match(/^Locales\["([^"]+)"\]/)?.[1]).toBe(locale)
-    },
-  )
-
   it('keeps every bundled frontend fallback in en.lua', () => {
     const missing = [...collectDefaultLocalePaths(phoneStoreSource)].filter(
       (path) => !englishPaths.has(`Nui.${path}`),
@@ -299,52 +248,26 @@ describe('phone locale contract', () => {
     }
   })
 
-  it.each(translatedLocaleValues)(
-    'keeps %s structurally aligned with English',
-    (_locale, values) => {
-      expect([...values.keys()].sort()).toEqual([...englishPaths].sort())
-    },
-  )
+  it('keeps German structurally aligned with English', () => {
+    const germanPaths = new Set(germanValues.keys())
 
-  it.each(translatedLocaleValues)(
-    'keeps %s interpolation placeholders aligned with English',
-    (_locale, values) => {
-      const mismatches = [...englishValues].flatMap(
-        ([path, englishValue]) => {
-          const translatedValue = values.get(path)
-          return translatedValue !== undefined &&
-            JSON.stringify(collectPlaceholders(translatedValue)) !==
-              JSON.stringify(collectPlaceholders(englishValue))
-            ? [
-                `${path}: ${collectPlaceholders(englishValue).join(', ')} != ${collectPlaceholders(translatedValue).join(', ')}`,
-              ]
-            : []
-        },
-      )
+    expect([...germanPaths].sort()).toEqual([...englishPaths].sort())
+  })
 
-      expect(mismatches).toEqual([])
-    },
-  )
+  it('keeps German interpolation placeholders aligned with English', () => {
+    const mismatches = [...englishValues].flatMap(([path, englishValue]) => {
+      const germanValue = germanValues.get(path)
+      return germanValue !== undefined &&
+        JSON.stringify(collectPlaceholders(germanValue)) !==
+          JSON.stringify(collectPlaceholders(englishValue))
+        ? [
+            `${path}: ${collectPlaceholders(englishValue).join(', ')} != ${collectPlaceholders(germanValue).join(', ')}`,
+          ]
+        : []
+    })
 
-  it.each(translatedLocaleValues)(
-    'keeps %s numeric source values intact',
-    (_locale, values) => {
-      const mismatches = [...englishValues].flatMap(([path, englishValue]) => {
-        const expected = collectNumberTokens(englishValue)
-        if (!expected.length) return []
-
-        const remaining = collectNumberTokens(values.get(path) ?? '')
-        for (const token of expected) {
-          const index = remaining.indexOf(token)
-          if (index >= 0) remaining.splice(index, 1)
-          else return [`${path}: missing numeric token ${token}`]
-        }
-        return []
-      })
-
-      expect(mismatches).toEqual([])
-    },
-  )
+    expect(mismatches).toEqual([])
+  })
 
   it('keeps standard app names German and custom game names unchanged', () => {
     const standardAppNames = {

frontend/src/stores/phone.ts

@@ -33,13 +33,11 @@ export type PasscodeResponseData = {
 export type PhoneOpenPayload = {
   account?: DeviceBootstrap['account']
   device?: PhoneDevice
-  disabledApps?: string[]
   fallbackLocales?: LocaleTree
   lang?: string
   locales?: LocaleTree
   memos?: DeviceBootstrap['memos']
   notes?: DeviceBootstrap['notes']
-  phoneNumberFormat?: DeviceBootstrap['phoneNumberFormat']
   player?: DeviceBootstrap['player']
   security?: DeviceSecurity
   token?: string
@@ -640,8 +638,7 @@ const cryptoFallbackLocales = {
     invalid_handle: 'Use 3–20 letters, numbers, dots or underscores.',
     handle_taken: 'That VaultX handle is already taken.',
     profile_exists: 'This character already owns a VaultX profile.',
-    invalid_password:
-      'Use 8–72 characters with uppercase, lowercase, a number, and a special character.',
+    invalid_password: 'Password must be 8–72 characters.',
     password_mismatch: 'The passwords do not match.',
     accept_terms: 'Confirm that this is a fictional in-game wallet.',
     invalid_credentials: 'The password is incorrect.',
@@ -824,7 +821,6 @@ const adminPanelFallbackLocales = {
     calls: 'Calls',
     moderation: 'Moderation',
     audit: 'Audit',
-    configurator: 'Phone configurator',
   },
   overview: {
     eyebrow: 'Server',
@@ -847,138 +843,17 @@ const adminPanelFallbackLocales = {
     callFeature: 'Review recent call activity',
     moderationFeature: 'Reset access, number, or device data',
     auditFeature: 'Review sensitive admin actions',
-    configuratorFeature: 'Manage config.lua and media.lua through SQL',
   },
-  statistics: {
-    eyebrow: 'Live data',
-    title: 'Phone statistics',
-    body: 'Current usage and device status, refreshed every 15 seconds.',
-    today: 'Activity today',
-    todayBody: 'Phone and admin activity since midnight.',
-    messagesToday: 'Messages',
-    callsToday: 'Calls',
-    auditToday: 'Admin actions',
-    coverage: 'Device coverage',
-    coverageBody: 'Current share of all stored phones.',
-    linkedDevices: 'Account linked',
-    simDevices: 'SIM assigned',
-    activeDevices: 'Updated in 24 hours',
-    ofDevices: '{count} of {total} devices',
-  },
-  configurator: {
-    context: 'Runtime configuration',
-    eyebrow: 'System tool',
-    sections: 'Configuration',
-    search: 'Search settings or paths',
-    configScope: 'config.lua',
-    mediaScope: 'media.lua',
-    noResults: 'No matching settings',
-    loading: 'Loading SQL configuration...',
-    title: 'Phone configurator',
-    body: 'Manage phone and media settings from the protected admin workspace.',
-    disabledTitle: 'SQL configuration is not active',
-    disabledBody:
-      'Enable the configurator at the beginning of config.lua and restart sky_phone. Until then, file values remain active and editing is locked.',
-    manualSave: 'Manual save',
-    refreshNotice:
-      'Nothing is written automatically. The green check verifies config.lua and media.lua in SQL and refreshes the active server, client, media and UI configuration immediately.',
-    fieldCount: '{count} fields',
-    secretConfigured: 'Secret configured · enter a replacement',
-    invalidValue: 'Check the highlighted table or number value.',
-    saved: 'SQL configuration saved and applied.',
-    descriptions: {
-      featureToggle: 'Turns {name} on or off.',
-      boolean: 'Controls whether {name} is allowed.',
-      number: 'Sets the numeric value for {name}.',
-      text: 'Sets the text value used for {name}.',
-      optionalText:
-        'Sets the optional value for {name}; switch it off to disable it.',
-      list: 'Manages all entries used for {name}.',
-      table: 'Groups the related settings for {name}.',
-      credential: 'Stores the protected credential used by {name}.',
-      url: 'Sets the URL or endpoint used by {name}.',
-      hosts: 'Defines which domains are allowed for {name}.',
-      milliseconds: 'Sets the timing for {name} in milliseconds.',
-      seconds: 'Sets the timing for {name} in seconds.',
-      rateLimit: 'Limits how many {name} actions are allowed per minute.',
-      byteLimit: 'Sets the maximum data size allowed for {name}.',
-      textLimit: 'Sets the maximum text length allowed for {name}.',
-      distance: 'Sets the world distance used for {name}.',
-      coordinates: 'Sets the world coordinates or orientation for {name}.',
-      gameAsset: 'Sets the GTA model or prop used for {name}.',
-      animation: 'Sets the animation asset used for {name}.',
-      access: 'Defines the jobs, groups or permission level for {name}.',
-      integration: 'Selects the connected framework or provider for {name}.',
-      path: 'Sets the storage or resource path used for {name}.',
-      color: 'Sets the interface color used for {name}.',
-      displayText: 'Sets the text shown to players for {name}.',
-      phoneNumber: 'Sets the phone or service number used for {name}.',
-      routing: 'Controls how incoming requests are routed for {name}.',
-      command: 'Sets the chat command used to open or run {name}.',
-      locale: 'Selects the language used for {name}.',
-      debug: 'Controls detailed diagnostic output for {name}.',
-      mediaQuality: 'Sets the media quality or volume used for {name}.',
-      amount: 'Sets the maximum or displayed amount for {name}.',
-    },
-    table: {
-      list: 'List',
-      table: 'Key table',
-      vector: 'Vector',
-      entry: 'Entry',
-      general: 'General',
-      subtabs: {
-        Dictionaries: 'Dictionaries',
-        Clips: 'Clips',
-        Transforms: 'Transforms',
-        RateLimits: 'Rate Limits',
-        Publishers: 'Publishers',
-        ExternalPingResources: 'External Ping Resources',
-        Markets: 'Markets',
-        TrustedAdapters: 'Trusted Adapters',
-        AllowedDisappearTimers: 'Allowed Disappear Timers',
-        MusicTracks: 'Music Tracks',
-        VehicleImages: 'Vehicle Images',
-        Custom: 'Custom',
-        Valet: 'Valet',
-        AutoPriority: 'Automatic Priority',
-        Camera: 'Camera',
-        Categories: 'Categories',
-        Districts: 'Districts',
-        PhotoGradients: 'Photo Gradients',
-        LbPhone: 'LB Phone',
-        Tracks: 'Tracks',
-        Props: 'Props',
-        CustomLocations: 'Custom Locations',
-        Animation: 'Animation',
-        ReportReasons: 'Report Reasons',
-        DisplayName: 'Display Name',
-        Hud: 'HUD',
-        Badge: 'Badge',
-        LockedChannels: 'Locked Channels',
-        NumberGroups: 'Number Groups',
-        CustomFare: 'Custom Fare',
-        DriverJobs: 'Driver Jobs',
-        Services: 'Services',
-        QuickLocations: 'Quick Locations',
-        AllowedJobs: 'Allowed Jobs',
-        Websites: 'Websites',
-      },
-      addRow: 'Add row',
-      addField: 'Add field',
-      remove: 'Remove',
-      emptyList: 'No rows yet. Add the first row with plus.',
-      emptyTable: 'No fields yet. Add the first key below.',
-      keyPlaceholder: 'New key',
-      convertToList: 'Use list',
-      convertToMap: 'Use typed key table',
-      convertToTable: 'Use key table',
-      types: {
-        string: 'Text',
-        number: 'Number',
-        boolean: 'Switch',
-        list: 'List',
-        table: 'Table',
-      },
+  appearance: {
+    eyebrow: 'Appearance',
+    title: 'Accent color',
+    body: 'Change the accent across the complete admin workspace.',
+    colors: {
+      emerald: 'Emerald',
+      blue: 'Blue',
+      violet: 'Violet',
+      orange: 'Orange',
+      red: 'Red',
     },
   },
   players: {
@@ -1131,8 +1006,7 @@ const adminPanelFallbackLocales = {
     noAutoSave: 'Manual save',
     noAutoSaveBody: 'Changes stay local until the green check is pressed.',
     discardTitle: 'Discard unsaved changes?',
-    discardBody:
-      'Your staged app or configuration changes have not been saved.',
+    discardBody: 'Your staged app changes have not been saved.',
     keepEditing: 'Keep editing',
     discard: 'Discard changes',
     saveFailed: 'Some changes could not be saved.',
@@ -1154,7 +1028,6 @@ const adminPanelFallbackLocales = {
       reset_passcode: 'Passcode reset',
       change_number: 'Phone number changed',
       factory_reset: 'Phone factory reset',
-      save_configuration: 'Configuration saved',
     },
   },
   errors: {
@@ -1165,10 +1038,7 @@ const adminPanelFallbackLocales = {
     invalid_app: 'That app is not registered on the server.',
     app_protected: 'This system app cannot be removed.',
     revision_conflict:
-      'The data changed in the meantime. Reopen the section and try again.',
-    configurator_disabled: 'Enable the phone configurator in config.lua first.',
-    invalid_field: 'That configuration field is no longer available.',
-    invalid_value: 'A configuration value is invalid.',
+      'The phone changed in the meantime. Refresh and try again.',
     account_not_found: 'No iFruit account is linked to this phone.',
     invalid_phone_number:
       'Enter a phone number in the configured server format.',
@@ -2466,7 +2336,7 @@ const defaultLocales: LocaleTree = {
       to: 'To:',
       connectPrivately: 'Connect privately',
       newChatBody:
-        "Enter another person's Dark-ID or invitation code. You can share your own ID from your profile.",
+        'Enter an exact Dark-ID or invitation code. Unknown identities require confirmation.',
       darkIdOrInvite: 'Dark-ID or invitation code',
       continue: 'Continue',
       contacts: 'DarkChat Contacts',
@@ -2712,8 +2582,6 @@ const defaultLocales: LocaleTree = {
         recipient_not_found: 'That number is unavailable.',
         blocked: 'This contact has blocked calls and messages from your SIM.',
         messaging_unavailable: 'This company contact does not accept messages.',
-        service_line_text_only:
-          'Company service lines currently accept text messages only.',
         no_sim: 'This phone has no SIM card.',
         rate_limited: 'Too many messages. Try again in a minute.',
         request_failed: 'Messages are temporarily unavailable.',
@@ -3027,7 +2895,6 @@ const defaultLocales: LocaleTree = {
         uninstallTitle: 'Uninstall this app?',
         uninstallBody:
           '{app} will be removed from this phone. You can download it again from the App Store.',
-        uninstallFailed: 'The app could not be uninstalled. Please try again.',
       },
       details: {
         skyStudios: 'Sky Studios',
@@ -3563,8 +3430,6 @@ const defaultLocales: LocaleTree = {
       viewRides: 'View Ride Options',
       change: 'Change',
       requestRide: 'Request SkyRide',
-      playerDriverNotice:
-        'SkyRide matches you with real player drivers. A driver must be online and accept your request.',
       serviceMeta: '{eta} min away · {seats} seats',
       distanceMeters: '{distance} m',
       distanceKilometers: '{distance} km',
@@ -3635,8 +3500,7 @@ const defaultLocales: LocaleTree = {
         cancelled: 'Cancelled',
       },
       statusBody: {
-        searching:
-          'Your request is waiting for an available player driver to accept it.',
+        searching: 'We are matching you with a nearby driver.',
         accepted: 'Your driver is preparing to pick you up.',
         driver_arriving: 'Your driver is on the way to your pickup.',
         arrived: 'Your driver is waiting at the pickup point.',
@@ -4526,8 +4390,8 @@ const defaultLocales: LocaleTree = {
       video: 'Video',
       microphoneOn: 'Microphone on',
       microphoneOff: 'Microphone muted',
-      focusHelp: 'Hold the look key to look around',
-      returnHelp: 'Release the look key for controls',
+      focusHelp: 'Space for movement',
+      returnHelp: 'Space to return',
       uploading: '{count} uploading',
       saving: 'Saving video...',
       openGallery: 'Open Photos',
@@ -4542,11 +4406,6 @@ const defaultLocales: LocaleTree = {
         invalid_media_type: 'The uploaded media type is invalid.',
         invalid_upload: 'The upload could not be verified.',
         invalid_upload_token: 'The upload session is no longer valid.',
-        media_provider_failed: 'The camera upload service is unavailable.',
-        media_provider_rate_limited:
-          'The camera upload service is busy. Try again shortly.',
-        media_provider_unauthorized:
-          'The configured FiveManage API key was rejected.',
         missing_config: 'Camera uploads are not configured.',
         microphone_unavailable:
           'Allow microphone access or mute the microphone before recording.',

frontend/src/testdata.contract.test.ts

@@ -16,15 +16,10 @@ describe('test data seeding contracts', () => {
     )
   })
 
-  it('refreshes the test-data command when its runtime configuration changes', () => {
-    expect(testData).toContain('local function refresh_test_data_command()')
-    expect(testData).toContain(
-      'active_test_data_command = Config.TestData.Enabled and Config.TestData.Command or nil',
-    )
-    expect(testData).toContain(
-      'AddEventHandler("sky_phone:configurator:serverUpdated", refresh_test_data_command)',
-    )
-    expect(testData).not.toContain('RegisterCommand(Config.TestData.Command')
+  it('returns before registering the test-data command when disabled', () => {
+    expect(
+      testData.indexOf('if not Config.TestData.Enabled then'),
+    ).toBeLessThan(testData.indexOf('RegisterCommand(Config.TestData.Command'))
   })
 
   it('moves an existing player SIM before attaching it to the selected phone', () => {

frontend/src/types/admin.ts

@@ -1,14 +1,7 @@
 export type AdminStats = {
   accounts: number
-  activeDevices: number
-  auditEntries: number
-  auditToday: number
-  callsToday: number
   devices: number
-  linkedDevices: number
-  messagesToday: number
   online: number
-  simDevices: number
 }
 
 export type AdminPlayerSummary = {
@@ -85,7 +78,6 @@ export type AdminAuditEntry = {
 
 export type AdminBootstrap = {
   audit: AdminAuditEntry[]
-  disabledApps: string[]
   players: AdminPlayerSummary[]
   stats: AdminStats
 }
@@ -119,70 +111,3 @@ export type AdminCallActivity = {
 export type AdminActivityResponse =
   | { entries: AdminMessageActivity[]; kind: 'messages' }
   | { entries: AdminCallActivity[]; kind: 'calls' }
-
-export type AdminConfiguratorField = {
-  configured?: boolean
-  label: string
-  path: string
-  structure?: AdminConfiguratorStructure
-  scope: 'config' | 'media'
-  sensitive: boolean
-  type: 'boolean' | 'json' | 'number' | 'string' | 'stringOrFalse'
-  value: unknown
-}
-
-export type AdminConfiguratorStructure =
-  | {
-      kind: 'list'
-      items: AdminConfiguratorStructure[]
-      template?: AdminConfiguratorStructure
-    }
-  | {
-      entryDefault?: unknown
-      fields: Record<string, AdminConfiguratorStructure>
-      kind: 'table'
-      mutableKeys?: boolean
-      template?: AdminConfiguratorStructure
-    }
-  | {
-      entries: Array<{
-        key: number | string
-        keyType: 'number' | 'string'
-        structure: AdminConfiguratorStructure
-      }>
-      keyType?: 'number' | 'string'
-      kind: 'map'
-      template?: AdminConfiguratorStructure
-    }
-  | {
-      kind: 'value'
-      valueType: 'boolean' | 'number' | 'string'
-    }
-  | {
-      kind: 'optionalString'
-    }
-  | {
-      kind: 'vector'
-      vectorType: 'vector2' | 'vector3' | 'vector4'
-    }
-
-export type AdminConfiguratorSection = {
-  fields: AdminConfiguratorField[]
-  id: string
-  label: string
-  scope: 'config' | 'media'
-}
-
-export type AdminConfigurator = {
-  enabled: boolean
-  revision: number
-  sections: AdminConfiguratorSection[]
-  updatedAt: string | null
-  updatedBy: string | null
-}
-
-export type AdminConfiguratorChange = {
-  path: string
-  scope: 'config' | 'media'
-  value: unknown
-}

frontend/src/types/device.ts

@@ -1,6 +1,6 @@
 import type { Note } from '@/utils/notes'
 import type { MemoDto } from '@/types/memos'
-import type { PhoneNumberFormat, PhoneSim } from '@/types/phone'
+import type { PhoneSim } from '@/types/phone'
 
 export type DeviceDataEntry<T = unknown> = {
   payload: T
@@ -50,7 +50,6 @@ export type DeviceBootstrap = {
   device: PhoneDevice
   memos: MemoDto[]
   notes: Note[]
-  phoneNumberFormat: PhoneNumberFormat
   player: PhonePlayerIdentity
   security: DeviceSecurity
   token: string

frontend/src/types/media.ts

@@ -70,6 +70,7 @@ export type MediaImportResult = {
 }
 
 export type UploadReady = {
+  captureToken: string
   correlationId: string
   mediaType: MediaType
   photo?: {

frontend/src/types/memos.ts

@@ -39,6 +39,7 @@ export type MemoRecordingMetadata = {
 export type MemoUploadReady = {
   requestId: string
   correlationId: string
+  captureToken: string
   presignedUrl: string
   uploadTimeoutMs?: number
 }

frontend/src/types/phone.ts

@@ -1,10 +1,5 @@
 export type SimType = 'registered' | 'anonymous'
 
-export type PhoneNumberFormat = {
-  groups: number[]
-  length: number
-}
-
 export type PhoneSim = {
   id: string
   number: string

frontend/src/ui/SkyNavbar.test.ts

@@ -43,17 +43,6 @@ describe('SkyNavbar', () => {
     expect(html).toContain('Account')
   })
 
-  it('constrains long compact titles to the center column', () => {
-    const titleRule = foundationStyles.match(
-      /\.sky-navbar__title\s*\{([^}]*)\}/s,
-    )?.[1]
-
-    expect(titleRule).toContain('max-width: 100%')
-    expect(titleRule).toContain('overflow: hidden')
-    expect(titleRule).toContain('text-overflow: ellipsis')
-    expect(titleRule).toContain('white-space: nowrap')
-  })
-
   it('exposes the large-title header without changing heading semantics', async () => {
     const html = await renderToString(
       createSSRApp(SkyNavbar, {

frontend/src/ui/foundation.css

@@ -168,7 +168,6 @@
 
 .sky-navbar__title {
   min-width: 0;
-  max-width: 100%;
   margin: 0;
   padding: 0 var(--sky-space-1);
   overflow: hidden;

frontend/src/utils/adminConfiguratorDefaults.test.ts

@@ -1,114 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { AdminConfiguratorStructure } from '@/types/admin'
-import { createMutableTableEntry } from '@/utils/adminConfiguratorDefaults'
-
-describe('admin configurator defaults', () => {
-  it('creates a usable company draft from its key and the server defaults', () => {
-    const entryDefault = {
-      AcceptsRequests: true,
-      Category: 'public_services',
-      Job: '',
-      LogoUrl: 'https://picsum.photos/seed/companies-new-logo/180/180',
-      Name: '',
-      ServiceLine: {
-        Number: '500',
-        Routing: 'round_robin',
-      },
-      Services: [
-        {
-          Description: '',
-          Id: '',
-          Price: '',
-          RequestsEnabled: true,
-          Title: '',
-        },
-      ],
-    }
-    const structure: AdminConfiguratorStructure = {
-      entryDefault,
-      fields: {},
-      kind: 'table',
-      mutableKeys: true,
-      template: {
-        fields: {
-          Job: { kind: 'value', valueType: 'string' },
-          Name: { kind: 'value', valueType: 'string' },
-        },
-        kind: 'table',
-      },
-    }
-
-    expect(
-      createMutableTableEntry(
-        structure,
-        'Companies.Definitions',
-        'pizza_palace',
-      ),
-    ).toEqual({
-      AcceptsRequests: true,
-      Category: 'public_services',
-      Job: 'pizza_palace',
-      LogoUrl: 'https://picsum.photos/seed/companies-pizza_palace-logo/180/180',
-      Name: 'Pizza Palace',
-      ServiceLine: {
-        Number: '500',
-        Routing: 'round_robin',
-      },
-      Services: [
-        {
-          Description: '',
-          Id: 'pizza_palace',
-          Price: '',
-          RequestsEnabled: true,
-          Title: 'Pizza Palace',
-        },
-      ],
-    })
-    expect(entryDefault).toMatchObject({
-      Job: '',
-      Name: '',
-      Services: [{ Id: '', Title: '' }],
-    })
-  })
-
-  it('allocates distinct service numbers for multiple unsaved companies', () => {
-    const structure: AdminConfiguratorStructure = {
-      entryDefault: {
-        Job: '',
-        LogoUrl: '',
-        Name: '',
-        ServiceLine: { Number: '500' },
-      },
-      fields: {},
-      kind: 'table',
-      mutableKeys: true,
-    }
-    const existing = {
-      pizzeria: { ServiceLine: { Number: '500' } },
-      restaurant: { ServiceLine: { Number: '501' } },
-    }
-
-    expect(
-      createMutableTableEntry(
-        structure,
-        'Companies.Definitions',
-        'bakery',
-        existing,
-      ),
-    ).toMatchObject({ ServiceLine: { Number: '502' } })
-  })
-
-  it('keeps generic mutable tables on their schema-derived blank value', () => {
-    const structure: AdminConfiguratorStructure = {
-      fields: {},
-      kind: 'table',
-      mutableKeys: true,
-      template: { kind: 'value', valueType: 'boolean' },
-    }
-
-    expect(createMutableTableEntry(structure, 'FeatureFlags', 'example')).toBe(
-      false,
-    )
-  })
-})

frontend/src/utils/adminConfiguratorDefaults.ts

@@ -1,142 +0,0 @@
-import type { AdminConfiguratorStructure } from '@/types/admin'
-
-function cloneConfiguratorValue(value: unknown): unknown {
-  if (Array.isArray(value)) return value.map(cloneConfiguratorValue)
-  if (value !== null && typeof value === 'object') {
-    return Object.fromEntries(
-      Object.entries(value).map(([key, child]) => [
-        key,
-        cloneConfiguratorValue(child),
-      ]),
-    )
-  }
-  return value
-}
-
-function blankScalar(valueType: 'boolean' | 'number' | 'string'): unknown {
-  if (valueType === 'boolean') return false
-  if (valueType === 'number') return 0
-  return ''
-}
-
-export function blankFromConfiguratorStructure(
-  structure: AdminConfiguratorStructure,
-): unknown {
-  if (structure.kind === 'optionalString') return ''
-  if (structure.kind === 'value') return blankScalar(structure.valueType)
-  if (structure.kind === 'vector') {
-    const axes = ['x', 'y', 'z', 'w'].slice(
-      0,
-      Number(structure.vectorType.slice(-1)),
-    )
-    return Object.fromEntries([
-      ['__skyType', structure.vectorType],
-      ...axes.map((axis) => [axis, 0]),
-    ])
-  }
-  if (structure.kind === 'list') {
-    return structure.items.map(blankFromConfiguratorStructure)
-  }
-  if (structure.kind === 'map') {
-    return {
-      __skyType: 'map',
-      entries: structure.entries.map((entry) => ({
-        key: entry.key,
-        keyType: entry.keyType,
-        value: blankFromConfiguratorStructure(entry.structure),
-      })),
-    }
-  }
-  return Object.fromEntries(
-    Object.entries(structure.fields).map(([key, field]) => [
-      key,
-      blankFromConfiguratorStructure(field),
-    ]),
-  )
-}
-
-export function createMutableTableEntry(
-  structure: Extract<AdminConfiguratorStructure, { kind: 'table' }>,
-  path: string,
-  key: string,
-  entries: Record<string, unknown> = {},
-): unknown {
-  const value =
-    structure.entryDefault !== undefined
-      ? cloneConfiguratorValue(structure.entryDefault)
-      : structure.template
-        ? blankFromConfiguratorStructure(structure.template)
-        : undefined
-
-  if (
-    path !== 'Companies.Definitions' ||
-    value === null ||
-    typeof value !== 'object' ||
-    Array.isArray(value)
-  ) {
-    return value
-  }
-
-  const company = value as Record<string, unknown>
-  company.Job = key
-  company.Name = key
-    .replace(/[_-]+/g, ' ')
-    .replace(/\b\w/g, (character) => character.toUpperCase())
-  company.LogoUrl = `https://picsum.photos/seed/companies-${key}-logo/180/180`
-  if (Array.isArray(company.Services)) {
-    if (company.Services.length === 0) {
-      company.Services.push({
-        Description: '',
-        Id: key,
-        Price: '',
-        RequestsEnabled: true,
-        Title: company.Name,
-      })
-    } else {
-      const service = company.Services[0]
-      if (
-        service !== null &&
-        typeof service === 'object' &&
-        !Array.isArray(service) &&
-        !(service as Record<string, unknown>).Id
-      ) {
-        const mutableService = service as Record<string, unknown>
-        mutableService.Id = key
-        mutableService.Title = company.Name
-      }
-    }
-  }
-  const serviceLine = company.ServiceLine
-  if (
-    serviceLine !== null &&
-    typeof serviceLine === 'object' &&
-    !Array.isArray(serviceLine)
-  ) {
-    const mutableServiceLine = serviceLine as Record<string, unknown>
-    const number = String(mutableServiceLine.Number ?? '')
-    const numeric = Number(number)
-    if (/^\d+$/.test(number) && Number.isSafeInteger(numeric) && numeric > 0) {
-      const used = new Set(
-        Object.values(entries).map((entry) => {
-          if (entry === null || typeof entry !== 'object') return ''
-          const line = (entry as Record<string, unknown>).ServiceLine
-          if (line === null || typeof line !== 'object') return ''
-          return String((line as Record<string, unknown>).Number ?? '').replace(
-            /\D/g,
-            '',
-          )
-        }),
-      )
-      const maximum = 10 ** number.length - 1
-      for (let offset = 0; offset < maximum; offset += 1) {
-        const candidate = ((numeric - 1 + offset) % maximum) + 1
-        const formatted = String(candidate).padStart(number.length, '0')
-        if (!used.has(formatted)) {
-          mutableServiceLine.Number = formatted
-          break
-        }
-      }
-    }
-  }
-  return company
-}

frontend/src/utils/adminConfiguratorDescription.test.ts

@@ -1,60 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import type { AdminConfiguratorStructure } from '@/types/admin'
-
-import {
-  configuratorDescriptionKey,
-  configuratorPathName,
-  describeConfiguratorValue,
-} from './adminConfiguratorDescription'
-
-describe('admin configurator descriptions', () => {
-  it('selects specific descriptions before generic value descriptions', () => {
-    expect(configuratorDescriptionKey('Bridge.CallbackTimeout', 15000)).toBe(
-      'milliseconds',
-    )
-    expect(configuratorDescriptionKey('Media.RequestTimeoutMs', 10000)).toBe(
-      'milliseconds',
-    )
-    expect(configuratorDescriptionKey('Radio.AllowedJobs', [])).toBe('access')
-    expect(configuratorDescriptionKey('FiveManage.ApiKey', '')).toBe(
-      'credential',
-    )
-  })
-
-  it('describes structured values from their schema', () => {
-    const vector: AdminConfiguratorStructure = {
-      kind: 'vector',
-      vectorType: 'vector3',
-    }
-    const table: AdminConfiguratorStructure = {
-      fields: {},
-      kind: 'table',
-    }
-    expect(configuratorDescriptionKey('Location', {}, vector)).toBe(
-      'coordinates',
-    )
-    expect(configuratorDescriptionKey('Settings', {}, table)).toBe('table')
-  })
-
-  it('passes a readable field name to the localized template', () => {
-    const translate = (key: string, params?: Record<string, string>) =>
-      `${key}:${params?.name}`
-    expect(
-      describeConfiguratorValue(
-        translate,
-        'CustomApps.MaximumStorageBytesPerApp',
-        262144,
-      ),
-    ).toBe('configurator.descriptions.byteLimit:Maximum Storage Bytes Per App')
-    expect(
-      describeConfiguratorValue(translate, 'Radio.AllowedJobs[2]', 'police'),
-    ).toBe('configurator.descriptions.access:Allowed Jobs #2')
-  })
-
-  it('humanizes subtab keys', () => {
-    expect(configuratorPathName('ExternalPingResources')).toBe(
-      'External Ping Resources',
-    )
-  })
-})

frontend/src/utils/adminConfiguratorDescription.ts

@@ -1,103 +0,0 @@
-import type { AdminConfiguratorStructure } from '@/types/admin'
-
-type ConfiguratorDescriptionTranslator = (
-  key: string,
-  params?: Record<string, string>,
-) => string
-
-export type AdminConfiguratorDescribe = (
-  path: string,
-  value: unknown,
-  structure?: AdminConfiguratorStructure,
-  label?: string,
-) => string
-
-const DESCRIPTION_RULES: Array<[RegExp, string]> = [
-  [/(?:^|\.)(?:apikey|token|password|secret)$/i, 'credential'],
-  [/(?:base|manifest|image|icon)?url$/i, 'url'],
-  [/(?:allowed)?(?:gif|media)?hosts?$/i, 'hosts'],
-  [
-    /(?:timeout|timeoutms|milliseconds|durationms|intervalms|pollms)$/i,
-    'milliseconds',
-  ],
-  [/(?:timeoutseconds|seconds)$/i, 'seconds'],
-  [/perminute$/i, 'rateLimit'],
-  [/(?:maximum|max).*bytes/i, 'byteLimit'],
-  [/(?:maximum|max).*length$|length$/i, 'textLimit'],
-  [/(?:distance)$/i, 'distance'],
-  [/(?:location|position|rotation|coords|coordinates)$/i, 'coordinates'],
-  [/(?:model|prop|propmodel|customprop|replacementprop)$/i, 'gameAsset'],
-  [/(?:dictionary|dictionaries|clip|clips|pedclip|propclip)$/i, 'animation'],
-  [
-    /(?:permissions?|admingroups?|allowedjobs?|jobs?|minimumgrade|requiredace)$/i,
-    'access',
-  ],
-  [/(?:framework|inventory|provider|voiceprovider|adapter)$/i, 'integration'],
-  [/(?:path)$/i, 'path'],
-  [/(?:color|colour|accent)$/i, 'color'],
-  [
-    /(?:label|name|title|description|address|district|locationlabel|devicename)$/i,
-    'displayText',
-  ],
-  [/(?:number|callernumber|numberprefix)$/i, 'phoneNumber'],
-  [/(?:routing)$/i, 'routing'],
-  [/(?:command)$/i, 'command'],
-  [/(?:locale)$/i, 'locale'],
-  [/(?:debug)$/i, 'debug'],
-  [/(?:enabled|active|public|verified)$/i, 'featureToggle'],
-  [/(?:quality|bitratekbps|volume)$/i, 'mediaQuality'],
-  [
-    /(?:pagesize|batchsize|limit|count|maxselection|maximumplayers|samples|decimals)$/i,
-    'amount',
-  ],
-]
-
-export function configuratorPathName(path: string): string {
-  const listEntry = path.match(/^(.*)\[(\d+)\]$/)
-  const source = listEntry?.[1] ?? path
-  const segment = source.split('.').at(-1) ?? source
-  const name = segment
-    .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
-    .replace(/([a-z\d])([A-Z])/g, '$1 $2')
-    .replace(/[_-]+/g, ' ')
-    .trim()
-  return listEntry ? `${name} #${listEntry[2]}` : name
-}
-
-export function configuratorDescriptionKey(
-  path: string,
-  value: unknown,
-  structure?: AdminConfiguratorStructure,
-): string {
-  const segment =
-    path
-      .replace(/\[\d+\]$/, '')
-      .split('.')
-      .at(-1) ?? path
-  const semanticRule = DESCRIPTION_RULES.find(([pattern]) =>
-    pattern.test(segment),
-  )
-  if (semanticRule) return semanticRule[1]
-
-  if (structure?.kind === 'vector') return 'coordinates'
-  if (structure?.kind === 'list' || Array.isArray(value)) return 'list'
-  if (structure?.kind === 'map' || structure?.kind === 'table') return 'table'
-  if (structure?.kind === 'optionalString') return 'optionalText'
-  if (value !== null && typeof value === 'object') return 'table'
-  if (typeof value === 'boolean') return 'boolean'
-  if (typeof value === 'number') return 'number'
-  return 'text'
-}
-
-export function describeConfiguratorValue(
-  translate: ConfiguratorDescriptionTranslator,
-  path: string,
-  value: unknown,
-  structure?: AdminConfiguratorStructure,
-  label?: string,
-): string {
-  return translate(
-    `configurator.descriptions.${configuratorDescriptionKey(path, value, structure)}`,
-    { name: label?.trim() || configuratorPathName(path) },
-  )
-}

frontend/src/utils/appStorePreviews.test.ts

@@ -1,4 +1,4 @@
-import { readdirSync, readFileSync } from 'node:fs'
+import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 
 import { describe, expect, it } from 'vitest'
@@ -41,21 +41,24 @@ describe('App Store preview catalog', () => {
     expect(visualSignatures.size).toBe(storeAppIds.length)
   })
 
-  it('localizes every specialized preview in the fallback and every configured locale', () => {
-    const localeDirectory = fileURLToPath(
-      new URL('../../../sky_phone/config/locales/', import.meta.url),
-    )
+  it('localizes every specialized preview in the fallback, English and German locales', () => {
     const localeSources = [
       readFileSync(
         fileURLToPath(new URL('../stores/phone.ts', import.meta.url)),
         'utf8',
       ),
-      ...readdirSync(localeDirectory)
-        .filter((fileName) => fileName.endsWith('.lua'))
-        .sort()
-        .map((fileName) =>
-          readFileSync(`${localeDirectory}/${fileName}`, 'utf8'),
+      readFileSync(
+        fileURLToPath(
+          new URL('../../../sky_phone/config/locales/en.lua', import.meta.url),
         ),
+        'utf8',
+      ),
+      readFileSync(
+        fileURLToPath(
+          new URL('../../../sky_phone/config/locales/de.lua', import.meta.url),
+        ),
+        'utf8',
+      ),
     ]
 
     for (const appId of PREVIEWABLE_BUILTIN_APP_IDS) {

frontend/src/utils/media.test.ts

@@ -158,13 +158,6 @@ describe('media utilities', () => {
     expect(mediaErrorKey('profile_photo_required')).toBe(
       'profile_photo_required',
     )
-    expect(mediaErrorKey('media_provider_failed')).toBe('media_provider_failed')
-    expect(mediaErrorKey('media_provider_rate_limited')).toBe(
-      'media_provider_rate_limited',
-    )
-    expect(mediaErrorKey('media_provider_unauthorized')).toBe(
-      'media_provider_unauthorized',
-    )
     expect(mediaErrorKey('private_provider_error')).toBe('request_failed')
   })
 })

frontend/src/utils/media.ts

@@ -95,9 +95,6 @@ export function mediaErrorKey(error?: string): string {
     'invalid_import_url',
     'invalid_upload',
     'invalid_upload_token',
-    'media_provider_failed',
-    'media_provider_rate_limited',
-    'media_provider_unauthorized',
     'missing_config',
     'import_media_not_allowed',
     'import_media_too_large',

frontend/src/utils/phone.test.ts

@@ -1,10 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import {
-  configurePhoneNumberFormat,
-  formatPhoneNumber,
-  normalizePhoneNumber,
-} from './phone'
+import { formatPhoneNumber, normalizePhoneNumber } from './phone'
 
 describe('phone numbers', () => {
   it('normalizes formatted ten digit values', () => {
@@ -17,13 +13,4 @@ describe('phone numbers', () => {
     expect(formatPhoneNumber('5551')).toBe('555 1')
     expect(formatPhoneNumber(5551234567)).toBe('555 123 4567')
   })
-
-  it('uses the server-provided number length and display groups', () => {
-    configurePhoneNumberFormat({ groups: [4, 3, 3], length: 10 })
-
-    expect(formatPhoneNumber('0171234567')).toBe('0171 234 567')
-    expect(normalizePhoneNumber('0171 234 567')).toBe('0171234567')
-
-    configurePhoneNumberFormat()
-  })
 })

frontend/src/utils/phone.ts

@@ -1,53 +1,12 @@
-import type { PhoneNumberFormat } from '@/types/phone'
-
 export const PHONE_NUMBER_LENGTH = 10
-const DEFAULT_PHONE_NUMBER_FORMAT: PhoneNumberFormat = {
-  groups: [3, 3, 4],
-  length: PHONE_NUMBER_LENGTH,
-}
-let phoneNumberFormat: PhoneNumberFormat = DEFAULT_PHONE_NUMBER_FORMAT
-
-export function configurePhoneNumberFormat(value?: PhoneNumberFormat): void {
-  const length = value?.length
-  const groups = value?.groups
-  if (
-    typeof length !== 'number' ||
-    !Number.isInteger(length) ||
-    length < 1 ||
-    length > 24 ||
-    !Array.isArray(groups) ||
-    groups.length === 0 ||
-    groups.some((group) => !Number.isInteger(group) || group < 1)
-  ) {
-    phoneNumberFormat = DEFAULT_PHONE_NUMBER_FORMAT
-    return
-  }
-
-  phoneNumberFormat = {
-    groups: [...groups],
-    length,
-  }
-}
 
 export function normalizePhoneNumber(value: string): string | null {
   const digits = value.replace(/\D/g, '')
-  return digits.length === phoneNumberFormat.length ? digits : null
+  return digits.length === PHONE_NUMBER_LENGTH ? digits : null
 }
 
 export function formatPhoneNumber(value: string | number): string {
-  const digits = String(value)
-    .replace(/\D/g, '')
-    .slice(0, phoneNumberFormat.length)
-  const formatted: string[] = []
-  let offset = 0
-
-  for (const size of phoneNumberFormat.groups) {
-    const group = digits.slice(offset, offset + size)
-    if (!group) break
-    formatted.push(group)
-    offset += size
-  }
-  if (offset < digits.length) formatted.push(digits.slice(offset))
-
-  return formatted.join(' ')
+  const digits = String(value).replace(/\D/g, '').slice(0, PHONE_NUMBER_LENGTH)
+  const groups = [digits.slice(0, 3), digits.slice(3, 6), digits.slice(6, 10)]
+  return groups.filter(Boolean).join(' ')
 }

frontend/src/utils/phoneViewportGeometry.test.ts

@@ -2,7 +2,6 @@ import { describe, expect, it } from 'vitest'
 
 import {
   normalizePhoneViewportRect,
-  phoneViewportRectContainsPoint,
   readPhoneViewportGeometry,
   type PhoneViewportRect,
 } from '@/utils/phoneViewportGeometry'
@@ -64,78 +63,7 @@ function createGeometryFixture(options: {
   }
 }
 
-const PHONE_BASE_ZOOM = 0.69 * 1.2
-const PHONE_HEIGHT = 844
-const PHONE_WIDTH = 390
-const REFERENCE_VIEWPORT_HEIGHT = 1080
-const REFERENCE_VIEWPORT_WIDTH = 1920
-
-const displayCases = [
-  { height: 1080, label: '1080p 16:9', width: 1920 },
-  { height: 2160, label: '4K 16:9', width: 3840 },
-  { height: 1440, label: '21:9', width: 3440 },
-  { height: 1440, label: '32:9', width: 5120 },
-  { height: 1600, label: '16:10', width: 2560 },
-] as const
-
-const phoneScales = [80, 100, 120] as const
-
-function productionPhoneZoom(
-  viewportWidth: number,
-  viewportHeight: number,
-  phoneScale: number,
-): number {
-  const viewportScale = Math.min(
-    viewportWidth / REFERENCE_VIEWPORT_WIDTH,
-    viewportHeight / REFERENCE_VIEWPORT_HEIGHT,
-  )
-  const preferred = PHONE_BASE_ZOOM * viewportScale * (phoneScale / 100)
-  const edgeGap = 24 * viewportScale
-  const viewportMaximum = Math.max(
-    0,
-    Math.min(
-      (viewportWidth - edgeGap) / PHONE_WIDTH,
-      (viewportHeight - edgeGap) / PHONE_HEIGHT,
-    ),
-  )
-
-  return Math.min(viewportMaximum, Math.max(260 / PHONE_WIDTH, preferred))
-}
-
-const cefDisplayMatrix = displayCases.flatMap((display) =>
-  phoneScales.map((phoneScale) => ({ display, phoneScale })),
-)
-
 describe('phone viewport geometry', () => {
-  it('treats every rectangle boundary as inside and rejects points beyond it', () => {
-    const rect: PhoneViewportRect = {
-      bottom: 260,
-      height: 160,
-      left: 120,
-      right: 360,
-      top: 100,
-      width: 240,
-    }
-
-    expect(phoneViewportRectContainsPoint(rect, 240, 180)).toBe(true)
-    expect(phoneViewportRectContainsPoint(rect, rect.left, rect.top)).toBe(true)
-    expect(phoneViewportRectContainsPoint(rect, rect.right, rect.bottom)).toBe(
-      true,
-    )
-    expect(phoneViewportRectContainsPoint(rect, rect.left - 0.001, 180)).toBe(
-      false,
-    )
-    expect(phoneViewportRectContainsPoint(rect, rect.right + 0.001, 180)).toBe(
-      false,
-    )
-    expect(phoneViewportRectContainsPoint(rect, 240, rect.top - 0.001)).toBe(
-      false,
-    )
-    expect(phoneViewportRectContainsPoint(rect, 240, rect.bottom + 0.001)).toBe(
-      false,
-    )
-  })
-
   it('leaves modern Chrome measurements unchanged when the canvas BCR is already rendered', () => {
     const wrapper = measuredRect(1573.09, 126.25, 322.92, 698.832)
     const layer = measuredRect(1589.783336, 177.75, 289.533328, 603.2)
@@ -196,76 +124,6 @@ describe('phone viewport geometry', () => {
     },
   )
 
-  it.each(cefDisplayMatrix)(
-    'keeps an opened folder panel hit-test exact at $phoneScale% on $display.label',
-    ({ display, phoneScale }) => {
-      const viewportScale = Math.min(
-        display.width / REFERENCE_VIEWPORT_WIDTH,
-        display.height / REFERENCE_VIEWPORT_HEIGHT,
-      )
-      const zoom = productionPhoneZoom(
-        display.width,
-        display.height,
-        phoneScale,
-      )
-      const edgeGap = 24 * viewportScale
-      const wrapper = measuredRect(
-        display.width - edgeGap - PHONE_WIDTH * zoom,
-        display.height - edgeGap - PHONE_HEIGHT * zoom,
-        PHONE_WIDTH * zoom,
-        PHONE_HEIGHT * zoom,
-      )
-      // Live CEF 103 can report the zoomed canvas in a different coordinate
-      // space from pointer events. Preserve that mismatch in this fixture.
-      const rawCanvas = measuredRect(
-        display.width + 117.375,
-        83.625,
-        PHONE_WIDTH,
-        PHONE_HEIGHT,
-      )
-      const rawPanel = measuredRect(
-        rawCanvas.left + 23.25,
-        rawCanvas.top + 246.75,
-        343.5,
-        324.25,
-      )
-      const panel = normalizePhoneViewportRect(rawPanel, rawCanvas, wrapper)
-      const expected = {
-        bottom: wrapper.top + (246.75 + 324.25) * zoom,
-        height: 324.25 * zoom,
-        left: wrapper.left + 23.25 * zoom,
-        right: wrapper.left + (23.25 + 343.5) * zoom,
-        top: wrapper.top + 246.75 * zoom,
-        width: 343.5 * zoom,
-      }
-
-      expectRectClose(panel, expected)
-      expect(
-        phoneViewportRectContainsPoint(
-          panel,
-          panel.left + panel.width / 2,
-          panel.top + panel.height / 2,
-        ),
-      ).toBe(true)
-      expect(phoneViewportRectContainsPoint(panel, panel.left, panel.top)).toBe(
-        true,
-      )
-      expect(
-        phoneViewportRectContainsPoint(panel, panel.right, panel.bottom),
-      ).toBe(true)
-      expect(
-        phoneViewportRectContainsPoint(panel, panel.left - 0.25, panel.top),
-      ).toBe(false)
-      expect(
-        phoneViewportRectContainsPoint(panel, panel.right + 0.25, panel.bottom),
-      ).toBe(false)
-      expect(panel.left).toBeGreaterThanOrEqual(0)
-      expect(panel.right).toBeLessThanOrEqual(display.width)
-      expect(panel.top).toBeGreaterThanOrEqual(0)
-      expect(panel.bottom).toBeLessThanOrEqual(display.height)
-    },
-  )
-
   it('reads visual scale and normalized element rects from a canvas anchor', () => {
     const fixture = createGeometryFixture({
       canvasOffsetHeight: 844,

frontend/src/utils/phoneViewportGeometry.ts

@@ -7,14 +7,6 @@ export type PhoneViewportRect = {
   width: number
 }
 
-export function phoneViewportRectContainsPoint(
-  rect: PhoneViewportRect,
-  x: number,
-  y: number,
-): boolean {
-  return x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom
-}
-
 type RectMeasurement = Pick<
   DOMRectReadOnly,
   'height' | 'left' | 'top' | 'width'

frontend/src/utils/preferences.test.ts

@@ -2,16 +2,11 @@ import { describe, expect, it } from 'vitest'
 import type { LaunchablePhoneAppId } from '@/types/apps'
 import {
   DEFAULT_PHONE_PREFERENCES,
-  PHONE_SCALE_STEP,
   PHONE_SETUP_LAST_STEP,
   parsePhonePreferences,
   WALLPAPER_IDS,
 } from './preferences'
 describe('preferences', () => {
-  it('allows one-percent phone scale adjustments', () => {
-    expect(PHONE_SCALE_STEP).toBe(1)
-  })
-
   it('starts Setup Assistant for a phone without saved settings', () => {
     const value = parsePhonePreferences(null)
 

frontend/src/utils/preferences.ts

@@ -38,7 +38,7 @@ export const WALLPAPER_IDS = [
 ] as const
 export const PHONE_SCALE_MIN = 75
 export const PHONE_SCALE_MAX = 150
-export const PHONE_SCALE_STEP = 1
+export const PHONE_SCALE_STEP = 5
 export const PHONE_SETUP_LAST_STEP = 9
 
 export type AppearanceMode = (typeof APPEARANCE_MODE_IDS)[number]

frontend/src/views/PhoneAppWindow.vue

@@ -30,11 +30,7 @@ const launchStyle = computed(() => {
   <div
     v-if="app && !app.adminOnly"
     class="app-window"
-    :class="{
-      'app-window--camera-landscape':
-        app.id === 'camera' && phone.cameraLandscape,
-      'app-window--citywarn': app.id === 'citywarn',
-    }"
+    :class="{ 'app-window--citywarn': app.id === 'citywarn' }"
     :style="launchStyle"
   >
     <CustomAppFrame

frontend/src/views/SpringboardView.contract.test.ts

@@ -31,22 +31,6 @@ const builtInWallpaperCss = mainCss.slice(
   mainCss.indexOf('.wallpaper--midnight'),
   mainCss.indexOf('.wallpaper--custom'),
 )
-const folderOverlayBlock =
-  viewSource.match(/<HomeFolderOverlay\b[\s\S]*?\/>/)?.[0] ?? ''
-
-function handlerName(block: string, event: string): string {
-  return (
-    block.match(new RegExp(`@${event}="([A-Za-z][A-Za-z0-9_]*)"`))?.[1] ?? ''
-  )
-}
-
-function functionSource(name: string): string {
-  if (!name) return ''
-  const start = viewSource.indexOf(`function ${name}(`)
-  if (start < 0) return ''
-  const next = viewSource.indexOf('\nfunction ', start + 1)
-  return viewSource.slice(start, next < 0 ? viewSource.length : next)
-}
 
 describe('Springboard page swipe contract', () => {
   it('keeps app and widget labels on the larger shared home typography', () => {
@@ -152,7 +136,7 @@ describe('Springboard page swipe contract', () => {
     )
     expect(
       viewSource.match(/:external-drag-visual="homeDragVisualActive"/g),
-    ).toHaveLength(5)
+    ).toHaveLength(4)
     expect(viewSource).toContain('updateHomeDragGhost(event)')
     expect(viewSource).toContain('const dropGhost = homeDragGhost')
     expect(viewSource).toContain('const dropOrigin = homeDragPreviewBounds')
@@ -176,65 +160,6 @@ describe('Springboard page swipe contract', () => {
     )
   })
 
-  it('owns one external drag session for an app leaving an opened folder', () => {
-    expect(folderOverlayBlock).toContain(
-      ':external-drag-visual="homeDragVisualActive"',
-    )
-
-    const startSource = functionSource(
-      handlerName(folderOverlayBlock, 'dragstart'),
-    )
-    const moveSource = functionSource(
-      handlerName(folderOverlayBlock, 'dragmove'),
-    )
-    const cancelSource = functionSource(
-      handlerName(folderOverlayBlock, 'dragcancel'),
-    )
-
-    expect(startSource).toContain('createHomeDragGhost(event)')
-    expect(startSource).toMatch(/\.value\s*=\s*\{[\s\S]*?sourceIndex/)
-    expect(moveSource).toContain('updateHomeDragGhost(event)')
-    expect(moveSource).toContain('folderDraggingOutside.value')
-    expect(moveSource).toContain('resolveHomeEdgeTurn(event)')
-    expect(moveSource).toContain("queueEdgePageTurn(event, 'app')")
-    expect(viewSource).toContain(
-      '(draggingHomeApp.value || draggingFolderApp.value)',
-    )
-    expect(cancelSource).toContain('clearHomeDragGhost()')
-    expect(cancelSource).toContain('clearTemporaryHomePage()')
-  })
-
-  it('settles an extracted folder app from the tracked viewport preview', () => {
-    const extractSource = functionSource('extractOpenedFolderApp')
-    const targetSource = functionSource('folderExtractionDropTarget')
-
-    expect(extractSource).toContain('const dropGhost = homeDragGhost')
-    expect(extractSource).toContain('homeDragPreviewBounds')
-    expect(targetSource).toContain('page > appStore.homeLayout.pageCount')
-    expect(extractSource).not.toContain('sourceElement')
-    expect(extractSource).not.toContain('getBoundingClientRect()')
-    expect(extractSource).toMatch(
-      /animateHomeItemDrop\([\s\S]*?dropOrigin[\s\S]*?\)\.finally\(/,
-    )
-    expect(extractSource).toContain('clearHomeDragGhost(dropGhost)')
-    expect(extractSource).toMatch(
-      /if \(!target\) \{[\s\S]*?clearHomeDragGhost\(\)/,
-    )
-  })
-
-  it('cleans the opened-folder drag preview after an internal move, cancellation, or unmount', () => {
-    const moveSource = functionSource('moveOpenedFolderApp')
-    const cancelSource = functionSource(
-      handlerName(folderOverlayBlock, 'dragcancel'),
-    )
-
-    expect(moveSource).toContain('stopOpenedFolderAppDrag()')
-    expect(cancelSource).toContain('clearHomeDragGhost()')
-    expect(viewSource).toMatch(
-      /onBeforeUnmount\(\(\) => \{[\s\S]*?clearHomeDragGhost\(\)/,
-    )
-  })
-
   it('cleans up the external drag visual on every terminal path', () => {
     expect(
       viewSource.match(

frontend/src/views/SpringboardView.vue

@@ -42,7 +42,6 @@ import {
 } from '@/utils/homeLayout'
 import type { ReorderDirection } from '@/utils/keyboard'
 import {
-  phoneViewportRectContainsPoint,
   readPhoneViewportGeometry,
   type PhoneViewportGeometry,
   type PhoneViewportRect,
@@ -112,11 +111,6 @@ const draggingHomeApp = ref<{
   area: HomeArea
   index: number
 } | null>(null)
-const draggingFolderApp = ref<{
-  appId: LaunchablePhoneAppId
-  folderId: string
-  sourceIndex: number
-} | null>(null)
 const homeDragLayer = ref<HTMLElement | null>(null)
 const homeDragVisualActive = ref(false)
 const temporaryHomePage = ref<number | null>(null)
@@ -616,11 +610,7 @@ function queueEdgePageTurn(
     edgePageTimer = undefined
     edgePageDirection = direction
     edgePageLocked = dragType === 'widget'
-    if (
-      dragType === 'app' &&
-      lastHomePointer &&
-      (draggingHomeApp.value || draggingFolderApp.value)
-    ) {
+    if (dragType === 'app' && lastHomePointer && draggingHomeApp.value) {
       queueEdgePageTurn(lastHomePointer, 'app')
     }
   }, HOME_EDGE_PAGE_TURN_DELAY)
@@ -824,7 +814,7 @@ function updateHomeDragGhost(event: {
   )
 }
 
-function createHomeDragGhost(event: PointerEvent): HTMLElement | null {
+function createHomeDragGhost(event: PointerEvent): void {
   clearHomeDragGhost()
   const eventTarget =
     event.currentTarget instanceof Element
@@ -837,7 +827,7 @@ function createHomeDragGhost(event: PointerEvent): HTMLElement | null {
   const springboard = source?.closest<HTMLElement>('.springboard')
   const portal = layer?.closest<HTMLElement>('.phone-home-drag-portal')
   const geometry = readPhoneViewportGeometry(source ?? null)
-  if (!source || !layer || !springboard || !portal || !geometry) return null
+  if (!source || !layer || !springboard || !portal || !geometry) return
 
   const portalBounds = portal.getBoundingClientRect()
   const clipBounds = geometry.rect(springboard)
@@ -848,7 +838,7 @@ function createHomeDragGhost(event: PointerEvent): HTMLElement | null {
     sourceBounds.width <= 0 ||
     sourceBounds.height <= 0
   ) {
-    return null
+    return
   }
 
   layer.style.left = `${clipBounds.left - portalBounds.left}px`
@@ -875,12 +865,7 @@ function createHomeDragGhost(event: PointerEvent): HTMLElement | null {
   for (const element of [ghost, ...Array.from(ghost.querySelectorAll('*'))]) {
     element.removeAttribute('id')
     for (const attribute of element.getAttributeNames()) {
-      if (
-        attribute.startsWith('data-home-') ||
-        attribute.startsWith('data-folder-')
-      ) {
-        element.removeAttribute(attribute)
-      }
+      if (attribute.startsWith('data-home-')) element.removeAttribute(attribute)
     }
   }
   for (const control of ghost.querySelectorAll<HTMLElement>(
@@ -909,7 +894,6 @@ function createHomeDragGhost(event: PointerEvent): HTMLElement | null {
   layer.appendChild(position)
   homeDragVisualActive.value = true
   updateHomeDragGhost(event)
-  return position
 }
 
 function startHomeDrag(
@@ -1206,98 +1190,6 @@ function nearestDockDropTarget(event: {
   return closestIndex === null ? null : slots[closestIndex]
 }
 
-function folderExtractionDropTarget(event: {
-  clientX: number
-  clientY: number
-}):
-  | { area: 'dock'; index: number }
-  | { area: 'grid'; index: number; page: number }
-  | null {
-  const geometry = homeDragGeometry
-  if (!geometry) return null
-
-  const dock = document.querySelector<HTMLElement>('.app-dock')
-  if (dock) {
-    const dockBounds = homeDragViewportRect(dock, geometry)
-    if (
-      phoneViewportRectContainsPoint(dockBounds, event.clientX, event.clientY)
-    ) {
-      const slots = Array.from(
-        dock.querySelectorAll<HTMLElement>(
-          '[data-home-area="dock"][data-home-index]',
-        ),
-      ).filter((slot) => {
-        const index = Number(slot.dataset.homeIndex)
-        return (
-          Number.isInteger(index) && appStore.homeLayout.dock[index] === null
-        )
-      })
-      const closestIndex = nearestSpringboardRectIndex(
-        event.clientX,
-        event.clientY,
-        slots.map((slot) => homeDragViewportRect(slot, geometry)),
-      )
-      if (closestIndex === null) return null
-      const index = Number(slots[closestIndex]?.dataset.homeIndex)
-      return Number.isInteger(index) ? { area: 'dock', index } : null
-    }
-  }
-
-  const page = phone.currentPage
-  if (page < 1 || page > appPages.value.length) return null
-  const grid = document.querySelector<HTMLElement>(
-    `.springboard-page--apps[data-home-page="${page}"] .app-grid`,
-  )
-  const pageElement = grid?.closest<HTMLElement>('.springboard-page')
-  const springboard = grid?.closest<HTMLElement>('.springboard')
-  if (!grid || !pageElement || !springboard) return null
-
-  const pageBounds = homeDragViewportRect(pageElement, geometry)
-  const springboardBounds = homeDragViewportRect(springboard, geometry)
-  const rawGridBounds = homeDragViewportRect(grid, geometry)
-  const gridBounds = viewportRectAt(
-    springboardBounds.left + (rawGridBounds.left - pageBounds.left),
-    springboardBounds.top + (rawGridBounds.top - pageBounds.top),
-    rawGridBounds.width,
-    rawGridBounds.height,
-  )
-  if (
-    !phoneViewportRectContainsPoint(gridBounds, event.clientX, event.clientY)
-  ) {
-    return null
-  }
-
-  const slots = Array.from(
-    grid.querySelectorAll<HTMLElement>(
-      '[data-home-area="grid"][data-home-index]',
-    ),
-  ).filter((slot) => {
-    const index = Number(slot.dataset.homeIndex)
-    const item = appStore.homeLayout.grid[index]
-    return (
-      Number.isInteger(index) &&
-      (item === null ||
-        (item === undefined && page > appStore.homeLayout.pageCount))
-    )
-  })
-  const closestIndex = nearestSpringboardRectIndex(
-    event.clientX,
-    event.clientY,
-    slots.map((slot) => {
-      const bounds = homeDragViewportRect(slot, geometry)
-      return {
-        height: bounds.height,
-        left: springboardBounds.left + (bounds.left - pageBounds.left),
-        top: springboardBounds.top + (bounds.top - pageBounds.top),
-        width: bounds.width,
-      }
-    }),
-  )
-  if (closestIndex === null) return null
-  const index = Number(slots[closestIndex]?.dataset.homeIndex)
-  return Number.isInteger(index) ? { area: 'grid', index, page } : null
-}
-
 function finishHomeDrag(event: PointerEvent): void {
   clearEdgePageTurn()
   clearFolderHover()
@@ -1432,83 +1324,16 @@ function folderPreviewApps(folder: HomeFolder): PhoneAppDefinition[] {
   return apps
 }
 
-function currentOpenedFolderDragSession(sourceIndex?: number) {
-  const session = draggingFolderApp.value
-  const folder = openedFolder.value
-  if (
-    !session ||
-    !folder ||
-    folder.id !== session.folderId ||
-    (sourceIndex !== undefined && sourceIndex !== session.sourceIndex) ||
-    folder.apps[session.sourceIndex] !== session.appId
-  ) {
-    return null
-  }
-  return session
-}
-
-function startOpenedFolderAppDrag(
-  sourceIndex: number,
-  event: PointerEvent,
-): void {
-  stopOpenedFolderAppDrag()
-  const folder = openedFolder.value
-  if (
-    !folder ||
-    !Number.isInteger(sourceIndex) ||
-    sourceIndex < 0 ||
-    sourceIndex >= folder.apps.length
-  ) {
-    return
-  }
-  const appId = folder.apps[sourceIndex]
-  if (!appId || !installedAppsById.value.has(appId)) return
-  if (!createHomeDragGhost(event)) {
-    clearHomeDragGhost()
-    return
-  }
-  draggingFolderApp.value = { appId, folderId: folder.id, sourceIndex }
-  lastHomePointer = { clientX: event.clientX, clientY: event.clientY }
-}
-
-function moveOpenedFolderAppDrag(event: PointerEvent): void {
-  if (!currentOpenedFolderDragSession()) {
-    stopOpenedFolderAppDrag()
-    return
-  }
-  lastHomePointer = { clientX: event.clientX, clientY: event.clientY }
-  updateHomeDragGhost(event)
-  if (folderDraggingOutside.value && resolveHomeEdgeTurn(event)) {
-    queueEdgePageTurn(event, 'app')
-    return
-  }
-  clearEdgePageTurn()
-}
-
-function stopOpenedFolderAppDrag(): void {
-  clearEdgePageTurn()
-  draggingFolderApp.value = null
-  lastHomePointer = null
-  clearHomeDragGhost()
-  clearTemporaryHomePage()
-}
-
-function resetOpenedFolderState(): void {
-  folderDraggingOutside.value = false
-  openedFolderId.value = null
-  renameFolderOnOpenId.value = null
-}
-
 function openFolder(folderId: string): void {
-  stopOpenedFolderAppDrag()
   pageTransitioning.value = false
   folderDraggingOutside.value = false
   openedFolderId.value = folderId
 }
 
 function closeFolder(): void {
-  stopOpenedFolderAppDrag()
-  resetOpenedFolderState()
+  folderDraggingOutside.value = false
+  openedFolderId.value = null
+  renameFolderOnOpenId.value = null
 }
 
 function renameOpenedFolder(name: string): void {
@@ -1517,68 +1342,71 @@ function renameOpenedFolder(name: string): void {
 }
 
 function moveOpenedFolderApp(sourceIndex: number, targetIndex: number): void {
-  const session = currentOpenedFolderDragSession(sourceIndex)
-  stopOpenedFolderAppDrag()
-  if (!session) return
-  appStore.moveHomeFolderApp(session.folderId, sourceIndex, targetIndex)
+  if (!openedFolderId.value) return
+  appStore.moveHomeFolderApp(openedFolderId.value, sourceIndex, targetIndex)
 }
 
 function extractOpenedFolderApp(
   sourceIndex: number,
   event: PointerEvent,
 ): void {
-  const session = currentOpenedFolderDragSession(sourceIndex)
-  if (!session) {
-    closeFolder()
-    return
-  }
-  updateHomeDragGhost(event)
-  const dropGhost = homeDragGhost
-  const dropOrigin = homeDragPreviewBounds ? { ...homeDragPreviewBounds } : null
-  if (!dropGhost || !dropOrigin) {
-    closeFolder()
-    return
-  }
-  const target = folderExtractionDropTarget(event)
+  const folder = openedFolder.value
+  if (!folder) return
+  const appId = folder.apps[sourceIndex]
+  const sourceElement = document
+    .querySelector<HTMLElement>(
+      `.home-folder-panel [data-folder-app-index="${sourceIndex}"]`,
+    )
+    ?.closest<HTMLElement>('.app-icon-item')
+  const geometry = readPhoneViewportGeometry(sourceElement ?? null)
+  const sourceBounds = sourceElement
+    ? homeDragViewportRect(sourceElement, geometry)
+    : null
+  const candidates = Array.from(
+    document.querySelectorAll<HTMLElement>('[data-home-index][data-home-area]'),
+  ).filter((element) => {
+    const area = element.dataset.homeArea as HomeArea
+    const index = Number(element.dataset.homeIndex)
+    return (
+      (area === 'grid' || area === 'dock') &&
+      Number.isInteger(index) &&
+      appStore.homeLayout[area][index] === null
+    )
+  })
+  const target = candidates.reduce<HTMLElement | null>((closest, candidate) => {
+    if (!closest) return candidate
+    const bounds = homeDragViewportRect(candidate, geometry)
+    const closestBounds = homeDragViewportRect(closest, geometry)
+    const distance = Math.hypot(
+      event.clientX - (bounds.left + bounds.width / 2),
+      event.clientY - (bounds.top + bounds.height / 2),
+    )
+    const closestDistance = Math.hypot(
+      event.clientX - (closestBounds.left + closestBounds.width / 2),
+      event.clientY - (closestBounds.top + closestBounds.height / 2),
+    )
+    return distance < closestDistance ? candidate : closest
+  }, null)
   if (!target) {
-    clearEdgePageTurn()
-    draggingFolderApp.value = null
-    lastHomePointer = null
-    clearHomeDragGhost()
-    clearTemporaryHomePage()
-    resetOpenedFolderState()
+    closeFolder()
     return
   }
 
-  const { area, index: targetIndex } = target
+  const area = target.dataset.homeArea as HomeArea
+  const targetIndex = Number(target.dataset.homeIndex)
   if (
-    !appStore.extractHomeFolderApp(
-      session.folderId,
-      session.sourceIndex,
-      area,
-      targetIndex,
-    )
+    !appStore.extractHomeFolderApp(folder.id, sourceIndex, area, targetIndex)
   ) {
     closeFolder()
     return
   }
-
-  clearEdgePageTurn()
-  draggingFolderApp.value = null
-  lastHomePointer = null
-  clearTemporaryHomePage(area === 'grid')
-  resetOpenedFolderState()
-  const extractedIndex = findHomeItemIndex(session.appId, area, targetIndex)
-  if (extractedIndex === null) {
-    clearHomeDragGhost(dropGhost)
-    return
+  closeFolder()
+  if (sourceBounds) {
+    const extractedIndex = findHomeItemIndex(appId, area, targetIndex)
+    if (extractedIndex !== null) {
+      void animateHomeItemDrop(appId, area, extractedIndex, sourceBounds)
+    }
   }
-  void animateHomeItemDrop(
-    session.appId,
-    area,
-    extractedIndex,
-    dropOrigin,
-  ).finally(() => clearHomeDragGhost(dropGhost))
 }
 
 function clearSearch(): void {
@@ -1598,12 +1426,11 @@ watch(isEditablePage, (visible) => {
 watch(editMode, (editing) => {
   emit('editModeChange', editing)
   if (editing) return
-  stopOpenedFolderAppDrag()
   stopHomeDrag()
   stopWidgetDrag()
 })
 watch(openedFolder, (folder) => {
-  if (!folder && openedFolderId.value !== null) closeFolder()
+  if (!folder) closeFolder()
 })
 onBeforeUnmount(() => {
   emit('editModeChange', false)
@@ -1618,7 +1445,6 @@ onBeforeUnmount(() => {
   clearHomeDragGhost()
   temporaryHomePage.value = null
   draggingHomeApp.value = null
-  draggingFolderApp.value = null
   draggingWidgetId.value = null
 })
 </script>
@@ -2032,13 +1858,9 @@ onBeforeUnmount(() => {
         v-if="openedFolder"
         :apps="openedFolderApps"
         :edit-mode="editMode"
-        :external-drag-visual="homeDragVisualActive"
         :folder="openedFolder"
         :rename-on-open="renameFolderOnOpenId === openedFolder.id"
         @close="closeFolder"
-        @dragcancel="stopOpenedFolderAppDrag"
-        @dragmove="moveOpenedFolderAppDrag"
-        @dragstart="startOpenedFolderAppDrag"
         @drag-outside-change="folderDraggingOutside = $event"
         @edit="enterEditMode"
         @extract="extractOpenedFolderApp"

frontend/src/views/apps/AppStoreApp.contract.test.ts

@@ -81,7 +81,6 @@ describe('AppStoreApp Sky navigation contract', () => {
     expect(source).toContain('@click="profileOpened = true"')
     expect(source).toContain('const installedApps = computed')
     expect(source).toContain('return !appStore.isInstalled(app.id)')
-    expect(source).toContain('if (!appStore.isAvailable(app.id)) return false')
     expect(source).toContain(
       'class="store-account__apps phone-effect--expensive-shadow"',
     )
@@ -101,10 +100,6 @@ describe('AppStoreApp Sky navigation contract', () => {
     expect(source).toContain(
       'appStore.uninstallApp(uninstallCandidate.value.id)',
     )
-    expect(source).toContain('@click.stop="requestUninstall(app)"')
-    expect(source).toContain('if (!appStore.uninstallApp(')
-    expect(source).toContain('Apps.appStore.account.uninstallFailed')
-    expect(source).toContain('role="alert"')
     expect(source).toContain('v-if="isPhoneAppRemovable(app)"')
     expect(source).toContain(':opened="Boolean(uninstallCandidate)"')
     expect(source).toContain('class="store-account__grabber"')

frontend/src/views/apps/AppStoreApp.vue

@@ -63,7 +63,6 @@ const openedAt = new Date()
 const featuredSlide = ref(0)
 const profileOpened = ref(false)
 const uninstallCandidate = ref<LaunchablePhoneAppDefinition | null>(null)
-const uninstallError = ref('')
 const selectedApp = ref<LaunchablePhoneAppDefinition | null>(null)
 const storeScroll = ref<ComponentPublicInstance | null>(null)
 const featuredScroller = ref<HTMLElement | null>(null)
@@ -123,7 +122,6 @@ const catalog = computed(() =>
     if (!isLaunchablePhoneApp(app) || app.id === 'app-store' || app.adminOnly) {
       return false
     }
-    if (!appStore.isAvailable(app.id)) return false
 
     return !appStore.isInstalled(app.id)
   }).sort((a, b) => a.gridOrder - b.gridOrder),
@@ -131,9 +129,7 @@ const catalog = computed(() =>
 const installedApps = computed(() =>
   PHONE_APPS.filter(
     (app): app is LaunchablePhoneAppDefinition =>
-      isLaunchablePhoneApp(app) &&
-      appStore.isAvailable(app.id) &&
-      appStore.isInstalled(app.id),
+      isLaunchablePhoneApp(app) && appStore.isInstalled(app.id),
   ).sort((a, b) => a.gridOrder - b.gridOrder),
 )
 const installedGameCount = computed(
@@ -147,7 +143,6 @@ const dailyCandidates = computed(() =>
         !app.adminOnly &&
         !isExternalPhoneApp(app) &&
         app.id !== 'app-store' &&
-        appStore.isAvailable(app.id) &&
         !DEFAULT_INSTALLED_PHONE_APP_IDS.has(app.id) &&
         !appStore.isInstalled(app.id),
     ),
@@ -289,16 +284,6 @@ function closeProfile(): void {
   profileDragOffset.value = 0
 }
 
-function requestUninstall(app: LaunchablePhoneAppDefinition): void {
-  uninstallError.value = ''
-  uninstallCandidate.value = app
-}
-
-function closeUninstallDialog(): void {
-  uninstallError.value = ''
-  uninstallCandidate.value = null
-}
-
 function beginProfileDrag(event: PointerEvent): void {
   if (!profileOpened.value || event.button !== 0) return
   profileDragPointerId = event.pointerId
@@ -329,11 +314,8 @@ function endProfileDrag(event: PointerEvent): void {
 
 function confirmUninstall(): void {
   if (!uninstallCandidate.value) return
-  if (!appStore.uninstallApp(uninstallCandidate.value.id)) {
-    uninstallError.value = phone.t('Apps.appStore.account.uninstallFailed')
-    return
-  }
-  closeUninstallDialog()
+  appStore.uninstallApp(uninstallCandidate.value.id)
+  uninstallCandidate.value = null
 }
 
 function highlightStyle(index: number): Record<string, string> {
@@ -1121,7 +1103,7 @@ watch(
                   app: getPhoneAppLabel(app, phone.t),
                 })
               "
-              @click.stop="requestUninstall(app)"
+              @click="uninstallCandidate = app"
             >
               <Trash2 :size="17" :stroke-width="2" aria-hidden="true" />
             </button>
@@ -1133,8 +1115,8 @@ watch(
     <SkyDialog
       :opened="Boolean(uninstallCandidate)"
       role="alertdialog"
-      @backdropclick="closeUninstallDialog"
-      @escape="closeUninstallDialog"
+      @backdropclick="uninstallCandidate = null"
+      @escape="uninstallCandidate = null"
     >
       <template #title>
         {{ phone.t('Apps.appStore.account.uninstallTitle') }}
@@ -1146,15 +1128,8 @@ watch(
           })
         }}
       </p>
-      <p
-        v-if="uninstallError"
-        class="store-account__uninstall-error"
-        role="alert"
-      >
-        {{ uninstallError }}
-      </p>
       <template #buttons>
-        <SkyDialogButton @click="closeUninstallDialog">
+        <SkyDialogButton @click="uninstallCandidate = null">
           {{ phone.t('Common.cancel') }}
         </SkyDialogButton>
         <SkyDialogButton strong @click="confirmUninstall">
@@ -1497,11 +1472,6 @@ watch(
   background: var(--sky-danger-soft);
 }
 
-.store-account__uninstall-error {
-  color: var(--sky-danger);
-  font-size: 12px;
-}
-
 .store-scroll {
   min-height: 0;
   flex: 1 1 auto;

frontend/src/views/apps/CameraApp.contract.test.ts

@@ -6,15 +6,6 @@ const cameraView = readFileSync(
   new URL('./CameraApp.vue', import.meta.url),
   'utf8',
 )
-const appShell = readFileSync(new URL('../../App.vue', import.meta.url), 'utf8')
-const appWindow = readFileSync(
-  new URL('../PhoneAppWindow.vue', import.meta.url),
-  'utf8',
-)
-const shellStyles = readFileSync(
-  new URL('../../assets/main.css', import.meta.url),
-  'utf8',
-)
 const mediaCapture = readFileSync(
   new URL('../../components/PhoneMediaCapture.vue', import.meta.url),
   'utf8',
@@ -56,99 +47,6 @@ describe('Camera app controls', () => {
     expect(cameraView).not.toContain('k-navbar')
   })
 
-  it('stays dark when the global phone appearance is light', () => {
-    const cameraPageTag = cameraView.match(/<sky-app-page\b[^>]*>/s)?.[0]
-
-    expect(cameraPageTag).toBeDefined()
-    expect(cameraPageTag).toMatch(/\bdark\b/)
-    expect(cameraView).toMatch(
-      /\.camera-page\s*\{[^}]*--sky-bg:\s*#000;[^}]*--sky-text:\s*#fff;[^}]*background:\s*var\(--sky-bg\);[^}]*color:\s*var\(--sky-text\);/s,
-    )
-  })
-
-  it('fills the translucent landscape shell without letterbox gaps', () => {
-    const landscapeViewport = cameraView.match(
-      /\.camera-page--landscape \.camera-viewport\s*\{([^}]*)\}/s,
-    )?.[1]
-
-    expect(cameraView).toMatch(
-      /\.camera-page--landscape\s*\{[^}]*--sky-bg:\s*rgba\(0, 0, 0, 0\.42\);/s,
-    )
-    expect(landscapeViewport).toBeDefined()
-    expect(landscapeViewport).toContain('top: 50%')
-    expect(landscapeViewport).toContain(
-      'width: calc(100% * var(--phone-screen-portrait-ratio))',
-    )
-    expect(landscapeViewport).toContain(
-      'aspect-ratio: var(--phone-screen-portrait-ratio)',
-    )
-    expect(landscapeViewport).not.toContain('16 / 9')
-    expect(cameraView).toMatch(
-      /\.camera-page--landscape \.camera-shade\s*\{[^}]*linear-gradient\([^)]*90deg,[^)]*rgba\(0, 0, 0, 0\.42\) 0 18%,[^)]*transparent 18% 75%,[^)]*rgba\(0, 0, 0, 0\.42\) 75% 100%/s,
-    )
-    expect(appShell).toMatch(
-      /'phone-screen--camera-landscape':\s*activeAppId === 'camera' && phone\.cameraLandscape/,
-    )
-    expect(appWindow).toMatch(
-      /'app-window--camera-landscape':\s*app\.id === 'camera' && phone\.cameraLandscape/,
-    )
-    expect(shellStyles).toMatch(
-      /\.phone-screen\s*\{[^}]*--phone-screen-portrait-ratio:\s*2\.30951;/s,
-    )
-    expect(shellStyles).toMatch(
-      /\.phone-screen--camera-landscape\s*\{[^}]*background:\s*transparent;/s,
-    )
-    expect(shellStyles).toMatch(
-      /\.phone-screen--camera-landscape \.springboard\s*\{[^}]*visibility:\s*hidden;/s,
-    )
-    expect(shellStyles).toMatch(
-      /\.app-window--camera-landscape\s*\{[^}]*background:\s*transparent;/s,
-    )
-  })
-
-  it('renders camera notices as plain text without a glass pill', () => {
-    const noticeMarkup = cameraView.slice(
-      cameraView.indexOf('<span v-if="noticeText"'),
-      cameraView.indexOf('<span v-else-if="pendingCount"'),
-    )
-    const noticeStyles = cameraView.match(
-      /\.camera-notice-text\s*,[\s\S]*?\{([^}]*)\}/,
-    )?.[1]
-
-    expect(noticeMarkup).toContain('class="camera-notice-text"')
-    expect(noticeMarkup).not.toContain('camera-focus-pill')
-    expect(noticeStyles).toBeDefined()
-    expect(noticeStyles).toContain('color: #ffd60a')
-    expect(noticeStyles).not.toMatch(
-      /(?:background|backdrop-filter|border-radius|padding)\s*:/,
-    )
-  })
-
-  it('uses the current compact lens selector treatment', () => {
-    const zoomControl = cameraView.slice(
-      cameraView.indexOf('<div class="camera-zoom-control">'),
-      cameraView.indexOf('<footer class="camera-controls">'),
-    )
-
-    expect(zoomControl).toContain('variant="plain"')
-    expect(zoomControl).not.toContain('glass')
-    expect(zoomControl).toContain('{{ zoomPresetLabel(zoom) }}')
-    expect(cameraView).toContain("return zoom === 0.5 ? '.5' : `${zoom}`")
-    expect(cameraView).toMatch(
-      /\.camera-zoom-control\s*\{[^}]*bottom:\s*216px;/s,
-    )
-    expect(cameraView).toMatch(/\.camera-zoom-row\s*\{[^}]*gap:\s*10px;/s)
-    expect(cameraView).toMatch(
-      /\.camera-zoom-pill\s*\{[^}]*width:\s*36px;[^}]*min-width:\s*36px;[^}]*height:\s*36px;[^}]*min-height:\s*36px;[^}]*padding:\s*0;/s,
-    )
-    expect(cameraView).toMatch(
-      /\.camera-zoom-pill::before\s*\{[^}]*width:\s*var\(--sky-touch-target, 44px\);[^}]*inset-block:\s*-4px;/s,
-    )
-    expect(cameraView).toMatch(
-      /\.camera-zoom-pill\.active\s*\{[^}]*color:\s*#ffd60a;[^}]*background:\s*rgba\(28, 28, 30, 0\.78\);/s,
-    )
-  })
-
   it('keeps continuous wheel zoom without an extra slider bar', () => {
     expect(cameraView).not.toContain('camera-zoom-slider')
     expect(cameraView).not.toContain('type="range"')
@@ -179,8 +77,7 @@ describe('Camera app controls', () => {
   it('locks look controls without changing the global gameplay camera', () => {
     expect(cameraView).toContain("nuiCall('camera:setLocked'")
     expect(cameraView).toContain('cameraLocked.value')
-    expect(cameraView).toContain('Apps.camera.lookKey')
-    expect(cameraView).not.toContain('Apps.camera.spaceKey')
+    expect(cameraView).toContain('Apps.camera.spaceKey')
     expect(cameraClient).toContain('RegisterNUICallback("camera:setLocked"')
     expect(cameraClient).toContain('INPUT_LOOK_LR')
     expect(cameraClient).toContain('INPUT_LOOK_UD')
@@ -198,26 +95,10 @@ describe('Camera app controls', () => {
     expect(cameraClient).not.toContain('ensure_ultrawide_camera')
   })
 
-  it('uses the configured HoldToLook control and Space in camera modes', () => {
-    expect(cameraView).not.toContain("event.code !== 'Space'")
-    expect(cameraView).not.toContain("window.addEventListener('keydown'")
-    expect(focusClient).toContain(
-      'function SkyPhoneFocus.IsHoldToLookPressed()',
+  it('keeps the selfie camera stable while Space still allows movement', () => {
+    expect(cameraView).toMatch(
+      /event\.code !== 'Space'[\s\S]*cameraLocked\.value/,
     )
-    expect(focusClient).toContain(
-      'IsDisabledControlPressed(0, hold_to_look_control)',
-    )
-    expect(cameraClient).toContain('SkyPhoneFocus.IsHoldToLookPressed()')
-    expect(cameraClient).toContain(
-      'IsDisabledControlPressed(0, camera_passthrough_control)',
-    )
-    expect(cameraClient).toMatch(
-      /if data\.active then\s+watch_camera_controls\(\)/,
-    )
-    expect(cameraClient).not.toContain('IsDisabledControlJustReleased(0, 22)')
-  })
-
-  it('orbits the stable selfie camera while HoldToLook allows movement', () => {
     expect(cameraClient).toContain(
       'if camera_state.locked or camera_state.front_camera then',
     )
@@ -225,22 +106,14 @@ describe('Camera app controls', () => {
     expect(cameraClient).toContain('local front_camera_view_mode = 0')
     expect(cameraClient).toContain('local front_camera_fov = 32.0')
     expect(cameraClient).toContain('local front_camera_distance = 1.05')
-    expect(cameraClient).toContain('local front_camera_horizontal_limit = 75.0')
-    expect(cameraClient).toContain('local front_camera_vertical_limit = 35.0')
     expect(cameraClient).toContain('local head_position = GetPedBoneCoords')
-    expect(cameraClient).toContain('GetDisabledControlNormal(0, 1)')
-    expect(cameraClient).toContain('GetDisabledControlNormal(0, 2)')
-    expect(cameraClient).toContain('update_front_camera_orbit()')
-    expect(cameraClient).toContain('camera_state.front_camera_yaw')
-    expect(cameraClient).toContain('camera_state.front_camera_pitch')
+    expect(cameraClient).toContain(
+      'local dot = (to_camera.x * forward_vector.x)',
+    )
     expect(cameraClient).toContain('front_camera_target_height')
     expect(focusClient).toContain(
       'return { block_game = false, block_look = false, cursor = false, focused = true, game_input = true, keep_input = true }',
     )
-    expect(focusClient).toContain(
-      'return { block_game = true, block_look = true, cursor = true, focused = true, game_input = false, keep_input = true }',
-    )
-    expect(focusClient).toContain('gameInput = focus.game_input')
     expect(cameraClient).toContain('SetCamCoord(')
     expect(cameraClient).toContain('PointCamAtCoord(')
     expect(cameraClient).not.toContain('SetCamRot(')
@@ -248,6 +121,10 @@ describe('Camera app controls', () => {
     expect(cameraClient).not.toContain('front_camera_position')
     expect(cameraClient).not.toContain('AttachCamToEntity(')
     expect(cameraClient).not.toContain('PointCamAtEntity(')
+    expect(cameraView).toContain("window.addEventListener('keyup', onKeyup)")
+    expect(cameraView).toContain(
+      "nuiCall('camera:setFocus', { focused: true })",
+    )
   })
 
   it('uses a looping camera-hold pose instead of the old selfie dance', () => {

frontend/src/views/apps/CameraApp.vue

@@ -56,6 +56,7 @@ const microphoneEnabled = ref(true)
 const frontCamera = ref(false)
 const shutterActive = ref(false)
 const cameraLocked = ref(false)
+const movementEnabled = ref(false)
 const recording = ref(false)
 const savingVideo = ref(false)
 const recordingStartedAt = ref(0)
@@ -77,16 +78,6 @@ const pendingCount = computed(
   () =>
     captures.value.filter((capture) => capture.status === 'uploading').length,
 )
-
-function zoomPresetIsActive(zoom: (typeof zoomLevels)[number]): boolean {
-  return Math.abs(selectedZoom.value - zoom) < 0.03
-}
-
-function zoomPresetLabel(zoom: (typeof zoomLevels)[number]): string {
-  if (zoomPresetIsActive(zoom)) return `${zoom}x`
-  return zoom === 0.5 ? '.5' : `${zoom}`
-}
-
 function correlationId(): string {
   return `${Date.now()}-${crypto.randomUUID()}`
 }
@@ -143,30 +134,10 @@ async function requestPhoto(): Promise<void> {
     window.setTimeout(() => void completeDevelopmentCapture(id, 'photo'), 700)
     return
   }
-  console.info('[Sky Phone Media] Camera requested a photo upload.', {
-    correlationId: id,
-  })
-  const response = await nuiCall('media:requestUpload', {
+  await nuiCall('media:requestUpload', {
     correlationId: id,
     mediaType: 'photo',
   })
-  if (!response.success) {
-    console.error('[Sky Phone Media] Photo upload request was rejected.', {
-      correlationId: id,
-      error: response.error,
-    })
-    window.postMessage(
-      {
-        data: {
-          correlationId: id,
-          error: response.error ?? 'request_failed',
-          success: false,
-        },
-        type: 'media:uploadResult',
-      },
-      '*',
-    )
-  }
 }
 
 function startRecording(): void {
@@ -247,6 +218,10 @@ async function toggleFacing(): Promise<void> {
 
 async function toggleCameraLock(): Promise<void> {
   cameraLocked.value = !cameraLocked.value
+  if (cameraLocked.value && movementEnabled.value) {
+    movementEnabled.value = false
+    await nuiCall('camera:setFocus', { focused: true })
+  }
   await nuiCall('camera:setLocked', { locked: cameraLocked.value })
 }
 
@@ -345,6 +320,26 @@ function updateRecordingTimer(): void {
   elapsed.value = formatRecordingDuration(Date.now() - recordingStartedAt.value)
 }
 
+function onKeydown(event: KeyboardEvent): void {
+  if (
+    event.code !== 'Space' ||
+    event.repeat ||
+    cameraLocked.value ||
+    movementEnabled.value
+  )
+    return
+  event.preventDefault()
+  movementEnabled.value = true
+  void nuiCall('camera:setFocus', { focused: false })
+}
+
+function onKeyup(event: KeyboardEvent): void {
+  if (event.code !== 'Space' || !movementEnabled.value) return
+  event.preventDefault()
+  movementEnabled.value = false
+  void nuiCall('camera:setFocus', { focused: true })
+}
+
 function onMessage(event: MessageEvent): void {
   if (!isTrustedRootMessageSource(event.source, window)) return
   const message = event.data as {
@@ -379,11 +374,6 @@ function onMessage(event: MessageEvent): void {
   } else if (message.type === 'media:uploadResult') {
     const result = message.data as UploadResult
     if (!result?.correlationId) return
-    console.info('[Sky Phone Media] Camera received an upload result.', {
-      correlationId: result.correlationId,
-      error: result.error,
-      success: result.success,
-    })
     savingVideo.value = false
     if (result.success && result.media) {
       latestMedia.value = result.media
@@ -427,6 +417,8 @@ onMounted(() => {
     { data: { zoom: selectedZoom.value }, type: 'camera:zoom' },
     '*',
   )
+  window.addEventListener('keydown', onKeydown)
+  window.addEventListener('keyup', onKeyup)
   window.addEventListener('message', onMessage)
   void nuiCall('camera:setActive', { active: true })
   void nuiCall<MediaConfig>('media:config').then((response) => {
@@ -442,7 +434,13 @@ onBeforeUnmount(() => {
   if (shutterTimer !== undefined) window.clearTimeout(shutterTimer)
   if (noticeTimer !== undefined) window.clearTimeout(noticeTimer)
   if (recordingTimer !== undefined) window.clearInterval(recordingTimer)
+  window.removeEventListener('keydown', onKeydown)
+  window.removeEventListener('keyup', onKeyup)
   window.removeEventListener('message', onMessage)
+  if (movementEnabled.value) {
+    movementEnabled.value = false
+    void nuiCall('camera:setFocus', { focused: true })
+  }
   if (renderFrameId !== undefined) window.cancelAnimationFrame(renderFrameId)
   resizeObserver?.disconnect()
   gameView?.dispose()
@@ -463,7 +461,6 @@ onBeforeUnmount(() => {
     class="camera-page"
     :class="{ 'camera-page--landscape': phone.cameraLandscape }"
     :aria-label="phone.t('Apps.camera.name')"
-    dark
   >
     <div class="camera-viewport" @wheel.prevent.stop="zoomWithWheel">
       <canvas
@@ -537,7 +534,10 @@ onBeforeUnmount(() => {
           </template>
         </sky-fab>
       </div>
-      <span v-if="noticeText" class="camera-notice-text">
+      <span
+        v-if="noticeText"
+        class="camera-focus-pill camera-focus-pill--notice"
+      >
         {{ noticeText }}
       </span>
       <span v-else-if="pendingCount" class="camera-upload-pill">
@@ -562,7 +562,7 @@ onBeforeUnmount(() => {
       >
         <LockKeyhole v-if="cameraLocked" :size="12" />
         <LockOpen v-else :size="12" />
-        <kbd>{{ phone.t('Apps.camera.lookKey') }}</kbd>
+        <kbd>{{ phone.t('Apps.camera.spaceKey') }}</kbd>
       </SkyButton>
       <sky-fab
         component="button"
@@ -593,16 +593,16 @@ onBeforeUnmount(() => {
         <SkyButton
           v-for="zoom in zoomLevels"
           :key="zoom"
+          glass
           rounded
-          variant="plain"
           class="camera-zoom-pill"
-          :class="{ active: zoomPresetIsActive(zoom) }"
+          :class="{ active: Math.abs(selectedZoom - zoom) < 0.03 }"
           type="button"
           :aria-label="phone.t('Apps.camera.zoom', { zoom: `${zoom}x` })"
-          :aria-pressed="zoomPresetIsActive(zoom)"
+          :aria-pressed="Math.abs(selectedZoom - zoom) < 0.03"
           @click="setZoom(zoom)"
         >
-          {{ zoomPresetLabel(zoom) }}
+          {{ zoom }}x
         </SkyButton>
       </div>
     </div>
@@ -693,15 +693,10 @@ onBeforeUnmount(() => {
 
 <style scoped>
 .camera-page {
-  --sky-bg: #000;
-  --sky-text: #fff;
   position: relative;
   overflow: clip;
-  background: var(--sky-bg);
-  color: var(--sky-text);
-}
-.camera-page--landscape {
-  --sky-bg: rgba(0, 0, 0, 0.42);
+  background: #000;
+  color: #fff;
 }
 .camera-viewport {
   position: absolute;
@@ -713,11 +708,11 @@ onBeforeUnmount(() => {
   transform: translateY(-50%);
 }
 .camera-page--landscape .camera-viewport {
-  top: 50%;
+  top: 46%;
   left: 50%;
-  width: calc(100% * var(--phone-screen-portrait-ratio));
+  width: calc(100% * 16 / 9);
   height: auto;
-  aspect-ratio: var(--phone-screen-portrait-ratio);
+  aspect-ratio: 16 / 9;
   transform: translate(-50%, -50%) rotate(90deg);
 }
 .camera-game-view,
@@ -775,16 +770,6 @@ onBeforeUnmount(() => {
   pointer-events: none;
   background: linear-gradient(#0008, transparent 22%);
 }
-.camera-page--landscape .camera-shade {
-  background:
-    linear-gradient(
-      90deg,
-      rgba(0, 0, 0, 0.42) 0 18%,
-      transparent 18% 75%,
-      rgba(0, 0, 0, 0.42) 75% 100%
-    ),
-    linear-gradient(#0008, transparent 22%);
-}
 .camera-flash {
   z-index: 8;
   pointer-events: none;
@@ -845,22 +830,25 @@ onBeforeUnmount(() => {
 .camera-page--landscape .camera-latest svg {
   transform: rotate(90deg);
 }
-.camera-upload-pill {
-  padding: 7px 10px;
-  border-radius: 999px;
-  background: #0006;
-  backdrop-filter: blur(16px);
-  -webkit-backdrop-filter: blur(16px);
-}
-.camera-notice-text,
+.camera-focus-pill:not(.sky-button--glass),
 .camera-upload-pill {
   min-width: 0;
-  color: #ffd60a;
+  padding: 7px 10px;
   overflow: hidden;
+  border-radius: 999px;
+  background: #0006;
   text-align: center;
   text-overflow: ellipsis;
   white-space: nowrap;
   font-size: 11px;
+  backdrop-filter: blur(16px);
+  -webkit-backdrop-filter: blur(16px);
+}
+.camera-upload-pill {
+  color: #ffd60a;
+}
+.camera-focus-pill--notice {
+  color: #ffd60a;
 }
 .camera-lock-control {
   min-height: 44px;
@@ -911,7 +899,7 @@ onBeforeUnmount(() => {
 .camera-zoom-control {
   position: absolute;
   z-index: 4;
-  bottom: 216px;
+  bottom: 196px;
   left: 50%;
   width: auto;
   transform: translateX(-50%);
@@ -919,19 +907,16 @@ onBeforeUnmount(() => {
 .camera-zoom-row {
   display: flex;
   justify-content: space-between;
-  gap: 10px;
+  gap: 8px;
 }
 .camera-zoom-pill {
-  width: 36px;
-  min-width: 36px;
-  height: 36px;
-  min-height: 36px;
+  width: 44px;
+  min-width: 44px;
+  height: 44px;
+  min-height: 44px;
   padding: 0;
-  border: 0;
   color: #fff;
-  background: transparent;
-  font-size: 12px;
-  font-weight: 500;
+  font-size: 10px;
   text-align: center;
   transition:
     background-color 0.2s ease,
@@ -939,20 +924,8 @@ onBeforeUnmount(() => {
     border-color 0.2s ease,
     box-shadow 0.2s ease;
 }
-.camera-zoom-pill::before {
-  width: var(--sky-touch-target, 44px);
-  inset-block: -4px;
-}
 .camera-zoom-pill.active {
   color: #ffd60a;
-  background: rgba(28, 28, 30, 0.78);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.12);
-}
-.camera-zoom-pill:active:not(:disabled) {
-  background: rgba(28, 28, 30, 0.42);
-}
-.camera-zoom-pill.active:active:not(:disabled) {
-  background: rgba(28, 28, 30, 0.86);
 }
 .camera-controls {
   position: absolute;

frontend/src/views/apps/CityWarnApp.contract.test.ts

@@ -40,10 +40,6 @@ describe('CityWarn product contract', () => {
   })
 
   it('reserves the pill navigation, keeps sheets safe and avoids blur flicker', () => {
-    expect(source).toMatch(
-      /\.citywarn-scroll\s*\{[^}]*min-height:\s*0;[^}]*height:\s*auto;[^}]*flex:\s*1 1 0;[^}]*overflow-y:\s*auto;/s,
-    )
-    expect(source).not.toMatch(/\.citywarn-scroll\s*\{[^}]*height:\s*100%;/s)
     expect(source).toMatch(
       /\.citywarn-scroll\.sky-scroll-area--tabbar\s*\{[^}]*padding-bottom:\s*calc\(var\(--sky-safe-area-bottom\) \+ 84px\)/s,
     )
@@ -60,51 +56,6 @@ describe('CityWarn product contract', () => {
     expect(source).not.toContain('<span>{{ alert.title }}</span>')
   })
 
-  it('uses one spacing and radius system throughout the current feed', () => {
-    expect(source).toMatch(
-      /\.citywarn-overview\s*\{[^}]*padding:\s*var\(--sky-space-3\);[^}]*gap:\s*var\(--sky-space-3\);[^}]*border-radius:\s*var\(--sky-radius-card\);/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-overview \+ \.citywarn-feed\s*\{[^}]*margin-top:\s*var\(--sky-space-3\);[^}]*gap:\s*var\(--sky-space-3\);/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-alert-card\s*\{[^}]*border-radius:\s*var\(--sky-radius-card\);/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-publisher-card\s*\{[^}]*margin:\s*var\(--sky-space-3\) 0 0;[^}]*border-radius:\s*var\(--sky-radius-card\);/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-publisher-card :deep\(\.sky-card__content\)\s*\{[^}]*padding:\s*var\(--sky-space-3\);[^}]*gap:\s*var\(--sky-space-3\);/s,
-    )
-    for (const selector of [
-      'citywarn-overview-symbol',
-      'citywarn-card-icon',
-      'citywarn-publisher-icon',
-    ]) {
-      expect(source).toMatch(
-        new RegExp(
-          `\\.${selector}\\s*\\{[^}]*border-radius:\\s*var\\(--sky-radius-control\\);`,
-          's',
-        ),
-      )
-    }
-  })
-
-  it('keeps settings groups on one compact spacing rhythm', () => {
-    expect(source).toMatch(
-      /\.citywarn-settings\s*\{[^}]*gap:\s*var\(--sky-space-5\);/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-settings :deep\(\.sky-settings-group\)\s*\{[^}]*margin:\s*0;/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-settings :deep\(\.sky-settings-group__title\)\s*\{[^}]*margin:\s*0 var\(--sky-space-1\) var\(--sky-space-2\);/s,
-    )
-    expect(source).toMatch(
-      /\.citywarn-settings :deep\(\.sky-settings-group__footer\)\s*\{[^}]*margin:\s*var\(--sky-space-2\) var\(--sky-space-1\) 0;/s,
-    )
-  })
-
   it('keeps publishing authorization and validation on the server', () => {
     expect(server).toContain('Bridge.Framework.GetJob(source)')
     expect(server).toContain('SkyPhone.RequireSession(source)')

frontend/src/views/apps/CityWarnApp.vue

@@ -1026,9 +1026,7 @@ onMounted(async () => {
   height: 18px;
 }
 .citywarn-scroll {
-  min-height: 0;
-  height: auto;
-  flex: 1 1 0;
+  height: 100%;
   padding: 12px 13px calc(28px + env(safe-area-inset-bottom));
   overflow-y: auto;
 }
@@ -1047,11 +1045,11 @@ onMounted(async () => {
 }
 .citywarn-overview {
   display: flex;
-  padding: var(--sky-space-3);
+  padding: 15px;
   align-items: center;
-  gap: var(--sky-space-3);
+  gap: 12px;
   border: 1px solid #bbf7d0;
-  border-radius: var(--sky-radius-card);
+  border-radius: 18px;
   background: linear-gradient(135deg, #f0fdf4, #ecfdf5);
 }
 .citywarn-overview--active {
@@ -1064,7 +1062,7 @@ onMounted(async () => {
   height: 46px;
   flex: 0 0 auto;
   place-items: center;
-  border-radius: var(--sky-radius-control);
+  border-radius: 15px;
   color: #15803d;
   background: #dcfce7;
 }
@@ -1088,17 +1086,12 @@ onMounted(async () => {
   flex-direction: column;
   gap: 10px;
 }
-.citywarn-overview + .citywarn-feed {
-  margin-top: var(--sky-space-3);
-  gap: var(--sky-space-3);
-}
 .citywarn-alert-card {
   position: relative;
-  padding: var(--sky-space-3) var(--sky-space-3) var(--sky-space-3)
-    var(--sky-space-4);
+  padding: 13px 13px 12px 17px;
   overflow: hidden;
   border: 1px solid #e5e7eb;
-  border-radius: var(--sky-radius-card);
+  border-radius: 17px;
   background: #fff;
   box-shadow: 0 4px 15px rgb(15 23 42 / 5%);
   cursor: pointer;
@@ -1122,7 +1115,7 @@ onMounted(async () => {
   width: 32px;
   height: 32px;
   place-items: center;
-  border-radius: var(--sky-radius-control);
+  border-radius: 10px;
   color: var(--severity);
   background: color-mix(in srgb, var(--severity) 12%, white);
 }
@@ -1146,7 +1139,7 @@ onMounted(async () => {
   color: #9ca3af;
 }
 .citywarn-alert-card h3 {
-  margin: var(--sky-space-2) 0 var(--sky-space-1);
+  margin: 10px 0 5px;
   font-size: 16px;
   line-height: 1.18;
 }
@@ -1162,10 +1155,10 @@ onMounted(async () => {
 }
 .citywarn-alert-card footer {
   display: flex;
-  margin-top: var(--sky-space-2);
+  margin-top: 11px;
   align-items: center;
   justify-content: space-between;
-  gap: var(--sky-space-2);
+  gap: 8px;
   color: #6b7280;
   font-size: 10.5px;
 }
@@ -1179,13 +1172,12 @@ onMounted(async () => {
   white-space: nowrap;
 }
 .citywarn-publisher-card {
-  margin: var(--sky-space-3) 0 0;
-  border-radius: var(--sky-radius-card);
+  margin-top: 12px;
 }
 .citywarn-publisher-card :deep(.sky-card__content) {
   display: flex;
-  padding: var(--sky-space-3);
-  gap: var(--sky-space-3);
+  padding: 12px;
+  gap: 10px;
 }
 .citywarn-publisher-icon {
   display: grid;
@@ -1193,7 +1185,7 @@ onMounted(async () => {
   height: 36px;
   flex: 0 0 auto;
   place-items: center;
-  border-radius: var(--sky-radius-control);
+  border-radius: 11px;
   color: #1d4ed8;
   background: #dbeafe;
 }
@@ -1531,20 +1523,11 @@ onMounted(async () => {
 .citywarn-settings {
   display: flex;
   flex-direction: column;
-  gap: var(--sky-space-5);
-}
-.citywarn-settings :deep(.sky-settings-group) {
-  margin: 0;
-}
-.citywarn-settings :deep(.sky-settings-group__title) {
-  margin: 0 var(--sky-space-1) var(--sky-space-2);
-}
-.citywarn-settings :deep(.sky-settings-group__footer) {
-  margin: var(--sky-space-2) var(--sky-space-1) 0;
+  gap: 15px;
 }
 .citywarn-settings-hint {
   display: flex;
-  margin: 0 var(--sky-space-1);
+  margin: 0 8px;
   align-items: flex-start;
   gap: 7px;
   color: #6b7280;

frontend/src/views/apps/CryptoApp.contract.test.ts

@@ -119,8 +119,6 @@ describe('VaultX crypto app contracts', () => {
     expect(source).not.toContain('class="auth-panel__heading"')
     expect(source).not.toContain('class="auth-action-dock"')
     expect(source).not.toContain('class="password-rules"')
-    expect(source).toContain('class="auth-password-hint"')
-    expect(source).toContain("t('auth.ruleSpecial')")
     expect(source).toMatch(
       /\.auth-shell\s*\{[^}]*width:\s*100%;[^}]*max-width:\s*338px;/s,
     )
@@ -369,22 +367,6 @@ describe('VaultX crypto app contracts', () => {
     expect(testServer).toContain('function advanceCryptoCycle(')
   })
 
-  it('does not keep market and settlement workers active while disabled', () => {
-    expect(server).toContain('local function start_crypto_schedulers()')
-    expect(server).toMatch(
-      /start_crypto_schedulers\(\)[\s\S]*?if Config\.Crypto\.Enabled ~= true then\s+return/,
-    )
-    expect(server).toContain(
-      'while scheduler_generation == generation and Config.Crypto.Enabled == true do',
-    )
-    expect(server).toContain(
-      'AddEventHandler("sky_phone:configurator:serverUpdated", refresh_crypto_runtime)',
-    )
-    expect(server).not.toMatch(
-      /CreateThread\(function\(\)\s+while true do\s+Wait\(5 \* 60 \* 1000\)/,
-    )
-  })
-
   it('stores cash in price-scale minor units throughout the ledger', () => {
     expect(server).toContain(
       'local ledger_amount = amount * Config.Crypto.PriceScale',

frontend/src/views/apps/CryptoApp.vue

@@ -824,10 +824,6 @@ onUnmounted(() => {
                       :size="18"
                     /></button></template
               ></SkyField>
-              <p v-if="authMode === 'register'" class="auth-password-hint">
-                {{ t('auth.ruleLength') }} · {{ t('auth.ruleMixed') }} ·
-                {{ t('auth.ruleNumber') }} · {{ t('auth.ruleSpecial') }}
-              </p>
               <p v-if="formError" class="error">{{ formError }}</p>
               <SkyButton block large class="auth-submit" type="submit">{{
                 t(
@@ -2064,12 +2060,6 @@ onUnmounted(() => {
 .auth-form {
   gap: 12px;
 }
-.auth-password-hint {
-  margin: -3px 4px 0;
-  color: rgba(255, 255, 255, 0.58);
-  font-size: 11px;
-  line-height: 15px;
-}
 .auth-account {
   display: grid;
   grid-template-columns: 40px minmax(0, 1fr) 18px;

frontend/src/views/apps/DarkChatApp.contract.test.ts

@@ -6,14 +6,6 @@ const source = readFileSync(
   new URL('./DarkChatApp.vue', import.meta.url),
   'utf8',
 )
-const server = readFileSync(
-  new URL('../../../../sky_phone/source/server/darkchat.lua', import.meta.url),
-  'utf8',
-)
-const config = readFileSync(
-  new URL('../../../../sky_phone/config/config.lua', import.meta.url),
-  'utf8',
-)
 
 describe('DarkChatApp Sky UI contract', () => {
   it('uses first-party Sky UI without direct Konsta markup', () => {
@@ -45,17 +37,10 @@ describe('DarkChatApp Sky UI contract', () => {
     expect(newChat).toContain('class="dc-recipient-field"')
     expect(newChat).toContain('layout="inline"')
     expect(newChat).toContain('class="dc-new-chat-contacts"')
-    expect(newChat).toContain("{{ t('newChatBody') }}")
     expect(newChat).toContain("{{ phone.t('Common.cancel') }}")
     expect(newChat).not.toContain('class="dc-hero"')
   })
 
-  it('rejects the current profile identifiers before opening confirmation', () => {
-    expect(source).toContain('darkchat.profile?.darkId')
-    expect(source).toContain('darkchat.profile?.inviteCode')
-    expect(source).toContain("showToast(errorText('self_chat'))")
-  })
-
   it('keeps the search visually compact without shrinking its wrapper', () => {
     expect(source).toMatch(
       /\.dc-search :deep\(\.sky-searchbar__control\),[\s\S]*?height:\s*38px;[\s\S]*?min-height:\s*38px;/,
@@ -138,13 +123,4 @@ describe('DarkChatApp Sky UI contract', () => {
       /\.dc-inbox-navbar :deep\(\.sky-navbar__title-container > div\)\s*\{[^}]*translateY\(-14px\)/s,
     )
   })
-
-  it('cleans expired messages in bounded indexed batches', () => {
-    expect(config).toContain('CleanupBatchSize = 250')
-    expect(server).toContain('Config.DarkChat.CleanupBatchSize')
-    expect(server).toMatch(
-      /DELETE FROM `sky_phone_darkchat_messages`[\s\S]*?ORDER BY `expires_at`, `id`[\s\S]*?LIMIT \?/,
-    )
-    expect(server).toContain(']], { batch_size })')
-  })
 })

frontend/src/views/apps/DarkChatApp.vue

@@ -427,20 +427,6 @@ function closeReport(): void {
 function requestStart(value = identifier.value): void {
   const clean = value.trim()
   if (!clean) return
-  const ownIdentifiers = [
-    darkchat.profile?.darkId,
-    darkchat.profile?.inviteCode,
-  ]
-  if (
-    ownIdentifiers.some(
-      (ownIdentifier) =>
-        ownIdentifier?.toLocaleLowerCase(phone.lang) ===
-        clean.toLocaleLowerCase(phone.lang),
-    )
-  ) {
-    showToast(errorText('self_chat'))
-    return
-  }
   pendingIdentifier.value = clean
   safetyOpen.value = true
 }
@@ -1276,13 +1262,6 @@ onBeforeUnmount(() => {
   padding-top: 2px;
 }
 
-.dc-new-chat-intro {
-  margin: 2px 2px 12px;
-  color: var(--dc-muted);
-  font-size: 13px;
-  line-height: 18px;
-}
-
 .dc-recipient-field,
 .dc-new-chat-contacts {
   margin: 0 calc(var(--sky-page-gutter) * -1) 12px;
@@ -2092,7 +2071,6 @@ onBeforeUnmount(() => {
           </template>
         </SkyNavbar>
         <SkyScrollArea padded class="dc-new-chat-scroll">
-          <p class="dc-new-chat-intro">{{ t('newChatBody') }}</p>
           <SkyList class="dc-recipient-field" density="compact" flush>
             <SkyField
               :label="t('to')"

frontend/src/views/apps/MessagesApp.contract.test.ts

@@ -203,7 +203,7 @@ describe('MessagesApp Sky UI contract', () => {
     expect(sheetStart).toBeGreaterThan(-1)
     expect(sheetEnd).toBeGreaterThan(sheetStart)
     expect(sheet).toContain(
-      'activeCanMessage && !activeServiceLine && attachmentPicker !== null',
+      ':opened="activeCanMessage && attachmentPicker !== null"',
     )
     expect(sheet).toContain('swipe-to-close')
     expect(sheet).toContain('grabber-clickable')

frontend/src/views/apps/MessagesApp.vue

@@ -215,9 +215,6 @@ const activeContact = computed(() =>
 const activeCanMessage = computed(
   () => activeContact.value?.canMessage !== false,
 )
-const activeServiceLine = computed(
-  () => activeContact.value?.source === 'company',
-)
 const activeContactEmail = computed(() =>
   normalizeMailAddress(activeContact.value?.email ?? ''),
 )
@@ -258,15 +255,12 @@ const inboxMenuItems = computed(() => [
   },
 ])
 const attachmentPanelOpen = computed(
-  () =>
-    emojiOpen.value ||
-    (!activeServiceLine.value && attachmentPicker.value !== null),
+  () => emojiOpen.value || attachmentPicker.value !== null,
 )
 const composerHasContent = computed(
   () =>
-    Boolean(draft.value.trim()) ||
-    (!activeServiceLine.value &&
-      (Boolean(shareDraft.value) || pendingAttachments.value.length > 0)),
+    Boolean(draft.value.trim() || shareDraft.value) ||
+    pendingAttachments.value.length > 0,
 )
 function contactName(number: string): string {
   return (
@@ -423,8 +417,6 @@ function errorText(error?: string): string {
     'gif_provider_failed',
     'self_message',
     'recipient_not_found',
-    'messaging_unavailable',
-    'service_line_text_only',
     'no_sim',
     'rate_limited',
     'blocked',
@@ -622,7 +614,6 @@ async function callActiveContact(): Promise<void> {
 }
 
 function toggleAttachmentMenu(): void {
-  if (activeServiceLine.value) return
   attachmentMenuOpen.value = !attachmentMenuOpen.value
   emojiOpen.value = false
   attachmentPicker.value = null
@@ -655,7 +646,7 @@ function openMediaApp(
   app: 'camera' | 'photos',
   mediaType: 'photo' | 'video',
 ): void {
-  if (!messages.activeNumber || activeServiceLine.value) return
+  if (!messages.activeNumber) return
   const remainingSlots =
     MAX_PENDING_ATTACHMENTS - pendingAttachments.value.length
   if (remainingSlots < 1) {
@@ -716,14 +707,7 @@ async function sendAttachment(
   mediaAssetId: string,
   mediaDurationMs?: number,
 ): Promise<void> {
-  if (
-    !messages.activeNumber ||
-    !activeCanMessage.value ||
-    activeServiceLine.value ||
-    sending.value
-  ) {
-    return
-  }
+  if (!messages.activeNumber || !activeCanMessage.value || sending.value) return
   attachmentMenuOpen.value = false
   attachmentPicker.value = null
   sending.value = true
@@ -738,7 +722,7 @@ async function sendAttachment(
 }
 
 async function sendContact(contact: PhoneContact): Promise<void> {
-  if (!messages.activeNumber || activeServiceLine.value || sending.value) return
+  if (!messages.activeNumber || sending.value) return
   attachmentMenuOpen.value = false
   attachmentPicker.value = null
   sending.value = true
@@ -901,12 +885,7 @@ function sampleMicrophone(): void {
 }
 
 async function startVoiceRecording(): Promise<void> {
-  if (
-    !activeCanMessage.value ||
-    activeServiceLine.value ||
-    recording.value ||
-    recordingStarting.value
-  ) {
+  if (!activeCanMessage.value || recording.value || recordingStarting.value) {
     return
   }
   emojiOpen.value = false
@@ -1062,27 +1041,6 @@ watch(
   },
 )
 
-watch(activeServiceLine, (serviceLine) => {
-  if (!serviceLine) return
-  const discarded = Boolean(
-    shareDraft.value ||
-      pendingAttachments.value.length ||
-      recording.value ||
-      recordingStarting.value,
-  )
-  attachmentMenuOpen.value = false
-  attachmentPicker.value = null
-  shareDraft.value = null
-  pendingAttachments.value = []
-  if (recording.value) {
-    discardRecording = true
-    cancelVoiceRecording()
-  } else if (recordingStarting.value) {
-    cleanupRecorder()
-  }
-  if (discarded) showToast(errorText('service_line_text_only'))
-})
-
 onBeforeUnmount(() => {
   discardRecording = true
   cleanupRecorder()
@@ -1656,7 +1614,7 @@ onBeforeUnmount(() => {
     </SkyScrollArea>
 
     <section
-      v-if="activeCanMessage && !activeServiceLine && attachmentMenuOpen"
+      v-if="activeCanMessage && attachmentMenuOpen"
       class="messages-attachment-menu"
       :aria-hidden="contactDetailsOpen"
       :inert="contactDetailsOpen || undefined"
@@ -1701,9 +1659,7 @@ onBeforeUnmount(() => {
 
     <SkySheet
       class="messages-media-picker-sheet"
-      :opened="
-        activeCanMessage && !activeServiceLine && attachmentPicker !== null
-      "
+      :opened="activeCanMessage && attachmentPicker !== null"
       :aria-label="
         phone.t(
           attachmentPicker === 'contacts'
@@ -1838,7 +1794,7 @@ onBeforeUnmount(() => {
     />
 
     <div
-      v-if="activeCanMessage && !activeServiceLine && shareDraft && !recording"
+      v-if="activeCanMessage && shareDraft && !recording"
       class="shared-composer-preview"
       :aria-hidden="contactDetailsOpen"
       :inert="contactDetailsOpen || undefined"
@@ -1854,7 +1810,7 @@ onBeforeUnmount(() => {
     </div>
 
     <section
-      v-if="activeCanMessage && !activeServiceLine && recording"
+      v-if="activeCanMessage && recording"
       class="messages-recorder"
       :aria-hidden="contactDetailsOpen"
       :inert="contactDetailsOpen || undefined"
@@ -1942,7 +1898,6 @@ onBeforeUnmount(() => {
 
       <div class="messages-sky-composer-row">
         <SkyGlass
-          v-if="!activeServiceLine"
           component="button"
           type="button"
           class="messages-sky-messagebar__action messages-sky-messagebar__plus"
@@ -1979,7 +1934,7 @@ onBeforeUnmount(() => {
                 <ArrowUpCircle :size="29" :stroke-width="2.4" />
               </SkyLink>
               <SkyLink
-                v-else-if="!activeServiceLine"
+                v-else
                 icon-only
                 class="messages-sky-messagebar__send"
                 :disabled="sending || recordingStarting"

frontend/src/views/apps/PhoneApp.contract.test.ts

@@ -16,12 +16,6 @@ describe('PhoneApp EasyShare contract', () => {
   it('uses the shared full-width Sky tab bar for phone sections', () => {
     expect(source).toContain('<sky-tab-bar')
     expect(source).toContain('<sky-tab-button')
-    expect(source).toContain(
-      'calc(var(--sky-tabbar-height) + var(--sky-safe-area-bottom) + 16px);',
-    )
-    expect(source).not.toMatch(
-      /\.phone-contacts\s*\{[^}]*padding-bottom:\s*20px;/s,
-    )
   })
 
   it('uses shared interactive liquid glass surfaces for phone controls', () => {
@@ -63,21 +57,6 @@ describe('PhoneApp EasyShare contract', () => {
     expect(source).not.toContain('rgba(10, 132, 255')
   })
 
-  it('keeps contact profiles readable in light mode', () => {
-    expect(source).toMatch(
-      /\.phone-app--light\.phone-calls-app--profile\s*\{[^}]*color:\s*var\(--sky-text\);[^}]*background:\s*var\(--sky-bg\) !important;/s,
-    )
-    expect(source).toMatch(
-      /\.phone-app--light \.phone-profile-action\s*\{[^}]*color:\s*var\(--sky-text\) !important;/s,
-    )
-    expect(source).toMatch(
-      /\.phone-app--light \.phone-profile-action:disabled\s*\{[^}]*color:\s*var\(--sky-subtle\) !important;/s,
-    )
-    expect(source).toMatch(
-      /\.phone-app--light \.phone-profile-card,[\s\S]*?\.phone-app--light \.phone-history-card\s*\{[^}]*color:\s*var\(--sky-text\);[^}]*background:\s*var\(--sky-glass\);/,
-    )
-  })
-
   it('opens contact deep links only after contacts bootstrap and consumes the query', () => {
     const mounted = source.slice(
       source.indexOf('onMounted(async () => {'),

frontend/src/views/apps/PhoneApp.vue

@@ -2250,6 +2250,7 @@ onBeforeUnmount(() => {
   position: relative;
   padding-top: 6px;
   padding-right: 24px;
+  padding-bottom: 20px;
 }
 
 .phone-contacts-header {
@@ -3858,63 +3859,6 @@ onBeforeUnmount(() => {
   background: var(--sky-glass);
 }
 
-.phone-app--light.phone-calls-app--profile {
-  color: var(--sky-text);
-  background: var(--sky-bg) !important;
-}
-
-.phone-app--light .phone-call-content--profile,
-.phone-app--light .phone-contact-hero h2,
-.phone-app--light .phone-detail-header-button,
-.phone-app--light .phone-detail-edit {
-  color: var(--sky-text);
-}
-
-.phone-app--light .phone-contact-hero .phone-contact-organization,
-.phone-app--light .phone-profile-notes > p,
-.phone-app--light .phone-history-copy small,
-.phone-app--light .phone-history-row time,
-.phone-app--light .phone-history-empty {
-  color: var(--sky-muted);
-}
-
-.phone-app--light .phone-profile-action {
-  color: var(--sky-text) !important;
-}
-
-.phone-app--light .phone-profile-action:disabled {
-  color: var(--sky-subtle) !important;
-}
-
-.phone-app--light .phone-profile-card,
-.phone-app--light .phone-own-profile-card,
-.phone-app--light .phone-history-card {
-  border-color: var(--sky-hairline);
-  color: var(--sky-text);
-  background: var(--sky-glass);
-  box-shadow: var(--sky-shadow-glass);
-}
-
-.phone-app--light .phone-own-profile-card > div:not(:last-child),
-.phone-app--light .phone-profile-info-card > button,
-.phone-app--light .phone-profile-options-card > button,
-.phone-app--light .phone-profile-single-option > button,
-.phone-app--light .phone-profile-notes,
-.phone-app--light .phone-history-row {
-  border-color: var(--sky-hairline);
-}
-
-.phone-app--light .phone-own-profile-card > div > span {
-  color: var(--sky-text);
-  background: var(--sky-pressed);
-}
-
-.phone-app--light .phone-profile-info-card > button > svg,
-.phone-app--light .phone-profile-notes > span,
-.phone-app--light .phone-history-card h3 {
-  color: var(--sky-text);
-}
-
 .phone-app--light .phone-bottom-tabbar {
   --sky-app-accent: #3a3a3c;
 }

frontend/src/views/apps/SkyRideApp.contract.test.ts

@@ -18,11 +18,6 @@ describe('SkyRide app layout', () => {
     expect(source).toContain('skyride-history-card__distance')
   })
 
-  it('explains that requests require an online player driver', () => {
-    expect(source).toContain("phone.t('Apps.skyride.playerDriverNotice')")
-    expect(source).toContain('class="skyride-player-driver-notice"')
-  })
-
   it('aligns rider and activity surfaces to one content width', () => {
     expect(source).toMatch(
       /\.skyride-location-list,\s*\.skyride-activity-list\s*\{[^}]*margin-inline:\s*2px !important;/s,
@@ -32,52 +27,6 @@ describe('SkyRide app layout', () => {
     )
   })
 
-  it('scrolls Ride and Drive away without full-width nav backgrounds', () => {
-    expect(source).toMatch(
-      /\.skyride-navbar :deep\(\.sky-navbar__blur\),\s*\.skyride-navbar :deep\(\.sky-navbar__background\)\s*\{[^}]*display:\s*none;/s,
-    )
-    expect(source).toMatch(
-      /<div class="skyride-scroll">\s*<div class="skyride-mode">/s,
-    )
-    expect(source).toMatch(
-      /\.skyride-scroll\s*\{[^}]*box-sizing:\s*border-box;[^}]*inset:\s*114px 0 0;[^}]*padding:\s*0 0 116px;/s,
-    )
-    expect(source).toMatch(
-      /\.skyride-tabbar :deep\(\.sky-tabbar__blur\),\s*\.skyride-tabbar :deep\(\.sky-tabbar__background\)\s*\{[^}]*display:\s*none;/s,
-    )
-    expect(source).not.toMatch(
-      /\.skyride-tabbar :deep\(\.sky-tabbar__pane\)\s*\{\s*border:/s,
-    )
-  })
-
-  it('keeps active-ride card spacing even and outline actions contrasted', () => {
-    expect(source).toMatch(
-      /\.skyride-ride-status-card\s*\{[^}]*margin-bottom:\s*12px;/s,
-    )
-    expect(source).toMatch(
-      /\.skyride-person-card\s*\{[^}]*margin-bottom:\s*12px;/s,
-    )
-    expect(source).toMatch(
-      /\.skyride-trip-card\s*\{[^}]*margin-bottom:\s*12px;/s,
-    )
-    expect(source).toContain('.sky-button--primary:not(.sky-button--outline)')
-    expect(source).not.toMatch(
-      /\.skyride-app :deep\(\.sky-button--primary\)\s*\{/,
-    )
-  })
-
-  it('aligns pickup and destination text to one timeline axis', () => {
-    expect(source).toMatch(
-      /\.skyride-route-stop\s*\{[^}]*grid-template-columns:\s*18px minmax\(0, 1fr\);/s,
-    )
-    expect(source).toMatch(
-      /\.skyride-route-stop > \.skyride-dot\s*\{[^}]*justify-self:\s*center;/s,
-    )
-    expect(source).toMatch(
-      /\.skyride-trip-card > i\s*\{[^}]*margin:\s*1px 0 1px 8px;/s,
-    )
-  })
-
   it('uses a compact swipeable profile editor with equal actions', () => {
     expect(source).toContain('class="skyride-profile-sheet"')
     expect(source).toContain('swipe-to-close')

frontend/src/views/apps/SkyRideApp.vue

@@ -622,26 +622,26 @@ onBeforeUnmount(() => {
     </k-card>
 
     <template v-else>
-      <div class="skyride-scroll">
-        <div class="skyride-mode">
-          <k-segmented v-if="skyride.driverEligible">
-            <k-segmented-button
-              :active="mode === 'rider'"
-              :disabled="Boolean(skyride.activeRide)"
-              @click="mode = 'rider'"
-            >
-              {{ phone.t('Apps.skyride.mode.rider') }}
-            </k-segmented-button>
-            <k-segmented-button
-              :active="mode === 'driver'"
-              :disabled="Boolean(skyride.activeRide)"
-              @click="mode = 'driver'"
-            >
-              {{ phone.t('Apps.skyride.mode.driver') }}
-            </k-segmented-button>
-          </k-segmented>
-        </div>
+      <div class="skyride-mode">
+        <k-segmented v-if="skyride.driverEligible">
+          <k-segmented-button
+            :active="mode === 'rider'"
+            :disabled="Boolean(skyride.activeRide)"
+            @click="mode = 'rider'"
+          >
+            {{ phone.t('Apps.skyride.mode.rider') }}
+          </k-segmented-button>
+          <k-segmented-button
+            :active="mode === 'driver'"
+            :disabled="Boolean(skyride.activeRide)"
+            @click="mode = 'driver'"
+          >
+            {{ phone.t('Apps.skyride.mode.driver') }}
+          </k-segmented-button>
+        </k-segmented>
+      </div>
 
+      <div class="skyride-scroll">
         <template v-if="activeTab === 'home'">
           <section v-if="mode === 'rider'" class="skyride-home-panel">
             <template v-if="!skyride.activeRide">
@@ -848,9 +848,6 @@ onBeforeUnmount(() => {
                     </k-button>
                   </div>
                 </k-card>
-                <p class="skyride-player-driver-notice">
-                  {{ phone.t('Apps.skyride.playerDriverNotice') }}
-                </p>
                 <k-button
                   large
                   rounded
@@ -1816,11 +1813,6 @@ onBeforeUnmount(() => {
   color: var(--ride-text);
 }
 
-.skyride-navbar :deep(.sky-navbar__blur),
-.skyride-navbar :deep(.sky-navbar__background) {
-  display: none;
-}
-
 .skyride-navbar :deep(.sky-navbar__title) {
   color: var(--ride-text);
   font-size: 18px;
@@ -1858,9 +1850,7 @@ onBeforeUnmount(() => {
 .skyride-scroll {
   position: absolute;
   z-index: 2;
-  box-sizing: border-box;
-  inset: 114px 0 0;
-  padding: 0 0 116px;
+  inset: 148px 0 116px;
   overflow-x: hidden;
   overflow-y: auto;
   overscroll-behavior: contain;
@@ -2119,13 +2109,6 @@ onBeforeUnmount(() => {
   font-weight: 650;
 }
 
-.skyride-player-driver-notice {
-  margin: 2px 7px 8px;
-  color: var(--ride-muted);
-  font-size: 12px;
-  line-height: 17px;
-}
-
 .skyride-primary :deep(svg) {
   margin-left: 4px;
 }
@@ -2260,10 +2243,6 @@ onBeforeUnmount(() => {
   padding: 16px;
 }
 
-.skyride-person-card {
-  margin-bottom: 12px;
-}
-
 .skyride-avatar,
 .skyride-profile-avatar {
   display: grid;
@@ -2340,19 +2319,13 @@ onBeforeUnmount(() => {
 }
 
 .skyride-route-stop {
-  display: grid;
-  grid-template-columns: 18px minmax(0, 1fr);
+  display: flex;
   align-items: center;
-  column-gap: 11px;
-}
-
-.skyride-route-stop > .skyride-dot {
-  justify-self: center;
+  gap: 11px;
 }
 
 .skyride-route-stop > svg {
-  width: 18px;
-  height: 18px;
+  flex: 0 0 18px;
   color: var(--ride-accent-strong);
 }
 
@@ -2383,7 +2356,7 @@ onBeforeUnmount(() => {
   display: block;
   width: 1px;
   height: 17px;
-  margin: 1px 0 1px 8px;
+  margin: 1px 0 1px 5px;
   border-left: 1px dashed var(--ride-muted);
 }
 
@@ -2708,11 +2681,6 @@ button.skyride-profile-avatar--editable {
   gap: 0 !important;
 }
 
-.skyride-tabbar :deep(.sky-tabbar__blur),
-.skyride-tabbar :deep(.sky-tabbar__background) {
-  display: none;
-}
-
 .skyride-tab-pane {
   width: 100% !important;
   max-width: none !important;
@@ -2991,7 +2959,7 @@ button.skyride-profile-avatar--editable {
   background-color: var(--ride-accent);
 }
 
-.skyride-app :deep(.sky-button--primary:not(.sky-button--outline)) {
+.skyride-app :deep(.sky-button--primary) {
   color: #171719;
 }
 

frontend/src/views/apps/SkyUiApps.contract.test.ts

@@ -93,7 +93,7 @@ describe('phone apps use Sky UI', () => {
 
   it('uses shared liquid glass for remaining compact interaction controls', () => {
     const minimumGlassButtons: Record<string, number> = {
-      'CameraApp.vue': 1,
+      'CameraApp.vue': 2,
       'FeatherApp.vue': 2,
       'FlareApp.vue': 1,
       'FlipTokApp.vue': 2,

frontend/src/voiceProviders.contract.test.ts

@@ -116,20 +116,6 @@ describe('voice provider contracts', () => {
     expect(phoneApp).not.toContain('callMuted = !callMuted')
   })
 
-  it('supports explicit automatic call-provider discovery on client and server', () => {
-    expect(config).toContain(
-      'VoiceProvider = "pma", -- auto, yaca (alias: yaca-voice)',
-    )
-    expect(clientCalls).toContain('if configured == "auto" then')
-    expect(serverVoice).toContain('if configured == "auto" then')
-    expect(clientCalls).toContain(
-      'for _, candidate in ipairs({ "yaca", "pma", "saltychat" }) do',
-    )
-    expect(serverVoice).toContain(
-      'for _, candidate in ipairs({ "yaca", "pma", "saltychat" }) do',
-    )
-  })
-
   it('passes Yaca radio volume arguments in the documented order', () => {
     expect(clientRadio).toContain(
       'changeRadioChannelVolumeRaw(volume / 100, 1)',

frontend/testserver/configurator-fixture.cjs

@@ -1,730 +0,0 @@
-const { readFileSync } = require('node:fs')
-const { resolve } = require('node:path')
-
-class LuaTable {
-  constructor() {
-    this.entries = []
-    this.nextArrayIndex = 1
-  }
-
-  get(key) {
-    return this.entries.find((entry) => entry.key === key)?.value
-  }
-
-  set(key, value) {
-    const entry = this.entries.find((candidate) => candidate.key === key)
-    if (entry) entry.value = value
-    else this.entries.push({ key, value })
-  }
-}
-
-function tokenize(source) {
-  const tokens = []
-  let index = 0
-
-  while (index < source.length) {
-    const character = source[index]
-    if (/\s/.test(character)) {
-      index += 1
-      continue
-    }
-    if (source.startsWith('--[[', index)) {
-      const end = source.indexOf(']]', index + 4)
-      index = end < 0 ? source.length : end + 2
-      continue
-    }
-    if (source.startsWith('--', index)) {
-      const end = source.indexOf('\n', index + 2)
-      index = end < 0 ? source.length : end + 1
-      continue
-    }
-    if (character === '"' || character === "'") {
-      const quote = character
-      let value = ''
-      index += 1
-      while (index < source.length && source[index] !== quote) {
-        if (source[index] !== '\\') {
-          value += source[index]
-          index += 1
-          continue
-        }
-
-        index += 1
-        const escaped = source[index]
-        const escapeValues = {
-          a: '\u0007',
-          b: '\b',
-          f: '\f',
-          n: '\n',
-          r: '\r',
-          t: '\t',
-          v: '\u000b',
-        }
-        value += escapeValues[escaped] ?? escaped
-        index += 1
-      }
-      if (source[index] !== quote)
-        throw new Error('Unterminated Lua string in configurator fixture.')
-      index += 1
-      tokens.push({ type: 'string', value })
-      continue
-    }
-    if (/[A-Za-z_]/.test(character)) {
-      const match = source.slice(index).match(/^[A-Za-z_][A-Za-z0-9_]*/)
-      tokens.push({ type: 'name', value: match[0] })
-      index += match[0].length
-      continue
-    }
-    if (
-      /\d/.test(character) ||
-      (character === '.' && /\d/.test(source[index + 1]))
-    ) {
-      const match = source
-        .slice(index)
-        .match(/^(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?/)
-      tokens.push({ type: 'number', value: Number(match[0]) })
-      index += match[0].length
-      continue
-    }
-
-    tokens.push({ type: 'symbol', value: character })
-    index += 1
-  }
-
-  return tokens
-}
-
-class LuaConfigParser {
-  constructor(source) {
-    this.tokens = tokenize(source)
-    this.index = 0
-    this.config = new LuaTable()
-  }
-
-  current(offset = 0) {
-    return this.tokens[this.index + offset]
-  }
-
-  matches(value, offset = 0) {
-    return this.current(offset)?.value === value
-  }
-
-  take(value) {
-    const token = this.current()
-    if (!token || (value !== undefined && token.value !== value)) {
-      throw new Error(
-        `Expected '${value}', received '${token?.value ?? 'end of file'}' in configurator fixture.`,
-      )
-    }
-    this.index += 1
-    return token
-  }
-
-  parse() {
-    while (this.current()) {
-      if (this.matches('Config')) {
-        const start = this.index
-        const path = this.parsePath()
-        if (path.length && this.matches('=')) {
-          this.take('=')
-          this.setPath(path, this.parseExpression())
-          continue
-        }
-        this.index = start + 1
-        continue
-      }
-      this.index += 1
-    }
-    return this.config
-  }
-
-  parsePath() {
-    this.take('Config')
-    const path = []
-    while (this.matches('.') && this.current(1)?.type === 'name') {
-      this.take('.')
-      path.push(this.take().value)
-    }
-    return path
-  }
-
-  getPath(path) {
-    let value = this.config
-    for (const key of path) {
-      if (!(value instanceof LuaTable)) return undefined
-      value = value.get(key)
-    }
-    return value
-  }
-
-  setPath(path, value) {
-    let parent = this.config
-    for (let index = 0; index < path.length - 1; index += 1) {
-      const key = path[index]
-      let child = parent.get(key)
-      if (!(child instanceof LuaTable)) {
-        child = new LuaTable()
-        parent.set(key, child)
-      }
-      parent = child
-    }
-    parent.set(path.at(-1), value)
-  }
-
-  parseExpression() {
-    return this.parseOr()
-  }
-
-  parseOr() {
-    let value = this.parseAdditive()
-    while (this.matches('or')) {
-      this.take('or')
-      const fallback = this.parseAdditive()
-      value =
-        value !== false && value !== null && value !== undefined
-          ? value
-          : fallback
-    }
-    return value
-  }
-
-  parseAdditive() {
-    let value = this.parseMultiplicative()
-    while (this.matches('+') || this.matches('-')) {
-      const operator = this.take().value
-      const right = this.parseMultiplicative()
-      value =
-        operator === '+'
-          ? Number(value) + Number(right)
-          : Number(value) - Number(right)
-    }
-    return value
-  }
-
-  parseMultiplicative() {
-    let value = this.parseUnary()
-    while (this.matches('*') || this.matches('/')) {
-      const operator = this.take().value
-      const right = this.parseUnary()
-      value =
-        operator === '*'
-          ? Number(value) * Number(right)
-          : Number(value) / Number(right)
-    }
-    return value
-  }
-
-  parseUnary() {
-    if (this.matches('-')) {
-      this.take('-')
-      return -Number(this.parseUnary())
-    }
-    return this.parsePrimary()
-  }
-
-  parsePrimary() {
-    const token = this.current()
-    if (!token)
-      throw new Error(
-        'Unexpected end of Lua configuration in configurator fixture.',
-      )
-    if (token.type === 'number' || token.type === 'string') {
-      this.index += 1
-      return token.value
-    }
-    if (this.matches('true') || this.matches('false') || this.matches('nil')) {
-      this.index += 1
-      return token.value === 'true'
-        ? true
-        : token.value === 'false'
-          ? false
-          : null
-    }
-    if (this.matches('{')) return this.parseTable()
-    if (this.matches('(')) {
-      this.take('(')
-      const value = this.parseExpression()
-      this.take(')')
-      return value
-    }
-    if (this.matches('Config')) return this.getPath(this.parsePath())
-    if (token.type === 'name' && this.current(1)?.value === '(') {
-      const name = this.take().value
-      this.take('(')
-      const argumentsList = []
-      while (!this.matches(')')) {
-        argumentsList.push(this.parseExpression())
-        if (!this.matches(',')) break
-        this.take(',')
-      }
-      this.take(')')
-      if (/^vector[234]$/.test(name)) {
-        const axes = ['x', 'y', 'z', 'w']
-        return Object.fromEntries([
-          ['__skyType', name],
-          ...argumentsList.map((value, index) => [axes[index], value]),
-        ])
-      }
-      throw new Error(`Unsupported Lua call '${name}' in configurator fixture.`)
-    }
-
-    throw new Error(
-      `Unsupported Lua token '${token.value}' in configurator fixture.`,
-    )
-  }
-
-  parseTable() {
-    const table = new LuaTable()
-    this.take('{')
-    while (!this.matches('}')) {
-      if (this.matches('[')) {
-        this.take('[')
-        const key = this.parseExpression()
-        this.take(']')
-        this.take('=')
-        table.set(key, this.parseExpression())
-      } else if (
-        this.current()?.type === 'name' &&
-        this.current(1)?.value === '='
-      ) {
-        const key = this.take().value
-        this.take('=')
-        table.set(key, this.parseExpression())
-      } else {
-        table.set(table.nextArrayIndex, this.parseExpression())
-        table.nextArrayIndex += 1
-      }
-
-      if (this.matches(',') || this.matches(';')) this.index += 1
-      else if (!this.matches('}')) {
-        throw new Error(
-          `Expected a Lua table separator, received '${this.current()?.value ?? 'end of file'}'.`,
-        )
-      }
-    }
-    this.take('}')
-    return table
-  }
-}
-
-function serializeLuaValue(value) {
-  if (!(value instanceof LuaTable)) {
-    if (Array.isArray(value)) return value.map(serializeLuaValue)
-    if (value && typeof value === 'object') {
-      return Object.fromEntries(
-        Object.entries(value).map(([key, child]) => [
-          key,
-          serializeLuaValue(child),
-        ]),
-      )
-    }
-    return value
-  }
-
-  const numericKeys = value.entries
-    .filter((entry) => typeof entry.key === 'number')
-    .map((entry) => entry.key)
-    .sort((left, right) => left - right)
-  const isSequence =
-    numericKeys.length === value.entries.length &&
-    numericKeys.every((key, index) => key === index + 1)
-  if (isSequence) {
-    return [...value.entries]
-      .sort((left, right) => left.key - right.key)
-      .map((entry) => serializeLuaValue(entry.value))
-  }
-  if (value.entries.every((entry) => typeof entry.key === 'string')) {
-    return Object.fromEntries(
-      value.entries.map((entry) => [entry.key, serializeLuaValue(entry.value)]),
-    )
-  }
-
-  return {
-    __skyType: 'map',
-    entries: value.entries.map((entry) => ({
-      key: entry.key,
-      keyType: typeof entry.key,
-      value: serializeLuaValue(entry.value),
-    })),
-  }
-}
-
-function humanize(value) {
-  return String(value ?? '')
-    .replace(/[_-]+/g, ' ')
-    .replace(/([a-z])([A-Z])/g, '$1 $2')
-    .replace(/([A-Za-z])(\d)/g, '$1 $2')
-    .replace(/^./, (character) => character.toUpperCase())
-}
-
-function sensitivePath(path) {
-  const leaf = path.split('.').at(-1) ?? path
-  const normalized = leaf.toLowerCase().replace(/[^a-z0-9]/g, '')
-  return (
-    normalized.includes('apikey') ||
-    normalized.includes('secret') ||
-    normalized.includes('pepper') ||
-    [
-      'password',
-      'token',
-      'authorization',
-      'credential',
-      'connectionstring',
-    ].includes(normalized)
-  )
-}
-
-function maskValue(value, path) {
-  if (Array.isArray(value))
-    return value.map((child, index) => maskValue(child, `${path}.${index + 1}`))
-  if (value?.__skyType === 'map' && Array.isArray(value.entries)) {
-    return {
-      __skyType: 'map',
-      entries: value.entries.map((entry) => ({
-        key: entry.key,
-        keyType: entry.keyType,
-        value: maskValue(entry.value, `${path}.${entry.key}`),
-      })),
-    }
-  }
-  if (value && typeof value === 'object') {
-    return Object.fromEntries(
-      Object.entries(value).map(([key, child]) => [
-        key,
-        maskValue(child, `${path}.${key}`),
-      ]),
-    )
-  }
-  return typeof value === 'string' && sensitivePath(path)
-    ? '***REDACTED***'
-    : value
-}
-
-function emptyStructure(scope, path) {
-  if (scope !== 'config') return undefined
-  if (path === 'Garage.VehicleImages.ModelNames') {
-    return {
-      entries: [],
-      keyType: 'number',
-      kind: 'map',
-      template: { kind: 'value', valueType: 'string' },
-    }
-  }
-  if (
-    path === 'CrewLink.ExternalPingResources' ||
-    path === 'CustomApps.TrustedAdapters'
-  ) {
-    return {
-      fields: {},
-      kind: 'table',
-      mutableKeys: true,
-      template: { kind: 'value', valueType: 'boolean' },
-    }
-  }
-  if (path === 'FlipTok.MusicTracks') {
-    return {
-      items: [],
-      kind: 'list',
-      template: {
-        fields: {
-          Artist: { kind: 'value', valueType: 'string' },
-          Id: { kind: 'value', valueType: 'string' },
-          Title: { kind: 'value', valueType: 'string' },
-          Url: { kind: 'value', valueType: 'string' },
-        },
-        kind: 'table',
-      },
-    }
-  }
-  if (path === 'Music.Tracks') {
-    return {
-      items: [],
-      kind: 'list',
-      template: {
-        fields: {
-          Artist: { kind: 'value', valueType: 'string' },
-          Id: { kind: 'value', valueType: 'string' },
-          Title: { kind: 'value', valueType: 'string' },
-        },
-        kind: 'table',
-      },
-    }
-  }
-  if (path === 'Payphones.CustomLocations') {
-    return {
-      items: [],
-      kind: 'list',
-      template: { kind: 'vector', vectorType: 'vector4' },
-    }
-  }
-  if (/^Companies\.Definitions\.[^.]+\.Services$/.test(path)) {
-    return {
-      items: [],
-      kind: 'list',
-      template: {
-        fields: {
-          Description: { kind: 'value', valueType: 'string' },
-          Id: { kind: 'value', valueType: 'string' },
-          Price: { kind: 'value', valueType: 'string' },
-          RequestsEnabled: { kind: 'value', valueType: 'boolean' },
-          Title: { kind: 'value', valueType: 'string' },
-        },
-        kind: 'table',
-      },
-    }
-  }
-  return undefined
-}
-
-function companyDefinitionEntryDefault(definitions) {
-  const firstDefinition = definitions[Object.keys(definitions).sort()[0]]
-  const usedNumbers = new Set(
-    Object.values(definitions).map((definition) =>
-      String(definition.ServiceLine.Number).replace(/\D/g, ''),
-    ),
-  )
-  let serviceNumber = ''
-  for (let offset = 0; offset < 999; offset += 1) {
-    const candidate = String(((499 + offset) % 999) + 1).padStart(3, '0')
-    if (!usedNumbers.has(candidate)) {
-      serviceNumber = candidate
-      break
-    }
-  }
-  return {
-    AcceptsRequests: true,
-    Address: '',
-    Category: firstDefinition.Category,
-    DefaultAvailability: 'closed',
-    Description: '',
-    District: '',
-    Emergency: false,
-    Icon: 'building',
-    Job: '',
-    Location: { __skyType: 'vector3', x: 0, y: 0, z: 0 },
-    LocationLabel: '',
-    LogoUrl: 'https://picsum.photos/seed/companies-new-logo/180/180',
-    Name: '',
-    Permissions: {
-      Announcement: 0,
-      Assign: 0,
-      Availability: 0,
-      Hours: 0,
-      Profile: 0,
-      Services: 0,
-      WorkQueue: 0,
-    },
-    Public: true,
-    ServiceLine: {
-      AutoContact: true,
-      CanCall: true,
-      CanMessage: false,
-      MinimumGrade: 0,
-      Number: serviceNumber,
-      Routing: 'round_robin',
-    },
-    Services: [
-      {
-        Description: '',
-        Id: '',
-        Price: '',
-        RequestsEnabled: true,
-        Title: '',
-      },
-    ],
-    Verified: false,
-  }
-}
-
-function buildStructure(value, scope, path) {
-  if (scope === 'config' && path === 'Phone.Keybind') {
-    return { kind: 'optionalString' }
-  }
-  if (
-    scope === 'config' &&
-    path === 'Companies.Definitions' &&
-    value !== null &&
-    typeof value === 'object' &&
-    !Array.isArray(value)
-  ) {
-    const keys = Object.keys(value).sort()
-    const fields = Object.fromEntries(
-      keys.map((key) => [
-        key,
-        buildStructure(value[key], scope, `${path}.${key}`),
-      ]),
-    )
-    return {
-      entryDefault: companyDefinitionEntryDefault(value),
-      fields,
-      kind: 'table',
-      mutableKeys: true,
-      template: keys[0] ? fields[keys[0]] : undefined,
-    }
-  }
-  const configuredEmptyStructure =
-    Array.isArray(value) && value.length === 0
-      ? emptyStructure(scope, path)
-      : undefined
-  if (configuredEmptyStructure) {
-    return configuredEmptyStructure
-  }
-  if (Array.isArray(value)) {
-    const items = value.map((child, index) =>
-      buildStructure(child, scope, `${path}.${index + 1}`),
-    )
-    return {
-      kind: 'list',
-      items,
-      template: items[0],
-    }
-  }
-  if (value?.__skyType === 'map' && Array.isArray(value.entries)) {
-    const entries = value.entries.map((entry) => ({
-      key: entry.key,
-      keyType: entry.keyType,
-      structure: buildStructure(entry.value, scope, `${path}.${entry.key}`),
-    }))
-    const keyTypes = new Set(entries.map((entry) => entry.keyType))
-    return {
-      kind: 'map',
-      entries,
-      keyType: keyTypes.size === 1 ? entries[0]?.keyType : undefined,
-      template: entries[0]?.structure,
-    }
-  }
-  if (/^vector[234]$/.test(value?.__skyType ?? '')) {
-    return { kind: 'vector', vectorType: value.__skyType }
-  }
-  if (value !== null && typeof value === 'object') {
-    return {
-      kind: 'table',
-      fields: Object.fromEntries(
-        Object.entries(value).map(([key, child]) => [
-          key,
-          buildStructure(child, scope, `${path}.${key}`),
-        ]),
-      ),
-    }
-  }
-  return { kind: 'value', valueType: typeof value }
-}
-
-function addField(fields, scope, path, value) {
-  const valueType = Array.isArray(value) ? 'json' : typeof value
-  const sensitive = typeof value === 'string' && sensitivePath(path)
-  fields.push({
-    configured: sensitive ? value !== '' : undefined,
-    label:
-      scope === 'config' && path === 'Companies.Definitions'
-        ? 'Jobs'
-        : humanize(path.split('.').at(-1)),
-    path,
-    scope,
-    sensitive,
-    structure:
-      value !== null && typeof value === 'object'
-        ? buildStructure(value, scope, path)
-        : undefined,
-    type:
-      scope === 'config' && path === 'Phone.Keybind'
-        ? 'stringOrFalse'
-        : value !== null && typeof value === 'object'
-          ? 'json'
-          : valueType,
-    value: sensitive ? '' : maskValue(value, path),
-  })
-}
-
-function flattenCompanyFields(fields, path, value) {
-  if (
-    path === 'Companies.Definitions' ||
-    value === null ||
-    typeof value !== 'object' ||
-    Array.isArray(value) ||
-    value.__skyType ||
-    Object.keys(value).length === 0
-  ) {
-    addField(fields, 'config', path, value)
-    return
-  }
-
-  for (const key of Object.keys(value).sort()) {
-    flattenCompanyFields(fields, `${path}.${key}`, value[key])
-  }
-}
-
-function buildSections(scope, payload) {
-  const sections = []
-  const generalFields = []
-  for (const key of Object.keys(payload).sort()) {
-    const value = payload[key]
-    if (scope === 'config' && key === 'Companies') {
-      const fields = []
-      flattenCompanyFields(fields, 'Companies', value)
-      fields.sort((left, right) => {
-        if (left.path === 'Companies.Definitions') return 1
-        if (right.path === 'Companies.Definitions') return -1
-        return left.path.localeCompare(right.path)
-      })
-      sections.push({
-        fields,
-        id: 'config:Companies',
-        label: humanize(key),
-        scope,
-      })
-    } else if (
-      value !== null &&
-      typeof value === 'object' &&
-      !Array.isArray(value) &&
-      !value.__skyType &&
-      Object.keys(value).length > 0
-    ) {
-      const fields = []
-      addField(fields, scope, key, value)
-      sections.push({
-        fields,
-        id: `${scope}:${key}`,
-        label: humanize(key),
-        scope,
-      })
-    } else {
-      addField(generalFields, scope, key, value)
-    }
-  }
-  if (generalFields.length) {
-    const general = {
-      fields: generalFields,
-      id: `${scope}:general`,
-      label: 'General',
-      scope,
-    }
-    if (scope === 'config') sections.unshift(general)
-    else sections.push(general)
-  }
-  return sections
-}
-
-function loadConfiguratorSections() {
-  const resourceRoot = resolve(__dirname, '../..')
-  const config = serializeLuaValue(
-    new LuaConfigParser(
-      readFileSync(
-        resolve(resourceRoot, 'sky_phone/config/config.lua'),
-        'utf8',
-      ),
-    ).parse(),
-  )
-  const mediaRoot = serializeLuaValue(
-    new LuaConfigParser(
-      readFileSync(resolve(resourceRoot, 'sky_phone/config/media.lua'), 'utf8'),
-    ).parse(),
-  )
-  const media = mediaRoot.Media
-  delete config.PhoneConfigurator
-  delete config.CommandPermissions
-  delete config.Media
-  return [...buildSections('config', config), ...buildSections('media', media)]
-}
-
-module.exports = { loadConfiguratorSections }

frontend/testserver/configurator-fixture.test.ts

@@ -1,257 +0,0 @@
-import { readFileSync } from 'node:fs'
-import { createRequire } from 'node:module'
-
-import { describe, expect, it } from 'vitest'
-
-type ConfiguratorField = {
-  label: string
-  path: string
-  structure?: ConfiguratorStructure
-  type: string
-  value: unknown
-}
-
-type ConfiguratorStructure = {
-  entryDefault?: unknown
-  entries?: Array<{ structure: ConfiguratorStructure }>
-  fields?: Record<string, ConfiguratorStructure>
-  items?: ConfiguratorStructure[]
-  keyType?: 'number' | 'string'
-  kind: string
-  mutableKeys?: boolean
-  template?: ConfiguratorStructure
-}
-
-type ConfiguratorSection = {
-  fields: ConfiguratorField[]
-  id: string
-  scope: 'config' | 'media'
-}
-
-const require = createRequire(import.meta.url)
-const { loadConfiguratorSections } = require('./configurator-fixture.cjs') as {
-  loadConfiguratorSections: () => ConfiguratorSection[]
-}
-
-const configSource = readFileSync(
-  new URL('../../sky_phone/config/config.lua', import.meta.url),
-  'utf8',
-)
-
-function countStructure(structure: ConfiguratorStructure | undefined): number {
-  if (!structure) return 1
-  if (structure.fields) {
-    return Object.values(structure.fields).reduce(
-      (total, field) => total + countStructure(field),
-      0,
-    )
-  }
-  if (structure.items) {
-    return structure.items.reduce(
-      (total, item) => total + countStructure(item),
-      0,
-    )
-  }
-  if (structure.entries) {
-    return structure.entries.reduce(
-      (total, entry) => total + countStructure(entry.structure),
-      0,
-    )
-  }
-  return 1
-}
-
-describe('admin configurator fixture', () => {
-  it('exposes every SQL-managed config.lua root through the full live preview', () => {
-    const sections = loadConfiguratorSections()
-    const fields = sections.flatMap((section) => section.fields)
-    const roots = [
-      ...configSource.matchAll(/^\s{0,4}Config\.([A-Za-z0-9_]+)\s*=/gm),
-    ]
-      .map((match) => match[1])
-      .filter(
-        (root) =>
-          root !== 'Media' &&
-          root !== 'PhoneConfigurator' &&
-          root !== 'CommandPermissions',
-      )
-
-    expect(sections).toHaveLength(46)
-    expect(
-      fields.reduce(
-        (total, field) => total + countStructure(field.structure),
-        0,
-      ),
-    ).toBeGreaterThan(700)
-    for (const root of new Set(roots)) {
-      expect(
-        sections.some(
-          (section) =>
-            section.id === `config:${root}` ||
-            section.fields.some(
-              (field) =>
-                field.path === root || field.path.startsWith(`${root}.`),
-            ),
-        ),
-        `Missing Config.${root}`,
-      ).toBe(true)
-    }
-  })
-
-  it('preserves numeric Lua map keys and the false keybind option', () => {
-    const fields = loadConfiguratorSections().flatMap(
-      (section) => section.fields,
-    )
-    const darkChat = fields.find((field) => field.path === 'DarkChat')
-    const phone = fields.find((field) => field.path === 'Phone')
-    const companyJobs = fields.find(
-      (field) => field.path === 'Companies.Definitions',
-    )
-    const garage = fields.find((field) => field.path === 'Garage')
-    const timers = (darkChat?.value as Record<string, unknown> | undefined)
-      ?.AllowedDisappearTimers
-
-    expect(timers).toMatchObject({
-      __skyType: 'map',
-      entries: expect.arrayContaining([
-        { key: -1, keyType: 'number', value: true },
-        { key: 0, keyType: 'number', value: true },
-        { key: 604800, keyType: 'number', value: true },
-      ]),
-    })
-    expect(darkChat?.structure?.fields?.AllowedDisappearTimers.kind).toBe('map')
-    expect(phone?.structure?.fields?.Keybind.kind).toBe('optionalString')
-    expect(companyJobs?.label).toBe('Jobs')
-    expect(companyJobs?.structure).toMatchObject({
-      entryDefault: {
-        AcceptsRequests: true,
-        Category: 'public_services',
-        Job: '',
-        ServiceLine: {
-          Number: '500',
-          Routing: 'round_robin',
-        },
-        Services: [
-          {
-            Id: '',
-            RequestsEnabled: true,
-            Title: '',
-          },
-        ],
-      },
-      fields: {
-        ambulance: { kind: 'table' },
-        police: { kind: 'table' },
-      },
-      kind: 'table',
-      mutableKeys: true,
-      template: { kind: 'table' },
-    })
-    expect(
-      garage?.structure?.fields?.VehicleImages.fields?.ModelNames.kind,
-    ).toBe('map')
-  })
-
-  it('exposes the requestable police assistance defaults', () => {
-    const companyJobs = loadConfiguratorSections()
-      .flatMap((section) => section.fields)
-      .find((field) => field.path === 'Companies.Definitions')
-    const police = (
-      companyJobs?.value as Record<string, Record<string, unknown>> | undefined
-    )?.police
-
-    expect(police).toMatchObject({
-      AcceptsRequests: true,
-      Emergency: true,
-      Services: [
-        {
-          Id: 'police-assistance',
-          RequestsEnabled: true,
-        },
-      ],
-    })
-    expect(
-      companyJobs?.structure?.fields?.police.fields?.Services,
-    ).toMatchObject({
-      items: [
-        {
-          fields: {
-            Id: { kind: 'value', valueType: 'string' },
-            RequestsEnabled: { kind: 'value', valueType: 'boolean' },
-          },
-          kind: 'table',
-        },
-      ],
-      kind: 'list',
-      template: {
-        fields: {
-          Id: { kind: 'value', valueType: 'string' },
-          RequestsEnabled: { kind: 'value', valueType: 'boolean' },
-        },
-        kind: 'table',
-      },
-    })
-  })
-
-  it('publishes fixed schemas for every empty configurable collection', () => {
-    const fields = loadConfiguratorSections().flatMap(
-      (section) => section.fields,
-    )
-    const root = (path: string) =>
-      fields.find((field) => field.path === path)?.structure
-
-    expect(root('Music')?.fields?.Tracks).toMatchObject({
-      items: [],
-      kind: 'list',
-      template: {
-        fields: {
-          Artist: { kind: 'value', valueType: 'string' },
-          Id: { kind: 'value', valueType: 'string' },
-          Title: { kind: 'value', valueType: 'string' },
-        },
-        kind: 'table',
-      },
-    })
-    expect(root('FlipTok')?.fields?.MusicTracks.template).toMatchObject({
-      fields: { Url: { kind: 'value', valueType: 'string' } },
-      kind: 'table',
-    })
-    expect(root('Payphones')?.fields?.CustomLocations.template).toEqual({
-      kind: 'vector',
-      vectorType: 'vector4',
-    })
-    expect(root('CrewLink')?.fields?.ExternalPingResources).toMatchObject({
-      fields: {},
-      kind: 'table',
-      mutableKeys: true,
-      template: { kind: 'value', valueType: 'boolean' },
-    })
-    expect(root('CustomApps')?.fields?.TrustedAdapters).toMatchObject({
-      fields: {},
-      kind: 'table',
-      mutableKeys: true,
-      template: { kind: 'value', valueType: 'boolean' },
-    })
-    expect(
-      root('Garage')?.fields?.VehicleImages.fields?.ModelNames,
-    ).toMatchObject({
-      entries: [],
-      keyType: 'number',
-      kind: 'map',
-      template: { kind: 'value', valueType: 'string' },
-    })
-    expect(
-      root('Companies.Definitions')?.fields?.ambulance.fields?.Services,
-    ).toMatchObject({
-      items: [],
-      kind: 'list',
-      template: {
-        fields: {
-          Id: { kind: 'value', valueType: 'string' },
-          RequestsEnabled: { kind: 'value', valueType: 'boolean' },
-        },
-        kind: 'table',
-      },
-    })
-  })
-})

frontend/testserver/index.cjs

@@ -3,8 +3,6 @@ const { randomUUID } = require('node:crypto')
 const cors = require('cors')
 const express = require('express')
 
-const { loadConfiguratorSections } = require('./configurator-fixture.cjs')
-
 const app = express()
 const port = Number(process.argv[2]) || 3001
 
@@ -1978,7 +1976,7 @@ const contacts = [
   },
   {
     canCall: true,
-    canMessage: true,
+    canMessage: false,
     companyId: 'police',
     avatar_url: 'https://picsum.photos/seed/companies-police-logo/180/180',
     id: 'company:police',
@@ -4178,7 +4176,7 @@ const companyCategories = [
 let companyCallAvailable = false
 const companyProfiles = [
   {
-    acceptsRequests: true,
+    acceptsRequests: false,
     announcement: {
       body: 'Community traffic unit active around Legion Square.',
       expiresAt: isoTime(6 * 60 * 60 * 1000),
@@ -4187,7 +4185,7 @@ const companyProfiles = [
     availability: 'available',
     availabilityUpdatedAt: isoTime(-12 * 60 * 1000),
     canCall: true,
-    canMessage: true,
+    canMessage: false,
     categoryId: 'public_services',
     categoryName: 'Public Services',
     coverUrl: 'https://picsum.photos/seed/companies-police-cover/900/360',
@@ -4202,20 +4200,28 @@ const companyProfiles = [
       label: 'Mission Row Police Station',
     },
     logoUrl: 'https://picsum.photos/seed/companies-police-logo/180/180',
-    name: 'Los Santos Police Department',
+    name: 'Los Santos Police',
     phoneNumber: '911',
     revision: 3,
     services: [
       {
-        acceptsRequests: true,
+        acceptsRequests: false,
         active: true,
-        description: 'Request non-emergency police assistance.',
-        id: 'police-assistance',
+        description: 'Immediate police response through the service line.',
+        id: 'emergency-response',
         priceText: null,
-        title: 'Police Assistance',
+        title: 'Emergency Response',
+      },
+      {
+        acceptsRequests: false,
+        active: true,
+        description: 'General information and non-emergency assistance.',
+        id: 'public-assistance',
+        priceText: null,
+        title: 'Public Assistance',
       },
     ],
-    serviceSummary: 'Non-emergency police assistance',
+    serviceSummary: 'Emergency response and public assistance',
     verified: true,
   },
   {
@@ -4718,7 +4724,6 @@ function adminMockBootstrap() {
         targetSource: 2,
       },
     ],
-    disabledApps: [],
     players: [1, 2].map((source) => {
       const player = adminMockPlayerDetail(source)
       return {
@@ -4733,224 +4738,15 @@ function adminMockBootstrap() {
         source,
       }
     }),
-    stats: {
-      accounts: 24,
-      activeDevices: 19,
-      auditEntries: 37,
-      auditToday: 4,
-      callsToday: 18,
-      devices: 31,
-      linkedDevices: 22,
-      messagesToday: 146,
-      online: 2,
-      simDevices: 27,
-    },
+    stats: { accounts: 24, devices: 31, online: 2 },
   }
 }
 
-const adminMockConfiguratorBase = {
-  enabled: true,
-  revision: 4,
-  sections: [
-    {
-      id: 'config:Bridge',
-      label: 'Bridge',
-      scope: 'config',
-      fields: [
-        {
-          label: 'Framework',
-          path: 'Bridge.Framework',
-          scope: 'config',
-          sensitive: false,
-          type: 'string',
-          value: 'auto',
-        },
-        {
-          label: 'Inventory',
-          path: 'Bridge.Inventory',
-          scope: 'config',
-          sensitive: false,
-          type: 'string',
-          value: 'auto',
-        },
-        {
-          label: 'Locale',
-          path: 'Bridge.Locale',
-          scope: 'config',
-          sensitive: false,
-          type: 'string',
-          value: 'de',
-        },
-        {
-          label: 'Callback Timeout',
-          path: 'Bridge.CallbackTimeout',
-          scope: 'config',
-          sensitive: false,
-          type: 'number',
-          value: 15000,
-        },
-        {
-          label: 'Debug',
-          path: 'Bridge.Debug',
-          scope: 'config',
-          sensitive: false,
-          type: 'boolean',
-          value: false,
-        },
-      ],
-    },
-    {
-      id: 'config:Phone',
-      label: 'Phone',
-      scope: 'config',
-      fields: [
-        {
-          label: 'Item',
-          path: 'Phone.Item',
-          scope: 'config',
-          sensitive: false,
-          type: 'string',
-          value: 'phone',
-        },
-        {
-          label: 'Unique',
-          path: 'Phone.Unique',
-          scope: 'config',
-          sensitive: false,
-          type: 'boolean',
-          value: true,
-        },
-        {
-          label: 'Keybind',
-          path: 'Phone.Keybind',
-          scope: 'config',
-          sensitive: false,
-          type: 'string',
-          value: 'F1',
-        },
-        {
-          label: 'Device Name',
-          path: 'Phone.DeviceName',
-          scope: 'config',
-          sensitive: false,
-          type: 'string',
-          value: 'iFruit Phone',
-        },
-      ],
-    },
-    {
-      id: 'config:Companies',
-      label: 'Companies',
-      scope: 'config',
-      fields: [
-        {
-          label: 'Enabled',
-          path: 'Companies.Enabled',
-          scope: 'config',
-          sensitive: false,
-          type: 'boolean',
-          value: true,
-        },
-        {
-          label: 'Categories',
-          path: 'Companies.Categories',
-          scope: 'config',
-          sensitive: false,
-          type: 'json',
-          value: ['public_services', 'vehicles', 'transport'],
-        },
-      ],
-    },
-    {
-      id: 'media:FiveManage',
-      label: 'Five Manage',
-      scope: 'media',
-      fields: [
-        {
-          configured: true,
-          label: 'Api Key',
-          path: 'FiveManage.ApiKey',
-          scope: 'media',
-          sensitive: true,
-          type: 'string',
-          value: '',
-        },
-        {
-          label: 'Base Url',
-          path: 'FiveManage.BaseUrl',
-          scope: 'media',
-          sensitive: false,
-          type: 'string',
-          value: 'https://api.fivemanage.com/api/v3/file',
-        },
-        {
-          label: 'Upload Timeout Ms',
-          path: 'FiveManage.UploadTimeoutMs',
-          scope: 'media',
-          sensitive: false,
-          type: 'number',
-          value: 25000,
-        },
-      ],
-    },
-    {
-      id: 'media:Import',
-      label: 'Import',
-      scope: 'media',
-      fields: [
-        {
-          label: 'Enabled',
-          path: 'Import.Enabled',
-          scope: 'media',
-          sensitive: false,
-          type: 'boolean',
-          value: true,
-        },
-        {
-          label: 'Websites',
-          path: 'Import.Websites',
-          scope: 'media',
-          sensitive: false,
-          type: 'json',
-          value: [
-            {
-              Adapter: 'fivemanage',
-              Enabled: true,
-              Id: 'fivemanage',
-              Label: 'FiveManage',
-            },
-          ],
-        },
-      ],
-    },
-  ],
-  updatedAt: '2026-08-20 20:15:00',
-  updatedBy: 'Alex Morgan',
-}
-
-const adminMockConfigurator = {
-  ...adminMockConfiguratorBase,
-  sections: loadConfiguratorSections(),
-}
-
 app.post('/api/:endpoint', async (request, response, next) => {
   const endpoint = request.params.endpoint
   const loggedBody = { ...request.body }
   if (typeof loggedBody.password === 'string')
     loggedBody.password = '<redacted>'
-  if (
-    endpoint === 'admin:save-configurator' &&
-    Array.isArray(loggedBody.changes)
-  ) {
-    loggedBody.changes = loggedBody.changes.map((change) => ({
-      ...change,
-      value: /api.?key|pepper|secret|token|password/i.test(
-        String(change.path ?? ''),
-      )
-        ? '<redacted>'
-        : change.value,
-    }))
-  }
   if (endpoint === 'memos:devCapture') {
     loggedBody.audioDataUrl = `<${String(request.body.audioDataUrl ?? '').length} characters>`
   }
@@ -4963,31 +4759,6 @@ app.post('/api/:endpoint', async (request, response, next) => {
     response.json({ success: true, data: adminMockBootstrap() })
     return
   }
-  if (endpoint === 'admin:configurator') {
-    response.json({ success: true, data: adminMockConfigurator })
-    return
-  }
-  if (endpoint === 'admin:save-configurator') {
-    const changes = Array.isArray(request.body.changes)
-      ? request.body.changes
-      : []
-    for (const change of changes) {
-      for (const section of adminMockConfigurator.sections) {
-        const field = section.fields.find(
-          (candidate) =>
-            candidate.scope === change.scope && candidate.path === change.path,
-        )
-        if (!field) continue
-        if (field.sensitive)
-          field.configured = String(change.value ?? '') !== ''
-        else field.value = change.value
-      }
-    }
-    adminMockConfigurator.revision += 1
-    adminMockConfigurator.updatedAt = new Date().toISOString()
-    response.json({ success: true, data: adminMockConfigurator })
-    return
-  }
   if (endpoint === 'admin:player') {
     response.json({
       success: true,

sky_phone/README.md

@@ -134,7 +134,7 @@ Sky Phone is built to be the **free FiveM phone you can choose without accepting
   - `hex_4_inventory`
   - Native ESX inventory
 
-`mf-inventory` and `smx-inventory` are supported with ESX. The native ESX and HEX adapters use count-based items, so Sky Phone automatically disables unique phones and physical SIM cards while either adapter is active.
+`mf-inventory` and `smx-inventory` are supported with ESX. The native ESX and HEX adapters use count-based items and therefore require unique phones and physical SIM cards to be disabled.
 
 ### Voice
 
@@ -196,7 +196,6 @@ The files contain clearly separated sections for:
 | Section | Purpose |
 | --- | --- |
 | `Config.Bridge` | Framework, inventory, language, callback timeout, and debug mode |
-| `Config.CommandPermissions` | Fixed groups for the admin panel, test data, verification commands, and social moderation |
 | `Config.Phone` | Phone item, movement, unique-device mode, and development command |
 | `Config.Sim` | Physical or virtual SIM behavior and number formatting |
 | `Config.Calls` / `Config.Radio` | Voice providers, call behavior, radio limits, and permissions |
@@ -212,18 +211,6 @@ The files contain clearly separated sections for:
 
 Restart `sky_phone` after changing Lua configuration.
 
-When `Config.PhoneConfigurator.Enabled` is enabled, the generated `source/shared/config_default.lua`
-provides the shipped SQL baseline. The frontend build recreates it from `config.lua` and the
-server-only `media.lua`; do not edit the generated snapshot directly.
-
-`Config.PhoneConfigurator` and `Config.CommandPermissions` remain file-owned and are omitted from
-the generated default snapshot. Permissions are not displayed in the Phone Configurator and stay
-authoritative while SQL configuration is enabled. Their stable keys do not change when a command is
-renamed in the panel. ESX and QBCore use their framework permissions. Qbox checks the configured ACE
-objects first and then its framework groups, so the standard `permissions.cfg` mapping from
-`group.admin` to the `admin` ACE works with the shipped `phonepanel` permission list. Restart
-`sky_phone` after changing fixed permissions.
-
 ### Language
 
 Available locales:
@@ -325,7 +312,7 @@ Do not configure an LB Phone client event or client export. Sky Phone registers
 
 The server registers `Config.Phone.Item` as usable for every supported inventory adapter: `ox`, `qb`, `lj`, `qs`, `codem`, `core`, `mf`, `smx`, `hex`, and `esx`. Resource startup fails visibly if the selected adapter cannot complete that registration.
 
-The `hex` and `esx` adapters use ESX's count-based item API, which cannot persist per-item phone or physical SIM metadata. Sky Phone automatically forces `Config.Phone.Unique = false` and `Config.Sim.Enabled = false` while either adapter is active. `auto` selects `hex` when `hex_4_inventory` is started and otherwise falls back to `esx` on an ESX server when no metadata-capable inventory is detected.
+The `hex` and `esx` adapters use ESX's count-based item API. They require both `Config.Phone.Unique = false` and `Config.Sim.Enabled = false` because this API cannot persist per-item phone or physical SIM metadata. `auto` selects `hex` when `hex_4_inventory` is started and otherwise falls back to `esx` on an ESX server when no metadata-capable inventory is detected.
 
 ### QBCore-style item tables
 

sky_phone/config/config.lua

@@ -10,36 +10,13 @@
     Keep option names unchanged. Restart sky_phone after editing this file.
 ]]
 
--- CONFIG_DEFAULT_EXCLUDE_START
--- When enabled, the active configuration is loaded from SQL and managed through
--- /phonepanel. Frontend builds snapshot the shipped defaults from config.lua and
--- media.lua into source/shared/config_default.lua.
-Config.PhoneConfigurator = {
-    Enabled = true,
-}
-
--- Fixed server permissions. These values remain authoritative even while the
--- Phone Configurator is enabled and are intentionally not shown in its panel.
--- Group names use the active framework's permissions. On Qbox they also match
--- ACE objects such as "admin" from the standard permissions.cfg.
-Config.CommandPermissions = {
-    phonepanel = { "god", "superadmin", "admin" },
-    phonetestdata = { "god", "superadmin", "admin" },
-    fliptokverify = { "god", "superadmin", "admin" },
-    picstagramverify = { "god", "superadmin", "admin" },
-    picstagramadmin = { "god", "superadmin", "admin" },
-}
--- CONFIG_DEFAULT_EXCLUDE_END
-
 -- =============================================================================
 -- Core, framework and device
 -- =============================================================================
 
 Config.Bridge = {
     Framework = "auto", -- auto, esx, qbox, qb
-    -- auto, ak47, codem, core, jaksam, jpr, lj, mf, one, origen, ox, ps, qb, qs, smx, tgiann, hex, esx
-    -- Compatibility aliases: qb-inv -> qb, qbox -> ox
-    Inventory = "auto",
+    Inventory = "auto", -- auto, ox, qb, lj, qs, codem, core, mf, smx, hex, esx
     Locale = "en",
     CallbackTimeout = 15000,
     Debug = false, -- true: show debug/info output; warnings and errors are always shown
@@ -49,75 +26,25 @@ Config.Command = "phone"
 
 Config.Phone = {
     Item = "phone",
-    Unique = true, -- true: data follows each phone item; false: one persistent phone per character; forced false for metadata-free inventories
+    Unique = true, -- true: data follows each phone item; false: one persistent phone per character; hex/esx require false
     Keybind = "F1", -- false disables the configurable phone key mapping
-    OpenRequestsPerMinute = 20,
     AllowMovement = true, -- true: game input stays active while the mobile phone is open
-    HoldToLook = {
-        Enabled = true, -- hold the configured control to hide the cursor and look around; independent of AllowMovement
-        Control = 19, -- INPUT_CHARACTER_WHEEL (Left Alt by default)
-    },
     DevelopmentCommand = true,
     DeviceName = "iFruit Phone",
 }
 
--- Server-wide availability for bundled apps. Set an entry to false to hide it
--- from every phone, the App Store and per-device app management.
-Config.Apps = {
-    ["app-store"] = true,
-    banking = true,
-    billing = true,
-    calculator = true,
-    calendar = true,
-    camera = true,
-    citymarkt = true,
-    citywarn = true,
-    clock = true,
-    companies = true,
-    crewlink = true,
-    crypto = true,
-    darkchat = true,
-    feather = true,
-    flare = true,
-    fliptok = true,
-    garage = true,
-    health = true,
-    house = true,
-    ["local-pages"] = true,
-    mail = true,
-    map = true,
-    memory = true,
-    memos = true,
-    messages = true,
-    minesweeper = true,
-    music = true,
-    ["neon-drop"] = true,
-    notes = true,
-    ["number-merge"] = true,
-    phone = true,
-    photos = true,
-    picstagram = true,
-    radio = true,
-    settings = true,
-    ["sky-flappy"] = true,
-    skyride = true,
-    snake = true,
-    ["tower-stack"] = true,
-    weather = true,
-    ["weazel-news"] = true,
-}
-
 Config.TestData = {
     Enabled = false, -- development/test servers only; keep disabled in production
     Command = "phonetestdata",
     AdminOnly = false, -- enable only on development servers; every run is scoped to the executing player's phone
+    AdminGroups = { "admin", "superadmin" },
 }
 
 Config.CustomApps = {
     Enabled = true,
     BundledApps = true,
     ExternalApps = true,
-    Debug = false, -- detailed client traces for exports, registration, catalog sync and lifecycle events
+    Debug = true, -- detailed client traces for exports, registration, catalog sync and lifecycle events
     ReadyTimeoutMs = 8000,
     MaximumMessageBytes = 65536,
     MaximumStorageBytesPerApp = 262144,
@@ -136,7 +63,8 @@ Config.Security = {
 
 Config.AdminPanel = {
     Enabled = true,
-    Command = "phonepanel",
+    Command = "phoneadmin",
+    AdminGroups = { "admin", "superadmin" },
     MaximumPlayers = 128,
     ReadRequestsPerMinute = 60,
     ActionRequestsPerMinute = 30,
@@ -146,12 +74,12 @@ Config.AdminPanel = {
 }
 
 Config.Sim = {
-    Enabled = true, -- false: devices receive a persistent random number automatically; forced false for metadata-free inventories
+    Enabled = true, -- false: devices receive a persistent random number automatically; hex/esx require false
     RegisteredItem = "sky_phone_sim_registered",
     AnonymousItem = "sky_phone_sim_anonymous",
-    NumberLength = 10, -- total number of digits, including NumberPrefix
-    NumberPrefix = "", -- digits only; use "555", not "555-"
-    NumberGroups = { 3, 3, 4 }, -- display groups separated by spaces
+    NumberLength = 10,
+    NumberPrefix = "",
+    NumberGroups = { 3, 3, 4 },
 }
 
 -- =============================================================================
@@ -163,7 +91,7 @@ Config.Speaker = {
 }
 
 Config.Calls = {
-    VoiceProvider = "pma", -- auto, yaca (alias: yaca-voice), pma (alias: pma-voice), saltychat (alias: salty)
+    VoiceProvider = "pma", -- yaca (alias: yaca-voice), pma (alias: pma-voice), saltychat (alias: salty)
     RingSeconds = 30,
     ContactNameMaxLength = 80,
     ContactNotesMaxLength = 500,
@@ -348,7 +276,6 @@ Config.DarkChat = {
     VoiceMaxBase64Length = 360000,
     VoiceWaveformSamples = 48,
     CleanupIntervalSeconds = 30,
-    CleanupBatchSize = 250,
     AllowedDisappearTimers = {
         [0] = true,
         [-1] = true, -- after reading
@@ -450,8 +377,8 @@ Config.Garage = {
 }
 
 Config.Housing = {
-    System = "auto", -- auto, rtx, quasar, tgiann, vms, rx, nolag, sn, esx_property, qbx_properties
-    AutoPriority = { "esx_property", "qbx_properties", "rtx", "quasar", "tgiann", "vms", "rx", "nolag", "sn" },
+    System = "auto", -- auto, rtx, quasar, vms, rx, nolag, sn, esx_property, qbx_properties
+    AutoPriority = { "esx_property", "qbx_properties", "rtx", "quasar", "vms", "rx", "nolag", "sn" },
     MaximumProperties = 50,
     OverviewRequestsPerMinute = 30,
     ActionsPerMinute = 12,
@@ -546,6 +473,7 @@ Config.FlipTok = {
     MaxPostMedia = 10,
     MusicTracks = {},
     VerifyCommand = "fliptokverify",
+    AdminGroups = { "admin" },
     ReportWebhookConvar = "sky_phone_fliptok_report_webhook",
 }
 
@@ -567,6 +495,7 @@ Config.Picstagram = {
     ReportDetailsMaxLength = 500,
     ReportReasons = { "spam", "harassment", "dangerous", "illegal", "other" },
     VerifyCommand = "picstagramverify",
+    AdminGroups = { "admin" },
 }
 
 Config.Feather = {
@@ -1181,7 +1110,7 @@ if IsDuplicityVersion() then
                 LogoUrl = "https://picsum.photos/seed/companies-police-logo/180/180",
                 Description = "Public safety, emergency response, and police services.",
                 DefaultAvailability = "closed",
-                AcceptsRequests = true,
+                AcceptsRequests = false,
                 District = "Mission Row",
                 LocationLabel = "Mission Row Police Station",
                 Address = "Mission Row Police Station",
@@ -1190,7 +1119,7 @@ if IsDuplicityVersion() then
                     Number = "911",
                     AutoContact = true,
                     CanCall = true,
-                    CanMessage = true,
+                    CanMessage = false,
                     Routing = "round_robin",
                     MinimumGrade = 0,
                 },
@@ -1203,15 +1132,7 @@ if IsDuplicityVersion() then
                     Services = 3,
                     Announcement = 3,
                 },
-                Services = {
-                    {
-                        Id = "police-assistance",
-                        Title = "Police assistance",
-                        Description = "Request non-emergency police assistance.",
-                        Price = "",
-                        RequestsEnabled = true,
-                    },
-                },
+                Services = {},
             },
             ambulance = {
                 Job = "ambulance",

sky_phone/config/locales/de.lua

@@ -1,7 +1,7 @@
 Locales["de"] = {
     CommandDescription = "Öffne dein Handy.",
     AdminCommand = {
-        CommandDescription = "Öffne Handy-Administration und -Konfiguration.",
+        CommandDescription = "Öffne das geschützte Handy-Admin-Panel.",
         Errors = {
             disabled = "Das Handy-Admin-Panel ist deaktiviert.",
             not_authorized = "Du hast keinen Zugriff auf das Handy-Admin-Panel.",
@@ -43,7 +43,6 @@ Locales["de"] = {
         invalid_sim = "Diese SIM-Karte besitzt ungültige Metadaten.",
         phone_required = "Du benötigst ein Handy in deinem Inventar.",
         operation_in_progress = "Eine andere Handy-Aktion wird bereits ausgeführt.",
-        rate_limited = "Das Handy wurde zu oft geöffnet. Versuch es gleich erneut.",
         voice_unavailable = "Der konfigurierte Sprachdienst ist nicht verfügbar.",
         default = "Das Handy konnte nicht geöffnet werden.",
     },
@@ -204,10 +203,9 @@ Locales["de"] = {
         },
         AdminPanel = {
             name = "Phone Admin", subtitle = "Administration", navigation = "Admin-Navigation", refresh = "Admin-Daten aktualisieren", loading = "Geschützte Daten werden geladen...",
-            tabs = { overview = "Übersicht", players = "Spieler", devices = "Geräte", apps = "Apps", accounts = "Accounts", messages = "Nachrichten", calls = "Anrufe", moderation = "Moderation", audit = "Audit", configurator = "Phone Configurator" },
-            overview = { eyebrow = "Server", title = "Dashboard", body = "Spieler, Geräte, Apps und Handydaten.", stats = "Server-Handystatistik", online = "Online", devices = "Geräte", accounts = "Accounts", audit = "Audit-Einträge", control = "Navigation", features = "Module", featuresBody = "Öffne ein Verwaltungsmodul.", recent = "Letzte Aktivitäten", playerFeature = "Identität, Finanzen, Job und Dienst", deviceFeature = "IMEI, SIM, Nummer und Aktivität", appFeature = "Handy-Apps installieren oder entfernen", accountFeature = "Accountzugriff und geschützte Zugangsdaten", messageFeature = "Letzte SMS-Aktivitäten prüfen", callFeature = "Letzte Anrufaktivitäten prüfen", moderationFeature = "Zugriff, Nummer oder Gerätedaten zurücksetzen", auditFeature = "Sensible Admin-Aktionen prüfen", configuratorFeature = "config.lua und media.lua über SQL verwalten" },
-            statistics = { eyebrow = "Live-Daten", title = "Handy-Statistiken", body = "Aktuelle Nutzung und Gerätestatus, automatisch alle 15 Sekunden aktualisiert.", today = "Aktivität heute", todayBody = "Handy- und Admin-Aktivität seit Mitternacht.", messagesToday = "Nachrichten", callsToday = "Anrufe", auditToday = "Admin-Aktionen", coverage = "Geräteabdeckung", coverageBody = "Aktueller Anteil aller gespeicherten Handys.", linkedDevices = "Account verknüpft", simDevices = "SIM zugewiesen", activeDevices = "In 24 Stunden aktualisiert", ofDevices = "{count} von {total} Geräten" },
-            configurator = { context = "Runtime-Konfiguration", eyebrow = "Systemwerkzeug", sections = "Konfiguration", search = "Einstellungen oder Pfade suchen", configScope = "config.lua", mediaScope = "media.lua", noResults = "Keine passenden Einstellungen", loading = "SQL-Konfiguration wird geladen...", title = "Phone Configurator", body = "Verwalte Handy- und Media-Einstellungen im geschützten Admin-Bereich.", disabledTitle = "SQL-Konfiguration ist nicht aktiv", disabledBody = "Aktiviere den Configurator am Anfang der config.lua und starte sky_phone neu. Bis dahin bleiben die Dateiwerte aktiv und die Bearbeitung gesperrt.", manualSave = "Manuelles Speichern", refreshNotice = "Nichts wird automatisch gespeichert. Der grüne Haken prüft config.lua und media.lua in SQL und aktualisiert die aktive Server-, Client-, Media- und UI-Konfiguration sofort intern.", fieldCount = "{count} Felder", secretConfigured = "Secret gesetzt · Ersatzwert eingeben", invalidValue = "Prüfe den markierten Tabellen- oder Zahlenwert.", saved = "SQL-Konfiguration gespeichert und übernommen.", descriptions = { featureToggle = "Schaltet {name} ein oder aus.", boolean = "Legt fest, ob {name} erlaubt ist.", number = "Legt den Zahlenwert für {name} fest.", text = "Legt den Textwert für {name} fest.", optionalText = "Legt den optionalen Wert für {name} fest; der Schalter deaktiviert ihn.", list = "Verwaltet alle Einträge für {name}.", table = "Bündelt die zusammengehörigen Einstellungen für {name}.", credential = "Speichert den geschützten Zugangsschlüssel für {name}.", url = "Legt die URL oder den Endpunkt für {name} fest.", hosts = "Legt die erlaubten Domains für {name} fest.", milliseconds = "Legt die Zeit für {name} in Millisekunden fest.", seconds = "Legt die Zeit für {name} in Sekunden fest.", rateLimit = "Begrenzt die Aktionen für {name} pro Minute.", byteLimit = "Legt die maximal erlaubte Datengröße für {name} fest.", textLimit = "Legt die maximal erlaubte Textlänge für {name} fest.", distance = "Legt die Distanz in der Spielwelt für {name} fest.", coordinates = "Legt Weltkoordinaten oder Ausrichtung für {name} fest.", gameAsset = "Legt das GTA-Modell oder Prop für {name} fest.", animation = "Legt die Animationsdatei für {name} fest.", access = "Legt Jobs, Gruppen oder Berechtigungsstufen für {name} fest.", integration = "Wählt Framework oder Anbieter für {name} aus.", path = "Legt den Speicher- oder Ressourcenpfad für {name} fest.", color = "Legt die Oberflächenfarbe für {name} fest.", displayText = "Legt den Spielern angezeigten Text für {name} fest.", phoneNumber = "Legt die Telefon- oder Servicenummer für {name} fest.", routing = "Steuert die Verteilung eingehender Anfragen für {name}.", command = "Legt den Chat-Befehl zum Öffnen oder Ausführen von {name} fest.", locale = "Wählt die Sprache für {name} aus.", debug = "Steuert ausführliche Diagnoseausgaben für {name}.", mediaQuality = "Legt Medienqualität oder Lautstärke für {name} fest.", amount = "Legt die maximale oder angezeigte Menge für {name} fest." }, table = { list = "Liste", table = "Schlüsseltabelle", vector = "Vektor", entry = "Eintrag", general = "Allgemein", addRow = "Zeile hinzufügen", addField = "Feld hinzufügen", remove = "Entfernen", emptyList = "Noch keine Zeilen. Füge die erste Zeile mit Plus hinzu.", emptyTable = "Noch keine Felder. Füge unten den ersten Schlüssel hinzu.", keyPlaceholder = "Neuer Schlüssel", convertToList = "Als Liste nutzen", convertToMap = "Als typisierte Schlüsseltabelle nutzen", convertToTable = "Als Schlüsseltabelle nutzen", types = { string = "Text", number = "Zahl", boolean = "Schalter", list = "Liste", table = "Tabelle" } } },
+            tabs = { overview = "Übersicht", players = "Spieler", devices = "Geräte", apps = "Apps", accounts = "Accounts", messages = "Nachrichten", calls = "Anrufe", moderation = "Moderation", audit = "Audit" },
+            overview = { eyebrow = "Server", title = "Dashboard", body = "Spieler, Geräte, Apps und Handydaten.", stats = "Server-Handystatistik", online = "Online", devices = "Geräte", accounts = "Accounts", audit = "Audit-Einträge", control = "Navigation", features = "Module", featuresBody = "Öffne ein Verwaltungsmodul.", recent = "Letzte Aktivitäten", playerFeature = "Identität, Finanzen, Job und Dienst", deviceFeature = "IMEI, SIM, Nummer und Aktivität", appFeature = "Handy-Apps installieren oder entfernen", accountFeature = "Accountzugriff und geschützte Zugangsdaten", messageFeature = "Letzte SMS-Aktivitäten prüfen", callFeature = "Letzte Anrufaktivitäten prüfen", moderationFeature = "Zugriff, Nummer oder Gerätedaten zurücksetzen", auditFeature = "Sensible Admin-Aktionen prüfen" },
+            appearance = { eyebrow = "Darstellung", title = "Akzentfarbe", body = "Ändere den Akzent im gesamten Admin-Arbeitsbereich.", colors = { emerald = "Smaragd", blue = "Blau", violet = "Violett", orange = "Orange", red = "Rot" } },
             players = { eyebrow = "Aktive Sitzungen", title = "Online-Spieler", online = "Jetzt online", empty = "Keine Spieler gefunden", emptyBody = "Passe die Suche an oder aktualisiere die Spielerliste." },
             search = { players = "Name, ID, Job oder Nummer suchen", apps = "Apps suchen", clear = "Suche leeren" },
             detail = { character = "Charakterprofil", data = "Spielerdatenübersicht", cash = "Bargeld", bank = "Bank", job = "Job", duty = "Dienst", onDuty = "Im Dienst", offDuty = "Außer Dienst", identity = "Identität", playerData = "Spielerdaten", identifier = "Charakter-Identifier", birthdate = "Geburtsdatum", grade = "Job-Rang", unknown = "Unbekannt" },
@@ -220,9 +218,9 @@ Locales["de"] = {
                 dialogs = { ["reset-passcodeTitle"] = "Gerätecode zurücksetzen?", ["reset-passcodeBody"] = "Der Spieler kann dieses Handy danach ohne die bisherige PIN entsperren.", ["change-numberTitle"] = "Telefonnummer ändern?", ["change-numberBody"] = "Die neue Nummer muss dem Serverformat entsprechen und eindeutig sein.", ["factory-resetTitle"] = "Werksreset für dieses Handy?", ["factory-resetBody"] = "Lokale Gerätedaten, App-Einstellungen, Sicherheit und der verknüpfte Account werden gelöscht. Das kann nicht rückgängig gemacht werden." },
                 confirm = { ["reset-passcode"] = "Gerätecode zurücksetzen", ["change-number"] = "Nummer ändern", ["factory-reset"] = "Werksreset" },
             },
-            audit = { eyebrow = "Nachvollziehbarkeit", title = "Audit-Verlauf", body = "Sensible Anzeigen und App-Änderungen werden hier protokolliert.", empty = "Noch keine Admin-Aktionen", emptyBody = "Geschützte Aktionen erscheinen hier, nachdem sie ausgeführt wurden.", by = "{actor} · Ziel-ID {target}", actions = { grant_app = "App installiert", revoke_app = "App entfernt", reveal_account_password = "Passwort angezeigt", view_messages = "Nachrichten angesehen", view_calls = "Anrufe angesehen", reset_passcode = "Gerätecode zurückgesetzt", change_number = "Telefonnummer geändert", factory_reset = "Werksreset ausgeführt", save_configuration = "Konfiguration gespeichert" } },
-            editor = { brand = "SKY PHONE", workspace = "ADMIN", players = "Spielerverzeichnis", audit = "Audit-Protokoll", selectPlayer = "Wähle einen Spieler, um Identität, Geräte, Zugangsdaten und App-Zugriffe zu prüfen.", save = "Änderungen speichern", saveHint = "Offene Änderungen übernehmen", saved = "Änderungen gespeichert.", unsaved = "Ungespeicherte Änderungen", close = "Admin-Panel schließen", refresh = "Live-Daten aktualisieren", online = "LIVE", profile = "PROFIL", financial = "FINANZEN", device = "GERÄT", security = "SICHERHEIT", noAutoSave = "Manuelles Speichern", noAutoSaveBody = "Änderungen bleiben lokal, bis der grüne Haken gedrückt wird.", discardTitle = "Ungespeicherte Änderungen verwerfen?", discardBody = "Deine vorgemerkten App- oder Konfigurationsänderungen wurden noch nicht gespeichert.", keepEditing = "Weiter bearbeiten", discard = "Änderungen verwerfen", saveFailed = "Einige Änderungen konnten nicht gespeichert werden.", noSelection = "Kein Spieler ausgewählt" },
-            errors = { not_authorized = "Du hast keinen Zugriff auf das Admin-Panel.", rate_limited = "Zu viele Admin-Anfragen. Bitte warte.", player_unavailable = "Dieser Spieler ist nicht mehr online.", device_not_owned = "Dieses Handy gehört nicht mehr zum ausgewählten Spieler.", invalid_app = "Diese App ist nicht auf dem Server registriert.", app_protected = "Diese System-App kann nicht entfernt werden.", revision_conflict = "Die Daten wurden zwischenzeitlich geändert. Öffne den Bereich neu und versuche es erneut.", configurator_disabled = "Aktiviere zuerst den Phone Configurator in der config.lua.", invalid_field = "Dieses Konfigurationsfeld ist nicht mehr verfügbar.", invalid_value = "Ein Konfigurationswert ist ungültig.", invalid_company_configuration = "Die Firmenkonfiguration ist unvollständig oder enthält einen doppelten Job, eine doppelte Servicenummer oder Service-ID.", account_not_found = "Mit diesem Handy ist kein iFruit-Account verknüpft.", invalid_phone_number = "Gib eine Telefonnummer im konfigurierten Serverformat ein.", phone_number_unchanged = "Diese SIM verwendet diese Telefonnummer bereits.", phone_number_taken = "Diese Telefonnummer ist bereits vergeben.", no_sim = "Dieses Handy besitzt keine änderbare SIM.", passcode_not_set = "Für dieses Handy ist kein Gerätecode eingerichtet.", device_not_found = "Dieses Handy existiert nicht mehr.", metadata_unsupported = "Die Inventar-Metadaten des Handys konnten nicht aktualisiert werden.", invalid_request = "Die Admin-Anfrage war ungültig.", request_failed = "Die Admin-Anfrage ist fehlgeschlagen.", default = "Das Admin-Panel ist vorübergehend nicht verfügbar." },
+            audit = { eyebrow = "Nachvollziehbarkeit", title = "Audit-Verlauf", body = "Sensible Anzeigen und App-Änderungen werden hier protokolliert.", empty = "Noch keine Admin-Aktionen", emptyBody = "Geschützte Aktionen erscheinen hier, nachdem sie ausgeführt wurden.", by = "{actor} · Ziel-ID {target}", actions = { grant_app = "App installiert", revoke_app = "App entfernt", reveal_account_password = "Passwort angezeigt", view_messages = "Nachrichten angesehen", view_calls = "Anrufe angesehen", reset_passcode = "Gerätecode zurückgesetzt", change_number = "Telefonnummer geändert", factory_reset = "Werksreset ausgeführt" } },
+            editor = { brand = "SKY PHONE", workspace = "ADMIN", players = "Spielerverzeichnis", audit = "Audit-Protokoll", selectPlayer = "Wähle einen Spieler, um Identität, Geräte, Zugangsdaten und App-Zugriffe zu prüfen.", save = "Änderungen speichern", saveHint = "Offene Änderungen übernehmen", saved = "Änderungen gespeichert.", unsaved = "Ungespeicherte Änderungen", close = "Admin-Panel schließen", refresh = "Live-Daten aktualisieren", online = "LIVE", profile = "PROFIL", financial = "FINANZEN", device = "GERÄT", security = "SICHERHEIT", noAutoSave = "Manuelles Speichern", noAutoSaveBody = "Änderungen bleiben lokal, bis der grüne Haken gedrückt wird.", discardTitle = "Ungespeicherte Änderungen verwerfen?", discardBody = "Deine vorgemerkten App-Änderungen wurden noch nicht gespeichert.", keepEditing = "Weiter bearbeiten", discard = "Änderungen verwerfen", saveFailed = "Einige Änderungen konnten nicht gespeichert werden.", noSelection = "Kein Spieler ausgewählt" },
+            errors = { not_authorized = "Du hast keinen Zugriff auf das Admin-Panel.", rate_limited = "Zu viele Admin-Anfragen. Bitte warte.", player_unavailable = "Dieser Spieler ist nicht mehr online.", device_not_owned = "Dieses Handy gehört nicht mehr zum ausgewählten Spieler.", invalid_app = "Diese App ist nicht auf dem Server registriert.", app_protected = "Diese System-App kann nicht entfernt werden.", revision_conflict = "Das Handy wurde zwischenzeitlich geändert. Aktualisiere und versuche es erneut.", account_not_found = "Mit diesem Handy ist kein iFruit-Account verknüpft.", invalid_phone_number = "Gib eine Telefonnummer im konfigurierten Serverformat ein.", phone_number_unchanged = "Diese SIM verwendet diese Telefonnummer bereits.", phone_number_taken = "Diese Telefonnummer ist bereits vergeben.", no_sim = "Dieses Handy besitzt keine änderbare SIM.", passcode_not_set = "Für dieses Handy ist kein Gerätecode eingerichtet.", device_not_found = "Dieses Handy existiert nicht mehr.", metadata_unsupported = "Die Inventar-Metadaten des Handys konnten nicht aktualisiert werden.", invalid_request = "Die Admin-Anfrage war ungültig.", request_failed = "Die Admin-Anfrage ist fehlgeschlagen.", default = "Das Admin-Panel ist vorübergehend nicht verfügbar." },
         },
         Apps = {
             health = {
@@ -637,7 +635,7 @@ Locales["de"] = {
                 createIdentity = "Dunkle Identität erstellen", createIdentityBody = "Erstell eine private Identität, bevor du ein DarkChat-Gespräch anfängst.",
                 security = "Sicherheit", privateNetwork = "Privates Einladungs-Nur-Netzwerk", noResults = "Keine Ergebnisse", noResultsBody = "Versucht es mit einem anderen Alias oder Dark-ID.",
                 noChats = "Keine privaten Chats", noChatsBody = "Verbinde dich über eine Dark-ID oder einen Einladungscode. Es gibt keine öffentliche Suche.", newChat = "Neuer Chat", to = "An:",
-                connectPrivately = "Privat verbinden", newChatBody = "Gib die Dark-ID oder den Einladungscode einer anderen Person ein. Deine eigene ID kannst du im Profil teilen.", darkIdOrInvite = "Dark-ID oder Einladungscode", continue = "Weiter", contacts = "DarkChat Kontakte", contactsHint = "Gespeicherte private Identitäten erscheinen nur auf deinem DarkChat-Konto.", noContacts = "Keine gespeicherten DarkChat Kontakte", private = "Privat", shareIdentity = "Tippe auf deine private Identität",
+                connectPrivately = "Privat verbinden", newChatBody = "Gib einen genauen Dark-ID oder Einladungscode ein. Unbekannte Identitäten erfordern eine Bestätigung.", darkIdOrInvite = "Dark-ID oder Einladungscode", continue = "Weiter", contacts = "DarkChat Kontakte", contactsHint = "Gespeicherte private Identitäten erscheinen nur auf deinem DarkChat-Konto.", noContacts = "Keine gespeicherten DarkChat Kontakte", private = "Privat", shareIdentity = "Tippe auf deine private Identität",
                 message = "Dunkle Botschaft", activeNow = "Anteil der Tätigkeiten", encryptedSession = "Privatsitzung", serverPrivate = "Private server-gespeicherte Konversation",
                 emoji = "Emoji", gif = "GIF", gifs = "GIF", photo = "Foto", video = "Video", attachPhoto = "Foto anhängen", takePhoto = "Foto machen", attachGif = "GIF-Anlage", attachVideo = "Video anhängen", searchGifs = "GIF durchsuchen", loadMore = "Mehr laden",
                 voiceMessage = "Sprachnachricht", sending = "Senden", failed = "Nicht geliefert", delivered = "Lieferung", read = "Lesen", replying = "Antwort auf",
@@ -653,7 +651,7 @@ Locales["de"] = {
                 microphoneUnavailable = "Das Mikrofon ist nicht verfügbar.", recordingTooLarge = "Die Sprachbotschaft ist zu groß.",
                 errors = {
                     sign_out_failed = "Sky Cloud konnte sich nicht ausmelden.",
-                    not_authenticated = "Melde dich zuerst bei deinem Sky Cloud-Konto an.", invalid_dark_id = "Gib eine gültige Dark-ID oder einen Einladungscode ein.", profile_not_found = "Diese private Identität wurde nicht gefunden.", self_chat = "Du kannst deiner eigenen Identität keine Nachricht senden.", conversation_not_found = "Diese Unterhaltung ist nicht verfügbar.", blocked = "Nachrichten werden in diesem Gespräch blockiert.", invalid_message = "Gib eine gültige Nachricht ein.", invalid_gif = "Dieses GIF ist ungültig.", invalid_voice = "Diese Sprachnachricht ist ungültig.", invalid_attachment = "Dieses Foto oder Video ist nicht verfügbar.", invalid_profile = "Prüfe deinen Alias und deine Privatsphäre.", rate_limited = "Zu viele Anfragen. Versuch es gleich erneut.", gif_provider_unconfigured = "GIF-Suche ist nicht konfiguriert.", gif_provider_unauthorized = "Der GIF-Anbieterschlüssel ist ungültig.", gif_provider_rate_limited = "Die GIF-Suche ist ausgelastet. Versuch es gleich erneut.", gif_provider_failed = "GIFs sind vorübergehend nicht verfügbar.", default = "DarkChat konnte die Anfrage nicht abschließen.",
+                    not_authenticated = "Melde dich zuerst bei deinem Sky Cloud-Konto an.", invalid_dark_id = "Gib einen gültigen Dark-ID oder Einladungscode ein.", profile_not_found = "Diese private Identität wurde nicht gefunden.", self_chat = "Du kannst deine Identität nicht selbst sagen.", conversation_not_found = "Diese Unterhaltung ist nicht verfügbar.", blocked = "Nachrichten werden in diesem Gespräch blockiert.", invalid_message = "Gib eine gültige Nachricht ein.", invalid_gif = "Diese GIF ist ungültig.", invalid_voice = "Diese Sprachnachricht ist ungültig.", invalid_attachment = "Dieses Foto oder Video ist nicht verfügbar.", invalid_profile = "Prüfe deinen Alias und deine Privatsphäre.", rate_limited = "Zu viele Anfragen. Versuch es gleich erneut.", gif_provider_unconfigured = "GIF-Suche ist nicht konfiguriert.", gif_provider_unauthorized = "Der GIF-Anbieterschlüssel ist ungültig.", gif_provider_rate_limited = "Die GIF-Suche ist ausgelastet. Versuch es gleich erneut.", gif_provider_failed = "GIFs sind vorübergehend nicht verfügbar.", default = "DarkChat konnte die Anfrage nicht abschließen.",
                 },
             },
             messages = {
@@ -695,7 +693,6 @@ Locales["de"] = {
                     gif_provider_rate_limited = "GIPHY ist ausgelastet. Versuch es gleich erneut.", gif_provider_failed = "GIF-Suche ist vorübergehend nicht verfügbar.",
                     self_message = "Du kannst deine eigene Nummer nicht melden.", recipient_not_found = "Diese Nummer ist nicht verfügbar.", blocked = "Dieser Kontakt hat Anrufe und Nachrichten von deinem SIM blockiert.",
                     messaging_unavailable = "Dieser Firmenkontakt akzeptiert keine Nachrichten.",
-                    service_line_text_only = "Firmen-Serviceleitungen akzeptieren derzeit nur Textnachrichten.",
                     no_sim = "Dieses Handy hat keine SIM-Karte.", rate_limited = "Zu viele Nachrichten. Versuch es in einer Minute erneut.",
                     request_failed = "Nachrichten sind vorübergehend nicht verfügbar.", default = "Die Nachricht konnte nicht gesendet werden.",
                 },
@@ -1101,7 +1098,7 @@ Locales["de"] = {
                 profile = { verified = "Charakterbesitz verifiziert", walletKey = "Öffentlicher Crypto-Key", walletKeyBody = "Teile diesen Key, um Krypto zu empfangen. Er gewährt keinen Kontozugriff.", copyKey = "Kopieren", copied = "Kopiert", shareKey = "Teilen", shareTitle = "Mein VaultX Crypto-Key", shareText = "Sende Krypto an meinen öffentlichen VaultX-Key:", trades = "Trades", volume = "Volumen", memberSince = "Mitglied seit", preferences = "Einstellungen", priceAlerts = "Kurswarnungen", priceAlertsBody = "Bei auffälligen Marktbewegungen benachrichtigen.", confirmations = "Handelsbestätigung", confirmationsBody = "Zusätzliche Bestätigung vor der Ausführung behalten.", hideBalances = "Privatsphäre-Modus", hideBalancesBody = "Beträge in VaultX verbergen.", identity = "Profilidentität", edit = "Bearbeiten", account = "Konto & Sicherheit", editTitle = "Profil bearbeiten", editBody = "Ändere deinen Benutzernamen oder lege ein neues Passwort fest. Dein aktuelles Passwort bestätigt Identitätsänderungen.", currentPassword = "Aktuelles Passwort", currentPasswordPlaceholder = "Für Namens- oder Passwortänderungen erforderlich", newPassword = "Neues Passwort", newPasswordPlaceholder = "Leer lassen, um das aktuelle Passwort zu behalten", passwordSecurity = "Passwörter werden speicherintensiv gehasht und nie wieder angezeigt.", saved = "Profil sicher gespeichert.", save = "Profil speichern", saveChanges = "Änderungen speichern", securityTitle = "Geschütztes Profil", securityBody = "Dein Profil bleibt an diesen Framework-Charakter und die Finanzsitzung gebunden." },
                 activityTypes = { buy = "Asset-Kauf", sell = "Asset-Verkauf", deposit = "Bankeinzahlung", withdrawal = "Bankauszahlung", transfer_in = "Krypto empfangen", transfer_out = "Krypto gesendet" },
                 statuses = { completed = "Abgeschlossen", pending = "Prüfung ausstehend", failed = "Fehlgeschlagen", manual_review = "Manuelle Prüfung" },
-                errors = { invalid_profile = "Prüfe deine VaultX-Profileinstellungen.", invalid_handle = "Nutze 3–20 Buchstaben, Zahlen, Punkte oder Unterstriche.", handle_taken = "Dieser VaultX-Benutzername ist bereits vergeben.", profile_exists = "Dieser Charakter besitzt bereits ein VaultX-Profil.", invalid_password = "Nutze 8–72 Zeichen mit Groß- und Kleinbuchstaben, einer Zahl und einem Sonderzeichen.", password_mismatch = "Die Passwörter stimmen nicht überein.", accept_terms = "Bestätige, dass dies ein fiktives Ingame-Wallet ist.", invalid_credentials = "Das Passwort ist falsch.", locked = "Zu viele Versuche. Versuche es später erneut.", not_authenticated = "Logge dich zuerst bei VaultX ein.", invalid_amount = "Gib einen positiven ganzen Betrag ein.", invalid_quantity = "Gib eine Menge mit bis zu sechs Nachkommastellen ein.", invalid_wallet_key = "Gib einen vollständigen VX-Empfangsschlüssel ein.", recipient_not_found = "Zu diesem Key wurde kein aktives VaultX-Konto gefunden.", self_transfer = "Du kannst keine Krypto an deinen eigenen Key senden.", invalid_transfer = "Prüfe Empfänger, Asset und Krypto-Menge.", recipient_limit_exceeded = "Das Empfänger-Wallet kann diese Menge nicht aufnehmen.", insufficient_funds = "Dein verfügbarer Bestand reicht nicht aus.", insufficient_liquidity = "Die Börse kann diese Menge derzeit nicht ausführen.", quote_expired = "Das Angebot ist abgelaufen. Fordere ein neues an.", quote_unavailable = "Das Angebot ist nicht mehr verfügbar.", market_unavailable = "Dieser Markt ist vorübergehend pausiert.", limit_exceeded = "Die Anfrage überschreitet ein Börsenlimit.", duplicate_request = "Diese Anfrage wurde bereits verarbeitet.", rate_limited = "Zu viele Anfragen. Versuche es gleich erneut.", settlement_pending = "Eine Geldbewegung wartet bereits auf Prüfung.", service_unavailable = "VaultX ist vorübergehend nicht verfügbar.", request_failed = "Die sichere Börsenanfrage ist fehlgeschlagen.", default = "VaultX konnte die Anfrage nicht abschließen." },
+                errors = { invalid_profile = "Prüfe deine VaultX-Profileinstellungen.", invalid_handle = "Nutze 3–20 Buchstaben, Zahlen, Punkte oder Unterstriche.", handle_taken = "Dieser VaultX-Benutzername ist bereits vergeben.", profile_exists = "Dieser Charakter besitzt bereits ein VaultX-Profil.", invalid_password = "Das Passwort muss 8–72 Zeichen lang sein.", password_mismatch = "Die Passwörter stimmen nicht überein.", accept_terms = "Bestätige, dass dies ein fiktives Ingame-Wallet ist.", invalid_credentials = "Das Passwort ist falsch.", locked = "Zu viele Versuche. Versuche es später erneut.", not_authenticated = "Logge dich zuerst bei VaultX ein.", invalid_amount = "Gib einen positiven ganzen Betrag ein.", invalid_quantity = "Gib eine Menge mit bis zu sechs Nachkommastellen ein.", invalid_wallet_key = "Gib einen vollständigen VX-Empfangsschlüssel ein.", recipient_not_found = "Zu diesem Key wurde kein aktives VaultX-Konto gefunden.", self_transfer = "Du kannst keine Krypto an deinen eigenen Key senden.", invalid_transfer = "Prüfe Empfänger, Asset und Krypto-Menge.", recipient_limit_exceeded = "Das Empfänger-Wallet kann diese Menge nicht aufnehmen.", insufficient_funds = "Dein verfügbarer Bestand reicht nicht aus.", insufficient_liquidity = "Die Börse kann diese Menge derzeit nicht ausführen.", quote_expired = "Das Angebot ist abgelaufen. Fordere ein neues an.", quote_unavailable = "Das Angebot ist nicht mehr verfügbar.", market_unavailable = "Dieser Markt ist vorübergehend pausiert.", limit_exceeded = "Die Anfrage überschreitet ein Börsenlimit.", duplicate_request = "Diese Anfrage wurde bereits verarbeitet.", rate_limited = "Zu viele Anfragen. Versuche es gleich erneut.", settlement_pending = "Eine Geldbewegung wartet bereits auf Prüfung.", service_unavailable = "VaultX ist vorübergehend nicht verfügbar.", request_failed = "Die sichere Börsenanfrage ist fehlgeschlagen.", default = "VaultX konnte die Anfrage nicht abschließen." },
             },
             banking = {
                 name = "Banking", welcome = "Willkommen zurück", totalBalance = "Gesamtsaldo", recentPeriod = "in jüngster Zeit",
@@ -1229,7 +1226,7 @@ Locales["de"] = {
             },
             skyride = {
                 name = "SkyRide", loading = "Laden SkyRide", unavailable = "SkyRide nicht verfügbar", tryAgain = "Erneut versuchen",
-                mode = { rider = "Passagier", driver = "Fahrer" },
+                mode = { rider = "Reiten", driver = "Antrieb" },
                 riderEyebrow = "Fahr irgendwohin.", whereTo = "Wohin?", pickup = "Abholung", destination = "Ziel",
                 currentLocation = "Aktueller Standort", notSelected = "Nicht ausgewählt", location = "Wähle einen Ort",
                 chooseLocation = { pickup = "Abholvorgang einstellen", destination = "Ziel auswählen" },
@@ -1239,7 +1236,7 @@ Locales["de"] = {
                 zoomIn = "Vergrößern", zoomOut = "Auszoomen", resetMap = "Kartenansicht zurücksetzen",
                 savedPlaces = "Gespeicherte Plätze", savedPlace = "Gespeicherter Ort", quickDestinations = "Schnelle Reiseziele",
                 quickLocations = { ["legion-square"] = "Legionsplatz", ["diamond-casino"] = "Diamant Casino", airport = "Flughafen Los Santos", vinewood = "Weinholz" },
-                viewRides = "Fahrtoptionen anzeigen", change = "Ändern", requestRide = "SkyRide anfragen", playerDriverNotice = "SkyRide vermittelt an echte Spieler-Fahrer. Ein Fahrer muss online sein und deine Anfrage annehmen.",
+                viewRides = "Ansicht Einstellungen für die Fahrt", change = "Veränderung", requestRide = "Anfrage SkyRide",
                 serviceMeta = "{eta} min entfernt · {seats} Sitze", distanceMeters = "{distance} m",
                 distanceKilometers = "{distance} km", distanceMiles = "{distance} mi", durationMinutes = "{minutes} min",
                 fare = "Fahrpreis", calculatedFare = "Berechnet", customFare = "Eigener Preis",
@@ -1273,7 +1270,7 @@ Locales["de"] = {
                     arrived = "Fahrer angekommen", in_progress = "Auf dem Weg", completed = "Abgeschlossen", cancelled = "Abgebrochen",
                 },
                 statusBody = {
-                    searching = "Deine Anfrage wartet darauf, dass ein verfügbarer Spieler-Fahrer sie annimmt.", accepted = "Dein Fahrer bereitet die Abholung vor.",
+                    searching = "Wir passen zu dir mit einem Fahrer in der Nähe.", accepted = "Dein Fahrer will dich abholen.",
                     driver_arriving = "Dein Fahrer ist auf dem Weg zu deinem Pickup.", arrived = "Dein Fahrer wartet am Abholpunkt.",
                     in_progress = "Du bist auf dem Weg zu deinem Ziel.", completed = "Du bist am Ziel angekommen.",
                     cancelled = "Diese Fahrt ist nicht mehr aktiv.",
@@ -1450,17 +1447,15 @@ Locales["de"] = {
             camera = {
                 name = "Kamera", flash = "Blitz", flip = "Kamera wechseln", landscape = "Zum Querformat wechseln",
                 portrait = "Zum Hochformat wechseln", photo = "Foto", video = "Video", microphoneOn = "Mikrofon eingeschaltet", microphoneOff = "Mikrofon stumm",
-                focusHelp = "Halte die Umschautaste gedrückt, um dich umzusehen", returnHelp = "Umschautaste loslassen für Steuerung", lockCamera = "Kamerabewegung sperren",
-                unlockCamera = "Kamerabewegung entsperren", lookKey = "Umschauen", uploading = "Upload: {count}",
+                focusHelp = "Halte die Leertaste gedrückt, um dich umzusehen", returnHelp = "Leertaste für Steuerung", lockCamera = "Kamerabewegung sperren",
+                unlockCamera = "Kamerabewegung entsperren", spaceKey = "Leertaste", uploading = "Upload: {count}",
                 saving = "Video speichern...", openGallery = "Fotos öffnen", takePhoto = "Foto machen",
                 startRecording = "Aufnahme starten", stopRecording = "Aufnahme beenden", saved = "Auf Fotos gespeichert.",
                 zoom = "Kamerazoom auf {zoom} einstellen",
                 errors = {
                     cancelled = "Die Aufnahme ist abgesagt.", capture_failed = "Die Spielansicht kann nicht erfasst werden.",
                     invalid_media_type = "Der hochgeladene Medientyp ist ungültig.", invalid_upload = "Der Upload konnte nicht überprüft werden.",
-                    invalid_upload_token = "Die Upload-Sitzung ist nicht mehr gültig.", media_provider_failed = "Der Kamera-Upload-Dienst ist nicht verfügbar.",
-                    media_provider_rate_limited = "Der Kamera-Upload-Dienst ist ausgelastet. Versuch es gleich erneut.", media_provider_unauthorized = "Der konfigurierte FiveManage API-Schlüssel wurde abgelehnt.",
-                    missing_config = "Kamera-Uploads sind nicht konfiguriert.",
+                    invalid_upload_token = "Die Upload-Sitzung ist nicht mehr gültig.", missing_config = "Kamera-Uploads sind nicht konfiguriert.",
                     microphone_unavailable = "Erlaube den Mikrofonzugriff oder schalte das Mikrofon vor der Aufnahme stumm.",
                     not_found = "Das Medienobjekt existiert nicht mehr.", owner_changed = "Das aktive Telefonkonto hat sich beim Upload geändert.",
                     operation_in_progress = "Eine weitere Medienoperation ist bereits im Gange.",
@@ -2022,11 +2017,10 @@ Locales["de"] = {
                 },
                 account = {
                     account = "Account", title = "App-Verwaltung", skyAccount = "Sky Phone Konto",
-                    apps = "Installierte Apps", games = "Spiele", library = "Deine Bibliothek.", myApps = "Meine Apps",
+                    apps = "Installation von Apps", games = "Spiele", library = "Deine Bibliothek.", myApps = "Meine Apps",
                     downloadedOn = "Gespeichert {date}", uninstall = "Deinstallieren", uninstallApp = "Deinstallieren {app}",
                     uninstallTitle = "Diese App deinstallieren?",
                     uninstallBody = "{app} wird von diesem Handy entfernt. Du kannst die App erneut aus dem App Store laden.",
-                    uninstallFailed = "Die App konnte nicht deinstalliert werden. Bitte versuche es erneut.",
                 },
                 details = {
                     skyStudios = "Sky Studios", share = "App teilen", openDetails = "Ansicht {app}",
@@ -2140,41 +2134,3 @@ Locales["de"] = {
         },
     },
 }
-
-Locales["de"].Nui.AdminPanel.configurator.table.subtabs = {
-    Dictionaries = "Animationsdateien",
-    Clips = "Clips",
-    Transforms = "Transformationen",
-    RateLimits = "Ratenlimits",
-    Publishers = "Herausgeber",
-    ExternalPingResources = "Externe Ping-Ressourcen",
-    Markets = "Märkte",
-    TrustedAdapters = "Vertrauenswürdige Adapter",
-    AllowedDisappearTimers = "Erlaubte Löschzeiten",
-    MusicTracks = "Musiktitel",
-    VehicleImages = "Fahrzeugbilder",
-    Custom = "Benutzerdefiniert",
-    Valet = "Parkservice",
-    AutoPriority = "Automatische Priorität",
-    Camera = "Kamera",
-    Categories = "Kategorien",
-    Districts = "Bezirke",
-    PhotoGradients = "Fotoverläufe",
-    LbPhone = "LB Phone",
-    Tracks = "Titel",
-    Props = "Props",
-    CustomLocations = "Benutzerdefinierte Standorte",
-    Animation = "Animation",
-    ReportReasons = "Meldegründe",
-    DisplayName = "Anzeigename",
-    Hud = "HUD",
-    Badge = "Abzeichen",
-    LockedChannels = "Gesperrte Kanäle",
-    NumberGroups = "Nummerngruppen",
-    CustomFare = "Benutzerdefinierter Tarif",
-    DriverJobs = "Fahrerjobs",
-    Services = "Dienstleistungen",
-    QuickLocations = "Schnellziele",
-    AllowedJobs = "Erlaubte Jobs",
-    Websites = "Webseiten",
-}

sky_phone/config/locales/en.lua

@@ -1,7 +1,7 @@
 Locales["en"] = {
     CommandDescription = "Open your phone.",
     AdminCommand = {
-        CommandDescription = "Open phone administration and configuration.",
+        CommandDescription = "Open the protected phone admin panel.",
         Errors = {
             disabled = "The phone admin panel is disabled.",
             not_authorized = "You do not have access to the phone admin panel.",
@@ -43,7 +43,6 @@ Locales["en"] = {
         invalid_sim = "This SIM card has invalid metadata.",
         phone_required = "You need a phone in your inventory.",
         operation_in_progress = "Another phone operation is already in progress.",
-        rate_limited = "The phone was opened too often. Try again in a moment.",
         voice_unavailable = "The configured phone voice service is unavailable.",
         default = "The phone could not be opened.",
     },
@@ -204,10 +203,9 @@ Locales["en"] = {
         },
         AdminPanel = {
             name = "Phone Admin", subtitle = "Administration", navigation = "Admin navigation", refresh = "Refresh admin data", loading = "Loading protected data...",
-            tabs = { overview = "Overview", players = "Players", devices = "Devices", apps = "Apps", accounts = "Accounts", messages = "Messages", calls = "Calls", moderation = "Moderation", audit = "Audit", configurator = "Phone configurator" },
-            overview = { eyebrow = "Server", title = "Dashboard", body = "Players, devices, apps, and phone data.", stats = "Server phone statistics", online = "Online", devices = "Devices", accounts = "Accounts", audit = "Audit entries", control = "Navigation", features = "Modules", featuresBody = "Open an administration module.", recent = "Recent activity", playerFeature = "Identity, finances, job, and duty", deviceFeature = "IMEI, SIM, number, and activity", appFeature = "Install or remove phone apps", accountFeature = "Account access and protected credentials", messageFeature = "Review recent SMS activity", callFeature = "Review recent call activity", moderationFeature = "Reset access, number, or device data", auditFeature = "Review sensitive admin actions", configuratorFeature = "Manage config.lua and media.lua through SQL" },
-            statistics = { eyebrow = "Live data", title = "Phone statistics", body = "Current usage and device status, refreshed every 15 seconds.", today = "Activity today", todayBody = "Phone and admin activity since midnight.", messagesToday = "Messages", callsToday = "Calls", auditToday = "Admin actions", coverage = "Device coverage", coverageBody = "Current share of all stored phones.", linkedDevices = "Account linked", simDevices = "SIM assigned", activeDevices = "Updated in 24 hours", ofDevices = "{count} of {total} devices" },
-            configurator = { context = "Runtime configuration", eyebrow = "System tool", sections = "Configuration", search = "Search settings or paths", configScope = "config.lua", mediaScope = "media.lua", noResults = "No matching settings", loading = "Loading SQL configuration...", title = "Phone configurator", body = "Manage phone and media settings from the protected admin workspace.", disabledTitle = "SQL configuration is not active", disabledBody = "Enable the configurator at the beginning of config.lua and restart sky_phone. Until then, file values remain active and editing is locked.", manualSave = "Manual save", refreshNotice = "Nothing is written automatically. The green check verifies config.lua and media.lua in SQL and refreshes the active server, client, media and UI configuration immediately.", fieldCount = "{count} fields", secretConfigured = "Secret configured · enter a replacement", invalidValue = "Check the highlighted table or number value.", saved = "SQL configuration saved and applied.", descriptions = { featureToggle = "Turns {name} on or off.", boolean = "Controls whether {name} is allowed.", number = "Sets the numeric value for {name}.", text = "Sets the text value used for {name}.", optionalText = "Sets the optional value for {name}; switch it off to disable it.", list = "Manages all entries used for {name}.", table = "Groups the related settings for {name}.", credential = "Stores the protected credential used by {name}.", url = "Sets the URL or endpoint used by {name}.", hosts = "Defines which domains are allowed for {name}.", milliseconds = "Sets the timing for {name} in milliseconds.", seconds = "Sets the timing for {name} in seconds.", rateLimit = "Limits how many {name} actions are allowed per minute.", byteLimit = "Sets the maximum data size allowed for {name}.", textLimit = "Sets the maximum text length allowed for {name}.", distance = "Sets the world distance used for {name}.", coordinates = "Sets the world coordinates or orientation for {name}.", gameAsset = "Sets the GTA model or prop used for {name}.", animation = "Sets the animation asset used for {name}.", access = "Defines the jobs, groups or permission level for {name}.", integration = "Selects the connected framework or provider for {name}.", path = "Sets the storage or resource path used for {name}.", color = "Sets the interface color used for {name}.", displayText = "Sets the text shown to players for {name}.", phoneNumber = "Sets the phone or service number used for {name}.", routing = "Controls how incoming requests are routed for {name}.", command = "Sets the chat command used to open or run {name}.", locale = "Selects the language used for {name}.", debug = "Controls detailed diagnostic output for {name}.", mediaQuality = "Sets the media quality or volume used for {name}.", amount = "Sets the maximum or displayed amount for {name}." }, table = { list = "List", table = "Key table", vector = "Vector", entry = "Entry", general = "General", addRow = "Add row", addField = "Add field", remove = "Remove", emptyList = "No rows yet. Add the first row with plus.", emptyTable = "No fields yet. Add the first key below.", keyPlaceholder = "New key", convertToList = "Use list", convertToMap = "Use typed key table", convertToTable = "Use key table", types = { string = "Text", number = "Number", boolean = "Switch", list = "List", table = "Table" } } },
+            tabs = { overview = "Overview", players = "Players", devices = "Devices", apps = "Apps", accounts = "Accounts", messages = "Messages", calls = "Calls", moderation = "Moderation", audit = "Audit" },
+            overview = { eyebrow = "Server", title = "Dashboard", body = "Players, devices, apps, and phone data.", stats = "Server phone statistics", online = "Online", devices = "Devices", accounts = "Accounts", audit = "Audit entries", control = "Navigation", features = "Modules", featuresBody = "Open an administration module.", recent = "Recent activity", playerFeature = "Identity, finances, job, and duty", deviceFeature = "IMEI, SIM, number, and activity", appFeature = "Install or remove phone apps", accountFeature = "Account access and protected credentials", messageFeature = "Review recent SMS activity", callFeature = "Review recent call activity", moderationFeature = "Reset access, number, or device data", auditFeature = "Review sensitive admin actions" },
+            appearance = { eyebrow = "Appearance", title = "Accent color", body = "Change the accent across the complete admin workspace.", colors = { emerald = "Emerald", blue = "Blue", violet = "Violet", orange = "Orange", red = "Red" } },
             players = { eyebrow = "Active sessions", title = "Online players", online = "Online now", empty = "No players found", emptyBody = "Adjust the search or refresh the live player list." },
             search = { players = "Search name, ID, job, or number", apps = "Search apps", clear = "Clear search" },
             detail = { character = "Character profile", data = "Player data overview", cash = "Cash", bank = "Bank", job = "Job", duty = "Duty", onDuty = "On duty", offDuty = "Off duty", identity = "Identity", playerData = "Player data", identifier = "Character identifier", birthdate = "Birthdate", grade = "Job grade", unknown = "Unknown" },
@@ -220,9 +218,9 @@ Locales["en"] = {
                 dialogs = { ["reset-passcodeTitle"] = "Reset device passcode?", ["reset-passcodeBody"] = "The player can unlock this phone without the previous PIN afterward.", ["change-numberTitle"] = "Change phone number?", ["change-numberBody"] = "The new number must match the configured server number format and be unique.", ["factory-resetTitle"] = "Factory reset this phone?", ["factory-resetBody"] = "This clears local device data, app settings, security, and the linked account. This cannot be undone." },
                 confirm = { ["reset-passcode"] = "Reset passcode", ["change-number"] = "Change number", ["factory-reset"] = "Factory reset" },
             },
-            audit = { eyebrow = "Accountability", title = "Audit trail", body = "Sensitive reveals and remote app changes are recorded here.", empty = "No admin actions yet", emptyBody = "Protected actions will appear here after they are performed.", by = "{actor} · target ID {target}", actions = { grant_app = "App installed", revoke_app = "App removed", reveal_account_password = "Password revealed", view_messages = "Messages viewed", view_calls = "Calls viewed", reset_passcode = "Passcode reset", change_number = "Phone number changed", factory_reset = "Phone factory reset", save_configuration = "Configuration saved" } },
-            editor = { brand = "SKY PHONE", workspace = "ADMIN", players = "Player directory", audit = "Audit log", selectPlayer = "Select a player to inspect identity, devices, credentials, and app access.", save = "Save changes", saveHint = "Apply pending changes", saved = "Changes saved.", unsaved = "Unsaved changes", close = "Close admin panel", refresh = "Refresh live data", online = "LIVE", profile = "PROFILE", financial = "FINANCIAL", device = "DEVICE", security = "SECURITY", noAutoSave = "Manual save", noAutoSaveBody = "Changes stay local until the green check is pressed.", discardTitle = "Discard unsaved changes?", discardBody = "Your staged app or configuration changes have not been saved.", keepEditing = "Keep editing", discard = "Discard changes", saveFailed = "Some changes could not be saved.", noSelection = "No player selected" },
-            errors = { not_authorized = "You do not have access to the admin panel.", rate_limited = "Too many admin requests. Please wait.", player_unavailable = "That player is no longer online.", device_not_owned = "That phone no longer belongs to the selected player.", invalid_app = "That app is not registered on the server.", app_protected = "This system app cannot be removed.", revision_conflict = "The data changed in the meantime. Reopen the section and try again.", configurator_disabled = "Enable the phone configurator in config.lua first.", invalid_field = "That configuration field is no longer available.", invalid_value = "A configuration value is invalid.", invalid_company_configuration = "The company configuration is incomplete or contains a duplicate job, service number, or service ID.", account_not_found = "No iFruit account is linked to this phone.", invalid_phone_number = "Enter a phone number in the configured server format.", phone_number_unchanged = "This SIM already uses that phone number.", phone_number_taken = "That phone number is already assigned.", no_sim = "This phone has no SIM that can be changed.", passcode_not_set = "This phone has no passcode configured.", device_not_found = "This phone no longer exists.", metadata_unsupported = "The phone inventory metadata could not be updated.", invalid_request = "The admin request was invalid.", request_failed = "The admin request failed.", default = "The admin panel is temporarily unavailable." },
+            audit = { eyebrow = "Accountability", title = "Audit trail", body = "Sensitive reveals and remote app changes are recorded here.", empty = "No admin actions yet", emptyBody = "Protected actions will appear here after they are performed.", by = "{actor} · target ID {target}", actions = { grant_app = "App installed", revoke_app = "App removed", reveal_account_password = "Password revealed", view_messages = "Messages viewed", view_calls = "Calls viewed", reset_passcode = "Passcode reset", change_number = "Phone number changed", factory_reset = "Phone factory reset" } },
+            editor = { brand = "SKY PHONE", workspace = "ADMIN", players = "Player directory", audit = "Audit log", selectPlayer = "Select a player to inspect identity, devices, credentials, and app access.", save = "Save changes", saveHint = "Apply pending changes", saved = "Changes saved.", unsaved = "Unsaved changes", close = "Close admin panel", refresh = "Refresh live data", online = "LIVE", profile = "PROFILE", financial = "FINANCIAL", device = "DEVICE", security = "SECURITY", noAutoSave = "Manual save", noAutoSaveBody = "Changes stay local until the green check is pressed.", discardTitle = "Discard unsaved changes?", discardBody = "Your staged app changes have not been saved.", keepEditing = "Keep editing", discard = "Discard changes", saveFailed = "Some changes could not be saved.", noSelection = "No player selected" },
+            errors = { not_authorized = "You do not have access to the admin panel.", rate_limited = "Too many admin requests. Please wait.", player_unavailable = "That player is no longer online.", device_not_owned = "That phone no longer belongs to the selected player.", invalid_app = "That app is not registered on the server.", app_protected = "This system app cannot be removed.", revision_conflict = "The phone changed in the meantime. Refresh and try again.", account_not_found = "No iFruit account is linked to this phone.", invalid_phone_number = "Enter a phone number in the configured server format.", phone_number_unchanged = "This SIM already uses that phone number.", phone_number_taken = "That phone number is already assigned.", no_sim = "This phone has no SIM that can be changed.", passcode_not_set = "This phone has no passcode configured.", device_not_found = "This phone no longer exists.", metadata_unsupported = "The phone inventory metadata could not be updated.", invalid_request = "The admin request was invalid.", request_failed = "The admin request failed.", default = "The admin panel is temporarily unavailable." },
         },
         Apps = {
             health = {
@@ -637,7 +635,7 @@ Locales["en"] = {
                 createIdentity = "Create Dark Identity", createIdentityBody = "Create a private identity before starting a DarkChat conversation.",
                 security = "Security", privateNetwork = "Private invitation-only network", noResults = "No Results", noResultsBody = "Try another alias or Dark-ID.",
                 noChats = "No Private Chats", noChatsBody = "Connect with a Dark-ID or invitation code. There is no public search.", newChat = "New Chat", to = "To:",
-                connectPrivately = "Connect privately", newChatBody = "Enter another person's Dark-ID or invitation code. You can share your own ID from your profile.", darkIdOrInvite = "Dark-ID or invitation code", continue = "Continue", contacts = "DarkChat Contacts", contactsHint = "Saved private identities appear only on your DarkChat account.", noContacts = "No saved DarkChat contacts", private = "Private", shareIdentity = "Tap to share your private identity",
+                connectPrivately = "Connect privately", newChatBody = "Enter an exact Dark-ID or invitation code. Unknown identities require confirmation.", darkIdOrInvite = "Dark-ID or invitation code", continue = "Continue", contacts = "DarkChat Contacts", contactsHint = "Saved private identities appear only on your DarkChat account.", noContacts = "No saved DarkChat contacts", private = "Private", shareIdentity = "Tap to share your private identity",
                 message = "Dark message", activeNow = "Activity shared", encryptedSession = "Private session", serverPrivate = "Private server-stored conversation",
                 emoji = "Emoji", gif = "GIF", gifs = "GIFs", photo = "Photo", video = "Video", attachPhoto = "Attach Photo", takePhoto = "Take Photo", attachGif = "Attach GIF", attachVideo = "Attach Video", searchGifs = "Search GIFs", loadMore = "Load More",
                 voiceMessage = "Voice message", sending = "Sending", failed = "Not delivered", delivered = "Delivered", read = "Read", replying = "Replying to",
@@ -695,7 +693,6 @@ Locales["en"] = {
                     gif_provider_rate_limited = "GIPHY is busy. Try again in a moment.", gif_provider_failed = "GIF search is temporarily unavailable.",
                     self_message = "You cannot message your own number.", recipient_not_found = "That number is unavailable.", blocked = "This contact has blocked calls and messages from your SIM.",
                     messaging_unavailable = "This company contact does not accept messages.",
-                    service_line_text_only = "Company service lines currently accept text messages only.",
                     no_sim = "This phone has no SIM card.", rate_limited = "Too many messages. Try again in a minute.",
                     request_failed = "Messages are temporarily unavailable.", default = "The message could not be sent.",
                 },
@@ -1101,7 +1098,7 @@ Locales["en"] = {
                 profile = { verified = "Character ownership verified", walletKey = "Public crypto key", walletKeyBody = "Share this key to receive crypto. It cannot access your account.", copyKey = "Copy", copied = "Copied", shareKey = "Share", shareTitle = "My VaultX crypto key", shareText = "Send crypto to my public VaultX key:", trades = "Trades", volume = "Volume", memberSince = "Member since", preferences = "Preferences", priceAlerts = "Price alerts", priceAlertsBody = "Notify me about notable market moves.", confirmations = "Trade confirmations", confirmationsBody = "Keep an extra confirmation before execution.", hideBalances = "Privacy mode", hideBalancesBody = "Hide balances across VaultX.", identity = "Profile identity", edit = "Edit", account = "Account & security", editTitle = "Edit profile", editBody = "Update your handle or set a new password. Your current password confirms identity changes.", currentPassword = "Current password", currentPasswordPlaceholder = "Required for handle or password changes", newPassword = "New password", newPasswordPlaceholder = "Leave blank to keep your current password", passwordSecurity = "Passwords use memory-hard hashing and are never shown again.", saved = "Profile saved securely.", save = "Save profile", saveChanges = "Save changes", securityTitle = "Protected profile", securityBody = "Your profile stays bound to this framework character and financial session." },
                 activityTypes = { buy = "Asset purchase", sell = "Asset sale", deposit = "Bank deposit", withdrawal = "Bank withdrawal", transfer_in = "Crypto received", transfer_out = "Crypto sent" },
                 statuses = { completed = "Completed", pending = "Pending review", failed = "Failed", manual_review = "Manual review" },
-                errors = { invalid_profile = "Check your VaultX profile settings.", invalid_handle = "Use 3–20 letters, numbers, dots or underscores.", handle_taken = "That VaultX handle is already taken.", profile_exists = "This character already owns a VaultX profile.", invalid_password = "Use 8–72 characters with uppercase, lowercase, a number, and a special character.", password_mismatch = "The passwords do not match.", accept_terms = "Confirm that this is a fictional in-game wallet.", invalid_credentials = "The password is incorrect.", locked = "Too many attempts. Try again later.", not_authenticated = "Sign in to VaultX first.", invalid_amount = "Enter a positive whole amount.", invalid_quantity = "Enter a quantity with up to six decimals.", invalid_wallet_key = "Enter a complete VX receiving key.", recipient_not_found = "No active VaultX account uses this key.", self_transfer = "You cannot send crypto to your own key.", invalid_transfer = "Verify a recipient, asset and valid crypto amount.", recipient_limit_exceeded = "The recipient wallet cannot hold that amount.", insufficient_funds = "Your available balance is too low.", insufficient_liquidity = "The exchange cannot fill that amount right now.", quote_expired = "This quote expired. Request a new one.", quote_unavailable = "The quote is no longer available.", market_unavailable = "This market is temporarily paused.", limit_exceeded = "This request exceeds an exchange limit.", duplicate_request = "This request was already processed.", rate_limited = "Too many requests. Try again shortly.", settlement_pending = "A money transfer is already pending review.", service_unavailable = "VaultX is temporarily unavailable.", request_failed = "The secure exchange request failed.", default = "VaultX could not complete the request." },
+                errors = { invalid_profile = "Check your VaultX profile settings.", invalid_handle = "Use 3–20 letters, numbers, dots or underscores.", handle_taken = "That VaultX handle is already taken.", profile_exists = "This character already owns a VaultX profile.", invalid_password = "Password must be 8–72 characters.", password_mismatch = "The passwords do not match.", accept_terms = "Confirm that this is a fictional in-game wallet.", invalid_credentials = "The password is incorrect.", locked = "Too many attempts. Try again later.", not_authenticated = "Sign in to VaultX first.", invalid_amount = "Enter a positive whole amount.", invalid_quantity = "Enter a quantity with up to six decimals.", invalid_wallet_key = "Enter a complete VX receiving key.", recipient_not_found = "No active VaultX account uses this key.", self_transfer = "You cannot send crypto to your own key.", invalid_transfer = "Verify a recipient, asset and valid crypto amount.", recipient_limit_exceeded = "The recipient wallet cannot hold that amount.", insufficient_funds = "Your available balance is too low.", insufficient_liquidity = "The exchange cannot fill that amount right now.", quote_expired = "This quote expired. Request a new one.", quote_unavailable = "The quote is no longer available.", market_unavailable = "This market is temporarily paused.", limit_exceeded = "This request exceeds an exchange limit.", duplicate_request = "This request was already processed.", rate_limited = "Too many requests. Try again shortly.", settlement_pending = "A money transfer is already pending review.", service_unavailable = "VaultX is temporarily unavailable.", request_failed = "The secure exchange request failed.", default = "VaultX could not complete the request." },
             },
             banking = {
                 name = "Banking", welcome = "Welcome back", totalBalance = "Total Balance", recentPeriod = "in recent activity",
@@ -1239,7 +1236,7 @@ Locales["en"] = {
                 zoomIn = "Zoom in", zoomOut = "Zoom out", resetMap = "Reset map view",
                 savedPlaces = "Saved places", savedPlace = "Saved place", quickDestinations = "Quick destinations",
                 quickLocations = { ["legion-square"] = "Legion Square", ["diamond-casino"] = "Diamond Casino", airport = "Los Santos Airport", vinewood = "Vinewood" },
-                viewRides = "View Ride Options", change = "Change", requestRide = "Request SkyRide", playerDriverNotice = "SkyRide matches you with real player drivers. A driver must be online and accept your request.",
+                viewRides = "View Ride Options", change = "Change", requestRide = "Request SkyRide",
                 serviceMeta = "{eta} min away · {seats} seats", distanceMeters = "{distance} m",
                 distanceKilometers = "{distance} km", distanceMiles = "{distance} mi", durationMinutes = "{minutes} min",
                 fare = "Trip fare", calculatedFare = "Calculated", customFare = "Own price",
@@ -1273,7 +1270,7 @@ Locales["en"] = {
                     arrived = "Driver arrived", in_progress = "On the way", completed = "Completed", cancelled = "Cancelled",
                 },
                 statusBody = {
-                    searching = "Your request is waiting for an available player driver to accept it.", accepted = "Your driver is preparing to pick you up.",
+                    searching = "We are matching you with a nearby driver.", accepted = "Your driver is preparing to pick you up.",
                     driver_arriving = "Your driver is on the way to your pickup.", arrived = "Your driver is waiting at the pickup point.",
                     in_progress = "You are on the way to your destination.", completed = "You have arrived at your destination.",
                     cancelled = "This ride is no longer active.",
@@ -1450,17 +1447,15 @@ Locales["en"] = {
             camera = {
                 name = "Camera", flash = "Flash", flip = "Flip camera", landscape = "Switch to landscape",
                 portrait = "Switch to portrait", photo = "Photo", video = "Video", microphoneOn = "Microphone on", microphoneOff = "Microphone muted",
-                focusHelp = "Hold the look key to look around", returnHelp = "Release the look key for controls", lockCamera = "Lock camera movement",
-                unlockCamera = "Unlock camera movement", lookKey = "Look", uploading = "{count} uploading",
+                focusHelp = "Hold Space to look around", returnHelp = "Release Space for controls", lockCamera = "Lock camera movement",
+                unlockCamera = "Unlock camera movement", spaceKey = "Space", uploading = "{count} uploading",
                 saving = "Saving video...", openGallery = "Open Photos", takePhoto = "Take photo",
                 startRecording = "Start recording", stopRecording = "Stop recording", saved = "Saved to Photos.",
                 zoom = "Set camera zoom to {zoom}",
                 errors = {
                     cancelled = "Capture cancelled.", capture_failed = "Unable to capture the game view.",
                     invalid_media_type = "The uploaded media type is invalid.", invalid_upload = "The upload could not be verified.",
-                    invalid_upload_token = "The upload session is no longer valid.", media_provider_failed = "The camera upload service is unavailable.",
-                    media_provider_rate_limited = "The camera upload service is busy. Try again shortly.", media_provider_unauthorized = "The configured FiveManage API key was rejected.",
-                    missing_config = "Camera uploads are not configured.",
+                    invalid_upload_token = "The upload session is no longer valid.", missing_config = "Camera uploads are not configured.",
                     microphone_unavailable = "Allow microphone access or mute the microphone before recording.",
                     not_found = "The media item no longer exists.", owner_changed = "The active phone account changed during upload.",
                     operation_in_progress = "Another media operation is already in progress.",
@@ -2026,7 +2021,6 @@ Locales["en"] = {
                     downloadedOn = "Downloaded {date}", uninstall = "Uninstall", uninstallApp = "Uninstall {app}",
                     uninstallTitle = "Uninstall this app?",
                     uninstallBody = "{app} will be removed from this phone. You can download it again from the App Store.",
-                    uninstallFailed = "The app could not be uninstalled. Please try again.",
                 },
                 details = {
                     skyStudios = "Sky Studios", share = "Share app", openDetails = "View {app}",
@@ -2140,41 +2134,3 @@ Locales["en"] = {
         },
     },
 }
-
-Locales["en"].Nui.AdminPanel.configurator.table.subtabs = {
-    Dictionaries = "Dictionaries",
-    Clips = "Clips",
-    Transforms = "Transforms",
-    RateLimits = "Rate Limits",
-    Publishers = "Publishers",
-    ExternalPingResources = "External Ping Resources",
-    Markets = "Markets",
-    TrustedAdapters = "Trusted Adapters",
-    AllowedDisappearTimers = "Allowed Disappear Timers",
-    MusicTracks = "Music Tracks",
-    VehicleImages = "Vehicle Images",
-    Custom = "Custom",
-    Valet = "Valet",
-    AutoPriority = "Automatic Priority",
-    Camera = "Camera",
-    Categories = "Categories",
-    Districts = "Districts",
-    PhotoGradients = "Photo Gradients",
-    LbPhone = "LB Phone",
-    Tracks = "Tracks",
-    Props = "Props",
-    CustomLocations = "Custom Locations",
-    Animation = "Animation",
-    ReportReasons = "Report Reasons",
-    DisplayName = "Display Name",
-    Hud = "HUD",
-    Badge = "Badge",
-    LockedChannels = "Locked Channels",
-    NumberGroups = "Number Groups",
-    CustomFare = "Custom Fare",
-    DriverJobs = "Driver Jobs",
-    Services = "Services",
-    QuickLocations = "Quick Locations",
-    AllowedJobs = "Allowed Jobs",
-    Websites = "Websites",
-}

sky_phone/config/media.lua

@@ -1,26 +1,19 @@
 --[[
     Sky Phone media configuration
 
-    This file is loaded on the server only. Keep API keys private. When the
-    phone configurator is enabled in config.lua, the active media configuration
-    is loaded from SQL and frontend builds copy the shipped values from this
-    file into source/shared/config_default.lua.
+    This file is loaded on the server only. Keep API keys private and restart
+    sky_phone after changing providers, upload limits, or import sources.
 ]]
 
 Config.Media = {
-    -- Create or sign in to an account at https://developers.giphy.com/, open
-    -- the Developer Dashboard, choose "Create an API Key", and paste it here.
-    GiphyApiKey = "",
+    GiphyApiKey = "", -- Paste the GIPHY API key here.
     GifPageSize = 24,
     GifRating = "pg-13",
     UrlMaxLength = 2048,
     AllowedGifHosts = { "giphy.com" },
 
-    -- Create or sign in at https://fivemanage.com/, create or select your team,
-    -- then open Dashboard > Tokens and create a token with Media access. Keep
-    -- this server-only token private and paste it here.
     FiveManage = {
-        ApiKey = "",
+        ApiKey = "", -- Paste a newly generated FiveManage V3 Media API token here.
         BaseUrl = "https://api.fivemanage.com/api/v3/file",
         RequestTimeoutMs = 10000,
         UploadTimeoutMs = 25000,

sky_phone/fxmanifest.lua

@@ -6,7 +6,7 @@ use_experimental_fxv2_oal 'yes'
 
 author 'Sky-Systems'
 description 'Sky Phone'
-version '0.3.2'
+version '0.1.0'
 
 provide 'lb-phone'
 provide '17mov_Phone'
@@ -30,10 +30,10 @@ shared_scripts {
 
 client_scripts {
     'config/config.lua',
-    'config/locales/*.lua',
-    'source/bridge/client/callbacks.lua',
-    'source/client/phone_configurator.lua',
+    'config/locales/en.lua',
+    'config/locales/de.lua',
     'source/bridge/client/framework.lua',
+    'source/bridge/client/callbacks.lua',
     'source/bridge/client/housing.lua',
     'source/bridge/client/housing/*.lua',
     'source/bridge/client/calls.lua',
@@ -76,22 +76,16 @@ server_scripts {
     'config/media.lua',
     'config/locales/en.lua',
     'config/locales/de.lua',
-    'config/locales/es.lua',
-    'source/shared/config_default.lua',
-    'source/server/nui_build_check.lua',
     'source/server/update_check.lua',
     'source/bridge/server/database.lua',
     'source/bridge/server/migrations.lua',
-    'source/server/phone_configurator_schema.lua',
     'source/bridge/server/callbacks.lua',
-    'source/server/phone_configurator.lua',
     'source/bridge/server/framework.lua',
     'source/bridge/server/frameworks/*.lua',
     'source/bridge/server/housing.lua',
     'source/bridge/server/housing/*.lua',
     'source/bridge/server/inventory.lua',
     'source/bridge/server/inventory/*.lua',
-    'source/bridge/server/inventory_contract.lua',
     'source/bridge/server/voice.lua',
     'source/server/custom_apps.lua',
     'source/server/media_metadata.lua',
@@ -113,7 +107,6 @@ server_scripts {
     'source/server/notifications.lua',
     'source/shared/public_api.lua',
     'source/server/public_api.lua',
-    'source/server/media_provider_config.lua',
     'source/server/media_import.lua',
     'source/server/media_import/fivemanage.lua',
     'source/server/media_import/manifest.lua',
@@ -157,7 +150,6 @@ files {
     'source/html/index.html',
     'source/html/assets/**',
     'source/html/img/**',
-    'source/html/sounds/**',
     'config/music/**',
 }
 

sky_phone/source/bridge/client/calls.lua

@@ -11,15 +11,6 @@ local provider_aliases = {
 
 local function resolve_provider()
     local configured = tostring(Config.Calls.VoiceProvider or "")
-    if configured == "auto" then
-        for _, candidate in ipairs({ "yaca", "pma", "saltychat" }) do
-            if GetResourceState(provider_resources[candidate]) == "started" then
-                return candidate
-            end
-        end
-        return nil
-    end
-
     local selected = provider_aliases[configured] or configured
     local resource_name = provider_resources[selected]
     if resource_name and GetResourceState(resource_name) == "started" then

sky_phone/source/bridge/client/framework.lua

@@ -21,24 +21,11 @@ local function resolve_framework()
     return nil
 end
 
-local function refresh_framework()
-    local resolved = resolve_framework()
-    if resolved ~= "esx" and resolved ~= "qbox" and resolved ~= "qb" then
-        error("[sky_phone] No supported framework is running. Configure Config.Bridge.Framework.")
-    end
-    if resolved == framework_name then
-        return
-    end
-
-    framework_name = resolved
-    esx = nil
-    qb = nil
+framework_name = resolve_framework()
+if not framework_name then
+    error("[sky_phone] No supported framework is running. Configure Config.Bridge.Framework.")
 end
 
-refresh_framework()
-
-AddEventHandler("sky_phone:configurator:updated", refresh_framework)
-
 function Bridge.Framework.GetName()
     return framework_name
 end

sky_phone/source/bridge/client/housing/tgiann.lua

@@ -1,73 +0,0 @@
-local provider_name = "tgiann"
-local resource_name = "tgiann-house"
-
-local function house_reference(value)
-    if type(value) ~= "string" then
-        return nil
-    end
-    return value ~= "" and value or nil
-end
-
-local function house_entrance(house)
-    local success, house_data = pcall(function()
-        return exports[resource_name]:getHouseData(house)
-    end)
-    if not success then
-        Bridge.Debug(
-            "error",
-            "[sky_phone] tgiann-house:getHouseData failed for '%s': %s",
-            house,
-            tostring(house_data)
-        )
-        return nil, "provider_error"
-    end
-    local entrance = type(house_data) == "table"
-        and Bridge.Normalize.Coordinates(house_data.doorCoord) or nil
-    if not entrance then
-        return nil, "invalid_coordinates"
-    end
-    return entrance
-end
-
-local function enrich_overview(properties)
-    local result = {}
-    if GetResourceState(resource_name) ~= "started" or type(properties) ~= "table" then
-        return result
-    end
-
-    for _, property in ipairs(properties) do
-        local house = type(property) == "table" and house_reference(property.providerId) or nil
-        if house and property.id == provider_name .. ":" .. house then
-            local entrance = house_entrance(house)
-            if entrance then
-                result[#result + 1] = {
-                    id = property.id,
-                    entrance = entrance,
-                }
-            end
-        end
-    end
-    return result
-end
-
-Bridge.Housing.RegisterClientProvider(provider_name, {
-    enrich_overview = enrich_overview,
-    execute = function(action, data)
-        if GetResourceState(resource_name) ~= "started" then
-            return false, "provider_unavailable"
-        end
-        if action ~= "set_waypoint" then
-            return false, "capability_unavailable"
-        end
-        local house = type(data) == "table" and house_reference(data.providerId) or nil
-        if not house then
-            return false, "invalid_property"
-        end
-        local entrance, error_code = house_entrance(house)
-        if not entrance then
-            return false, error_code
-        end
-        SetNewWaypoint(entrance.x + 0.0, entrance.y + 0.0)
-        return true
-    end,
-})

sky_phone/source/bridge/client/radio.lua

@@ -1,5 +1,4 @@
 local provider
-local configured_voice_provider = Config.Radio.VoiceProvider
 local provider_resources = {
     yaca = "yaca-voice",
     pma = "pma-voice",
@@ -139,7 +138,8 @@ function Bridge.Radio.Join(primary, secondary)
     return false
 end
 
-local function leave_provider(selected)
+function Bridge.Radio.Leave()
+    local selected = resolve_provider()
     if selected == "yaca" then
         exports["yaca-voice"]:enableRadio(false)
     elseif selected == "pma" then
@@ -151,10 +151,6 @@ local function leave_provider(selected)
     end
 end
 
-function Bridge.Radio.Leave()
-    leave_provider(resolve_provider())
-end
-
 function Bridge.Radio.SetVolume(volume)
     local selected = resolve_provider()
     if selected == "yaca" then
@@ -169,17 +165,6 @@ function Bridge.Radio.SetVolume(volume)
     end
 end
 
-AddEventHandler("sky_phone:configurator:updated", function()
-    if configured_voice_provider == Config.Radio.VoiceProvider then
-        return
-    end
-
-    leave_provider(provider)
-    provider = nil
-    configured_voice_provider = Config.Radio.VoiceProvider
-    TriggerEvent("sky_phone:client:radioProviderUpdated")
-end)
-
 AddEventHandler("onResourceStop", function(resource_name)
     if resource_name == GetCurrentResourceName() then
         Bridge.Radio.Leave()

sky_phone/source/bridge/server/framework.lua

@@ -19,23 +19,3 @@ Bridge.Framework.Name = configured_framework
 function Bridge.Framework.GetName()
     return Bridge.Framework.Name
 end
-
-function Bridge.Framework.HasPermission(source, permission)
-    if type(permission) ~= "string" or permission == "" then
-        error("[sky_phone] Permission identifiers must be non-empty strings.")
-    end
-
-    local groups = Config.CommandPermissions[permission]
-    if type(groups) ~= "table" or #groups == 0 then
-        local message = "[sky_phone] Config.CommandPermissions.%s must contain at least one group."
-        error(message:format(permission))
-    end
-    for index, group in ipairs(groups) do
-        if type(group) ~= "string" or group == "" then
-            local message = "[sky_phone] Config.CommandPermissions.%s[%s] must be a non-empty string."
-            error(message:format(permission, index))
-        end
-    end
-
-    return Bridge.Framework.HasAdminGroup(source, groups)
-end

sky_phone/source/bridge/server/frameworks/qbox.lua

@@ -24,13 +24,6 @@ function Bridge.Framework.HasAdminGroup(source, groups)
     if not player then
         return false
     end
-
-    for _, group in ipairs(groups) do
-        if IsPlayerAceAllowed(tostring(source), group) then
-            return true
-        end
-    end
-
     return exports.qbx_core:HasGroup(source, groups)
 end
 

sky_phone/source/bridge/server/housing.lua

@@ -111,8 +111,3 @@ end
 
 AddEventHandler("onResourceStart", reset_provider)
 AddEventHandler("onResourceStop", reset_provider)
-
-AddEventHandler("sky_phone:configurator:serverUpdated", function()
-    selected_provider_name = nil
-    last_provider_state = nil
-end)

sky_phone/source/bridge/server/housing/tgiann.lua

@@ -1,124 +0,0 @@
-local provider_name = "tgiann"
-local resource_name = "tgiann-house"
-
-local function query_owned_houses(identifier)
-    local success, properties = pcall(function()
-        return MySQL.query.await([[
-            SELECT `name`
-            FROM `tgiann_house`
-            WHERE `owner` = ?
-            ORDER BY `name` ASC
-        ]], { identifier })
-    end)
-    if not success or type(properties) ~= "table" then
-        Bridge.Debug("error", "[sky_phone] tgiann-house overview query failed: %s", tostring(properties))
-        return nil
-    end
-    return properties
-end
-
-local function owns_house(identifier, house)
-    local success, property = pcall(function()
-        return MySQL.single.await([[
-            SELECT `name`
-            FROM `tgiann_house`
-            WHERE `name` = ? AND `owner` = ?
-            LIMIT 1
-        ]], { house, identifier })
-    end)
-    if not success then
-        Bridge.Debug("error", "[sky_phone] tgiann-house ownership query failed: %s", tostring(property))
-        return nil, "provider_error"
-    end
-    return type(property) == "table"
-end
-
-local function house_from_property_id(value)
-    if type(value) ~= "string" then
-        return nil
-    end
-    local house = value:match("^tgiann:(.+)$")
-    return house and house ~= "" and house or nil
-end
-
-local function normalized_property(house)
-    return {
-        id = provider_name .. ":" .. house,
-        providerId = house,
-        name = house,
-        access = "owner",
-        locked = false,
-        capabilities = {
-            lock = false,
-            keys = false,
-            waypoint = true,
-            cctv = false,
-            garageStatus = false,
-        },
-        cctv = { enabled = false },
-        garage = nil,
-        keys = nil,
-    }
-end
-
-Bridge.Housing.RegisterProvider(provider_name, {
-    resource_name = resource_name,
-    is_available = function()
-        return GetResourceState(resource_name) == "started"
-    end,
-    get_overview = function(source)
-        local identifier = Bridge.Framework.GetIdentifier(source)
-        if not identifier then
-            return nil, "housing_unavailable"
-        end
-        local properties = query_owned_houses(identifier)
-        if not properties then
-            return nil, "provider_error"
-        end
-
-        local result = {}
-        local seen = {}
-        local maximum = math.max(0, math.floor(tonumber(Config.Housing.MaximumProperties) or 0))
-        for _, property in ipairs(properties) do
-            if #result >= maximum then
-                break
-            end
-            local house = type(property.name) == "string" and property.name or nil
-            if house and house ~= "" and not seen[house] then
-                seen[house] = true
-                result[#result + 1] = normalized_property(house)
-            end
-        end
-        return result
-    end,
-    prepare = function(source, action, data)
-        if action == "toggle_lock" or action == "grant_key" or action == "revoke_key"
-            or action == "key_candidates"
-        then
-            return nil, "capability_unavailable"
-        end
-        if action == "open_cctv" then
-            return nil, "cctv_unavailable"
-        end
-        if action ~= "set_waypoint" then
-            return nil, "invalid_action"
-        end
-
-        local house = house_from_property_id(data and data.propertyId)
-        if not house then
-            return nil, "invalid_property"
-        end
-        local identifier = Bridge.Framework.GetIdentifier(source)
-        if not identifier then
-            return nil, "housing_unavailable"
-        end
-        local owned, error_code = owns_house(identifier, house)
-        if owned == nil then
-            return nil, error_code
-        end
-        if not owned then
-            return nil, "property_access_denied"
-        end
-        return { providerId = house }
-    end,
-})

sky_phone/source/bridge/server/inventory.lua

@@ -1,92 +1,62 @@
-local inventory_adapters = {
-    { name = "jaksam", resource = "jaksam_inventory" },
-    { name = "qs", resource = "qs-inventory" },
-    { name = "ps", resource = "ps-inventory", framework = "qb" },
-    { name = "codem", resource = "codem-inventory" },
-    { name = "tgiann", resource = "tgiann-inventory" },
-    { name = "core", resource = "core_inventory" },
-    { name = "jpr", resource = "jpr-inventory", framework = "qb" },
-    { name = "origen", resource = "origen_inventory" },
-    { name = "ak47", resource = "ak47_inventory" },
-    { name = "one", resource = "one_inventory" },
-    { name = "ox", resource = "ox_inventory" },
-    { name = "mf", resource = "mf-inventory", framework = "esx" },
-    { name = "smx", resource = "smx-inventory", framework = "esx" },
-    { name = "lj", resource = "lj-inventory" },
-    { name = "qb", resource = "qb-inventory" },
-    { name = "hex", resource = "hex_4_inventory", framework = "esx", metadata = false },
-    { name = "esx", resource = "es_extended", framework = "esx", metadata = false },
-}
-
-local inventory_aliases = {
-    ["qb-inv"] = "qb",
-    qbox = "ox",
-}
-local supported_inventories = {}
-for _, adapter in ipairs(inventory_adapters) do
-    inventory_aliases[adapter.resource] = adapter.name
-    supported_inventories[adapter.name] = adapter
-end
-
 local configured_inventory = Config.Bridge.Inventory
-configured_inventory = inventory_aliases[configured_inventory] or configured_inventory
-local framework_name = Bridge.Framework.GetName()
 
 if configured_inventory == "auto" then
-    for _, adapter in ipairs(inventory_adapters) do
-        local compatible_framework = not adapter.framework or adapter.framework == framework_name
-        if adapter.name ~= "esx" and compatible_framework and GetResourceState(adapter.resource) == "started" then
-            configured_inventory = adapter.name
-            break
-        end
-    end
-
-    if configured_inventory == "auto" and framework_name == "esx" then
+    if GetResourceState("ox_inventory") == "started" then
+        configured_inventory = "ox"
+    elseif GetResourceState("qb-inventory") == "started" then
+        configured_inventory = "qb"
+    elseif GetResourceState("lj-inventory") == "started" then
+        configured_inventory = "lj"
+    elseif GetResourceState("qs-inventory") == "started" then
+        configured_inventory = "qs"
+    elseif GetResourceState("codem-inventory") == "started" then
+        configured_inventory = "codem"
+    elseif GetResourceState("core_inventory") == "started" then
+        configured_inventory = "core"
+    elseif GetResourceState("mf-inventory") == "started" then
+        configured_inventory = "mf"
+    elseif GetResourceState("smx-inventory") == "started" then
+        configured_inventory = "smx"
+    elseif GetResourceState("hex_4_inventory") == "started" then
+        configured_inventory = "hex"
+    elseif Bridge.Framework.GetName() == "esx" then
         configured_inventory = "esx"
     end
 end
 
-local selected_adapter = supported_inventories[configured_inventory]
-if not selected_adapter then
+local supported_inventories = {
+    ox = true,
+    qb = true,
+    lj = true,
+    qs = true,
+    codem = true,
+    core = true,
+    mf = true,
+    smx = true,
+    hex = true,
+    esx = true,
+}
+
+if not supported_inventories[configured_inventory] then
     error(("[sky_phone] Unsupported or unavailable inventory '%s'. Configure a supported inventory adapter."):format(tostring(configured_inventory)))
 end
-if GetResourceState(selected_adapter.resource) ~= "started" then
-    error(("[sky_phone] Inventory '%s' is configured, but resource '%s' is not started.")
-        :format(tostring(configured_inventory), selected_adapter.resource))
-end
-if selected_adapter.framework and selected_adapter.framework ~= framework_name then
-    error(("[sky_phone] Inventory '%s' is only supported with framework '%s'.")
-        :format(tostring(configured_inventory), selected_adapter.framework))
+
+if configured_inventory == "hex" or configured_inventory == "esx" then
+    if Bridge.Framework.GetName() ~= "esx" then
+        error(("[sky_phone] Inventory '%s' is only supported with ESX."):format(configured_inventory))
+    end
+    if Config.Phone.Unique ~= false then
+        error(("[sky_phone] Inventory '%s' cannot store unique phone metadata. Set Config.Phone.Unique = false or configure a metadata-capable inventory."):format(configured_inventory))
+    end
+    if Config.Sim.Enabled ~= false then
+        error(("[sky_phone] Inventory '%s' cannot store physical SIM metadata. Set Config.Sim.Enabled = false or configure a metadata-capable inventory."):format(configured_inventory))
+    end
 end
 
 Bridge.Inventory.Name = configured_inventory
 
-local metadata_free_inventory = selected_adapter.metadata == false
-
-local function enforce_metadata_compatibility()
-    if not metadata_free_inventory then
-        return
-    end
-
-    local modes_changed = Config.Phone.Unique ~= false or Config.Sim.Enabled ~= false
-    Config.Phone.Unique = false
-    Config.Sim.Enabled = false
-
-    if modes_changed then
-        Bridge.Debug(
-            "warn",
-            "[sky_phone] Inventory '%s' does not support item metadata; unique phones and physical SIM cards were disabled automatically.",
-            configured_inventory
-        )
-    end
-end
-
-enforce_metadata_compatibility()
-
-AddEventHandler("sky_phone:configurator:serverUpdated", enforce_metadata_compatibility)
-
-function Bridge.Inventory.NormalizeItem(item, metadata_field, fallback_slot)
-    if type(item) ~= "table" then
+function Bridge.Inventory.NormalizeItem(item, metadata_field)
+    if not item then
         return nil
     end
 
@@ -95,15 +65,11 @@ function Bridge.Inventory.NormalizeItem(item, metadata_field, fallback_slot)
         metadata = item.metadata or item.info
     end
 
-    local slot = item.slot or item.id or fallback_slot
-    local numeric_slot = tonumber(slot)
-    local count = tonumber(item.count or item.amount or item.quantity) or 0
-
     return {
-        name = item.name or item.item,
-        slot = numeric_slot or slot,
-        count = count,
-        amount = count,
+        name = item.name,
+        slot = item.slot or item.id,
+        count = tonumber(item.count or item.amount) or 0,
+        amount = tonumber(item.amount or item.count) or 0,
         metadata = type(metadata) == "table" and metadata or {},
     }
 end
@@ -120,13 +86,3 @@ function Bridge.Inventory.MetadataMatches(actual, expected)
     end
     return true
 end
-
-function Bridge.Inventory.ResolveUsableItem(...)
-    for index = select("#", ...), 1, -1 do
-        local candidate = select(index, ...)
-        if type(candidate) == "table" and (candidate.name or candidate.item) then
-            return candidate
-        end
-    end
-    return nil
-end

sky_phone/source/bridge/server/inventory/ak47.lua

@@ -1,87 +0,0 @@
-if Bridge.Inventory.Name ~= "ak47" then
-    return
-end
-
-local inventory = exports["ak47_inventory"]
-
-local function normalize(item, fallback_slot)
-    local normalized = Bridge.Inventory.NormalizeItem(item, "info", fallback_slot)
-    if not normalized or not normalized.name or normalized.amount < 1 then
-        return nil
-    end
-    return normalized
-end
-
-function Bridge.Inventory.GetResourceName()
-    return "ak47_inventory"
-end
-
-function Bridge.Inventory.GetSlot(source, slot_id)
-    local identifier = Bridge.Framework.GetIdentifier(source)
-    local numeric_slot = tonumber(slot_id)
-    if not identifier or not numeric_slot then
-        return nil
-    end
-    return normalize(inventory:GetSlot(identifier, numeric_slot), numeric_slot)
-end
-
-function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-    local identifier = Bridge.Framework.GetIdentifier(source)
-    if not identifier then
-        return {}
-    end
-
-    local matches = {}
-    local filter_metadata = type(metadata) == "table" and metadata or nil
-    for index, item in pairs(inventory:GetSlotsWithItem(identifier, item_name, filter_metadata, filter_metadata ~= nil) or {}) do
-        local normalized = normalize(item, tonumber(index) or index)
-        if normalized and normalized.name == item_name
-            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
-            matches[#matches + 1] = normalized
-        end
-    end
-    return matches
-end
-
-function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
-    local identifier = Bridge.Framework.GetIdentifier(source)
-    local slot = identifier and Bridge.Inventory.GetSlot(source, slot_id) or nil
-    if not slot then
-        return false
-    end
-
-    local requested_metadata = type(metadata) == "table" and metadata or {}
-    inventory:SetItemInfo(identifier, slot.slot, requested_metadata)
-    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
-    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
-end
-
-function Bridge.Inventory.CanCarryItem(source, item_name, count)
-    return inventory:CanAddItem(source, item_name, count) == true
-end
-
-function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
-    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
-        return false
-    end
-    return inventory:AddItem(source, item_name, count, slot, metadata or {}) == true
-end
-
-function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
-    if metadata and not slot then
-        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-        slot = slots[1] and slots[1].slot or nil
-        if not slot then
-            return 0
-        end
-    end
-
-    local removed = inventory:RemoveItem(source, item_name, count, slot)
-    return removed ~= false and count or 0
-end
-
-function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
-        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
-    end)
-end

sky_phone/source/bridge/server/inventory/codem.lua

@@ -9,8 +9,7 @@ local function normalize(item)
 end
 
 local function get_inventory(source)
-    local identifier = Bridge.Framework.GetIdentifier(source)
-    return identifier and inventory:GetInventory(identifier, source) or {}
+    return inventory:GetInventory(false, source) or {}
 end
 
 function Bridge.Inventory.GetResourceName()
@@ -28,14 +27,9 @@ end
 
 function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
     local matches = {}
-    local items = inventory:GetItemsByName(source, item_name) or {}
-    if items.name then
-        items = { items }
-    end
-    for _, item in pairs(items) do
+    for _, item in pairs(get_inventory(source)) do
         local normalized = normalize(item)
-        if normalized and normalized.name == item_name
-            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
+        if normalized.name == item_name and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
             matches[#matches + 1] = normalized
         end
     end
@@ -72,7 +66,7 @@ function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
 end
 
 function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
-        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
+    return Bridge.Framework.RegisterUsableItem(item_name, function(source, item)
+        callback(source, normalize(item))
     end)
 end

sky_phone/source/bridge/server/inventory/core.lua

@@ -38,16 +38,13 @@ function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
 end
 
 function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
-    local numeric_slot = tonumber(slot_id)
-    local slot = numeric_slot and Bridge.Inventory.GetSlot(source, numeric_slot) or nil
+    local slot = Bridge.Inventory.GetSlot(source, slot_id)
     if not slot then
         return false
     end
-
-    local requested_metadata = type(metadata) == "table" and metadata or {}
-    inventory:setMetadata(source, numeric_slot, requested_metadata)
-    local updated = Bridge.Inventory.GetSlot(source, numeric_slot)
-    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
+    inventory:updateMetadata(source, slot.slot, metadata or {})
+    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
+    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, metadata or {}) or false
 end
 
 function Bridge.Inventory.CanCarryItem()

sky_phone/source/bridge/server/inventory/jaksam.lua

@@ -1,94 +0,0 @@
-if Bridge.Inventory.Name ~= "jaksam" then
-    return
-end
-
-local inventory = exports["jaksam_inventory"]
-
-local function normalize(item)
-    local normalized = Bridge.Inventory.NormalizeItem(item)
-    if not normalized or not normalized.name or normalized.amount < 1 then
-        return nil
-    end
-    return normalized
-end
-
-local function get_inventory(source)
-    local player_inventory = inventory:getInventory(source)
-    return type(player_inventory) == "table" and type(player_inventory.items) == "table"
-        and player_inventory.items or {}
-end
-
-function Bridge.Inventory.GetResourceName()
-    return "jaksam_inventory"
-end
-
-function Bridge.Inventory.GetSlot(source, slot_id)
-    for index, item in pairs(get_inventory(source)) do
-        local normalized = normalize(item)
-        local item_slot = normalized and (normalized.slot or tonumber(index)) or nil
-        if tostring(item_slot) == tostring(slot_id) then
-            normalized.slot = item_slot
-            return normalized
-        end
-    end
-    return nil
-end
-
-function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-    local matches = {}
-    for index, item in pairs(get_inventory(source)) do
-        local normalized = normalize(item)
-        if normalized and normalized.name == item_name
-            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
-            normalized.slot = normalized.slot or tonumber(index) or index
-            matches[#matches + 1] = normalized
-        end
-    end
-    return matches
-end
-
-function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
-    local slot = Bridge.Inventory.GetSlot(source, slot_id)
-    if not slot then
-        return false
-    end
-
-    local requested_metadata = type(metadata) == "table" and metadata or {}
-    local success = inventory:setItemMetadataInSlot(source, slot.slot, requested_metadata)
-    if success ~= true then
-        return false
-    end
-    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
-    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
-end
-
-function Bridge.Inventory.CanCarryItem(source, item_name, count)
-    return inventory:canCarryItem(source, item_name, count) == true
-end
-
-function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
-    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
-        return false
-    end
-    local success = inventory:addItem(source, item_name, count, metadata or {}, slot)
-    return success == true
-end
-
-function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
-    if metadata and not slot then
-        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-        slot = slots[1] and slots[1].slot or nil
-        if not slot then
-            return 0
-        end
-    end
-    local success = inventory:removeItem(source, item_name, count, nil, slot)
-    return success == true and count or 0
-end
-
-function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    inventory:registerUsableItem(item_name, function(source, ...)
-        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
-    end)
-    return true
-end

sky_phone/source/bridge/server/inventory/jpr.lua

@@ -1,109 +0,0 @@
-if Bridge.Inventory.Name ~= "jpr" then
-    return
-end
-
-if Bridge.Framework.GetName() ~= "qb" then
-    error("[sky_phone] jpr-inventory is only supported with QBCore.")
-end
-
-local inventory = exports["jpr-inventory"]
-local QBCore = exports["qb-core"]:GetCoreObject()
-
-local function normalize(item, fallback_slot)
-    local normalized = Bridge.Inventory.NormalizeItem(item, "info", fallback_slot)
-    if not normalized or not normalized.name or normalized.amount < 1 then
-        return nil
-    end
-    return normalized
-end
-
-local function get_inventory(source)
-    local player = QBCore.Functions.GetPlayer(tonumber(source))
-    return player and player.PlayerData.items or {}
-end
-
-local function restore_slot(source, slot, metadata)
-    local restored = inventory:AddItem(source, slot.name, slot.amount, slot.slot, metadata, "sky_phone:metadata-rollback")
-    if not restored then
-        Bridge.Debug(
-            "error",
-            "[sky_phone] jpr-inventory could not restore item '%s' in slot %s after a metadata update failed.",
-            tostring(slot.name),
-            tostring(slot.slot)
-        )
-    end
-    return restored == true
-end
-
-function Bridge.Inventory.GetResourceName()
-    return "jpr-inventory"
-end
-
-function Bridge.Inventory.GetSlot(source, slot_id)
-    local numeric_slot = tonumber(slot_id)
-    return numeric_slot and normalize(inventory:GetItemBySlot(source, numeric_slot), numeric_slot) or nil
-end
-
-function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-    local matches = {}
-    for index, item in pairs(get_inventory(source)) do
-        local normalized = normalize(item, tonumber(index) or index)
-        if normalized and normalized.name == item_name
-            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
-            normalized.slot = normalized.slot or tonumber(index) or index
-            matches[#matches + 1] = normalized
-        end
-    end
-    return matches
-end
-
-function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
-    local slot = Bridge.Inventory.GetSlot(source, slot_id)
-    if not slot or slot.amount < 1 then
-        return false
-    end
-
-    local previous_metadata = slot.metadata
-    local requested_metadata = type(metadata) == "table" and metadata or {}
-    if inventory:RemoveItem(source, slot.name, slot.amount, slot.slot, "sky_phone:metadata-update") ~= true then
-        return false
-    end
-    if inventory:AddItem(source, slot.name, slot.amount, slot.slot, requested_metadata, "sky_phone:metadata-update") ~= true then
-        restore_slot(source, slot, previous_metadata)
-        return false
-    end
-
-    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
-    if updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) then
-        return true
-    end
-
-    inventory:RemoveItem(source, slot.name, slot.amount, slot.slot, "sky_phone:metadata-rollback")
-    restore_slot(source, slot, previous_metadata)
-    return false
-end
-
-function Bridge.Inventory.CanCarryItem()
-    return true
-end
-
-function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
-    return inventory:AddItem(source, item_name, count, slot, metadata or {}, "sky_phone") == true
-end
-
-function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
-    if metadata and not slot then
-        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-        slot = slots[1] and slots[1].slot or nil
-        if not slot then
-            return 0
-        end
-    end
-    return inventory:RemoveItem(source, item_name, count, slot, "sky_phone") == true and count or 0
-end
-
-function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
-        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
-    end)
-end

sky_phone/source/bridge/server/inventory/one.lua

@@ -1,76 +0,0 @@
-if Bridge.Inventory.Name ~= "one" then
-    return
-end
-
-local inventory = exports.one_inventory
-
-local function normalize(item, fallback_slot)
-    local normalized = Bridge.Inventory.NormalizeItem(item, nil, fallback_slot)
-    if not normalized or not normalized.name or normalized.amount < 1 then
-        return nil
-    end
-    return normalized
-end
-
-function Bridge.Inventory.GetResourceName()
-    return "one_inventory"
-end
-
-function Bridge.Inventory.GetSlot(source, slot_id)
-    local numeric_slot = tonumber(slot_id)
-    return numeric_slot and normalize(inventory:GetSlot(source, numeric_slot), numeric_slot) or nil
-end
-
-function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-    local matches = {}
-    for _, slot_id in ipairs(inventory:GetSlotIdsWithItem(source, item_name, metadata) or {}) do
-        local normalized = Bridge.Inventory.GetSlot(source, slot_id)
-        if normalized and normalized.name == item_name
-            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
-            matches[#matches + 1] = normalized
-        end
-    end
-    return matches
-end
-
-function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
-    local slot = Bridge.Inventory.GetSlot(source, slot_id)
-    if not slot then
-        return false
-    end
-
-    local requested_metadata = type(metadata) == "table" and metadata or {}
-    if inventory:SetItemMetadata(source, slot.slot, requested_metadata) == false then
-        return false
-    end
-    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
-    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
-end
-
-function Bridge.Inventory.CanCarryItem(source, item_name, count)
-    return inventory:CanCarryItem(source, item_name, count) == true
-end
-
-function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
-    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
-        return false
-    end
-    return inventory:AddItem(source, item_name, count, metadata or {}, slot) == true
-end
-
-function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
-    if metadata and not slot then
-        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-        slot = slots[1] and slots[1].slot or nil
-        if not slot then
-            return 0
-        end
-    end
-    return inventory:RemoveItem(source, item_name, count, metadata, slot) == true and count or 0
-end
-
-function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
-        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
-    end)
-end

sky_phone/source/bridge/server/inventory/origen.lua

@@ -1,88 +0,0 @@
-if Bridge.Inventory.Name ~= "origen" then
-    return
-end
-
-local inventory = exports.origen_inventory
-
-local function normalize(item)
-    local normalized = Bridge.Inventory.NormalizeItem(item)
-    if not normalized or not normalized.name or normalized.amount < 1 then
-        return nil
-    end
-    return normalized
-end
-
-local function get_inventory(source)
-    local player_inventory = inventory:GetInventory(source)
-    return type(player_inventory) == "table" and type(player_inventory.inventory) == "table"
-        and player_inventory.inventory or {}
-end
-
-function Bridge.Inventory.GetResourceName()
-    return "origen_inventory"
-end
-
-function Bridge.Inventory.GetSlot(source, slot_id)
-    for index, item in pairs(get_inventory(source)) do
-        local normalized = normalize(item)
-        local item_slot = normalized and (normalized.slot or tonumber(index)) or nil
-        if tostring(item_slot) == tostring(slot_id) then
-            normalized.slot = item_slot
-            return normalized
-        end
-    end
-    return nil
-end
-
-function Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-    local matches = {}
-    for index, item in pairs(get_inventory(source)) do
-        local normalized = normalize(item)
-        if normalized and normalized.name == item_name
-            and Bridge.Inventory.MetadataMatches(normalized.metadata, metadata) then
-            normalized.slot = normalized.slot or tonumber(index) or index
-            matches[#matches + 1] = normalized
-        end
-    end
-    return matches
-end
-
-function Bridge.Inventory.SetSlotMetadata(source, slot_id, metadata)
-    local slot = Bridge.Inventory.GetSlot(source, slot_id)
-    if not slot then
-        return false
-    end
-
-    local requested_metadata = type(metadata) == "table" and metadata or {}
-    inventory:setMetadata(source, slot.slot, requested_metadata)
-    local updated = Bridge.Inventory.GetSlot(source, slot.slot)
-    return updated and Bridge.Inventory.MetadataMatches(updated.metadata, requested_metadata) or false
-end
-
-function Bridge.Inventory.CanCarryItem(source, item_name, count)
-    return inventory:canCarryItem(source, item_name, count) == true
-end
-
-function Bridge.Inventory.AddItem(source, item_name, count, slot, metadata)
-    if not Bridge.Inventory.CanCarryItem(source, item_name, count, metadata) then
-        return false
-    end
-    return inventory:addItem(source, item_name, count, metadata or {}, slot, false) == true
-end
-
-function Bridge.Inventory.RemoveItem(source, item_name, count, slot, metadata)
-    if metadata and not slot then
-        local slots = Bridge.Inventory.GetSlotsWithItem(source, item_name, metadata)
-        slot = slots[1] and slots[1].slot or nil
-        if not slot then
-            return 0
-        end
-    end
-    return inventory:removeItem(source, item_name, count, nil, slot, false) == true and count or 0
-end
-
-function Bridge.Inventory.RegisterUsableItem(item_name, callback)
-    return Bridge.Framework.RegisterUsableItem(item_name, function(source, ...)
-        callback(source, normalize(Bridge.Inventory.ResolveUsableItem(...)))
-    end)
-end