Skip to content

Commit ffbf2a1

Browse files
committed
Fix unreachable fallback values in resolveServerUrl and stale null cache in RepositoryIdentityResolver
- Remove dead-code fallback arguments in resolveServerUrl since resolvePrimaryEnvironmentBootstrapUrl() already contains a complete fallback chain and always returns a non-empty string. - Skip caching null identity results in RepositoryIdentityResolver so that directories without a git remote are re-resolved on subsequent calls, allowing later-configured remotes to be picked up.
1 parent 9ac4003 commit ffbf2a1

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,14 @@ export const makeRepositoryIdentityResolver = Effect.gen(function* () {
115115
}
116116

117117
const resolved = yield* Effect.promise(() => resolveRepositoryIdentity(cwd));
118-
yield* Ref.update(cacheRef, (current) => {
119-
const next = new Map(current);
120-
next.set(cwd, resolved.identity);
121-
next.set(resolved.cacheKey, resolved.identity);
122-
return next;
123-
});
118+
if (resolved.identity !== null) {
119+
yield* Ref.update(cacheRef, (current) => {
120+
const next = new Map(current);
121+
next.set(cwd, resolved.identity);
122+
next.set(resolved.cacheKey, resolved.identity);
123+
return next;
124+
});
125+
}
124126
return resolved.identity;
125127
});
126128

apps/web/src/lib/utils.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ export const resolveServerUrl = (options?: {
5353
pathname?: string | undefined;
5454
searchParams?: Record<string, string> | undefined;
5555
}): string => {
56-
const rawUrl = firstNonEmptyString(
57-
options?.url,
58-
resolvePrimaryEnvironmentBootstrapUrl(),
59-
import.meta.env.VITE_WS_URL,
60-
window.location.origin,
61-
);
56+
const rawUrl = firstNonEmptyString(options?.url, resolvePrimaryEnvironmentBootstrapUrl());
6257

6358
const parsedUrl = new URL(rawUrl);
6459
if (options?.protocol) {

0 commit comments

Comments
 (0)