From abd1254d662bd94a803d1b3af2b23c69c6f994b7 Mon Sep 17 00:00:00 2001 From: bastien Date: Thu, 24 Sep 2026 11:44:41 +0200 Subject: [PATCH] chore(memory): journal + TODO, branch-delete-guard merged to develop 2026-09-24 --- .claude/memory/journal.md | 1 + .claude/tasks/TODO.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.claude/memory/journal.md b/.claude/memory/journal.md index 97eb287..b6eea8c 100644 --- a/.claude/memory/journal.md +++ b/.claude/memory/journal.md @@ -496,3 +496,4 @@ rules: - User rule: auto-delete of a branch only once merged into develop/main; main/develop never deleted. Found `git branch -d` guard dead since BDR-095's `-u` push (checks the upstream, always in sync) — T22a proves it ([[LRN-161]]). - Shipped [[BDR-096]] on feature/branch-delete-guard: `gitflow_delete` (rc 5 unmerged / rc 6 protected; CLI `delete` `merged` `hooks`), 4th hook `reference-transaction` vetoing delete/rename of main/develop (live via global `githooks/`), `GITFLOW_HOOKS` single list, static deny on hand `branch -d/--delete` + base renames, hard_deny entry, doctrine + SKILL + docs. 152/154 (2 pre-existing T16a), doctor 4/4, shellcheck clean. UNMERGED — human gate. - Inline probes denied 4× by the guardrails themselves (deny strings in command text) → probe = test file, content via Write. Open for the user: `origin/
` accumulates after finish (`push --delete` denied), CLAUDE.global.md 352L (>320 budget), user's `feedbackDrafts` settings line left uncommitted on purpose. +- feature/branch-delete-guard merged into develop on user go, `gitflow finish` → b2e252e, pushed by the lib + post-merge hook (develop == origin/develop, no hand push). First live run of `gitflow_delete`: branch verified merged → deleted. User asked "push automatically after every merge": already the case since [[BDR-095]] (`_gitflow_merge_into` pushes the target, post-merge hook, T18f) — evidenced, nothing added. Remote `origin/feature/{branch-delete-guard,destructive-guardrails}` remain (`push --delete` denied) — user's call. diff --git a/.claude/tasks/TODO.md b/.claude/tasks/TODO.md index 4646e0a..d472793 100644 --- a/.claude/tasks/TODO.md +++ b/.claude/tasks/TODO.md @@ -36,7 +36,8 @@ sync via post-commit) instead of "merged into HEAD" — its safety valve is dead - [x] D7 `make test`, shellcheck, doctor; BDR-096 + LRN + journal. Verified 2026-09-24: gitflow-test 152/154 (2 pre-existing T16a), T22 12/12 + T23 11/11, shellcheck clean incl. emitted hook, doctor - 4/4 hooks match. Branch UNMERGED — human gate. BDR-096, LRN-161. + 4/4 hooks match. Merged into develop b2e252e (user go 2026-09-24). + BDR-096, LRN-161. Out of scope, flagged: remote branch cleanup after finish (`git push --delete` is in static deny since BDR-095; origin/
now accumulates — user's call).