@zak Thanks for posting this - after several years of using this particular MBP, I finally got around to enabling per-directory history in zsh. This exact thing has been driving me nuts lately, but I hadn't realised how annoying it was until I started to type a reply.