Merge sidebar workspaces across all connected hosts (#1538)
* Merge workspaces across all hosts in the sidebar Replace per-host sidebar sections with a single merged project list. Projects that exist on multiple hosts (matched by projectKey) are collapsed into one row. Host identity is surfaced via: - A status-only footer pill showing online/offline host counts - Hover cards with a mandatory host row on every workspace entry - Subtitles showing the host name when a project spans >1 host - A host filter in the grouping dropdown (not a sidebar switcher) Order and group-mode stores migrated from per-server to global keys with zustand persist migrations. New-workspace screen now shows a merged project list with a host selector combobox. Key files: - workspace-structure.ts: merge algorithm by projectKey - sidebar-view-store.ts / sidebar-order-store.ts: global state - sidebar-workspace-list.tsx: context-based subtitle injection - new-workspace-screen.tsx: host selector in footer row * Add host filtering to the merged sidebar The sidebar now merges workspaces from every connected host, so a single global "active host" no longer fits. Host selection becomes explicit per action via a host chooser, and agent history pages across all hosts at once. Removes the active-host / active-server-id model and the all-agents-list hook that fed it. * Fix rebase fallout: translate archive host error, update stale workspace-key test archiveWorkspacesOptimistically used a raw "Host is not connected" string that the i18n completeness test forbids; route it through i18n.t with the existing hostDisconnected key. The selectors memoization test asserted un-prefixed workspace keys, but merged-sidebar keys are serverId-prefixed. * Fix sidebar review fallout * Address sidebar review followups * Fix sidebar workspace identity migration * Address sidebar review followups * Handle partial host history failures * Fix merged sidebar project removal and E2E drift * Restore history routes and project removal shape * Remove sidebar host context plumbing * Tighten sidebar status and host filter state * Keep new workspace project selection host-compatible * Migrate sidebar view storage * Streamline host selection flows * Update all-host history on archive * Fix empty project sidebar action Code regression: the main merge dropped the empty-project New workspace child row while keeping the empty project persistence contract. Restore the row using the project host target so the sidebar stays aligned with the no-host-selection model. * Fix Japanese shortcut translation key Stale-base integration: main added the Japanese locale after this branch added cycleAgentMode to the English shortcut help map. Merging main exposed the missing ja key in CI typecheck and resources.test. * Fix Playwright speech teardown race
This commit is contained in:
Mohamed Boudra
@@ -3,12 +3,24 @@ import { create } from "zustand";
|
||||
import { createJSONStorage, persist } from "zustand/middleware";
|
||||
|
||||
interface SidebarOrderStoreState {
|
||||
projectOrderByServerId: Record<string, string[]>;
|
||||
workspaceOrderByServerAndProject: Record<string, string[]>;
|
||||
getProjectOrder: (serverId: string) => string[];
|
||||
setProjectOrder: (serverId: string, keys: string[]) => void;
|
||||
getWorkspaceOrder: (serverId: string, projectKey: string) => string[];
|
||||
setWorkspaceOrder: (serverId: string, projectKey: string, keys: string[]) => void;
|
||||
projectOrder: string[];
|
||||
workspaceOrderByProject: Record<string, string[]>;
|
||||
getProjectOrder: () => string[];
|
||||
setProjectOrder: (keys: string[]) => void;
|
||||
getWorkspaceOrder: (projectKey: string) => string[];
|
||||
setWorkspaceOrder: (projectKey: string, keys: string[]) => void;
|
||||
}
|
||||
|
||||
interface SidebarOrderPersistedState {
|
||||
projectOrder?: string[];
|
||||
workspaceOrderByProject?: Record<string, string[]>;
|
||||
projectOrderByServerId?: Record<string, string[]>;
|
||||
workspaceOrderByServerAndProject?: Record<string, string[]>;
|
||||
}
|
||||
|
||||
interface SidebarWorkspaceOrderScope {
|
||||
serverId: string;
|
||||
projectKey: string;
|
||||
}
|
||||
|
||||
function normalizeKeys(keys: string[]): string[] {
|
||||
@@ -27,56 +39,96 @@ function normalizeKeys(keys: string[]): string[] {
|
||||
return normalized;
|
||||
}
|
||||
|
||||
function buildWorkspaceScopeKey(serverId: string, projectKey: string): string {
|
||||
return `${serverId.trim()}::${projectKey.trim()}`;
|
||||
function normalizeWorkspaceOrderByProject(
|
||||
workspaceOrderByProject: Record<string, string[]> | undefined,
|
||||
): Record<string, string[]> {
|
||||
const normalized: Record<string, string[]> = {};
|
||||
for (const [projectKey, order] of Object.entries(workspaceOrderByProject ?? {})) {
|
||||
const scope = projectKey.trim();
|
||||
if (!scope) continue;
|
||||
normalized[scope] = normalizeKeys(order);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
function extractWorkspaceOrderScope(scopeKey: string): SidebarWorkspaceOrderScope | null {
|
||||
const separatorIndex = scopeKey.indexOf("::");
|
||||
if (separatorIndex < 0) return null;
|
||||
const serverId = scopeKey.slice(0, separatorIndex).trim();
|
||||
const projectKey = scopeKey.slice(separatorIndex + 2).trim();
|
||||
if (!serverId || !projectKey) return null;
|
||||
return { serverId, projectKey };
|
||||
}
|
||||
|
||||
function normalizeLegacyWorkspaceKey(serverId: string, rawWorkspaceKey: string): string | null {
|
||||
const workspaceKey = rawWorkspaceKey.trim();
|
||||
if (!workspaceKey) return null;
|
||||
const serverPrefix = `${serverId}:`;
|
||||
return workspaceKey.startsWith(serverPrefix) ? workspaceKey : `${serverPrefix}${workspaceKey}`;
|
||||
}
|
||||
|
||||
export function migrateSidebarOrderState(persistedState: unknown): {
|
||||
projectOrder: string[];
|
||||
workspaceOrderByProject: Record<string, string[]>;
|
||||
} {
|
||||
const state = persistedState as SidebarOrderPersistedState | undefined;
|
||||
|
||||
if (!state) {
|
||||
return { projectOrder: [], workspaceOrderByProject: {} };
|
||||
}
|
||||
|
||||
const projectOrder = normalizeKeys(state.projectOrder ?? []);
|
||||
const seenProjects = new Set(projectOrder);
|
||||
for (const keys of Object.values(state.projectOrderByServerId ?? {})) {
|
||||
for (const key of normalizeKeys(keys)) {
|
||||
if (seenProjects.has(key)) continue;
|
||||
seenProjects.add(key);
|
||||
projectOrder.push(key);
|
||||
}
|
||||
}
|
||||
|
||||
const workspaceOrderByProject = normalizeWorkspaceOrderByProject(state.workspaceOrderByProject);
|
||||
for (const [scopeKey, order] of Object.entries(state.workspaceOrderByServerAndProject ?? {})) {
|
||||
const scope = extractWorkspaceOrderScope(scopeKey);
|
||||
if (!scope) continue;
|
||||
const existing = workspaceOrderByProject[scope.projectKey] ?? [];
|
||||
const merged = [...existing];
|
||||
const seen = new Set(merged);
|
||||
for (const key of order) {
|
||||
const workspaceKey = normalizeLegacyWorkspaceKey(scope.serverId, key);
|
||||
if (!workspaceKey || seen.has(workspaceKey)) continue;
|
||||
seen.add(workspaceKey);
|
||||
merged.push(workspaceKey);
|
||||
}
|
||||
workspaceOrderByProject[scope.projectKey] = merged;
|
||||
}
|
||||
|
||||
return { projectOrder, workspaceOrderByProject };
|
||||
}
|
||||
|
||||
export const useSidebarOrderStore = create<SidebarOrderStoreState>()(
|
||||
persist(
|
||||
(set, get) => ({
|
||||
projectOrderByServerId: {},
|
||||
workspaceOrderByServerAndProject: {},
|
||||
getProjectOrder: (serverId) => {
|
||||
const key = serverId.trim();
|
||||
if (!key) {
|
||||
return [];
|
||||
}
|
||||
return get().projectOrderByServerId[key] ?? [];
|
||||
projectOrder: [],
|
||||
workspaceOrderByProject: {},
|
||||
getProjectOrder: () => get().projectOrder,
|
||||
setProjectOrder: (keys) => {
|
||||
const normalized = normalizeKeys(keys);
|
||||
set({ projectOrder: normalized });
|
||||
},
|
||||
setProjectOrder: (serverId, keys) => {
|
||||
const key = serverId.trim();
|
||||
if (!key) {
|
||||
return;
|
||||
}
|
||||
getWorkspaceOrder: (projectKey) => {
|
||||
const scope = projectKey.trim();
|
||||
if (!scope) return [];
|
||||
return get().workspaceOrderByProject[scope] ?? [];
|
||||
},
|
||||
setWorkspaceOrder: (projectKey, keys) => {
|
||||
const scope = projectKey.trim();
|
||||
if (!scope) return;
|
||||
const normalized = normalizeKeys(keys);
|
||||
set((state) => ({
|
||||
projectOrderByServerId: {
|
||||
...state.projectOrderByServerId,
|
||||
[key]: normalized,
|
||||
},
|
||||
}));
|
||||
},
|
||||
getWorkspaceOrder: (serverId, projectKey) => {
|
||||
const serverKey = serverId.trim();
|
||||
const projectScope = projectKey.trim();
|
||||
if (!serverKey || !projectScope) {
|
||||
return [];
|
||||
}
|
||||
const scopeKey = buildWorkspaceScopeKey(serverKey, projectScope);
|
||||
return get().workspaceOrderByServerAndProject[scopeKey] ?? [];
|
||||
},
|
||||
setWorkspaceOrder: (serverId, projectKey, keys) => {
|
||||
const serverKey = serverId.trim();
|
||||
const projectScope = projectKey.trim();
|
||||
if (!serverKey || !projectScope) {
|
||||
return;
|
||||
}
|
||||
const scopeKey = buildWorkspaceScopeKey(serverKey, projectScope);
|
||||
const normalized = normalizeKeys(keys);
|
||||
set((state) => ({
|
||||
workspaceOrderByServerAndProject: {
|
||||
...state.workspaceOrderByServerAndProject,
|
||||
[scopeKey]: normalized,
|
||||
workspaceOrderByProject: {
|
||||
...state.workspaceOrderByProject,
|
||||
[scope]: normalized,
|
||||
},
|
||||
}));
|
||||
},
|
||||
@@ -85,9 +137,11 @@ export const useSidebarOrderStore = create<SidebarOrderStoreState>()(
|
||||
name: "sidebar-project-workspace-order",
|
||||
storage: createJSONStorage(() => AsyncStorage),
|
||||
partialize: (state) => ({
|
||||
projectOrderByServerId: state.projectOrderByServerId,
|
||||
workspaceOrderByServerAndProject: state.workspaceOrderByServerAndProject,
|
||||
projectOrder: state.projectOrder,
|
||||
workspaceOrderByProject: state.workspaceOrderByProject,
|
||||
}),
|
||||
version: 1,
|
||||
migrate: migrateSidebarOrderState,
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user