* 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
75 lines
2.3 KiB
TypeScript
75 lines
2.3 KiB
TypeScript
import { create } from "zustand";
|
|
import type { SidebarShortcutWorkspaceTarget } from "@/utils/sidebar-shortcuts";
|
|
|
|
const SHORTCUT_BADGE_DELAY_MS = 150;
|
|
|
|
interface KeyboardShortcutsState {
|
|
commandCenterOpen: boolean;
|
|
shortcutsDialogOpen: boolean;
|
|
capturingShortcut: boolean;
|
|
altDown: boolean;
|
|
cmdOrCtrlDown: boolean;
|
|
showShortcutBadges: boolean;
|
|
/** Sidebar-visible workspace targets (up to 9), in top-to-bottom visual order. */
|
|
sidebarShortcutWorkspaceTargets: SidebarShortcutWorkspaceTarget[];
|
|
|
|
setCommandCenterOpen: (open: boolean) => void;
|
|
setShortcutsDialogOpen: (open: boolean) => void;
|
|
setCapturingShortcut: (capturing: boolean) => void;
|
|
setAltDown: (down: boolean) => void;
|
|
setCmdOrCtrlDown: (down: boolean) => void;
|
|
setSidebarShortcutWorkspaceTargets: (targets: SidebarShortcutWorkspaceTarget[]) => void;
|
|
resetModifiers: () => void;
|
|
}
|
|
|
|
let badgeTimer: ReturnType<typeof setTimeout> | null = null;
|
|
|
|
function updateBadgeTimer(
|
|
set: (partial: Partial<KeyboardShortcutsState>) => void,
|
|
get: () => KeyboardShortcutsState,
|
|
) {
|
|
const { altDown, cmdOrCtrlDown } = get();
|
|
const modifierDown = altDown || cmdOrCtrlDown;
|
|
|
|
if (badgeTimer) {
|
|
clearTimeout(badgeTimer);
|
|
badgeTimer = null;
|
|
}
|
|
|
|
if (modifierDown) {
|
|
badgeTimer = setTimeout(() => {
|
|
set({ showShortcutBadges: true });
|
|
}, SHORTCUT_BADGE_DELAY_MS);
|
|
} else {
|
|
set({ showShortcutBadges: false });
|
|
}
|
|
}
|
|
|
|
export const useKeyboardShortcutsStore = create<KeyboardShortcutsState>((set, get) => ({
|
|
commandCenterOpen: false,
|
|
shortcutsDialogOpen: false,
|
|
capturingShortcut: false,
|
|
altDown: false,
|
|
cmdOrCtrlDown: false,
|
|
showShortcutBadges: false,
|
|
sidebarShortcutWorkspaceTargets: [],
|
|
|
|
setCommandCenterOpen: (open) => set({ commandCenterOpen: open }),
|
|
setShortcutsDialogOpen: (open) => set({ shortcutsDialogOpen: open }),
|
|
setCapturingShortcut: (capturing) => set({ capturingShortcut: capturing }),
|
|
setAltDown: (down) => {
|
|
set({ altDown: down });
|
|
updateBadgeTimer(set, get);
|
|
},
|
|
setCmdOrCtrlDown: (down) => {
|
|
set({ cmdOrCtrlDown: down });
|
|
updateBadgeTimer(set, get);
|
|
},
|
|
setSidebarShortcutWorkspaceTargets: (targets) =>
|
|
set({ sidebarShortcutWorkspaceTargets: targets }),
|
|
resetModifiers: () => {
|
|
set({ altDown: false, cmdOrCtrlDown: false });
|
|
updateBadgeTimer(set, get);
|
|
},
|
|
}));
|