[codex] Move project grouping to General settings#4313

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

Merged
juliusmarminge merged 3 commits into from
Jul 23, 2026
Merged

[codex] Move project grouping to General settings #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d5988e
move project grouping to general settings
juliusmarminge Jul 22, 2026
05cde4d
persist the last enabled grouping mode
juliusmarminge Jul 22, 2026
dfd23a5
restore grouping mode across cold loads
juliusmarminge Jul 22, 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
50 changes: 1 addition & 49 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
Menu,
MenuGroup,
MenuPopup,
MenuRadioGroup,
MenuRadioItem,
MenuSeparator,
MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
NumberField,
NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
projectSortOrder,
threadSortOrder,
projectGroupingMode,
threadPreviewCount,
onProjectSortOrderChange,
onThreadSortOrderChange,
onProjectGroupingModeChange,
onThreadPreviewCountChange,
}: {
projectSortOrder: SidebarProjectSortOrder;
threadSortOrder: SidebarThreadSortOrder;
projectGroupingMode: SidebarProjectGroupingMode;
threadPreviewCount: SidebarThreadPreviewCount;
onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
</NumberField>
</div>
</MenuGroup>
<MenuSeparator />
<MenuGroup>
<div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
Group projects
</div>
<MenuRadioGroup
value={projectGroupingMode}
onValueChange={(value) => {
if (value === "repository" || value === "repository_path" || value === "separate") {
onProjectGroupingModeChange(value);
}
}}
>
{(
Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
[SidebarProjectGroupingMode, string]
>
).map(([value, label]) => (
<MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
{label}
</MenuRadioItem>
))}
</MenuRadioGroup>
</MenuGroup>
</MenuPopup>
</Menu>
);
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
handleDesktopUpdateButtonClick: () => void;
projectSortOrder: SidebarProjectSortOrder;
threadSortOrder: SidebarThreadSortOrder;
projectGroupingMode: SidebarProjectGroupingMode;
threadPreviewCount: SidebarThreadPreviewCount;
updateSettings: ReturnType<typeof useUpdateClientSettings>;
openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
handleDesktopUpdateButtonClick,
projectSortOrder,
threadSortOrder,
projectGroupingMode,
threadPreviewCount,
updateSettings,
openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
},
[updateSettings],
);
const handleProjectGroupingModeChange = useCallback(
(groupingMode: SidebarProjectGroupingMode) => {
updateSettings({ sidebarProjectGroupingMode: groupingMode });
},
[updateSettings],
);
const handleThreadPreviewCountChange = useCallback(
(count: SidebarThreadPreviewCount) => {
updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
<ProjectSortMenu
projectSortOrder={projectSortOrder}
threadSortOrder={threadSortOrder}
projectGroupingMode={projectGroupingMode}
threadPreviewCount={threadPreviewCount}
onProjectSortOrderChange={handleProjectSortOrderChange}
onThreadSortOrderChange={handleThreadSortOrderChange}
onProjectGroupingModeChange={handleProjectGroupingModeChange}
onThreadPreviewCountChange={handleThreadPreviewCountChange}
/>
<Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
const isOnSettings = pathname.startsWith("/settings");
const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
projectSortOrder={sidebarProjectSortOrder}
threadSortOrder={sidebarThreadSortOrder}
projectGroupingMode={sidebarProjectGroupingMode}
threadPreviewCount={sidebarThreadPreviewCount}
updateSettings={updateSettings}
openAddProject={openAddProjectCommandPalette}
Expand Down
17 changes: 17 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.logic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
buildProviderInstanceUpdatePatch,
formatDiagnosticsDescription,
isProjectGroupingEnabled,
projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
it("enables repository grouping and disables into separate projects", () => {
expect(isProjectGroupingEnabled("repository")).toBe(true);
expect(isProjectGroupingEnabled("repository_path")).toBe(true);
expect(isProjectGroupingEnabled("separate")).toBe(false);
expect(projectGroupingModeFromToggle(true)).toBe("repository");
expect(projectGroupingModeFromToggle(false)).toBe("separate");
});

it("restores repository path grouping when the toggle is cycled", () => {
expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
});
});

describe("formatDiagnosticsDescription", () => {
it("collapses trace and metric URLs that share the same OTEL base path", () => {
expect(
Expand Down
34 changes: 34 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.logic.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
ProviderInstanceConfig,
ProviderInstanceId,
ServerSettings,
SidebarProjectGroupingMode,
UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
return mode !== "separate";
}

export function projectGroupingModeFromToggle(
enabled: boolean,
lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
if (!enabled) return "separate";
return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
try {
return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
? "repository_path"
: "repository";
} catch {
return "repository";
}
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
if (mode === "separate") return;
try {
localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
} catch {
// Storage can be unavailable in restricted browser contexts.
}
}

function collapseOtelSignalsUrl(input: {
readonly tracesUrl: string;
readonly metricsUrl: string;
Expand Down
50 changes: 50 additions & 0 deletions apps/web/src/components/settings/SettingsPanels.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
type ProviderInstanceConfig,
type ProviderInstanceId,
type ScopedThreadRef,
type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
buildProviderInstanceUpdatePatch,
formatDiagnosticsDescription,
isProjectGroupingEnabled,
projectGroupingModeFromToggle,
readLastEnabledProjectGroupingMode,
rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
? ["Visible threads"]
: []),
...(settings.sidebarProjectGroupingMode !==
DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
? ["Project Grouping"]
: []),
...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
settings.automaticGitFetchInterval,
settings.enableAssistantStreaming,
settings.enableProviderUpdateChecks,
settings.sidebarProjectGroupingMode,
settings.sidebarThreadPreviewCount,
settings.timestampFormat,
settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
const { theme, setTheme } = useTheme();
const settings = usePrimarySettings();
const updateSettings = useUpdatePrimarySettings();
const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
readLastEnabledProjectGroupingMode(),
);
const observability = useAtomValue(primaryServerObservabilityAtom);
const serverProviders = useAtomValue(primaryServerProvidersAtom);
const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
}
/>

<SettingsRow
title="Project Grouping"
description="Combine matching repositories across environments."
resetAction={
settings.sidebarProjectGroupingMode !==
DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
<SettingResetButton
label="project grouping"
onClick={() =>
updateSettings({
sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
})
}
/>
) : null
}
control={
<Switch
checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
onCheckedChange={(checked) => {
if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
}
updateSettings({
sidebarProjectGroupingMode: projectGroupingModeFromToggle(
checked,
lastEnabledProjectGroupingMode.current,
),
});
}}
aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.
/>
Comment thread
juliusmarminge marked this conversation as resolved.
}
/>

<SettingsRow
title="Time format"
description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
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
[codex] Move project grouping to General settings#4313

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

 Merged

juliusmarminge
merged 3 commits into

from

Jul 23, 2026
 Merged


[codex] Move project grouping to General settings
#4313
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0d5988e

move project grouping to general settings


juliusmarminge Jul 22, 2026
05cde4d

persist the last enabled grouping mode


juliusmarminge Jul 22, 2026
dfd23a5

restore grouping mode across cold loads


juliusmarminge Jul 22, 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


50 changes: 1 addition & 49 deletions
apps/web/src/components/Sidebar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,15 +145,7 @@ import {
 DialogTitle,
} from "./ui/dialog";
import { Input } from "./ui/input";
import {
 Menu,
 MenuGroup,
 MenuPopup,
 MenuRadioGroup,
 MenuRadioItem,
 MenuSeparator,
 MenuTrigger,
} from "./ui/menu";
import { Menu, MenuGroup, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "./ui/menu";
import {
 NumberField,
 NumberFieldDecrement,
Expand DownExpand Up@@ -2601,20 +2593,16 @@ type SortableProjectHandleProps = Pick<
function ProjectSortMenu({
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 onProjectSortOrderChange,
 onThreadSortOrderChange,
 onProjectGroupingModeChange,
 onThreadPreviewCountChange,
}: {
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 onProjectSortOrderChange: (sortOrder: SidebarProjectSortOrder) => void;
 onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
 onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
 onThreadPreviewCountChange: (count: SidebarThreadPreviewCount) => void;
}) {
 const handleThreadPreviewCountChange = useCallback(
Expand DownExpand Up@@ -2718,30 +2706,6 @@ function ProjectSortMenu({
 </NumberField>
 </div>
 </MenuGroup>
 <MenuSeparator />
 <MenuGroup>
 <div className="px-2 pt-2 pb-1 font-medium text-muted-foreground sm:text-xs">
 Group projects
 </div>
 <MenuRadioGroup
 value={projectGroupingMode}
 onValueChange={(value) => {
 if (value === "repository" || value === "repository_path" || value === "separate") {
 onProjectGroupingModeChange(value);
 }
 }}
 >
 {(
 Object.entries(PROJECT_GROUPING_MODE_LABELS) as Array<
 [SidebarProjectGroupingMode, string]
 >
 ).map(([value, label]) => (
 <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
 {label}
 </MenuRadioItem>
 ))}
 </MenuRadioGroup>
 </MenuGroup>
 </MenuPopup>
 </Menu>
 );
Expand DownExpand Up@@ -2792,7 +2756,6 @@ interface SidebarProjectsContentProps {
 handleDesktopUpdateButtonClick: () => void;
 projectSortOrder: SidebarProjectSortOrder;
 threadSortOrder: SidebarThreadSortOrder;
 projectGroupingMode: SidebarProjectGroupingMode;
 threadPreviewCount: SidebarThreadPreviewCount;
 updateSettings: ReturnType<typeof useUpdateClientSettings>;
 openAddProject: () => void;
Expand DownExpand Up@@ -2833,7 +2796,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 handleDesktopUpdateButtonClick,
 projectSortOrder,
 threadSortOrder,
 projectGroupingMode,
 threadPreviewCount,
 updateSettings,
 openAddProject,
Expand DownExpand Up@@ -2875,12 +2837,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 },
 [updateSettings],
 );
 const handleProjectGroupingModeChange = useCallback(
 (groupingMode: SidebarProjectGroupingMode) => {
 updateSettings({ sidebarProjectGroupingMode: groupingMode });
 },
 [updateSettings],
 );
 const handleThreadPreviewCountChange = useCallback(
 (count: SidebarThreadPreviewCount) => {
 updateSettings({ sidebarThreadPreviewCount: count });
Expand DownExpand Up@@ -2944,11 +2900,9 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 <ProjectSortMenu
 projectSortOrder={projectSortOrder}
 threadSortOrder={threadSortOrder}
 projectGroupingMode={projectGroupingMode}
 threadPreviewCount={threadPreviewCount}
 onProjectSortOrderChange={handleProjectSortOrderChange}
 onThreadSortOrderChange={handleThreadSortOrderChange}
 onProjectGroupingModeChange={handleProjectGroupingModeChange}
 onThreadPreviewCountChange={handleThreadPreviewCountChange}
 />
 <Tooltip>
Expand DownExpand Up@@ -3064,7 +3018,6 @@ export default function Sidebar() {
 const isOnSettings = pathname.startsWith("/settings");
 const sidebarThreadSortOrder = useClientSettings((s) => s.sidebarThreadSortOrder);
 const sidebarProjectSortOrder = useClientSettings((s) => s.sidebarProjectSortOrder);
 const sidebarProjectGroupingMode = useClientSettings((s) => s.sidebarProjectGroupingMode);
 const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
 const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
 const updateSettings = useUpdateClientSettings();
Expand DownExpand Up@@ -3674,7 +3627,6 @@ export default function Sidebar() {
 handleDesktopUpdateButtonClick={handleDesktopUpdateButtonClick}
 projectSortOrder={sidebarProjectSortOrder}
 threadSortOrder={sidebarThreadSortOrder}
 projectGroupingMode={sidebarProjectGroupingMode}
 threadPreviewCount={sidebarThreadPreviewCount}
 updateSettings={updateSettings}
 openAddProject={openAddProjectCommandPalette}
Expand Down

17 changes: 17 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,25 @@ import { describe, expect, it } from "vite-plus/test";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
} from "./SettingsPanels.logic";

describe("project grouping toggle", () => {
 it("enables repository grouping and disables into separate projects", () => {
 expect(isProjectGroupingEnabled("repository")).toBe(true);
 expect(isProjectGroupingEnabled("repository_path")).toBe(true);
 expect(isProjectGroupingEnabled("separate")).toBe(false);
 expect(projectGroupingModeFromToggle(true)).toBe("repository");
 expect(projectGroupingModeFromToggle(false)).toBe("separate");
 });

 it("restores repository path grouping when the toggle is cycled", () => {
 expect(projectGroupingModeFromToggle(false, "repository_path")).toBe("separate");
 expect(projectGroupingModeFromToggle(true, "repository_path")).toBe("repository_path");
 });
});

describe("formatDiagnosticsDescription", () => {
 it("collapses trace and metric URLs that share the same OTEL base path", () => {
 expect(
Expand Down

34 changes: 34 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,10 +3,44 @@ import type {
 ProviderInstanceConfig,
 ProviderInstanceId,
 ServerSettings,
 SidebarProjectGroupingMode,
 UnifiedSettings,
} from "@t3tools/contracts";
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";

export function isProjectGroupingEnabled(mode: SidebarProjectGroupingMode): boolean {
 return mode !== "separate";
}

export function projectGroupingModeFromToggle(
 enabled: boolean,
 lastEnabledMode: SidebarProjectGroupingMode = "repository",
): SidebarProjectGroupingMode {
 if (!enabled) return "separate";
 return lastEnabledMode === "repository_path" ? "repository_path" : "repository";
}

const LAST_ENABLED_PROJECT_GROUPING_MODE_KEY = "t3code:last-enabled-project-grouping-mode";

export function readLastEnabledProjectGroupingMode(): SidebarProjectGroupingMode {
 try {
 return localStorage.getItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY) === "repository_path"
 ? "repository_path"
 : "repository";
 } catch {
 return "repository";
 }
}

export function rememberEnabledProjectGroupingMode(mode: SidebarProjectGroupingMode): void {
 if (mode === "separate") return;
 try {
 localStorage.setItem(LAST_ENABLED_PROJECT_GROUPING_MODE_KEY, mode);
 } catch {
 // Storage can be unavailable in restricted browser contexts.
 }
}

function collapseOtelSignalsUrl(input: {
 readonly tracesUrl: string;
 readonly metricsUrl: string;
Expand Down

50 changes: 50 additions & 0 deletions
apps/web/src/components/settings/SettingsPanels.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import {
 type ProviderInstanceConfig,
 type ProviderInstanceId,
 type ScopedThreadRef,
 type SidebarProjectGroupingMode,
} from "@t3tools/contracts";
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
Expand DownExpand Up@@ -83,6 +84,10 @@ import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
import {
 buildProviderInstanceUpdatePatch,
 formatDiagnosticsDescription,
 isProjectGroupingEnabled,
 projectGroupingModeFromToggle,
 readLastEnabledProjectGroupingMode,
 rememberEnabledProjectGroupingMode,
} from "./SettingsPanels.logic";
import {
 SettingResetButton,
Expand DownExpand Up@@ -401,6 +406,10 @@ export function useSettingsRestore(onRestored?: () => void) {
 ...(settings.sidebarThreadPreviewCount !== DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount
 ? ["Visible threads"]
 : []),
 ...(settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode
 ? ["Project Grouping"]
 : []),
 ...(settings.wordWrap !== DEFAULT_UNIFIED_SETTINGS.wordWrap ? ["Word wrap"] : []),
 ...(settings.diffIgnoreWhitespace !== DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace
 ? ["Diff whitespace changes"]
Expand DownExpand Up@@ -450,6 +459,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 settings.automaticGitFetchInterval,
 settings.enableAssistantStreaming,
 settings.enableProviderUpdateChecks,
 settings.sidebarProjectGroupingMode,
 settings.sidebarThreadPreviewCount,
 settings.timestampFormat,
 settings.wordWrap,
Expand All@@ -474,6 +484,7 @@ export function useSettingsRestore(onRestored?: () => void) {
 diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace,
 glassOpacity: DEFAULT_UNIFIED_SETTINGS.glassOpacity,
 sidebarThreadPreviewCount: DEFAULT_UNIFIED_SETTINGS.sidebarThreadPreviewCount,
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 autoOpenPlanSidebar: DEFAULT_UNIFIED_SETTINGS.autoOpenPlanSidebar,
 enableAssistantStreaming: DEFAULT_UNIFIED_SETTINGS.enableAssistantStreaming,
 enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
Expand All@@ -498,6 +509,9 @@ export function GeneralSettingsPanel() {
 const { theme, setTheme } = useTheme();
 const settings = usePrimarySettings();
 const updateSettings = useUpdatePrimarySettings();
 const lastEnabledProjectGroupingMode = useRef<SidebarProjectGroupingMode>(
 readLastEnabledProjectGroupingMode(),
 );
 const observability = useAtomValue(primaryServerObservabilityAtom);
 const serverProviders = useAtomValue(primaryServerProvidersAtom);
 const glassOpacityRatio =
Expand DownExpand Up@@ -619,6 +633,42 @@ export function GeneralSettingsPanel() {
 }
 />

 <SettingsRow
 title="Project Grouping"
 description="Combine matching repositories across environments."
 resetAction={
 settings.sidebarProjectGroupingMode !==
 DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode ? (
 <SettingResetButton
 label="project grouping"
 onClick={() =>
 updateSettings({
 sidebarProjectGroupingMode: DEFAULT_UNIFIED_SETTINGS.sidebarProjectGroupingMode,
 })
 }
 />
 ) : null
 }
 control={
 <Switch
 checked={isProjectGroupingEnabled(settings.sidebarProjectGroupingMode)}
 onCheckedChange={(checked) => {
 if (!checked && settings.sidebarProjectGroupingMode !== "separate") {
 lastEnabledProjectGroupingMode.current = settings.sidebarProjectGroupingMode;
 rememberEnabledProjectGroupingMode(settings.sidebarProjectGroupingMode);
 }
 updateSettings({
 sidebarProjectGroupingMode: projectGroupingModeFromToggle(
 checked,
 lastEnabledProjectGroupingMode.current,
 ),
 });
 }}
 aria-label="Project Grouping"
Comment thread
cursor[bot] marked this conversation as resolved.

 />
Comment thread
juliusmarminge marked this conversation as resolved.

 }
 />

 <SettingsRow
 title="Time format"
 description="System default follows your browser or OS clock preference."
Expand Down
Loading