* fix(projects): restore cross-host grouping Random host-local project IDs replaced the remote-derived value that had also served as grouping identity. Persist a separate opaque group key and let normal boot reconciliation backfill older records without a migration. * fix(projects): keep ambiguous clones separate A shared remote can identify a project across hosts, but it cannot distinguish two independent clones on one host. Treat those keys as ambiguous so host-local project IDs remain separate. * fix(projects): preserve host-local project identity * fix(projects): strengthen grouping identity * test(app): update project host shape contract * fix(projects): preserve selected host identity * fix(projects): close grouped routing gaps * fix(projects): stabilize legacy subproject grouping * fix(projects): preserve selected project identity * fix(projects): isolate legacy host identity * fix(projects): preserve symlinked bootstrap roots * fix(projects): reconcile grouped custom names * fix(projects): stabilize settings and path identity * fix(projects): normalize default remote ports * fix(projects): harden host and remote identity * fix(projects): preserve host-scoped actions * fix(projects): preserve remote path semantics * fix(projects): model SCP remote semantics * fix(projects): keep settings on routed host * fix(projects): preserve SSH URL path semantics * fix(projects): separate identity from presentation * test(projects): use grouped identity in UI specs * fix(projects): harden grouped project routing * test(projects): expect framed settings route * fix(projects): preserve exact placement identity * fix(projects): harden grouping identity and routing * fix(projects): restore project key as grouping identity Random host-local project IDs had replaced the persisted cross-host value carried by projectKey. Keep projectId for routing while reconciliation owns and persists projectKey for grouping. * fix(projects): prevent project key collisions Preserve platform path semantics and generic remote transports in cross-host keys, and compare legacy checkout roots using filesystem equivalence before materializing ownership. * test(projects): assert host-scoped project keys * fix(projects): preserve project key compatibility Resolve legacy workspace project references at the daemon boundary while keeping projectKey as the cross-host identity. Complete generic SSH normalization without collapsing distinct repositories. * fix(projects): harden project reference identity * fix(projects): retain archived reference errors * fix(projects): scope legacy paths to hosts * test(app): model persisted project keys * fix(projects): retain absolute scp users * fix(projects): resolve legacy mutation aliases * fix(projects): preserve conservative identity boundaries * fix(projects): preserve legacy placement identity * test(projects): assert legacy placement identity * test(projects): expect canonical Windows keys * fix(projects): separate bootstrap identity fields * fix(projects): scope legacy paths by host * fix(projects): stabilize opaque project identity * fix(projects): preserve remaining opaque identities * fix(projects): classify forward-slash UNC roots * fix(projects): preserve opaque selection keys * fix(projects): frame host-local project keys * fix(projects): canonicalize framed identities * test(projects): isolate repeated remote fixtures * fix(projects): keep project key as UI identity * fix(projects): reconcile hydrated project references * fix(projects): preserve archived project identity * refactor(projects): group projects from project records, not workspaces Cross-host grouping had been built by hanging a projectKey off every workspace descriptor. That scoped the key to the wrong entity: the app then had to reconstruct project identity per workspace in six modules, which forced projectKey fallbacks into RPC arguments and a server-side resolver that turned grouping keys back into project ids. A workspace has a projectId. The key belongs to the project, and grouping is a display concern, so the daemon now publishes projects over project.list plus the existing project.update channel and the app groups them in one place. Projects are addressed by host-local projectId everywhere, including the settings route. Projects persisted without a key are backfilled by ordinary boot reconciliation, with no migration. Old daemons advertise no projectList capability and simply do not group. * test(projects): seed projects alongside workspaces in fixtures Sidebar fixtures seeded workspaces without their projects, which the daemon cannot produce now that projects arrive on their own channel, so nothing rendered. Adds a seeding helper that supplies both. Also drops the provisioning test for accepting a project key where a project id belongs; that resolver was removed deliberately. * fix(projects): keep derived project identity stable Four gaps left by shrinking the key derivation: Local keys used a bare path resolve, so one directory reached by a different spelling produced a different key and reset grouped identity. Windows CI caught this with the 8.3 and long-name forms of one temp path. Canonicalize through the shared realpath-aware normalization. Subproject display names lost their selected-path input, so every subproject of a monorepo rendered under the same remote-derived name. Reconciliation only ever backfilled a missing key, so a project whose remote changed stayed grouped with hosts on the old remote. Project settings kept a disconnected host selected and rendered a dead end with no way back to an editable host. * fix(projects): read scheme remotes as URLs, not scp form An `ssh://user@host:22/org/repo` remote matched the scp-form pattern first, because `[^@]+` happily eats `ssh://git`, so the port landed in the path and the project keyed as `remote:host/22/org/repo`. Two spellings of one remote therefore never grouped. Try scp form only when there is no scheme, and drop protocol-default ports so an explicitly written `:22` matches the same remote without it.
543 lines
18 KiB
TypeScript
543 lines
18 KiB
TypeScript
import { expect, type BrowserContext, type Page } from "@playwright/test";
|
|
import type { DaemonClient as InternalDaemonClient } from "@getpaseo/client/internal/daemon-client";
|
|
import { decodeWorkspaceIdFromPathSegment } from "@/utils/host-routes";
|
|
import { connectDaemonClient } from "./daemon-client-loader";
|
|
import { daemonWsRoutePattern } from "./daemon-port";
|
|
import { expectWorkspaceHeader } from "./workspace-ui";
|
|
|
|
type NewWorkspaceDaemonClient = Pick<
|
|
InternalDaemonClient,
|
|
| "archivePaseoWorktree"
|
|
| "archiveWorkspace"
|
|
| "checkoutRefresh"
|
|
| "close"
|
|
| "connect"
|
|
| "createPaseoWorktree"
|
|
| "createWorkspace"
|
|
| "fetchWorkspaces"
|
|
| "getPaseoWorktreeList"
|
|
| "getDaemonConfig"
|
|
| "inspectWorkspaceRecovery"
|
|
| "listProjects"
|
|
| "on"
|
|
| "patchDaemonConfig"
|
|
| "removeProject"
|
|
>;
|
|
|
|
type CreateWorkspacePayload = Awaited<ReturnType<NewWorkspaceDaemonClient["createWorkspace"]>>;
|
|
type WorkspacePayload = Pick<CreateWorkspacePayload, "error" | "workspace">;
|
|
type WorkspaceDescriptor = NonNullable<CreateWorkspacePayload["workspace"]>;
|
|
|
|
export interface OpenedProject {
|
|
workspaceId: string;
|
|
projectId: string;
|
|
projectKey: string;
|
|
projectDisplayName: string;
|
|
workspaceName: string;
|
|
workspaceDirectory: string;
|
|
}
|
|
|
|
function requireWorkspace(payload: WorkspacePayload) {
|
|
if (payload.error) {
|
|
throw new Error(payload.error);
|
|
}
|
|
if (!payload.workspace) {
|
|
throw new Error("workspace.create returned no workspace.");
|
|
}
|
|
return payload.workspace;
|
|
}
|
|
|
|
async function openedProjectFromWorkspace(
|
|
client: NewWorkspaceDaemonClient,
|
|
workspace: WorkspaceDescriptor,
|
|
): Promise<OpenedProject> {
|
|
const payload = await client.listProjects();
|
|
const project = payload.projects.find((candidate) => candidate.projectId === workspace.projectId);
|
|
if (!project?.projectKey) {
|
|
throw new Error(`Project ${workspace.projectId} has no project key`);
|
|
}
|
|
return {
|
|
workspaceId: workspace.id,
|
|
projectId: workspace.projectId,
|
|
projectKey: project.projectKey,
|
|
projectDisplayName: workspace.projectDisplayName,
|
|
workspaceName: workspace.name,
|
|
workspaceDirectory: workspace.workspaceDirectory,
|
|
};
|
|
}
|
|
|
|
async function fetchWorkspaceById(
|
|
client: NewWorkspaceDaemonClient,
|
|
workspaceId: string,
|
|
): Promise<WorkspaceDescriptor | null> {
|
|
const payload = await client.fetchWorkspaces();
|
|
return payload.entries.find((entry) => entry.id === workspaceId) ?? null;
|
|
}
|
|
|
|
async function waitForWorkspaceDescriptor(
|
|
client: NewWorkspaceDaemonClient,
|
|
workspaceId: string,
|
|
): Promise<WorkspaceDescriptor> {
|
|
const deadline = Date.now() + 30_000;
|
|
while (Date.now() < deadline) {
|
|
const workspace = await fetchWorkspaceById(client, workspaceId);
|
|
if (workspace) {
|
|
return workspace;
|
|
}
|
|
await new Promise((resolve) => setTimeout(resolve, 250));
|
|
}
|
|
throw new Error(`Workspace descriptor not found: ${workspaceId}`);
|
|
}
|
|
|
|
function parseWorkspaceIdFromPageUrl(page: Page, serverId: string): string | null {
|
|
const pathname = new URL(page.url()).pathname;
|
|
const match = pathname.match(
|
|
new RegExp(`^/h/${serverId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/workspace/([^/?#]+)`),
|
|
);
|
|
if (!match?.[1]) {
|
|
return null;
|
|
}
|
|
return decodeWorkspaceIdFromPathSegment(match[1]);
|
|
}
|
|
|
|
export async function connectNewWorkspaceDaemonClient(options?: {
|
|
port?: number;
|
|
}): Promise<NewWorkspaceDaemonClient> {
|
|
return connectDaemonClient<NewWorkspaceDaemonClient>({
|
|
clientIdPrefix: "app-e2e-new-workspace",
|
|
port: options?.port,
|
|
});
|
|
}
|
|
|
|
export async function openProjectViaDaemon(
|
|
client: NewWorkspaceDaemonClient,
|
|
repoPath: string,
|
|
): Promise<OpenedProject> {
|
|
const workspace = requireWorkspace(
|
|
await client.createWorkspace({
|
|
source: { kind: "directory", path: repoPath },
|
|
}),
|
|
);
|
|
return openedProjectFromWorkspace(client, workspace);
|
|
}
|
|
|
|
export async function archiveWorkspaceFromDaemon(
|
|
client: NewWorkspaceDaemonClient,
|
|
workspaceDirectory: string,
|
|
options?: { scope?: "workspace" | "worktree" },
|
|
): Promise<void> {
|
|
const payload = await client.archivePaseoWorktree({
|
|
worktreePath: workspaceDirectory,
|
|
...(options?.scope !== undefined ? { scope: options.scope } : {}),
|
|
});
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
if (!payload.success) {
|
|
throw new Error(`Failed to archive workspace: ${workspaceDirectory}`);
|
|
}
|
|
}
|
|
|
|
export async function archiveLocalWorkspaceFromDaemon(
|
|
client: NewWorkspaceDaemonClient,
|
|
workspaceId: string,
|
|
): Promise<void> {
|
|
const payload = await client.archiveWorkspace(workspaceId);
|
|
if (payload.error) {
|
|
throw new Error(payload.error);
|
|
}
|
|
if (!payload.archivedAt) {
|
|
throw new Error(`Failed to archive workspace: ${workspaceId}`);
|
|
}
|
|
}
|
|
|
|
export async function createWorktreeViaDaemon(
|
|
client: NewWorkspaceDaemonClient,
|
|
input: { cwd: string; slug: string },
|
|
): Promise<OpenedProject> {
|
|
const payload = await client.createPaseoWorktree({
|
|
cwd: input.cwd,
|
|
worktreeSlug: input.slug,
|
|
});
|
|
const workspace = requireWorkspace(payload);
|
|
return openedProjectFromWorkspace(client, workspace);
|
|
}
|
|
|
|
export async function openNewWorkspaceComposer(
|
|
page: Page,
|
|
input: { projectKey: string; projectDisplayName: string },
|
|
): Promise<void> {
|
|
const projectRow = page.getByTestId(`sidebar-project-row-${input.projectKey}`).first();
|
|
await expect(projectRow).toBeVisible({ timeout: 30_000 });
|
|
await projectRow.hover();
|
|
|
|
const button = page.getByTestId(`sidebar-project-new-worktree-${input.projectKey}`).first();
|
|
await expect(button).toBeVisible({ timeout: 30_000 });
|
|
await button.click();
|
|
|
|
await expect(page).toHaveURL(/\/new(?:\?.*)?$/, {
|
|
timeout: 30_000,
|
|
});
|
|
}
|
|
|
|
export async function openGlobalNewWorkspaceComposer(page: Page): Promise<void> {
|
|
await page.getByTestId("sidebar-global-new-workspace").click();
|
|
|
|
await expect(page).toHaveURL(/\/new(?:\?.*)?$/, {
|
|
timeout: 30_000,
|
|
});
|
|
}
|
|
|
|
export async function openNewWorkspaceProjectPickerWithShortcut(page: Page): Promise<void> {
|
|
await page.keyboard.press("Control+P");
|
|
|
|
const searchInput = page.getByPlaceholder("Search projects");
|
|
await expect(searchInput).toBeVisible({ timeout: 30_000 });
|
|
await expect(searchInput).toBeFocused();
|
|
}
|
|
|
|
export async function expectNewWorkspaceProjectSelected(
|
|
page: Page,
|
|
projectDisplayName: string,
|
|
): Promise<void> {
|
|
const projectPicker = page.getByRole("button", { name: "Workspace project" });
|
|
await expect(projectPicker).toBeVisible({ timeout: 30_000 });
|
|
await expect(projectPicker).toContainText(projectDisplayName);
|
|
}
|
|
|
|
export async function fillNewWorkspaceDraft(page: Page, draft: string): Promise<void> {
|
|
const composer = page.getByRole("textbox", { name: "Message agent..." });
|
|
await expect(composer).toBeVisible({ timeout: 30_000 });
|
|
await composer.fill(draft);
|
|
}
|
|
|
|
export async function expectNewWorkspaceDraft(page: Page, draft: string): Promise<void> {
|
|
await expect(page.getByRole("textbox", { name: "Message agent..." })).toHaveValue(draft);
|
|
}
|
|
|
|
export async function selectNewWorkspaceHost(page: Page, hostLabel: string): Promise<void> {
|
|
await page.getByTestId("host-picker-trigger").click();
|
|
await page.getByText(hostLabel, { exact: true }).click();
|
|
}
|
|
|
|
export async function submitNewWorkspacePrompt(
|
|
page: Page,
|
|
prompt = "Hello from e2e",
|
|
): Promise<void> {
|
|
const composer = page.getByRole("textbox", { name: "Message agent..." });
|
|
await expect(composer).toBeVisible({ timeout: 30_000 });
|
|
await composer.fill(prompt);
|
|
const createButton = page
|
|
.getByTestId("message-input-root")
|
|
.getByRole("button", { name: "Create" });
|
|
await expect(createButton).toBeVisible({ timeout: 30_000 });
|
|
await createButton.click();
|
|
}
|
|
|
|
export async function clickNewWorkspaceButton(
|
|
page: Page,
|
|
input: { projectKey: string; projectDisplayName: string; prompt?: string },
|
|
): Promise<void> {
|
|
await openNewWorkspaceComposer(page, input);
|
|
await submitNewWorkspacePrompt(page, input.prompt);
|
|
}
|
|
|
|
export async function selectNewWorkspaceProject(
|
|
page: Page,
|
|
input: { projectKey: string; projectDisplayName: string },
|
|
): Promise<void> {
|
|
const trigger = page.getByTestId("new-workspace-project-picker-trigger");
|
|
await expect(trigger).toBeVisible({ timeout: 30_000 });
|
|
await trigger.click();
|
|
|
|
const option = page.getByTestId(`new-workspace-project-picker-option-${input.projectKey}`);
|
|
await expect(option).toBeVisible({ timeout: 30_000 });
|
|
await option.click();
|
|
|
|
await expectNewWorkspaceProjectSelected(page, input.projectDisplayName);
|
|
}
|
|
|
|
// The isolation trigger renders the active isolation's label ("Local" / "New
|
|
// worktree"), so asserting its text proves what the screen currently remembers.
|
|
const ISOLATION_TRIGGER_LABEL: Record<"local" | "worktree", string> = {
|
|
local: "Local",
|
|
worktree: "New worktree",
|
|
};
|
|
|
|
export async function expectWorkspaceIsolationSelected(
|
|
page: Page,
|
|
isolation: "local" | "worktree",
|
|
): Promise<void> {
|
|
const trigger = page.getByRole("button", { name: "Workspace isolation" });
|
|
await expect(trigger).toBeVisible({ timeout: 30_000 });
|
|
await expect(trigger).toContainText(ISOLATION_TRIGGER_LABEL[isolation]);
|
|
}
|
|
|
|
export async function selectWorkspaceIsolation(
|
|
page: Page,
|
|
isolation: "local" | "worktree",
|
|
): Promise<void> {
|
|
const trigger = page.getByTestId("workspace-create-isolation-trigger");
|
|
await expect(trigger).toBeVisible({ timeout: 30_000 });
|
|
await trigger.click();
|
|
|
|
// "New worktree" is only listed once the checkout status query confirms the
|
|
// selected project is a git repo, so wait for the option to appear before
|
|
// clicking it.
|
|
const option = page.getByTestId(`workspace-create-isolation-${isolation}`);
|
|
await expect(option).toBeVisible({ timeout: 30_000 });
|
|
await option.click();
|
|
}
|
|
|
|
export async function submitNewWorkspaceEmpty(page: Page): Promise<void> {
|
|
const createButton = page
|
|
.getByTestId("message-input-root")
|
|
.getByRole("button", { name: "Create" });
|
|
await expect(createButton).toBeVisible({ timeout: 30_000 });
|
|
await createButton.click();
|
|
}
|
|
|
|
export async function openStartingRefPicker(page: Page): Promise<void> {
|
|
const trigger = page.getByTestId("new-workspace-ref-picker-trigger");
|
|
await expect(trigger).toBeVisible({ timeout: 30_000 });
|
|
await trigger.click();
|
|
}
|
|
|
|
export async function selectBranchInPicker(page: Page, name: string): Promise<void> {
|
|
const branchRow = page.getByTestId(`new-workspace-ref-picker-branch-${name}`);
|
|
await expect(branchRow).toBeVisible({ timeout: 30_000 });
|
|
await branchRow.click();
|
|
}
|
|
|
|
export async function searchAndSelectBranchInPicker(page: Page, name: string): Promise<void> {
|
|
const searchInput = page.getByPlaceholder("Search branches and PRs");
|
|
await expect(searchInput).toBeVisible({ timeout: 30_000 });
|
|
await searchInput.fill(name);
|
|
await selectBranchInPicker(page, name);
|
|
}
|
|
|
|
export async function selectGitHubPrInPicker(page: Page, number: number): Promise<void> {
|
|
const prRow = page.getByTestId(`new-workspace-ref-picker-pr-${number}`);
|
|
await expect(prRow).toBeVisible({ timeout: 30_000 });
|
|
await prRow.click();
|
|
}
|
|
|
|
export async function expectStartingRefPickerTriggerPr(
|
|
page: Page,
|
|
input: { number: number; title: string; headRef: string },
|
|
): Promise<void> {
|
|
const trigger = page.getByRole("button", { name: "Starting ref" });
|
|
await expect(trigger).toContainText(`#${input.number}`);
|
|
await expect(trigger).toContainText(input.title);
|
|
await expect(trigger).not.toContainText(input.headRef);
|
|
}
|
|
|
|
export async function openBranchPicker(page: Page): Promise<void> {
|
|
const trigger = page.getByRole("button", { name: "Starting ref" });
|
|
await expect(trigger).toBeVisible({ timeout: 30_000 });
|
|
await trigger.click();
|
|
}
|
|
|
|
export async function selectPickerOptionByKeyboard(page: Page, label: string): Promise<void> {
|
|
const searchInput = page.getByPlaceholder("Search branches and PRs");
|
|
await expect(searchInput).toBeVisible({ timeout: 30_000 });
|
|
await page.keyboard.type(label);
|
|
await expect(page.getByTestId(`new-workspace-ref-picker-branch-${label}`)).toBeVisible({
|
|
timeout: 10_000,
|
|
});
|
|
await page.keyboard.press("Enter");
|
|
}
|
|
|
|
export async function closeBranchPicker(page: Page): Promise<void> {
|
|
await page.keyboard.press("Escape");
|
|
}
|
|
|
|
export async function expectPickerOpen(page: Page): Promise<void> {
|
|
await expect(page.getByTestId("combobox-desktop-container")).toBeVisible({ timeout: 30_000 });
|
|
}
|
|
|
|
export async function expectPickerClosed(page: Page): Promise<void> {
|
|
await expect(page.getByTestId("combobox-desktop-container")).not.toBeVisible({
|
|
timeout: 30_000,
|
|
});
|
|
}
|
|
|
|
export async function expectPickerSelected(page: Page, label: string): Promise<void> {
|
|
const trigger = page.getByRole("button", { name: "Starting ref" });
|
|
await expect(trigger).toContainText(label);
|
|
}
|
|
|
|
export async function expectComposerGithubAttachmentPill(
|
|
page: Page,
|
|
input: { number: number; title: string },
|
|
): Promise<void> {
|
|
const pills = page.getByTestId("composer-github-attachment-pill");
|
|
await expect(pills).toHaveCount(1);
|
|
await expect(pills.first()).toContainText(`#${input.number}`);
|
|
await expect(pills.first()).toContainText(input.title);
|
|
}
|
|
|
|
export async function pasteGithubPrUrl(
|
|
page: Page,
|
|
context: BrowserContext,
|
|
url: string,
|
|
): Promise<void> {
|
|
const composer = page.getByRole("textbox", { name: "Message agent..." });
|
|
await context.grantPermissions(["clipboard-read", "clipboard-write"]);
|
|
await page.evaluate((value) => navigator.clipboard.writeText(value), url);
|
|
await composer.focus();
|
|
await page.keyboard.press("Control+V");
|
|
}
|
|
|
|
export async function assertNewWorkspaceSidebarAndHeader(
|
|
page: Page,
|
|
input: {
|
|
serverId: string;
|
|
client: NewWorkspaceDaemonClient;
|
|
previousWorkspaceId: string;
|
|
projectDisplayName: string;
|
|
assertSidebarRow?: boolean;
|
|
assertHeader?: boolean;
|
|
},
|
|
): Promise<{ workspaceId: string; workspaceName: string; workspaceDirectory: string }> {
|
|
// URL is the source of truth so concurrent sidebar rows cannot satisfy this.
|
|
await expect
|
|
.poll(
|
|
() => {
|
|
const workspaceId = parseWorkspaceIdFromPageUrl(page, input.serverId);
|
|
return workspaceId && workspaceId !== input.previousWorkspaceId ? workspaceId : null;
|
|
},
|
|
{ timeout: 60_000 },
|
|
)
|
|
.not.toBeNull();
|
|
|
|
const workspaceId = parseWorkspaceIdFromPageUrl(page, input.serverId);
|
|
if (!workspaceId || workspaceId === input.previousWorkspaceId) {
|
|
throw new Error(`Expected URL to redirect to a new workspace.\nCurrent URL: ${page.url()}`);
|
|
}
|
|
|
|
const workspace = await waitForWorkspaceDescriptor(input.client, workspaceId);
|
|
|
|
if (input.assertSidebarRow !== false) {
|
|
const createdWorkspaceRow = page.getByTestId(
|
|
`sidebar-workspace-row-${input.serverId}:${workspace.id}`,
|
|
);
|
|
await expect(createdWorkspaceRow.first()).toBeVisible({ timeout: 30_000 });
|
|
}
|
|
|
|
if (input.assertHeader !== false) {
|
|
await expectWorkspaceHeader(page, {
|
|
title: workspace.name,
|
|
subtitle: input.projectDisplayName,
|
|
});
|
|
}
|
|
|
|
return {
|
|
workspaceId: workspace.id,
|
|
workspaceName: workspace.name,
|
|
workspaceDirectory: workspace.workspaceDirectory,
|
|
};
|
|
}
|
|
|
|
type WebSocketMessage = string | Buffer;
|
|
|
|
function parseWebSocketJson(message: WebSocketMessage): unknown {
|
|
const rawMessage = typeof message === "string" ? message : message.toString("utf8");
|
|
try {
|
|
return JSON.parse(rawMessage);
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function getSessionMessage(message: WebSocketMessage): Record<string, unknown> | null {
|
|
const envelope = parseWebSocketJson(message);
|
|
if (!envelope || typeof envelope !== "object") {
|
|
return null;
|
|
}
|
|
const maybeEnvelope = envelope as { type?: unknown; message?: unknown };
|
|
if (maybeEnvelope.type !== "session" || !maybeEnvelope.message) {
|
|
return null;
|
|
}
|
|
if (typeof maybeEnvelope.message !== "object") {
|
|
return null;
|
|
}
|
|
return maybeEnvelope.message as Record<string, unknown>;
|
|
}
|
|
|
|
function getStringField(input: Record<string, unknown>, key: string): string | null {
|
|
const value = input[key];
|
|
return typeof value === "string" ? value : null;
|
|
}
|
|
|
|
export interface AgentCreatedDelayControl {
|
|
release(): void;
|
|
waitForCreateRequest(): Promise<void>;
|
|
waitForDelayedCreatedStatus(): Promise<void>;
|
|
}
|
|
|
|
export async function delayBrowserAgentCreatedStatus(
|
|
page: Page,
|
|
): Promise<AgentCreatedDelayControl> {
|
|
const daemonPortPattern = daemonWsRoutePattern();
|
|
const createRequestIds = new Set<string>();
|
|
const delayedForwards: Array<() => void> = [];
|
|
let releaseRequested = false;
|
|
let resolveCreateRequest: (() => void) | null = null;
|
|
let resolveDelayedCreatedStatus: (() => void) | null = null;
|
|
const createRequestSeen = new Promise<void>((resolve) => {
|
|
resolveCreateRequest = resolve;
|
|
});
|
|
const delayedCreatedStatusSeen = new Promise<void>((resolve) => {
|
|
resolveDelayedCreatedStatus = resolve;
|
|
});
|
|
|
|
await page.routeWebSocket(daemonPortPattern, (ws) => {
|
|
const server = ws.connectToServer();
|
|
|
|
ws.onMessage((message) => {
|
|
const sessionMessage = getSessionMessage(message);
|
|
if (sessionMessage?.type === "create_agent_request") {
|
|
const requestId = getStringField(sessionMessage, "requestId");
|
|
if (requestId) {
|
|
createRequestIds.add(requestId);
|
|
resolveCreateRequest?.();
|
|
}
|
|
}
|
|
server.send(message);
|
|
});
|
|
|
|
server.onMessage((message) => {
|
|
const sessionMessage = getSessionMessage(message);
|
|
const payload =
|
|
sessionMessage?.type === "status" && typeof sessionMessage.payload === "object"
|
|
? (sessionMessage.payload as Record<string, unknown>)
|
|
: null;
|
|
const requestId = payload ? getStringField(payload, "requestId") : null;
|
|
|
|
if (payload?.status === "agent_created" && requestId && createRequestIds.has(requestId)) {
|
|
resolveDelayedCreatedStatus?.();
|
|
if (releaseRequested) {
|
|
ws.send(message);
|
|
return;
|
|
}
|
|
delayedForwards.push(() => ws.send(message));
|
|
return;
|
|
}
|
|
|
|
ws.send(message);
|
|
});
|
|
});
|
|
|
|
return {
|
|
release() {
|
|
releaseRequested = true;
|
|
for (const forward of delayedForwards.splice(0)) {
|
|
forward();
|
|
}
|
|
},
|
|
waitForCreateRequest: () => createRequestSeen,
|
|
waitForDelayedCreatedStatus: () => delayedCreatedStatusSeen,
|
|
};
|
|
}
|