From 58e9180c4a4492d82dac24f8aa0130f0ba3a994c Mon Sep 17 00:00:00 2001 From: bitkyc08-arch Date: Sat, 15 Aug 2026 14:36:21 +0900 Subject: [PATCH] docs(devlog): 260815 triage execution and final verification record --- .../020_merge_execution.md | 31 ++++++++++++++++-- .../030_final_verification.md | 32 +++++++++++++++++-- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/devlog/_plan/260815_open_pr_triage/020_merge_execution.md b/devlog/_plan/260815_open_pr_triage/020_merge_execution.md index 4ac3dd12c..6325c42a2 100644 --- a/devlog/_plan/260815_open_pr_triage/020_merge_execution.md +++ b/devlog/_plan/260815_open_pr_triage/020_merge_execution.md @@ -61,5 +61,32 @@ the recorded gaps (010 matrix). ## Execution log -(pending) - +- Retarget attempt: gh pr edit --base dev REJECTED for #1706/#1722/#1723 + (GitHub stack rule). Fallback: after the dev push, fast-forward the three + stack base branches (cl10-public-core, refactor/adapter-registry-authority, + test/adapter-registry-conformance) to the int tip so each child head is + reachable from its recorded base (exact-SHA auto-merge detection). +- int/260815-pr-landings built off origin/dev 02abe0afa. Merges (all --no-ff): + #1708 #1709 #1710 #1712 #1715 #1717 #1719 #1720 clean; #1705 clean; + #1706 semantic conflict in src/lab/ledger/purge.ts resolved (export-purge + deferral re-expressed inside withLedgerMutation; cell-object fix for TS + closure narrowing, follow-up commit ba20ce17f); #1714 trivial conflict in + gui/.eslint/i18n-allowlist.ts (took /^HTTP$/i); #1721/#1722/#1723 clean; + #1716 clean. Fixture fixes: 3 commits pointing mimo-free test fixtures at + the canonical /chat endpoint (#1714 guard). +- Local gate: bun run typecheck green on int tip ba20ce17f. +- KEEP-DRAFT maintainer comments posted: #1704 #1718 #1725 #1727 #1728 #1729 + #1732 (all 7, 2026-08-15). +- lidge validation: worktree /tmp/ocx-triage-260815-int on ba20ce17f; + INSTALL_OK TSC_OK PRIVACY_OK; full test suite running (log + /tmp/ocx-triage-260815.log). + +- Landing: direct push to dev rejected by ACTIVE ruleset 'Protect dev' + (bypass_mode=pull_request). Route adapted: opened PR #1736 + (int/260815-pr-landings -> dev) and merged with --admin --merge, preserving + all 15 head SHAs as ancestors. dev tip 88463de4e (tree byte-identical to + lidge-validated ba20ce17f; empty git diff). +- Post-land: all 15 source PRs auto-marked MERGED (gh verified). +- Cleanup: remote branches cl10-public-core, refactor/adapter-registry-authority, + test/adapter-registry-conformance, int/260815-pr-landings deleted; local + refs/triage/* removed; local dev synced to origin/dev. diff --git a/devlog/_plan/260815_open_pr_triage/030_final_verification.md b/devlog/_plan/260815_open_pr_triage/030_final_verification.md index 44659ec5c..4969a67fe 100644 --- a/devlog/_plan/260815_open_pr_triage/030_final_verification.md +++ b/devlog/_plan/260815_open_pr_triage/030_final_verification.md @@ -1,4 +1,30 @@ # 030 - Final verification (wp6) - -(pending: lidge suite output on final dev head, gh disposition verification, per-PR outcome report) - + +## Landing + +- dev tip: 88463de4e (merge of PR #1736, int/260815-pr-landings). +- Integration tip ba20ce17f tree is byte-identical to dev tip (empty diff). + +## lidge suite (only host used for suites, per owner directive) + +- Host: ssh lidge, worktree /tmp/ocx-triage-260815-int @ ba20ce17f. +- First run: 7 transient failures - bun installed gui deps mid-run + (gui/node_modules/react created 14:14:19 KST, errors in the same minute + window); install race, not a code defect. +- Rerun (clean): 12204 pass / 11 skip / 0 fail; Ran 12215 tests across 777 + files [448.99s]; TESTS_OK. typecheck (TSC_OK) and privacy:scan + (PRIVACY_OK) green on the same tree. + +## Dispositions (gh-verified 2026-08-15) + +MERGED (15): #1705 #1706 #1708 #1709 #1710 #1712 #1714 #1715 #1716 #1717 +#1719 #1720 #1721 #1722 #1723 + +KEEP-DRAFT with maintainer comment (7): #1704 (screenshot+test+threads), +#1718 (maintainer CI + checklist), #1725 (maintainer CI + checklist), +#1727 (path-redaction Major + empty_catch + screenshot), #1728 (author +checklist), #1729 (5 macOS test failures), #1732 (reclaim/gates red + 2 +Majors). + +Out of scope untouched: #1703 and older open drafts (not in the owner's list). +