fix(sidebar): prefer origin remote and deep-merge persisted client settings

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>

Author: tyulyukov

apps/server/src/project/Layers/RepositoryIdentityResolver.test.ts

@@ -97,24 +97,24 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
     }).pipe(Effect.provide(RepositoryIdentityResolverLive)),
   );
 
-  it.effect("prefers upstream over origin when both remotes are configured", () =>
+  it.effect("prefers origin over upstream so forks surface their own name", () =>
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
       const cwd = yield* fileSystem.makeTempDirectoryScoped({
-        prefix: "marcode-repository-identity-upstream-test-",
+        prefix: "marcode-repository-identity-origin-priority-test-",
       });
 
       yield* git(cwd, ["init"]);
-      yield* git(cwd, ["remote", "add", "origin", "git@github.com:julius/marcode.git"]);
+      yield* git(cwd, ["remote", "add", "origin", "git@github.com:tyulyukov/marcode.git"]);
       yield* git(cwd, ["remote", "add", "upstream", "git@github.com:MarCodeHQ/marcode.git"]);
 
       const resolver = yield* RepositoryIdentityResolver;
       const identity = yield* resolver.resolve(cwd);
 
       expect(identity).not.toBeNull();
-      expect(identity?.locator.remoteName).toBe("upstream");
-      expect(identity?.canonicalKey).toBe("github.com/marcodehq/marcode");
-      expect(identity?.displayName).toBe("marcodehq/marcode");
+      expect(identity?.locator.remoteName).toBe("origin");
+      expect(identity?.canonicalKey).toBe("github.com/tyulyukov/marcode");
+      expect(identity?.displayName).toBe("tyulyukov/marcode");
     }).pipe(Effect.provide(RepositoryIdentityResolverLive)),
   );
 

apps/server/src/project/Layers/RepositoryIdentityResolver.ts

@@ -27,7 +27,7 @@ function parseRemoteFetchUrls(stdout: string): Map<string, string> {
 function pickPrimaryRemote(
   remotes: ReadonlyMap<string, string>,
 ): { readonly remoteName: string; readonly remoteUrl: string } | null {
-  for (const preferredRemoteName of ["upstream", "origin"] as const) {
+  for (const preferredRemoteName of ["origin", "upstream"] as const) {
     const remoteUrl = remotes.get(preferredRemoteName);
     if (remoteUrl) {
       return { remoteName: preferredRemoteName, remoteUrl };

apps/web/src/hooks/useSettings.ts

@@ -78,7 +78,9 @@ async function hydrateClientSettings(): Promise<void> {
     try {
       const persistedSettings = await ensureLocalApi().persistence.getClientSettings();
       if (persistedSettings) {
-        replaceClientSettingsSnapshot(persistedSettings);
+        replaceClientSettingsSnapshot(
+          deepMerge(DEFAULT_CLIENT_SETTINGS, persistedSettings) as ClientSettings,
+        );
       }
     } catch (error) {
       console.error(`${CLIENT_SETTINGS_PERSISTENCE_ERROR_SCOPE} hydrate failed`, error);