mika kunsandClaude Sonnet 5.5 feb0afa33a fix(merge): pass the stash consent to the conflict resolver so it opens on a dirty target ...

The resolver restarts the merge via StartConflictMerge, which had no autostash.
After a stash-retry approve reported 'conflict', the restart hit the same dirty
target, got 'dirty_target' and the resolver silently never opened. Thread the
consent through the hub, client, coordinator and resolver; surface a refusal in
the footer instead of dropping it.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

2026-10-02 17:25:52 +02:00

..

Helpers

feat(ui): colour agent output by kind and stop cutting tool calls at 120 chars

2026-10-01 10:49:52 +02:00

Services

feat(details): attach clipboard image on Ctrl+V in the task description

2026-10-02 10:31:47 +02:00

ViewModels

fix(merge): pass the stash consent to the conflict resolver so it opens on a dirty target

2026-10-02 17:25:52 +02:00

Views

fix(ui): deliver AltGr characters to ConPTY tiles as text

2026-10-01 10:24:05 +02:00

AccentPresetsTests.cs

feat(lists): selectable list/folder colors with accent-aware swatches and custom picker

2026-10-01 10:29:53 +02:00

AppSettingsTests.cs

test(ui): restore the language settings tests dropped in the previous commit

2026-08-07 09:24:43 +02:00

ClaudeDo.Ui.Tests.csproj

refactor(ipc): declare the SignalR wire DTOs once in ClaudeDo.Data

2026-08-26 13:55:40 +02:00

ColorBrushConverterTests.cs

feat(lists): selectable list/folder colors with accent-aware swatches and custom picker

2026-10-01 10:29:53 +02:00

ConnectionPromptGateTests.cs

fix(ui): connection pill opens worker help only when disconnected

2026-08-12 10:58:10 +02:00

DiffFileIconsTests.cs

feat(diff-viewer): folder/file-type icons and change-kind colours in the file tree

2026-10-02 10:31:55 +02:00

DragHitTestTests.cs

feat(ui): ghost-window drag infrastructure for task rows

2026-06-26 16:11:51 +02:00

InheritanceResolverTests.cs

feat(ui): add inheritance resolver returning value and source

2026-06-04 12:28:12 +02:00

IslandsShellViewModelExternalMergeTests.cs

fix(merge): pass the stash consent to the conflict resolver so it opens on a dirty target

2026-10-02 17:25:52 +02:00

IslandsShellViewModelRestartWorkerTests.cs

fix(ui): surface worker connect/restart failures instead of no-opting

2026-09-10 13:34:32 +02:00

IslandsShellViewModelShutdownTests.cs

fix(ui): duplizierter Confirm-Dialog mit "Delete"-Knopf – zusammenfuehren und lokalisieren

2026-09-16 15:43:38 +02:00

IslandsShellViewModelStartupRecoveryTests.cs

feat(worker): surface startup recovery via OperationProgress channel

2026-08-21 13:36:25 +02:00

IslandsShellViewModelUpdateClaudeCliTests.cs

feat(ui): Worker-Menü "Update Claude CLI" führt claude update aus

2026-09-10 13:10:30 +02:00

IslandsShellViewModelWorkerLogTests.cs

fix(ui): Log Visualizer shows every footer-log message

2026-10-01 17:35:03 +02:00

LanguageSettingTests.cs

feat(i18n): add language dropdown to settings and persist selection

2026-06-03 11:51:36 +02:00

LocalizedStringTests.cs

feat(i18n): add Avalonia loc:Tr markup extension and LocalizedString

2026-06-03 11:44:16 +02:00

MainWindowCloseConfirmDecisionTests.cs

feat(ui): confirm main-window close when Mission Control sessions are open

2026-08-21 18:14:48 +02:00

MdiIconNamesTests.cs

refactor(ui): delete dead Icon.* geometries and icon-stroke styles, add MDI name guard test

2026-10-01 16:56:45 +02:00

MissionControlViewModelTests.cs

feat(ui): mission-control pane title shows usage limit reset time

2026-09-10 13:18:09 +02:00

RepoImportCandidatesTests.cs

feat(ui): repo-import modal — remember folders, search, compact rows, no auto-select

2026-05-29 16:29:22 +02:00

RepoScannerTests.cs

fix(ui): stop treating git worktrees and submodules as repos

2026-09-02 09:59:12 +02:00

StubWorkerClient.cs

fix(merge): pass the stash consent to the conflict resolver so it opens on a dirty target

2026-10-02 17:25:52 +02:00

TestDoubles.cs

fix(ui): duplizierter Confirm-Dialog mit "Delete"-Knopf – zusammenfuehren und lokalisieren

2026-09-16 15:43:38 +02:00

TestSetup.cs

fix(tests): stop Ui.Tests order-dependent flakiness on shared Loc.Current

2026-09-02 12:55:51 +02:00

TestTaskNumbers.cs

fix(test): give Ui.Tests task seeds a unique Number

2026-08-11 11:32:01 +02:00

WorkerLogLevelToBrushConverterTests.cs

feat(ui): add WorkerLogLevelToBrushConverter with tests

2026-04-23 14:53:03 +02:00