# Команда: node scripts/test/accept-branch.mjs 1df2019 antigravity/fix-sync-c0-bootstrap codex/fix-format-baseline (SHA 1df2019 = прежняя голова antigravity/fix-reject-device-shifts; 8baad55, 513cdff — головы на момент прогона, 16:04 NOVT)

## accept-branch — 2026-09-26 09:06 UTC

База: `origin/codex/bootstrap-platform-foundation` = b0243d5; стенд (оверлей tests/e2e, scripts/test): aa7f5f8 (+ незакоммиченные изменения стенда); БД: роли созданы один раз через E2E_PG_ADMIN_URL (provision-pg), дальше --roles keep. Логи: `tests/e2e/evidence/accept/2026-09-26T09-05-12/`.

### Сводка

| Ветка                                             | SHA     | npm run check  | integration (красные файлы) | e2e red/green                                                       | e2e: стало зелёным | e2e: стало красным     |
| ------------------------------------------------- | ------- | -------------- | --------------------------- | ------------------------------------------------------------------- | ------------------ | ---------------------- |
| origin/codex/bootstrap-platform-foundation (база) | b0243d5 | OK (195 passed | 1 skipped (196))            | 3/4 зелёных; FAIL: tenant-isolation.test.ts                         | 45/4               | n/a                    | n/a |
| 1df2019                                           | 1df2019 | OK (196 passed | 3 skipped (199))            | 3/5 зелёных; FAIL: sync-rejection.test.ts, tenant-isolation.test.ts | 43/6               | K13/SYNC-A, K13/SYNC-B | —   |
| origin/antigravity/fix-sync-c0-bootstrap          | 8baad55 | OK (196 passed | 3 skipped (199))            | 3/5 зелёных; FAIL: sync-bootstrap.test.ts, tenant-isolation.test.ts | 44/5               | SYNC-C0                | —   |
| origin/codex/fix-format-baseline                  | 513cdff | OK (196 passed | 1 skipped (197))            | 3/4 зелёных; FAIL: tenant-isolation.test.ts                         | 43/6               | K13/SYNC-A, K13/SYNC-B | —   |

### Интеграционные тесты (каждый файл отдельно, свежая БД)

| Ветка                                      | Файл                     | Итог | Test Files   | Tests          | Первая ошибка                                                           |
| ------------------------------------------ | ------------------------ | ---- | ------------ | -------------- | ----------------------------------------------------------------------- |
| origin/codex/bootstrap-platform-foundation | health.test.ts           | OK   | 1 passed (1) | 3 passed (3)   |                                                                         |
| origin/codex/bootstrap-platform-foundation | openapi-runtime.test.ts  | OK   | 1 passed (1) | 1 passed (1)   |                                                                         |
| origin/codex/bootstrap-platform-foundation | portal.test.ts           | OK   | 1 passed (1) | 12 passed (12) |                                                                         |
| origin/codex/bootstrap-platform-foundation | tenant-isolation.test.ts | FAIL | 1 failed (1) | 1 passed (1)   | error: permission denied for table staff_employees                      |
| 1df2019                                    | health.test.ts           | OK   | 1 passed (1) | 3 passed (3)   |                                                                         |
| 1df2019                                    | openapi-runtime.test.ts  | OK   | 1 passed (1) | 1 passed (1)   |                                                                         |
| 1df2019                                    | portal.test.ts           | OK   | 1 passed (1) | 12 passed (12) |                                                                         |
| 1df2019                                    | sync-rejection.test.ts   | FAIL | 1 failed (1) | 2 skipped (2)  | error: column "created_by" of relation "staff_employees" does not exist |
| 1df2019                                    | tenant-isolation.test.ts | FAIL | 1 failed (1) | 1 passed (1)   | error: permission denied for table staff_employees                      |
| origin/antigravity/fix-sync-c0-bootstrap   | health.test.ts           | OK   | 1 passed (1) | 3 passed (3)   |                                                                         |
| origin/antigravity/fix-sync-c0-bootstrap   | openapi-runtime.test.ts  | OK   | 1 passed (1) | 1 passed (1)   |                                                                         |
| origin/antigravity/fix-sync-c0-bootstrap   | portal.test.ts           | OK   | 1 passed (1) | 12 passed (12) |                                                                         |
| origin/antigravity/fix-sync-c0-bootstrap   | sync-bootstrap.test.ts   | FAIL | 1 failed (1) | 2 passed (2)   | Error: Called end on pool more than once                                |
| origin/antigravity/fix-sync-c0-bootstrap   | tenant-isolation.test.ts | FAIL | 1 failed (1) | 1 passed (1)   | error: permission denied for table staff_employees                      |
| origin/codex/fix-format-baseline           | health.test.ts           | OK   | 1 passed (1) | 3 passed (3)   |                                                                         |
| origin/codex/fix-format-baseline           | openapi-runtime.test.ts  | OK   | 1 passed (1) | 1 passed (1)   |                                                                         |
| origin/codex/fix-format-baseline           | portal.test.ts           | OK   | 1 passed (1) | 12 passed (12) |                                                                         |
| origin/codex/fix-format-baseline           | tenant-isolation.test.ts | FAIL | 1 failed (1) | 1 passed (1)   | error: permission denied for table staff_employees                      |

### Попарные слияния (`git merge-tree --write-tree`)

| Ветка A                                    | Ветка B                                  | Результат | Конфликтные файлы          |
| ------------------------------------------ | ---------------------------------------- | --------- | -------------------------- |
| origin/codex/bootstrap-platform-foundation | 1df2019                                  | чисто     |                            |
| origin/codex/bootstrap-platform-foundation | origin/antigravity/fix-sync-c0-bootstrap | чисто     |                            |
| origin/codex/bootstrap-platform-foundation | origin/codex/fix-format-baseline         | чисто     |                            |
| 1df2019                                    | origin/antigravity/fix-sync-c0-bootstrap | КОНФЛИКТ  | src/domain/sync/service.ts |
| 1df2019                                    | origin/codex/fix-format-baseline         | чисто     |                            |
| origin/antigravity/fix-sync-c0-bootstrap   | origin/codex/fix-format-baseline         | КОНФЛИКТ  | src/domain/sync/service.ts |

### Форматирование без поведения

**origin/codex/fix-format-baseline** (513cdff), merge-base f5ac179, изменено файлов: 24 — ЕСТЬ ИЗМЕНЕНИЯ СВЕРХ PRETTIER

| Файл                       | Почему                        | Строк сверх prettier | Эти же строки в ветке                                       |
| -------------------------- | ----------------------------- | -------------------- | ----------------------------------------------------------- |
| src/domain/sync/service.ts | не совпадает с prettier(база) | 232                  | 1df2019: 232/232; antigravity/fix-sync-c0-bootstrap: 6/232  |
| tests/unit/sync.test.ts    | не совпадает с prettier(база) | 130                  | 1df2019: 130/130; antigravity/fix-sync-c0-bootstrap: 12/130 |