feat(conflicts): add bash write detection, dismiss/acknowledge, and worktree suppression
This commit is contained in:
parent
05191127ea
commit
38b8447ae6
8 changed files with 354 additions and 24 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue