feat(sidebar): configurable project grouping (port upstream #2055) - #49
Merged
Merged
Conversation
…ing) Extracts normalizeProjectPathForComparison and path regex helpers from upstream pingdotgg#2024 in isolation, so they're available as a dependency for the configurable project grouping port (pingdotgg#2055). Adds @marcode/shared/path subpath export. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…#2055) Port upstream t3code pingdotgg#2055 (188a40c) to add three sidebar project grouping modes (repository, repository_path, separate) plus per-project overrides via nested context-menu submenus. MarCode reconciliation: - Preserved skeleton loading (SidebarProjectsSkeleton) in Sidebar.tsx - Preserved cross-environment thread fetching via memberProjectRefs - Kept ThreadStatusIndicators import (from pingdotgg#2107 GitLab MR port) - Kept Opus 4.7 default effort = "high" in ClaudeProvider - Kept turn notification wiring, Jira embedded defaults, windowState persistence, custom draft-thread system in ChatView Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
…le settings
readClientSettings() loads client-settings.json as a raw JSON blob without
running the schema decoder, so users with pre-upgrade settings files have no
sidebarProjectGroupingOverrides key. Dereferencing it with bracket access
threw "Cannot read properties of undefined (reading '\${envId}:\${path}')"
and blocked the app from opening.
- resolveProjectGroupingMode: optional-chain the overrides record and fall
back to DEFAULT_SIDEBAR_PROJECT_GROUPING_MODE when the mode itself is
missing
- openProjectGroupingDialog: optional-chain the overrides lookup
- Grouping-rule Select "global default" label falls back to the default
mode when settings.sidebarProjectGroupingMode is missing
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>…ttings Forks with both origin and upstream were surfacing the upstream repo name because pickPrimaryRemote prioritized upstream. Flip the order so a user's own fork wins, making the canonicalKey consistent with their working tree. Client settings hydration replaced the default snapshot with raw persisted JSON, so fields added in later versions (e.g. sidebarProjectGroupingMode) stayed undefined on upgrade. Deep-merge with DEFAULT_CLIENT_SETTINGS so missing keys inherit defaults. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Pre-existing projects never got grouped in the sidebar because getListingSnapshot (the Phase 1 bootstrap used to paint the sidebar) omitted repositoryIdentity. New projects happened to work because project.created events carry the resolved identity, but rows read at startup only had whatever the listing snapshot populated — which was nothing. Mirror the resolver call from getSnapshot so every listed project has identity and logical-project grouping can key off it. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
projectPathsutility module with path normalization helpers (prerequisite)RepositoryIdentityResolverto track git root paths for each projectxhigh→max(SDK compatibility fix)Testing