# Conflicts: # packages/engine/src/__tests__/executor-recovery.test.ts # packages/engine/src/agent-tools.ts # packages/engine/src/executor.ts # packages/engine/src/worktree-acquisition.ts
# Conflicts: # packages/engine/src/__tests__/executor-recovery.test.ts # packages/engine/src/agent-tools.ts # packages/engine/src/executor.ts # packages/engine/src/worktree-acquisition.ts