ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-18 22:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add settingsService integration for feature defaults and improve worktree handling

Browse Source
This commit is contained in:
gsxdsm
2026-03-02 03:28:37 -08:00
parent 34161ccc08
commit 33a2e04bf0
6 changed files with 105 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/ui/src/hooks/use-settings-migration.ts
View File

@@ -833,18 +833,11 @@ export function hydrateStoreFromSettings(settings: GlobalSettings): void {
)
)
: current.agentModelBySession,
// Sanitize currentWorktreeByProject: only restore entries where path is null
// (main branch). Non-null paths point to worktree directories that may have
// been deleted while the app was closed. Restoring a stale path causes the
// board to render an invalid worktree selection, triggering a crash loop
// (error boundary reloads → restores same bad path → crash again).
// The use-worktrees validation effect will re-discover valid worktrees
// from the server once they load.
currentWorktreeByProject: Object.fromEntries(
Object.entries(sanitizeWorktreeByProject(settings.currentWorktreeByProject)).filter(
([, worktree]) => worktree.path === null
)
),
// Restore all valid worktree selections (both main branch and feature worktrees).
// The validation effect in use-worktrees.ts handles deleted worktrees gracefully
// by resetting to main branch when the worktree list loads and the cached
// worktree no longer exists.
currentWorktreeByProject: sanitizeWorktreeByProject(settings.currentWorktreeByProject),
// UI State
worktreePanelCollapsed: settings.worktreePanelCollapsed ?? false,
lastProjectDir: settings.lastProjectDir ?? '',

4
apps/ui/src/hooks/use-settings-sync.ts
View File

@@ -864,8 +864,8 @@ export async function refreshSettingsFromServer(): Promise<boolean> {
)
)
: currentAppState.agentModelBySession,
// Sanitize: only restore entries with path === null (main branch).
// Non-null paths may reference deleted worktrees, causing crash loops.
// Restore all valid worktree selections (both main branch and feature worktrees).
// The validation effect in use-worktrees.ts handles deleted worktrees gracefully.
currentWorktreeByProject: sanitizeWorktreeByProject(
serverSettings.currentWorktreeByProject ?? currentAppState.currentWorktreeByProject
),