* 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
113 lines
3.8 KiB
TypeScript
113 lines
3.8 KiB
TypeScript
import AsyncStorage from "@react-native-async-storage/async-storage";
|
|
import { router, useLocalSearchParams, usePathname, type Href } from "expo-router";
|
|
import { useEffect, useSyncExternalStore } from "react";
|
|
import {
|
|
createLastWorkspaceSelectionStore,
|
|
type ActiveWorkspaceSelection,
|
|
type LastWorkspaceSelectionStorage,
|
|
} from "@/stores/last-workspace-selection";
|
|
import {
|
|
navigateToLastWorkspace as navigateToLastWorkspacePure,
|
|
navigateToWorkspace as navigateToWorkspacePure,
|
|
parseActiveWorkspaceSelection,
|
|
type NavigateToWorkspaceDeps,
|
|
} from "./navigation";
|
|
import { useSessionStore } from "@/stores/session-store";
|
|
import { useWorkspaceLayoutStore } from "@/stores/workspace-layout-store";
|
|
import { stripHostWorkspaceRouteEchoSearchFromBrowserUrlAfterCommit } from "@/utils/host-route-browser";
|
|
|
|
export type { ActiveWorkspaceSelection } from "@/stores/last-workspace-selection";
|
|
|
|
interface NavigateToWorkspaceOptions {
|
|
currentPathname?: string | null;
|
|
}
|
|
|
|
const LAST_WORKSPACE_SELECTION_STORAGE_KEY = "paseo:last-workspace-route-selection";
|
|
|
|
const lastWorkspaceSelectionStorage: LastWorkspaceSelectionStorage = {
|
|
read: () => AsyncStorage.getItem(LAST_WORKSPACE_SELECTION_STORAGE_KEY),
|
|
write: (value) => AsyncStorage.setItem(LAST_WORKSPACE_SELECTION_STORAGE_KEY, value),
|
|
};
|
|
|
|
const lastWorkspaceSelectionStore = createLastWorkspaceSelectionStore(
|
|
lastWorkspaceSelectionStorage,
|
|
);
|
|
|
|
function navigateDeps(): NavigateToWorkspaceDeps {
|
|
return {
|
|
getSessionWorkspaces: (serverId) => useSessionStore.getState().sessions[serverId]?.workspaces,
|
|
getSessionAgents: (serverId) =>
|
|
useSessionStore.getState().sessions[serverId]?.agents.values() ?? [],
|
|
openWorkspaceAgentTab: (workspaceKey, agentId) => {
|
|
useWorkspaceLayoutStore.getState().openTabFocused(workspaceKey, { kind: "agent", agentId });
|
|
},
|
|
rememberLastWorkspace: (selection) => lastWorkspaceSelectionStore.remember(selection),
|
|
navigateToRoute: (route) => {
|
|
router.dismissTo(route as Href);
|
|
stripHostWorkspaceRouteEchoSearchFromBrowserUrlAfterCommit();
|
|
},
|
|
};
|
|
}
|
|
|
|
export function hydrateLastWorkspaceSelection(): Promise<void> {
|
|
return lastWorkspaceSelectionStore.hydrate();
|
|
}
|
|
|
|
export function getLastWorkspaceSelection(): ActiveWorkspaceSelection | null {
|
|
return lastWorkspaceSelectionStore.getSelection();
|
|
}
|
|
|
|
export function getIsLastWorkspaceSelectionHydrated(): boolean {
|
|
return lastWorkspaceSelectionStore.isHydrated();
|
|
}
|
|
|
|
export function navigateToWorkspace(
|
|
serverId: string,
|
|
workspaceId: string,
|
|
_options: NavigateToWorkspaceOptions = {},
|
|
) {
|
|
navigateToWorkspacePure(serverId, workspaceId, navigateDeps());
|
|
}
|
|
|
|
export function navigateToLastWorkspace(): boolean {
|
|
return navigateToLastWorkspacePure({
|
|
...navigateDeps(),
|
|
getLastWorkspaceSelection: () => lastWorkspaceSelectionStore.getSelection(),
|
|
});
|
|
}
|
|
|
|
export function useActiveWorkspaceSelection(): ActiveWorkspaceSelection | null {
|
|
const params = useLocalSearchParams<{
|
|
serverId?: string | string[];
|
|
workspaceId?: string | string[];
|
|
}>();
|
|
const selection = parseActiveWorkspaceSelection({ pathname: usePathname(), params });
|
|
const serverId = selection?.serverId ?? null;
|
|
const workspaceId = selection?.workspaceId ?? null;
|
|
useEffect(() => {
|
|
if (!serverId || !workspaceId) {
|
|
return;
|
|
}
|
|
lastWorkspaceSelectionStore.remember({ serverId, workspaceId });
|
|
}, [serverId, workspaceId]);
|
|
return selection;
|
|
}
|
|
|
|
export function useLastWorkspaceSelection(): ActiveWorkspaceSelection | null {
|
|
return useSyncExternalStore(
|
|
lastWorkspaceSelectionStore.subscribe,
|
|
getLastWorkspaceSelection,
|
|
getLastWorkspaceSelection,
|
|
);
|
|
}
|
|
|
|
export function useIsLastWorkspaceSelectionHydrated(): boolean {
|
|
return useSyncExternalStore(
|
|
lastWorkspaceSelectionStore.subscribe,
|
|
getIsLastWorkspaceSelectionHydrated,
|
|
getIsLastWorkspaceSelectionHydrated,
|
|
);
|
|
}
|
|
|
|
void hydrateLastWorkspaceSelection();
|