Skip to content

Use threaded chain descriptions in rescue/skip notifications #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheValiantOne merged 1 commit into from
Aug 11, 2026
Merged

Use threaded chain descriptions in rescue/skip notifications #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions WitcherScriptMerger.Core/Tools/DiffPlexMergeEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public MergeEngineResult MergeHeadless(
if (!hasVanillaVersion)
{
AppState.Notifier.ShowMessage(
$"Skipped {source1.Name} + {source2.Name}: no vanilla version of this file could be found, " +
$"Skipped {oldDescription ?? source1.Name} + {newDescription ?? source2.Name}: no vanilla version of this file could be found, " +
"so a 3-way merge isn't possible.",
"Skipped", NotifyButtons.OK, DialogIcon.Warning);
return MergeEngineResult.NeedsManualResolution;
Expand All @@ -209,7 +209,7 @@ public MergeEngineResult MergeHeadless(
&& source2.Hash != null && source2.Hash.IsOutdated)
{
AppState.Notifier.ShowMessage(
$"Skipped {source1.Name} + {source2.Name}: merging an updated mod file into a merge " +
$"Skipped {oldDescription ?? source1.Name} + {newDescription ?? source2.Name}: merging an updated mod file into a merge " +
"created with a previous version needs manual review (auto-solving could keep changes " +
"from the previous version that have been removed in the new one).",
"Skipped", NotifyButtons.OK, DialogIcon.Warning);
Expand Down Expand Up @@ -244,7 +244,7 @@ public MergeEngineResult MergeHeadless(
// starting point at all - genuinely needs the source files opened side by
// side and compared by hand.
AppState.Notifier.ShowMessage(
$"Skipped {source1.Name} + {source2.Name}: the automatic 3-way merge algorithm hit " +
$"Skipped {oldDescription ?? source1.Name} + {newDescription ?? source2.Name}: the automatic 3-way merge algorithm hit " +
$"an internal inconsistency it couldn't safely recover from ({ex.Message}) - a known " +
"limitation of the underlying DiffPlex library for certain multi-edit conflicts, see " +
"CLAUDE.md. Needs manual resolution - open the source mod files directly to compare " +
Expand Down Expand Up @@ -331,7 +331,7 @@ public MergeEngineResult MergeHeadless(
? " - opened it for review."
: " - open it manually to review.";
AppState.Notifier.ShowMessage(
$"Skipped {source1.Name} + {source2.Name}: genuine conflict, needs manual resolution. " +
$"Skipped {oldDescription ?? source1.Name} + {newDescription ?? source2.Name}: genuine conflict, needs manual resolution. " +
$"Conflict markers were written to {sidecarFullPath}{openSuffix}",
"Skipped", NotifyButtons.OK, DialogIcon.Warning);

Expand Down Expand Up @@ -454,7 +454,7 @@ bool TryFunctionLevelRescue(
// carries MCP JSON-RPC frames only when running under the mcp verb,
// and writing arbitrary text there would corrupt the protocol stream.
AppState.Notifier.ShowMessage(
$"Function-level merge rescue hit an unexpected error for {source1.Name} + {source2.Name} " +
$"Function-level merge rescue hit an unexpected error for {oldDescription ?? source1.Name} + {newDescription ?? source2.Name} " +
$"({ex.GetType().Name}: {ex.Message}) - falling back to the whole-file result.",
"Function-level rescue error", NotifyButtons.OK, DialogIcon.Warning);
return false;
Expand All @@ -476,8 +476,15 @@ bool TryFunctionLevelRescue(
// run (openConflictMarkers is false only for the dry-run caller), so
// it's reachable far more often than the exception-logging branch.
var previewSuffix = openConflictMarkers ? "" : " (dry run preview - nothing was actually written)";
// oldDescription/newDescription, not source1.Name/source2.Name: past a
// merge chain's first step, source1 is the previous step's accumulated
// temp file, whose MergeSource.Name resolves from its path (observed
// mislabeling a dry run's flat-file chain as "Merged Bundle Content" -
// a temp-root folder name - during live regression). The decision lines
// inside this same message already used the caller-threaded
// descriptions; the header just never caught up.
AppState.Notifier.ShowMessage(
$"Merged {source1.Name} + {source2.Name} at the function level after the whole-file merge " +
$"Merged {oldDescription ?? source1.Name} + {newDescription ?? source2.Name} at the function level after the whole-file merge " +
$"couldn't auto-solve it{previewSuffix}:\n\n" + string.Join("\n", result.Decisions),
"Merged (function-level)", NotifyButtons.OK, DialogIcon.Warning);
}
Expand Down
Loading