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
@@ -1,41 +1,101 @@
|
||||
import AsyncStorage from "@react-native-async-storage/async-storage";
|
||||
import { create } from "zustand";
|
||||
import { createJSONStorage, persist } from "zustand/middleware";
|
||||
import { createJSONStorage, persist, type StateStorage } from "zustand/middleware";
|
||||
|
||||
export type SidebarGroupMode = "project" | "status";
|
||||
|
||||
const SIDEBAR_VIEW_STORAGE_KEY = "sidebar-view";
|
||||
const LEGACY_SIDEBAR_GROUP_MODE_STORAGE_KEY = "sidebar-group-mode";
|
||||
const SIDEBAR_VIEW_STORE_VERSION = 1;
|
||||
|
||||
interface SidebarViewStoreState {
|
||||
groupModeByServerId: Record<string, SidebarGroupMode>;
|
||||
getGroupMode: (serverId: string) => SidebarGroupMode;
|
||||
setGroupMode: (serverId: string, mode: SidebarGroupMode) => void;
|
||||
groupMode: SidebarGroupMode;
|
||||
hostFilter: string | null;
|
||||
setGroupMode: (mode: SidebarGroupMode) => void;
|
||||
setHostFilter: (serverId: string | null) => void;
|
||||
reconcileHostFilter: (serverIds: readonly string[]) => void;
|
||||
}
|
||||
|
||||
interface SidebarViewPersistedState {
|
||||
groupMode: SidebarGroupMode;
|
||||
hostFilter: string | null;
|
||||
}
|
||||
|
||||
function isSidebarGroupMode(value: unknown): value is SidebarGroupMode {
|
||||
return value === "project" || value === "status";
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === "object" && value !== null && !Array.isArray(value);
|
||||
}
|
||||
|
||||
function readLegacyGroupMode(persistedState: Record<string, unknown>): SidebarGroupMode | null {
|
||||
const groupModeByServerId = persistedState.groupModeByServerId;
|
||||
if (!isRecord(groupModeByServerId)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const modes = Object.values(groupModeByServerId).filter(isSidebarGroupMode);
|
||||
if (modes.length === 0) return null;
|
||||
return modes.includes("status") ? "status" : "project";
|
||||
}
|
||||
|
||||
export function migrateSidebarViewState(persistedState: unknown): SidebarViewPersistedState {
|
||||
if (!isRecord(persistedState)) {
|
||||
return { groupMode: "project", hostFilter: null };
|
||||
}
|
||||
|
||||
const legacyGroupMode = readLegacyGroupMode(persistedState);
|
||||
if (legacyGroupMode) {
|
||||
return { groupMode: legacyGroupMode, hostFilter: null };
|
||||
}
|
||||
|
||||
return {
|
||||
groupMode: isSidebarGroupMode(persistedState.groupMode) ? persistedState.groupMode : "project",
|
||||
hostFilter: typeof persistedState.hostFilter === "string" ? persistedState.hostFilter : null,
|
||||
};
|
||||
}
|
||||
|
||||
export function createSidebarViewStorage(
|
||||
backingStorage: StateStorage = AsyncStorage,
|
||||
): StateStorage {
|
||||
return {
|
||||
getItem: async (name) => {
|
||||
const value = await backingStorage.getItem(name);
|
||||
if (value !== null || name !== SIDEBAR_VIEW_STORAGE_KEY) {
|
||||
return value;
|
||||
}
|
||||
return backingStorage.getItem(LEGACY_SIDEBAR_GROUP_MODE_STORAGE_KEY);
|
||||
},
|
||||
setItem: (name, value) => backingStorage.setItem(name, value),
|
||||
removeItem: (name) => backingStorage.removeItem(name),
|
||||
};
|
||||
}
|
||||
|
||||
export const useSidebarViewStore = create<SidebarViewStoreState>()(
|
||||
persist(
|
||||
(set, get) => ({
|
||||
groupModeByServerId: {},
|
||||
getGroupMode: (serverId) => {
|
||||
const key = serverId.trim();
|
||||
if (!key) return "project";
|
||||
return get().groupModeByServerId[key] ?? "project";
|
||||
},
|
||||
setGroupMode: (serverId, mode) => {
|
||||
const key = serverId.trim();
|
||||
if (!key) return;
|
||||
set((state) => ({
|
||||
groupModeByServerId: {
|
||||
...state.groupModeByServerId,
|
||||
[key]: mode,
|
||||
},
|
||||
}));
|
||||
},
|
||||
(set) => ({
|
||||
groupMode: "project",
|
||||
hostFilter: null,
|
||||
setGroupMode: (mode) => set({ groupMode: mode }),
|
||||
setHostFilter: (serverId) => set({ hostFilter: serverId }),
|
||||
reconcileHostFilter: (serverIds) =>
|
||||
set((state) => {
|
||||
if (!state.hostFilter || serverIds.includes(state.hostFilter)) {
|
||||
return state;
|
||||
}
|
||||
return { hostFilter: null };
|
||||
}),
|
||||
}),
|
||||
{
|
||||
name: "sidebar-group-mode",
|
||||
storage: createJSONStorage(() => AsyncStorage),
|
||||
name: SIDEBAR_VIEW_STORAGE_KEY,
|
||||
version: SIDEBAR_VIEW_STORE_VERSION,
|
||||
storage: createJSONStorage(createSidebarViewStorage),
|
||||
partialize: (state) => ({
|
||||
groupModeByServerId: state.groupModeByServerId,
|
||||
groupMode: state.groupMode,
|
||||
hostFilter: state.hostFilter,
|
||||
}),
|
||||
migrate: migrateSidebarViewState,
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user