* 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
391 lines
12 KiB
TypeScript
391 lines
12 KiB
TypeScript
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
|
import type { TextInput } from "react-native";
|
|
import { router, usePathname, type Href } from "expo-router";
|
|
import { useTranslation } from "react-i18next";
|
|
import { useKeyboardShortcutsStore } from "@/stores/keyboard-shortcuts-store";
|
|
import { keyboardActionDispatcher } from "@/keyboard/keyboard-action-dispatcher";
|
|
import { useAggregatedAgents, type AggregatedAgent } from "@/hooks/use-aggregated-agents";
|
|
import { useOpenProjectPicker } from "@/hooks/use-open-project-picker";
|
|
import {
|
|
clearCommandCenterFocusRestoreElement,
|
|
takeCommandCenterFocusRestoreElement,
|
|
} from "@/utils/command-center-focus-restore";
|
|
import { buildOpenProjectRoute, buildSettingsRoute } from "@/utils/host-routes";
|
|
import type { ShortcutKey } from "@/utils/format-shortcut";
|
|
import { chordStringToShortcutKeys } from "@/keyboard/shortcut-string";
|
|
import { getBindingIdForAction, getDefaultKeysForAction } from "@/keyboard/keyboard-shortcuts";
|
|
import { useKeyboardShortcutOverrides } from "@/hooks/use-keyboard-shortcut-overrides";
|
|
import { getShortcutOs } from "@/utils/shortcut-platform";
|
|
import { getIsElectronRuntime } from "@/constants/layout";
|
|
import { navigateToAgent } from "@/utils/navigate-to-agent";
|
|
import { focusWithRetries } from "@/utils/web-focus";
|
|
import { isWeb } from "@/constants/platform";
|
|
|
|
const EMPTY_AGENTS: AggregatedAgent[] = [];
|
|
const EMPTY_ACTION_ITEMS: CommandCenterActionItem[] = [];
|
|
const EMPTY_COMMAND_CENTER_ITEMS: CommandCenterItem[] = [];
|
|
|
|
function isMatch(agent: AggregatedAgent, query: string): boolean {
|
|
if (!query) return true;
|
|
const q = query.toLowerCase();
|
|
const title = (agent.title ?? "New agent").toLowerCase();
|
|
const cwd = agent.cwd.toLowerCase();
|
|
return title.includes(q) || cwd.includes(q);
|
|
}
|
|
|
|
function sortAgents(left: AggregatedAgent, right: AggregatedAgent): number {
|
|
const leftNeedsInput = (left.pendingPermissionCount ?? 0) > 0 ? 1 : 0;
|
|
const rightNeedsInput = (right.pendingPermissionCount ?? 0) > 0 ? 1 : 0;
|
|
if (leftNeedsInput !== rightNeedsInput) return rightNeedsInput - leftNeedsInput;
|
|
|
|
const leftAttention = left.requiresAttention ? 1 : 0;
|
|
const rightAttention = right.requiresAttention ? 1 : 0;
|
|
if (leftAttention !== rightAttention) return rightAttention - leftAttention;
|
|
|
|
const leftRunning = left.status === "running" ? 1 : 0;
|
|
const rightRunning = right.status === "running" ? 1 : 0;
|
|
if (leftRunning !== rightRunning) return rightRunning - leftRunning;
|
|
|
|
return right.lastActivityAt.getTime() - left.lastActivityAt.getTime();
|
|
}
|
|
|
|
interface CommandCenterActionDefinition {
|
|
id: string;
|
|
titleKey:
|
|
| "shell.commandCenter.openProject"
|
|
| "shell.commandCenter.home"
|
|
| "sidebar.actions.settings";
|
|
icon?: "plus" | "settings" | "home";
|
|
actionId?: string;
|
|
keywords: string[];
|
|
routeKind: "settings" | "home" | "none";
|
|
}
|
|
|
|
const COMMAND_CENTER_ACTIONS: readonly CommandCenterActionDefinition[] = [
|
|
{
|
|
id: "new-agent",
|
|
titleKey: "shell.commandCenter.openProject",
|
|
icon: "plus",
|
|
actionId: "new-agent",
|
|
keywords: ["open", "project", "folder", "workspace", "repo"],
|
|
routeKind: "none",
|
|
},
|
|
{
|
|
id: "home",
|
|
titleKey: "shell.commandCenter.home",
|
|
icon: "home",
|
|
keywords: ["home", "start", "import", "session", "pair", "device", "providers"],
|
|
routeKind: "home",
|
|
},
|
|
{
|
|
id: "settings",
|
|
titleKey: "sidebar.actions.settings",
|
|
icon: "settings",
|
|
keywords: ["settings", "preferences", "config", "configuration"],
|
|
routeKind: "settings",
|
|
},
|
|
];
|
|
|
|
function matchesActionQuery(
|
|
query: string,
|
|
action: CommandCenterActionDefinition,
|
|
title: string,
|
|
): boolean {
|
|
const normalized = query.trim().toLowerCase();
|
|
if (!normalized) return true;
|
|
if (title.toLowerCase().includes(normalized)) {
|
|
return true;
|
|
}
|
|
return action.keywords.some((keyword) => keyword.includes(normalized));
|
|
}
|
|
|
|
export interface CommandCenterActionItem {
|
|
kind: "action";
|
|
id: string;
|
|
title: string;
|
|
icon?: "plus" | "settings" | "home";
|
|
route?: Href;
|
|
shortcutKeys?: ShortcutKey[][];
|
|
}
|
|
|
|
export type CommandCenterItem =
|
|
| {
|
|
kind: "action";
|
|
action: CommandCenterActionItem;
|
|
}
|
|
| {
|
|
kind: "agent";
|
|
agent: AggregatedAgent;
|
|
};
|
|
|
|
function resolveActionShortcutKeys(
|
|
actionId: string | undefined,
|
|
overrides: Record<string, string>,
|
|
): ShortcutKey[][] | undefined {
|
|
if (!actionId) return undefined;
|
|
const isMac = getShortcutOs() === "mac";
|
|
const isDesktopApp = getIsElectronRuntime();
|
|
const platform = { isMac, isDesktop: isDesktopApp };
|
|
const bindingId = getBindingIdForAction(actionId, platform);
|
|
if (!bindingId) return undefined;
|
|
const override = overrides[bindingId];
|
|
if (override) return chordStringToShortcutKeys(override);
|
|
const defaultKeys = getDefaultKeysForAction(actionId, platform);
|
|
return defaultKeys ? [defaultKeys] : undefined;
|
|
}
|
|
|
|
export function useCommandCenter() {
|
|
const { t } = useTranslation();
|
|
const pathname = usePathname();
|
|
const { overrides } = useKeyboardShortcutOverrides();
|
|
const open = useKeyboardShortcutsStore((s) => s.commandCenterOpen);
|
|
const setOpen = useKeyboardShortcutsStore((s) => s.setCommandCenterOpen);
|
|
const inputRef = useRef<TextInput>(null);
|
|
const didNavigateRef = useRef(false);
|
|
const prevOpenRef = useRef(open);
|
|
const activeIndexRef = useRef(0);
|
|
const itemsRef = useRef<CommandCenterItem[]>([]);
|
|
const handleCloseRef = useRef<() => void>(() => undefined);
|
|
const handleSelectItemRef = useRef<(item: CommandCenterItem) => void>(() => undefined);
|
|
const [query, setQuery] = useState("");
|
|
const [activeIndex, setActiveIndex] = useState(0);
|
|
|
|
const { agents } = useAggregatedAgents();
|
|
|
|
const agentResults = useMemo(() => {
|
|
if (!open || agents.length === 0) {
|
|
return EMPTY_AGENTS;
|
|
}
|
|
const filtered = agents.filter((agent) => isMatch(agent, query));
|
|
filtered.sort(sortAgents);
|
|
return filtered;
|
|
}, [agents, open, query]);
|
|
|
|
const settingsRoute = useMemo<Href>(() => {
|
|
return buildSettingsRoute();
|
|
}, []);
|
|
|
|
const homeRoute = useMemo<Href>(() => buildOpenProjectRoute() as Href, []);
|
|
|
|
const actionItems = useMemo(() => {
|
|
if (!open) {
|
|
return EMPTY_ACTION_ITEMS;
|
|
}
|
|
return COMMAND_CENTER_ACTIONS.filter((action) => {
|
|
if (action.routeKind === "home" && !homeRoute) return false;
|
|
return matchesActionQuery(query, action, t(action.titleKey));
|
|
}).map<CommandCenterActionItem>((action) => {
|
|
let route: Href | undefined;
|
|
if (action.routeKind === "settings") route = settingsRoute;
|
|
else if (action.routeKind === "home") route = homeRoute;
|
|
return {
|
|
kind: "action",
|
|
id: action.id,
|
|
title: t(action.titleKey),
|
|
icon: action.icon,
|
|
route,
|
|
shortcutKeys: resolveActionShortcutKeys(action.actionId, overrides),
|
|
};
|
|
});
|
|
}, [open, query, settingsRoute, homeRoute, overrides, t]);
|
|
|
|
const items = useMemo(() => {
|
|
if (!open) {
|
|
return EMPTY_COMMAND_CENTER_ITEMS;
|
|
}
|
|
const next: CommandCenterItem[] = [];
|
|
for (const action of actionItems) {
|
|
next.push({
|
|
kind: "action",
|
|
action,
|
|
});
|
|
}
|
|
for (const agent of agentResults) {
|
|
next.push({
|
|
kind: "agent",
|
|
agent,
|
|
});
|
|
}
|
|
return next;
|
|
}, [actionItems, agentResults, open]);
|
|
|
|
const handleClose = useCallback(() => {
|
|
setOpen(false);
|
|
}, [setOpen]);
|
|
|
|
const handleSelectAgent = useCallback(
|
|
(agent: AggregatedAgent) => {
|
|
didNavigateRef.current = true;
|
|
|
|
// Don't restore focus back to the prior element after we navigate.
|
|
clearCommandCenterFocusRestoreElement();
|
|
setOpen(false);
|
|
navigateToAgent({
|
|
serverId: agent.serverId,
|
|
agentId: agent.id,
|
|
currentPathname: pathname,
|
|
});
|
|
},
|
|
[pathname, setOpen],
|
|
);
|
|
|
|
const openProjectPicker = useOpenProjectPicker();
|
|
|
|
const handleSelectAction = useCallback(
|
|
(action: CommandCenterActionItem) => {
|
|
clearCommandCenterFocusRestoreElement();
|
|
setOpen(false);
|
|
if (action.id === "new-agent") {
|
|
void openProjectPicker();
|
|
return;
|
|
}
|
|
if (!action.route) {
|
|
return;
|
|
}
|
|
didNavigateRef.current = true;
|
|
router.push(action.route);
|
|
},
|
|
[openProjectPicker, setOpen],
|
|
);
|
|
|
|
const handleSelectItem = useCallback(
|
|
(item: CommandCenterItem) => {
|
|
if (item.kind === "action") {
|
|
handleSelectAction(item.action);
|
|
return;
|
|
}
|
|
handleSelectAgent(item.agent);
|
|
},
|
|
[handleSelectAction, handleSelectAgent],
|
|
);
|
|
|
|
useEffect(() => {
|
|
activeIndexRef.current = activeIndex;
|
|
}, [activeIndex]);
|
|
|
|
useEffect(() => {
|
|
itemsRef.current = items;
|
|
}, [items]);
|
|
|
|
useEffect(() => {
|
|
handleCloseRef.current = handleClose;
|
|
}, [handleClose]);
|
|
|
|
useEffect(() => {
|
|
handleSelectItemRef.current = handleSelectItem;
|
|
}, [handleSelectItem]);
|
|
|
|
useEffect(() => {
|
|
const prevOpen = prevOpenRef.current;
|
|
prevOpenRef.current = open;
|
|
|
|
if (!open) {
|
|
setQuery("");
|
|
setActiveIndex(0);
|
|
|
|
if (prevOpen && !didNavigateRef.current) {
|
|
const el = takeCommandCenterFocusRestoreElement();
|
|
const isFocused = () =>
|
|
Boolean(el) && typeof document !== "undefined" && document.activeElement === el;
|
|
|
|
const cancel = focusWithRetries({
|
|
focus: () => el?.focus(),
|
|
isFocused,
|
|
onTimeout: () => {
|
|
keyboardActionDispatcher.dispatch({
|
|
id: "message-input.focus",
|
|
scope: "message-input",
|
|
});
|
|
},
|
|
});
|
|
return cancel;
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
didNavigateRef.current = false;
|
|
|
|
const id = setTimeout(() => {
|
|
inputRef.current?.focus();
|
|
}, 0);
|
|
return () => clearTimeout(id);
|
|
}, [open]);
|
|
|
|
useEffect(() => {
|
|
if (!open) return;
|
|
if (activeIndex >= items.length) {
|
|
setActiveIndex(items.length > 0 ? items.length - 1 : 0);
|
|
}
|
|
}, [activeIndex, items.length, open]);
|
|
|
|
const handleKeyEvent = useCallback(
|
|
(key: string): boolean => {
|
|
if (!open) return false;
|
|
const currentItems = itemsRef.current;
|
|
|
|
if (key === "Escape") {
|
|
handleCloseRef.current();
|
|
return true;
|
|
}
|
|
|
|
if (key === "Enter") {
|
|
if (currentItems.length === 0) return false;
|
|
const index = Math.max(0, Math.min(activeIndexRef.current, currentItems.length - 1));
|
|
handleSelectItemRef.current(currentItems[index]);
|
|
return true;
|
|
}
|
|
|
|
if (key === "ArrowDown" || key === "ArrowUp") {
|
|
if (currentItems.length === 0) return false;
|
|
setActiveIndex((current) => {
|
|
const delta = key === "ArrowDown" ? 1 : -1;
|
|
const next = current + delta;
|
|
if (next < 0) return currentItems.length - 1;
|
|
if (next >= currentItems.length) return 0;
|
|
return next;
|
|
});
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
},
|
|
[open],
|
|
);
|
|
|
|
useEffect(() => {
|
|
if (!open || !isWeb) return;
|
|
|
|
const handler = (event: KeyboardEvent) => {
|
|
if (
|
|
event.key !== "ArrowDown" &&
|
|
event.key !== "ArrowUp" &&
|
|
event.key !== "Enter" &&
|
|
event.key !== "Escape"
|
|
) {
|
|
return;
|
|
}
|
|
if (handleKeyEvent(event.key)) {
|
|
event.preventDefault();
|
|
}
|
|
};
|
|
|
|
// react-native-web can stop propagation on key events, so listen in capture phase.
|
|
window.addEventListener("keydown", handler, true);
|
|
return () => window.removeEventListener("keydown", handler, true);
|
|
}, [open, handleKeyEvent]);
|
|
|
|
return {
|
|
open,
|
|
inputRef,
|
|
query,
|
|
setQuery,
|
|
activeIndex,
|
|
setActiveIndex,
|
|
items,
|
|
handleClose,
|
|
handleSelectItem,
|
|
handleKeyEvent,
|
|
};
|
|
}
|