Merge upstream v6.0.5, rework vault secrets as a hierarchy, fix three regressions - #18

Merged

AustralianRaven merged 1641 commits into

chore/merge-upstream-6.0.5

Aug 26, 2026

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 2, 2026

fix filter operator alignment
bnquon
committed
8bfa63b
Merge pull request #4559 from bnquon/fix/reposition-filter-operators
not-night-but
authored
4507216
Merge branch 'master' into fix/table-row-delete-key-macos
ylyra
authored
5183f5b
Merge branch 'master' into fix/favorite-delete-confirmation-title
ylyra
authored
7bf9bed
use a custom builder for columns and values to pass raw sql to knex
bnquon
committed
cd31a41
clean up test format
bnquon
committed
fd82c6d

Commits on Aug 3, 2026

add dialectType to getConnectionInfo
azmy60
committed
38b42c4
add disabledFeatures instead
azmy60
committed
1e68777
Merge pull request #4554 from beekeeper-studio/dependabot/npm_and_yarn/brace-expansion-1.1.18
azmy60
authored
a5b4d11
Merge branch 'master' into fix/sql-export-column-order
bnquon
authored
14b1ffc
missing drag-pending, filter, and hide rename if cannot write
azmy60
committed
ff91430
fix css
azmy60
committed
238149a
add lines beside folder tree
azmy60
committed
d6ef508
better empty state, loading state uses skeleton
azmy60
committed
27934b9
fix move modal does not show all folders
azmy60
committed
0898925
fix fetchedIds are not set when refreshing
azmy60
committed
4196602
highlight newly created folder in the sidebar trees

azmy60
and
claude
committed
733b3c0
Merge branch 'master' into fix/favorite-delete-confirmation-title
ylyra
authored
b16b172
Merge branch 'master' into fix/table-row-delete-key-macos
ylyra
authored
85b7228
refactor: split AppImage and AppImageLauncher detection
cynicalmindset
committed
8ba9336
refactor: split AppImage and AppImageLauncher detection
cynicalmindset
committed
22260d7
Merge pull request #4547 from ylyra/fix/favorite-delete-confirmation-title
not-night-but
authored
c23497c
Merge pull request #4562 from cynicalmindset/fix/appimage-launcher-detection
not-night-but
authored
1f5b281
fix: use Control for context-menu ctrl/cmd modifiers on macOS
ylyra
committed
96823e3
fix: route table row delete through v-hotkey again
ylyra
committed
0d19dd2
fix: map delete keybinding to backspace on macOS for v-hotkey
ylyra
committed
a802791
Merge branch 'master' into fix/table-row-delete-key-macos
ylyra
authored
ba8030e
fix: map mac delete keybinding to backspace and update tests
ylyra
committed
22855bc
Merge pull request #4561 from beekeeper-studio/feat/plugin-conn-info
not-night-but
authored
70e7f2c

Commits on Aug 4, 2026

add helper to return tooltip friendly keybind displays + tests
bnquon
committed
8e76f19
use configured shortcuts in structure view tooltips
bnquon
committed
055fcf0
Merge branch 'master' into fix/display-tooltip-shortcuts-nicely
bnquon
authored
a1a88f0
Merge branch 'master' into fix/sql-export-column-order
bnquon
authored
71f917a
fix(postgres): use pg_proc OID for overloaded routines
AdityaBhosale22
committed
02478ce
fix deleting connections
azmy60
committed
2c75f22
fix invalid parameters on refreshing queries & connections
azmy60
committed
4390c70
fix missing @duplicate and pinned icon in connection list
azmy60
committed
30d5fd1
remove dead code
azmy60
committed
f073240
fix expanded folders stuck empty when their children fail to load
azmy60
committed
644db9b
cleanup
azmy60
committed
9e8ecc5
chore(deps): bump undici from 6.27.0 to 6.28.0
dependabot[bot]
authored
3a10d78
extract folderableActions, share tree actions across all data modules

azmy60
and
claude
committed
c0e54a3
fix all folders are expanded initially for local folders
azmy60
committed
151c86c
fix pin state, search delete target, and carried-over tree expansion

azmy60
and
claude
committed
015b89e
data leak when switching accounts
azmy60
committed
f74f4c9
hide dividers
azmy60
committed
1040c62
personal folder should be first in the list
azmy60
committed
50e40b7
Merge branch 'master' into fix/table-row-delete-key-macos
ylyra
authored
b5e5232
Merge pull request #4555 from cleven12/add-swahili-readme
not-night-but
authored
bbe5165
Merge pull request #4566 from beekeeper-studio/dependabot/npm_and_yarn/undici-6.28.0
not-night-but
authored
22dd21b
chore(deps): bump postcss in /apps/ui-kit/examples/html
dependabot[bot]
authored
f9f8e2d
chore(deps): bump fast-uri from 3.1.4 to 3.1.5
dependabot[bot]
authored
2a50336
Merge pull request #4564 from bnquon/fix/display-tooltip-shortcuts-nicely
not-night-but
authored
59fccc5
Merge pull request #4569 from beekeeper-studio/dependabot/npm_and_yarn/fast-uri-3.1.5
not-night-but
authored
d0459bf
Merge pull request #4568 from beekeeper-studio/dependabot/npm_and_yarn/apps/ui-kit/examples/html/postcss-8.5.25
not-night-but
authored
7ae3f22
Merge branch 'master' into fix/table-row-delete-key-macos
ylyra
authored
9a29d1f
move "Preserve Column Order" into advanced options form
bnquon
committed
7414348
Merge branch 'master' into fix/sql-export-column-order
bnquon
authored
5165881
initial iteration of directory import
not-night-but
committed
cf069ed
move to workspace handlers, ux
not-night-but
committed
eb83deb
fix redaction destroying errors
not-night-but
committed
66c60b1
use <x-progressbar /> for modals
azmy60
committed
6feb2c5

Commits on Aug 5, 2026

fix not being able to create subfolders
azmy60
committed
614af9b
fix missing license check when creating a subfolder
azmy60
committed
748a9d8
folderableStore
azmy60
committed
d681f6a
always place draft folder at the top
azmy60
committed
4e0d8f6
Merge pull request #4551 from AdityaBhosale22/fix/postgres-overloaded-function-create-script
not-night-but
authored
d6e7616
Merge pull request #4560 from bnquon/fix/sql-export-column-order
not-night-but
authored
2a5b05b
local import
not-night-but
committed
7402260
disable sorting for cloud workspaces
azmy60
committed
d19fc50
expand ancestors after all folders are loaded
azmy60
committed
f529574
drop a folder on an item to move it into that item's folder

azmy60
and
claude
committed
1031a28
remove duplicate loadDefaultFolders on tree init

azmy60
and
claude
committed
e3e4a0e
drop a folder beside another folder to join its parent

azmy60
and
claude
committed
87b5de9
confirm before moving a shared item to the personal folder

azmy60
and
claude
committed
a315869
fix non default folders are expanded initially
azmy60
committed
3096310
Update prerequisites for creating a plugin
Lucas-Tolle
authored
9de053d
fix null draft, local workspace searching should match cloud workspace
azmy60
committed
274f828
ngrok for testing
rathboma
committed
7144aab
initial iteration of directory import
not-night-but
committed
c8c98b9
move to workspace handlers, ux
not-night-but
committed
93db1a8
fix redaction destroying errors
not-night-but
committed
a66c9b0
local import
not-night-but
committed
a28e3d0
Merge branch 'feat/directory-import' of github.com:beekeeper-studio/beekeeper-studio into feat/directory-import
not-night-but
committed
c44f86d
tree item list v-tooltip
azmy60
committed
542df9f
fix broken lastUsedWorkspace setting
azmy60
committed
3c56e87

Commits on Aug 6, 2026

Merge pull request #4556 from ylyra/fix/table-row-delete-key-macos
not-night-but
authored
bd7f37d
add an in app folder-picker form component
not-night-but
committed
e171178
add modal detection and slideover for when in modal
not-night-but
committed
6f1ceb4
allow importing to root locally
not-night-but
committed
92ff849
add preserve root checkbox
not-night-but
committed
e3d27af
Merge pull request #4574 from Lucas-Tolle/patch-1
not-night-but
authored
f40aaad
fix stale test
azmy60
committed
f8de1df
Revert "ngrok for testing"
azmy60
committed
5a23478
Merge branch 'master' into feat/sidebar-tree-list
azmy60
committed
ef4d170
Merge branch 'feat/sidebar-tree-list' into feat/directory-import
azmy60
authored
18aa135
fix test
azmy60
committed
cfdf5de
Merge pull request #4578 from beekeeper-studio/feat/tree-item-title
azmy60
authored
5d46495
make recursive import ult only
not-night-but
committed
0b2f0b9
Merge branch 'master' into feat/sidebar-tree-list

azmy60
authored and
not-night-but
committed
5beab33
fix hidden <tree> in MoveFolderModal

azmy60
authored and
not-night-but
committed
c52978e
Merge pull request #4502 from beekeeper-studio/feat/sidebar-tree-list
rathboma
authored
6bd8d03
Merge pull request #4579 from beekeeper-studio/rc-60
rathboma
authored
5476750
docs: mark Snowflake fully supported, add SAP HANA as coming soon
claude
committed
848fb4d
Merge pull request #4581 from beekeeper-studio/claude/update-includes-databases-md-30qhkz
rathboma
authored
55938d3

Commits on Aug 7, 2026

fix: re-fetch table columns on manual table refresh to reflect renames

YuriNachos
and
claude
committed
136f679

Commits on Aug 8, 2026

fix(deps): bump sql-query-identifier to ^3.2.0 for Postgres dollar-quote splitting

YuriNachos
and
claude
committed
67ac971
Enhance setDebugComms documentation
Lucas-Tolle
authored
3fa5cbd
Enhance plugin views documentation with view types reference
Lucas-Tolle
authored
7ff512f

Commits on Aug 9, 2026

Commits on Aug 11, 2026

poll() should call refresh()

azmy60
authored and
not-night-but
committed
3802e11
simplify

azmy60
authored and
not-night-but
committed
c239d1d
unload when collapsing

azmy60
authored and
not-night-but
committed
bdd6139
fix removals

azmy60
authored and
not-night-but
committed
b9944b7
Merge pull request #4599 from ylyra/fix/jump-to-last-page-with-filters
not-night-but
authored
9cf5625
Merge pull request #4584 from beekeeper-studio/fix/poll
azmy60
authored
37057e5
fix quick search connections and queries
azmy60
committed
521d4a6
only poll cloud modules on the screen that shows them

azmy60
and
claude
committed
7c6a26b
wrap poll bodies in a positive condition

azmy60
and
claude
committed
c0801c5
only poll queries when query sidebar is active and not closed
azmy60
committed
f50bcd5
fix saving query payload

not-night-but
authored and
azmy60
committed
fcfc39f
Polling, remote deleted, merging

not-night-but
authored and
azmy60
committed
ee40b41
check if pollInterval is defined before polling again

not-night-but
authored and
azmy60
committed
59aea19
fix tooltip display

not-night-but
authored and
azmy60
committed
2e027b1
fix recursive import to local workspace

not-night-but
authored and
azmy60
committed
283fa83
add "no items" state to the folder
azmy60
committed
6d08cee
skeleton padding
azmy60
committed
a3c5e08
fix new folder cleared by poll
azmy60
committed
e4dc9a7
filtering break when using global state
azmy60
committed
3f33a65
Prevent users from restoring a version when there are pending remote
azmy60
committed
3175cef
fix save query title and folder

not-night-but
authored and
azmy60
committed
c884927
use _.omit instead of _.pick

not-night-but
authored and
azmy60
committed
9eafc56
Fix for being unable to close tabs

rathboma
authored and
azmy60
committed
a34f483
fix import from local modals

not-night-but
authored and
azmy60
committed
857d681
Merge pull request #4609 from beekeeper-studio/fix/import-conn-modal
not-night-but
authored
ea7f2c0
add folder-header slot
azmy60
committed
382d1c5
show error alert instead of "no items"
azmy60
committed
17ca684
bump apps studio version to 6.0.0
azmy60
committed
969b73d
fix(editor): show hours field at exactly one hour in query elapsed timer

YuriNachos
and
claude
committed
69954e4
fix(json-viewer): escape regex metacharacters when locating keys by path

YuriNachos
and
claude
committed
e9f6ad2
chore(deps): bump js-yaml from 3.15.0 to 3.15.1
dependabot[bot]
authored
2097451
fix console.log test
azmy60
committed
0b9331f
fix unit test error
azmy60
committed
60f3607
skip .git folder in import
not-night-but
committed
c2ebe1d
update allowed console logs
not-night-but
committed
afcb387
fix poll error
azmy60
committed
32404be
fix query polling on mount if not active
not-night-but
committed
045cdbc
fix lint
azmy60
committed
b954d0c
Merge pull request #4615 from beekeeper-studio/fix/import-git
not-night-but
authored
21ae34e
Merge pull request #4617 from beekeeper-studio/fix/mounted-query-polling
rathboma
authored
775f43b
Merge pull request #4592 from YuriNachos/YuriNachos/w6-beekeeper-studio
not-night-but
authored
8c683d1
Merge pull request #4614 from beekeeper-studio/dependabot/npm_and_yarn/js-yaml-3.15.1
not-night-but
authored
1d401a8
Merge pull request #4612 from YuriNachos/fix/format-seconds-hour-boundary
not-night-but
authored
98dca0d
Merge pull request #4601 from beekeeper-studio/dependabot/npm_and_yarn/dompurify-3.4.13
not-night-but
authored
ee4104c
chore(deps): bump nanoid from 3.3.12 to 3.3.18
dependabot[bot]
authored
4922869
Merge pull request #4618 from beekeeper-studio/dependabot/npm_and_yarn/nanoid-3.3.18
not-night-but
authored
f137c0a
chore(deps-dev): bump electron from 39.8.5 to 39.8.10
dependabot[bot]
authored
cddcd33
remove close icon and add isPollError to connection sidebar too
azmy60
committed
1874b17
Merge pull request #4610 from beekeeper-studio/fix/show-folder-error
azmy60
authored
53e093d
Merge branch 'master' into rc-60
azmy60
authored
fe3c587
Merge pull request #4613 from YuriNachos/fix/findkeyposition-regex-escape
not-night-but
authored
298f71f
move default to 10s sync
rathboma
committed
15de749
use title instead of v-tooltip to fix tree sidebar causing overflowing
azmy60
committed
0b737c3
Merge pull request #4619 from beekeeper-studio/fix/massive-overflow
not-night-but
authored
508c355
Merge pull request #4580 from beekeeper-studio/dependabot/npm_and_yarn/electron-39.8.10
not-night-but
authored
130a829
Merge branch 'master' into rc-60
not-night-but
committed
d83d861
chore: bump version to 6.0.0-beta.0
not-night-but
committed
af6b272
chore: bump version to 6.0.0
not-night-but
committed
548cbdb

Commits on Aug 12, 2026

fix ssh attempting to parse encrypted default keys
not-night-but
committed
a7e1bc0
fix unit test and add integration test
not-night-but
committed
e7b7a42

Commits on Aug 13, 2026

force folders to be alphabetically sorted
azmy60
committed
8ba53a9
hide share buttons on personal files
azmy60
committed
6f90633
show errors using <alert-error>
azmy60
committed
ddef8ba
use ui kit context menu
azmy60
committed
11305d6
remove dead code
azmy60
committed
f1f7c59
ts check
azmy60
committed
1dbc81c
simplify
azmy60
committed
5879604
Mirror release downloads to R2 and gate all channels on release publish
claude
committed
127d945
add ask ai button
azmy60
committed
64e1256
Rewrite mirror_release_downloads in Node
claude
committed
70ba332
Address review: drop arm32, free disk per asset, resolve latest early
claude
committed
71bdcaa
Post release-publishing status to Slack
claude
committed
a8c4d8f
Merge pull request #4436 from beekeeper-studio/fix/use-ui-kit-context-menu
not-night-but
authored
f84d93f
remove duplicate import for config in utility.ts
not-night-but
committed
fc5f3e0
Merge pull request #4626 from beekeeper-studio/fix/no-sharing-personal-files
not-night-but
authored
3af8460
Merge pull request #4625 from beekeeper-studio/fix/force-tree-order-alphabetically
not-night-but
authored
3a4ffe5
Merge pull request #4628 from beekeeper-studio/feat/ask-ai
not-night-but
authored
be284fc
Merge pull request #4622 from beekeeper-studio/fix/ssh-encrypted-key
not-night-but
authored
696e424
ugrade identifier
not-night-but
committed
3f0f95e
Merge pull request #4629 from beekeeper-studio/claude/beekeeper-downloads-migration-kmon1c
rathboma
authored
2069323
Add per-path checkboxes to release publishing dispatch
claude
committed
e2c8d14
Merge pull request #4635 from beekeeper-studio/claude/beekeeper-downloads-migration-kmon1c
rathboma
authored
4708b56
fix save connection form showing up on new connection screen
not-night-but
committed
1fc3ff1
Merge branch 'rc-60'
not-night-but
committed
fe9087d
ci: never restore node_modules cache in release builds; key caches by runner image
claude
committed
db2f0e1

Commits on Aug 14, 2026

ci: derive cache-key OS segment from the runner image instead of hardcoding
claude
committed
fd8e981
Merge pull request #4638 from beekeeper-studio/claude/v6-ubuntu-22-launch-bvlxcp
rathboma
authored
e82ccf0
ci: never restore node_modules cache in release builds; key caches by runner image
claude
committed
5d8fd95
ci: derive cache-key OS segment from the runner image instead of hardcoding
claude
committed
7d53091
ci: port release-published pipeline to rc-60
claude
committed
8430144
Merge branch 'master' into rc-60
rathboma
authored
9d6f54d
fix pageant on windows
not-night-but
committed
e8f7b77
Merge pull request #4634 from beekeeper-studio/fix/ident-upgrade
azmy60
authored
7b6dda5
Merge pull request #4640 from beekeeper-studio/fix/windows-pageant
not-night-but
authored
b25fbd4
Merge pull request #4636 from beekeeper-studio/fix/save-connection-form
not-night-but
authored
e9c76d2
Merge pull request #4633 from beekeeper-studio/fix/duplicate-util-config
not-night-but
authored
5e32027
use config values instead of old globals
not-night-but
committed
8b91b69
chore: bump version to 6.0.1
not-night-but
committed
6b92be1
fix persistence guard
azmy60
committed
433abb4
Merge pull request #4645 from beekeeper-studio/fix/persistence-not-triggered
rathboma
authored
48e3e09
Merge pull request #4642 from beekeeper-studio/fix/column-width-config
rathboma
authored
30ae378
fix(sidebar): render connections and queries by position again

andreasarf
and
claude
committed
7f2fa29
test(sidebar): cover render order for connections and queries

andreasarf
and
claude
committed
3393d84
Autocomplete defaults overhaul - restoring upper case

claude
authored and
rathboma
committed
f9c0cb7
Merge branch 'master' into autocomplete-revamp
rathboma
authored
21d5f9f
Merge pull request #4647 from andreasarf/fix/sidebar-drag-reorder-overridden-by-sort
not-night-but
authored
2366fd7

Commits on Aug 15, 2026

wrong findOneBy parameter
azmy60
committed
84c3508
regression test
azmy60
committed
b7f880a

Commits on Aug 17, 2026

updates to address feedback
rathboma
committed
8a89863
autocomplete docs
rathboma
committed
9eeef3e
Merge pull request #4648 from beekeeper-studio/autocomplete-revamp
rathboma
authored
4916746
Merge pull request #4651 from beekeeper-studio/fix/tabulator-persistence
not-night-but
authored
334694d
chore: bump version to 6.0.2
rathboma
committed
16443ee
only save persistence data if data has changed
not-night-but
committed
9589813
whoops, missed a ?
not-night-but
committed
b4105db
Merge pull request #4656 from beekeeper-studio/fix/persistence-writing
not-night-but
authored
bf37036
chore: bump version to 6.0.3
rathboma
committed
5caa7e8
Update bundled plugins when the app ships a newer version

azmy60
and
claude
committed
1dde140

Commits on Aug 18, 2026

Commits on Aug 19, 2026

whoops, didn't mean to remove that
not-night-but
committed
8709d33
remove insane test
not-night-but
committed
c941f89
Merge pull request #4664 from beekeeper-studio/fix/manual-commit-typing
rathboma
authored
cc2de82

Commits on Aug 24, 2026

fix(ssh): treat agent errors as non-fatal so publickey auth can proceed

stephaneminisini-fps
authored and
not-night-but
committed
8a0a3f6
chore: bump version to 6.0.5
not-night-but
committed
8daba1f

Commits on Aug 26, 2026

Merge upstream Beekeeper Studio v6.0.5

AustralianRaven
and
claude
committed
de942f0
feat: 🔐 multi-vault secret hierarchy

AustralianRaven
and
claude
committed
73f685b
fix: 🪟 stop the dev launcher killing itself on Windows

AustralianRaven
and
claude
committed
de6047b
fix(#16): 🗄️ populate the SQL Server database dropdown from any context

AustralianRaven
and
claude
committed
67c9e65
fix(#17): 📊 virtualise large result sets in the stacked layout

AustralianRaven
and
claude
committed
b997b45
fix: 🔁 stop splitting SQL Server scripts into separate batches

AustralianRaven
and
claude
committed
9658581
fix(#16): 🗄️ read the SQL Server database list from master

AustralianRaven
and
claude
committed
a65e40b