FIX - support folder dragging across scaling (#41)

* FIX - repair persisted company messaging defaults

* FIX - unify CityWarn spacing and scrolling

frontend/src/companiesServiceLineMessages.contract.test.ts

@@ -0,0 +1,133 @@
+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

@@ -107,10 +107,10 @@ describe('company configurator creation contract', () => {
     expect(blankRegistration).toBeLessThan(policeRegistration)
   })
 
-  it('repairs persisted service-line messaging before Companies starts', () => {
+  it('enables persisted police service-line messaging before Companies starts', () => {
     const migration = configuratorServer.slice(
       configuratorServer.indexOf(
-        'local function migrate_unsupported_company_message_defaults()',
+        'local function migrate_police_service_line_messaging()',
       ),
       configuratorServer.indexOf('\n\ndefault_config = {}'),
     )
@@ -118,19 +118,22 @@ describe('company configurator creation contract', () => {
       'Bridge.Database.AfterMigration("sky_phone", migrate_police_request_defaults)',
     )
     const messageRegistration = configuratorServer.indexOf(
-      'Bridge.Database.AfterMigration("sky_phone", migrate_unsupported_company_message_defaults)',
+      'Bridge.Database.AfterMigration("sky_phone", migrate_police_service_line_messaging)',
     )
 
     expect(migration).toContain(
-      'sky-phone:configurator:unsupported-company-message-defaults:v1',
+      'sky-phone:configurator:service-line-messaging:v2',
     )
-    expect(migration).toContain('line.CanMessage == true')
-    expect(migration).toContain('line.CanMessage = false')
+    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/HomeFolderInteraction.contract.test.ts

@@ -26,6 +26,10 @@ 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', () => {
@@ -36,7 +40,7 @@ describe('Home folder interaction contract', () => {
     expect(iconSource).not.toContain('props.editMode || suppressClick.value')
   })
 
-  it('keeps folder app dragging aligned at every phone scale', () => {
+  it('keeps whole-folder 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')")
@@ -47,6 +51,60 @@ 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')
@@ -63,8 +121,9 @@ 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 (draggingIndex.value === null || draggingOutside.value) return',
+      'if (!draggingOutside.value && !isPointerInsidePanel(event))',
     )
     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, ref, watch } from 'vue'
+import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 
 import AppIcon from '@/components/AppIcon.vue'
 import { usePhoneStore } from '@/stores/phone'
@@ -11,20 +11,35 @@ 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 = defineProps<{
-  apps: FolderAppEntry[]
-  editMode: boolean
-  folder: HomeFolder
-  renameOnOpen: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    apps: FolderAppEntry[]
+    editMode: boolean
+    externalDragVisual?: boolean
+    folder: HomeFolder
+    renameOnOpen: boolean
+  }>(),
+  {
+    externalDragVisual: false,
+  },
+)
 const emit = defineEmits<{
   close: []
+  dragcancel: []
+  dragmove: [event: PointerEvent]
+  dragstart: [index: number, event: PointerEvent]
   'drag-outside-change': [outside: boolean]
   edit: []
   extract: [index: number, event: PointerEvent]
@@ -43,6 +58,7 @@ 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'),
@@ -113,25 +129,48 @@ function saveRename(): void {
   renameOpened.value = false
 }
 
-function startFolderAppDrag(index: number): void {
+function startFolderAppDrag(index: number, event: PointerEvent): 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 panelBounds = panelElement.value?.getBoundingClientRect()
-  if (!panelBounds) return false
+  const panel = panelElement.value
   return (
-    event.clientX >= panelBounds.left &&
-    event.clientX <= panelBounds.right &&
-    event.clientY >= panelBounds.top &&
-    event.clientY <= panelBounds.bottom
+    panel !== null &&
+    phoneViewportRectContainsPoint(
+      folderDragViewportRect(panel),
+      event.clientX,
+      event.clientY,
+    )
   )
 }
 
 function moveFolderAppDrag(event: PointerEvent): void {
-  if (draggingIndex.value === null || draggingOutside.value) return
-  if (!isPointerInsidePanel(event)) setDraggingOutside(true)
+  if (draggingIndex.value === null) return
+  if (!draggingOutside.value && !isPointerInsidePanel(event)) {
+    setDraggingOutside(true)
+  }
+  emit('dragmove', event)
 }
 
 function setDraggingOutside(outside: boolean): void {
@@ -145,31 +184,52 @@ 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 = 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 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 targetIndex = Number(target.dataset.folderAppIndex)
-  if (Number.isInteger(targetIndex)) emit('move', sourceIndex, targetIndex)
+  dragGeometry = null
+  if (!Number.isInteger(targetIndex)) {
+    emit('dragcancel')
+    return
+  }
+  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 {
@@ -195,6 +255,11 @@ function finishPageSwipe(event: PointerEvent): void {
   }
   pagePointerId = null
 }
+
+onBeforeUnmount(() => {
+  stopFolderAppDrag()
+  pagePointerId = null
+})
 </script>
 
 <template>
@@ -290,10 +355,11 @@ function finishPageSwipe(event: PointerEvent): void {
                 :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)"
+                @dragstart="startFolderAppDrag(entry.index, $event)"
                 @edit="emit('edit')"
               />
             </div>

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

@@ -474,6 +474,41 @@ 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,6 +19,7 @@ import {
   createDefaultHomeLayout,
   deleteHomePage,
   extractHomeFolderApp,
+  HOME_GRID_PAGE_SIZE,
   moveHomeFolderApp,
   moveHomeApp,
   moveHomeAppToGridPage,
@@ -519,14 +520,23 @@ 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(
-        this.homeLayout,
+        sourceLayout,
         folderId,
         sourceIndex,
         to,
         targetIndex,
       )
-      if (next === this.homeLayout) return false
+      if (next === sourceLayout) return false
       this.homeLayout = next
       this.persist()
       return true

frontend/src/stores/phone.ts

@@ -2712,6 +2712,8 @@ 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.',

frontend/src/utils/phoneViewportGeometry.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 
 import {
   normalizePhoneViewportRect,
+  phoneViewportRectContainsPoint,
   readPhoneViewportGeometry,
   type PhoneViewportRect,
 } from '@/utils/phoneViewportGeometry'
@@ -63,7 +64,78 @@ 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)
@@ -124,6 +196,76 @@ 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,6 +7,14 @@ 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/views/SpringboardView.contract.test.ts

@@ -31,6 +31,22 @@ 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', () => {
@@ -136,7 +152,7 @@ describe('Springboard page swipe contract', () => {
     )
     expect(
       viewSource.match(/:external-drag-visual="homeDragVisualActive"/g),
-    ).toHaveLength(4)
+    ).toHaveLength(5)
     expect(viewSource).toContain('updateHomeDragGhost(event)')
     expect(viewSource).toContain('const dropGhost = homeDragGhost')
     expect(viewSource).toContain('const dropOrigin = homeDragPreviewBounds')
@@ -160,6 +176,65 @@ 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,6 +42,7 @@ import {
 } from '@/utils/homeLayout'
 import type { ReorderDirection } from '@/utils/keyboard'
 import {
+  phoneViewportRectContainsPoint,
   readPhoneViewportGeometry,
   type PhoneViewportGeometry,
   type PhoneViewportRect,
@@ -111,6 +112,11 @@ 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)
@@ -610,7 +616,11 @@ function queueEdgePageTurn(
     edgePageTimer = undefined
     edgePageDirection = direction
     edgePageLocked = dragType === 'widget'
-    if (dragType === 'app' && lastHomePointer && draggingHomeApp.value) {
+    if (
+      dragType === 'app' &&
+      lastHomePointer &&
+      (draggingHomeApp.value || draggingFolderApp.value)
+    ) {
       queueEdgePageTurn(lastHomePointer, 'app')
     }
   }, HOME_EDGE_PAGE_TURN_DELAY)
@@ -814,7 +824,7 @@ function updateHomeDragGhost(event: {
   )
 }
 
-function createHomeDragGhost(event: PointerEvent): void {
+function createHomeDragGhost(event: PointerEvent): HTMLElement | null {
   clearHomeDragGhost()
   const eventTarget =
     event.currentTarget instanceof Element
@@ -827,7 +837,7 @@ function createHomeDragGhost(event: PointerEvent): void {
   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
+  if (!source || !layer || !springboard || !portal || !geometry) return null
 
   const portalBounds = portal.getBoundingClientRect()
   const clipBounds = geometry.rect(springboard)
@@ -838,7 +848,7 @@ function createHomeDragGhost(event: PointerEvent): void {
     sourceBounds.width <= 0 ||
     sourceBounds.height <= 0
   ) {
-    return
+    return null
   }
 
   layer.style.left = `${clipBounds.left - portalBounds.left}px`
@@ -865,7 +875,12 @@ function createHomeDragGhost(event: PointerEvent): void {
   for (const element of [ghost, ...Array.from(ghost.querySelectorAll('*'))]) {
     element.removeAttribute('id')
     for (const attribute of element.getAttributeNames()) {
-      if (attribute.startsWith('data-home-')) element.removeAttribute(attribute)
+      if (
+        attribute.startsWith('data-home-') ||
+        attribute.startsWith('data-folder-')
+      ) {
+        element.removeAttribute(attribute)
+      }
     }
   }
   for (const control of ghost.querySelectorAll<HTMLElement>(
@@ -894,6 +909,7 @@ function createHomeDragGhost(event: PointerEvent): void {
   layer.appendChild(position)
   homeDragVisualActive.value = true
   updateHomeDragGhost(event)
+  return position
 }
 
 function startHomeDrag(
@@ -1190,6 +1206,98 @@ 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()
@@ -1324,16 +1432,83 @@ 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 {
-  folderDraggingOutside.value = false
-  openedFolderId.value = null
-  renameFolderOnOpenId.value = null
+  stopOpenedFolderAppDrag()
+  resetOpenedFolderState()
 }
 
 function renameOpenedFolder(name: string): void {
@@ -1342,71 +1517,68 @@ function renameOpenedFolder(name: string): void {
 }
 
 function moveOpenedFolderApp(sourceIndex: number, targetIndex: number): void {
-  if (!openedFolderId.value) return
-  appStore.moveHomeFolderApp(openedFolderId.value, sourceIndex, targetIndex)
+  const session = currentOpenedFolderDragSession(sourceIndex)
+  stopOpenedFolderAppDrag()
+  if (!session) return
+  appStore.moveHomeFolderApp(session.folderId, sourceIndex, targetIndex)
 }
 
 function extractOpenedFolderApp(
   sourceIndex: number,
   event: PointerEvent,
 ): void {
-  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) {
+  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)
+  if (!target) {
+    clearEdgePageTurn()
+    draggingFolderApp.value = null
+    lastHomePointer = null
+    clearHomeDragGhost()
+    clearTemporaryHomePage()
+    resetOpenedFolderState()
+    return
+  }
 
-  const area = target.dataset.homeArea as HomeArea
-  const targetIndex = Number(target.dataset.homeIndex)
+  const { area, index: targetIndex } = target
   if (
-    !appStore.extractHomeFolderApp(folder.id, sourceIndex, area, targetIndex)
+    !appStore.extractHomeFolderApp(
+      session.folderId,
+      session.sourceIndex,
+      area,
+      targetIndex,
+    )
   ) {
     closeFolder()
     return
   }
-  closeFolder()
-  if (sourceBounds) {
-    const extractedIndex = findHomeItemIndex(appId, area, targetIndex)
-    if (extractedIndex !== null) {
-      void animateHomeItemDrop(appId, area, extractedIndex, sourceBounds)
-    }
+
+  clearEdgePageTurn()
+  draggingFolderApp.value = null
+  lastHomePointer = null
+  clearTemporaryHomePage(area === 'grid')
+  resetOpenedFolderState()
+  const extractedIndex = findHomeItemIndex(session.appId, area, targetIndex)
+  if (extractedIndex === null) {
+    clearHomeDragGhost(dropGhost)
+    return
   }
+  void animateHomeItemDrop(
+    session.appId,
+    area,
+    extractedIndex,
+    dropOrigin,
+  ).finally(() => clearHomeDragGhost(dropGhost))
 }
 
 function clearSearch(): void {
@@ -1426,11 +1598,12 @@ watch(isEditablePage, (visible) => {
 watch(editMode, (editing) => {
   emit('editModeChange', editing)
   if (editing) return
+  stopOpenedFolderAppDrag()
   stopHomeDrag()
   stopWidgetDrag()
 })
 watch(openedFolder, (folder) => {
-  if (!folder) closeFolder()
+  if (!folder && openedFolderId.value !== null) closeFolder()
 })
 onBeforeUnmount(() => {
   emit('editModeChange', false)
@@ -1445,6 +1618,7 @@ onBeforeUnmount(() => {
   clearHomeDragGhost()
   temporaryHomePage.value = null
   draggingHomeApp.value = null
+  draggingFolderApp.value = null
   draggingWidgetId.value = null
 })
 </script>
@@ -1858,9 +2032,13 @@ 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/MessagesApp.contract.test.ts

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

frontend/src/views/apps/MessagesApp.vue

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

frontend/testserver/index.cjs

@@ -1978,7 +1978,7 @@ const contacts = [
   },
   {
     canCall: true,
-    canMessage: false,
+    canMessage: true,
     companyId: 'police',
     avatar_url: 'https://picsum.photos/seed/companies-police-logo/180/180',
     id: 'company:police',
@@ -4187,7 +4187,7 @@ const companyProfiles = [
     availability: 'available',
     availabilityUpdatedAt: isoTime(-12 * 60 * 1000),
     canCall: true,
-    canMessage: false,
+    canMessage: true,
     categoryId: 'public_services',
     categoryName: 'Public Services',
     coverUrl: 'https://picsum.photos/seed/companies-police-cover/900/360',

sky_phone/config/config.lua

@@ -1190,7 +1190,7 @@ if IsDuplicityVersion() then
                     Number = "911",
                     AutoContact = true,
                     CanCall = true,
-                    CanMessage = false,
+                    CanMessage = true,
                     Routing = "round_robin",
                     MinimumGrade = 0,
                 },

sky_phone/config/locales/de.lua

@@ -695,6 +695,7 @@ 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.",
                 },

sky_phone/config/locales/en.lua

@@ -695,6 +695,7 @@ 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.",
                 },

sky_phone/config/locales/es.lua

@@ -695,6 +695,7 @@ Locales["es"] = {
                     gif_provider_rate_limited = "GIPHY está ocupado. Inténtalo de nuevo en un momento.", gif_provider_failed = "La búsqueda de GIFs está temporalmente inaccesible.",
                     self_message = "No puedes enviar mensajes a tu propio número.", recipient_not_found = "Ese número no está disponible.", blocked = "Este contacto ha bloqueado las llamadas y los mensajes de esta SIM.",
                     messaging_unavailable = "Este contacto de empresa no acepta mensajes.",
+                    service_line_text_only = "Las líneas de servicio de empresa solo aceptan mensajes de texto por ahora.",
                     no_sim = "Este teléfono no tiene tarjeta SIM.", rate_limited = "Demasiados mensajes, inténtalo de nuevo en un minuto.",
                     request_failed = "Los mensajes están temporalmente inaccesibles.", default = "El mensaje no se pudo enviar.",
                 },

sky_phone/fxmanifest.lua

@@ -6,7 +6,7 @@ use_experimental_fxv2_oal 'yes'
 
 author 'Sky-Systems'
 description 'Sky Phone'
-version '0.2.8'
+version '0.3.0'
 
 provide 'lb-phone'
 provide '17mov_Phone'
@@ -30,9 +30,7 @@ shared_scripts {
 
 client_scripts {
     'config/config.lua',
-    'config/locales/en.lua',
-    'config/locales/de.lua',
-    'config/locales/es.lua',
+    'config/locales/*.lua',
     'source/bridge/client/callbacks.lua',
     'source/client/phone_configurator.lua',
     'source/bridge/client/framework.lua',

sky_phone/source/server/companies.lua

@@ -337,11 +337,6 @@ local function validate_configuration(configuration)
                 tostring(line.Routing)
             )
         end
-        if line.CanMessage then
-            return nil, ("[sky_phone] Company '%s' enables messaging without a virtual service-line message router."):format(
-                company_id
-            )
-        end
         line.Number = number
         validated_definitions[company_id] = definition
         validated_definition_ids[#validated_definition_ids + 1] = company_id
@@ -1193,7 +1188,7 @@ end
 
 local function request_row(request_id)
     local rows = Bridge.Database.Query([[
-        SELECT r.`id`, r.`company_id`, r.`service_id`, r.`customer_sim_id`, r.`subject`, r.`description`,
+        SELECT r.`id`, r.`company_id`, r.`service_id`, r.`channel`, r.`customer_sim_id`, r.`subject`, r.`description`,
             r.`status`, r.`assigned_identifier`, r.`customer_unread`,
             r.`company_activity_revision`, r.`revision`,
             UNIX_TIMESTAMP(r.`created_at`) AS `created_at_unix`,
@@ -1895,6 +1890,175 @@ local function notification_payload(kind, area, row)
     }
 end
 
+function SkyPhoneCompanies.RouteServiceLineMessage(source, data)
+    if not Config.Companies.Enabled or type(data) ~= "table"
+        or data.messageType ~= "text" or not valid_uuid(data.id)
+    then
+        return { success = false, error = "invalid_request" }
+    end
+    local device, device_error = current_device(source, false)
+    if not device then
+        return device_error
+    end
+    local service_line = SkyPhoneCompanies.GetServiceLine(data.phoneNumber)
+    if not service_line or not service_line.canMessage then
+        return { success = false, error = "messaging_unavailable" }
+    end
+    local body = valid_text(
+        data.body,
+        math.min(Config.Messages.BodyMaxLength, Config.Companies.MessageMaxLength),
+        false
+    )
+    if not body then
+        return { success = false, error = "invalid_message" }
+    end
+
+    local request_id = uuid()
+    local created_event_id = uuid()
+    local status_event_id = uuid()
+    local mutation_token = uuid()
+    local statements = {
+        {
+            query = "UPDATE `sky_phone_sims` SET `updated_at` = `updated_at` WHERE `id` = ?",
+            params = { device.sim_id },
+        },
+        {
+            query = [[
+                INSERT INTO `sky_phone_company_requests`
+                    (`id`, `company_id`, `channel`, `customer_sim_id`, `subject`, `description`,
+                        `company_activity_revision`)
+                SELECT ?, profile.`company_id`, 'service_line', sim.`id`, sim.`phone_number`, ?, 0
+                FROM `sky_phone_sims` sim
+                INNER JOIN `sky_phone_company_profiles` profile ON profile.`company_id` = ?
+                WHERE sim.`id` = ? AND NOT EXISTS (
+                    SELECT 1 FROM `sky_phone_company_requests` existing
+                    WHERE existing.`company_id` = profile.`company_id`
+                        AND existing.`customer_sim_id` = sim.`id`
+                        AND existing.`channel` = 'service_line'
+                        AND existing.`status` NOT IN ('completed', 'cancelled')
+                )
+            ]],
+            params = {
+                request_id,
+                body,
+                service_line.companyId,
+                device.sim_id,
+            },
+        },
+        {
+            query = [[
+                INSERT INTO `sky_phone_company_request_events`
+                    (`id`, `request_id`, `event_type`, `actor_type`, `to_status`, `detail`)
+                SELECT ?, `id`, 'created', 'customer', 'new', 'service_line'
+                FROM `sky_phone_company_requests` WHERE `id` = ?
+            ]],
+            params = { created_event_id, request_id },
+        },
+        {
+            query = [[
+                INSERT INTO `sky_phone_company_request_events`
+                    (`id`, `request_id`, `event_type`, `actor_type`, `from_status`, `to_status`, `detail`)
+                SELECT ?, `id`, 'status', 'customer', 'waiting_customer', 'in_progress', 'service_line_message'
+                FROM `sky_phone_company_requests`
+                WHERE `company_id` = ? AND `customer_sim_id` = ?
+                    AND `channel` = 'service_line' AND `status` = 'waiting_customer'
+                ORDER BY `updated_at` DESC, `id` DESC LIMIT 1
+            ]],
+            params = { status_event_id, service_line.companyId, device.sim_id },
+        },
+        {
+            query = [[
+                UPDATE `sky_phone_company_requests`
+                SET `status` = IF(`status` = 'waiting_customer', 'in_progress', `status`),
+                    `company_activity_revision` = `company_activity_revision` + 1,
+                    `revision` = `revision` + 1, `mutation_token` = ?
+                WHERE `company_id` = ? AND `customer_sim_id` = ?
+                    AND `channel` = 'service_line'
+                    AND `status` NOT IN ('completed', 'cancelled')
+                ORDER BY `updated_at` DESC, `id` DESC LIMIT 1
+            ]],
+            params = { mutation_token, service_line.companyId, device.sim_id },
+        },
+        {
+            query = [[
+                INSERT INTO `sky_phone_company_request_messages`
+                    (`id`, `request_id`, `sender_type`, `sender_sim_id`, `body`)
+                SELECT ?, `id`, 'customer', `customer_sim_id`, ?
+                FROM `sky_phone_company_requests`
+                WHERE `mutation_token` = ? LIMIT 1
+            ]],
+            params = { data.id, body, mutation_token },
+        },
+        {
+            query = [[
+                INSERT INTO `sky_phone_sms_messages`
+                    (`id`, `sender_sim_id`, `recipient_sim_id`, `sender_number`, `recipient_number`,
+                        `message_type`, `body`)
+                SELECT ?, sim.`id`, NULL, sim.`phone_number`, ?, 'text', ?
+                FROM `sky_phone_sims` sim
+                INNER JOIN `sky_phone_company_request_messages` message ON message.`id` = ?
+                WHERE sim.`id` = ?
+            ]],
+            params = {
+                data.id,
+                service_line.number,
+                body,
+                data.id,
+                device.sim_id,
+            },
+        },
+    }
+    if not Bridge.Database.Transaction(statements) then
+        return { success = false, error = "request_failed" }
+    end
+
+    local routed = Bridge.Database.Query([[
+        SELECT request.`id` AS `request_id`, created.`id` AS `created_event_id`
+        FROM `sky_phone_sms_messages` sms
+        INNER JOIN `sky_phone_company_request_messages` message ON message.`id` = sms.`id`
+        INNER JOIN `sky_phone_company_requests` request ON request.`id` = message.`request_id`
+        LEFT JOIN `sky_phone_company_request_events` created
+            ON created.`id` = ? AND created.`request_id` = request.`id`
+        WHERE sms.`id` = ? LIMIT 1
+    ]], { created_event_id, data.id })
+    if not routed[1] then
+        Bridge.Debug(
+            "error",
+            "[sky_phone] Service-line message %s committed without a complete route.",
+            tostring(data.id),
+            { always = true }
+        )
+        return { success = false, error = "request_failed" }
+    end
+    local row = request_row(routed[1].request_id)
+    if not row then
+        return { success = false, error = "request_failed" }
+    end
+
+    emit_request_change(row, true, true, source)
+    if routed[1].created_event_id then
+        notify_company(row.company_id, "sky_phone:companies:notification", notification_payload(
+            "newRequest",
+            "work",
+            row
+        ), source)
+    elseif row.assigned_identifier then
+        notify_identifier(
+            row.assigned_identifier,
+            row.company_id,
+            "sky_phone:companies:notification",
+            notification_payload("newMessage", "work", row)
+        )
+    end
+    return {
+        success = true,
+        data = {
+            messageId = data.id,
+            requestId = row.id,
+        },
+    }
+end
+
 Bridge.Callbacks.Register("sky_phone:companies:create-request", function(source, data)
     local allowed, rate_error = allow_mutation(source, "create_request", "CreateRequest")
     if not allowed then
@@ -2160,6 +2324,11 @@ Bridge.Callbacks.Register("sky_phone:companies:send-message", function(source, d
     then
         return { success = false, error = "invalid_status" }
     end
+    local service_line = access.row.channel == "service_line"
+        and SkyPhoneCompanies.GetServiceLineForCompany(access.row.company_id) or nil
+    if access.row.channel == "service_line" and (not service_line or not service_line.canMessage) then
+        return { success = false, error = "messaging_unavailable" }
+    end
     local message_id = uuid()
     local mutation_token = uuid()
     local new_status = access.audience == "customer" and access.row.status == "waiting_customer"
@@ -2199,6 +2368,37 @@ Bridge.Callbacks.Register("sky_phone:companies:send-message", function(source, d
             params = { message_id, access.member.identifier, body, request_id, revision + 1, mutation_token },
         }
     end
+    if service_line then
+        if access.audience == "customer" then
+            statements[#statements + 1] = {
+                query = [[
+                    INSERT INTO `sky_phone_sms_messages`
+                        (`id`, `sender_sim_id`, `recipient_sim_id`, `sender_number`, `recipient_number`,
+                            `message_type`, `body`)
+                    SELECT message.`id`, request.`customer_sim_id`, NULL, sim.`phone_number`, ?, 'text', message.`body`
+                    FROM `sky_phone_company_request_messages` message
+                    INNER JOIN `sky_phone_company_requests` request ON request.`id` = message.`request_id`
+                    INNER JOIN `sky_phone_sims` sim ON sim.`id` = request.`customer_sim_id`
+                    WHERE message.`id` = ? AND message.`sender_type` = 'customer'
+                ]],
+                params = { service_line.number, message_id },
+            }
+        else
+            statements[#statements + 1] = {
+                query = [[
+                    INSERT INTO `sky_phone_sms_messages`
+                        (`id`, `sender_sim_id`, `recipient_sim_id`, `sender_number`, `recipient_number`,
+                            `message_type`, `body`)
+                    SELECT message.`id`, NULL, request.`customer_sim_id`, ?, sim.`phone_number`, 'text', message.`body`
+                    FROM `sky_phone_company_request_messages` message
+                    INNER JOIN `sky_phone_company_requests` request ON request.`id` = message.`request_id`
+                    INNER JOIN `sky_phone_sims` sim ON sim.`id` = request.`customer_sim_id`
+                    WHERE message.`id` = ? AND message.`sender_type` = 'company'
+                ]],
+                params = { service_line.number, message_id },
+            }
+        end
+    end
     if new_status ~= access.row.status then
         statements[#statements + 1] = {
             query = [[
@@ -2213,16 +2413,32 @@ Bridge.Callbacks.Register("sky_phone:companies:send-message", function(source, d
     if not Bridge.Database.Transaction(statements) then
         return { success = false, error = "request_failed" }
     end
-    local inserted = Bridge.Database.Query(
-        "SELECT `id` FROM `sky_phone_company_request_messages` WHERE `id` = ? LIMIT 1",
-        { message_id }
-    )
+    local inserted = Bridge.Database.Query([[
+        SELECT message.`id`, sms.`id` AS `sms_id`
+        FROM `sky_phone_company_request_messages` message
+        LEFT JOIN `sky_phone_sms_messages` sms ON sms.`id` = message.`id`
+        WHERE message.`id` = ? LIMIT 1
+    ]], { message_id })
     if not inserted[1] then
         return { success = false, error = "revision_conflict" }
     end
+    if service_line and not inserted[1].sms_id then
+        Bridge.Debug(
+            "error",
+            "[sky_phone] Company request message %s committed without its service-line SMS.",
+            tostring(message_id),
+            { always = true }
+        )
+        return { success = false, error = "request_failed" }
+    end
     local row = request_row(request_id)
     emit_request_change(row, true, true, source)
     if access.audience == "customer" then
+        if service_line then
+            TriggerClientEvent("sky_phone:messages:changed", source, {
+                phoneNumber = service_line.number,
+            })
+        end
         local notification = notification_payload("newMessage", "work", row)
         if row.assigned_identifier then
             notify_identifier(
@@ -2232,6 +2448,12 @@ Bridge.Callbacks.Register("sky_phone:companies:send-message", function(source, d
                 notification
             )
         end
+    elseif service_line then
+        notify_sim(row.customer_sim_id, "sky_phone:messages:new", {
+            phoneNumber = service_line.number,
+            sender = service_line.name,
+            voice = false,
+        })
     else
         notify_sim(row.customer_sim_id, "sky_phone:companies:notification", notification_payload(
             "newMessage",

sky_phone/source/server/db_migrate.lua

@@ -2710,6 +2710,7 @@ local schema = {
             { name = "id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" },
             { name = "company_id", type = "VARCHAR(64) NOT NULL", characterSet = "ascii", collation = "ascii_bin" },
             { name = "service_id", type = "VARCHAR(64) NULL", characterSet = "ascii", collation = "ascii_bin" },
+            { name = "channel", type = "ENUM('app','service_line') NOT NULL DEFAULT 'app'" },
             { name = "customer_sim_id", type = "CHAR(36) NOT NULL", characterSet = "ascii", collation = "ascii_bin" },
             { name = "subject", type = "VARCHAR(120) NOT NULL" },
             { name = "description", type = "VARCHAR(2000) NOT NULL" },
@@ -2729,6 +2730,7 @@ local schema = {
             { name = "idx_sky_phone_company_requests_customer", columns = "(`customer_sim_id`, `updated_at`, `id`)" },
             { name = "idx_sky_phone_company_requests_queue", columns = "(`company_id`, `status`, `updated_at`, `id`)" },
             { name = "idx_sky_phone_company_requests_assignee", columns = "(`company_id`, `assigned_identifier`, `status`)" },
+            { name = "idx_sky_phone_company_requests_service_line", columns = "(`company_id`, `customer_sim_id`, `channel`, `status`, `updated_at`, `id`)" },
         },
         foreignKeys = {
             { column = "company_id", references = "`sky_phone_company_profiles` (`company_id`) ON DELETE CASCADE" },

sky_phone/source/server/messages.lua

@@ -97,6 +97,14 @@ local function current_device(source)
     return device
 end
 
+local function resolve_message_recipient(value)
+    local service_line = SkyPhoneCompanies.GetServiceLine(value)
+    if service_line then
+        return service_line.number, service_line
+    end
+    return SkyPhoneSimNumber.Normalize(value, Config.Sim.NumberLength, Config.Sim.NumberPrefix), nil
+end
+
 local function shared_contact(device, contact_id)
     if type(contact_id) ~= "string" or contact_id == "" or #contact_id > 36 then
         return nil, "invalid_contact"
@@ -366,7 +374,7 @@ Bridge.Callbacks.Register("sky_phone:messages:thread", function(source, data)
     if not device then
         return error_response
     end
-    local number = SkyPhoneSimNumber.Normalize(data.phoneNumber, Config.Sim.NumberLength, Config.Sim.NumberPrefix)
+    local number = resolve_message_recipient(data.phoneNumber)
     if not number then
         return { success = false, error = "invalid_number" }
     end
@@ -407,11 +415,7 @@ Bridge.Callbacks.Register("sky_phone:messages:delete", function(source, data)
     local numbers = {}
     local seen = {}
     for index = 1, #data.phoneNumbers do
-        local number = SkyPhoneSimNumber.Normalize(
-            data.phoneNumbers[index],
-            Config.Sim.NumberLength,
-            Config.Sim.NumberPrefix
-        )
+        local number = resolve_message_recipient(data.phoneNumbers[index])
         if not number then
             return { success = false, error = "invalid_number" }
         end
@@ -483,7 +487,7 @@ Bridge.Callbacks.Register("sky_phone:messages:send", function(source, data)
     if not device then
         return error_response
     end
-    local number = SkyPhoneSimNumber.Normalize(data.phoneNumber, Config.Sim.NumberLength, Config.Sim.NumberPrefix)
+    local number, service_line = resolve_message_recipient(data.phoneNumber)
     if not number then
         return { success = false, error = "invalid_number" }
     end
@@ -536,6 +540,42 @@ Bridge.Callbacks.Register("sky_phone:messages:send", function(source, data)
     else
         return { success = false, error = "invalid_request" }
     end
+    if service_line then
+        if not service_line.canMessage then
+            return { success = false, error = "messaging_unavailable" }
+        end
+        if message_type ~= "text" then
+            return { success = false, error = "service_line_text_only" }
+        end
+        local id = uuid()
+        local routed = SkyPhoneCompanies.RouteServiceLineMessage(source, {
+            id = id,
+            body = body,
+            messageType = message_type,
+            phoneNumber = number,
+        })
+        if not routed or not routed.success then
+            return routed or { success = false, error = "request_failed" }
+        end
+        local rows = Bridge.Database.Query([[
+            SELECT `id`, `sender_number`, `recipient_number`, `message_type`, `body`,
+                `media_payload`, `media_mime`, `media_duration_ms`, `media_waveform`,
+                `read_at`, `created_at`, 'sent' AS `direction`
+            FROM `sky_phone_sms_messages` WHERE `id` = ? LIMIT 1
+        ]], { id })
+        if not rows[1] then
+            Bridge.Debug(
+                "error",
+                "[sky_phone] Routed service-line SMS %s could not be read back.",
+                tostring(id),
+                { always = true }
+            )
+            return { success = false, error = "request_failed" }
+        end
+        local message = format_message(rows[1])
+        TriggerClientEvent("sky_phone:messages:changed", source, { phoneNumber = number })
+        return { success = true, data = message }
+    end
     local recipients = Bridge.Database.Query([[
         SELECT s.`id`, s.`phone_number`
         FROM `sky_phone_sims` s

sky_phone/source/server/phone_configurator.lua

@@ -1289,8 +1289,8 @@ local function migrate_police_request_defaults()
     )
 end
 
-local function migrate_unsupported_company_message_defaults()
-    local migration_name = "sky-phone:configurator:unsupported-company-message-defaults:v1"
+local function migrate_police_service_line_messaging()
+    local migration_name = "sky-phone:configurator:service-line-messaging:v2"
     local completed = Bridge.Database.Query(
         "SELECT 1 FROM `sky_phone_migrations` WHERE `name` = ? LIMIT 1",
         { migration_name }
@@ -1301,22 +1301,17 @@ local function migrate_unsupported_company_message_defaults()
 
     local row = read_stored_row()
     local config_payload = decode_payload(row.config_payload, "config")
-    local definitions = config_payload.Companies
+    local police = config_payload.Companies
         and config_payload.Companies.Definitions
-    local migrated_companies = {}
-    if type(definitions) == "table" then
-        for company_id, definition in pairs(definitions) do
-            local line = type(definition) == "table" and definition.ServiceLine or nil
-            if type(line) == "table" and line.CanMessage == true then
-                line.CanMessage = false
-                migrated_companies[#migrated_companies + 1] = tostring(company_id)
-            end
-        end
+        and config_payload.Companies.Definitions.police
+    local line = type(police) == "table" and police.ServiceLine or nil
+    local migrated = type(line) == "table" and line.CanMessage ~= true
+    if migrated then
+        line.CanMessage = true
     end
-    table.sort(migrated_companies)
 
     local statements = {}
-    if #migrated_companies > 0 then
+    if migrated then
         statements[#statements + 1] = {
             query = ([[
                 UPDATE `%s`
@@ -1334,13 +1329,13 @@ local function migrate_unsupported_company_message_defaults()
         params = {
             migration_name,
             "sky-phone",
-            json.encode({ companies = migrated_companies }),
+            json.encode({ police = migrated }),
         },
     }
     if not Bridge.Database.Transaction(statements) then
-        error("[sky_phone] Could not migrate unsupported Phone Configurator service-line messaging defaults.")
+        error("[sky_phone] Could not enable Phone Configurator police service-line messaging.")
     end
-    if #migrated_companies == 0 then
+    if not migrated then
         return
     end
 
@@ -1350,8 +1345,7 @@ local function migrate_unsupported_company_message_defaults()
     SkyPhoneConfigurator.Broadcast(-1)
     Bridge.Debug(
         "info",
-        "[sky_phone] Disabled unsupported Phone Configurator service-line messaging for: %s",
-        table.concat(migrated_companies, ", "),
+        "[sky_phone] Enabled Phone Configurator police service-line messaging.",
         { always = true }
     )
 end
@@ -1378,7 +1372,7 @@ apply_stored_row(read_stored_row())
 apply_runtime_configuration()
 Bridge.Database.AfterMigration("sky_phone", migrate_blank_company_definitions)
 Bridge.Database.AfterMigration("sky_phone", migrate_police_request_defaults)
-Bridge.Database.AfterMigration("sky_phone", migrate_unsupported_company_message_defaults)
+Bridge.Database.AfterMigration("sky_phone", migrate_police_service_line_messaging)
 
 function SkyPhoneConfigurator.GetAdminData()
     local data = build_admin_data()

sky_phone/source/shared/config_default.lua

@@ -1175,7 +1175,7 @@ if IsDuplicityVersion() then
                     Number = "911",
                     AutoContact = true,
                     CanCall = true,
-                    CanMessage = false,
+                    CanMessage = true,
                     Routing = "round_robin",
                     MinimumGrade = 0,
                 },