fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into from
Apr 20, 2026
Merged

fix(web): restore manual sort drag and keep per-group expand state #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76ba94d
fix(web): restore manual sort drag and keep per-group expand state
mwolson Apr 20, 2026
f166d1a
fix(web): preserve project expand state when logical key changes
mwolson Apr 20, 2026
803cf3a
fix(web): preserve all-collapsed project state across restart
mwolson Apr 20, 2026
cbf3423
test(web): add round-trip tests for project expand-state persistence
mwolson Apr 20, 2026
fb544d9
test(web): cover persisted order and cross-restart logical-key migration
mwolson Apr 20, 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
36 changes: 36 additions & 0 deletions apps/web/src/components/Sidebar.logic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
ProjectId.make("project-1"),
]);
});

it("honors projectOrder physical keys via getProjectOrderKey", async () => {
// Regression guard for #1904 / the regression introduced by #2055:
// `projectOrder` is populated with physical keys (envId + cwd-derived)
// by the store and by drag-end handlers. Readers must identify projects
// with the same key format, or manual sort silently snaps back.
const { getProjectOrderKey } = await import("../logicalProject");
const projects = [
{
environmentId: EnvironmentId.make("environment-local"),
id: ProjectId.make("id-alpha"),
cwd: "/work/alpha",
},
{
environmentId: EnvironmentId.make("environment-local"),
id: ProjectId.make("id-beta"),
cwd: "/work/beta",
},
{
environmentId: EnvironmentId.make("environment-local"),
id: ProjectId.make("id-gamma"),
cwd: "/work/gamma",
},
];
const ordered = orderItemsByPreferredIds({
items: projects,
preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
getId: getProjectOrderKey,
});

expect(ordered.map((project) => project.cwd)).toEqual([
"/work/gamma",
"/work/alpha",
"/work/beta",
]);
});
});

describe("resolveAdjacentThreadId", () => {
Expand Down
8 changes: 6 additions & 2 deletions apps/web/src/components/Sidebar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
derivePhysicalProjectKey,
deriveProjectGroupingOverrideKey,
getProjectOrderKey,
} from "../logicalProject";
import {
useSavedEnvironmentRegistryStore,
useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
return orderItemsByPreferredIds({
items: projects,
preferredIds: projectOrder,
getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
getId: getProjectOrderKey,
});
}, [projectOrder, projects]);

Expand Down
10 changes: 9 additions & 1 deletion apps/web/src/environments/runtime/service.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
deriveLogicalProjectKeyFromSettings,
derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
const projects = selectProjectsAcrossEnvironments(useStore.getState());
const clientSettings = getClientSettings();
useUiStateStore.getState().syncProjects(
projects.map((project) => ({
key: derivePhysicalProjectKey(project),
logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
cwd: project.cwd,
})),
);
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
if (needsProjectUiSync) {
const projects = selectProjectsAcrossEnvironments(useStore.getState());
const clientSettings = getClientSettings();
useUiStateStore.getState().syncProjects(
projects.map((project) => ({
key: derivePhysicalProjectKey(project),
logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
cwd: project.cwd,
})),
);
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/hooks/useHandleNewThread.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
return orderItemsByPreferredIds({
items: projects,
preferredIds: projectOrder,
getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
getId: getProjectOrderKey,
});
}, [projectOrder, projects]);
const handleNewThread = useNewThreadState();
Expand Down
9 changes: 9 additions & 0 deletions apps/web/src/hooks/useSettings.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
* only re-render when the slice they care about changes.
*/

/**
* Non-hook accessor for the current merged client settings snapshot.
* Used by non-React code paths (e.g. runtime services) that need the latest
* settings without subscribing.
*/
export function getClientSettings(): ClientSettings {
return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
const serverSettings = useServerSettings();
const clientSettings = useSyncExternalStore(
Expand Down
7 changes: 7 additions & 0 deletions apps/web/src/logicalProject.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
project: Pick<Project, "environmentId" | "cwd">,
settings: ProjectGroupingSettings,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading

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

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading

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

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading

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

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading

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

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading

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

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading

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

Skip to content
fix(web): restore manual sort drag and keep per-group expand state#2221

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 5 commits into

from

Apr 20, 2026
 Merged


fix(web): restore manual sort drag and keep per-group expand state
#2221
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
76ba94d

fix(web): restore manual sort drag and keep per-group expand state


mwolson Apr 20, 2026
f166d1a

fix(web): preserve project expand state when logical key changes


mwolson Apr 20, 2026
803cf3a

fix(web): preserve all-collapsed project state across restart


mwolson Apr 20, 2026
cbf3423

test(web): add round-trip tests for project expand-state persistence


mwolson Apr 20, 2026
fb544d9

test(web): cover persisted order and cross-restart logical-key migration


mwolson Apr 20, 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


36 changes: 36 additions & 0 deletions
apps/web/src/components/Sidebar.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -309,6 +309,42 @@ describe("orderItemsByPreferredIds", () => {
 ProjectId.make("project-1"),
 ]);
 });

 it("honors projectOrder physical keys via getProjectOrderKey", async () => {
 // Regression guard for #1904 / the regression introduced by #2055:
 // `projectOrder` is populated with physical keys (envId + cwd-derived)
 // by the store and by drag-end handlers. Readers must identify projects
 // with the same key format, or manual sort silently snaps back.
 const { getProjectOrderKey } = await import("../logicalProject");
 const projects = [
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-alpha"),
 cwd: "/work/alpha",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-beta"),
 cwd: "/work/beta",
 },
 {
 environmentId: EnvironmentId.make("environment-local"),
 id: ProjectId.make("id-gamma"),
 cwd: "/work/gamma",
 },
 ];
 const ordered = orderItemsByPreferredIds({
 items: projects,
 preferredIds: [getProjectOrderKey(projects[2]!), getProjectOrderKey(projects[0]!)],
 getId: getProjectOrderKey,
 });

 expect(ordered.map((project) => project.cwd)).toEqual([
 "/work/gamma",
 "/work/alpha",
 "/work/beta",
 ]);
 });
});

describe("resolveAdjacentThreadId", () => {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,11 @@ import { CommandDialogTrigger } from "./ui/command";
import { readEnvironmentApi } from "../environmentApi";
import { useSettings, useUpdateSettings } from "~/hooks/useSettings";
import { useServerKeybindings } from "../rpc/serverState";
import { derivePhysicalProjectKey, deriveProjectGroupingOverrideKey } from "../logicalProject";
import {
 derivePhysicalProjectKey,
 deriveProjectGroupingOverrideKey,
 getProjectOrderKey,
} from "../logicalProject";
import {
 useSavedEnvironmentRegistryStore,
 useSavedEnvironmentRuntimeStore,
Expand DownExpand Up@@ -2708,7 +2712,7 @@ export default function Sidebar() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);

Expand Down

10 changes: 9 additions & 1 deletion
apps/web/src/environments/runtime/service.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,7 +61,11 @@ import { useTerminalStateStore } from "~/terminalStateStore";
import { useUiStateStore } from "~/uiStateStore";
import { WsTransport } from "../../rpc/wsTransport";
import { createWsRpcClient, type WsRpcClient } from "../../rpc/wsRpcClient";
import { derivePhysicalProjectKey } from "../../logicalProject";
import {
 deriveLogicalProjectKeyFromSettings,
 derivePhysicalProjectKey,
} from "../../logicalProject";
import { getClientSettings } from "~/hooks/useSettings";

type EnvironmentServiceState = {
 readonly queryClient: QueryClient;
Expand DownExpand Up@@ -468,9 +472,11 @@ function coalesceOrchestrationUiEvents(

function syncProjectUiFromStore() {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand DownExpand Up@@ -541,9 +547,11 @@ function applyRecoveredEventBatch(
 useStore.getState().applyOrchestrationEvents(uiEvents, environmentId);
 if (needsProjectUiSync) {
 const projects = selectProjectsAcrossEnvironments(useStore.getState());
 const clientSettings = getClientSettings();
 useUiStateStore.getState().syncProjects(
 projects.map((project) => ({
 key: derivePhysicalProjectKey(project),
 logicalKey: deriveLogicalProjectKeyFromSettings(project, clientSettings),
 cwd: project.cwd,
 })),
 );
Expand Down

4 changes: 2 additions & 2 deletions
apps/web/src/hooks/useHandleNewThread.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import {
} from "../composerDraftStore";
import { newDraftId, newThreadId } from "../lib/utils";
import { orderItemsByPreferredIds } from "../components/Sidebar.logic";
import { deriveLogicalProjectKeyFromSettings } from "../logicalProject";
import { deriveLogicalProjectKeyFromSettings, getProjectOrderKey } from "../logicalProject";
import { selectProjectsAcrossEnvironments, useStore } from "../store";
import { createThreadSelectorByRef } from "../storeSelectors";
import { resolveThreadRouteTarget } from "../threadRoutes";
Expand DownExpand Up@@ -169,7 +169,7 @@ export function useHandleNewThread() {
 return orderItemsByPreferredIds({
 items: projects,
 preferredIds: projectOrder,
 getId: (project) => scopedProjectKey(scopeProjectRef(project.environmentId, project.id)),
 getId: getProjectOrderKey,
 });
 }, [projectOrder, projects]);
 const handleNewThread = useNewThreadState();
Expand Down

9 changes: 9 additions & 0 deletions
apps/web/src/hooks/useSettings.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -123,6 +123,15 @@ function splitPatch(patch: Partial<UnifiedSettings>): {
 * only re-render when the slice they care about changes.
 */

/**
 * Non-hook accessor for the current merged client settings snapshot.
 * Used by non-React code paths (e.g. runtime services) that need the latest
 * settings without subscribing.
 */
export function getClientSettings(): ClientSettings {
 return getClientSettingsSnapshot();
}

export function useSettings<T = UnifiedSettings>(selector?: (s: UnifiedSettings) => T): T {
 const serverSettings = useServerSettings();
 const clientSettings = useSyncExternalStore(
Expand Down

7 changes: 7 additions & 0 deletions
apps/web/src/logicalProject.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,6 +65,13 @@ export function deriveProjectGroupingOverrideKey(
 return derivePhysicalProjectKey(project);
}

// Key under which a project's manual sort order (projectOrder) is stored.
// Must stay aligned with the writer side in `uiStateStore.syncProjects` and
// the drag handlers in `Sidebar` so readers and writers agree.
export function getProjectOrderKey(project: Pick<Project, "environmentId" | "cwd">): string {
 return derivePhysicalProjectKey(project);
}

export function resolveProjectGroupingMode(
 project: Pick<Project, "environmentId" | "cwd">,
 settings: ProjectGroupingSettings,
Expand Down
Loading
Loading