План разбора веток (решение № 38)
Исполнен 11.10.2026 по решению владельца:
main=6cea05ce(зелёный CI, задание 537), удалено 85 веток, 12 метокarchive/*, оставленаcodex/latest-h30-layout-xml-20261010. Ниже — план в том виде, в каком он был одобрен. Квитанция:evidence-phase0-line-20261011.json.
Рабочая линия: HEAD = 30553e49. Веток: 85 —
FF-MAIN 1, MERGED 71, ARCHIVE 12, REVIEW 1. Скрипт ничего не удалял и не
отправлял; команды ниже выполняет владелец.
Порядок: 1) отправить линию отдельной веткой и дождаться зелёного
just ci; 2) перемотать main; 3) метки
archive/* и пакеты; 4) удаления. Пакеты содержат только
свои коммиты ветки (линия — предпосылка), поэтому восстанавливаются в
любом клоне, где есть линия.
Резервные пакеты всех 13 веток со своими коммитами уже созданы и
проверены (git bundle verify):
~/MOffice-branch-backups-2026-10-10/ на Mac владельца, 20
МБ. Создано командой
python3 scripts/branch_audit.py --bundle-dir ~/MOffice-branch-backups-2026-10-10;
репозиторий при этом не менялся.
Перемотка main (1)
| Ветка | Своих | Отстаёт | Последний коммит | Сообщение |
|---|---|---|---|---|
main |
0 | 731 | 2026-10-10 | ops: store Sagar MOffice data on external SSD |
git merge-base --is-ancestor origin/main 30553e49e97299965e4f700aae283cfc232db0fe # проверка: перемотка без слияния
git push origin 30553e49e97299965e4f700aae283cfc232db0fe:mainПолностью вошли в линию — удалить (71)
| Ветка | Своих | Отстаёт | Последний коммит | Сообщение |
|---|---|---|---|---|
claude/app-analysis-work-plan-3a8daa |
0 | 923 | 2026-10-06 | plan: Sheets — предупреждение сортировки, подсказка протягивания, итоги, журнал отмены |
claude/build-run-mac-dd7c86 |
0 | 1139 | 2026-10-05 | Merge remote-tracking branch 'origin/main' into claude/app-analysis-work-plan-3a8daa |
claude/ci-fetch-retry |
0 | 1124 | 2026-10-05 | ci: git fetch в /data/src — 3 попытки и обрыв зависшего соединения, сеть не стирает кэш |
claude/ci-runner-hosting-sweep |
0 | 1125 | 2026-10-05 | ci-runner: уборка собирает список после ожидания простоя и не ставит паузу впустую |
claude/frosty-hypatia-962d47 |
0 | 1127 | 2026-10-05 | write: «Вставка» — сетка символов, разрыв страницы и пустая страница (с отменой) |
claude/local-project-path-db99d0 |
0 | 923 | 2026-10-06 | plan: Sheets — предупреждение сортировки, подсказка протягивания, итоги, журнал отмены |
claude/modest-torvalds-6ee372 |
0 | 1360 | 2026-10-05 | kernel: вставка и удаление строк и столбцов со сдвигом ссылок, копирование ячейки; C ABI v0.5 |
claude/parallel-plans-analysis-bc12e0 |
0 | 1188 | 2026-10-05 | mwx: неизвестные части docx (Document::parts) — foreign/ooxml/ + index.xml с SHA-256, в .mwxf — m:fi |
claude/upbeat-lovelace-6c7692 |
0 | 1138 | 2026-10-05 | kernel: C ABI правки ссылок, закладок и примечаний Write (v0.12) |
codex/auto-spacing-twips-20261010 |
0 | 85 | 2026-10-10 | docs(layout): record accepted native TOC style validation |
codex/ci-worker-marker-20261009 |
0 | 193 | 2026-10-09 | Merge latest Broker diagnostics and dictionary publication QA |
codex/docs-latest-receipts-20261010 |
0 | 165 | 2026-10-10 | docs: publish accepted CI and visual results with two-session plan |
codex/docx-image-crop-20261010 |
0 | 155 | 2026-10-10 | docs: принять полный визуальный пересчёт GIF-состава |
codex/downloads-20261010 |
0 | 46 | 2026-10-10 | Указать проверенный минимум glibc для загрузки Linux |
codex/h20-exact-baseline-composition-20261010 |
0 | 108 | 2026-10-10 | docs: record composed exact baseline checks and precise text drift triage |
codex/h20-ready-core-composition-20261010 |
0 | 125 | 2026-10-10 | docs: record scoped ready Core composition and retained Linux failure |
codex/h20-table-borders-20261010 |
0 | 153 | 2026-10-10 | docs: record scoped table border composition verification |
codex/h33-local-diagnostics-20261010 |
0 | 97 | 2026-10-10 | fix(hub): use supported middle elision for diagnostics path |
codex/h35-latest-publication-20261010 |
0 | 89 | 2026-10-10 | fix(hub): принимать ввод пути диагностики после щелчка мышью |
codex/h36-diagnostic-metadata-20261010 |
0 | 83 | 2026-10-10 | merge: сохранить текущий production и метаданные диагностики Hub |
codex/h39-latest-site-20261010 |
0 | 56 | 2026-10-10 | Integrate accepted frozen reference replay with current renderer |
codex/hub-content-worker |
0 | 621 | 2026-10-09 | fix(write): keep ribbon tabs clear of trailing actions |
codex/hub-preview-h18-20261009 |
0 | 183 | 2026-10-09 | docs(hub): document H18 preview bounds and verified before/after tests |
codex/input-hub-20261007 |
0 | 922 | 2026-10-07 | integration: неизменяемый снимок локальных Hub и Quick Access |
codex/installed-diagnostics-20261010 |
0 | 18 | 2026-10-10 | Record standard installed diagnostics pass without promoting physical OS or full CI |
codex/latest-h20-composition-20261010 |
0 | 163 | 2026-10-10 | Merge commit 'f955490c409b5c7a6455aa2a039b1195ef70a6a5' into codex/latest-h20-composition-20261010 |
codex/latest-h21-filter-sort-composition-20261010 |
0 | 160 | 2026-10-10 | merge(sheets): integrate atomic filter and sort history on latest base |
codex/latest-h22-receipts-composition-20261010 |
0 | 158 | 2026-10-10 | docs: compose latest accepted receipts with filter and sort updates |
codex/latest-h23-gif-composition-20261010 |
0 | 148 | 2026-10-10 | merge: compose accepted GIF decoder with latest filter, sort and worker updates |
codex/latest-h24-table-filter-composition-20261010 |
0 | 138 | 2026-10-10 | merge: compose latest table border inheritance and empty filter selection |
codex/latest-h26-rtl-paste-composition-20261010 |
0 | 127 | 2026-10-10 | merge: compose paste recovery with completed RTL tables and worker diagnostics |
codex/latest-h27-ci-rtl-receipts-20261010 |
0 | 125 | 2026-10-10 | merge: preserve latest RTL CI, native PDF and compatibility evidence |
codex/latest-h28-complete-ci-docs-20261010 |
0 | 118 | 2026-10-10 | merge: publish complete CI and latest finished table reports |
codex/latest-h31-current-help-20261010 |
0 | 115 | 2026-10-10 | merge: preserve live Sheets help with completed CI and XML evidence |
codex/latest-h32-inline-frame-20261010 |
0 | 99 | 2026-10-10 | docs: retain stale publication refusal after live help update |
codex/latest-updates-20261009 |
0 | 189 | 2026-10-09 | docs: принять общий CI63 и обновить план двух сессий после публикации |
codex/moffice-acceptance20 |
0 | 712 | 2026-10-08 | Record independent user input evidence without native acceptance claims |
codex/moffice-ci-accepted-plan-20261009 |
0 | 189 | 2026-10-09 | docs: принять общий CI63 и обновить план двух сессий после публикации |
codex/moffice-common-ci-private-fixtures-20261009 |
0 | 205 | 2026-10-09 | ci: закрыть тестовые папки Hub независимо от umask и исправить strict C-контроль |
codex/moffice-core |
0 | 395 | 2026-10-09 | docs: accept latest A4 and spacing checks and refresh two-session plan |
codex/moffice-external-storage |
0 | 731 | 2026-10-10 | ops: store Sagar MOffice data on external SSD |
codex/moffice-integration |
0 | 732 | 2026-10-07 | docs(repo): document secure RepoBase SSH access |
codex/moffice-integration-55-fa37647f |
0 | 376 | 2026-10-09 | kernel: совместить OTT-шаблоны с безопасным чтением ODF manifest |
codex/moffice-integration-current-private-fixtures-20261009 |
0 | 195 | 2026-10-09 | ci: объединить private fixtures Hub с текущим production без потери C-контролей |
codex/moffice-integration-latest-20261009 |
0 | 370 | 2026-10-09 | integrate: собрать свежие A4, адаптивную ленту и отчёт ядра |
codex/moffice-integration-production-latest-20261009 |
0 | 207 | 2026-10-09 | Integrate latest core spacing fix onto current Sagar source |
codex/moffice-integration-production-verified-20261009 |
0 | 206 | 2026-10-09 | Refresh dependency registry for the combined production and core source |
codex/moffice-integration-split-20261009 |
0 | 365 | 2026-10-09 | Integrate accepted split mark, collapsed spacing, A4 and responsive ribbon |
codex/moffice-latest-h18-source-20261009 |
0 | 183 | 2026-10-09 | docs(hub): document H18 preview bounds and verified before/after tests |
codex/moffice-latest-ui-source-20261010 |
0 | 181 | 2026-10-10 | fix(ui): lazily load bundled CJK and emoji fallback with stable legacy faces |
codex/moffice-odt |
0 | 714 | 2026-10-08 | docs(codecs): pin normalized roundtrip evidence and remaining input faults |
codex/moffice-platform |
0 | 606 | 2026-10-08 | Record composed CommentRef plain clipboard and annotation OS evidence |
codex/moffice-publisher |
0 | 675 | 2026-10-08 | docs(evidence): preserve outline witnesses and exact counter checks |
codex/moffice-release-latest-composed-20261009 |
0 | 190 | 2026-10-09 | release: объединить последние QA и private fixtures с текущим сайтом |
codex/moffice-services |
0 | 404 | 2026-10-10 | Record native SUBTOTAL roundtrip and retained filter history gap |
codex/paste-dependency-recovery-20261010 |
0 | 137 | 2026-10-10 | perf(calc): avoid rebuilding visited sets for already dirty formulas |
codex/sheets-filter-help-20261010 |
0 | 157 | 2026-10-10 | docs(sheets): describe filter history and visible subtotals |
codex/sheets-h20-composition-20261010 |
0 | 158 | 2026-10-10 | docs: record composed Sheets filter validation and retained limits |
codex/site-install-update |
0 | 34 | 2026-10-10 | Add Linux DEB download card and clear installer labels |
codex/spelling-postcommit-context-20261010 |
0 | 123 | 2026-10-10 | docs: retain spelling prepublication failure evidence and queued control |
codex/subtotal-filter-history |
0 | 177 | 2026-10-10 | fix(sheets): сохранять пустой выбор значений фильтра |
codex/table-border-inheritance-20261010 |
0 | 150 | 2026-10-10 | docs: описать исправление наследования рамок и приёмку macOS |
codex/table-rtl-visual-20261010 |
0 | 13 | 2026-10-10 | Record independent Sagar acceptance of three native archives |
codex/ui-unicode-h19-release-20261010 |
0 | 180 | 2026-10-10 | docs(ui): publish H19 glyph acceptance separately from pending ideographic-space gate |
codex/xml-resource-observation-20261010 |
0 | 117 | 2026-10-10 | qa: add pinned four-API XML resource observer and sealed visual evidence |
d-foreign |
0 | 1144 | 2026-10-05 | edit: команды ссылок, закладок и примечаний — вставка/изменение/снятие ссылки, закладки с проверкой |
d-markers |
0 | 1174 | 2026-10-05 | docs: D-log — D7 (метки) влито, план D8 (Inline::Foreign) |
phase0/kernel |
0 | 1128 | 2026-10-05 | kernel: запись OpenDocument (.odt) своим кодом — codec-odf, C ABI v0.13 meridian_doc_save_odt |
track-d/edit-mwx |
0 | 1188 | 2026-10-05 | mwx: неизвестные части docx (Document::parts) — foreign/ooxml/ + index.xml с SHA-256, в .mwxf — m:fi |
track-d/foreign |
0 | 1160 | 2026-10-05 | edit, mwx: Inline::Foreign (диаграммы, SmartArt, OLE, формулы) — одна единица правки; .mwx — g:inlin |
track-d/markers |
0 | 1175 | 2026-10-05 | edit, mwx: метки полей, ссылок, закладок и примечаний — инварианты правки и формат .mwx; rtl/szCs/bC |
git push origin --delete claude/app-analysis-work-plan-3a8daa
git push origin --delete claude/build-run-mac-dd7c86
git push origin --delete claude/ci-fetch-retry
git push origin --delete claude/ci-runner-hosting-sweep
git push origin --delete claude/frosty-hypatia-962d47
git push origin --delete claude/local-project-path-db99d0
git push origin --delete claude/modest-torvalds-6ee372
git push origin --delete claude/parallel-plans-analysis-bc12e0
git push origin --delete claude/upbeat-lovelace-6c7692
git push origin --delete codex/auto-spacing-twips-20261010
git push origin --delete codex/ci-worker-marker-20261009
git push origin --delete codex/docs-latest-receipts-20261010
git push origin --delete codex/docx-image-crop-20261010
git push origin --delete codex/downloads-20261010
git push origin --delete codex/h20-exact-baseline-composition-20261010
git push origin --delete codex/h20-ready-core-composition-20261010
git push origin --delete codex/h20-table-borders-20261010
git push origin --delete codex/h33-local-diagnostics-20261010
git push origin --delete codex/h35-latest-publication-20261010
git push origin --delete codex/h36-diagnostic-metadata-20261010
git push origin --delete codex/h39-latest-site-20261010
git push origin --delete codex/hub-content-worker
git push origin --delete codex/hub-preview-h18-20261009
git push origin --delete codex/input-hub-20261007
git push origin --delete codex/installed-diagnostics-20261010
git push origin --delete codex/latest-h20-composition-20261010
git push origin --delete codex/latest-h21-filter-sort-composition-20261010
git push origin --delete codex/latest-h22-receipts-composition-20261010
git push origin --delete codex/latest-h23-gif-composition-20261010
git push origin --delete codex/latest-h24-table-filter-composition-20261010
git push origin --delete codex/latest-h26-rtl-paste-composition-20261010
git push origin --delete codex/latest-h27-ci-rtl-receipts-20261010
git push origin --delete codex/latest-h28-complete-ci-docs-20261010
git push origin --delete codex/latest-h31-current-help-20261010
git push origin --delete codex/latest-h32-inline-frame-20261010
git push origin --delete codex/latest-updates-20261009
git push origin --delete codex/moffice-acceptance20
git push origin --delete codex/moffice-ci-accepted-plan-20261009
git push origin --delete codex/moffice-common-ci-private-fixtures-20261009
git push origin --delete codex/moffice-core
git push origin --delete codex/moffice-external-storage
git push origin --delete codex/moffice-integration
git push origin --delete codex/moffice-integration-55-fa37647f
git push origin --delete codex/moffice-integration-current-private-fixtures-20261009
git push origin --delete codex/moffice-integration-latest-20261009
git push origin --delete codex/moffice-integration-production-latest-20261009
git push origin --delete codex/moffice-integration-production-verified-20261009
git push origin --delete codex/moffice-integration-split-20261009
git push origin --delete codex/moffice-latest-h18-source-20261009
git push origin --delete codex/moffice-latest-ui-source-20261010
git push origin --delete codex/moffice-odt
git push origin --delete codex/moffice-platform
git push origin --delete codex/moffice-publisher
git push origin --delete codex/moffice-release-latest-composed-20261009
git push origin --delete codex/moffice-services
git push origin --delete codex/paste-dependency-recovery-20261010
git push origin --delete codex/sheets-filter-help-20261010
git push origin --delete codex/sheets-h20-composition-20261010
git push origin --delete codex/site-install-update
git push origin --delete codex/spelling-postcommit-context-20261010
git push origin --delete codex/subtotal-filter-history
git push origin --delete codex/table-border-inheritance-20261010
git push origin --delete codex/table-rtl-visual-20261010
git push origin --delete codex/ui-unicode-h19-release-20261010
git push origin --delete codex/xml-resource-observation-20261010
git push origin --delete d-foreign
git push origin --delete d-markers
git push origin --delete phase0/kernel
git push origin --delete track-d/edit-mwx
git push origin --delete track-d/foreign
git push origin --delete track-d/markersДавние со своими коммитами — метка, пакет, удаление (12)
| Ветка | Своих | Отстаёт | Последний коммит | Сообщение |
|---|---|---|---|---|
claude/russia-app-promotion-0d496f |
1 | 1334 | 2026-10-07 | chore(snapshot): preserve promotion sources |
codex/hub-macos-workspace |
1 | 923 | 2026-10-07 | chore(snapshot): preserve local source before RepoBase sync |
codex/moffice-font-release-baseline |
1 | 647 | 2026-10-08 | test(layout): reproduce requested-font defect on accepted e6e source |
codex/moffice-font-release-candidate |
2 | 647 | 2026-10-08 | fix(layout): compose requested-family metrics onto accepted e6e release source |
codex/moffice-parallel |
20 | 812 | 2026-10-07 | evidence: зафиксировать preview v21 на GX10 |
codex/moffice-reliability |
25 | 826 | 2026-10-07 | docs: label prior Sheets stage historically |
codex/recovered-git-objects-20261007 |
309 | 739 | 2026-10-07 | archive: anchor recovered unreachable worktree history 2026-10-07 |
codex/recovered-odt-save |
1 | 1144 | 2026-10-05 | kernel: запись OpenDocument (.odt) своим кодом — codec-odf, C ABI v0.13 meridian_doc_save_odt |
phase0/kernel-foreign |
3 | 1174 | 2026-10-05 | kernel: модель — Inline::Foreign (диаграммы, SmartArt, объекты OLE, формулы) и его запись в docx |
phase0/kernel-markers |
6 | 1204 | 2026-10-05 | kernel: модель — метки полей, гиперссылок, закладок и примечаний; Document::comments; запись в docx |
phase0/kernel-table-model |
1 | 1133 | 2026-10-05 | kernel: модель таблиц — пропуск колонок строки и явно снятые рамки таблицы (шаг «а», ветка для D) |
phase0/platform |
35 | 1127 | 2026-10-05 | Merge main into phase0/platform |
git tag archive/claude/russia-app-promotion-0d496f origin/claude/russia-app-promotion-0d496f
git bundle create claude-russia-app-promotion-0d496f.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/claude/russia-app-promotion-0d496f
git push origin archive/claude/russia-app-promotion-0d496f
git push origin --delete claude/russia-app-promotion-0d496f
git tag archive/codex/hub-macos-workspace origin/codex/hub-macos-workspace
git bundle create codex-hub-macos-workspace.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/hub-macos-workspace
git push origin archive/codex/hub-macos-workspace
git push origin --delete codex/hub-macos-workspace
git tag archive/codex/moffice-font-release-baseline origin/codex/moffice-font-release-baseline
git bundle create codex-moffice-font-release-baseline.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/moffice-font-release-baseline
git push origin archive/codex/moffice-font-release-baseline
git push origin --delete codex/moffice-font-release-baseline
git tag archive/codex/moffice-font-release-candidate origin/codex/moffice-font-release-candidate
git bundle create codex-moffice-font-release-candidate.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/moffice-font-release-candidate
git push origin archive/codex/moffice-font-release-candidate
git push origin --delete codex/moffice-font-release-candidate
git tag archive/codex/moffice-parallel origin/codex/moffice-parallel
git bundle create codex-moffice-parallel.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/moffice-parallel
git push origin archive/codex/moffice-parallel
git push origin --delete codex/moffice-parallel
git tag archive/codex/moffice-reliability origin/codex/moffice-reliability
git bundle create codex-moffice-reliability.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/moffice-reliability
git push origin archive/codex/moffice-reliability
git push origin --delete codex/moffice-reliability
git tag archive/codex/recovered-git-objects-20261007 origin/codex/recovered-git-objects-20261007
git bundle create codex-recovered-git-objects-20261007.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/recovered-git-objects-20261007
git push origin archive/codex/recovered-git-objects-20261007
git push origin --delete codex/recovered-git-objects-20261007
git tag archive/codex/recovered-odt-save origin/codex/recovered-odt-save
git bundle create codex-recovered-odt-save.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/recovered-odt-save
git push origin archive/codex/recovered-odt-save
git push origin --delete codex/recovered-odt-save
git tag archive/phase0/kernel-foreign origin/phase0/kernel-foreign
git bundle create phase0-kernel-foreign.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/phase0/kernel-foreign
git push origin archive/phase0/kernel-foreign
git push origin --delete phase0/kernel-foreign
git tag archive/phase0/kernel-markers origin/phase0/kernel-markers
git bundle create phase0-kernel-markers.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/phase0/kernel-markers
git push origin archive/phase0/kernel-markers
git push origin --delete phase0/kernel-markers
git tag archive/phase0/kernel-table-model origin/phase0/kernel-table-model
git bundle create phase0-kernel-table-model.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/phase0/kernel-table-model
git push origin archive/phase0/kernel-table-model
git push origin --delete phase0/kernel-table-model
git tag archive/phase0/platform origin/phase0/platform
git bundle create phase0-platform.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/phase0/platform
git push origin archive/phase0/platform
git push origin --delete phase0/platformСвежие со своими коммитами — решение автора или владельца (1)
| Ветка | Своих | Отстаёт | Последний коммит | Сообщение |
|---|---|---|---|---|
codex/latest-h30-layout-xml-20261010 |
1 | 109 | 2026-10-10 | merge: compose completed legacy page spacing and pinned XML QA |
git tag archive/codex/latest-h30-layout-xml-20261010 origin/codex/latest-h30-layout-xml-20261010
git bundle create codex-latest-h30-layout-xml-20261010.bundle 30553e49e97299965e4f700aae283cfc232db0fe..origin/codex/latest-h30-layout-xml-20261010
git push origin archive/codex/latest-h30-layout-xml-20261010
# решить: перенести коммиты в линию, слить или оставить ветку