Skip to content

docs: consolidate stranded documentation and agent-memory before merged-worktree cleanup - #557

Merged
drmoisan merged 3 commits into
mainfrom
documentationandmemories
Aug 15, 2026
Merged

docs: consolidate stranded documentation and agent-memory before merged-worktree cleanup#557
drmoisan merged 3 commits into
mainfrom
documentationandmemories

Conversation

@drmoisan

Copy link
Copy Markdown
Owner

Suggested title

docs: consolidate stranded documentation and agent-memory before merged-worktree cleanup

Summary

  • Rescues 15 documentation and agent-memory files that existed only inside stale git worktrees and were unreachable from main.
  • Cherry-picks (-x) commit 17d96c01 from TaskMaster-wt-2026-08-11T09-12, the sole unique residual commit across all local branches, recording the parallel-surface blockers promoted to Bug: blast-radius-config-not-ported-to-taskmaster #545 and Bug: research-doc-cohort-library-false-negative #546.
  • Commits ten agent-memory files that were left uncommitted in the worktree TaskMaster-wt/2026-08-10T13-56, whose branch is already a strict ancestor of main and is therefore a deletion candidate.
  • Contains no production code: the diff is confined to .claude/agent-memory/** and docs/features/potential/promoted/**.
  • Unblocks deletion of 23 fully-merged local branches and their worktree registrations.

Why

Merged-worktree cleanup classifies every local branch against main. Two categories of content were found that deletion would have destroyed:

  1. A unique residual commit. TaskMaster-wt-2026-08-11T09-12 is one commit ahead of main. Per-path comparison against main confirmed the content is genuinely absent (two files absent, two differing, one index modified) rather than patch-equivalent.

  2. Uncommitted work in an already-merged worktree. TaskMaster-wt/2026-08-10T13-56 tracks a branch that is a strict ancestor of main, so the worktree is otherwise disposable — but its working tree held 8 untracked memory files plus 2 modified index files that had never been committed anywhere.

Consolidating both onto a single branch makes the content durable before any destructive pass runs.

What Changed

Docs — promoted potential entries (from cherry-picked 17d96c01)

  • docs/features/potential/promoted/2026-08-11-blast-radius-config-not-ported-to-taskmaster.md (new, +111)
  • docs/features/potential/promoted/2026-08-11-research-doc-cohort-library-false-negative.md (new, +85)

Agent memory — parallel-planner (from cherry-picked 17d96c01)

  • project_parallel_cannot_express_ordering.md (new)
  • project_parallel_surface_partial_port.md (rewritten: supersedes the 2026-08-10 assessment, which recorded a false negative on cohort-library availability)
  • MEMORY.md (index updated)

Agent memory — epic-orchestrator (rescued from the dirty worktree)

  • feedback_prepared_epic_stale_child_branches.md (new)
  • project_child_pr_ci_gap_integration_base.md (new)
  • MEMORY.md (+2 index lines, pure append)

Agent memory — epic-planner (rescued from the dirty worktree)

  • feedback_governance_doc_edits_need_execution_authorization.md (new)
  • feedback_preexisting_issues_skip_potential_to_issue.md (new)
  • feedback_recover_dead_prep_child_by_committing_then_relaunching.md (new)
  • project_lane_a_gate_fidelity_epic.md (new)
  • reference_epic_kickoff_validator_table_rules.md (new)
  • reference_prepared_plan_crlf_hazard_at_execution.md (new)
  • MEMORY.md (+6 index lines, pure append)

Architecture / How It Fits Together

No runtime wiring changes. The two affected trees are read by agents, not by the build:

Verification

Completed

  • Cherry-pick of 17d96c01 applied with no conflict.
  • Per-path comparison of 17d96c01 against main confirmed the content was not already present (no patch-equivalent duplicate).
  • CR-normalized diff of both rescued MEMORY.md files against main confirmed the edits are pure appends — no existing index entry is modified or removed (+2 and +6 lines, -0).
  • Staged diff for the rescue commit is 10 files changed, 270 insertions(+), zero deletions.
  • Branch pushed and comparison range confirmed as 0569ac0b..58290338.

Recommended

  • Confirm the two rescued index files render with every bullet resolving to a present sibling file.
  • No toolchain run applies: the diff touches no *.cs, *.csproj, *.props, *.targets, or *.ps1 file, so the CSharpier / analyzer / nullable / MSTest loop has nothing to exercise.

Backward Compatibility / Migration Notes

None. All changes are additive documentation. No public API, build configuration, or test is touched. The one non-additive edit is project_parallel_surface_partial_port.md, which intentionally supersedes its own prior content and records why the earlier verdict was wrong.

Risks and Mitigations

  • Risk: the rescued memory files were uncommitted work whose author had not chosen to commit them.
    Mitigation: the content is purely additive and its source worktree is left untouched by this PR — nothing was moved or deleted, only copied forward. Rollback is a plain revert.
  • Risk: a rescued index entry could point at a file that was not copied.
    Mitigation: verified — all 8 index bullets added map to the 8 new memory files in this diff.
  • Risk: stale guidance in project_parallel_surface_partial_port.md if the parallel surface changes again.
    Mitigation: the file states its own as-of date (2026-08-11) and instructs the reader to verify against the repo.

Review Guide

Suggested order:

  1. docs/features/potential/promoted/* — the two promoted entries backing Bug: blast-radius-config-not-ported-to-taskmaster #545 and Bug: research-doc-cohort-library-false-negative #546.
  2. .claude/agent-memory/parallel-planner/project_parallel_surface_partial_port.md — the only rewritten file; read as a replacement of the prior text.
  3. The three MEMORY.md index diffs — small and mechanical; confirm append-only.
  4. The eight new epic-orchestrator / epic-planner memory files — independent of each other, readable in any order.

Follow-ups

  • Issues Bug: blast-radius-config-not-ported-to-taskmaster #545 and Bug: research-doc-cohort-library-false-negative #546 remain open; this PR records the promotion documentation only and does not implement either fix.
  • scripts/bash/cleanup-worktrees.sh and its two libraries, referenced by .claude/skills/cleanup-merged-worktrees/SKILL.md, do not exist in this repository. The skill was ported as documentation only, so its classification, consolidation, and apply passes currently have no implementation. This should be tracked separately.
  • After this PR merges, 23 fully-merged local branches and the clean merged worktree registrations become eligible for deletion.

GitHub Auto-close

None — issues #545 and #546 are referenced for context only and are not resolved by this PR.

drmoisan and others added 3 commits August 14, 2026 22:00
Planning /parallel-plan for Lanes B-M halted before any delegation. Two
report-only defects promoted through the MCP lifecycle so they survive
outside a planner session:

- #545: config/blast-radius.json was pushed down verbatim in #544 and
  describes the governance payload's layout, not TaskMaster's. Verified
  via Get-BlastRadius/Test-BlastRadiusConflict: the mandatory
  docs/features/active/<name>/** glob falls under module docs, making the
  conflict graph a clique (fully serial execution), while TaskMaster.sln,
  Directory.Build.targets, .editorconfig, coverage.config and
  .github/workflows/** are absent from shared_surfaces (real build-file
  collisions dropped silently under F1a).
- #546: the 2026-08-10 research doc records the cohort library as absent
  from both repos. It exists at .claude/lib/bash/compute-cohorts.sh and
  upstream at scripts/dev_tools/parallel_cohort_computation.py; the false
  negative came from git grep alternation without -E.

Also records the second, independent blocker in agent memory: depends_on
is a prohibited key at every level of the parallel surface
(parallel-orchestration.md invariant 10, M7), so "lanes parallel, issues
within a lane sequential" is inexpressible there. Lane work should use
/epic-plan per lane, where waves express intra-lane ordering natively.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DQp1dund9kqDP8ye2wzCdk
(cherry picked from commit 17d96c01a59fc23337fb9eb9d5354b9db3d83bd3)
…ries

These ten agent-memory files were left uncommitted in the worktree at
TaskMaster-wt/2026-08-10T13-56, whose branch (TaskMaster-wt-2026-08-10T13-56)
is already a strict ancestor of main. Removing that worktree during merged-
worktree cleanup would have destroyed them, so they are consolidated here
before deletion.

Both MEMORY.md index edits are pure appends over main's current content
(verified with a CR-normalized diff): 2 new epic-orchestrator entries and
6 new epic-planner entries, each pointing at one of the 8 new memory files.
No existing entry is modified or removed.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@drmoisan
drmoisan merged commit b67cf69 into main Aug 15, 2026
5 checks passed
@drmoisan
drmoisan deleted the documentationandmemories branch August 15, 2026 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant