Use threaded chain descriptions in rescue/skip notifications - #31
Merged
Conversation
Past a merge chain's first step, source1 is the previous step's accumulated temp file, whose MergeSource.Name resolves from its path - observed live mislabeling a dry run's flat-file chain as "Merged Bundle Content" (a temp-root folder name) in both the function-level rescue header and the skip messages. The decision lines inside the rescue message already used the caller-threaded oldDescription/newDescription (PR #22); the six surrounding human-facing messages never caught up. Marker labels deliberately keep source names (unchanged). Found during the live regression matrix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01GXAuGMLB44T5Zv5o5ZzKah
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
1 participant
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.
Summary
Found during the live regression matrix:
merge_conflictsnotifications for chain steps past the first were headed "Merged Merged Bundle Content + modX..." / "Skipped Merged Bundle Content + modX..." for plain flat-file merges —source1.Nameresolves the accumulated temp file's path, and a dry run's intermediate outputs live under the temp root, so the label came out as a folder name instead of the real accumulated-mods description.PR #22 threaded
oldDescription/newDescription("accumulated merge (modA, modB)") into the function-level decision lines; this fixes the six surrounding human-facing messages (rescue header + five skip/error messages) to use the same descriptions, falling back tosource.Namewhen no description was threaded (chain step 1, where Name is a real mod name). Conflict-marker labels deliberately keep source names — unchanged.dotnet build/dotnet test128/128 / format check all green.🤖 Generated with Claude Code
https://claude.ai/code/session_01GXAuGMLB44T5Zv5o5ZzKah