Background
I'm a fairly stereotypical software developer. Decent technical skills, but sorely lacking in soft-skills (which I am actively working on). I recently found myself in a position where I was prepared to accept a job offer from a new company, but after an extended discussion with HR at my current company, I renegotiated my position and have since decided to stay on. Part of that discussion included a challenging/degraded relationship with one of my fellow team members. During the discussion with HR, I highlighted this as one of the major factors motivating my move away from the company and it was hinted to me that it would be worth my time to wait 24 hours before taking the job offer any further. Sure enough, the next morning, it was announced that the colleague in question had given notice and would be departing from the company (HR obviously already knew, but couldn't tell me directly), subsequently I declined the other offer and committed to stay with my current company
Context
I'll preface this by saying this is only from my own observation, but I do sit directly next to them. During a 0700-1530 working day, I would estimate my colleague spends no more than 60% of the day at their desk. They frequently are absent from their desk and when they are present, they are often gazing out the window or not interacting with their PC in a way one would expect a developer to. During the previous few months, they have taken weeks of time to complete tasks which should take a few days and often the task is not even functionally complete. I previously wrote this off as them having "checked out" knowing they would be resigning, but I still find it immensely disrespectful.
Additionally, when I first joined the team, he made some incredibly rude comments to me, as well as being generally negative/pessimistic during discussions. Also, while not relevant to the current question, he has some annoying personal habits which I have worked around by constantly wearing headphones while he is at his desk
The Situation
It has just been announced that the colleague in question has revoked their resignation, a mere 2 days before the end of their notice period (which is 4 weeks) and will be staying on not only with the company, but in the same team as me. While I would value any advice on how to handle this from a soft-skills perspective, I appreciate that heads in the "question with opinion-based answers" direction, so I'll summarise the main questions I have:
- Given that I renegotiated my staying in the same team on the premise the colleague would be leaving (it's not in writing though), how do I bring this up in a constructive way with HR? (and/or my manager)
- As someone striving to reach a senior development position, should I attempt to motivate them and rebuild relationships in the team, or leave that to my manager to worry about?
- What's the best strategy for managing frustration at an unproductive colleague?