Skip to content

docs(audit): fold the 24 UNRESOLVED rulings (#1186) into rows.json + FINAL.md (t_12b66b00) #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ang-fleet-lander merged 2 commits into from
Sep 27, 2026
Merged

docs(audit): fold the 24 UNRESOLVED rulings (#1186) into rows.json + FINAL.md (t_12b66b00) #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59432cf
docs(audit): measure and rule the 24 UNRESOLVED rows (t_63023f77)
Kyzcreig Sep 26, 2026
d1f7df9
docs(audit): fold the 24 t_63023f77 UNRESOLVED rulings into rows.json…
ang-fleet-workers[bot] Sep 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 42 additions & 27 deletions docs/plans/fork-pr-audit/FINAL.md
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 21 additions & 12 deletions docs/plans/fork-pr-audit/ROLLUP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

| tranche | KEEP | UPSTREAM | SUPERSEDED-BY-UPSTREAM | DROP | UNRESOLVED | total |
|---|---|---|---|---|---|---|
| gateway | 95 | 19 | 26 | 39 | 2 | 181 |
| gateway | 95 | 19 | 27 | 40 | 0 | 181 |
| agent | 118 | 20 | 85 | 17 | 0 | 240 |
| hermes_cli | 134 | 4 | 16 | 7 | 16 | 177 |
| hermes_cli | 141 | 7 | 17 | 12 | 0 | 177 |
| plugins | 69 | 7 | 4 | 4 | 0 | 84 |
| cron+tools | 44 | 37 | 21 | 9 | 0 | 111 |
| scripts+misc | 78 | 1 | 3 | 30 | 5 | 117 |
| auto | 134 | 5 | 17 | 10 | 1 | 167 |
| scripts+misc | 79 | 2 | 3 | 33 | 0 | 117 |
| auto | 134 | 5 | 17 | 11 | 0 | 167 |
| auto-cherry-pick | 0 | 0 | 2 | 0 | 0 | 2 |
| auto-desktop-retired | 0 | 0 | 0 | 37 | 0 | 37 |
| **all** | **672** | **93** | **174** | **153** | **24** | **1116** |
| **all** | **680** | **97** | **176** | **163** | **0** | **1116** |

## 2. Fork lines that DROP / SUPERSEDED would delete

Census `loc` (add+del of the original PR, an upper bound — later rows edit the same lines): DROP 50,822, SUPERSEDED-BY-UPSTREAM 88,161, UPSTREAM (deleted once merged upstream) 30,313, KEEP 338,037, UNRESOLVED 7,867; all rows 515,200.
Census `loc` (add+del of the original PR, an upper bound — later rows edit the same lines): DROP 53,571, SUPERSEDED-BY-UPSTREAM 88,557, UPSTREAM (deleted once merged upstream) 30,711, KEEP 342,361, UNRESOLVED 0; all rows 515,200.

Real `git diff --shortstat <merge-base> <branch>` of every revert branch on origin (lead run 2026-09-25):

Expand Down Expand Up @@ -144,6 +144,10 @@ Real `git diff --shortstat <merge-base> <branch>` of every revert branch on orig
| t_522e29c9 | #71 | audit/cron_tools/upstream-71 |
| t_05cdacb0 | nopr:4d626ac813 | to build |
| t_e480bf39 | nopr:9a1db22e58 | to build |
| t_4bf92fd0 | #326 | to build (t_63023f77) |
| t_db92203d | #166 | to build (t_63023f77) |
| t_bc006a95 | #135 | to build (t_63023f77) |
| t_c1c5035d | #695 | to build (t_63023f77) |

## 4. Expected reduction in parity-merge conflicts

Expand All @@ -152,10 +156,10 @@ Census `conflict_files` is file-level (the PR touches a file named in a sync led
| ledger | ledger files touched by fork rows | touched by DROP/SUPERSEDED rows | freed (no surviving row touches it) |
|---|---|---|---|
| RESOLUTION-LEDGER.md | 47 | 43 | 7 |
| RESOLUTION-LEDGER-20260807.md | 117 | 85 | 13 |
| RESOLUTION-LEDGER-2026-08-29.md | 123 | 84 | 14 |
| RESOLUTION-LEDGER-20260807.md | 117 | 87 | 14 |
| RESOLUTION-LEDGER-2026-08-29.md | 123 | 87 | 16 |

Row view: 233/795 ledger-touching rows are DROP/SUPERSEDED; they hold 545/1,727 (32%) of all row×conflict-file incidences. Freed files (all ledgers, deduped): 31 — apps/desktop/src/lib/reasoning-effort.ts, hermes_cli/tools_config.py, locales/ar.yaml, scripts/install.sh, scripts/iso-certify.py, tests/agent/test_compaction_threshold_reresolve.py, tests/agent/test_fallback_announce.py, tests/agent/test_i18n.py, tests/agent/test_redact.py, tests/cron/test_lifecycle_guard_heredoc_data.py, tests/gateway/test_config_env_bridge_authority.py, tests/gateway/test_cron_session_contextvar.py, tests/gateway/test_no_gateway_session_env_writes.py, tests/hermes_cli/test_model_switch_custom_providers.py, tests/hermes_cli/test_web_server.py, tests/run_agent/test_partial_stream_finish_reason.py, tests/run_agent/test_run_agent.py, tests/run_agent/test_run_agent_conversation.py, tests/test_code_skew.py, tests/test_web_server.py, tests/tools/test_cron_subagent_session.py, tests/tools/test_mcp_tool.py, tests/tui_gateway/test_compute_host_phase1.py, tests/tui_gateway/test_iso_certify_seam.py, tui_gateway/compute_host.py, tui_gateway/host_supervisor.py, tui_gateway/methods_session.py, tui_gateway/synthetic_turn.py, web/src/lib/gatewayClient.test.ts, web/src/lib/gatewayClient.ts, website/docs/user-guide/features/browser.md. The god files (gateway/run.py, agent/*helpers, hermes_state.py, cron/scheduler.py) stay conflicted: KEEP rows still touch them, so the win there is fewer hunks, not fewer files.
Row view: 241/795 ledger-touching rows are DROP/SUPERSEDED; they hold 569/1,727 (33%) of all row×conflict-file incidences. Freed files (all ledgers, deduped): 33 — apps/desktop/src/lib/reasoning-effort.ts, hermes_cli/tools_config.py, locales/ar.yaml, scripts/install.sh, scripts/iso-certify.py, tests/agent/test_compaction_threshold_reresolve.py, tests/agent/test_fallback_announce.py, tests/agent/test_i18n.py, tests/agent/test_redact.py, tests/cron/test_lifecycle_guard_heredoc_data.py, tests/gateway/test_config_env_bridge_authority.py, tests/gateway/test_cron_session_contextvar.py, tests/gateway/test_no_gateway_session_env_writes.py, tests/hermes_cli/test_model_switch_custom_providers.py, tests/hermes_cli/test_web_server.py, tests/hermes_cli/test_web_server_cron_profiles.py, tests/run_agent/test_partial_stream_finish_reason.py, tests/run_agent/test_run_agent.py, tests/run_agent/test_run_agent_conversation.py, tests/test_code_skew.py, tests/test_web_server.py, tests/tools/test_cron_subagent_session.py, tests/tools/test_mcp_tool.py, tests/tui_gateway/test_compute_host_phase1.py, tests/tui_gateway/test_iso_certify_seam.py, tui_gateway/compute_host.py, tui_gateway/host_supervisor.py, tui_gateway/methods_session.py, tui_gateway/synthetic_turn.py, tui_gateway/ws.py, web/src/lib/gatewayClient.test.ts, web/src/lib/gatewayClient.ts, website/docs/user-guide/features/browser.md. The god files (gateway/run.py, agent/*helpers, hermes_state.py, cron/scheduler.py) stay conflicted: KEEP rows still touch them, so the win there is fewer hunks, not fewer files.

## 5. D2b registry write-backs owed (docs/sync/fork-features.json)

Expand All @@ -170,11 +174,11 @@ Row view: 233/795 ledger-touching rows are DROP/SUPERSEDED; they hold 545/1,727

## 6. The three answers Ace asked for

**What still provides value.** 672 rows (338,037 loc) KEEP on a measurement: the restart/resume/admission family (boot_resume_scheduled 1,190, dropbox_resume 1,410, turn_slot_acquire 2,208, restart_notice 455 fires), blackbox cost accounting (19k–47k turns/api-calls priced), relay-lane headers/pricing (16,913 bpx/bpr calls/7d), the footer and route/compaction announce families (registry 3/22/23/24, live config), Discord restart backfill (425 re-injected messages), cron fallback/pins (17 opt-in jobs, 521-job stores). Plus 93 UPSTREAM rows that are needed AND generic — value that should stop being ours.
**What still provides value.** 680 rows (342,361 loc) KEEP on a measurement: the restart/resume/admission family (boot_resume_scheduled 1,190, dropbox_resume 1,410, turn_slot_acquire 2,208, restart_notice 455 fires), blackbox cost accounting (19k–47k turns/api-calls priced), relay-lane headers/pricing (16,913 bpx/bpr calls/7d), the footer and route/compaction announce families (registry 3/22/23/24, live config), Discord restart backfill (425 re-injected messages), cron fallback/pins (17 opt-in jobs, 521-job stores). Plus 97 UPSTREAM rows that are needed AND generic — value that should stop being ours.

**What solves problems that no longer exist.** 174 rows are fixed upstream (take theirs at the next sync) and 153 rows DROP: never fired in the window, dormant surfaces (desktop D9 ×37, gemini/yunwu lanes, MoA/send_message tools dormant since July, /undo 2 uses, /merge 0), one-shot June LCM campaign harnesses, and a write-only reaction journal. 24 rows stay UNRESOLVED (silent guards with no log/DB signal — need a canary, not a guess).
**What solves problems that no longer exist.** 176 rows are fixed upstream (take theirs at the next sync) and 163 rows DROP: never fired in the window, dormant surfaces (desktop D9 ×37, gemini/yunwu lanes, MoA/send_message tools dormant since July, /undo 2 uses, /merge 0), one-shot June LCM campaign harnesses, and a write-only reaction journal. 0 rows stay UNRESOLVED: the 24 the lead left were measured and ruled by t_63023f77 (UNRESOLVED.md).

**What the maintenance burden actually is (measured).** 515,200 fork lines across 1,116 rows; 795 rows sit on files named in the sync ledgers and 458 on files that conflicted in all three syncs. DROP+SUPERSEDED rows carry 545 of 1,727 (32%) row×conflict-file incidences and 138,983 census loc; but only 31 ledger files are fully freed because KEEP rows still sit on the god files. The real reduction comes in two steps: (1) this audit's DROP/SUPERSEDED (fewer hunks per sync), (2) landing the UPSTREAM rows + registry 22/23/24, which is what empties gateway/run.py of fork hunks.
**What the maintenance burden actually is (measured).** 515,200 fork lines across 1,116 rows; 795 rows sit on files named in the sync ledgers and 458 on files that conflicted in all three syncs. DROP+SUPERSEDED rows carry 569 of 1,727 (33%) row×conflict-file incidences and 142,128 census loc; but only 33 ledger files are fully freed because KEEP rows still sit on the god files. The real reduction comes in two steps: (1) this audit's DROP/SUPERSEDED (fewer hunks per sync), (2) landing the UPSTREAM rows + registry 22/23/24, which is what empties gateway/run.py of fork hunks.

## 7. Open prerequisites before the sync takes upstream

Expand Down Expand Up @@ -222,3 +226,8 @@ Post-ruling flips (Ace, 2026-09-27, card t_f29230a1): 8 DROP rows → KEEP (#562
nopr:36134d8944, nopr:051c2076e1, #22). §1/§2/§4/§6 above are re-rendered: KEEP 672, DROP 153. The §9 card arithmetic
records what was created at handoff (254 rows); after the flips, 246 rows are DROP/UPSTREAM. The 8 flipped rows' slice
cards were closed by the ruling. Details are in FINAL.md "Post-ruling flips (2026-09-27)".

UNRESOLVED fold (2026-09-27, card t_12b66b00): the 24 rows above were measured and ruled by t_63023f77 (`UNRESOLVED.md`) and are
now applied by `final.build()`. §1/§2/§3/§4/§6 are re-rendered: KEEP 680, DROP 163, UPSTREAM 97, SUPERSEDED-BY-UPSTREAM 176,
UNRESOLVED 0. The 4 new UPSTREAM rows are listed in §3 with their t_63023f77 slice cards. Details are in FINAL.md
"UNRESOLVED rows folded (2026-09-27)".
Loading
Loading