Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

web/settings: fix source control scan on relay environments (#6230)

Dominic Royda6253b3dd3a
diff --git a/apps/web/src/components/settings/SourceControlSettings.tsx b/apps/web/src/components/settings/SourceControlSettings.tsx
index 10b54f6d7..7cdd697d3 100644
--- a/apps/web/src/components/settings/SourceControlSettings.tsx
+++ b/apps/web/src/components/settings/SourceControlSettings.tsx
@@ -19,7 +19,7 @@ import {
import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
-import { usePrimaryEnvironment } from "../../state/environments";
+import { useEnvironments, usePrimaryEnvironment } from "../../state/environments";
import { useEnvironmentQuery } from "../../state/query";
import { sourceControlEnvironment } from "../../state/sourceControl";
import { Badge } from "../ui/badge";
@@ -508,7 +508,15 @@ function EmptySourceControlDiscovery({
}
export function SourceControlSettingsPanel() {
- const environmentId = usePrimaryEnvironment()?.environmentId ?? null;
+ const { environments } = useEnvironments();
+ const primaryEnvironment = usePrimaryEnvironment();
+ const fallbackEnvironment =
+ environments.find((environment) => environment.connection.phase === "connected") ??
+ environments[0] ??
+ null;
+ const environmentId =
+ primaryEnvironment?.environmentId ?? fallbackEnvironment?.environmentId ?? null;
+ const isPrimaryEnvironment = environmentId === primaryEnvironment?.environmentId;
const discovery = useEnvironmentQuery(
environmentId === null
? null
@@ -561,7 +569,9 @@ export function SourceControlSettingsPanel() {
>
{result.versionControlSystems.map((item) => (
<DiscoveryItemRow key={`vcs:${item.kind}`} item={item}>
- {item.kind === "git" ? <GitFetchIntervalSettings /> : undefined}
+ {item.kind === "git" && isPrimaryEnvironment ? (
+ <GitFetchIntervalSettings />
+ ) : undefined}
</DiscoveryItemRow>
))}
</SettingsSection>
@@ -587,7 +597,7 @@ export function SourceControlSettingsPanel() {
/>
)}
- {environmentId !== null ? <SourceControlWritingSettingsSection /> : null}
+ {isPrimaryEnvironment ? <SourceControlWritingSettingsSection /> : null}
</SettingsPageContainer>
);
}