chore(memory): consolidate stranded agent-memory commit from merged worktrees - #676
Merged
Conversation
…ic child Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> (cherry picked from commit 27328485f5f685f2c2a8c1160212a3f9986c8314)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Suggested title
chore(memory): consolidate stranded agent-memory commit from merged worktrees
Summary
documentationandmemoriesbranch so it can land onmainbefore the source worktree/branch is deleted.worktree-agent-a3af2b2b1cd3149baafter that branch's feature content had already merged, so it was never reachable frommain./cleanup-merged-worktreesworkflow's editorial triage and consolidation step, run against local branches/worktrees on 2026-08-28.Why
Several
drm-copilot-wt-*/agent worktree branches accumulated documentation or agent-memory commits after their feature work had already merged intomain. Deleting those branches outright would silently drop that content. The cleanup workflow requires such content to be consolidated ontomainbefore the source branches are removed.What Changed
Docs/agent-memory:
.claude/agent-memory/orchestrator/MEMORY.md— adds one index line pointing to the new memory entry below..claude/agent-memory/orchestrator/prepared-epic-child-invalidated-by-sibling-merge.md(new) — records the lesson that a prepared epic child can be invalidated by a sibling's merge.No other files are touched.
Architecture / How It Fits Together
This branch was created off
mainin a dedicated worktree and received exactly one cherry-picked commit (-xprovenance preserved) from the stranded source branch. It carries no other history changes.Three additional candidate commits from a second stranded branch (
worktree-agent-ab754ef5080070b0e) were evaluated and deliberately excluded:docs/features/active/quickfiler-keyboard-action-defects-444/{plan,spec}.md— early drafts of a feature-doc folder that already exists onmainin a far more complete, closed-out form (issue, plan, spec, audits, evidence). Cherry-picking one of them produced a real conflict against that existing folder, confirming the content was superseded rather than missing..claude/agent-memory/orchestrator/prd-feature-hook-longest-path-token.md— the same underlying lesson is already recorded onmainunderprd-feature-hook-parses-prompt-paths.md, in more detail and with a documented incident. Consolidating the duplicate was judged not worthwhile.Verification
Completed:
git merge-base --is-ancestor/ cherry-pick applied cleanly for the one consolidated commit (confirmed viagit logon the consolidation branch)..claude/agent-memory/.Recommended:
Backward Compatibility / Migration Notes
None. No production code, schema, or public API is touched.
Risks and Mitigations
Review Guide
MEMORY.md's one added line and the new memory file in full — both are short.Follow-ups
worktree-agent-a3af2b2b1cd3149ba(and the other now-fully-classified branches from this cleanup pass) become eligible for deletion viabash scripts/bash/cleanup-worktrees.sh --apply.GitHub Auto-close