Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
colonelpanic8 wants to merge 5 commits into from
Closed

Target server settings by environment #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1aaccc6
feat(web): configure providers per environment
colonelpanic8 Jul 26, 2026
2b6ab96
feat(web): select diagnostics environment
colonelpanic8 Jul 24, 2026
f8f630e
fix(web): scope diagnostics panel state to the selected environment
colonelpanic8 Jul 25, 2026
f08526b
fix(web): keep diagnostics refresh disabled while disconnected
colonelpanic8 Jul 25, 2026
bf1d0ee
fix(web): target server settings by environment
colonelpanic8 Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/web/src/components/AppSidebarLayout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
const { toggleSidebar } = useSidebar();
const isSidebarVisible = useSidebarVisibility();
const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down
31 changes: 10 additions & 21 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
lazy,
memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
primaryServerAvailableEditorsAtom,
primaryServerKeybindingsAtom,
primaryServerSettingsAtom,
serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
(store) => store.threadLastVisitedAtById[routeThreadKey],
);
const settings = useEnvironmentSettings(environmentId);
// New-thread defaults live in the primary environment's settings.json (the
// settings UI never writes to remote environments), so read them from the
// primary server rather than the thread's environment.
const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
const setStickyComposerModelSelection = useComposerDraftStore(
(store) => store.setStickyModelSelection,
);
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
selectedProvider: selectedProviderByThreadId,
threadProvider,
});
// Once a thread selects an environment, never substitute the primary
// environment's config while the selected environment is still loading.
const serverConfig = activeThread
? (activeEnvironment?.serverConfig ?? null)
: (primaryEnvironment?.serverConfig ?? null);
// Once a thread or draft selects an environment, never substitute another
// environment's config while the selected one is still loading.
const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
const versionMismatchDismissKey =
versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
input: { cwd: gitStatusCwd },
}),
);
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
const availableEditors = serverConfig?.availableEditors ?? [];
// Prefer an instance-id match so a custom Codex instance (e.g.
// `codex_personal`) surfaces its own status/message in the banner rather
// than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
? (draftThread?.startFromOrigin ?? false)
: canOverrideServerThreadEnvMode
? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
: false;
const sendEnvMode = resolveSendEnvMode({
requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
envMode: mode,
startFromOrigin: resolveNewDraftStartFromOrigin({
envMode: mode,
newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
}),
...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
});
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
composerDraftTarget,
draftThread?.worktreePath,
isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
setPendingServerThreadEnvMode,
scheduleComposerFocus,
setDraftThreadContext,
Expand Down
11 changes: 6 additions & 5 deletions apps/web/src/components/CommandPalette.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
type KeyboardEvent,
type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
const composerHandleRef = useRef<ChatComposerHandle | null>(null);
const routeTarget = useParams({
strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
const projects = useProjects();
const projectOrder = useUiStateStore((store) => store.projectOrder);
const threads = useThreadShells();
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const providers = useAtomValue(primaryServerProvidersAtom);
const defaultServerConfig = useDefaultServerConfig();
const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
const providers = defaultServerConfig?.providers ?? [];
const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
const currentView = viewStack.at(-1) ?? null;
const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down
22 changes: 13 additions & 9 deletions apps/web/src/components/ProviderUpdatePrimaryNotification.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
type ProviderDriverKind,
type ProviderInstanceId,
type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
*/
export function ProviderUpdatePrimaryNotification() {
const navigate = useNavigate();
const providers = useAtomValue(primaryServerProvidersAtom);
const primaryEnvironment = usePrimaryEnvironment();
const defaultEnvironmentId = useDefaultEnvironmentId();
const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
reportFailure: false,
});
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
};

const runUpdates = () => {
if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
return;
}
updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
for (const provider of oneClickProviders) {
results.push(
await updateProvider({
environmentId: primaryEnvironment.environmentId,
environmentId: defaultEnvironmentId,
input: {
provider: provider.driver,
instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
notificationKey,
oneClickProviders,
openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
updateProviders,
]);

Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
derivePhysicalProjectKey,
deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
: false,
);
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
const openAddProjectCommandPalette = useCallback(
() => openCommandPalette({ open: "add-project" }),
[],
Expand Down
6 changes: 2 additions & 4 deletions apps/web/src/components/SidebarStageBackdrop.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
const primaryServerVersion =
useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

return resolveSidebarStageBackdropVariant(
resolveServerBackedAppStageLabel({
Expand Down
10 changes: 6 additions & 4 deletions apps/web/src/components/SidebarV2.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
const threads = useThreadShells();
const router = useRouter();
const { isMobile, setOpenMobile } = useSidebar();
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
const defaultServerConfig = useDefaultServerConfig();
const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
() => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
[sidebarProjectSortOrder, threads, unsortedProjectGroups],
);
const serverProviders = useAtomValue(primaryServerProvidersAtom);
const serverProviders = defaultServerConfig?.providers ?? [];
const providerEntryByInstanceId = useMemo(
() =>
new Map(
Expand Down
25 changes: 16 additions & 9 deletions apps/web/src/components/settings/AddProviderInstanceDialog.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
type EnvironmentId,
ProviderInstanceId,
ProviderDriverKind,
type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
readonly open: boolean;
readonly environmentId: EnvironmentId;
readonly environmentLabel: string;
readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
const settings = usePrimarySettings();
const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
open,
environmentId,
environmentLabel,
onOpenChange,
}: AddProviderInstanceDialogProps) {
const settings = useEnvironmentSettings(environmentId);
const updateSettings = useUpdateEnvironmentSettings(environmentId);

const [wizardStep, setWizardStep] = useState(0);
const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
toastManager.add({
type: "success",
title: "Provider instance added",
description: `${driverOption.label} instance '${instanceId}' was added.`,
description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
});
onOpenChange(false);
} catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
<DialogHeader>
<DialogTitle>Add provider instance</DialogTitle>
<DialogDescription>
Configure an additional provider instance — for example, a second Codex install
pointed at a different workspace.
Configure an additional provider instance on {environmentLabel}.
</DialogDescription>
<AddProviderInstanceWizardSteps
currentStep={wizardStep}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Target server settings by environment#1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

colonelpanic8
wants to merge
5
commits into

from

 Closed


Target server settings by environment
#1
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1aaccc6

feat(web): configure providers per environment


colonelpanic8 Jul 26, 2026
2b6ab96

feat(web): select diagnostics environment


colonelpanic8 Jul 24, 2026
f8f630e

fix(web): scope diagnostics panel state to the selected environment


colonelpanic8 Jul 25, 2026
f08526b

fix(web): keep diagnostics refresh disabled while disconnected


colonelpanic8 Jul 25, 2026
bf1d0ee

fix(web): target server settings by environment


colonelpanic8 Jul 26, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
apps/web/src/components/AppSidebarLayout.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { useAtomValue } from "@effect/atom-react";
import * as Schema from "effect/Schema";
import { useEffect, useState, type CSSProperties, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";
Expand All@@ -7,7 +6,8 @@ import { isElectron } from "../env";
import { getLocalStorageItem } from "../hooks/useLocalStorage";
import { resolveShortcutCommand, shortcutLabelForCommand } from "../keybindings";
import { cn, isMacPlatform } from "../lib/utils";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useClientSettings } from "../hooks/useSettings";
import ThreadSidebar from "./Sidebar";
import ThreadSidebarV2 from "./SidebarV2";
Expand DownExpand Up@@ -44,7 +44,7 @@ function readInitialThreadSidebarWidth(): number {
}

function SidebarControl() {
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const { toggleSidebar } = useSidebar();
 const isSidebarVisible = useSidebarVisibility();
 const stageBackdropVariant = useSidebarStageBackdropVariant();
Expand Down

31 changes: 10 additions & 21 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/proje
import { truncate } from "@t3tools/shared/String";
import { nextTerminalId, resolveTerminalSessionLabel } from "@t3tools/shared/terminalLabels";
import { Debouncer } from "@tanstack/react-pacer";
import { useAtomValue } from "@effect/atom-react";
import {
 lazy,
 memo,
Expand DownExpand Up@@ -195,12 +194,8 @@ import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../termina
import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
import { projectEnvironment } from "../state/projects";
import { useEnvironmentQuery } from "../state/query";
import {
 primaryServerAvailableEditorsAtom,
 primaryServerKeybindingsAtom,
 primaryServerSettingsAtom,
 serverEnvironment,
} from "../state/server";
import { serverEnvironment } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { terminalEnvironment } from "../state/terminal";
import { threadEnvironment } from "../state/threads";
import { vcsEnvironment } from "../state/vcs";
Expand DownExpand Up@@ -1179,10 +1174,6 @@ function ChatViewContent(props: ChatViewProps) {
 (store) => store.threadLastVisitedAtById[routeThreadKey],
 );
 const settings = useEnvironmentSettings(environmentId);
 // New-thread defaults live in the primary environment's settings.json (the
 // settings UI never writes to remote environments), so read them from the
 // primary server rather than the thread's environment.
 const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
 const setStickyComposerModelSelection = useComposerDraftStore(
 (store) => store.setStickyModelSelection,
 );
Expand DownExpand Up@@ -1804,11 +1795,9 @@ function ChatViewContent(props: ChatViewProps) {
 selectedProvider: selectedProviderByThreadId,
 threadProvider,
 });
 // Once a thread selects an environment, never substitute the primary
 // environment's config while the selected environment is still loading.
 const serverConfig = activeThread
 ? (activeEnvironment?.serverConfig ?? null)
 : (primaryEnvironment?.serverConfig ?? null);
 // Once a thread or draft selects an environment, never substitute another
 // environment's config while the selected one is still loading.
 const serverConfig = environmentById.get(environmentId)?.serverConfig ?? null;
 const versionMismatch = resolveServerConfigVersionMismatch(serverConfig);
 const versionMismatchDismissKey =
 versionMismatch && activeThread
Expand DownExpand Up@@ -2330,8 +2319,8 @@ function ChatViewContent(props: ChatViewProps) {
 input: { cwd: gitStatusCwd },
 }),
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const availableEditors = useAtomValue(primaryServerAvailableEditorsAtom);
 const keybindings = serverConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const availableEditors = serverConfig?.availableEditors ?? [];
 // Prefer an instance-id match so a custom Codex instance (e.g.
 // `codex_personal`) surfaces its own status/message in the banner rather
 // than the default Codex's. Falls back to first-match-by-kind when no
Expand DownExpand Up@@ -3816,7 +3805,7 @@ function ChatViewContent(props: ChatViewProps) {
 ? (draftThread?.startFromOrigin ?? false)
 : canOverrideServerThreadEnvMode
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
settings.newWorktreesStartFromOrigin)
 : false;
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
Expand DownExpand Up@@ -5441,7 +5430,7 @@ function ChatViewContent(props: ChatViewProps) {
 envMode: mode,
 startFromOrigin: resolveNewDraftStartFromOrigin({
 envMode: mode,
 newWorktreesStartFromOrigin: primaryServerSettings.newWorktreesStartFromOrigin,
 newWorktreesStartFromOrigin: settings.newWorktreesStartFromOrigin,
 }),
 ...(mode === "worktree" && draftThread?.worktreePath ? { worktreePath: null } : {}),
 });
Expand All@@ -5453,7 +5442,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerDraftTarget,
 draftThread?.worktreePath,
 isLocalDraftThread,
primaryServerSettings.newWorktreesStartFromOrigin,
settings.newWorktreesStartFromOrigin,
 setPendingServerThreadEnvMode,
 scheduleComposerFocus,
 setDraftThreadContext,
Expand Down

11 changes: 6 additions & 5 deletions
apps/web/src/components/CommandPalette.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,6 @@ import {
 type KeyboardEvent,
 type ReactNode,
} from "react";
import { useAtomValue } from "@effect/atom-react";

import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
import { useDesktopLocalBootstraps } from "../connection/useDesktopLocalBootstraps";
Expand DownExpand Up@@ -113,7 +112,8 @@ import { CommandPaletteResults } from "./CommandPaletteResults";
import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons";
import { ProjectFavicon } from "./ProjectFavicon";
import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
import { primaryServerKeybindingsAtom, primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { resolveDefaultProviderModelSelection } from "../providerInstances";
import { resolveShortcutCommand, threadJumpIndexFromCommand } from "../keybindings";
import {
Expand DownExpand Up@@ -390,7 +390,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
 const openAddProject = useCallback(() => dispatch({ _tag: "OpenAddProject" }), []);
 const openNewThreadIn = useCallback(() => dispatch({ _tag: "OpenNewThreadIn" }), []);
 const clearOpenIntent = useCallback(() => dispatch({ _tag: "ClearOpenIntent" }), []);
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const composerHandleRef = useRef<ChatComposerHandle | null>(null);
 const routeTarget = useParams({
 strict: false,
Expand DownExpand Up@@ -502,8 +502,9 @@ function OpenCommandPaletteDialog(props: {
 const projects = useProjects();
 const projectOrder = useUiStateStore((store) => store.projectOrder);
 const threads = useThreadShells();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const providers = useAtomValue(primaryServerProvidersAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const providers = defaultServerConfig?.providers ?? [];
 const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
 const currentView = viewStack.at(-1) ?? null;
 const [browseGeneration, setBrowseGeneration] = useState(0);
Expand Down

22 changes: 13 additions & 9 deletions
apps/web/src/components/ProviderUpdatePrimaryNotification.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
import { useNavigate } from "@tanstack/react-router";
import { useAtomValue } from "@effect/atom-react";
import { DownloadIcon } from "lucide-react";
import { useCallback, useEffect, useMemo, useRef } from "react";
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import {
 type ProviderDriverKind,
 type ProviderInstanceId,
 type ServerProvider,
} from "@t3tools/contracts";

import { primaryServerProvidersAtom, serverEnvironment } from "../state/server";
import { usePrimaryEnvironment } from "../state/environments";
import { serverEnvironment } from "../state/server";
import { useDefaultEnvironmentId, useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { useDismissedProviderUpdateNotificationKeys } from "../providerUpdateDismissal";
import { PROVIDER_ICON_BY_PROVIDER } from "./chat/providerIconUtils";
import {
Expand All@@ -24,6 +27,7 @@ import { stackedThreadToast, toastManager } from "./ui/toast";
import { useAtomCommand } from "../state/use-atom-command";

const seenProviderUpdateNotificationKeys = new Set<string>();
const EMPTY_SERVER_PROVIDERS: ReadonlyArray<ServerProvider> = [];
type ProviderUpdateToastId = ReturnType<typeof toastManager.add>;

type ActiveProviderUpdateToast =
Expand DownExpand Up@@ -108,8 +112,8 @@ function isTerminalProviderUpdateToastView(view: ProviderUpdateToastView) {
 */
export function ProviderUpdatePrimaryNotification() {
 const navigate = useNavigate();
 const providers = useAtomValue(primaryServerProvidersAtom);
 const primaryEnvironment = usePrimaryEnvironment();
 const defaultEnvironmentId = useDefaultEnvironmentId();
 const providers = useDefaultServerConfig()?.providers ?? EMPTY_SERVER_PROVIDERS;
 const updateProvider = useAtomCommand(serverEnvironment.updateProvider, {
 reportFailure: false,
 });
Expand DownExpand Up@@ -208,7 +212,7 @@ export function ProviderUpdatePrimaryNotification() {
 };

 const runUpdates = () => {
 if (updateStarted || oneClickProviders.length === 0 || !primaryEnvironment) {
 if (updateStarted || oneClickProviders.length === 0 || defaultEnvironmentId === null) {
 return;
 }
 updateStarted = true;
Expand All@@ -234,7 +238,7 @@ export function ProviderUpdatePrimaryNotification() {
 for (const provider of oneClickProviders) {
 results.push(
 await updateProvider({
 environmentId: primaryEnvironment.environmentId,
 environmentId: defaultEnvironmentId,
 input: {
 provider: provider.driver,
 instanceId: provider.instanceId,
Expand DownExpand Up@@ -323,7 +327,7 @@ export function ProviderUpdatePrimaryNotification() {
 notificationKey,
 oneClickProviders,
 openProviderSettings,
primaryEnvironment,
defaultEnvironmentId,
 updateProviders,
 ]);

Expand Down

6 changes: 3 additions & 3 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,6 @@ import {
 ThreadWorktreeIndicator,
} from "./ThreadStatusIndicators";
import { ProjectFavicon } from "./ProjectFavicon";
import { useAtomValue } from "@effect/atom-react";
import { autoAnimate } from "@formkit/auto-animate";
import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
import { useShallow } from "zustand/react/shallow";
Expand DownExpand Up@@ -198,7 +197,8 @@ import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useIsMobile } from "~/hooks/useMediaQuery";
import { CommandDialogTrigger } from "./ui/command";
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
import { primaryServerKeybindingsAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
Expand DownExpand Up@@ -3025,7 +3025,7 @@ export default function Sidebar() {
 ? selectThreadTerminalUiState(state.terminalUiStateByThreadKey, routeThreadRef).terminalOpen
 : false,
 );
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const keybindings = useDefaultServerConfig()?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const openAddProjectCommandPalette = useCallback(
 () => openCommandPalette({ open: "add-project" }),
 [],
Expand Down

6 changes: 2 additions & 4 deletions
apps/web/src/components/SidebarStageBackdrop.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
import { useAtomValue } from "@effect/atom-react";
import { useId } from "react";

import { APP_STAGE_LABEL } from "../branding";
import { resolveServerBackedAppStageLabel } from "../branding.logic";
import { primaryServerConfigAtom } from "../state/server";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";

export type SidebarStageBackdropVariant = "nightly" | "dev";

Expand All@@ -21,8 +20,7 @@ export function resolveSidebarStageBackdropVariant(
}

export function useSidebarStageBackdropVariant(): SidebarStageBackdropVariant | null {
 const primaryServerVersion =
 useAtomValue(primaryServerConfigAtom)?.environment.serverVersion ?? null;
 const primaryServerVersion = useDefaultServerConfig()?.environment.serverVersion ?? null;

 return resolveSidebarStageBackdropVariant(
 resolveServerBackedAppStageLabel({
Expand Down

10 changes: 6 additions & 4 deletions
apps/web/src/components/SidebarV2.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ import { useNowMinute } from "../hooks/useNowMinute";
import { useEnvironmentPresenceScope, useEnvironments } from "../state/environments";
import { isRemoteEnvironmentId, type EnvironmentPresenceScope } from "../environmentPresence";
import { useProjects, useThreadShells } from "../state/entities";
import { environmentServerConfigsAtom, primaryServerKeybindingsAtom } from "../state/server";
import { environmentServerConfigsAtom } from "../state/server";
import { vcsEnvironment } from "../state/vcs";
import { threadEnvironment } from "../state/threads";
import { projectEnvironment } from "../state/projects";
Expand DownExpand Up@@ -132,7 +132,8 @@ import { ProjectFavicon } from "./ProjectFavicon";
import { ProviderInstanceIcon } from "./chat/ProviderInstanceIcon";
import { getTriggerDisplayModelLabel } from "./chat/providerIconUtils";
import { deriveProviderInstanceEntries, type ProviderInstanceEntry } from "../providerInstances";
import { primaryServerProvidersAtom } from "../state/server";
import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
import { useDefaultServerConfig } from "../hooks/useDefaultServerConfig";
import { stackedThreadToast, toastManager } from "./ui/toast";
import { CommandDialogTrigger } from "./ui/command";
import { Button } from "./ui/button";
Expand DownExpand Up@@ -1001,7 +1002,8 @@ export default function SidebarV2() {
 const threads = useThreadShells();
 const router = useRouter();
 const { isMobile, setOpenMobile } = useSidebar();
 const keybindings = useAtomValue(primaryServerKeybindingsAtom);
 const defaultServerConfig = useDefaultServerConfig();
 const keybindings = defaultServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
 const autoSettleAfterDays = useClientSettings((s) => s.sidebarAutoSettleAfterDays);
 const confirmThreadDelete = useClientSettings((s) => s.confirmThreadDelete);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
Expand DownExpand Up@@ -1110,7 +1112,7 @@ export default function SidebarV2() {
 () => sortLogicalProjectsForSidebar(unsortedProjectGroups, threads, sidebarProjectSortOrder),
 [sidebarProjectSortOrder, threads, unsortedProjectGroups],
 );
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const serverProviders = defaultServerConfig?.providers ?? [];
 const providerEntryByInstanceId = useMemo(
 () =>
 new Map(
Expand Down

25 changes: 16 additions & 9 deletions
apps/web/src/components/settings/AddProviderInstanceDialog.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ import { Radio as RadioPrimitive } from "@base-ui/react/radio";
import { CheckIcon } from "lucide-react";
import { useMemo, useState } from "react";
import {
 type EnvironmentId,
 ProviderInstanceId,
 ProviderDriverKind,
 type ProviderInstanceConfig,
} from "@t3tools/contracts";

import { usePrimarySettings, useUpdatePrimarySettings } from "../../hooks/useSettings";
import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hooks/useSettings";
import { cn } from "../../lib/utils";
import { normalizeProviderAccentColor } from "../../providerInstances";
import { Button } from "../ui/button";
Expand DownExpand Up@@ -115,13 +116,20 @@ function validateInstanceId(id: string, existing: ReadonlySet<string>): string |
}

interface AddProviderInstanceDialogProps {
 open: boolean;
 onOpenChange: (open: boolean) => void;
 readonly open: boolean;
 readonly environmentId: EnvironmentId;
 readonly environmentLabel: string;
 readonly onOpenChange: (open: boolean) => void;
}

export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderInstanceDialogProps) {
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
export function AddProviderInstanceDialog({
 open,
 environmentId,
 environmentLabel,
 onOpenChange,
}: AddProviderInstanceDialogProps) {
 const settings = useEnvironmentSettings(environmentId);
 const updateSettings = useUpdateEnvironmentSettings(environmentId);

 const [wizardStep, setWizardStep] = useState(0);
 const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
Expand DownExpand Up@@ -208,7 +216,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 toastManager.add({
 type: "success",
 title: "Provider instance added",
 description: `${driverOption.label} instance '${instanceId}' was added.`,
 description: `${driverOption.label} instance '${instanceId}' was added to ${environmentLabel}.`,
 });
 onOpenChange(false);
 } catch (error) {
Expand All@@ -227,8 +235,7 @@ export function AddProviderInstanceDialog({ open, onOpenChange }: AddProviderIns
 <DialogHeader>
 <DialogTitle>Add provider instance</DialogTitle>
 <DialogDescription>
 Configure an additional provider instance — for example, a second Codex install
 pointed at a different workspace.
 Configure an additional provider instance on {environmentLabel}.
 </DialogDescription>
 <AddProviderInstanceWizardSteps
 currentStep={wizardStep}
Expand Down
Loading
Loading