Improve sidebar workspace readability and host identity (#2790)
* fix(app): align turn footer actions Keep running-turn actions in the same position as completed-turn actions and use the shared small icon size for both copy and fork controls. * feat(app): improve sidebar workspace identity Make dense sidebar workspace rows easier to scan and let each device control how connected hosts are identified. * fix(app): keep host badges readable Use a compact display menu and keep identity color on the host icon so translated controls fit and badge text retains standard contrast. * fix(app): announce selected sidebar badge mode * fix(app): retain icon-only host names for screen readers * fix(app): name hoisted workspace rows * fix(app): retain host identity in workspace labels * fix(app): retain workspace status in row labels * fix(app): defer host appearance until identity resolves * fix(app): serialize host appearance writes * fix(app): serialize host registry writes * fix(app): bound sidebar host badge labels * test(app): match workspace status labels * fix(app): consolidate sidebar identity behavior * test(app): assert status grouping behavior * fix(app): keep sidebar row actions accessible * fix(app): stabilize optimistic message layout
This commit is contained in:
@@ -176,6 +176,10 @@ function agentStreamEventKey(type: string): string {
|
||||
return `agent-stream-event:${type}`;
|
||||
}
|
||||
|
||||
function agentStreamItemKey(type: string): string {
|
||||
return `agent-stream-item:${type}`;
|
||||
}
|
||||
|
||||
function agentUpdateKey(agentId: string, status: string): string {
|
||||
return `agent-update:${agentId}:${status}`;
|
||||
}
|
||||
@@ -526,6 +530,12 @@ export async function installDaemonWebSocketGate(page: Page) {
|
||||
(message) => readAgentStreamEventType(message) === type,
|
||||
);
|
||||
},
|
||||
holdNextAgentStreamItem(type: string): void {
|
||||
pendingServerMessageHolds.set(
|
||||
agentStreamItemKey(type),
|
||||
(message) => readAgentStreamItemType(message) === type,
|
||||
);
|
||||
},
|
||||
async waitForHeldServerMessage(type?: string): Promise<void> {
|
||||
const key = type ? serverMessageKey(type) : null;
|
||||
while (!heldServerMessages.some((message) => key === null || message.key === key)) {
|
||||
@@ -574,6 +584,22 @@ export async function installDaemonWebSocketGate(page: Page) {
|
||||
heldServerMessage.browser.send(follower);
|
||||
}
|
||||
},
|
||||
async waitForHeldAgentStreamItem(type: string): Promise<void> {
|
||||
const key = agentStreamItemKey(type);
|
||||
while (!heldServerMessages.some((message) => message.key === key)) {
|
||||
await new Promise<void>((resolve) => heldServerMessageWaiters.add(resolve));
|
||||
}
|
||||
},
|
||||
releaseHeldAgentStreamItem(type: string): void {
|
||||
const key = agentStreamItemKey(type);
|
||||
const index = heldServerMessages.findIndex((message) => message.key === key);
|
||||
const [heldServerMessage] = index >= 0 ? heldServerMessages.splice(index, 1) : [];
|
||||
if (!heldServerMessage) throw new Error("No held agent stream item to release");
|
||||
heldServerMessage.browser.send(heldServerMessage.message);
|
||||
for (const follower of heldServerMessage.agentStreamFollowers) {
|
||||
heldServerMessage.browser.send(follower);
|
||||
}
|
||||
},
|
||||
requestTimelineTail(agentId: string): void {
|
||||
if (!latestServer) throw new Error("No daemon WebSocket is connected");
|
||||
latestServer.send(
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import { expect, type Page } from "@playwright/test";
|
||||
import { identityColor, type IdentityColorName } from "@/styles/identity-colors";
|
||||
import { openSettings } from "./app";
|
||||
import { buildSeededHost } from "./daemon-registry";
|
||||
import { clickSettingsBackToWorkspace, openHostSection, selectSettingsHost } from "./settings";
|
||||
|
||||
const REGISTRY_KEY = "@paseo:daemon-registry";
|
||||
const SEED_NONCE_KEY = "@paseo:e2e-seed-nonce";
|
||||
@@ -140,3 +143,113 @@ export async function toggleHostFilter(page: Page, serverId: string): Promise<vo
|
||||
export async function selectAllHostsFilter(page: Page): Promise<void> {
|
||||
await page.getByTestId("sidebar-host-filter-all").click();
|
||||
}
|
||||
|
||||
export async function openHostAppearanceSettings(page: Page, serverId: string): Promise<void> {
|
||||
await openSettings(page);
|
||||
await selectSettingsHost(page, serverId);
|
||||
await openHostSection(page, serverId, "host");
|
||||
await expect(page.getByTestId("host-appearance-preview")).toBeVisible({ timeout: 15_000 });
|
||||
}
|
||||
|
||||
// Settings replaces the workspace sidebar, so badge assertions need the app shell back. Going
|
||||
// through the in-app back control (rather than a fresh goto) also keeps the auto-seed fixture
|
||||
// from rewriting the host registry, since init scripts only re-run on a real navigation.
|
||||
export async function leaveHostAppearanceSettings(page: Page): Promise<void> {
|
||||
await clickSettingsBackToWorkspace(page);
|
||||
await expect(page.getByTestId("host-appearance-preview")).toHaveCount(0);
|
||||
}
|
||||
|
||||
export async function renameHostFromSettings(page: Page, name: string): Promise<void> {
|
||||
await page.getByTestId("host-page-label-edit-button").click();
|
||||
const input = page.getByTestId("host-page-rename-modal-input");
|
||||
await expect(input).toBeVisible();
|
||||
await input.fill(name);
|
||||
await page.getByTestId("host-page-rename-modal-submit").click();
|
||||
await expect(input).toHaveCount(0);
|
||||
}
|
||||
|
||||
export async function chooseHostColor(page: Page, colorName: string): Promise<void> {
|
||||
await page.getByRole("button", { name: /^Color, / }).click();
|
||||
await page.getByRole("button", { name: colorName, exact: true }).click();
|
||||
await expect(page.getByRole("button", { name: `Color, ${colorName}` })).toBeVisible();
|
||||
}
|
||||
|
||||
export async function chooseHostBadgeDisplay(
|
||||
page: Page,
|
||||
option: "Name" | "Icon only" | "Hidden",
|
||||
): Promise<void> {
|
||||
await page.getByTestId("host-appearance-badge-display").click();
|
||||
await page.getByRole("button", { name: option, exact: true }).click();
|
||||
await expect(page.getByRole("button", { name: `Sidebar badge, ${option}` })).toBeVisible();
|
||||
}
|
||||
|
||||
// The badge is visual-only; the workspace row owns its accessible name. Test IDs keep visual
|
||||
// assertions from coupling to that row-level accessibility contract.
|
||||
function hostBadge(page: Page, input: HostBadgeTarget) {
|
||||
return page
|
||||
.getByTestId(`sidebar-workspace-row-${input.serverId}:${input.workspaceId}`)
|
||||
.getByTestId(`sidebar-host-badge-${input.serverId}`);
|
||||
}
|
||||
|
||||
interface HostBadgeTarget {
|
||||
serverId: string;
|
||||
workspaceId: string;
|
||||
hostName: string;
|
||||
}
|
||||
|
||||
export async function expectHostBadgeName(page: Page, target: HostBadgeTarget): Promise<void> {
|
||||
const badge = hostBadge(page, target);
|
||||
await expect(badge).toBeVisible({ timeout: 15_000 });
|
||||
await expect(badge).toHaveText(target.hostName);
|
||||
}
|
||||
|
||||
export async function expectHostBadgeIconOnly(page: Page, target: HostBadgeTarget): Promise<void> {
|
||||
const badge = hostBadge(page, target);
|
||||
await expect(badge).toBeVisible({ timeout: 15_000 });
|
||||
await expect(badge).not.toHaveText(target.hostName);
|
||||
await expect(
|
||||
page.getByTestId(`sidebar-workspace-row-${target.serverId}:${target.workspaceId}`),
|
||||
).toHaveAccessibleName(new RegExp(target.hostName));
|
||||
}
|
||||
|
||||
export async function expectNoHostBadge(page: Page, target: HostBadgeTarget): Promise<void> {
|
||||
await expect(hostBadge(page, target)).toHaveCount(0, { timeout: 15_000 });
|
||||
}
|
||||
|
||||
export async function expectHostBadgeTinted(
|
||||
page: Page,
|
||||
target: HostBadgeTarget & { color: IdentityColorName },
|
||||
): Promise<void> {
|
||||
const badge = hostBadge(page, target);
|
||||
await expect(badge).toBeVisible({ timeout: 15_000 });
|
||||
await expect(badge.getByText(target.hostName)).toHaveCSS("color", "rgb(113, 113, 122)");
|
||||
await expect(badge.locator("svg")).toHaveAttribute("stroke", identityColor(target.color));
|
||||
}
|
||||
|
||||
export async function expectHostAppearancePreview(
|
||||
page: Page,
|
||||
input: { serverId: string; hostName: string; color: IdentityColorName },
|
||||
): Promise<void> {
|
||||
const preview = page.getByTestId("host-appearance-preview");
|
||||
await expect(preview).toBeVisible();
|
||||
const badge = preview.getByTestId(`sidebar-host-badge-${input.serverId}`);
|
||||
await expect(badge).toHaveText(input.hostName);
|
||||
await expect(badge.locator("svg")).toHaveAttribute("stroke", identityColor(input.color));
|
||||
}
|
||||
|
||||
// The auto-seed fixture rewrites the host registry on every navigation. Setting the
|
||||
// disable-once flag to the current nonce makes it skip exactly one reload, which is what proves
|
||||
// the appearance survived rather than being reseeded.
|
||||
export async function reloadPreservingHostRegistry(page: Page): Promise<void> {
|
||||
await page.evaluate(
|
||||
(keys) => {
|
||||
const nonce = localStorage.getItem(keys.nonce);
|
||||
if (!nonce) {
|
||||
throw new Error("Expected the e2e seed nonce before reloading.");
|
||||
}
|
||||
localStorage.setItem(keys.disableSeedOnce, nonce);
|
||||
},
|
||||
{ nonce: SEED_NONCE_KEY, disableSeedOnce: DISABLE_DEFAULT_SEED_ONCE_KEY },
|
||||
);
|
||||
await page.reload();
|
||||
}
|
||||
|
||||
@@ -1,6 +1,110 @@
|
||||
import { expect, type Page } from "@playwright/test";
|
||||
import { getServerId } from "./server-id";
|
||||
|
||||
interface ContextMenuAnchor {
|
||||
x: number;
|
||||
y: number;
|
||||
}
|
||||
|
||||
async function openContextMenuAtRowPoint(
|
||||
page: Page,
|
||||
rowTestID: string,
|
||||
menuTestID: string,
|
||||
): Promise<ContextMenuAnchor> {
|
||||
const row = page.getByTestId(rowTestID);
|
||||
await expect(row).toBeVisible({ timeout: 30_000 });
|
||||
const bounds = await row.boundingBox();
|
||||
if (!bounds) throw new Error(`Could not measure ${rowTestID}`);
|
||||
|
||||
const anchor = {
|
||||
x: bounds.x + Math.min(60, bounds.width / 2),
|
||||
y: bounds.y + bounds.height / 2,
|
||||
};
|
||||
await page.mouse.click(anchor.x, anchor.y, { button: "right" });
|
||||
await expect(page.getByTestId(menuTestID)).toBeVisible({ timeout: 10_000 });
|
||||
return anchor;
|
||||
}
|
||||
|
||||
async function expectContextMenuAtPointer(
|
||||
page: Page,
|
||||
menuTestID: string,
|
||||
anchor: ContextMenuAnchor,
|
||||
): Promise<void> {
|
||||
const bounds = await page.getByTestId(menuTestID).boundingBox();
|
||||
if (!bounds) throw new Error(`Could not measure ${menuTestID}`);
|
||||
expect(Math.abs(bounds.x - anchor.x)).toBeLessThanOrEqual(2);
|
||||
expect(Math.abs(bounds.y - (anchor.y + 4))).toBeLessThanOrEqual(2);
|
||||
}
|
||||
|
||||
export async function openWorkspaceContextMenu(page: Page, workspaceId: string): Promise<void> {
|
||||
const workspaceKey = `${getServerId()}:${workspaceId}`;
|
||||
const menuTestID = `sidebar-workspace-context-menu-${workspaceKey}`;
|
||||
const anchor = await openContextMenuAtRowPoint(
|
||||
page,
|
||||
`sidebar-workspace-row-${workspaceKey}`,
|
||||
menuTestID,
|
||||
);
|
||||
await expectContextMenuAtPointer(page, menuTestID, anchor);
|
||||
}
|
||||
|
||||
export async function showWorkspaceHoverCard(page: Page, workspaceId: string): Promise<void> {
|
||||
const workspaceKey = `${getServerId()}:${workspaceId}`;
|
||||
await page.getByTestId(`sidebar-workspace-row-${workspaceKey}`).hover();
|
||||
await expect(page.getByTestId("workspace-hover-card")).toBeVisible();
|
||||
}
|
||||
|
||||
export async function closeWorkspaceContextMenu(page: Page, workspaceId: string): Promise<void> {
|
||||
const workspaceKey = `${getServerId()}:${workspaceId}`;
|
||||
await page.getByTestId(`sidebar-workspace-context-menu-${workspaceKey}-backdrop`).click();
|
||||
}
|
||||
|
||||
export async function expectWorkspaceContextMenuOwnsAttention(page: Page): Promise<void> {
|
||||
await expect(page.getByTestId("workspace-hover-card")).toHaveCount(0);
|
||||
}
|
||||
|
||||
export async function expectWorkspaceRowHoverCleared(
|
||||
page: Page,
|
||||
workspaceId: string,
|
||||
): Promise<void> {
|
||||
const workspaceKey = `${getServerId()}:${workspaceId}`;
|
||||
await expect(page.getByTestId(`sidebar-workspace-kebab-${workspaceKey}`)).toBeHidden();
|
||||
await expect(page.getByTestId("workspace-hover-card")).toHaveCount(0);
|
||||
}
|
||||
|
||||
export async function expectWorkspaceContextMenuActions(
|
||||
page: Page,
|
||||
workspaceId: string,
|
||||
): Promise<void> {
|
||||
const workspaceKey = `${getServerId()}:${workspaceId}`;
|
||||
const menu = page.getByTestId(`sidebar-workspace-context-menu-${workspaceKey}`);
|
||||
await expect(menu.getByRole("button", { name: "Copy path" })).toBeVisible();
|
||||
await expect(menu.getByRole("button", { name: "Rename workspace" })).toBeVisible();
|
||||
await expect(menu.getByRole("button", { name: "Archive" })).toBeVisible();
|
||||
}
|
||||
|
||||
export async function openProjectContextMenu(page: Page, projectViewKey: string): Promise<void> {
|
||||
const menuTestID = `sidebar-project-context-menu-${projectViewKey}`;
|
||||
const anchor = await openContextMenuAtRowPoint(
|
||||
page,
|
||||
`sidebar-project-row-${projectViewKey}`,
|
||||
menuTestID,
|
||||
);
|
||||
await expectContextMenuAtPointer(page, menuTestID, anchor);
|
||||
}
|
||||
|
||||
export async function closeProjectContextMenu(page: Page, projectViewKey: string): Promise<void> {
|
||||
await page.getByTestId(`sidebar-project-context-menu-${projectViewKey}-backdrop`).click();
|
||||
}
|
||||
|
||||
export async function expectProjectContextMenuActions(
|
||||
page: Page,
|
||||
projectViewKey: string,
|
||||
): Promise<void> {
|
||||
const menu = page.getByTestId(`sidebar-project-context-menu-${projectViewKey}`);
|
||||
await expect(menu.getByRole("button", { name: "Open project settings" })).toBeVisible();
|
||||
await expect(menu.getByRole("button", { name: "Remove project" })).toBeVisible();
|
||||
}
|
||||
|
||||
export async function selectWorkspaceInSidebar(page: Page, workspaceId: string): Promise<void> {
|
||||
const row = page.getByTestId(`sidebar-workspace-row-${getServerId()}:${workspaceId}`);
|
||||
await expect(row).toBeVisible({ timeout: 30_000 });
|
||||
|
||||
Reference in New Issue
Block a user