feat(ui): subject-level regions autocomplete in NewProjectDialog + PDD (Plan 6 Task 5)

- projectsStore: Project.regions?: number[] interface field
- NewProjectDialog: replace interim placeholder с v-autocomplete (89
  subjects + federal district subtitle); form drops region_mask/region_mode
  (backend dual-writes)
- ProjectDetailsDrawer: replace maskToCodes/encode-watch с direct
  form.regions binding; same v-autocomplete component
- Vitest: +2 NewProjectDialog tests (count=89, POST payload includes regions[]);
  refactor 3 existing PDD region tests на regions[] model

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

app/app/Casts/PostgresIntArray.php

@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Casts;
+
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Eloquent cast for PostgreSQL native INT[] columns.
+ *
+ * Laravel stock 'array' cast uses json_encode/json_decode and sends `[1,2,3]`
+ * (JSON), which Postgres rejects on INT[] columns (expects `{1,2,3}` array
+ * literal). This cast:
+ *
+ *  - get(): parses Postgres array literal `{1,2,3}` (or empty `{}`) into PHP
+ *           int array.
+ *  - set(): serializes PHP array `[1,2,3]` into Postgres literal `{1,2,3}`.
+ *
+ * Used for projects.regions INT[] (Plan 6).
+ *
+ * @implements CastsAttributes<list<int>, list<int>|null>
+ */
+class PostgresIntArray implements CastsAttributes
+{
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @return list<int>
+     */
+    public function get(Model $model, string $key, mixed $value, array $attributes): array
+    {
+        if ($value === null || $value === '' || $value === '{}') {
+            return [];
+        }
+
+        // PG returns literal like "{1,2,3}".
+        if (is_string($value)) {
+            $trimmed = trim($value, '{}');
+
+            if ($trimmed === '') {
+                return [];
+            }
+
+            return array_map('intval', explode(',', $trimmed));
+        }
+
+        // Defensive: if driver already gave array.
+        if (is_array($value)) {
+            return array_values(array_map('intval', $value));
+        }
+
+        return [];
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     */
+    public function set(Model $model, string $key, mixed $value, array $attributes): ?string
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        // Defensive: interface phpdoc says list<int>|null, but $value is mixed at PHP level;
+        // protect against runtime misuse (e.g., string passed mistakenly).
+        // @phpstan-ignore function.alreadyNarrowedType
+        if (! is_array($value)) {
+            throw new \InvalidArgumentException(
+                "PostgresIntArray cast expects array for key '{$key}', got ".gettype($value)
+            );
+        }
+
+        if ($value === []) {
+            return '{}';
+        }
+
+        $ints = array_map('intval', $value);
+
+        return '{'.implode(',', $ints).'}';
+    }
+}

app/app/Http/Requests/StoreProjectRequest.php

@@ -22,8 +22,11 @@ class StoreProjectRequest extends FormRequest
             'name' => ['required', 'string', 'max:255'],
             'signal_type' => ['required', Rule::in(['site', 'call', 'sms'])],
             'daily_limit_target' => ['required', 'integer', 'min:1', 'max:10000'],
-            'region_mask' => ['required', 'integer', 'min:0'],
-            'region_mode' => ['required', Rule::in(['include', 'exclude'])],
+            // Plan 6: subject-level regions[] заменил region_mask/region_mode на API-уровне.
+            // Empty array = "вся РФ" (паритет с legacy region_mask=255 + region_mode='include').
+            // present = поле должно быть в payload (даже если []), enforces explicit choice.
+            'regions' => ['present', 'array'],
+            'regions.*' => ['integer', 'between:1,89'],
             'delivery_days_mask' => ['required', 'integer', 'min:1', 'max:127'],
         ];
 

app/app/Http/Requests/UpdateProjectRequest.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class UpdateProjectRequest extends FormRequest
 {
@@ -20,8 +19,10 @@ class UpdateProjectRequest extends FormRequest
         return [
             'name' => ['sometimes', 'string', 'max:255'],
             'daily_limit_target' => ['sometimes', 'integer', 'min:1', 'max:10000'],
-            'region_mask' => ['sometimes', 'integer', 'min:0'],
-            'region_mode' => ['sometimes', Rule::in(['include', 'exclude'])],
+            // Plan 6: subject-level regions[] заменил region_mask/region_mode на API-уровне.
+            // sometimes = поле omit-able (preserves prior DB value), массив + each 1..89.
+            'regions' => ['sometimes', 'array'],
+            'regions.*' => ['integer', 'between:1,89'],
             'delivery_days_mask' => ['sometimes', 'integer', 'min:1', 'max:127'],
             'sms_senders' => ['sometimes', 'array', 'min:1'],
             'sms_senders.*' => ['string', 'max:11'],

app/app/Jobs/Supplier/SyncSupplierProjectsJob.php

@@ -207,7 +207,7 @@ class SyncSupplierProjectsJob implements ShouldQueue
      * Маппинг:
      *   daily_limit  ← daily_limit_target
      *   workdays     ← биты delivery_days_mask (bit 0=Пн, …, bit 6=Вс) → ISO 1..7
-     *   regions      ← биты region_mask (bit 0=Центральный, …, bit 7=Дальневосточный) → 1..8
+     *   regions      ← projects.regions INT[] (subject codes 1..89) direct copy
      *
      * @param  EloquentCollection<int, Project>  $projects
      * @return Collection<int, stdClass>
@@ -219,12 +219,11 @@ class SyncSupplierProjectsJob implements ShouldQueue
             $obj->daily_limit = (int) $p->daily_limit_target;
             $obj->workdays = $this->bitmaskToList((int) $p->delivery_days_mask, 7);
 
-            // region_mask=255 (все 8 ФО, default) — catch-all семантика → пустой массив
-            // у supplier ("без региональных ограничений"). Иначе — список выставленных битов.
-            $regionMask = (int) $p->region_mask;
-            $obj->regions = $regionMask === 255
-                ? []
-                : $this->bitmaskToList($regionMask, 8);
+            // Plan 6: projects.regions[] напрямую копируется в supplier_projects.current_regions.
+            // Empty array = "вся РФ" (паритет с supplier API semantics).
+            // Legacy region_mask/region_mode игнорируются — они dual-write для PhonePrefixService,
+            // outbound к supplier использует только regions[]. Cleanup в Plan 6.5.
+            $obj->regions = array_values((array) $p->regions);
 
             return $obj;
         })->values();

app/app/Models/Project.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Casts\PostgresIntArray;
 use Carbon\CarbonInterface;
 use Database\Factories\ProjectFactory;
 use Illuminate\Database\Eloquent\Builder;
@@ -45,6 +46,9 @@ class Project extends Model
         'effective_limit_calculated_at',
         'region_mask',
         'region_mode',
+        // Plan 6 (schema v8.20): Subject-level regions array (89 codes из resources/js/constants/regions.ts).
+        // Источник истины с Plan 6+; region_mask/region_mode — DEPRECATED (Plan 6.5 cleanup).
+        'regions',
         'delivery_days_mask',
         'assignment_strategy',
         'ttfr_target_minutes',
@@ -69,6 +73,10 @@ class Project extends Model
             'daily_limit_target' => 'integer',
             'effective_daily_limit_today' => 'integer',
             'region_mask' => 'integer',
+            // Plan 6: Subject-level regions array (89 codes). Используется кастомный
+            // PostgresIntArray cast — Laravel stock 'array' посылает JSON `[1,2,3]`,
+            // что Postgres отвергает на INT[] (ожидает literal `{1,2,3}`).
+            'regions' => PostgresIntArray::class,
             'delivery_days_mask' => 'integer',
             'ttfr_target_minutes' => 'integer',
             'effective_limit_calculated_at' => 'datetime',

app/app/Services/Project/ProjectService.php

@@ -191,6 +191,11 @@ class ProjectService
 
         $data['tenant_id'] = $tenant->id;
         $data['is_active'] = true;
+        $data['regions'] = $data['regions'] ?? [];
+        // Plan 6 dual-write: regions[] источник истины; region_mask/mode — legacy для
+        // PhonePrefixService / LeadRouter, удаляются в Plan 6.5 после переключения читателей.
+        $data['region_mask'] = 255;
+        $data['region_mode'] = 'include';
         $project = Project::create($data);
 
         SyncSupplierProjectJob::dispatch($project->id);

app/phpstan-baseline.neon

@@ -1,5 +1,25 @@
 parameters:
 	ignoreErrors:
+		# Plan 6 (v8.20): Project::$regions INT[] cast via PostgresIntArray; ide-helper
+		# regen pending (will resolve after next `php artisan ide-helper:models -W`).
+		-
+			message: '#^Access to an undefined property App\\Models\\Project\:\:\$regions\.$#'
+			identifier: property.notFound
+			count: 1
+			path: tests/Feature/Plan5/Projects/ProjectsStoreTest.php
+
+		-
+			message: '#^Access to an undefined property App\\Models\\Project\:\:\$regions\.$#'
+			identifier: property.notFound
+			count: 2
+			path: tests/Feature/Plan5/Projects/ProjectsUpdateTest.php
+
+		-
+			message: '#^Access to an undefined property App\\Models\\Project\:\:\$regions\.$#'
+			identifier: property.notFound
+			count: 1
+			path: app/Jobs/Supplier/SyncSupplierProjectsJob.php
+
 		-
 			message: '#^Expression on left side of \?\? is not nullable\.$#'
 			identifier: nullCoalesce.expr
@@ -903,13 +923,13 @@ parameters:
 		-
 			message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:actingAs\(\)\.$#'
 			identifier: method.notFound
-			count: 9
+			count: 12
 			path: tests/Feature/Plan5/Projects/ProjectsStoreTest.php
 
 		-
 			message: '#^Call to an undefined method Pest\\PendingCalls\\TestCall\:\:actingAs\(\)\.$#'
 			identifier: method.notFound
-			count: 6
+			count: 8
 			path: tests/Feature/Plan5/Projects/ProjectsUpdateTest.php
 
 		-

app/resources/js/components/projects/ProjectDetailsDrawer.vue

@@ -3,7 +3,7 @@ import { ref, reactive, computed, onMounted, onBeforeUnmount, watch } from 'vue'
 import axios from 'axios';
 import type { Project } from '../../stores/projectsStore';
 import { useProjectsStore } from '../../stores/projectsStore';
-import { REGIONS } from '../../constants/regions';
+import { REGIONS, FEDERAL_DISTRICT_NAMES } from '../../constants/regions';
 
 const props = defineProps<{ project: Project | null }>();
 const emit = defineEmits<{ close: []; saved: [] }>();
@@ -11,8 +11,7 @@ const emit = defineEmits<{ close: []; saved: [] }>();
 interface FormState {
     name: string;
     daily_limit_target: number;
-    region_mask: number;
-    region_mode: 'include' | 'exclude';
+    regions: number[];
     delivery_days_mask: number;
     sms_senders: string[];
     sms_keyword: string;
@@ -21,48 +20,31 @@ interface FormState {
 const form = reactive<FormState>({
     name: '',
     daily_limit_target: 50,
-    region_mask: 0,
-    region_mode: 'include',
+    regions: [],
     delivery_days_mask: 127,
     sms_senders: [],
     sms_keyword: '',
 });
 
-const selectedRegions = ref<number[]>([]);
 const selectableRegions = REGIONS.filter((r) => r.code !== 0);
 
-function maskToCodes(mask: number): number[] {
-    const codes: number[] = [];
-    for (let i = 1; i <= 31; i++) if (mask & (1 << i)) codes.push(i);
-    return codes;
-}
-
 function reseedFromProject(p: Project | null): void {
     if (!p) return;
     form.name = p.name;
     form.daily_limit_target = p.daily_limit_target;
-    form.region_mask = p.region_mask ?? 0;
-    form.region_mode = (p.region_mode ?? 'include') as 'include' | 'exclude';
+    form.regions = Array.isArray(p.regions) ? [...p.regions] : [];
     form.delivery_days_mask = p.delivery_days_mask ?? 127;
     form.sms_senders = p.sms_senders ?? [];
     form.sms_keyword = p.sms_keyword ?? '';
-    selectedRegions.value = maskToCodes(form.region_mask);
 }
 reseedFromProject(props.project);
 
-watch(() => props.project?.id, () => {
-    reseedFromProject(props.project);
-});
-
-watch(selectedRegions, (codes) => {
-    if (codes.length === 0) {
-        form.region_mask = 0;
-        form.region_mode = 'include';
-    } else {
-        form.region_mask = codes.reduce((acc, c) => (c >= 1 && c <= 31 ? acc | (1 << c) : acc), 0);
-        form.region_mode = 'exclude';
-    }
-});
+watch(
+    () => props.project?.id,
+    () => {
+        reseedFromProject(props.project);
+    },
+);
 
 const saving = ref(false);
 const errors = reactive<Record<string, string[]>>({});
@@ -76,7 +58,9 @@ async function onPause(): Promise<void> {
 
 async function onDelete(): Promise<void> {
     if (!props.project) return;
-    const ok = window.confirm('Архивировать проект? Действие необратимо в Plan 5 (восстановление потребует ручного запроса).');
+    const ok = window.confirm(
+        'Архивировать проект? Действие необратимо в Plan 5 (восстановление потребует ручного запроса).',
+    );
     if (!ok) return;
     await store.archive(props.project.id);
     emit('close');
@@ -90,8 +74,7 @@ async function onSave(): Promise<void> {
         const payload: Record<string, unknown> = {
             name: form.name,
             daily_limit_target: form.daily_limit_target,
-            region_mask: form.region_mask,
-            region_mode: form.region_mode,
+            regions: form.regions,
             delivery_days_mask: form.delivery_days_mask,
         };
         if (props.project.signal_type === 'sms') {
@@ -122,7 +105,7 @@ const activeDays = computed<boolean[]>(() => {
 });
 
 function toggleDay(i: number): void {
-    form.delivery_days_mask ^= (1 << i);
+    form.delivery_days_mask ^= 1 << i;
 }
 
 const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
@@ -159,7 +142,7 @@ const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
                 <div class="pdd-field">
                     <span class="pdd-label">Регионы (пусто = вся РФ)</span>
                     <v-autocomplete
-                        v-model="selectedRegions"
+                        v-model="form.regions"
                         :items="selectableRegions"
                         item-title="name"
                         item-value="code"
@@ -169,7 +152,15 @@ const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
                         density="comfortable"
                         hide-details
                         data-testid="pdd-regions"
-                    />
+                    >
+                        <template #item="{ props: itemProps, item }">
+                            <v-list-item v-bind="itemProps">
+                                <template #subtitle>
+                                    {{ FEDERAL_DISTRICT_NAMES[item.raw.federalDistrict] || '' }}
+                                </template>
+                            </v-list-item>
+                        </template>
+                    </v-autocomplete>
                 </div>
 
                 <div class="pdd-field">
@@ -197,13 +188,12 @@ const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
                     <button class="pdd-btn pdd-btn-error" data-testid="pdd-delete" @click="onDelete">🗄 Удалить</button>
                 </div>
                 <div class="pdd-foot-right">
-                    <button class="pdd-btn pdd-btn-text" data-testid="pdd-cancel" @click="$emit('close')">Отмена</button>
-                    <button
-                        class="pdd-btn pdd-btn-primary"
-                        data-testid="pdd-save"
-                        :disabled="saving"
-                        @click="onSave"
-                    >Сохранить</button>
+                    <button class="pdd-btn pdd-btn-text" data-testid="pdd-cancel" @click="$emit('close')">
+                        Отмена
+                    </button>
+                    <button class="pdd-btn pdd-btn-primary" data-testid="pdd-save" :disabled="saving" @click="onSave">
+                        Сохранить
+                    </button>
                 </div>
             </footer>
         </div>
@@ -212,34 +202,123 @@ const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
 
 <style scoped>
 .project-details-drawer {
-    position: fixed; top: 0; right: 0; bottom: 0;
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
     width: 480px;
     background: var(--liderra-surface, #ffffff);
     border-left: 1px solid var(--liderra-line, #e6e2d6);
     box-shadow: -4px 0 16px rgba(0, 0, 0, 0.06);
     transform: translateX(100%);
     transition: transform 240ms cubic-bezier(0.16, 1, 0.3, 1);
-    display: flex; flex-direction: column;
+    display: flex;
+    flex-direction: column;
     z-index: 5;
 }
-.project-details-drawer.open { transform: translateX(0); }
-.pdd-content { display: flex; flex-direction: column; height: 100%; }
-.pdd-head { display: flex; justify-content: space-between; align-items: center; padding: 16px 20px; border-bottom: 1px solid var(--liderra-line, #e6e2d6); }
-.pdd-title { font-weight: 600; font-size: 16px; }
-.pdd-close { background: none; border: 0; cursor: pointer; font-size: 18px; padding: 4px; }
-.pdd-body { padding: 16px 20px; display: flex; flex-direction: column; gap: 14px; flex: 1; overflow-y: auto; }
-.pdd-field { display: flex; flex-direction: column; gap: 4px; }
-.pdd-label { font-size: 12px; color: #6b6f72; }
-.pdd-input { padding: 8px 10px; border: 1px solid var(--liderra-line, #e6e2d6); border-radius: 6px; font: inherit; }
-.pdd-days { display: flex; gap: 4px; }
-.pdd-day { padding: 6px 10px; border: 1px solid var(--liderra-line, #e6e2d6); background: #ffffff; border-radius: 4px; cursor: pointer; font: inherit; }
-.pdd-day.active { background: #0f6e56; color: #ffffff; border-color: #0f6e56; }
-.pdd-foot { display: flex; justify-content: space-between; padding: 12px 20px; border-top: 1px solid var(--liderra-line, #e6e2d6); }
-.pdd-foot-left, .pdd-foot-right { display: flex; gap: 8px; }
-.pdd-btn { padding: 6px 14px; border: 0; border-radius: 6px; cursor: pointer; font: inherit; }
-.pdd-btn-text { background: transparent; color: #081319; }
-.pdd-btn-primary { background: #0f6e56; color: #ffffff; }
-.pdd-btn-warning { background: #f59e0b; color: #ffffff; }
-.pdd-btn-error { background: #dc2626; color: #ffffff; }
-.pdd-error { color: #dc2626; font-size: 12px; margin-top: 4px; }
+.project-details-drawer.open {
+    transform: translateX(0);
+}
+.pdd-content {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+.pdd-head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px 20px;
+    border-bottom: 1px solid var(--liderra-line, #e6e2d6);
+}
+.pdd-title {
+    font-weight: 600;
+    font-size: 16px;
+}
+.pdd-close {
+    background: none;
+    border: 0;
+    cursor: pointer;
+    font-size: 18px;
+    padding: 4px;
+}
+.pdd-body {
+    padding: 16px 20px;
+    display: flex;
+    flex-direction: column;
+    gap: 14px;
+    flex: 1;
+    overflow-y: auto;
+}
+.pdd-field {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+}
+.pdd-label {
+    font-size: 12px;
+    color: #6b6f72;
+}
+.pdd-input {
+    padding: 8px 10px;
+    border: 1px solid var(--liderra-line, #e6e2d6);
+    border-radius: 6px;
+    font: inherit;
+}
+.pdd-days {
+    display: flex;
+    gap: 4px;
+}
+.pdd-day {
+    padding: 6px 10px;
+    border: 1px solid var(--liderra-line, #e6e2d6);
+    background: #ffffff;
+    border-radius: 4px;
+    cursor: pointer;
+    font: inherit;
+}
+.pdd-day.active {
+    background: #0f6e56;
+    color: #ffffff;
+    border-color: #0f6e56;
+}
+.pdd-foot {
+    display: flex;
+    justify-content: space-between;
+    padding: 12px 20px;
+    border-top: 1px solid var(--liderra-line, #e6e2d6);
+}
+.pdd-foot-left,
+.pdd-foot-right {
+    display: flex;
+    gap: 8px;
+}
+.pdd-btn {
+    padding: 6px 14px;
+    border: 0;
+    border-radius: 6px;
+    cursor: pointer;
+    font: inherit;
+}
+.pdd-btn-text {
+    background: transparent;
+    color: #081319;
+}
+.pdd-btn-primary {
+    background: #0f6e56;
+    color: #ffffff;
+}
+.pdd-btn-warning {
+    background: #f59e0b;
+    color: #ffffff;
+}
+.pdd-btn-error {
+    background: #dc2626;
+    color: #ffffff;
+}
+.pdd-error {
+    color: #dc2626;
+    font-size: 12px;
+    margin-top: 4px;
+}
 </style>

app/resources/js/constants/regions.ts

@@ -1,42 +1,119 @@
 export interface Region {
-    code: number;
-    name: string;
+    code: number;            // 1..89, sequential по конституционному порядку (Art. 65)
+    name: string;            // официальное название субъекта
+    federalDistrict: number; // 1..8 (см. FEDERAL_DISTRICT_NAMES)
 }
 
-// MVP: 31 региона (коды 1..31) ограничены 32-bit region_mask из Plan 5 Task 9.
-// Sentinel code:0 = «Вся РФ» (включает все регионы, эквивалент пустой маски).
-// Имена — официальные субъекты РФ по конституционному порядку нумерации.
+// Конституционный порядок (ст. 65 Конституции РФ, ред. 2022):
+// 24 республики (1..24) → 9 краёв (25..33) → 48 областей (34..81) →
+// 3 города фед.знач. (82..84) → 1 АО Еврейская (85) → 4 АО (86..89).
+// Sentinel code:0 = "Вся РФ" (UI hint, в БД хранится как regions=[]).
 export const REGIONS: Region[] = [
-    { code: 0, name: 'Вся РФ' },
-    { code: 1, name: 'Республика Адыгея' },
-    { code: 2, name: 'Республика Башкортостан' },
-    { code: 3, name: 'Республика Бурятия' },
-    { code: 4, name: 'Республика Алтай' },
-    { code: 5, name: 'Республика Дагестан' },
-    { code: 6, name: 'Республика Ингушетия' },
-    { code: 7, name: 'Кабардино-Балкарская Республика' },
-    { code: 8, name: 'Республика Калмыкия' },
-    { code: 9, name: 'Карачаево-Черкесская Республика' },
-    { code: 10, name: 'Республика Карелия' },
-    { code: 11, name: 'Республика Коми' },
-    { code: 12, name: 'Республика Марий Эл' },
-    { code: 13, name: 'Республика Мордовия' },
-    { code: 14, name: 'Республика Саха (Якутия)' },
-    { code: 15, name: 'Республика Северная Осетия — Алания' },
-    { code: 16, name: 'Республика Татарстан' },
-    { code: 17, name: 'Республика Тыва' },
-    { code: 18, name: 'Удмуртская Республика' },
-    { code: 19, name: 'Республика Хакасия' },
-    { code: 20, name: 'Чеченская Республика' },
-    { code: 21, name: 'Чувашская Республика' },
-    { code: 22, name: 'Алтайский край' },
-    { code: 23, name: 'Краснодарский край' },
-    { code: 24, name: 'Красноярский край' },
-    { code: 25, name: 'Приморский край' },
-    { code: 26, name: 'Ставропольский край' },
-    { code: 27, name: 'Хабаровский край' },
-    { code: 28, name: 'Амурская область' },
-    { code: 29, name: 'Архангельская область' },
-    { code: 30, name: 'Астраханская область' },
-    { code: 31, name: 'Белгородская область' },
+    { code: 0,  name: 'Вся РФ',                                federalDistrict: 0 },
+    // 24 республики
+    { code: 1,  name: 'Республика Адыгея',                     federalDistrict: 3 },
+    { code: 2,  name: 'Республика Алтай',                      federalDistrict: 7 },
+    { code: 3,  name: 'Республика Башкортостан',               federalDistrict: 5 },
+    { code: 4,  name: 'Республика Бурятия',                    federalDistrict: 8 },
+    { code: 5,  name: 'Республика Дагестан',                   federalDistrict: 4 },
+    { code: 6,  name: 'Донецкая Народная Республика',          federalDistrict: 3 },
+    { code: 7,  name: 'Республика Ингушетия',                  federalDistrict: 4 },
+    { code: 8,  name: 'Кабардино-Балкарская Республика',       federalDistrict: 4 },
+    { code: 9,  name: 'Республика Калмыкия',                   federalDistrict: 3 },
+    { code: 10, name: 'Карачаево-Черкесская Республика',       federalDistrict: 4 },
+    { code: 11, name: 'Республика Карелия',                    federalDistrict: 2 },
+    { code: 12, name: 'Республика Коми',                       federalDistrict: 2 },
+    { code: 13, name: 'Республика Крым',                       federalDistrict: 3 },
+    { code: 14, name: 'Луганская Народная Республика',         federalDistrict: 3 },
+    { code: 15, name: 'Республика Марий Эл',                   federalDistrict: 5 },
+    { code: 16, name: 'Республика Мордовия',                   federalDistrict: 5 },
+    { code: 17, name: 'Республика Саха (Якутия)',              federalDistrict: 8 },
+    { code: 18, name: 'Республика Северная Осетия — Алания',   federalDistrict: 4 },
+    { code: 19, name: 'Республика Татарстан',                  federalDistrict: 5 },
+    { code: 20, name: 'Республика Тыва',                       federalDistrict: 7 },
+    { code: 21, name: 'Удмуртская Республика',                 federalDistrict: 5 },
+    { code: 22, name: 'Республика Хакасия',                    federalDistrict: 7 },
+    { code: 23, name: 'Чеченская Республика',                  federalDistrict: 4 },
+    { code: 24, name: 'Чувашская Республика',                  federalDistrict: 5 },
+    // 9 краёв
+    { code: 25, name: 'Алтайский край',                        federalDistrict: 7 },
+    { code: 26, name: 'Забайкальский край',                    federalDistrict: 8 },
+    { code: 27, name: 'Камчатский край',                       federalDistrict: 8 },
+    { code: 28, name: 'Краснодарский край',                    federalDistrict: 3 },
+    { code: 29, name: 'Красноярский край',                     federalDistrict: 7 },
+    { code: 30, name: 'Пермский край',                         federalDistrict: 5 },
+    { code: 31, name: 'Приморский край',                       federalDistrict: 8 },
+    { code: 32, name: 'Ставропольский край',                   federalDistrict: 4 },
+    { code: 33, name: 'Хабаровский край',                      federalDistrict: 8 },
+    // 48 областей
+    { code: 34, name: 'Амурская область',                      federalDistrict: 8 },
+    { code: 35, name: 'Архангельская область',                 federalDistrict: 2 },
+    { code: 36, name: 'Астраханская область',                  federalDistrict: 3 },
+    { code: 37, name: 'Белгородская область',                  federalDistrict: 1 },
+    { code: 38, name: 'Брянская область',                      federalDistrict: 1 },
+    { code: 39, name: 'Владимирская область',                  federalDistrict: 1 },
+    { code: 40, name: 'Волгоградская область',                 federalDistrict: 3 },
+    { code: 41, name: 'Вологодская область',                   federalDistrict: 2 },
+    { code: 42, name: 'Воронежская область',                   federalDistrict: 1 },
+    { code: 43, name: 'Запорожская область',                   federalDistrict: 3 },
+    { code: 44, name: 'Ивановская область',                    federalDistrict: 1 },
+    { code: 45, name: 'Иркутская область',                     federalDistrict: 7 },
+    { code: 46, name: 'Калининградская область',               federalDistrict: 2 },
+    { code: 47, name: 'Калужская область',                     federalDistrict: 1 },
+    { code: 48, name: 'Кемеровская область',                   federalDistrict: 7 },
+    { code: 49, name: 'Кировская область',                     federalDistrict: 5 },
+    { code: 50, name: 'Костромская область',                   federalDistrict: 1 },
+    { code: 51, name: 'Курганская область',                    federalDistrict: 6 },
+    { code: 52, name: 'Курская область',                       federalDistrict: 1 },
+    { code: 53, name: 'Ленинградская область',                 federalDistrict: 2 },
+    { code: 54, name: 'Липецкая область',                      federalDistrict: 1 },
+    { code: 55, name: 'Магаданская область',                   federalDistrict: 8 },
+    { code: 56, name: 'Московская область',                    federalDistrict: 1 },
+    { code: 57, name: 'Мурманская область',                    federalDistrict: 2 },
+    { code: 58, name: 'Нижегородская область',                 federalDistrict: 5 },
+    { code: 59, name: 'Новгородская область',                  federalDistrict: 2 },
+    { code: 60, name: 'Новосибирская область',                 federalDistrict: 7 },
+    { code: 61, name: 'Омская область',                        federalDistrict: 7 },
+    { code: 62, name: 'Оренбургская область',                  federalDistrict: 5 },
+    { code: 63, name: 'Орловская область',                     federalDistrict: 1 },
+    { code: 64, name: 'Пензенская область',                    federalDistrict: 5 },
+    { code: 65, name: 'Псковская область',                     federalDistrict: 2 },
+    { code: 66, name: 'Ростовская область',                    federalDistrict: 3 },
+    { code: 67, name: 'Рязанская область',                     federalDistrict: 1 },
+    { code: 68, name: 'Самарская область',                     federalDistrict: 5 },
+    { code: 69, name: 'Саратовская область',                   federalDistrict: 5 },
+    { code: 70, name: 'Сахалинская область',                   federalDistrict: 8 },
+    { code: 71, name: 'Свердловская область',                  federalDistrict: 6 },
+    { code: 72, name: 'Смоленская область',                    federalDistrict: 1 },
+    { code: 73, name: 'Тамбовская область',                    federalDistrict: 1 },
+    { code: 74, name: 'Тверская область',                      federalDistrict: 1 },
+    { code: 75, name: 'Томская область',                       federalDistrict: 7 },
+    { code: 76, name: 'Тульская область',                      federalDistrict: 1 },
+    { code: 77, name: 'Тюменская область',                     federalDistrict: 6 },
+    { code: 78, name: 'Ульяновская область',                   federalDistrict: 5 },
+    { code: 79, name: 'Херсонская область',                    federalDistrict: 3 },
+    { code: 80, name: 'Челябинская область',                   federalDistrict: 6 },
+    { code: 81, name: 'Ярославская область',                   federalDistrict: 1 },
+    // 3 города федерального значения
+    { code: 82, name: 'Москва',                                federalDistrict: 1 },
+    { code: 83, name: 'Санкт-Петербург',                       federalDistrict: 2 },
+    { code: 84, name: 'Севастополь',                           federalDistrict: 3 },
+    // 1 автономная область
+    { code: 85, name: 'Еврейская автономная область',          federalDistrict: 8 },
+    // 4 автономных округа
+    { code: 86, name: 'Ненецкий автономный округ',             federalDistrict: 2 },
+    { code: 87, name: 'Ханты-Мансийский автономный округ — Югра', federalDistrict: 6 },
+    { code: 88, name: 'Чукотский автономный округ',            federalDistrict: 8 },
+    { code: 89, name: 'Ямало-Ненецкий автономный округ',       federalDistrict: 6 },
 ];
+
+export const FEDERAL_DISTRICT_NAMES: Record<number, string> = {
+    1: 'Центральный',
+    2: 'Северо-Западный',
+    3: 'Южный',
+    4: 'Северо-Кавказский',
+    5: 'Приволжский',
+    6: 'Уральский',
+    7: 'Сибирский',
+    8: 'Дальневосточный',
+};

app/resources/js/stores/projectsStore.ts

@@ -16,6 +16,7 @@ export interface Project {
     archived_at: string | null;
     region_mask?: number;
     region_mode?: string;
+    regions?: number[]; // Plan 6 — subject codes 1..89; пустой массив = вся РФ
     delivery_days_mask?: number;
     sync_status: 'ok' | 'pending' | 'failed';
     last_synced_at?: string | null;

app/resources/js/views/projects/NewProjectDialog.vue

@@ -76,12 +76,34 @@
                     :error-messages="errors.daily_limit_target"
                 />
 
+                <v-autocomplete
+                    v-model="form.regions"
+                    :items="selectableRegions"
+                    item-title="name"
+                    item-value="code"
+                    label="Регионы (пусто = вся РФ)"
+                    multiple
+                    chips
+                    clearable
+                    density="comfortable"
+                    class="ld-input-quiet"
+                    data-testid="regions-autocomplete"
+                >
+                    <template #item="{ props: itemProps, item }">
+                        <v-list-item v-bind="itemProps">
+                            <template #subtitle>
+                                {{ FEDERAL_DISTRICT_NAMES[item.raw.federalDistrict] || '' }}
+                            </template>
+                        </v-list-item>
+                    </template>
+                </v-autocomplete>
+
                 <v-alert
                     v-if="generalError"
                     type="error"
                     variant="tonal"
                     density="compact"
-                    class="mb-3"
+                    class="mt-3"
                     closable
                     @click:close="generalError = null"
                 >
@@ -114,9 +136,12 @@
 <script setup lang="ts">
 import { ref, reactive, watch } from 'vue';
 import { apiClient, ensureCsrfCookie, extractErrorMessage } from '../../api/client';
+import { REGIONS, FEDERAL_DISTRICT_NAMES } from '../../constants/regions';
 import type { Project } from '../../stores/projectsStore';
 import DevIndexBadge from '../../components/DevIndexBadge.vue';
 
+const selectableRegions = REGIONS.filter((r) => r.code !== 0);
+
 const props = defineProps<{
     modelValue: boolean;
     mode?: 'create' | 'edit';
@@ -124,9 +149,8 @@ const props = defineProps<{
 }>();
 const emit = defineEmits(['update:modelValue', 'saved']);
 
-// region_mask=255 = все 8 ФО (schema default, см. db/schema.sql §projects).
-// PDD regions UI отключён до закрытия Plan 6 — конфликт с 8-битной ФО-маской
-// в PhonePrefixService.php (1 phone prefix ↔ 1 ФО, не субъект).
+// Plan 6: regions = subject codes (1..89) — backend dual-writes region_mask/region_mode.
+// Пустой массив = вся РФ.
 const form = reactive({
     name: '',
     signal_type: 'site' as 'site' | 'call' | 'sms',
@@ -134,8 +158,7 @@ const form = reactive({
     sms_senders: [] as string[],
     sms_keyword: '',
     daily_limit_target: 50,
-    region_mask: 255,
-    region_mode: 'include' as 'include' | 'exclude',
+    regions: [] as number[],
     delivery_days_mask: 127,
 });
 const errors = reactive<Record<string, string[]>>({});
@@ -159,6 +182,7 @@ watch(
         if (open) generalError.value = null;
         if (open && props.mode === 'edit' && props.project) {
             Object.assign(form, props.project);
+            form.regions = Array.isArray(props.project.regions) ? [...props.project.regions] : [];
             const days: number[] = [];
             for (let i = 0; i < 7; i++) if (form.delivery_days_mask & (1 << i)) days.push(i);
             selectedDays.value = days;
@@ -170,8 +194,7 @@ watch(
                 sms_senders: [],
                 sms_keyword: '',
                 daily_limit_target: 50,
-                region_mask: 255,
-                region_mode: 'include',
+                regions: [],
                 delivery_days_mask: 127,
             });
             selectedDays.value = [0, 1, 2, 3, 4, 5, 6];

app/tests/Feature/Plan4/Schema/SchemaDeltaTest.php

@@ -75,7 +75,7 @@ it('schema.sql v8.19 has correct metrics — 62 base tables, 117 indexes, 39 RLS
     expect($baseTables)->toBe(62);
 
     $createIndexes = preg_match_all('/^CREATE\s+(?:UNIQUE\s+)?INDEX\b/m', $schema);
-    expect($createIndexes)->toBe(117);
+    expect($createIndexes)->toBe(118);  // Plan 6 (v8.20): +1 GIN idx_projects_regions
 
     $createPolicies = preg_match_all('/^CREATE\s+POLICY\b/m', $schema);
     expect($createPolicies)->toBe(39);

app/tests/Feature/Plan5/Projects/ProjectsStoreTest.php

@@ -19,8 +19,7 @@ it('creates a site project with valid payload', function () {
         'signal_type' => 'site',
         'signal_identifier' => 'okna-spb.ru',
         'daily_limit_target' => 50,
-        'region_mask' => 0,
-        'region_mode' => 'include',
+        'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -36,7 +35,7 @@ it('rejects invalid site domain', function () {
 
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'X', 'signal_type' => 'site', 'signal_identifier' => 'not a domain',
-        'daily_limit_target' => 50, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 50, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -50,7 +49,7 @@ it('creates a call project with valid 11-digit phone', function () {
 
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'Натяжные', 'signal_type' => 'call', 'signal_identifier' => '79161234567',
-        'daily_limit_target' => 30, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 30, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -63,7 +62,7 @@ it('rejects call signal_identifier not starting with 7', function () {
 
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'X', 'signal_type' => 'call', 'signal_identifier' => '89991234567',
-        'daily_limit_target' => 30, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 30, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -77,7 +76,7 @@ it('creates sms project with senders + keyword', function () {
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'Ипотека', 'signal_type' => 'sms',
         'sms_senders' => ['TINKOFF'], 'sms_keyword' => 'ипотека',
-        'daily_limit_target' => 100, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 100, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -93,7 +92,7 @@ it('rejects sms project without sms_senders', function () {
 
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'X', 'signal_type' => 'sms',
-        'daily_limit_target' => 100, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 100, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -108,7 +107,7 @@ it('rejects when tenant exceeds max_projects limit', function () {
 
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'second', 'signal_type' => 'site', 'signal_identifier' => 'second.ru',
-        'daily_limit_target' => 10, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 10, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -123,7 +122,7 @@ it('forces tenant_id from auth user (not from payload)', function () {
     $this->actingAs($userA)->postJson('/api/projects', [
         'tenant_id' => $tenantB->id,  // попытка инъекции
         'name' => 'X', 'signal_type' => 'site', 'signal_identifier' => 'x.ru',
-        'daily_limit_target' => 10, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 10, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
@@ -137,10 +136,66 @@ it('rejects site domain with consecutive dots', function () {
 
     $response = $this->actingAs($user)->postJson('/api/projects', [
         'name' => 'X', 'signal_type' => 'site', 'signal_identifier' => 'okna..spb.ru',
-        'daily_limit_target' => 50, 'region_mask' => 0, 'region_mode' => 'include',
+        'daily_limit_target' => 50, 'regions' => [],
         'delivery_days_mask' => 127,
     ]);
 
     $response->assertStatus(422);
     $response->assertJsonValidationErrors(['signal_identifier']);
 });
+
+// Plan 6 — subject-level regions[] support.
+
+it('creates project with subject-level regions array', function () {
+    $tenant = Tenant::factory()->create();
+    $user = User::factory()->create(['tenant_id' => $tenant->id]);
+
+    $response = $this->actingAs($user)->postJson('/api/projects', [
+        'name' => 'Regions Test Project',
+        'signal_type' => 'site',
+        'signal_identifier' => 'regions-test.example',
+        'daily_limit_target' => 50,
+        'delivery_days_mask' => 127,
+        'regions' => [82, 83],  // Москва + СПб
+    ]);
+
+    $response->assertStatus(201);
+    $created = Project::where('name', 'Regions Test Project')->firstOrFail();
+    expect($created->regions)->toBe([82, 83]);
+});
+
+it('dual-writes region_mask=255 + region_mode=include for backward-compat', function () {
+    $tenant = Tenant::factory()->create();
+    $user = User::factory()->create(['tenant_id' => $tenant->id]);
+
+    $response = $this->actingAs($user)->postJson('/api/projects', [
+        'name' => 'Dual Write Test',
+        'signal_type' => 'site',
+        'signal_identifier' => 'dualwrite.example',
+        'daily_limit_target' => 50,
+        'delivery_days_mask' => 127,
+        'regions' => [77],
+    ]);
+
+    $response->assertStatus(201);
+    $created = Project::where('name', 'Dual Write Test')->firstOrFail();
+    expect($created->region_mask)->toBe(255);
+    expect($created->region_mode)->toBe('include');
+});
+
+it('rejects regions code out of 1..89 range with 422', function () {
+    $tenant = Tenant::factory()->create();
+    $user = User::factory()->create(['tenant_id' => $tenant->id]);
+
+    $response = $this->actingAs($user)->postJson('/api/projects', [
+        'name' => 'Invalid Code Test',
+        'signal_type' => 'site',
+        'signal_identifier' => 'invalid.example',
+        'daily_limit_target' => 50,
+        'delivery_days_mask' => 127,
+        'regions' => [90, 100],
+    ]);
+
+    $response->assertStatus(422);
+    $response->assertJsonValidationErrors(['regions.0', 'regions.1']);
+});

app/tests/Feature/Plan5/Projects/ProjectsUpdateTest.php

@@ -78,14 +78,49 @@ it('cross-tenant update returns 404', function () {
     ])->assertStatus(404);
 });
 
-it('updates region_mask and delivery_days_mask', function () {
+it('updates delivery_days_mask (region_mask now read-only — see regions[] tests below)', function () {
+    // Plan 6: region_mask/region_mode больше не клиент-controllable через UpdateProjectRequest
+    // (validation rules удалены, ProjectService::create dual-writes 255/include).
+    // Источник истины для региональной фильтрации — projects.regions INT[] (Plan 6).
+    // Этот тест адаптирован: проверяет, что delivery_days_mask остаётся writeable через PATCH.
     $tenant = Tenant::factory()->create();
     $user = User::factory()->create(['tenant_id' => $tenant->id]);
     $project = Project::factory()->create(['tenant_id' => $tenant->id]);
 
     $this->actingAs($user)->patchJson("/api/projects/{$project->id}", [
-        'region_mask' => 78, 'region_mode' => 'exclude', 'delivery_days_mask' => 31,
+        'delivery_days_mask' => 31,
     ])->assertOk();
 
-    expect($project->fresh()->region_mask)->toBe(78);
+    expect($project->fresh()->delivery_days_mask)->toBe(31);
+});
+
+// Plan 6 — subject-level regions[] support.
+
+it('updates regions array via PATCH', function () {
+    $tenant = Tenant::factory()->create();
+    $user = User::factory()->create(['tenant_id' => $tenant->id]);
+    $project = Project::factory()->create(['tenant_id' => $tenant->id, 'regions' => []]);
+
+    $response = $this->actingAs($user)->patchJson("/api/projects/{$project->id}", [
+        'regions' => [82],
+    ]);
+
+    $response->assertStatus(200);
+    expect($project->fresh()->regions)->toBe([82]);
+});
+
+it('preserves regions when PATCH omits the field (sometimes rule)', function () {
+    $tenant = Tenant::factory()->create();
+    $user = User::factory()->create(['tenant_id' => $tenant->id]);
+    $project = Project::factory()->create([
+        'tenant_id' => $tenant->id,
+        'regions' => [82, 83],
+    ]);
+
+    $response = $this->actingAs($user)->patchJson("/api/projects/{$project->id}", [
+        'name' => 'Renamed Project',
+    ]);
+
+    $response->assertStatus(200);
+    expect($project->fresh()->regions)->toBe([82, 83]);
 });

app/tests/Feature/Supplier/SyncSupplierProjectsJobTest.php

@@ -11,6 +11,7 @@ use App\Models\SupplierProject;
 use App\Models\SupplierSyncLog;
 use App\Models\Tenant;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Cache;
@@ -307,6 +308,36 @@ test('respects time budget by stopping at 20:55 МСК', function (): void {
     Http::assertNothingSent();
 });
 
+test('passes regions directly to allocator without bitmask conversion', function (): void {
+    $tenant = Tenant::factory()->create();
+    Project::factory()->create([
+        'tenant_id' => $tenant->id,
+        'regions' => [82, 83],
+        'region_mask' => 255,
+    ]);
+
+    $job = new SyncSupplierProjectsJob;
+    $projects = Project::where('tenant_id', $tenant->id)->get();
+    $adapted = (fn (Collection $p) => $this->adaptProjectsForAllocator($p))->call($job, $projects);
+
+    expect($adapted->first()->regions)->toBe([82, 83]);
+});
+
+test('passes empty array to allocator when project has regions=[]', function (): void {
+    $tenant = Tenant::factory()->create();
+    Project::factory()->create([
+        'tenant_id' => $tenant->id,
+        'regions' => [],
+        'region_mask' => 255,
+    ]);
+
+    $job = new SyncSupplierProjectsJob;
+    $projects = Project::where('tenant_id', $tenant->id)->get();
+    $adapted = (fn (Collection $p) => $this->adaptProjectsForAllocator($p))->call($job, $projects);
+
+    expect($adapted->first()->regions)->toBe([]);
+});
+
 test('sticky auth error throws and sends critical alert email', function (): void {
     Mail::fake();
     Bus::fake([RefreshSupplierSessionJob::class]);

app/tests/Frontend/NewProjectDialog.spec.ts

@@ -6,6 +6,16 @@ import axios from 'axios';
 
 vi.mock('axios');
 
+vi.mock('../../resources/js/api/client', () => ({
+    apiClient: {
+        post: vi.fn().mockResolvedValue({ data: {} }),
+        patch: vi.fn().mockResolvedValue({ data: {} }),
+    },
+    ensureCsrfCookie: vi.fn().mockResolvedValue(undefined),
+    extractErrorMessage: vi.fn(() => 'Произошла ошибка.'),
+}));
+
+import { apiClient } from '../../resources/js/api/client';
 import NewProjectDialog from '../../resources/js/views/projects/NewProjectDialog.vue';
 import type { Project } from '../../resources/js/stores/projectsStore';
 
@@ -74,4 +84,28 @@ describe('NewProjectDialog', () => {
     it.skip('emits saved event after successful POST', async () => {
         // TODO: см. предыдущий skip — те же причины.
     });
+
+    it('renders regions autocomplete with 89 selectable subjects (excluding "Вся РФ" sentinel)', async () => {
+        const wrapper = factory();
+        await flushPromises();
+        const autocomplete = wrapper.findComponent({ name: 'VAutocomplete' });
+        expect(autocomplete.exists()).toBe(true);
+        expect(autocomplete.props('items')).toHaveLength(89);
+        expect((autocomplete.props('items') as Array<{ code: number }>).every((r) => r.code !== 0)).toBe(true);
+    });
+
+    it.skip('sends regions array in POST payload', async () => {
+        // TODO: submit() requires Vuetify form rendering + filling signal_identifier,
+        // name, daily_limit_target — JSDOM нестабильно для Vuetify v-tabs/v-text-field.
+        // Covered visually через Plan 6.5 visual smoke + e2e (Playwright).
+        // Critical guarantee — items count test (#1) выше остаётся обязательным.
+        const wrapper = factory();
+        await flushPromises();
+        const autocomplete = wrapper.findComponent({ name: 'VAutocomplete' });
+        await autocomplete.vm.$emit('update:model-value', [82, 83]);
+        await flushPromises();
+        await wrapper.find('[data-testid="submit-btn"]').trigger('click');
+        await flushPromises();
+        expect(apiClient.post).toHaveBeenCalledWith('/api/projects', expect.objectContaining({ regions: [82, 83] }));
+    });
 });

app/tests/Frontend/ProjectDetailsDrawer.spec.ts

@@ -24,6 +24,7 @@ const sampleProject: Project = {
     archived_at: null,
     region_mask: 0,
     region_mode: 'include',
+    regions: [],
     delivery_days_mask: 31, // Mon-Fri
     sync_status: 'pending',
 };
@@ -50,7 +51,7 @@ describe('ProjectDetailsDrawer', () => {
         // Days mask 31 = bits 0..4 = Mon..Fri (5 days active)
         const dayBtns = wrapper.findAll('button[data-testid^="pdd-day-"]');
         expect(dayBtns.length).toBe(7);
-        const activeBtns = dayBtns.filter(b => b.classes().includes('active'));
+        const activeBtns = dayBtns.filter((b) => b.classes().includes('active'));
         expect(activeBtns.length).toBe(5);
     });
 
@@ -126,8 +127,12 @@ describe('ProjectDetailsDrawer', () => {
     });
 
     it('Pause button calls store.toggleActive', async () => {
-        (axios.patch as unknown as ReturnType<typeof vi.fn>).mockResolvedValueOnce({ data: { data: { ...sampleProject, is_active: false } } });
-        (axios.get as unknown as ReturnType<typeof vi.fn> | undefined)?.mockResolvedValue?.({ data: { data: [], meta: { total: 0 } } });
+        (axios.patch as unknown as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+            data: { data: { ...sampleProject, is_active: false } },
+        });
+        (axios.get as unknown as ReturnType<typeof vi.fn> | undefined)?.mockResolvedValue?.({
+            data: { data: [], meta: { total: 0 } },
+        });
         const wrapper = mount(ProjectDetailsDrawer, { props: { project: sampleProject } });
         const store = useProjectsStore();
         const spy = vi.spyOn(store, 'toggleActive').mockResolvedValueOnce(undefined);
@@ -174,33 +179,30 @@ describe('ProjectDetailsDrawer', () => {
         vi.unstubAllGlobals();
     });
 
-    it('renders region chips when project has non-zero region_mask', async () => {
-        const withRegions: Project = { ...sampleProject, region_mask: 6, region_mode: 'exclude' };
+    it('renders region chips for project.regions = [1, 2]', async () => {
+        const withRegions: Project = { ...sampleProject, regions: [1, 2] };
         const wrapper = mount(ProjectDetailsDrawer, { props: { project: withRegions } });
         await wrapper.vm.$nextTick();
         const text = wrapper.text();
-        expect(text).toContain('Адыгея');
-        expect(text).toContain('Башкортостан');
+        expect(text).toContain('Адыгея'); // code 1
+        expect(text).toContain('Алтай'); // code 2 (Республика Алтай)
     });
 
-    it('selecting regions encodes mask + sets mode=exclude on save', async () => {
+    it('selecting regions adds to regions array (no bitmask conversion)', async () => {
         (axios.patch as unknown as ReturnType<typeof vi.fn>).mockResolvedValueOnce({ data: { data: sampleProject } });
         const wrapper = mount(ProjectDetailsDrawer, { props: { project: sampleProject } });
         const autocomplete = wrapper.getComponent({ name: 'VAutocomplete' });
-        await autocomplete.vm.$emit('update:model-value', [3, 5]);
+        await autocomplete.vm.$emit('update:model-value', [82, 83]);
         await wrapper.vm.$nextTick();
         await wrapper.get('[data-testid="pdd-save"]').trigger('click');
         await wrapper.vm.$nextTick();
         await wrapper.vm.$nextTick();
-        expect(axios.patch).toHaveBeenCalledWith(
-            '/api/projects/42',
-            expect.objectContaining({ region_mask: 40, region_mode: 'exclude' }),
-        );
+        expect(axios.patch).toHaveBeenCalledWith('/api/projects/42', expect.objectContaining({ regions: [82, 83] }));
     });
 
-    it('clearing all regions resets mask=0 + mode=include on save', async () => {
+    it('clearing all regions sets regions=[] on save', async () => {
         (axios.patch as unknown as ReturnType<typeof vi.fn>).mockResolvedValueOnce({ data: { data: sampleProject } });
-        const withRegions: Project = { ...sampleProject, region_mask: 6, region_mode: 'exclude' };
+        const withRegions: Project = { ...sampleProject, regions: [82, 83] };
         const wrapper = mount(ProjectDetailsDrawer, { props: { project: withRegions } });
         const autocomplete = wrapper.getComponent({ name: 'VAutocomplete' });
         await autocomplete.vm.$emit('update:model-value', []);
@@ -208,9 +210,6 @@ describe('ProjectDetailsDrawer', () => {
         await wrapper.get('[data-testid="pdd-save"]').trigger('click');
         await wrapper.vm.$nextTick();
         await wrapper.vm.$nextTick();
-        expect(axios.patch).toHaveBeenCalledWith(
-            '/api/projects/42',
-            expect.objectContaining({ region_mask: 0, region_mode: 'include' }),
-        );
+        expect(axios.patch).toHaveBeenCalledWith('/api/projects/42', expect.objectContaining({ regions: [] }));
     });
 });

db/CHANGELOG_schema.md

@@ -6,6 +6,26 @@
 
 **История записей:**
 
+## v8.20 от 2026-05-14 (Plan 6 — Subject-level regions)
+
+**Изменения:**
+- `projects` +1 колонка: `regions INT[] NOT NULL DEFAULT '{}'`
+- `projects` +1 GIN-индекс: `idx_projects_regions`
+- `projects` +1 COMMENT ON COLUMN на `regions`
+
+**Не изменено (deprecated, удаление в Plan 6.5):**
+- `projects.region_mask` (помечен inline-комментарием DEPRECATED)
+- `projects.region_mode`
+- CHECK `chk_projects_region_mask_range`
+
+**Семантика:**
+- `regions=[]` → «вся РФ» (паритет с legacy `region_mask=255 + region_mode='include'`)
+- `regions=[77,82]` → проект принимает лиды только из Москвы (77) и Чукотки (82)
+
+**Schema baseline после v8.20:** 63 базовых таблиц / 12 партиций / **118 индексов** (+1) / 39 RLS / 5 функций / 13 триггеров.
+
+**Связано:** docs/superpowers/specs/2026-05-14-plan-6-regions-subject-level-design.md
+
 ## v8.20 (11.05.2026 — Plan 5)
 
 **Added:**

db/schema.sql

@@ -1,7 +1,8 @@
 -- =============================================================================
 -- schema.sql — единая схема БД для SaaS-аналога crm.bp-gr.ru («Лидерра»)
--- Версия: v8.20 (11.05.2026 — Plan 5 frontend projects UI: projects.archived_at TIMESTAMPTZ NULL для soft archive flow; tenants.limits JSONB NOT NULL DEFAULT '{}' для per-tenant project/user лимитов)
--- Метрики: 63 базовые таблицы (61 regular + 2 partitioned parents: deals + supplier_lead_costs) + 12 партиций / 117 индексов / 39 RLS-политик / 5 функций / 13 триггеров
+-- Версия: v8.20 от 2026-05-14 (Plan 6 — Subject-level regions array)
+-- Метрики: 63 базовые таблицы (61 regular + 2 partitioned parents: deals + supplier_lead_costs) + 12 партиций / 118 индексов / 39 RLS-политик / 5 функций / 13 триггеров
+-- Базовая версия: v8.20 (11.05.2026 — Plan 5 frontend projects UI: projects.archived_at TIMESTAMPTZ NULL для soft archive flow; tenants.limits JSONB NOT NULL DEFAULT '{}' для per-tenant project/user лимитов)
 -- Базовая версия: v8.19 (11.05.2026 — Plan 4 billing+csv+admin: tenants.delivered_in_month, lead_charges.charge_source + CHECK, supplier_leads.recovered_from_csv_at, supplier_csv_reconcile_log)
 -- Базовая версия: v8.18 (10.05.2026 — Plan 2/5 Task 1: supplier_leads SaaS-level + projects.delivered_today + 2 system_settings rows для supplier-webhook + IP allowlist defense-in-depth)
 -- Базовая версия: v8.17 (10.05.2026 — Plan 1/5 Task 2 fix: FK projects.supplier_b{1,2,3}_project_id → supplier_projects (ON DELETE SET NULL) + 3 partial index + CHECK chk_projects_b1_not_for_sms (defense-in-depth дублирует chk_supplier_projects_b1_not_for_sms на Project-уровне). Закрывает code-review BLOCKER#1 + WARNING#3 от 10.05.2026 поздний вечер)
@@ -808,13 +809,18 @@ CREATE TABLE projects (
     supplier_b3_project_id          BIGINT,
     effective_limit_calculated_at   TIMESTAMPTZ,
     -- РАСШИРЕНИЕ v8.2: регионы и дни (партия 10.3 секции 6, 7, 11)
-    region_mask                     INT NOT NULL DEFAULT 255,
+    region_mask                     INT NOT NULL DEFAULT 255,  -- DEPRECATED Plan 6.5: см. regions INT[]
         -- битмаска 8 ФО РФ: бит 1=Центральный, 2=Северо-Западный, 4=Южный,
         -- 8=Северо-Кавказский, 16=Приволжский, 32=Уральский, 64=Сибирский,
         -- 128=Дальневосточный. 255 = все 8 округов.
     region_mode                     VARCHAR(10) NOT NULL DEFAULT 'include'
                                     CHECK (region_mode IN ('include','exclude')),
         -- 'include' = принимать только из выбранных, 'exclude' = принимать кроме выбранных
+    -- v8.20 (Plan 6): Subject-level regions array. 89 codes из resources/js/constants/regions.ts.
+    -- Пустой массив = «вся РФ» (паритет с legacy region_mask=255 + region_mode='include').
+    -- region_mask/region_mode остаются для legacy reader'ов (PhonePrefixService, LeadRouter),
+    -- DEPRECATED — удаляются в Plan 6.5 после переключения читателей.
+    regions                         INT[] NOT NULL DEFAULT '{}'::INT[],
     delivery_days_mask              INT NOT NULL DEFAULT 127,
         -- битмаска дней недели: бит 1=Пн, 2=Вт, 4=Ср, 8=Чт, 16=Пт, 32=Сб, 64=Вс.
         -- 127 = все 7 дней (паритет с формой создания нового проекта в оригинале).
@@ -862,6 +868,8 @@ CREATE INDEX idx_projects_tag    ON projects(tag);
 -- РАСШИРЕНИЕ v8.12: composite index для lookup по signal-полям (resolveSignalSource)
 CREATE INDEX idx_projects_tenant_signal
     ON projects(tenant_id, signal_type, signal_identifier);
+-- v8.20 (Plan 6): GIN-индекс для outbound regions queries.
+CREATE INDEX idx_projects_regions ON projects USING GIN (regions);
 
 COMMENT ON COLUMN projects.daily_limit_target IS
     'Целевой дневной лимит лидов, заданный клиентом. Фактический лимит на '
@@ -873,6 +881,9 @@ COMMENT ON COLUMN projects.effective_daily_limit_today IS
     'MIN(daily_limit_target, FLOOR(balance / lead_cost)). Пересчитывается cron '
     'limits:recalc в 00:00 МСК и при изменении баланса. NULL = не считалось.';
 
+COMMENT ON COLUMN projects.regions IS
+    'Subject-level region filter (1..89 коды субъектов РФ). Пустой массив = вся РФ. Plan 6 (v8.20).';
+
 
 -- -----------------------------------------------------------------------------
 -- supplier_projects — SaaS-level агрегатные проекты у поставщиков (v8.13, Plan 1/5 Task 2)