* 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
131 lines
3.5 KiB
TypeScript
131 lines
3.5 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
import type { StateStorage } from "zustand/middleware";
|
|
import {
|
|
createSidebarViewStorage,
|
|
migrateSidebarViewState,
|
|
useSidebarViewStore,
|
|
} from "./sidebar-view-store";
|
|
|
|
vi.mock("@react-native-async-storage/async-storage", () => ({
|
|
default: {
|
|
getItem: vi.fn().mockResolvedValue(null),
|
|
setItem: vi.fn().mockResolvedValue(undefined),
|
|
removeItem: vi.fn().mockResolvedValue(undefined),
|
|
},
|
|
}));
|
|
|
|
interface MemoryStorage extends StateStorage<Promise<void>> {
|
|
reads: string[];
|
|
}
|
|
|
|
function createMemoryStorage(entries: Record<string, string | null>): MemoryStorage {
|
|
const reads: string[] = [];
|
|
return {
|
|
reads,
|
|
getItem: async (name) => {
|
|
reads.push(name);
|
|
return entries[name] ?? null;
|
|
},
|
|
setItem: async (name, value) => {
|
|
entries[name] = value;
|
|
},
|
|
removeItem: async (name) => {
|
|
entries[name] = null;
|
|
},
|
|
};
|
|
}
|
|
|
|
describe("sidebar view store", () => {
|
|
beforeEach(() => {
|
|
useSidebarViewStore.setState({
|
|
groupMode: "project",
|
|
hostFilter: null,
|
|
});
|
|
});
|
|
|
|
it("keeps a host filter that still points at an available host", () => {
|
|
useSidebarViewStore.getState().setHostFilter("host-a");
|
|
|
|
useSidebarViewStore.getState().reconcileHostFilter(["host-a", "host-b"]);
|
|
|
|
expect(useSidebarViewStore.getState().hostFilter).toBe("host-a");
|
|
});
|
|
|
|
it("clears a host filter after that host is removed", () => {
|
|
useSidebarViewStore.getState().setHostFilter("removed-host");
|
|
|
|
useSidebarViewStore.getState().reconcileHostFilter(["host-a"]);
|
|
|
|
expect(useSidebarViewStore.getState().hostFilter).toBeNull();
|
|
});
|
|
|
|
it("migrates legacy per-host group modes to the new global mode", () => {
|
|
expect(
|
|
migrateSidebarViewState({
|
|
groupModeByServerId: {
|
|
"host-a": "project",
|
|
"host-b": "status",
|
|
},
|
|
}),
|
|
).toEqual({
|
|
groupMode: "status",
|
|
hostFilter: null,
|
|
});
|
|
});
|
|
|
|
it("keeps current persisted sidebar view state during version migration", () => {
|
|
expect(
|
|
migrateSidebarViewState({
|
|
groupMode: "status",
|
|
hostFilter: "host-a",
|
|
}),
|
|
).toEqual({
|
|
groupMode: "status",
|
|
hostFilter: "host-a",
|
|
});
|
|
});
|
|
|
|
it("falls back to the legacy storage key when the new key is empty", async () => {
|
|
const storage = createMemoryStorage({
|
|
"sidebar-view": null,
|
|
"sidebar-group-mode": JSON.stringify({
|
|
state: { groupModeByServerId: { "host-a": "status" } },
|
|
version: 0,
|
|
}),
|
|
});
|
|
|
|
const value = await createSidebarViewStorage(storage).getItem("sidebar-view");
|
|
|
|
expect(value).toBe(
|
|
JSON.stringify({
|
|
state: { groupModeByServerId: { "host-a": "status" } },
|
|
version: 0,
|
|
}),
|
|
);
|
|
expect(storage.reads).toEqual(["sidebar-view", "sidebar-group-mode"]);
|
|
});
|
|
|
|
it("uses the new storage key without reading the legacy key when current state exists", async () => {
|
|
const storage = createMemoryStorage({
|
|
"sidebar-view": JSON.stringify({
|
|
state: { groupMode: "project", hostFilter: "host-a" },
|
|
version: 1,
|
|
}),
|
|
"sidebar-group-mode": JSON.stringify({
|
|
state: { groupModeByServerId: { "host-b": "status" } },
|
|
version: 0,
|
|
}),
|
|
});
|
|
|
|
const value = await createSidebarViewStorage(storage).getItem("sidebar-view");
|
|
|
|
expect(value).toBe(
|
|
JSON.stringify({
|
|
state: { groupMode: "project", hostFilter: "host-a" },
|
|
version: 1,
|
|
}),
|
|
);
|
|
expect(storage.reads).toEqual(["sidebar-view"]);
|
|
});
|
|
});
|