Merge branch 'v2/main' into v2/fix/1919-rfc6570-uri-template-expansion

clients/web/src/components/elements/CategoryBadge/CategoryBadge.stories.tsx

@@ -14,7 +14,7 @@ export const Transport: Story = {
   args: { category: "transport" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("transport")).toBeInTheDocument();
+    await expect(canvas.getByText("transport")).toBeInTheDocument();
   },
 };
 
@@ -22,6 +22,6 @@ export const Auth: Story = {
   args: { category: "auth" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("auth")).toBeInTheDocument();
+    await expect(canvas.getByText("auth")).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/EmbeddableScrollArea/EmbeddableScrollArea.stories.tsx

@@ -24,7 +24,7 @@ export const FullSize: Story = {
   ),
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("Row 1")).toBeInTheDocument();
+    await expect(canvas.getByText("Row 1")).toBeInTheDocument();
   },
 };
 
@@ -38,6 +38,6 @@ export const Embedded: Story = {
   ),
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("Row 1")).toBeInTheDocument();
+    await expect(canvas.getByText("Row 1")).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/ExpandToggle/ExpandToggle.stories.tsx

@@ -15,7 +15,9 @@ export const Collapsed: Story = {
   args: { expanded: false },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByRole("button", { name: "Expand" })).toBeInTheDocument();
+    await expect(
+      canvas.getByRole("button", { name: "Expand" }),
+    ).toBeInTheDocument();
   },
 };
 
@@ -23,7 +25,7 @@ export const Expanded: Story = {
   args: { expanded: true },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByRole("button", { name: "Collapse" }),
     ).toBeInTheDocument();
   },

clients/web/src/components/elements/McpErrorBadge/McpErrorBadge.stories.tsx

@@ -14,7 +14,7 @@ export const HeaderMismatch: Story = {
   args: { code: -32020, name: "HeaderMismatch" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("-32020 HeaderMismatch")).toBeInTheDocument();
+    await expect(canvas.getByText("-32020 HeaderMismatch")).toBeInTheDocument();
   },
 };
 
@@ -22,7 +22,7 @@ export const MissingCapability: Story = {
   args: { code: -32021, name: "MissingRequiredClientCapability" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByText("-32021 MissingRequiredClientCapability"),
     ).toBeInTheDocument();
   },
@@ -32,7 +32,7 @@ export const UnsupportedVersion: Story = {
   args: { code: -32022, name: "UnsupportedProtocolVersion" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByText("-32022 UnsupportedProtocolVersion"),
     ).toBeInTheDocument();
   },
@@ -47,6 +47,6 @@ export const MethodNotFound: Story = {
   },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("-32601 MethodNotFound")).toBeInTheDocument();
+    await expect(canvas.getByText("-32601 MethodNotFound")).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/MessageDirectionBadge/MessageDirectionBadge.stories.tsx

@@ -14,7 +14,7 @@ export const Outgoing: Story = {
   args: { direction: "outgoing" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("client → server")).toBeInTheDocument();
+    await expect(canvas.getByText("client → server")).toBeInTheDocument();
   },
 };
 
@@ -22,6 +22,6 @@ export const Incoming: Story = {
   args: { direction: "incoming" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("server → client")).toBeInTheDocument();
+    await expect(canvas.getByText("server → client")).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/MethodBadge/MethodBadge.stories.tsx

@@ -14,7 +14,7 @@ export const ToolsList: Story = {
   args: { method: "tools/list" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("tools/list")).toBeInTheDocument();
+    await expect(canvas.getByText("tools/list")).toBeInTheDocument();
   },
 };
 
@@ -22,6 +22,6 @@ export const TasksList: Story = {
   args: { method: "tasks/list" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("tasks/list")).toBeInTheDocument();
+    await expect(canvas.getByText("tasks/list")).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/MonitoringToggle/MonitoringToggle.stories.tsx

@@ -15,7 +15,7 @@ export const Closed: Story = {
   args: { open: false },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByRole("button", { name: "Open monitoring sidebar" }),
     ).toBeInTheDocument();
   },
@@ -25,7 +25,7 @@ export const Open: Story = {
   args: { open: true },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByRole("button", { name: "Close monitoring sidebar" }),
     ).toBeInTheDocument();
   },

clients/web/src/components/elements/PinToggle/PinToggle.stories.tsx

@@ -15,7 +15,9 @@ export const Unpinned: Story = {
   args: { pinned: false },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByRole("button", { name: "Pin" })).toBeInTheDocument();
+    await expect(
+      canvas.getByRole("button", { name: "Pin" }),
+    ).toBeInTheDocument();
   },
 };
 
@@ -23,6 +25,8 @@ export const Pinned: Story = {
   args: { pinned: true },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByRole("button", { name: "Unpin" })).toBeInTheDocument();
+    await expect(
+      canvas.getByRole("button", { name: "Unpin" }),
+    ).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/ReplayButton/ReplayButton.stories.tsx

@@ -14,6 +14,8 @@ type Story = StoryObj<typeof ReplayButton>;
 export const Default: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByRole("button", { name: "Replay" })).toBeInTheDocument();
+    await expect(
+      canvas.getByRole("button", { name: "Replay" }),
+    ).toBeInTheDocument();
   },
 };

clients/web/src/components/elements/ResizeHandle/ResizeHandle.stories.tsx

@@ -44,7 +44,7 @@ export const Default: Story = {
   render: () => <ResizeDemo />,
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByRole("separator", { name: "Resize demo panel" }),
     ).toBeInTheDocument();
   },

clients/web/src/components/elements/ScreenStage/ScreenStage.stories.tsx

@@ -48,7 +48,7 @@ export const FillsHostWidth: Story = {
     // sharper discriminator: a row flex leaves the layer full-width while
     // collapsing the child to the single "x").
     const layer = child.parentElement as HTMLElement;
-    expect(child.getBoundingClientRect().width).toBeCloseTo(
+    await expect(child.getBoundingClientRect().width).toBeCloseTo(
       layer.getBoundingClientRect().width,
       0,
     );
@@ -77,11 +77,11 @@ export const FillVariant: Story = {
     // Width still stretches onto the child (relative to the layer, as above);
     // the `fill` height comes from `bottom: 0` making the layer span the host.
     const layer = child.parentElement as HTMLElement;
-    expect(child.getBoundingClientRect().width).toBeCloseTo(
+    await expect(child.getBoundingClientRect().width).toBeCloseTo(
       layer.getBoundingClientRect().width,
       0,
     );
-    expect(layer.getBoundingClientRect().height).toBeGreaterThan(160 - 4);
+    await expect(layer.getBoundingClientRect().height).toBeGreaterThan(160 - 4);
   },
 };
 
@@ -97,6 +97,6 @@ export const Inactive: Story = {
   ),
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.queryByTestId("stage-child")).not.toBeInTheDocument();
+    await expect(canvas.queryByTestId("stage-child")).not.toBeInTheDocument();
   },
 };

clients/web/src/components/groups/ConnectionInfoContent/ConnectionInfoContent.stories.tsx

@@ -114,8 +114,10 @@ export const ServerInfoNotReported: Story = {
   },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.queryByText("my-catalog-name")).not.toBeInTheDocument();
-    expect(canvas.getAllByText(SERVER_INFO_NOT_REPORTED_LABEL)).toHaveLength(2);
+    await expect(canvas.queryByText("my-catalog-name")).not.toBeInTheDocument();
+    await expect(
+      canvas.getAllByText(SERVER_INFO_NOT_REPORTED_LABEL),
+    ).toHaveLength(2);
   },
 };
 
@@ -195,11 +197,11 @@ export const WithOAuthIdToken: Story = {
   },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("ID Token")).toBeInTheDocument();
+    await expect(canvas.getByText("ID Token")).toBeInTheDocument();
     // Only the ID token is a JWT here, so exactly one decode toggle is offered.
     await userEvent.click(
       canvas.getByRole("button", { name: "Decode JWT for ID Token" }),
     );
-    expect(canvas.getByText(/"sub": "user-42"/)).toBeInTheDocument();
+    await expect(canvas.getByText(/"sub": "user-42"/)).toBeInTheDocument();
   },
 };

clients/web/src/components/groups/LogStreamPanel/LogStreamPanel.stories.tsx

@@ -77,6 +77,6 @@ export const WithEntries: Story = {
   },
   // List scrollbar reserves a gutter and stays hidden when idle (#1474).
   play: async ({ canvasElement }) => {
-    expectScrollbarGutterIdleHidden(canvasElement);
+    await expectScrollbarGutterIdleHidden(canvasElement);
   },
 };

clients/web/src/components/groups/MessageDirectionFilter/MessageDirectionFilter.stories.tsx

@@ -31,10 +31,10 @@ export const AllVisible: Story = {
   args: { visibleDirections: { client: true, server: true } },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(
+    await expect(
       canvas.getByRole("button", { name: "client → server" }),
     ).toBeInTheDocument();
-    expect(
+    await expect(
       canvas.getByRole("button", { name: "Deselect All" }),
     ).toBeInTheDocument();
   },

clients/web/src/components/groups/MonitoringControls/MonitoringControls.stories.tsx

@@ -20,7 +20,7 @@ type Story = StoryObj<typeof MonitoringControls>;
 export const AllTabs: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByRole("radio", { name: "Logs" })).toBeChecked();
+    await expect(canvas.getByRole("radio", { name: "Logs" })).toBeChecked();
   },
 };
 
@@ -28,6 +28,6 @@ export const StdioServer: Story = {
   args: { tabs: ["Logs", "Protocol"], value: "Protocol" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.queryByRole("radio", { name: "Network" })).toBeNull();
+    await expect(canvas.queryByRole("radio", { name: "Network" })).toBeNull();
   },
 };

clients/web/src/components/groups/MonitoringScreen/MonitoringScreen.stories.tsx

@@ -47,7 +47,7 @@ type Story = StoryObj<typeof MonitoringScreen>;
 export const Logs: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("Log stream")).toBeInTheDocument();
+    await expect(canvas.getByText("Log stream")).toBeInTheDocument();
   },
 };
 
@@ -55,6 +55,6 @@ export const Protocol: Story = {
   args: { value: "Protocol" },
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement);
-    expect(canvas.getByText("Request history")).toBeInTheDocument();
+    await expect(canvas.getByText("Request history")).toBeInTheDocument();
   },
 };

clients/web/src/components/groups/NetworkStreamPanel/NetworkStreamPanel.stories.tsx

@@ -50,7 +50,7 @@ export const WithEntries: Story = {
   args: { entries: sample },
   // List scrollbar reserves a gutter and stays hidden when idle (#1474).
   play: async ({ canvasElement }) => {
-    expectScrollbarGutterIdleHidden(canvasElement);
+    await expectScrollbarGutterIdleHidden(canvasElement);
   },
 };
 

clients/web/src/components/groups/OutputValidationModal/OutputValidationModal.stories.tsx

@@ -45,14 +45,14 @@ export const Default: Story = {
     // Mantine renders the modal in a portal at document.body.
     const body = within(canvasElement.ownerDocument.body);
     await body.findByText("Output schema validation");
-    expect(body.getByText(/open_pattern_editor/)).toBeInTheDocument();
+    await expect(body.getByText(/open_pattern_editor/)).toBeInTheDocument();
     const details = body.getByLabelText(
       "Validation details",
     ) as HTMLTextAreaElement;
-    expect(details.value).toContain(
+    await expect(details.value).toContain(
       "data/samples/0 must NOT have additional properties",
     );
-    expect(details.readOnly).toBe(true);
+    await expect(details.readOnly).toBe(true);
   },
 };
 

clients/web/src/components/groups/PendingClientRequestModal/PendingClientRequestModal.stories.tsx

@@ -122,11 +122,11 @@ export const Sampling: Story = {
   play: async ({ canvasElement, args }) => {
     const body = within(canvasElement.ownerDocument.body);
     await body.findByText("Sampling Request");
-    expect(
+    await expect(
       body.getByText("The server is requesting an LLM completion."),
     ).toBeInTheDocument();
     await userEvent.click(body.getByRole("button", { name: "Send Response" }));
-    expect(args.onSamplingRespond).toHaveBeenCalled();
+    await expect(args.onSamplingRespond).toHaveBeenCalled();
   },
 };
 
@@ -144,8 +144,8 @@ export const SamplingInputRequired: Story = {
   play: async ({ canvasElement }) => {
     const body = within(canvasElement.ownerDocument.body);
     await body.findByText("Sampling Request");
-    expect(body.getByText("input_required")).toBeInTheDocument();
-    expect(body.getByText(/sent back as a retry/i)).toBeInTheDocument();
+    await expect(body.getByText("input_required")).toBeInTheDocument();
+    await expect(body.getByText(/sent back as a retry/i)).toBeInTheDocument();
   },
 };
 
@@ -172,11 +172,11 @@ export const ElicitationForm: Story = {
   play: async ({ canvasElement, args }) => {
     const body = within(canvasElement.ownerDocument.body);
     await body.findByText("Elicitation Request");
-    expect(
+    await expect(
       body.getByText(/Please provide your database connection details/),
     ).toBeInTheDocument();
     await userEvent.click(body.getByRole("button", { name: "Submit" }));
-    expect(args.onElicitationRespond).toHaveBeenCalledWith({
+    await expect(args.onElicitationRespond).toHaveBeenCalledWith({
       action: "accept",
       content: {},
     });
@@ -207,7 +207,7 @@ export const ElicitationUrl: Story = {
   play: async ({ canvasElement }) => {
     const body = within(canvasElement.ownerDocument.body);
     await body.findByText("Elicitation Request");
-    expect(
+    await expect(
       body.getByText("https://example.com/authorize?token=abc123"),
     ).toBeInTheDocument();
   },

clients/web/src/components/groups/ProtocolListPanel/ProtocolListPanel.stories.tsx

@@ -107,7 +107,7 @@ export const WithEntries: Story = {
   // bar never overlays the cards, and uses type="scroll" so it stays hidden
   // when idle rather than appearing on hover (#1474).
   play: async ({ canvasElement }) => {
-    expectScrollbarGutterIdleHidden(canvasElement);
+    await expectScrollbarGutterIdleHidden(canvasElement);
   },
 };