Merge remote-tracking branch 'upstream/dev' into experimental/windows-shells

# Conflicts:
#	packages/opencode/src/util/filesystem.ts