issues: close #2, file #3 (pr merge SEC-08 defect)
Message
issues: close #2, file #3 (pr merge SEC-08 defect)
Diff
.forge/issues/9f88d4ad-3fd1-4021-851b-ef88e11fbaa9/issue.md+2 −2
--- a/.forge/issues/9f88d4ad-3fd1-4021-851b-ef88e11fbaa9/issue.md+++ b/.forge/issues/9f88d4ad-3fd1-4021-851b-ef88e11fbaa9/issue.md@@ -1,12 +1,12 @@11 ---22 id: 9f88d4ad-3fd1-4021-851b-ef88e11fbaa933 title: 'dogfood: bootstrap (docs to wiki, local CI, plan)'4-state: open4+state: closed55 labels:66 - dogfood77 assignees: []88 milestone: dogfood-m199 created: 2026-09-08T03:26:43Z10-updated: null10+updated: 2026-09-08T03:50:11Z1111 ---1212 Install binary on PATH (done via crates/cli). Move AGENTS/OUTLINE/PLAN/build-log/audit to .forge/wiki/docs/. Wire local CI steps (audit, test, budget, release), posture runner: local. Put plan in wiki/docs/DOGFOOD-PLAN.md. Run first f0rge ci run (must pass).
.forge/issues/bcdfa6e5-2d0e-4c3e-9646-c192cdab199c/issue.md+12 −0
--- /dev/null+++ b/.forge/issues/bcdfa6e5-2d0e-4c3e-9646-c192cdab199c/issue.md@@ -0,0 +1,12 @@1+---2+id: bcdfa6e5-2d0e-4c3e-9646-c192cdab199c3+title: 'bug: pr merge on landed PR reports conflict; SEC-08 hash mismatch'4+state: open5+labels:6+- dogfood7+assignees: []8+milestone: null9+created: 2026-09-08T03:51:40Z10+updated: null11+---12+f0rge pr merge <uuid> on an already-merged PR: 'merge conflict' instead of 'already landed'. Root: branch payload hashes format-patch stdout; folder payload hashes stored patch.diff (pr create) — different bytes, landed() dedup misses. Also: branch-flow merges never flip canonical pr state to 'merged' (flip only in folder flow). Fix: canonical patch hash + flip canonical pr state on success in both flows.
.forge/merges/2026-09-08T03-50-11Z.md+8 −0
--- /dev/null+++ b/.forge/merges/2026-09-08T03-50-11Z.md@@ -0,0 +1,8 @@1+---2+pr: e769d904-3ced-4ad7-8619-f9a68ced736b3+applied: false4+verdict: fail5+resolved: []6+created: 2026-09-08T03:50:11Z7+---8+conflict: .forge/ci/steps/01_test.sh, .forge/ci/steps/02_budget.sh, .forge/ci/steps/03_release.sh