@stigmer/react 3.1.12 → 3.1.14

package/src/sharing/__tests__/ShareAgentDialog.test.tsx

@@ -1,9 +1,10 @@
 import { describe, it, expect, vi, beforeAll, afterEach } from "vitest";
 import { render, screen, fireEvent, waitFor, cleanup } from "@testing-library/react";
 import type { ReactNode } from "react";
+import { Code } from "@connectrpc/connect";
 import { AgentShareAudience } from "@stigmer/protos/ai/stigmer/agentic/agentshare/v1/spec_pb";
 import { ApiResourceVisibility } from "@stigmer/protos/ai/stigmer/commons/apiresource/enum_pb";
-import type { AgentShareInput } from "@stigmer/sdk";
+import { StigmerError, type AgentShareInput } from "@stigmer/sdk";
 import { StigmerContext } from "../../context";
 import { FetchCacheContext } from "../../internal/FetchCacheProvider";
 import { DeploymentModeContext } from "../../deployment-mode";
@@ -27,7 +28,6 @@ beforeAll(() => {
 afterEach(cleanup);
 
 interface MockOverrides {
-  getByAgent?: (input: unknown) => Promise<unknown>;
   apply?: (input: AgentShareInput) => Promise<unknown>;
   rotateShareLink?: (input: unknown) => Promise<unknown>;
   getOrCreateBillingAccount?: (orgId: string) => Promise<unknown>;
@@ -37,9 +37,6 @@ interface MockOverrides {
 function createMockStigmer(overrides: MockOverrides = {}) {
   return {
     agentShare: {
-      getByAgent:
-        overrides.getByAgent ??
-        vi.fn().mockResolvedValue({ totalCount: 0, items: [] }),
       apply: overrides.apply ?? vi.fn().mockResolvedValue({}),
       rotateShareLink:
         overrides.rotateShareLink ?? vi.fn().mockResolvedValue({}),
@@ -129,11 +126,7 @@ function makeShare(
     },
     spec: { agentRef: { org: "acme", slug: "support-agent" }, ...spec },
     ...(shareLinkToken !== undefined ? { status: { shareLinkToken } } : {}),
-  };
-}
-
-function withShare(share: unknown) {
-  return vi.fn().mockResolvedValue({ totalCount: 1, items: [share] });
+  } as never;
 }
 
 function orgSharedEnv(slug: string, name?: string) {
@@ -150,8 +143,8 @@ function orgSharedEnv(slug: string, name?: string) {
 const buildShareUrl = (org: string, slug: string) =>
   `https://app.example.com/chat/${org}/${slug}`;
 
-/** Render the open dialog and wait for the share load to settle. */
-async function renderOpenDialog(
+/** Render the dialog open. Pass `share` for edit mode; omit for create mode. */
+function renderOpenDialog(
   client: unknown,
   props?: Partial<Parameters<typeof ShareAgentDialog>[0]> & { mode?: "cloud" | "local" },
 ) {
@@ -167,96 +160,31 @@ async function renderOpenDialog(
       />
     </Providers>,
   );
-  await waitFor(() =>
-    expect(screen.queryByLabelText("Loading sharing settings")).toBeNull(),
-  );
 }
 
 describe("ShareAgentDialog", () => {
-  it("mounts no body while closed (share and billing fetches stay lazy)", () => {
-    const getByAgent = vi.fn();
+  it("mounts no body while closed (billing fetch stays lazy)", () => {
     const getOrCreateBillingAccount = vi.fn();
     render(
-      <Providers
-        client={createMockStigmer({ getByAgent, getOrCreateBillingAccount })}
-      >
+      <Providers client={createMockStigmer({ getOrCreateBillingAccount })}>
         <ShareAgentDialog
           open={false}
           onOpenChange={() => {}}
           agent={makeAgent()}
+          share={makeShare({ enabled: true })}
           buildShareUrl={buildShareUrl}
         />
       </Providers>,
     );
 
     expect(screen.queryByText("Share")).toBeNull();
-    expect(getByAgent).not.toHaveBeenCalled();
     expect(getOrCreateBillingAccount).not.toHaveBeenCalled();
   });
 
-  it("shows a loading state while the share resolves, then the form", async () => {
-    let resolveLoad: (v: unknown) => void = () => {};
-    const getByAgent = vi.fn().mockReturnValue(
-      new Promise((resolve) => {
-        resolveLoad = resolve;
-      }),
-    );
-    render(
-      <Providers client={createMockStigmer({ getByAgent })}>
-        <ShareAgentDialog
-          open
-          onOpenChange={() => {}}
-          agent={makeAgent()}
-          buildShareUrl={buildShareUrl}
-        />
-      </Providers>,
-    );
-
-    expect(screen.getByLabelText("Loading sharing settings")).toBeTruthy();
-    resolveLoad({ totalCount: 1, items: [makeShare({ enabled: true })] });
-    await waitFor(() =>
-      expect(
-        screen.getByText("https://app.example.com/chat/acme/support-agent"),
-      ).toBeTruthy(),
-    );
-  });
-
-  it("offers retry when the share load fails", async () => {
-    const share = makeShare({ enabled: true });
-    const getByAgent = vi
-      .fn()
-      .mockRejectedValueOnce(new Error("backend unavailable"))
-      .mockResolvedValueOnce({ totalCount: 1, items: [share] });
-    render(
-      <Providers client={createMockStigmer({ getByAgent })}>
-        <ShareAgentDialog
-          open
-          onOpenChange={() => {}}
-          agent={makeAgent()}
-          buildShareUrl={buildShareUrl}
-        />
-      </Providers>,
-    );
-
-    // A failed load must never render a form that would create a share
-    // over an existing one the dialog couldn't see.
-    expect(
-      await screen.findByText(/couldn't load this agent's sharing settings/i),
-    ).toBeTruthy();
-
-    fireEvent.click(screen.getByRole("button", { name: "Try again", hidden: true }));
-    await waitFor(() =>
-      expect(
-        screen.getByText("https://app.example.com/chat/acme/support-agent"),
-      ).toBeTruthy(),
-    );
-  });
-
-  it("renders header, toggle, and the share link from buildShareUrl", async () => {
-    const client = createMockStigmer({
-      getByAgent: withShare(makeShare({ enabled: true })),
+  it("renders header, toggle, and the share link from buildShareUrl", () => {
+    renderOpenDialog(createMockStigmer(), {
+      share: makeShare({ enabled: true }),
     });
-    await renderOpenDialog(client);
 
     expect(screen.getByText("Share")).toBeTruthy();
     expect(screen.getByText("Support Agent")).toBeTruthy();
@@ -266,77 +194,190 @@ describe("ShareAgentDialog", () => {
     ).toBeTruthy();
   });
 
-  it("builds the link from the SHARE's slug when it differs from the agent's", async () => {
-    // A manifest-renamed share: the hosted URL lives at the share's slug.
+  it("builds the link from the SHARE's slug when it differs from the agent's", () => {
+    // A renamed share: the hosted URL lives at the share's slug.
     const renamed = {
-      ...makeShare({ enabled: true }),
+      ...(makeShare({ enabled: true }) as Record<string, unknown>),
       metadata: { id: "ash_1", org: "acme", slug: "help-desk", name: "Help Desk" },
-    };
-    const client = createMockStigmer({ getByAgent: withShare(renamed) });
-    await renderOpenDialog(client);
+    } as never;
+    renderOpenDialog(createMockStigmer(), { share: renamed });
 
     expect(
       screen.getByText("https://app.example.com/chat/acme/help-desk"),
     ).toBeTruthy();
   });
 
-  it("falls back to the relative /chat path when buildShareUrl is omitted", async () => {
-    const client = createMockStigmer({
-      getByAgent: withShare(makeShare({ enabled: true })),
+  it("falls back to the relative /chat path when buildShareUrl is omitted", () => {
+    renderOpenDialog(createMockStigmer(), {
+      share: makeShare({ enabled: true }),
+      buildShareUrl: undefined,
     });
-    await renderOpenDialog(client, { buildShareUrl: undefined });
 
     expect(screen.getByText("/chat/acme/support-agent")).toBeTruthy();
   });
 
-  describe("never-shared agent (no share yet)", () => {
-    it("renders the off state with disabled copy affordances", async () => {
-      const client = createMockStigmer();
-      await renderOpenDialog(client);
+  describe("create mode (no share prop)", () => {
+    it("renders the create step with identity prefilled from the agent", () => {
+      renderOpenDialog(createMockStigmer());
 
       expect(
-        screen.getByRole("switch", { hidden: true }).getAttribute("aria-checked"),
-      ).toBe("false");
-      const copy = screen.getByRole("button", {
-        name: "Copy",
-        hidden: true,
-      }) as HTMLButtonElement;
-      expect(copy.disabled).toBe(true);
-      expect(
-        screen.getByText(/sharing is off, so this link doesn't work yet/i),
+        screen.getByRole("heading", { name: "Create share", hidden: true }),
       ).toBeTruthy();
+      expect(
+        (screen.getByLabelText("Name", { selector: "input" }) as HTMLInputElement).value,
+      ).toBe("Support Agent");
+      expect(
+        (screen.getByLabelText("Slug", { selector: "input" }) as HTMLInputElement).value,
+      ).toBe("support-agent");
+      // No channel exists yet — no switch, no link, and the footer offers
+      // Cancel rather than Done.
+      expect(screen.queryByRole("switch", { hidden: true })).toBeNull();
+      expect(screen.getByText("Cancel")).toBeTruthy();
     });
 
-    it("first enable creates the canonical share via apply", async () => {
+    it("auto-derives the slug from the name until the slug is edited", () => {
+      renderOpenDialog(createMockStigmer());
+
+      const name = screen.getByLabelText("Name", { selector: "input" });
+      const slug = screen.getByLabelText("Slug", { selector: "input" }) as HTMLInputElement;
+
+      fireEvent.change(name, { target: { value: "Docs Site Widget" } });
+      expect(slug.value).toBe("docs-site-widget");
+
+      fireEvent.change(slug, { target: { value: "docs-widget" } });
+      fireEvent.change(name, { target: { value: "Renamed Again" } });
+      // Touched slug stays put.
+      expect(slug.value).toBe("docs-widget");
+    });
+
+    it("creates the share live with the chosen identity, then becomes its editor", async () => {
       const apply = vi.fn().mockResolvedValue(makeShare({ enabled: true }));
-      const client = createMockStigmer({ apply });
-      await renderOpenDialog(client);
+      renderOpenDialog(createMockStigmer({ apply }));
 
-      fireEvent.click(screen.getByRole("switch", { hidden: true }));
+      fireEvent.click(screen.getByRole("button", { name: "Create share", hidden: true }));
 
       await waitFor(() => expect(apply).toHaveBeenCalledTimes(1));
       const input = apply.mock.calls[0][0] as AgentShareInput;
-      // Create identity: the agent's own org/slug/name (the server's D2
-      // default made explicit) plus the agent reference.
       expect(input.org).toBe("acme");
       expect(input.slug).toBe("support-agent");
+      expect(input.name).toBe("Support Agent");
       expect(input.agentRef).toEqual({ org: "acme", slug: "support-agent" });
+      // One intent-click yields a live link: created enabled, public.
       expect(input.enabled).toBe(true);
+      expect(input.audience).toBe(AgentShareAudience.public);
+
+      // The dialog transitions to the editor on the created share.
+      await waitFor(() =>
+        expect(
+          screen.getByText("https://app.example.com/chat/acme/support-agent"),
+        ).toBeTruthy(),
+      );
+      expect(screen.getByText("Done")).toBeTruthy();
+    });
+
+    it("pins an (org, slug) collision to the slug field with a pick-another-slug remedy", async () => {
+      const apply = vi
+        .fn()
+        .mockRejectedValue(
+          new StigmerError("already-exists", "duplicate slug", Code.AlreadyExists),
+        );
+      renderOpenDialog(createMockStigmer({ apply }));
+
+      fireEvent.click(screen.getByRole("button", { name: "Create share", hidden: true }));
+
+      expect(
+        await screen.findByText(/pick a different slug/i),
+      ).toBeTruthy();
+      // Still on the create step — nothing was created.
+      expect(screen.queryByRole("switch", { hidden: true })).toBeNull();
+
+      // Editing the slug clears the collision so the user can retry.
+      fireEvent.change(screen.getByLabelText("Slug", { selector: "input" }), {
+        target: { value: "support-agent-2" },
+      });
+      expect(screen.queryByText(/pick a different slug/i)).toBeNull();
+    });
+
+    it("surfaces other server refusals verbatim (e.g. non-public dependencies)", async () => {
+      const apply = vi
+        .fn()
+        .mockRejectedValue(
+          new StigmerError(
+            "failed-precondition",
+            "cannot share acme/support-agent across organizations: it references resources that are not public: skill acme/internal-kb",
+            Code.FailedPrecondition,
+          ),
+        );
+      renderOpenDialog(createMockStigmer({ apply }), { shareOrg: "consumer-org" });
+
+      fireEvent.click(screen.getByRole("button", { name: "Create share", hidden: true }));
+
+      expect(
+        await screen.findByText(/resources that are not public/i),
+      ).toBeTruthy();
+    });
+
+    it("cross-org create: qualifies the agent, names the paying org, creates in the viewer's org", async () => {
+      const apply = vi.fn().mockResolvedValue({
+        metadata: {
+          id: "ash_ext",
+          org: "consumer-org",
+          slug: "support-agent",
+          name: "Support Agent",
+        },
+        spec: {
+          agentRef: { org: "acme", slug: "support-agent" },
+          enabled: true,
+        },
+      });
+      renderOpenDialog(createMockStigmer({ apply }), { shareOrg: "consumer-org" });
 
+      // The header names whose blueprint this channel serves.
+      expect(screen.getByText("acme/support-agent")).toBeTruthy();
+      // The create copy names the org that owns and pays for the channel.
+      expect(screen.getByText(/credits/)).toBeTruthy();
+
+      fireEvent.click(screen.getByRole("button", { name: "Create share", hidden: true }));
+
+      await waitFor(() => expect(apply).toHaveBeenCalledTimes(1));
+      const input = apply.mock.calls[0][0] as AgentShareInput;
+      expect(input.org).toBe("consumer-org");
+      expect(input.agentRef).toEqual({ org: "acme", slug: "support-agent" });
+
+      // The editor shows the sharing org's URL; cross-org shares are
+      // public-audience only, so no audience selector is offered.
       await waitFor(() =>
         expect(
-          screen.getByRole("switch", { hidden: true }).getAttribute("aria-checked"),
-        ).toBe("true"),
+          screen.getByText("https://app.example.com/chat/consumer-org/support-agent"),
+        ).toBeTruthy(),
       );
+      expect(screen.queryByRole("radiogroup", { hidden: true })).toBeNull();
     });
   });
 
-  describe("Sharing-off state", () => {
-    it("shows the reason on the Embed tab too", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: false })),
+  describe("paused share (enabled: false)", () => {
+    it("renders the off state with disabled copy affordances", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: false }),
+      });
+
+      expect(
+        screen.getByRole("switch", { hidden: true }).getAttribute("aria-checked"),
+      ).toBe("false");
+      const copy = screen.getByRole("button", {
+        name: "Copy",
+        hidden: true,
+      }) as HTMLButtonElement;
+      expect(copy.disabled).toBe(true);
+      expect(
+        screen.getByText(/sharing is off, so this link doesn't work yet/i),
+      ).toBeTruthy();
+    });
+
+    it("shows the reason on the Embed tab too", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: false }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       expect(
@@ -344,11 +385,10 @@ describe("ShareAgentDialog", () => {
       ).toBeTruthy();
     });
 
-    it("drops the hint and enables copy once sharing is on", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
+    it("drops the hint and enables copy once sharing is on", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client);
 
       const copy = screen.getByRole("button", {
         name: "Copy",
@@ -359,11 +399,10 @@ describe("ShareAgentDialog", () => {
     });
   });
 
-  it("shows the indexability warning", async () => {
-    const client = createMockStigmer({
-      getByAgent: withShare(makeShare({ enabled: true })),
+  it("shows the indexability warning", () => {
+    renderOpenDialog(createMockStigmer(), {
+      share: makeShare({ enabled: true }),
     });
-    await renderOpenDialog(client);
 
     expect(
       screen.getByText(/forwarded and indexed by search engines/),
@@ -373,17 +412,13 @@ describe("ShareAgentDialog", () => {
   describe("Audience", () => {
     it("defaults to Public link and switching to Org members applies the full spec", async () => {
       const apply = vi.fn().mockResolvedValue({});
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(
-          makeShare({
-            enabled: true,
-            allowedOrigins: ["https://example.com"],
-            messages: { rateLimited: "Easy there." },
-          }),
-        ),
+      renderOpenDialog(createMockStigmer({ apply }), {
+        share: makeShare({
+          enabled: true,
+          allowedOrigins: ["https://example.com"],
+          messages: { rateLimited: "Easy there." },
+        }),
       });
-      await renderOpenDialog(client);
 
       const publicOption = screen.getByRole("radio", {
         name: "Public link",
@@ -402,21 +437,25 @@ describe("ShareAgentDialog", () => {
       expect(input.enabled).toBe(true);
       expect(input.allowedOrigins).toEqual(["https://example.com"]);
       expect(input.messages?.rateLimited).toBe("Easy there.");
+      // Edit keys on the existing share's identity — never a new row.
+      expect(input.org).toBe("acme");
+      expect(input.slug).toBe("support-agent");
     });
 
     it("switching to Org members drops credential bindings (public-audience only)", async () => {
       const apply = vi.fn().mockResolvedValue({});
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(
-          makeShare({
+      renderOpenDialog(
+        createMockStigmer({
+          apply,
+          environments: [orgSharedEnv("github-creds")],
+        }),
+        {
+          share: makeShare({
             enabled: true,
             environmentRefs: [{ org: "acme", slug: "github-creds" }],
           }),
-        ),
-        environments: [orgSharedEnv("github-creds")],
-      });
-      await renderOpenDialog(client);
+        },
+      );
 
       fireEvent.click(
         screen.getByRole("radio", { name: "Org members", hidden: true }),
@@ -430,13 +469,10 @@ describe("ShareAgentDialog", () => {
       expect(input.environmentRefs).toEqual([]);
     });
 
-    it("renders org-audience copy: member link, revocation note, no indexability warning", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(
-          makeShare({ enabled: true, audience: AgentShareAudience.org }),
-        ),
+    it("renders org-audience copy: member link, revocation note, no indexability warning", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true, audience: AgentShareAudience.org }),
       });
-      await renderOpenDialog(client);
 
       expect(screen.getByText("Organization members can chat")).toBeTruthy();
       expect(screen.getByText("Member chat link")).toBeTruthy();
@@ -448,13 +484,10 @@ describe("ShareAgentDialog", () => {
       ).toBeNull();
     });
 
-    it("replaces the Embed tab with a public-only explanation for the org audience", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(
-          makeShare({ enabled: true, audience: AgentShareAudience.org }),
-        ),
+    it("replaces the Embed tab with a public-only explanation for the org audience", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true, audience: AgentShareAudience.org }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       expect(
@@ -464,20 +497,60 @@ describe("ShareAgentDialog", () => {
     });
   });
 
+  describe("cross-org edit mode (share org differs from the agent's — decision 013)", () => {
+    const externalShare = {
+      metadata: {
+        id: "ash_ext",
+        org: "consumer-org",
+        slug: "support-agent",
+        name: "Support Agent",
+      },
+      spec: {
+        agentRef: { org: "acme", slug: "support-agent" },
+        enabled: true,
+      },
+    } as never;
+
+    it("qualifies the agent in the header and hides the audience selector", () => {
+      renderOpenDialog(createMockStigmer(), { share: externalShare });
+
+      // The header names whose blueprint this channel serves.
+      expect(screen.getByText("acme/support-agent")).toBeTruthy();
+      // Cross-org shares are public-audience only — no choice to offer.
+      expect(screen.queryByRole("radiogroup", { hidden: true })).toBeNull();
+    });
+
+    it("builds the link and billing line from the sharing org", () => {
+      renderOpenDialog(createMockStigmer(), { share: externalShare });
+
+      expect(
+        screen.getByText("https://app.example.com/chat/consumer-org/support-agent"),
+      ).toBeTruthy();
+      // Who-pays names the sharing org, not the agent's.
+      expect(screen.getByText("consumer-org")).toBeTruthy();
+    });
+
+    it("same-org dialogs are unchanged when the share org equals the agent's", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }),
+      });
+
+      expect(screen.getByText("Support Agent")).toBeTruthy();
+      expect(screen.getByRole("radiogroup", { hidden: true })).toBeTruthy();
+    });
+  });
+
   it("enabling applies the complete spec and notifies the host", async () => {
     const apply = vi.fn().mockResolvedValue({});
     const onSharingChanged = vi.fn();
-    const client = createMockStigmer({
-      apply,
-      getByAgent: withShare(
-        makeShare({
-          enabled: false,
-          allowedOrigins: ["https://example.com"],
-          messages: { rateLimited: "Easy there." },
-        }),
-      ),
+    renderOpenDialog(createMockStigmer({ apply }), {
+      onSharingChanged,
+      share: makeShare({
+        enabled: false,
+        allowedOrigins: ["https://example.com"],
+        messages: { rateLimited: "Easy there." },
+      }),
     });
-    await renderOpenDialog(client, { onSharingChanged });
 
     fireEvent.click(screen.getByRole("switch", { hidden: true }));
 
@@ -499,11 +572,9 @@ describe("ShareAgentDialog", () => {
         allowedOrigins: ["https://normalized.example.com"],
       }),
     );
-    const client = createMockStigmer({
-      apply,
-      getByAgent: withShare(makeShare({ enabled: false })),
+    renderOpenDialog(createMockStigmer({ apply }), {
+      share: makeShare({ enabled: false }),
     });
-    await renderOpenDialog(client);
 
     fireEvent.click(screen.getByRole("switch", { hidden: true }));
     await waitFor(() =>
@@ -517,11 +588,11 @@ describe("ShareAgentDialog", () => {
   });
 
   describe("Tool credentials", () => {
-    it("warns needs-credentials for a tool-using share without bindings", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
+    it("warns needs-credentials for a tool-using share without bindings", () => {
+      renderOpenDialog(createMockStigmer(), {
+        agent: makeAgent({ mcpUsages: true }),
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client, { agent: makeAgent({ mcpUsages: true }) });
 
       expect(
         screen.getByText(/no credentials are bound to this share/i),
@@ -530,12 +601,16 @@ describe("ShareAgentDialog", () => {
 
     it("binds an org-shared environment by applying the appended refs", async () => {
       const apply = vi.fn().mockResolvedValue({});
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(makeShare({ enabled: true })),
-        environments: [orgSharedEnv("github-creds", "GitHub Creds")],
-      });
-      await renderOpenDialog(client, { agent: makeAgent({ mcpUsages: true }) });
+      renderOpenDialog(
+        createMockStigmer({
+          apply,
+          environments: [orgSharedEnv("github-creds", "GitHub Creds")],
+        }),
+        {
+          agent: makeAgent({ mcpUsages: true }),
+          share: makeShare({ enabled: true }),
+        },
+      );
 
       // The section is expanded by default for tool-using agents.
       const picker = await screen.findByLabelText("Add environment", {
@@ -562,11 +637,15 @@ describe("ShareAgentDialog", () => {
         },
         spec: { description: "" },
       };
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
-        environments: [orgSharedEnv("github-creds", "GitHub Creds"), privateEnv],
-      });
-      await renderOpenDialog(client, { agent: makeAgent({ mcpUsages: true }) });
+      renderOpenDialog(
+        createMockStigmer({
+          environments: [orgSharedEnv("github-creds", "GitHub Creds"), privateEnv],
+        }),
+        {
+          agent: makeAgent({ mcpUsages: true }),
+          share: makeShare({ enabled: true }),
+        },
+      );
 
       await screen.findByLabelText("Add environment", { selector: "select" });
       // Private environments are guest-unusable (the runtime merge skips
@@ -575,24 +654,21 @@ describe("ShareAgentDialog", () => {
       expect(screen.queryByText("Personal Creds")).toBeNull();
     });
 
-    it("hides the section entirely for org-audience shares", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(
-          makeShare({ enabled: true, audience: AgentShareAudience.org }),
-        ),
+    it("hides the section entirely for org-audience shares", () => {
+      renderOpenDialog(createMockStigmer(), {
+        agent: makeAgent({ mcpUsages: true }),
+        share: makeShare({ enabled: true, audience: AgentShareAudience.org }),
       });
-      await renderOpenDialog(client, { agent: makeAgent({ mcpUsages: true }) });
 
       expect(screen.queryByText("Tool credentials")).toBeNull();
     });
   });
 
   describe("Embed tab", () => {
-    it("shows the one-line script snippet: loader from the app origin + <stigmer-agent>", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
+    it("shows the one-line script snippet: loader from the app origin + <stigmer-agent>", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       // The loader must be served from the SAME origin as the share URL —
@@ -609,11 +685,10 @@ describe("ShareAgentDialog", () => {
       ).toBeTruthy();
     });
 
-    it("keeps the iframe snippet available as the collapsed no-JavaScript alternative", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
+    it("keeps the iframe snippet available as the collapsed no-JavaScript alternative", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       // Collapsed by default — the script snippet is the primary path.
@@ -634,11 +709,9 @@ describe("ShareAgentDialog", () => {
 
     it("rejects an invalid origin without calling the RPC", async () => {
       const apply = vi.fn();
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(makeShare({ enabled: true })),
+      renderOpenDialog(createMockStigmer({ apply }), {
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       const input = screen.getByLabelText("Add allowed origin");
@@ -653,16 +726,12 @@ describe("ShareAgentDialog", () => {
 
     it("adds a valid origin by applying the appended list", async () => {
       const apply = vi.fn().mockResolvedValue({});
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(
-          makeShare({
-            enabled: true,
-            allowedOrigins: ["https://existing.example.com"],
-          }),
-        ),
+      renderOpenDialog(createMockStigmer({ apply }), {
+        share: makeShare({
+          enabled: true,
+          allowedOrigins: ["https://existing.example.com"],
+        }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       fireEvent.change(screen.getByLabelText("Add allowed origin"), {
@@ -682,16 +751,12 @@ describe("ShareAgentDialog", () => {
 
     it("rejects a duplicate origin", async () => {
       const apply = vi.fn();
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(
-          makeShare({
-            enabled: true,
-            allowedOrigins: ["https://example.com"],
-          }),
-        ),
+      renderOpenDialog(createMockStigmer({ apply }), {
+        share: makeShare({
+          enabled: true,
+          allowedOrigins: ["https://example.com"],
+        }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       fireEvent.change(screen.getByLabelText("Add allowed origin"), {
@@ -705,16 +770,12 @@ describe("ShareAgentDialog", () => {
 
     it("removes an origin by applying the filtered list", async () => {
       const apply = vi.fn().mockResolvedValue({});
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(
-          makeShare({
-            enabled: true,
-            allowedOrigins: ["https://a.example.com", "https://b.example.com"],
-          }),
-        ),
+      renderOpenDialog(createMockStigmer({ apply }), {
+        share: makeShare({
+          enabled: true,
+          allowedOrigins: ["https://a.example.com", "https://b.example.com"],
+        }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Embed/, hidden: true }));
       fireEvent.click(screen.getByLabelText("Remove https://a.example.com"));
@@ -728,16 +789,12 @@ describe("ShareAgentDialog", () => {
   describe("visitor messages", () => {
     it("saves edited messages as part of the complete spec", async () => {
       const apply = vi.fn().mockResolvedValue({});
-      const client = createMockStigmer({
-        apply,
-        getByAgent: withShare(
-          makeShare({
-            enabled: true,
-            allowedOrigins: ["https://example.com"],
-          }),
-        ),
+      renderOpenDialog(createMockStigmer({ apply }), {
+        share: makeShare({
+          enabled: true,
+          allowedOrigins: ["https://example.com"],
+        }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByText("Customize visitor messages"));
       fireEvent.change(screen.getByLabelText(/Rate limited/), {
@@ -752,11 +809,10 @@ describe("ShareAgentDialog", () => {
       expect(input.allowedOrigins).toEqual(["https://example.com"]);
     });
 
-    it("caps each message at 300 characters", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
+    it("caps each message at 300 characters", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByText("Customize visitor messages"));
       const field = screen.getByLabelText(/Rate limited/) as HTMLTextAreaElement;
@@ -770,11 +826,10 @@ describe("ShareAgentDialog", () => {
       const getOrCreateBillingAccount = vi.fn().mockResolvedValue({
         balance: { availableMicros: BigInt(12_500_000) },
       });
-      const client = createMockStigmer({
-        getOrCreateBillingAccount,
-        getByAgent: withShare(makeShare({ enabled: true })),
+      renderOpenDialog(createMockStigmer({ getOrCreateBillingAccount }), {
+        mode: "cloud",
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client, { mode: "cloud" });
 
       expect(screen.getByText(/Visitors chat on/)).toBeTruthy();
       await waitFor(() =>
@@ -783,13 +838,12 @@ describe("ShareAgentDialog", () => {
       expect(getOrCreateBillingAccount).toHaveBeenCalledWith("acme");
     });
 
-    it("degrades to the who-pays line alone in local mode (no billing fetch)", async () => {
+    it("degrades to the who-pays line alone in local mode (no billing fetch)", () => {
       const getOrCreateBillingAccount = vi.fn();
-      const client = createMockStigmer({
-        getOrCreateBillingAccount,
-        getByAgent: withShare(makeShare({ enabled: true })),
+      renderOpenDialog(createMockStigmer({ getOrCreateBillingAccount }), {
+        mode: "local",
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client, { mode: "local" });
 
       expect(screen.getByText(/Visitors chat on/)).toBeTruthy();
       expect(screen.queryByText(/available/)).toBeNull();
@@ -800,11 +854,10 @@ describe("ShareAgentDialog", () => {
       const getOrCreateBillingAccount = vi
         .fn()
         .mockRejectedValue(new Error("billing unavailable"));
-      const client = createMockStigmer({
-        getOrCreateBillingAccount,
-        getByAgent: withShare(makeShare({ enabled: true })),
+      renderOpenDialog(createMockStigmer({ getOrCreateBillingAccount }), {
+        mode: "cloud",
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client, { mode: "cloud" });
 
       await waitFor(() => expect(getOrCreateBillingAccount).toHaveBeenCalled());
       expect(screen.getByText(/Visitors chat on/)).toBeTruthy();
@@ -814,11 +867,10 @@ describe("ShareAgentDialog", () => {
   });
 
   describe("Developer tab", () => {
-    it("shows the platform client snippet and docs link", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true })),
+    it("shows the platform client snippet and docs link", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client);
 
       fireEvent.click(screen.getByRole("tab", { name: /Developer/, hidden: true }));
       expect(screen.getByText(/createPlatformClientAuth/)).toBeTruthy();
@@ -827,24 +879,24 @@ describe("ShareAgentDialog", () => {
     });
   });
 
-  it("renders in-flow without showModal when modal is false", async () => {
+  it("renders in-flow without showModal when modal is false", () => {
     const showModal = vi.spyOn(HTMLDialogElement.prototype, "showModal");
-    const client = createMockStigmer({
-      getByAgent: withShare(makeShare({ enabled: true })),
+    renderOpenDialog(createMockStigmer(), {
+      modal: false,
+      share: makeShare({ enabled: true }),
     });
-    await renderOpenDialog(client, { modal: false });
 
     expect(screen.getByText("Share")).toBeTruthy();
     expect(showModal).not.toHaveBeenCalled();
     showModal.mockRestore();
   });
 
-  it("requests close via Done and the close affordance", async () => {
+  it("requests close via Done and the close affordance", () => {
     const onOpenChange = vi.fn();
-    const client = createMockStigmer({
-      getByAgent: withShare(makeShare({ enabled: true })),
+    renderOpenDialog(createMockStigmer(), {
+      onOpenChange,
+      share: makeShare({ enabled: true }),
     });
-    await renderOpenDialog(client, { onOpenChange });
 
     screen.getByText("Done").click();
     expect(onOpenChange).toHaveBeenCalledWith(false);
@@ -855,11 +907,10 @@ describe("ShareAgentDialog", () => {
   });
 
   describe("Reset link (rotatable share token)", () => {
-    it("appends the status token to the shown link and embed snippet", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(makeShare({ enabled: true }, "tok123")),
+    it("appends the status token to the shown link and embed snippet", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare({ enabled: true }, "tok123"),
       });
-      await renderOpenDialog(client);
 
       expect(
         screen.getByText("https://app.example.com/chat/acme/support-agent?k=tok123"),
@@ -874,11 +925,10 @@ describe("ShareAgentDialog", () => {
         .fn()
         .mockResolvedValue(makeShare({ enabled: true }, "fresh-token"));
       const onSharingChanged = vi.fn();
-      const client = createMockStigmer({
-        rotateShareLink,
-        getByAgent: withShare(makeShare({ enabled: true })),
+      renderOpenDialog(createMockStigmer({ rotateShareLink }), {
+        onSharingChanged,
+        share: makeShare({ enabled: true }),
       });
-      await renderOpenDialog(client, { onSharingChanged });
 
       // A plain link shows no token before the reset.
       expect(
@@ -895,23 +945,20 @@ describe("ShareAgentDialog", () => {
         ).toBeTruthy(),
       );
       expect(rotateShareLink).toHaveBeenCalledTimes(1);
-      // The rotation targets the loaded share by its own id.
+      // The rotation targets the given share by its own id.
       expect(
         (rotateShareLink.mock.calls[0][0] as { resourceId: string }).resourceId,
       ).toBe("ash_1");
       expect(onSharingChanged).toHaveBeenCalled();
     });
 
-    it("hides the Reset control and the token for org-members-only shares", async () => {
-      const client = createMockStigmer({
-        getByAgent: withShare(
-          makeShare(
-            { enabled: true, audience: AgentShareAudience.org },
-            "tok123",
-          ),
+    it("hides the Reset control and the token for org-members-only shares", () => {
+      renderOpenDialog(createMockStigmer(), {
+        share: makeShare(
+          { enabled: true, audience: AgentShareAudience.org },
+          "tok123",
         ),
       });
-      await renderOpenDialog(client);
 
       // Org access is gated by membership, not the link token: the member
       // link stays clean and the Reset lever is not offered.