dexter/BTerminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
v2/src/lib/agent-dispatcher.ts
View file

@ -25,8 +25,8 @@ import {
} from './adapters/groups-bridge';
import { tel } from './adapters/telemetry-bridge';
import { recordActivity, recordToolDone, recordTokenSnapshot } from './stores/health.svelte';
import { recordFileWrite, clearSessionWrites } from './stores/conflicts.svelte';
import { extractWritePaths } from './utils/tool-files';
import { recordFileWrite, clearSessionWrites, setSessionWorktree } from './stores/conflicts.svelte';
import { extractWritePaths, extractWorktreePath } from './utils/tool-files';
let unlistenMsg: (() => void) | null = null;
let unlistenExit: (() => void) | null = null;
@ -184,6 +184,12 @@ function handleAgentEvent(sessionId: string, event: Record<string, unknown>): vo
const projId = sessionProjectMap.get(sessionId);
if (projId) {
recordActivity(projId, tc.name);
// Worktree tracking: detect worktree isolation on Agent/Task calls or EnterWorktree
const wtPath = extractWorktreePath(tc);
if (wtPath) {
// The child session (or this session) is entering a worktree
setSessionWorktree(sessionId, wtPath);
}
// Conflict detection: track file writes
const writePaths = extractWritePaths(tc);
for (const filePath of writePaths) {