From 76ad5bb8d5a55c06bf467aba8c8ac661d9c16633 Mon Sep 17 00:00:00 2001 From: bastien Date: Thu, 24 Sep 2026 11:54:06 +0200 Subject: [PATCH] chore(memory): journal + TODO, remote-branch-cleanup merged to develop 2026-09-24 --- .claude/memory/journal.md | 1 + .claude/tasks/TODO.md | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.claude/memory/journal.md b/.claude/memory/journal.md index 3eec46d..db24338 100644 --- a/.claude/memory/journal.md +++ b/.claude/memory/journal.md @@ -498,3 +498,4 @@ rules: - 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. - User go: remote copy cleaned too. `_gitflow_delete_remote` (tip re-checked against the bases before `push --delete`, best effort, loud KEPT/NOT removed), T24 9 checks, prose + doctrine + SKILL + docs. 161/163. Live run through the lib on the two stale merged remotes: origin/feature/branch-delete-guard + origin/feature/destructive-guardrails removed by `gitflow.sh delete` (both tips verified merged), bases untouched. Branch feature/remote-branch-cleanup UNMERGED — human gate. BDR-096 amended. +- feature/remote-branch-cleanup merged into develop on user go, `gitflow finish` → 91859fe, pushed (develop == origin/develop). First `finish` with the remote step live: it removed `origin/feature/remote-branch-cleanup` itself (tip verified merged). origin holds no `feature/*` any more. BDR-096 fully shipped. diff --git a/.claude/tasks/TODO.md b/.claude/tasks/TODO.md index c8ec826..2871930 100644 --- a/.claude/tasks/TODO.md +++ b/.claude/tasks/TODO.md @@ -42,7 +42,10 @@ sync via post-commit) instead of "merged into HEAD" — its safety valve is dead after the local delete, remote tip read + re-checked against develop/main, then `push origin --delete`; best effort (skip: no origin / NO_PUSH / autopush=false; loud: unreachable, unmerged remote tip). T24 9/9, 161/163. - Live on the 2 stale merged remotes: origin/feature/branch-delete-guard + origin/feature/destructive-guardrails removed by `gitflow.sh delete` (both tips verified merged), bases untouched. UNMERGED — human gate. + Live on the 2 stale merged remotes: origin/feature/branch-delete-guard + + origin/feature/destructive-guardrails removed by `gitflow.sh delete` (both + tips verified merged), bases untouched. Merged into develop 91859fe (user + go 2026-09-24); finish removed its own remote copy. ## 2026-09-22 — destructive guardrails after the 21/09 wipe (feature/destructive-guardrails) Incident 2026-09-21 00:21 on the old server: a reviewer sub-agent (atlast SDD, opus)