merge: resolve v1.23.0 upstream conflicts, preserve custom git provider config

Browse Source

Resolved conflicts in 8 files by taking upstream refactored code:
- desktop.ts: re-export DesktopSettings from registry
- openchamberConfig.ts: simplified project setup client
- persistence.ts: registry-derived settings, add git provider hydration
- search.ts: upstream search entries + git provider entries
- useConfigStore.ts: loadDesktopSettings() path
- settings-helpers.js: add gitProviderId/gitModelId/gitProviders sanitization
- DOCUMENTATION.md: upstream walkthrough docs
- vite.config.ts: upstream SW glob patterns

Custom fork additions preserved:
- gitProviderId, gitModelId, gitProviders fields in settings registry
- Git provider domain store hydration in persistence.ts
- Git provider search entries in search.ts
- Git provider sanitization in settings-helpers.js

...

This commit is contained in:

bot-hermes

2026-09-10 10:11:50 +00:00

parent 23aea36d0e 3c322d4262

commit bf81611bed

559 changed files with 36139 additions and 9087 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

.github/pr-evidence/ui-scale-100.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 38 KiB

.github/pr-evidence/ui-scale-80.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 42 KiB