feat(conflicts): add bash write detection, dismiss/acknowledge, and worktree suppression

This commit is contained in:
Hibryda 2026-03-11 00:25:26 +01:00
parent 05191127ea
commit 38b8447ae6
8 changed files with 354 additions and 24 deletions

View file

@ -174,10 +174,12 @@ vi.mock('./stores/notifications.svelte', () => ({
vi.mock('./stores/conflicts.svelte', () => ({
recordFileWrite: vi.fn().mockReturnValue(false),
clearSessionWrites: vi.fn(),
setSessionWorktree: vi.fn(),
}));
vi.mock('./utils/tool-files', () => ({
extractWritePaths: vi.fn().mockReturnValue([]),
extractWorktreePath: vi.fn().mockReturnValue(null),
}));
// Use fake timers to control setTimeout in sidecar crash recovery