)`. It renders as a chat card when the target
is a Solo chat; the `Chat:` label lets a viewer without access see it as one.
@@ -34,8 +35,10 @@ people, agents and channels** for an owner who can add agents) filters current
access and lists people under **Not in this chat**, each with an **Add** button;
Enter adds the highlighted person. Adding is immediate and uses the Solo share rule
(`canShareSoloChat`), with per-person **Adding…**, error and **Retry** states. The
-owner's selectable agents are offered too and join without starting a run. Where
-the viewer cannot add agents, a note says to mention an agent in the chat instead.
+owner's selectable agents are offered too and join as Bot, even with a Guest
+admission default, without starting a run. Composer mentions use the same grant.
+Where the viewer cannot add agents, a note says to mention an agent in the chat
+instead.
Current access uses the channel groups (**People**, **Agents**) with Owner and
Admin tags, and each row has the channel members' actions menu, so the chat owner
can remove someone. The verified roster shows loading or failure, never treating a
@@ -67,6 +70,57 @@ cached non-agent evidence for an additional human. Unknown profiles remain
unclassified; absence of the indicator is **not** a privacy promise. Clicking the
indicator opens the same dialog.
+An invitation saved by an older client without an explicit Member grant is never
+replayed as a participation invitation. **Retry** keeps it protected during the
+relay's 15-minute intake window. After expiry, Retry fences local delivery and
+checks the original event ID with a fresh strong read. Only verified absence can
+retire it durably; a failed read, recorded event, active delivery or newly observed
+echo keeps recovery. Add then re-reads membership before issuing a new explicit
+Member invitation. This uses the existing Outbox/member/share actions, with no
+background retry or new control. If signed roles confirm that the earlier invite
+admitted a Guest, remove that person in People and invite them again. Recovery
+never silently promotes an existing Guest. A definitively failed invitation can
+also be replaced after explicitly dismissing it in Outbox.
+
+### General access
+
+The access dialog's **General access** offers **View only** and **Private**.
+Public is not offered. Participation through this UI is by invitation. Existing
+members keep their individual roles when the general policy changes.
+
+View only makes the chat's full history and Canvas readable by the community.
+The confirmation names this disclosure, including workspace folder paths and
+agent instructions stored in Canvas. Moving from Public (existing) also
+explains that people already in the chat keep their access. Moving from View only
+to Private warns that joined viewers remain members unless a verified role
+snapshot establishes that no Guests exist; loading or failed verification keeps
+the warning. Public (existing) → Private also warns that joined members retain
+their access until removed in People. One signed kind-9002 edit sets
+`visibility=open` and `join_role=guest` together, through the existing
+`channelDetails` save, conflict checks and exact readback.
+
+Omitting Public here is a UI restriction, not a relay or harness safeguard.
+CLI/MCP or another client can still set a Solo chat to Public with Member
+admission. The dialog shows **Public (existing)** for that policy and lets the
+owner change it to View only or Private. Public members can still post and
+address the owner's agents, and can replace the shared Canvas. Agent wake and
+owner-Canvas hardening are separate follow-up work; this picker does not fix
+those risks. Changing to View only restricts new people, not existing members.
+
+With View only, visitors can find the chat by name in Search Buzz or open its
+ordinary chat link. They read without joining and cannot send messages, react or wake agents.
+The relay's ordinary Guest/default-Guest write policy enforces this boundary;
+the absent composer is only its client presentation. View-only access grants no
+membership and adds no sidebar entry for a visitor. The owner keeps the same
+Solo label, conversation ID and private workspace filing.
+
+Changing back to Private stops nonmembers from reading; it does not remove
+members or change their roles. Guests who joined through the CLI, MCP or another
+client while the chat was View only keep read access until removed in People.
+Reading without joining creates no membership to retain. Neither transition
+changes invitations, creates a share message or adds notifications. Unconfirmed
+publication uses **Check save status**, without automatically resending.
+
## Sending a chat link in a channel
Pasting a recognized Solo chat link into a composer stages it as a chat card.
@@ -98,17 +152,23 @@ in the destination channel are not synchronized.
The product owner approved this distinction on 2026-10-14: **Share** keeps the
Solo label and project filing; **Convert to channel** removes the Solo label and
the initiating viewer's project filing, so the same conversation becomes an
-ordinary Team channel, either Private or Public. It changes organization and
-conversation behavior for every member, never creates a new conversation or
-copies history.
+ordinary Team channel, with Private, View only or Public access. It changes
+organization and conversation behavior for every member, never creates a new
+conversation or copies history.
The Solo chat header overflow and the Solo row menu offer **Convert to channel**
for the viewer's own Solo chat.
-`src/features/solo/ConvertToChannel.tsx` reuses the shared Dialog, Field,
-Private/Public RadioGroup and Button. Private is the default; Public warns that the
-community can view the full existing history. A selected share channel is never
-granted by conversion. Cancel writes nothing and returns focus to the retained
-initiating control.
+`src/features/solo/ConvertToChannel.tsx` reuses the shared Dialog, Select
+and Button, with the same Private, View only and Public options and
+descriptions as channel general access. The current access policy is selected
+initially. Choosing View only or Public for a private chat discloses community
+reading of its full history and Canvas, including workspace folders and agent
+instructions. View only saves public visibility with Guest admission; Public saves
+Member admission; Private keeps reading restricted to members and retains the
+current admission default. Choosing Private for an open chat warns that joined
+people retain access until removed in People, using the same warning as General
+access. A selected share channel is never granted by conversion.
+Cancel writes nothing and returns focus to the retained initiating control.
The sequence is explicit, not atomic:
@@ -116,7 +176,7 @@ The sequence is explicit, not atomic:
owner. Fresh metadata, owner/admin authority, conflict checks,
altered-signature rejection and exact readback remain unchanged. The edit
removes `buzz.solo` from the channel's labels and applies the chosen
- visibility; name, lifetime and other labels are preserved.
+ visibility and admission policy; name, lifetime and other labels are preserved.
2. Refresh Solo projects and, if this viewer filed the chat in one, clear only
that assignment through `soloPreferences.assign(id, undefined)`. Its encrypted
account/community record, serialization and Outbox own persistence. Other
@@ -134,7 +194,7 @@ visit.
### Partial success and recovery
An uncertain metadata publication offers **Check status**, never automatic resend.
-The pending details owner retains exact selected visibility; **Reload chat
+The pending details owner retains the exact selected access policy; **Reload chat
details** recovers failed reads without losing that intent. If another details
surface confirmed the publication, fresh matching metadata can advance the retained
conversion receipt without another kind-9002 command.
@@ -144,7 +204,10 @@ metadata phase, with a shared running guard. It is not permission evidence or a
persistent transaction. After the label edit succeeds but project unfiling fails,
the dialog says **Channel converted. Finish removing it from its Solo project.**
**Finish conversion** re-reads details, confirms the label is gone and the
-settings are unchanged, and retries only the preference write. Restart loses the
+settings are unchanged, and retries only the preference write. Failed reads keep
+the recovery entry. A verified superseding settings edit retires an unconfirmed
+conversion receipt, including after Reload or reopening the dialog; it does not
+rewrite those settings or remove project filing. Restart loses the
orchestration receipt, not access or the channel: the conversation is already an
ordinary Team channel, and a leftover project assignment for a channel without the
label is ignored by Solo.
@@ -169,10 +232,9 @@ View-only role.
[Chat settings](README.md#optional-naming) form, not Share. Persisted naming
provenance, automatic-name reset and dynamic link titles remain deferred.
Old and new generated links keep their numeric labels after a rename.
-- **Can view / Can participate** is deferred to a second PR. Read-only requires
- relay-enforced authorization and a matching client capability contract; a
- cosmetic role switch or disabled composer is not sufficient. This slice shows
- neither a fake dropdown nor a static role tag.
+- Individual **Can view / Can participate** invitation choices remain deferred.
+ View-only Solo sharing uses the channel's relay-enforced Guest admission default,
+ without changing existing individual invitations or roles.
- Direct-person DM/link delivery is not implemented. Access grants alone are not
a dedicated invitation or share notification; explicit automatic handoff needs
a separate product decision.
diff --git a/src/app/shell/SearchResults.tsx b/src/app/shell/SearchResults.tsx
index 4404c3f1f7..917a58969c 100644
--- a/src/app/shell/SearchResults.tsx
+++ b/src/app/shell/SearchResults.tsx
@@ -816,7 +816,11 @@ export function SearchResults({
? "Archived chat"
: "Archived channel"
: channel.readOnly && !channel.cached && channel.viewerRole !== "guest"
- ? "Public channel · not joined"
+ ? channel.channelType === "solo"
+ ? channel.joinRole === "guest"
+ ? "View-only chat"
+ : "Public chat · not joined"
+ : "Public channel · not joined"
: channel.channelType === "dm"
? "Direct message"
: channel.channelType === "solo"
diff --git a/src/bundled/channels/ChannelGeneralAccess.test.tsx b/src/bundled/channels/ChannelGeneralAccess.test.tsx
index b481d89b0e..717ef30c8f 100644
--- a/src/bundled/channels/ChannelGeneralAccess.test.tsx
+++ b/src/bundled/channels/ChannelGeneralAccess.test.tsx
@@ -206,7 +206,7 @@ it.each(["member", "guest", undefined] as const)(
);
it.each(["private", "view-only", "legacy-public"])(
- "offers only Private and View only for a %s Solo chat",
+ "offers only View only / Private for a %s Solo chat",
async (policy) => {
const h = harness();
const current: ChannelDetails = {
@@ -239,8 +239,10 @@ it.each(["private", "view-only", "legacy-public"])(
screen.getByRole("option", { name: "View only" }),
).toHaveAccessibleDescription("Anyone in the community can read.");
expect(
- screen.queryByRole("option", { name: "Public" }),
+ screen.queryByRole("option", { name: /^Public$/ }),
).not.toBeInTheDocument();
+ expect(screen.queryByRole("alertdialog")).not.toBeInTheDocument();
+ expect(h.save).not.toHaveBeenCalled();
await user.click(
screen.getByRole("option", {
name: policy === "view-only" ? "Private" : "View only",
@@ -252,10 +254,10 @@ it.each(["private", "view-only", "legacy-public"])(
joinRole: "guest",
};
expect(h.save).not.toHaveBeenCalled();
- expect(screen.getByRole("alertdialog")).toHaveTextContent(
+ expect(screen.getByRole("alertdialog")).toHaveAccessibleDescription(
policy === "view-only"
- ? "Only chat members will have access."
- : "People already in the chat keep their access.",
+ ? "Only chat members will have access. People who joined while it was View only are members and keep reading until you remove them in People."
+ : `Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.${policy === "legacy-public" ? " People already in the chat keep their access." : ""}`,
);
h.load.mockResolvedValue(next);
await user.click(screen.getByRole("button", { name: "Change access" }));
@@ -274,6 +276,47 @@ it.each(["private", "view-only", "legacy-public"])(
},
);
+it.each([
+ {
+ visibility: "private",
+ joinRole: "guest",
+ option: "View only",
+ expected:
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.",
+ },
+ {
+ visibility: "public",
+ joinRole: "member",
+ option: "Private",
+ expected:
+ "Only chat members will have access. People who already joined remain members and keep their access until you remove them in People.",
+ },
+] as const)(
+ "explains $visibility/$joinRole → $option with existing members",
+ async ({ visibility, joinRole, option, expected }) => {
+ const h = harness();
+ h.load.mockResolvedValue({
+ ...base,
+ labels: ["buzz.solo"],
+ visibility,
+ joinRole,
+ });
+ const user = userEvent.setup();
+ render(
+
@@ -87,6 +100,7 @@ export function ChannelGeneralAccess({
capability={capability}
recovery={recovery}
channelId={channelId}
+ mayHaveGuestMembers={mayHaveGuestMembers}
/>
);
}
@@ -95,10 +109,12 @@ function ChannelGeneralAccessEditor({
capability,
recovery,
channelId,
+ mayHaveGuestMembers,
}: {
capability: ChannelDetailsCapability;
recovery: RelayRecovery | undefined;
channelId: string;
+ mayHaveGuestMembers: boolean;
}) {
const attempt = useSyncExternalStore(capability.subscribe, () =>
capability.snapshot(channelId),
@@ -152,13 +168,7 @@ function ChannelGeneralAccessEditor({
const locked = loading || pending || !!attempt || !base?.canEdit;
const solo = soloLabels(base?.labels);
const place = solo ? "chat" : "channel";
- const access = !base
- ? ""
- : base.visibility === "private"
- ? "private"
- : base.joinRole === "guest"
- ? "view-only"
- : "public";
+ const access = base ? generalAccessValue(base) : "";
const Icon =
access === "public"
? GlobeIcon
@@ -167,23 +177,16 @@ function ChannelGeneralAccessEditor({
: LockIcon;
function choose(value: string) {
if (locked || !base) return;
- if (
- value === access ||
- !["private", "public", "view-only"].includes(value) ||
- (solo && value === "public")
- )
- return;
+ const option = Object.values(generalAccessOptions).find(
+ (option) => option.value === value,
+ );
+ if (value === access || !option || (solo && value === "public")) return;
origin.current =
section.current?.querySelector('[role="combobox"]') ?? null;
setError("");
- // Private preserves even an older Guest admission default. Public choices
- // set both fields explicitly so the label always describes the saved policy.
setChoice({
...base,
- visibility: value === "private" ? "private" : "public",
- ...(value === "private"
- ? {}
- : { joinRole: value === "view-only" ? "guest" : "member" }),
+ ...generalAccessPolicy(option.value, base.joinRole),
});
}
async function apply(check = false) {
@@ -289,33 +292,22 @@ function ChannelGeneralAccessEditor({
{
label: "",
options: [
- ...(!solo
- ? [
- {
- value: "public",
- label: "Public",
- description:
- "Anyone in the community can participate.",
- leading: {
localStorage.clear();
for (const owner of owners.splice(0)) owner.dispose();
});
-function fixture(direct = false) {
+function fixture(
+ direct = false,
+ access?: { visibility: "private" | "public"; joinRole: "member" | "guest" },
+) {
const viewer = keypair(),
relay = keypair(),
aria = keypair(),
@@ -118,7 +121,8 @@ function fixture(direct = false) {
metadata(relay, source, "Work", clock, [
["t", "stream"],
["t", SOLO_LABEL],
- ["private"],
+ [access?.visibility ?? "private"],
+ ...(access ? [["join_role", access.joinRole]] : []),
// The owner's own Solo chat, or one shared with them as a guest.
["P", direct ? viewer.pubkey : relay.pubkey],
]),
@@ -138,6 +142,8 @@ function fixture(direct = false) {
let failDetails = false;
let failRoster = false;
let holdRoster: Promise | undefined;
+ let holdRoles: Promise | undefined;
+ const roles = new Map();
let loseDetailsResponse = false;
const projects = (assignments: Record) => ({
status: "ready" as const,
@@ -171,6 +177,9 @@ function fixture(direct = false) {
const previous = metadataEvents.get(source)?.tags ?? [];
const ttl = value("ttl") ?? previous.find(([tag]) => tag === "ttl")?.[1];
const visibility = value("visibility");
+ const joinRole =
+ value("join_role") ??
+ previous.find(([tag]) => tag === "join_role")?.[1];
const written = event.tags.flatMap(([tag, label]) =>
tag === "t" ? [label ?? ""] : [],
);
@@ -201,6 +210,7 @@ function fixture(direct = false) {
"",
],
...(ttl && ttl !== "0" ? [["ttl", ttl]] : []),
+ ...(joinRole ? [["join_role", joinRole]] : []),
]),
);
if (loseDetailsResponse) throw new Error("Lost settings response");
@@ -232,6 +242,8 @@ function fixture(direct = false) {
scope: "https://community.test",
media: () => undefined,
query: async (filters) => {
+ if (filters.some((filter) => filter.consistency === "strong"))
+ await holdRoles;
if (
filters.some(
(filter) => filter.kinds?.length === 1 && filter.kinds[0] === 39002,
@@ -270,15 +282,16 @@ function fixture(direct = false) {
"p",
key,
"",
- key === viewer.pubkey
- ? "owner"
- : profiles.some(
- (event) =>
- event.pubkey === key &&
- JSON.parse(event.content).is_agent,
- )
- ? "bot"
- : "member",
+ roles.get(key) ??
+ (key === viewer.pubkey
+ ? "owner"
+ : profiles.some(
+ (event) =>
+ event.pubkey === key &&
+ JSON.parse(event.content).is_agent,
+ )
+ ? "bot"
+ : "member"),
]),
],
}),
@@ -349,6 +362,10 @@ function fixture(direct = false) {
profile(key, { name, ...(agent ? { is_agent: true } : {}) }),
);
},
+ holdRoles(value: Promise | undefined) {
+ holdRoles = value;
+ },
+ roles,
viewer,
aria,
dev,
@@ -409,6 +426,219 @@ function fixture(direct = false) {
};
}
+it("shows Public (existing) without offering Public and changes its admission to Guest", async () => {
+ const t = fixture(true, { visibility: "public", joinRole: "member" });
+ await t.ready();
+ t.mount();
+ const user = userEvent.setup();
+ await user.click(screen.getByRole("button", { name: "Access" }));
+ const audience = await screen.findByRole("combobox", {
+ name: "General access",
+ });
+ await waitFor(() => expect(audience).toBeEnabled());
+ expect(audience).toHaveTextContent("Public (existing)");
+ await user.click(audience);
+ expect(
+ (await screen.findAllByRole("option")).map((option) =>
+ option.getAttribute("aria-label"),
+ ),
+ ).toEqual(["View only", "Private"]);
+ await user.click(screen.getByRole("option", { name: "View only" }));
+ expect(screen.getByRole("alertdialog")).toHaveAccessibleDescription(
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions. People already in the chat keep their access.",
+ );
+ expect(t.published).toEqual([]);
+ await user.click(screen.getByRole("button", { name: "Change access" }));
+ await waitFor(() => expect(audience).toBeEnabled());
+ expect(audience).toHaveTextContent("View only");
+ expect(t.published).toHaveLength(1);
+ expect(t.published[0]).toMatchObject({ kind: 9002 });
+ expect(t.published[0]?.tags).toContainEqual(["join_role", "guest"]);
+ expect(t.channel()).toMatchObject({
+ channelType: "solo",
+ visibility: "public",
+ joinRole: "guest",
+ labels: [SOLO_LABEL],
+ });
+ expect(t.members.get(source)).toEqual([t.viewer.pubkey]);
+ expect(t.placement).not.toHaveBeenCalled();
+});
+
+it("opens a Solo chat for view-only visitors and makes it private again without conversion or grants", async () => {
+ const t = fixture(true);
+ await t.ready();
+ t.mount();
+ const user = userEvent.setup();
+ await user.click(screen.getByRole("button", { name: "Access" }));
+ const audience = await screen.findByRole("combobox", {
+ name: "General access",
+ });
+ await waitFor(() => expect(audience).toBeEnabled());
+ expect(audience).toHaveTextContent("Private");
+ await user.click(audience);
+ expect(
+ (await screen.findAllByRole("option")).map((option) =>
+ option.getAttribute("aria-label"),
+ ),
+ ).toEqual(["View only", "Private"]);
+ await user.click(await screen.findByRole("option", { name: "View only" }));
+ const confirmation = screen.getByRole("alertdialog", {
+ name: "Change general access?",
+ });
+ expect(confirmation).toHaveAccessibleDescription(
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.",
+ );
+ expect(
+ screen.queryByRole("combobox", { name: "New people can" }),
+ ).not.toBeInTheDocument();
+ await user.keyboard("{Escape}");
+ await waitFor(() => expect(audience).toHaveFocus());
+ expect(t.published).toEqual([]);
+ await user.click(audience);
+ await user.click(await screen.findByRole("option", { name: "View only" }));
+ await user.click(screen.getByRole("button", { name: "Change access" }));
+ await waitFor(() => expect(audience).toBeEnabled());
+ expect(audience).toHaveTextContent("View only");
+ expect(t.published).toHaveLength(1);
+ expect(t.published[0]).toMatchObject({ kind: 9002 });
+ expect(t.published[0]?.tags).toContainEqual(["visibility", "open"]);
+ expect(t.published[0]?.tags).toContainEqual(["join_role", "guest"]);
+ expect(t.channel()).toMatchObject({
+ channelType: "solo",
+ visibility: "public",
+ joinRole: "guest",
+ labels: [SOLO_LABEL],
+ });
+ expect(
+ screen.queryByRole("combobox", { name: "New people can" }),
+ ).not.toBeInTheDocument();
+ expect(t.session.soloPreferences.snapshot().data?.assignments).toEqual({
+ [source]: "g",
+ });
+ expect(t.placement).not.toHaveBeenCalled();
+ expect(t.members.get(source)).toEqual([t.viewer.pubkey]);
+ await user.click(audience);
+ await user.click(await screen.findByRole("option", { name: "Private" }));
+ await user.click(screen.getByRole("button", { name: "Change access" }));
+ await waitFor(() => expect(audience).toBeEnabled());
+ expect(audience).toHaveTextContent("Private");
+ expect(t.channel()).toMatchObject({
+ channelType: "solo",
+ visibility: "private",
+ joinRole: "guest",
+ labels: [SOLO_LABEL],
+ });
+ expect(t.published.map(({ kind }) => kind)).toEqual([9002, 9002]);
+ expect(t.published[1]?.tags).toContainEqual(["visibility", "private"]);
+ expect(t.placement).not.toHaveBeenCalled();
+});
+
+it.each(["guest", "member"] as const)(
+ "warns about retained viewers only with a verified %s in a View-only chat",
+ async (role) => {
+ const t = fixture(true, { visibility: "public", joinRole: "guest" });
+ t.setSourceMembers([t.viewer.pubkey, t.aria.pubkey]);
+ t.roles.set(t.aria.pubkey, role);
+ await t.ready();
+ t.mount();
+ const user = userEvent.setup();
+ await user.click(screen.getByRole("button", { name: "Access" }));
+ const audience = await screen.findByRole("combobox", {
+ name: "General access",
+ });
+ await waitFor(() => expect(audience).toBeEnabled());
+ await waitFor(() =>
+ expect(t.session.memberAdministration.snapshot(source).status).toBe(
+ "ready",
+ ),
+ );
+ await user.click(audience);
+ await user.click(await screen.findByRole("option", { name: "Private" }));
+ expect(screen.getByRole("alertdialog")).toHaveAccessibleDescription(
+ `Only chat members will have access.${role === "guest" ? " People who joined while it was View only are members and keep reading until you remove them in People." : ""}`,
+ );
+ expect(t.published).toEqual([]);
+ await user.click(screen.getByRole("button", { name: "Change access" }));
+ await waitFor(() => expect(audience).toBeEnabled());
+ expect(audience).toHaveTextContent("Private");
+ expect(t.published.map(({ kind }) => kind)).toEqual([9002]);
+ expect(t.members.get(source)).toEqual([t.viewer.pubkey, t.aria.pubkey]);
+ expect(
+ t.session.memberAdministration.snapshot(source).authority.roles[
+ t.aria.pubkey
+ ],
+ ).toBe(role);
+ },
+);
+
+it.each(["guest", "member"] as const)(
+ "keeps the retained-viewer warning while previous %s roles are loading or unavailable",
+ async (role) => {
+ const t = fixture(true, { visibility: "public", joinRole: "guest" });
+ t.setSourceMembers([t.viewer.pubkey, t.aria.pubkey]);
+ t.roles.set(t.aria.pubkey, role);
+ await t.ready();
+ t.mount();
+ const user = userEvent.setup();
+ await user.click(screen.getByRole("button", { name: "Access" }));
+ const audience = await screen.findByRole("combobox", {
+ name: "General access",
+ });
+ await waitFor(() => expect(audience).toBeEnabled());
+ await waitFor(() =>
+ expect(t.session.memberAdministration.snapshot(source).status).toBe(
+ "ready",
+ ),
+ );
+ let release!: () => void;
+ let reject!: (reason: Error) => void;
+ t.holdRoles(
+ new Promise((resolve, fail) => {
+ release = resolve;
+ reject = fail;
+ }),
+ );
+ let refreshing!: Promise;
+ act(() => {
+ refreshing = t.session.memberAdministration.refresh(source);
+ });
+ try {
+ await waitFor(() =>
+ expect(t.session.memberAdministration.snapshot(source).status).toBe(
+ "loading",
+ ),
+ );
+ expect(
+ t.session.memberAdministration.snapshot(source).authority.roles[
+ t.aria.pubkey
+ ],
+ ).toBe(role);
+ await user.click(audience);
+ await user.click(await screen.findByRole("option", { name: "Private" }));
+ expect(screen.getByRole("alertdialog")).toHaveAccessibleDescription(
+ "Only chat members will have access. People who joined while it was View only are members and keep reading until you remove them in People.",
+ );
+ await act(async () => {
+ reject(new Error("Roles unavailable"));
+ await refreshing;
+ });
+ expect(t.session.memberAdministration.snapshot(source).status).toBe(
+ "error",
+ );
+ expect(screen.getByRole("alertdialog")).toHaveAccessibleDescription(
+ "Only chat members will have access. People who joined while it was View only are members and keep reading until you remove them in People.",
+ );
+ await user.keyboard("{Escape}");
+ expect(t.published).toEqual([]);
+ } finally {
+ release();
+ await act(async () => {
+ await refreshing;
+ });
+ }
+ },
+);
+
const search = (dialog: HTMLElement) =>
within(dialog).getByRole("searchbox", { name: "Search people and channels" });
async function chooseDestination(
@@ -618,7 +848,17 @@ it("shows loading and failed current access with refresh, never an empty roster"
);
await user.click(refresh);
await within(access).findByRole("region", { name: "People" });
- expect(within(access).queryByRole("alert")).toBeNull();
+ // General access has its own failed metadata read and explicit recovery.
+ const recovery = within(access).getByRole("group", {
+ name: "General access recovery",
+ });
+ expect(within(recovery).getByRole("alert")).toHaveTextContent(
+ "Roster unavailable",
+ );
+ await user.click(
+ within(recovery).getByRole("button", { name: "Reload access" }),
+ );
+ await waitFor(() => expect(within(access).queryByRole("alert")).toBeNull());
t.failRoster(true);
await chooseDestination(user, dialog);
const selectedChannel = within(dialog).getByRole("region", {
diff --git a/src/bundled/channels/ChannelMembersDialog.test.tsx b/src/bundled/channels/ChannelMembersDialog.test.tsx
index 1deceea58e..fb4139b40d 100644
--- a/src/bundled/channels/ChannelMembersDialog.test.tsx
+++ b/src/bundled/channels/ChannelMembersDialog.test.tsx
@@ -110,6 +110,8 @@ async function setup(
page: number,
) => Promise;
communities?: CommunityReader;
+ visibility?: "private" | "public";
+ joinRole?: "member" | "guest";
} = {},
) {
const viewer = keypair(),
@@ -157,7 +159,8 @@ async function setup(
tags: [
["d", id],
["t", type.includes("solo") ? "stream" : type],
- ["private"],
+ [options.visibility ?? "private"],
+ ...(options.joinRole ? [["join_role", options.joinRole]] : []),
["name", "Design"],
...(type.includes("solo")
? [
@@ -2659,7 +2662,7 @@ it("lets the Solo owner add an agent without sending a message", async () => {
"Add people, agents or a channel",
);
expect(screen.queryByText(/Join this channel/)).not.toBeInTheDocument();
- expect(screen.getByText(/Adding an agent won’t start a run/)).toBeVisible();
+ expect(input).not.toHaveAttribute("aria-describedby");
expect(screen.getByRole("dialog")).not.toHaveAccessibleDescription();
expect(
screen.queryByRole("region", { name: "Not in this chat" }),
@@ -2697,6 +2700,7 @@ it("lets the Solo owner add an agent without sending a message", async () => {
).toEqual([
["h", "11111111-1111-4111-8111-111111111111"],
["p", t.agent.pubkey],
+ ["role", "bot"],
]);
await t.user.click(screen.getByRole("button", { name: "Close" }));
await t.user.click(t.trigger);
@@ -2927,6 +2931,23 @@ it.each([false, true])(
},
);
+it.each(["private", "public"] as const)(
+ "adds the Solo owner's agent as Bot in a %s chat with a Guest default",
+ async (visibility) => {
+ const t = await setup("solo", false, true, undefined, undefined, {
+ visibility,
+ joinRole: "guest",
+ });
+ await t.user.type(screen.getByRole("searchbox"), "Fixture agent");
+ await t.user.click(
+ await screen.findByRole("button", { name: /Add Fixture agent/ }),
+ );
+ await screen.findByText("Fixture agent added.");
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.publish.mock.calls[0]?.[0].tags).toContainEqual(["role", "bot"]);
+ },
+);
+
it("routes a Solo owner's person and agent additions through their own paths", async () => {
const t = await setup("solo", false, true);
const input = screen.getByRole("searchbox", {
@@ -3238,9 +3259,19 @@ it.each(["public", "private"] as const)(
},
);
-it.each([false, true])(
- "explains reading and contribution access without joining or editing as a Guest %s",
- async (guest) => {
+it.each([
+ { solo: false, guest: false, joinRole: "guest" },
+ { solo: false, guest: true, joinRole: "guest" },
+ { solo: true, guest: false, joinRole: "guest" },
+ { solo: true, guest: true, joinRole: "guest" },
+ { solo: true, guest: false, joinRole: "member" },
+] as const)(
+ "reads preview rosters without joining or editing (Solo: $solo, Guest: $guest, admission: $joinRole)",
+ async ({ solo, guest, joinRole }) => {
+ const participation =
+ guest || joinRole === "guest"
+ ? "Viewing only. Ask an owner or admin to participate."
+ : "New people can participate. People already in the channel keep their access.";
const id = "11111111-1111-4111-8111-111111111111";
const viewer = keypair(),
relay = keypair(),
@@ -3254,7 +3285,13 @@ it.each([false, true])(
["t", "stream"],
["public"],
["name", "Reading room"],
- ["join_role", "guest"],
+ ["join_role", joinRole],
+ ...(solo
+ ? [
+ ["t", SOLO_LABEL],
+ ["P", owner.pubkey],
+ ]
+ : []),
],
}),
signed(relay, {
@@ -3319,11 +3356,7 @@ it.each([false, true])(
,
);
await user.click(screen.getByRole("button", { name: "Access" }));
- expect(
- await screen.findByText(
- "Viewing only. Ask an owner or admin to participate.",
- ),
- ).toBeVisible();
+ expect(await screen.findByText(participation)).toBeVisible();
expect(
screen.queryByText("You have read-only access to this channel."),
).not.toBeInTheDocument();
@@ -3336,7 +3369,7 @@ it.each([false, true])(
).toHaveTextContent("Anyone in the community can read.");
expect(
screen.getByRole("region", { name: "General access" }),
- ).toHaveTextContent("Viewing only. Ask an owner or admin to participate.");
+ ).toHaveTextContent(participation);
// Finish the roster read before checking that the dialog cannot invite or mutate.
await vi.waitFor(() =>
expect(
@@ -3344,8 +3377,13 @@ it.each([false, true])(
).toHaveAttribute("data-refreshing", "false"),
);
expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+ expect(screen.getByRole("region", { name: "People" })).toHaveTextContent(
+ "Channel owner",
+ );
expect(
- screen.getByRole("searchbox", { name: "Search people and agents" }),
+ screen.getByRole("searchbox", {
+ name: solo ? "Search people and channels" : "Search people and agents",
+ }),
).toHaveAttribute("placeholder", "Search members");
expect(load).not.toHaveBeenCalled();
expect(publish).not.toHaveBeenCalled();
diff --git a/src/bundled/channels/ChannelMembersDialog.tsx b/src/bundled/channels/ChannelMembersDialog.tsx
index 4c5cae5136..219748a540 100644
--- a/src/bundled/channels/ChannelMembersDialog.tsx
+++ b/src/bundled/channels/ChannelMembersDialog.tsx
@@ -681,11 +681,15 @@ export function ChannelMembersDialog({
session.channels.get?.(channelId);
const solo = channel?.channelType === "solo";
const place = solo ? "chat" : "channel";
+ const readOnlyAccess =
+ channel?.viewerRole === "guest" ||
+ (channel?.readOnly && channel.joinRole === "guest");
+ const soloSharing = solo && !channel?.readOnly && !readOnlyAccess;
const share = useSoloShare({
session,
navigator,
channelId,
- enabled: solo,
+ enabled: soloSharing,
signal,
query,
setQuery,
@@ -699,19 +703,19 @@ export function ChannelMembersDialog({
session.channelWrites.available;
const canAddPeople = solo ? share.eligible : canAddMembers(session, channel);
const canAdd = canAddPeople || canAddSoloAgents;
- const readOnlyAccess =
- !solo &&
- (channel?.viewerRole === "guest" ||
- (channel?.readOnly && channel.joinRole === "guest"));
const generalAccess =
channel &&
- (channel.channelType === "stream" || channel.channelType === "forum") &&
+ (solo ||
+ channel.channelType === "stream" ||
+ channel.channelType === "forum") &&
!channel.cached &&
!channel.archived &&
(channel.readOnly || session.channelDetails.available);
- // Solo access is verified by the sharing roster read; channels read 39002.
- const rosterBusy = solo ? share.rosterState === "loading" : rosterReading;
- const rosterError = solo
+ // Sharing verifies joined Solo rosters; read-only previews use ordinary 39002 reads.
+ const rosterBusy = soloSharing
+ ? share.rosterState === "loading"
+ : rosterReading;
+ const rosterError = soloSharing
? share.rosterState === "error"
? share.rosterError
: ""
@@ -755,7 +759,7 @@ export function ChannelMembersDialog({
// biome-ignore lint/correctness/useExhaustiveDependencies: refresh explicitly retries the roster read.
useEffect(() => {
void session.archives.ensure();
- if (solo) return;
+ if (soloSharing) return;
let current = true;
setRosterReading(true);
setRosterReadError("");
@@ -790,7 +794,7 @@ export function ChannelMembersDialog({
return () => {
current = false;
};
- }, [session, channelId, refresh, solo]);
+ }, [session, channelId, refresh, soloSharing]);
const memberKey = channel?.members?.join(":") ?? "";
const largeRoster = (channel?.members?.length ?? 0) > MEMBER_PAGE_SIZE;
const administration = useMemberAdministration(
@@ -1241,7 +1245,7 @@ export function ChannelMembersDialog({
const refreshMembers = () => {
if (refreshing || mutationPending) return;
setChangeError(undefined);
- if (solo) share.reloadRoster();
+ if (soloSharing) share.reloadRoster();
else setRosterReading(true);
setRefresh((value) => value + 1);
setInvitationPage({
@@ -1660,7 +1664,6 @@ export function ChannelMembersDialog({
) : null;
const dialog = (
@@ -1768,11 +1775,13 @@ export function ChannelMembersDialog({
? "Add member?"
: `Change access to ${memberAccessLabel(selection.role)}?`
: (title ??
- (solo
- ? "Share access"
- : readOnlyAccess
- ? "Channel access"
- : "Manage members"))
+ (solo && readOnlyAccess
+ ? "Chat access"
+ : solo
+ ? "Share access"
+ : readOnlyAccess
+ ? "Channel access"
+ : "Manage members"))
}
height={selection ? "content" : generalAccess ? "stable-tall" : "stable"}
bodyLayout={selection ? "flow" : "flex"}
@@ -1876,16 +1885,6 @@ export function ChannelMembersDialog({
) : (
{searchField}
- {solo && (
-
- {canAddSoloAgents
- ? "People and agents with access can read the full history and participate in new messages. Adding an agent won’t start a run."
- : "People with access can read the full history and participate in new messages."}
-
- )}
{(administrationError ||
rosterError ||
nameError ||
diff --git a/src/bundled/channels/OutboxStatus.test.tsx b/src/bundled/channels/OutboxStatus.test.tsx
index 017fa2e743..05c43fd4eb 100644
--- a/src/bundled/channels/OutboxStatus.test.tsx
+++ b/src/bundled/channels/OutboxStatus.test.tsx
@@ -105,10 +105,30 @@ it("does not show private feedback body or generic retry in the channel outbox",
expect(retry).not.toHaveBeenCalled();
});
-it("preserves generic retry for legacy unguarded invitations", () => {
- const { retry } = show(invitation);
+it("routes an unadopted no-role invitation through member verification", async () => {
+ const { retry, add } = show({
+ ...invitation,
+ delivery: "unknown",
+ event: {
+ ...invitation.event,
+ tags: [
+ ["h", "channel"],
+ ["p", "person"],
+ ],
+ },
+ });
+ fireEvent.click(screen.getByRole("button", { name: "Retry" }));
+ await waitFor(() =>
+ expect(add).toHaveBeenCalledExactlyOnceWith("channel", "person"),
+ );
+ expect(retry).not.toHaveBeenCalled();
+});
+it("keeps a malformed no-role invitation out of generic replay", async () => {
+ const { retry, add } = show(invitation);
fireEvent.click(screen.getByRole("button", { name: "Retry" }));
- expect(retry).toHaveBeenCalledWith("invite");
+ expect(await screen.findByRole("alert")).toHaveTextContent("Reopen Members");
+ expect(retry).not.toHaveBeenCalled();
+ expect(add).not.toHaveBeenCalled();
});
it("routes an ordinary addition retry through fresh membership checks", async () => {
diff --git a/src/bundled/channels/OutboxStatus.tsx b/src/bundled/channels/OutboxStatus.tsx
index 2218ac25d6..881eb66159 100644
--- a/src/bundled/channels/OutboxStatus.tsx
+++ b/src/bundled/channels/OutboxStatus.tsx
@@ -61,7 +61,8 @@ export function OutboxStatus({
try {
if (
item.event.kind === 9000 &&
- item.recovery?.key.startsWith("member-add:")
+ (item.recovery?.key.startsWith("member-add:") ||
+ !item.event.tags.some(([tag]) => tag === "role"))
) {
const channelId = item.event.tags.find(
([tag]) => tag === "h",
diff --git a/src/features/channel-members/members.test.ts b/src/features/channel-members/members.test.ts
index f633c1f176..d27dad8531 100644
--- a/src/features/channel-members/members.test.ts
+++ b/src/features/channel-members/members.test.ts
@@ -37,6 +37,7 @@ it.each([
);
afterEach(() => {
for (const cleanup of cleanups.splice(0)) cleanup();
+ vi.useRealTimers();
});
function setup(
type = "stream",
@@ -58,12 +59,21 @@ function setup(
let agent = false;
let echo = false;
let failRoster = false;
+ let rolesAvailable = true;
+ let failInvitationRead = false;
+ let recordedInvitation: RelayEvent | undefined;
+ let onInvitationRead: (() => void) | undefined;
+ const invitationReads: import("../relay/events").ReadFilter[][] = [];
let failSave = false;
let failAcknowledgement = false;
+ let roleGate: { entered(): void; held: Promise
} | undefined;
const published: RelayEvent[] = [];
const publish = vi.fn(async (event: RelayEvent) => {
if (fail) throw unknown ? new Error(fail) : new PublishRejected(fail);
- if (apply) members = [...new Set([...members, person.pubkey])];
+ if (apply) {
+ members = [...new Set([...members, person.pubkey])];
+ personRole = event.tags.find(([tag]) => tag === "role")?.[1] ?? joinRole;
+ }
clock++;
published.push(event);
if (loseReceipt) throw new Error("Receipt lost after membership applied");
@@ -80,6 +90,12 @@ function setup(
definitions: [],
identities: agent ? [{ pubkey: person.pubkey, name: "Agent" }] : [],
}),
+ memberAdministration: {
+ sign: async (template) => signed(viewer, template),
+ publish: async (event) => {
+ await publish(event);
+ },
+ },
writer: {
kinds: [9, 9000, 9007],
sign: async (template) => signed(viewer, template),
@@ -88,6 +104,22 @@ function setup(
},
},
query: async (filters) => {
+ if (filters.some((filter) => filter.kinds?.includes(9000))) {
+ invitationReads.push([...filters]);
+ onInvitationRead?.();
+ if (failInvitationRead)
+ throw new Error("Invitation read unavailable");
+ return recordedInvitation ? [recordedInvitation] : [];
+ }
+ if (
+ roleGate &&
+ filters.some((filter) => filter.kinds?.includes(39001))
+ ) {
+ const gate = roleGate;
+ roleGate = undefined;
+ gate.entered();
+ await gate.held;
+ }
if (
failRoster &&
published.length &&
@@ -101,12 +133,29 @@ function setup(
content: "",
tags: [
["d", id],
- ["t", type],
+ ["t", type === "solo" ? "stream" : type],
+ ...(type === "solo" ? [["t", "buzz.solo"]] : []),
[visibility],
["join_role", joinRole],
["name", "Design"],
],
}),
+ ...(rolesAvailable
+ ? [
+ signed(relay, {
+ kind: 39001,
+ content: "",
+ created_at: clock,
+ tags: [
+ ["d", id],
+ ...(personRole === "admin" &&
+ members.includes(person.pubkey)
+ ? [["p", person.pubkey, "admin"]]
+ : []),
+ ],
+ }),
+ ]
+ : []),
personRole
? signed(relay, {
kind: 39002,
@@ -179,6 +228,31 @@ function setup(
setEcho: () => {
echo = true;
},
+ invitationReads,
+ setInvitationReadFailure: (value: boolean) => {
+ failInvitationRead = value;
+ },
+ recordOriginal: () => {
+ recordedInvitation = records[0]?.signed;
+ },
+ onInvitationRead: (run: () => void) => {
+ onInvitationRead = run;
+ },
+ holdRoleRead: () => {
+ let release!: () => void;
+ let entered!: () => void;
+ const held = new Promise((resolve) => {
+ release = resolve;
+ });
+ const started = new Promise((resolve) => {
+ entered = resolve;
+ });
+ roleGate = { entered, held };
+ return { release, started };
+ },
+ setRolesAvailable: (value: boolean) => {
+ rolesAvailable = value;
+ },
setRosterFailure: (value: boolean) => {
failRoster = value;
},
@@ -251,6 +325,22 @@ it("adds a participant despite a private channel's saved Guest default", async (
await t.managedAdd();
expect(t.publish.mock.calls[0]?.[0].tags).toContainEqual(["role", "member"]);
});
+it.each(["private", "public"] as const)(
+ "keeps Solo invitations participatory with a %s chat's Guest visitor default",
+ async (visibility) => {
+ const t = setup("solo", visibility, "guest");
+ await t.ready();
+ await t.managedAdd();
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.publish.mock.calls[0]?.[0].tags).toContainEqual([
+ "role",
+ "member",
+ ]);
+ expect(t.session.channels.list().channels[0]?.members).toContain(
+ t.person.pubkey,
+ );
+ },
+);
it.each(["member", "guest"] as const)(
"leaves the public %s admission default to the relay",
async (joinRole) => {
@@ -750,3 +840,228 @@ it.each([false, true])(
]);
},
);
+
+async function savedNoRoleInvitation(
+ t: ReturnType,
+ uncertain = true,
+) {
+ t.setFail("Old invitation result", uncertain);
+ const outbox = t.session.outbox;
+ if (!outbox) throw new Error("Expected membership outbox");
+ const original = outbox.send({
+ kind: 9000,
+ content: "",
+ tags: [
+ ["h", t.id],
+ ["p", t.person.pubkey],
+ ],
+ });
+ await vi.waitFor(() =>
+ expect(t.records()[0]?.delivery).toBe(uncertain ? "unknown" : "failed"),
+ );
+ t.legacy();
+ t.restart();
+ await t.ready();
+ t.setFail("");
+ return original;
+}
+it("does not replay a legacy Solo invitation that could now admit a Guest", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t);
+ await expect(t.managedAdd()).rejects.toThrow(/15-minute delivery window/i);
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.records()[0]).toMatchObject({
+ event: { id: original },
+ delivery: "unknown",
+ });
+ expect(t.records()[0]?.acknowledged).toBeUndefined();
+ await expect(t.session.outbox?.dismiss(original)).rejects.toThrow(/Confirm/);
+ t.restart();
+ await t.ready();
+ await expect(t.managedAdd()).rejects.toThrow(/15-minute delivery window/i);
+ expect(t.publish).toHaveBeenCalledOnce();
+});
+it.each(["member", "admin"])(
+ "confirms a recovered no-role invitation only after signed %s participation",
+ async (role) => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t);
+ t.confirmPerson(role);
+ await t.managedAdd();
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.records()[0]).toMatchObject({
+ event: { id: original },
+ acknowledged: true,
+ });
+ },
+);
+it("reports a recovered Guest and permits a fresh Member invite only after explicit removal", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t);
+ t.confirmPerson("guest");
+ await expect(t.managedAdd()).rejects.toThrow(
+ /remove them in People.*invite them again/i,
+ );
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.records()[0]).toMatchObject({
+ event: { id: original },
+ acknowledged: true,
+ });
+ t.restart();
+ await t.ready();
+ await expect(t.managedAdd()).rejects.toThrow(/remove them in People/i);
+ expect(t.publish).toHaveBeenCalledOnce();
+ t.removePerson();
+ await t.managedAdd();
+ expect(t.publish).toHaveBeenCalledTimes(2);
+ expect(t.publish.mock.calls[1]?.[0].id).not.toBe(original);
+ expect(t.publish.mock.calls[1]?.[0].tags).toContainEqual(["role", "member"]);
+});
+
+it("preserves a legacy invitation while signed roles are unavailable", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ await savedNoRoleInvitation(t);
+ t.confirmPerson("guest");
+ t.setRolesAvailable(false);
+ await expect(t.managedAdd()).rejects.toThrow(
+ /access could not be confirmed/i,
+ );
+ expect(t.records()[0]?.acknowledged).toBeUndefined();
+ expect(t.publish).toHaveBeenCalledOnce();
+ t.setRolesAvailable(true);
+ await expect(t.managedAdd()).rejects.toThrow(/remove them in People/i);
+ expect(t.records()[0]?.acknowledged).toBe(true);
+});
+it("replaces a definitively failed no-role invitation only after explicit Outbox dismissal", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t, false);
+ await expect(t.managedAdd()).rejects.toThrow(/15-minute delivery window/i);
+ expect(t.publish).toHaveBeenCalledOnce();
+ await t.session.outbox?.dismiss(original);
+ await t.managedAdd();
+ expect(t.publish).toHaveBeenCalledTimes(2);
+ expect(t.publish.mock.calls[1]?.[0].id).not.toBe(original);
+ expect(t.publish.mock.calls[1]?.[0].tags).toContainEqual(["role", "member"]);
+});
+
+it("does not confirm a legacy invitation from stale roles during another member operation", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ await savedNoRoleInvitation(t);
+ t.confirmPerson("member");
+ await t.session.memberAdministration.refresh(t.id);
+ const gate = t.holdRoleRead();
+ const other = t.session.memberAdministration
+ .run(t.id, {
+ pubkey: t.person.pubkey,
+ expectedRole: "member",
+ role: "guest",
+ })
+ .catch(() => {});
+ try {
+ await gate.started;
+ expect(t.session.memberAdministration.snapshot(t.id)).toMatchObject({
+ status: "ready",
+ operation: { status: "pending" },
+ });
+ await expect(t.managedAdd()).rejects.toThrow(
+ /access could not be confirmed/i,
+ );
+ expect(t.records()[0]?.acknowledged).toBeUndefined();
+ expect(t.publish).toHaveBeenCalledOnce();
+ } finally {
+ gate.release();
+ await other;
+ }
+ await t.managedAdd();
+ expect(t.records()[0]?.acknowledged).toBe(true);
+ expect(t.publish).toHaveBeenCalledOnce();
+});
+
+it("retires an expired unapplied legacy invitation before sending and confirming a fresh Member grant", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t);
+ const created = t.records()[0]?.event.created_at;
+ if (created === undefined) throw new Error("Expected saved invitation");
+ vi.useFakeTimers({ toFake: ["Date"] });
+ vi.setSystemTime((created + 901) * 1000);
+ await t.managedAdd();
+ expect(t.publish).toHaveBeenCalledTimes(2);
+ expect(t.publish.mock.calls[1]?.[0].id).not.toBe(original);
+ expect(t.publish.mock.calls[1]?.[0].tags).toContainEqual(["role", "member"]);
+ expect(t.records().find((item) => item.event.id === original)).toMatchObject({
+ acknowledged: true,
+ });
+ t.restart();
+ await t.ready();
+ await t.managedAdd();
+ expect(t.publish).toHaveBeenCalledTimes(2);
+});
+
+function afterInvitationWindow(t: ReturnType, seconds = 901) {
+ const created = t.records()[0]?.event.created_at;
+ if (created === undefined) throw new Error("Expected saved invitation");
+ vi.useFakeTimers({ toFake: ["Date"] });
+ vi.setSystemTime((created + seconds) * 1000);
+}
+it.each(["read failure", "recorded event", "storage failure"])(
+ "preserves expired legacy recovery after %s",
+ async (failure) => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t);
+ afterInvitationWindow(t);
+ if (failure === "read failure") t.setInvitationReadFailure(true);
+ if (failure === "recorded event") t.recordOriginal();
+ if (failure === "storage failure") t.setAcknowledgementFailure(true);
+ await expect(t.managedAdd()).rejects.toThrow();
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.records()[0]).toMatchObject({
+ event: { id: original },
+ delivery: failure === "recorded event" ? "seen" : "unknown",
+ });
+ expect(t.records()[0]?.acknowledged).toBeUndefined();
+ t.restart();
+ await t.ready();
+ await expect(t.managedAdd()).rejects.toThrow();
+ expect(t.publish).toHaveBeenCalledOnce();
+ },
+);
+it("does not replace at the inclusive expiry boundary and confirms strong ID absence afterward", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ const original = await savedNoRoleInvitation(t);
+ afterInvitationWindow(t, 900);
+ await expect(t.managedAdd()).rejects.toThrow(/15-minute/);
+ expect(t.invitationReads).toHaveLength(0);
+ afterInvitationWindow(t);
+ await t.managedAdd();
+ expect(t.invitationReads).toEqual([
+ [
+ {
+ kinds: [9000],
+ ids: [original],
+ authors: [t.viewer.pubkey],
+ limit: 1,
+ consistency: "strong",
+ },
+ ],
+ ]);
+ expect(t.publish).toHaveBeenCalledTimes(2);
+});
+it("rechecks membership after retiring an expired invitation instead of overwriting a joined Guest", async () => {
+ const t = setup("solo", "public", "guest");
+ await t.ready();
+ await savedNoRoleInvitation(t);
+ afterInvitationWindow(t);
+ t.onInvitationRead(() => t.confirmPerson("guest"));
+ await expect(t.managedAdd()).rejects.toThrow(/remove them in People/);
+ expect(t.publish).toHaveBeenCalledOnce();
+ expect(t.records()[0]?.acknowledged).toBe(true);
+});
diff --git a/src/features/channel-members/members.ts b/src/features/channel-members/members.ts
index fa3f7328b3..2c58d017d8 100644
--- a/src/features/channel-members/members.ts
+++ b/src/features/channel-members/members.ts
@@ -2,6 +2,7 @@ import { archiveHides } from "../relay/identity-archives";
import type { RelaySession } from "../relay/session";
import type { ChannelSummary } from "../relay/contracts";
import type { LocalEvents } from "../relay/outbox";
+import type { RelayEvent } from "../relay/events";
const keyPattern = /^[0-9a-f]{64}$/;
@@ -39,7 +40,6 @@ export function canShareSoloChat(
session.viewer &&
session.outbox?.supports(9000) &&
channel?.channelType === "solo" &&
- channel.private &&
!channel.readOnly &&
!channel.cached &&
!channel.archived &&
@@ -99,7 +99,7 @@ export async function addChannelMember(
allowSoloAgents = false,
/** Runs synchronously just before a new or retried addition is dispatched. */
beforeDispatch?: () => void,
-) {
+): Promise {
if (!keyPattern.test(pubkey))
throw new Error("Choose a valid person or agent.");
const channel = () =>
@@ -133,26 +133,32 @@ export async function addChannelMember(
const fresh =
intent.dismissed ||
(intent.confirmed && !channel()?.members?.includes(pubkey));
+ const matchesTarget = (event: Pick) =>
+ event.kind === 9000 &&
+ event.tags.some(([tag, value]) => tag === "h" && value === channelId) &&
+ event.tags.some(([tag, value]) => tag === "p" && value === pubkey);
+ const noRole = (event: Pick) =>
+ !event.tags.some(([tag]) => tag === "role");
+ const saved = journal.snapshot();
const pending = fresh
? undefined
- : journal
- .snapshot()
- .find(({ event, acknowledged }) =>
- intent.id
- ? event.id === intent.id
- : !acknowledged &&
- event.kind === 9000 &&
- event.tags.some(
- ([tag, value]) => tag === "h" && value === channelId,
- ) &&
- event.tags.some(
- ([tag, value]) => tag === "p" && value === pubkey,
- ) &&
- !event.tags.some(
- ([tag, value]) =>
- tag === "role" && value !== "bot" && value !== "member",
- ),
- );
+ : (saved.find(({ event, acknowledged }) =>
+ intent.id
+ ? event.id === intent.id
+ : !acknowledged &&
+ matchesTarget(event) &&
+ !event.tags.some(
+ ([tag, value]) =>
+ tag === "role" && value !== "bot" && value !== "member",
+ ),
+ ) ??
+ // Keep a resolved legacy Guest outcome actionable after restart.
+ (soloParticipant && channel()?.members?.includes(pubkey)
+ ? saved.find(
+ ({ event, acknowledged }) =>
+ acknowledged && matchesTarget(event) && noRole(event),
+ )
+ : undefined));
const recovery = { key: `member-add:${channelId}:${pubkey}`, value: "1" };
// A saved share may finish its exact Bot grant; it cannot authorize a new one.
const recoveringSoloAgent =
@@ -183,9 +189,56 @@ export async function addChannelMember(
throw new Error(
"Retry this invitation from the agent’s profile so its eligibility can be checked.",
);
+ if (soloParticipant && pending && noRole(pending.event))
+ intent.id = pending.event.id;
if (pending && !pending.acknowledged)
await outbox.recover(pending.event.id, recovery);
check();
+ if (soloParticipant && pending && noRole(pending.event)) {
+ if (!channel()?.members?.includes(pubkey)) {
+ await outbox.acknowledge(pending.event.id, async (event) => {
+ check();
+ await session.channelWrites.verifyUnappliedAddition(event, signal);
+ check();
+ });
+ intent.confirmed = true;
+ // Re-read membership after durable retirement; only absent targets get a new grant.
+ return addChannelMember(
+ session,
+ channelId,
+ pubkey,
+ signal,
+ intent,
+ receipts,
+ soloParticipant,
+ allowSoloAgents,
+ beforeDispatch,
+ );
+ }
+ await session.memberAdministration.refresh(channelId);
+ check();
+ const verified = session.memberAdministration.snapshot(channelId);
+ const role = verified.authority.roles[pubkey];
+ if (
+ verified.status !== "ready" ||
+ verified.operation?.status === "pending" ||
+ !role ||
+ role === "unknown"
+ )
+ throw new Error(
+ "Current access could not be confirmed. Refresh members and roles before trying again.",
+ );
+ // Membership resolves the original command, even when its grant was Guest.
+ // Do not promote a newer role or replay the old command after removal.
+ if (role === "guest") {
+ await outbox.acknowledge(pending.event.id);
+ check();
+ intent.confirmed = true;
+ throw new Error(
+ "This earlier invitation granted view-only access. To grant participation, remove them in People and invite them again.",
+ );
+ }
+ }
if (channel()?.members?.includes(pubkey)) {
if (!intent.id && pending) intent.id = pending.event.id;
if (pending) await outbox.acknowledge(pending.event.id);
@@ -210,13 +263,13 @@ export async function addChannelMember(
.identities.some((agent) => agent.pubkey === pubkey) ||
session.profiles.snapshot().get(pubkey)?.isAgent;
const current = channel();
- // Private channel additions grant participation explicitly, even if an older
- // saved admission default is Guest. Solo and system admission stay separate.
+ // Solo sharing and private-channel invitations grant participation explicitly,
+ // independently of the admission default for public visitors.
const role = isAgent
? "bot"
- : !soloParticipant &&
- current?.visibility === "private" &&
- (current.channelType === "stream" || current.channelType === "forum")
+ : soloParticipant ||
+ (current?.visibility === "private" &&
+ (current.channelType === "stream" || current.channelType === "forum"))
? "member"
: undefined;
beforeDispatch?.();
diff --git a/src/features/channels/general-access.ts b/src/features/channels/general-access.ts
new file mode 100644
index 0000000000..ee137c4dc4
--- /dev/null
+++ b/src/features/channels/general-access.ts
@@ -0,0 +1,46 @@
+import type { ChannelDetailsDraft } from "../relay/channel-details-protocol";
+
+export const generalAccessOptions = {
+ private: {
+ value: "private",
+ label: "Private",
+ description: "Only people you add can access.",
+ },
+ "view-only": {
+ value: "view-only",
+ label: "View only",
+ description: "Anyone in the community can read.",
+ },
+ public: {
+ value: "public",
+ label: "Public",
+ description: "Anyone in the community can participate.",
+ },
+} as const;
+
+export type GeneralAccess = keyof typeof generalAccessOptions;
+type Policy = Pick;
+
+export function generalAccessValue(policy: Policy): GeneralAccess {
+ return policy.visibility === "private"
+ ? "private"
+ : policy.joinRole === "guest"
+ ? "view-only"
+ : "public";
+}
+
+/** Private retains the admission default; open policies state it explicitly. */
+export function generalAccessPolicy(
+ access: GeneralAccess,
+ joinRole: Policy["joinRole"],
+): Policy {
+ return {
+ visibility: access === "private" ? "private" : "public",
+ joinRole:
+ access === "private"
+ ? joinRole
+ : access === "view-only"
+ ? "guest"
+ : "member",
+ };
+}
diff --git a/src/features/messages/ChannelJoinNotice.tsx b/src/features/messages/ChannelJoinNotice.tsx
index 73b24239ee..203e9e3912 100644
--- a/src/features/messages/ChannelJoinNotice.tsx
+++ b/src/features/messages/ChannelJoinNotice.tsx
@@ -103,7 +103,7 @@ export function ChannelJoinNotice({
? `This ${place} is archived`
: readOnly
? joinRole === "guest"
- ? "This channel is read-only"
+ ? `This ${place} is read-only`
: "Read-only access"
: canJoin
? "Join channel to send messages"
diff --git a/src/features/messages/MessageComposer.test.tsx b/src/features/messages/MessageComposer.test.tsx
index 441b49673b..86d72db753 100644
--- a/src/features/messages/MessageComposer.test.tsx
+++ b/src/features/messages/MessageComposer.test.tsx
@@ -5765,9 +5765,13 @@ it.each([false, true])(
},
);
-it.each(["send", "unmount", "disabled", "denied"])(
- "waits for agent admission before saved Solo chat messages: %s",
- async (outcome) => {
+it.each(
+ ["send", "unmount", "disabled", "denied"].flatMap((outcome) =>
+ ["private", "public"].map((visibility) => ({ outcome, visibility })),
+ ),
+)(
+ "waits for agent admission before saved $visibility Solo chat messages with a Guest default: $outcome",
+ async ({ outcome, visibility }) => {
const view = mount();
const list = {
status: "ready",
@@ -5775,6 +5779,8 @@ it.each(["send", "unmount", "disabled", "denied"])(
{
id: "channel",
channelType: "solo",
+ visibility,
+ joinRole: "guest",
members: [] as string[],
},
],
diff --git a/src/features/relay/channel-writes.ts b/src/features/relay/channel-writes.ts
index 64ca55b6b7..83bab82cdb 100644
--- a/src/features/relay/channel-writes.ts
+++ b/src/features/relay/channel-writes.ts
@@ -6,6 +6,7 @@ import type { Outbox } from "./outbox";
import { withdraw } from "./withdraw";
import type { ChannelQueries, ChannelSummary } from "./contracts";
import type { RelayReader } from "./reader";
+import type { EventData } from "./events";
export const DEFAULT_TEMPORARY_CHANNEL_TTL_SECONDS = 7 * 24 * 60 * 60;
@@ -453,6 +454,8 @@ export function createChannelWrites(
if (active?.() === false)
throw new DOMException("Channel addition cancelled", "AbortError");
const original = await refreshMembership(id);
+ // Solo agents must be able to reply even with a saved Guest admission default.
+ const roleTags = original.channelType === "solo" ? [["role", "bot"]] : [];
if (active?.() === false)
throw new DOMException("Channel addition cancelled", "AbortError");
const unique = [...new Set(keys)].filter(
@@ -486,21 +489,22 @@ export function createChannelWrites(
if (!current?.members || current.archived)
throw new Error("Channel membership is unavailable.");
if (current.members.includes(key)) continue;
- const previous = (receipts ?? outbox)
- ?.snapshot()
- .find(
- (item) =>
- item.event.kind === 9000 &&
- !item.acknowledged &&
- !["accepted", "seen"].includes(item.delivery) &&
- item.event.tags.some(
- ([name, value]) => name === "h" && value === id,
- ) &&
- item.event.tags.some(
- ([name, value]) => name === "p" && value === key,
- ) &&
- !item.event.tags.some(([name]) => name === "role"),
+ const previous = (receipts ?? outbox)?.snapshot().find((item) => {
+ const roles = item.event.tags.filter(([name]) => name === "role");
+ return (
+ item.event.kind === 9000 &&
+ !item.acknowledged &&
+ !["accepted", "seen"].includes(item.delivery) &&
+ item.event.tags.some(
+ ([name, value]) => name === "h" && value === id,
+ ) &&
+ item.event.tags.some(
+ ([name, value]) => name === "p" && value === key,
+ ) &&
+ roles.length === roleTags.length &&
+ roles.every((tag) => tag.length === 2 && tag[1] === "bot")
);
+ });
if (previous && Date.now() / 1000 - previous.event.created_at >= 15 * 60)
throw new Error(
`This agent-add request expired. Open Outbox, remove the “Add agent ${key.slice(0, 12)}” item, then add the agent again. Check channel membership first if the request was unconfirmed.`,
@@ -511,10 +515,7 @@ export function createChannelWrites(
{
kind: 9000,
content: "",
- tags: [
- ["h", id],
- ["p", key],
- ],
+ tags: [["h", id], ["p", key], ...roleTags],
},
undefined,
active,
@@ -772,6 +773,28 @@ export function createChannelWrites(
false
);
},
+ /** Outbox fences local delivery and expiry; this read bypasses cached absence. */
+ async verifyUnappliedAddition(event: EventData, caller: AbortSignal) {
+ const active = AbortSignal.any([signal, caller]);
+ active.throwIfAborted();
+ const events = await reader.read(
+ [
+ {
+ kinds: [9000],
+ ids: [event.id],
+ authors: [event.pubkey],
+ limit: 1,
+ consistency: "strong",
+ },
+ ],
+ { signal: active, fresh: true, priority: "foreground" },
+ );
+ active.throwIfAborted();
+ if (events.length)
+ throw new Error(
+ "The earlier invitation is recorded on the relay. Refresh members to check its result before inviting again.",
+ );
+ },
async discardFailed(id: string) {
const source = writer();
if (
diff --git a/src/features/relay/contracts.ts b/src/features/relay/contracts.ts
index 3dc4c9d1a0..4128a429b5 100644
--- a/src/features/relay/contracts.ts
+++ b/src/features/relay/contracts.ts
@@ -43,7 +43,7 @@ export type ChannelSummary = Readonly<{
hidden?: true;
/** Relay-authored metadata; absent while metadata is unavailable. */
/** `system` (NIP-CL): access control for app data; never in list().
- * `session`: a private stream with the Solo label (`SOLO_LABEL`). */
+ * `solo`: a stream with the Solo label (`SOLO_LABEL`), regardless of visibility. */
channelType?: "stream" | "forum" | "dm" | "solo" | "system";
/** Relay-authored channel visibility; private channels use restricted presentation. */
private?: true;
diff --git a/src/features/relay/discovery-permissions.test.ts b/src/features/relay/discovery-permissions.test.ts
index 9c6fe2f1d4..61a72e89c6 100644
--- a/src/features/relay/discovery-permissions.test.ts
+++ b/src/features/relay/discovery-permissions.test.ts
@@ -2,6 +2,7 @@ import { expect, it } from "vitest";
import { DiscoveryState } from "./discovery";
import { eventDto } from "./events";
import { keypair, metadata, signed } from "./testing";
+import { SOLO_LABEL } from "../solo/labels";
const relay = keypair(),
viewer = keypair();
@@ -23,6 +24,37 @@ const details = (role: string, time: number) =>
["join_role", role],
]);
+it("keeps public Solo visitors read-only without membership and revokes their access when made private", () => {
+ const owner = keypair();
+ const state = new DiscoveryState(viewer.pubkey, relay.pubkey);
+ const chat = (visibility: "public" | "private", time: number) =>
+ metadata(relay, id, "Planning", time, [
+ [visibility],
+ ["t", "stream"],
+ ["t", SOLO_LABEL],
+ ["P", owner.pubkey],
+ ["join_role", "guest"],
+ ]);
+ state.accept(chat("private", 1));
+ expect(state.get(id)).toBeUndefined();
+ state.accept(chat("public", 2));
+ expect(state.get(id)).toMatchObject({
+ channelType: "solo",
+ readOnly: true,
+ joinRole: "guest",
+ creator: owner.pubkey,
+ });
+ expect(state.canAccess(id)).toBe(true);
+ expect(state.canWrite(id)).toBe(false);
+ expect(state.canParticipate(id)).toBe(false);
+ expect(state.channels()).toEqual([]);
+ state.accept(chat("private", 3));
+ expect(state.canAccess(id)).toBe(false);
+ expect(state.get(id)).toBeUndefined();
+ state.accept(chat("public", 2));
+ expect(state.canAccess(id)).toBe(false);
+});
+
it("keeps a guest joined and readable across admission-default changes until explicitly promoted", () => {
const state = new DiscoveryState(viewer.pubkey, relay.pubkey);
state.accept(details("guest", 10));
diff --git a/src/features/relay/discovery.ts b/src/features/relay/discovery.ts
index 0adb5961b5..e3f3770f49 100644
--- a/src/features/relay/discovery.ts
+++ b/src/features/relay/discovery.ts
@@ -24,12 +24,10 @@ export function metadataName(event: RelayEvent): string | undefined {
return name;
}
-/** A Solo chat: a private stream carrying the Solo label. Never access. */
+/** A Solo chat: a stream carrying the Solo label. Never access. */
export function soloChannelMetadata(event: RelayEvent): boolean {
return (
- tag(event, "t") === "stream" &&
- event.tags.some(([name]) => name === "private") &&
- soloLabels(channelIdentity(event).labels)
+ tag(event, "t") === "stream" && soloLabels(channelIdentity(event).labels)
);
}
diff --git a/src/features/relay/outbox-recovery.test.ts b/src/features/relay/outbox-recovery.test.ts
index 5b0aa41fe0..95dd91fd0a 100644
--- a/src/features/relay/outbox-recovery.test.ts
+++ b/src/features/relay/outbox-recovery.test.ts
@@ -13,6 +13,7 @@ const recovery = { key: "new-dm", value: '{"draft":"First message"}' };
const owners: ReturnType[] = [];
afterEach(() => {
for (const owner of owners.splice(0)) owner.dispose();
+ vi.useRealTimers();
});
function setup(
storage: OutboxStorage,
@@ -296,3 +297,123 @@ it("retires roster-confirmed member recovery without inventing a delivery receip
expect(h.publish).toHaveBeenCalledOnce();
expect(restored.publish).not.toHaveBeenCalled();
});
+
+function legacyAddition(age = 901) {
+ const event = signed(viewer, {
+ kind: 9000,
+ content: "",
+ tags: [
+ ["h", "channel"],
+ ["p", "person"],
+ ],
+ created_at: Math.floor(Date.now() / 1000) - age,
+ });
+ const recovery = { key: "member-add:channel:person", value: "1" };
+ let records: readonly OutgoingEvent[] = [
+ { event, signed: event, delivery: "unknown", recovery },
+ ];
+ const store = {
+ load: () => structuredClone(records),
+ save: (next: readonly OutgoingEvent[]) => {
+ records = structuredClone(next);
+ },
+ };
+ return { event, recovery, store };
+}
+it("fences replay and replacement until an expired legacy invitation is durably resolved", async () => {
+ const { event, recovery, store } = legacyAddition();
+ const h = setup(store);
+ await h.outbox.ready();
+ let release!: () => void;
+ const gate = new Promise((resolve) => {
+ release = resolve;
+ });
+ const verify = vi.fn(async () => {
+ await gate;
+ });
+ const retire = h.outbox.acknowledge(event.id, verify);
+ try {
+ await vi.waitFor(() => expect(verify).toHaveBeenCalledOnce());
+ h.outbox.retry(event.id);
+ expect(() =>
+ h.outbox.send(
+ {
+ kind: 9000,
+ content: "",
+ tags: [
+ ["h", "channel"],
+ ["p", "person"],
+ ["role", "member"],
+ ],
+ },
+ recovery,
+ ),
+ ).toThrow(/Recover the earlier/);
+ expect(store.load()[0]?.acknowledged).toBeUndefined();
+ } finally {
+ release();
+ }
+ await retire;
+ expect(h.publish).not.toHaveBeenCalled();
+ expect(store.load()[0]).toMatchObject({
+ acknowledged: true,
+ delivery: "unknown",
+ });
+ expect(h.outbox.snapshot()).toEqual([]);
+});
+it("cannot retire a still-active delivery after its intake window expires", async () => {
+ const { event, store } = legacyAddition(0);
+ let release!: () => void;
+ const gate = new Promise((resolve) => {
+ release = resolve;
+ });
+ const publish = vi.fn(async () => {
+ await gate;
+ });
+ const h = setup(store, publish);
+ await h.outbox.ready();
+ h.outbox.retry(event.id);
+ try {
+ await vi.waitFor(() => expect(publish).toHaveBeenCalledOnce());
+ vi.useFakeTimers({ toFake: ["Date"] });
+ vi.setSystemTime((event.created_at + 901) * 1000);
+ const verify = vi.fn(async () => {});
+ await expect(h.outbox.acknowledge(event.id, verify)).rejects.toThrow(
+ /may still arrive/,
+ );
+ expect(verify).not.toHaveBeenCalled();
+ expect(store.load()[0]?.acknowledged).toBeUndefined();
+ } finally {
+ release();
+ }
+ await vi.waitFor(() =>
+ expect(h.outbox.snapshot()[0]?.delivery).toBe("accepted"),
+ );
+});
+it("retains a legacy receipt when an echo arrives during negative verification", async () => {
+ const { event, store } = legacyAddition();
+ const h = setup(store);
+ await h.outbox.ready();
+ let release!: () => void;
+ const gate = new Promise((resolve) => {
+ release = resolve;
+ });
+ const verify = vi.fn(async () => {
+ await gate;
+ });
+ const retire = h.outbox.acknowledge(event.id, verify);
+ const rejected = expect(retire).rejects.toThrow(/changed while checking/);
+ try {
+ await vi.waitFor(() => expect(verify).toHaveBeenCalledOnce());
+ h.observe([event]);
+ } finally {
+ release();
+ }
+ await rejected;
+ expect(h.outbox.snapshot()[0]).toMatchObject({
+ delivery: "seen",
+ recovery: { key: "member-add:channel:person" },
+ });
+ expect(store.load()[0]?.acknowledged).toBeUndefined();
+ expect(h.publish).not.toHaveBeenCalled();
+});
diff --git a/src/features/relay/outbox.ts b/src/features/relay/outbox.ts
index a2f2503bc9..2ff6d421aa 100644
--- a/src/features/relay/outbox.ts
+++ b/src/features/relay/outbox.ts
@@ -63,7 +63,11 @@ export interface Outbox {
): string;
/** Attach caller-owned recovery to an existing receipt before resuming it. */
recover(id: string, recovery: OutboxRecovery): Promise;
- acknowledge(id: string): Promise;
+ /** An expired no-role invitation may instead be resolved by fresh negative readback. */
+ acknowledge(
+ id: string,
+ verifyUnapplied?: (event: EventData) => Promise,
+ ): Promise;
retry(id: string, active?: () => boolean): void;
dismiss(id: string): Promise;
/** Durable explicit dismissal, with delivery evidence at removal. */
@@ -688,10 +692,54 @@ export function createOutbox(
notify();
await persist(id);
},
- async acknowledge(id: string) {
+ async acknowledge(
+ id: string,
+ verifyUnapplied?: (event: EventData) => Promise,
+ ) {
await outbox.ready();
const item = visible.find((item) => item.event.id === id);
if (!item?.recovery) return;
+ if (verifyUnapplied) {
+ const eligible = () => {
+ const current = find(id);
+ return (
+ !closed &&
+ !attempts.has(id) &&
+ current?.event.kind === 9000 &&
+ current.recovery?.key.startsWith("member-add:") &&
+ (current.delivery === "unknown" || current.delivery === "failed") &&
+ current.event.content === "" &&
+ current.event.tags.every(
+ (tag) =>
+ tag.length === 2 &&
+ ["h", "p", "client-id", "ms"].includes(tag[0] ?? ""),
+ ) &&
+ current.event.tags.filter(([tag]) => tag === "h").length === 1 &&
+ current.event.tags.filter(([tag]) => tag === "p").length === 1 &&
+ current.event.created_at < Math.floor(Date.now() / 1000) - 15 * 60
+ );
+ };
+ if (dismissing.has(id) || !eligible())
+ throw new Error(
+ "This saved invitation may still arrive. Retry after its 15-minute delivery window ends.",
+ );
+ // Fence every local replay until verification and retirement are durable.
+ const work = Promise.resolve().then(async () => {
+ await verifyUnapplied(item.event);
+ if (!eligible())
+ throw new Error(
+ "The invitation changed while checking it. Refresh members and try again.",
+ );
+ await persist(id, "acknowledge");
+ });
+ dismissing.set(id, work);
+ try {
+ await work;
+ } finally {
+ if (dismissing.get(id) === work) dismissing.delete(id);
+ }
+ return;
+ }
// Member callers verify a fresh signed roster even when the receipt was lost.
if (
!(
diff --git a/src/features/relay/session-agent-admission.test.ts b/src/features/relay/session-agent-admission.test.ts
index 65c8436765..416919e95f 100644
--- a/src/features/relay/session-agent-admission.test.ts
+++ b/src/features/relay/session-agent-admission.test.ts
@@ -6,7 +6,7 @@ import { matchesEvent } from "./projection";
import type { RelayEvent } from "./events";
import { SOLO_LABEL } from "../solo/labels";
-function setup() {
+function setup(visibility: "private" | "public" = "private") {
const viewer = keypair(),
relay = keypair(),
agent = keypair();
@@ -102,7 +102,11 @@ function setup() {
tags: [["-"], ...archived.map((key) => ["p", key])],
}),
meta(parent, "stream"),
- meta(child, "stream", [["private"], ["t", SOLO_LABEL]]),
+ meta(child, "stream", [
+ [visibility],
+ ["t", SOLO_LABEL],
+ ["join_role", "guest"],
+ ]),
roster(relay, parent, members, clock),
roster(relay, child, childMembers, clock),
];
@@ -174,36 +178,83 @@ function setup() {
};
}
-it("adds an outside agent once and confirms its membership", async () => {
- const test = setup();
- try {
- await test.ready();
- await test.owner.session.channelWrites.addAgents(test.child, [
- test.agent,
- test.agent,
- ]);
- expect(test.publish).toHaveBeenCalledOnce();
- expect(test.publish.mock.calls[0]?.[0]).toMatchObject({
- kind: 9000,
- tags: expect.arrayContaining([
- ["h", test.child],
- ["p", test.agent],
- ]),
- });
- expect(
- test.publish.mock.calls[0]?.[0].tags.some(([name]) => name === "role"),
- ).toBe(false);
- expect(
- test.owner.session.channels
- .list()
- .channels.find((item) => item.id === test.child)?.members,
- ).toContain(test.agent);
- await test.owner.session.channelWrites.addAgents(test.child, [test.agent]);
- expect(test.publish).toHaveBeenCalledOnce();
- } finally {
- test.owner.dispose();
- }
-});
+it.each(["private", "public"] as const)(
+ "adds an outside agent as Bot with a Guest default in a %s Solo chat",
+ async (visibility) => {
+ const test = setup(visibility);
+ try {
+ await test.ready();
+ await test.owner.session.channelWrites.addAgents(test.child, [
+ test.agent,
+ test.agent,
+ ]);
+ expect(test.publish).toHaveBeenCalledOnce();
+ expect(test.publish.mock.calls[0]?.[0]).toMatchObject({
+ kind: 9000,
+ tags: expect.arrayContaining([
+ ["h", test.child],
+ ["p", test.agent],
+ ["role", "bot"],
+ ]),
+ });
+ expect(
+ test.owner.session.channels
+ .list()
+ .channels.find((item) => item.id === test.child)?.members,
+ ).toContain(test.agent);
+ await test.owner.session.channelWrites.addAgents(test.child, [
+ test.agent,
+ ]);
+ expect(test.publish).toHaveBeenCalledOnce();
+ } finally {
+ test.owner.dispose();
+ }
+ },
+);
+it.each([
+ { roleTags: [] },
+ { roleTags: [["role", "guest"]] },
+ { roleTags: [["role", "member"]] },
+ {
+ roleTags: [
+ ["role", "bot"],
+ ["role", "bot"],
+ ],
+ },
+])(
+ "does not reuse a Solo agent receipt with incompatible role tags $roleTags",
+ async ({ roleTags }) => {
+ const test = setup();
+ try {
+ await test.ready();
+ test.setDenied(true);
+ const outbox = test.owner.session.outbox;
+ if (!outbox) throw new Error("Missing fixture outbox");
+ const previous = outbox.send({
+ kind: 9000,
+ content: "",
+ tags: [["h", test.child], ["p", test.agent], ...roleTags],
+ });
+ await vi.waitFor(() =>
+ expect(
+ outbox.snapshot().find((item) => item.event.id === previous)
+ ?.delivery,
+ ).toBe("failed"),
+ );
+ test.setDenied(false);
+ await test.owner.session.channelWrites.addAgents(test.child, [
+ test.agent,
+ ]);
+ expect(test.publish.mock.lastCall?.[0].id).not.toBe(previous);
+ expect(test.publish.mock.lastCall?.[0].tags).toContainEqual([
+ "role",
+ "bot",
+ ]);
+ } finally {
+ test.owner.dispose();
+ }
+ },
+);
it("reports channel-specific uncertainty when an accepted addition lacks roster confirmation", async () => {
const test = setup();
try {
diff --git a/src/features/relay/session-discovery.test.ts b/src/features/relay/session-discovery.test.ts
index a9d093cecc..38ee1a83ab 100644
--- a/src/features/relay/session-discovery.test.ts
+++ b/src/features/relay/session-discovery.test.ts
@@ -2,7 +2,7 @@ import { expect, it } from "vitest";
import { DiscoveryState } from "./discovery";
import { keypair, roster, signed } from "./testing";
import { SOLO_LABEL } from "../solo/labels";
-it("recognizes only relay-authorized private streams with the Solo label", () => {
+it("recognizes relay-authorized streams with the Solo label independently of visibility", () => {
const viewer = keypair(),
relay = keypair();
const discovery = new DiscoveryState(viewer.pubkey, relay.pubkey);
@@ -28,7 +28,7 @@ it("recognizes only relay-authorized private streams with the Solo label", () =>
discovery.accept(metadata(viewer, true, 1));
expect(discovery.isSolo("work")).toBe(false);
discovery.accept(metadata(relay, false, 1));
- expect(discovery.isSolo("work")).toBe(false);
+ expect(discovery.isSolo("work")).toBe(true);
discovery.accept(metadata(relay, true, 2));
expect(discovery.channels()[0]).toMatchObject({
channelType: "solo",
diff --git a/src/features/solo/ConvertToChannel.test.tsx b/src/features/solo/ConvertToChannel.test.tsx
index a164ee20ca..ca55546a3d 100644
--- a/src/features/solo/ConvertToChannel.test.tsx
+++ b/src/features/solo/ConvertToChannel.test.tsx
@@ -9,12 +9,13 @@ import {
waitFor,
} from "@testing-library/react";
import { afterEach, expect, it, vi } from "vitest";
+import userEvent from "@testing-library/user-event";
import { finalizeEvent, getPublicKey, type EventTemplate } from "nostr-tools";
import { createChannelDetails } from "../relay/channel-details";
import { createRelaySession } from "../relay/session";
import { PublishRejected } from "../relay/outbox";
import { SOLO_LABEL } from "./labels";
-import { chatConversion } from "./conversion";
+import { chatConversion, conversionLabel } from "./conversion";
import { ConvertToChannel, canConvertToChannel } from "./ConvertToChannel";
const id = "11111111-1111-4111-8111-111111111111";
@@ -27,11 +28,16 @@ afterEach(() => {
cleanup();
for (const close of dispose.splice(0)) close();
});
-function setup(solo = true) {
+function setup(
+ solo = true,
+ initialVisibility: "private" | "public" = "private",
+ initialJoinRole: "member" | "guest" | undefined = undefined,
+) {
let clock = 100,
role = "owner",
name = "Original",
- visibility = "private";
+ visibility = initialVisibility,
+ joinRole = initialJoinRole;
let labels = solo ? [SOLO_LABEL, "work"] : ["work"];
const record = (kind: number, tags: string[][]) =>
finalizeEvent(
@@ -45,6 +51,7 @@ function setup(solo = true) {
["t", "stream"],
...labels.map((label) => ["t", label]),
[visibility],
+ ...(joinRole ? [["join_role", joinRole]] : []),
["ttl", "86400"],
]);
const read = vi.fn(async () => [
@@ -62,6 +69,8 @@ function setup(solo = true) {
if (written.length) labels = written.filter(Boolean);
const choice = event.tags.find(([tag]) => tag === "visibility")?.[1];
if (choice) visibility = choice === "open" ? "public" : "private";
+ const admission = event.tags.find(([tag]) => tag === "join_role")?.[1];
+ if (admission === "member" || admission === "guest") joinRole = admission;
clock++;
});
const details = createChannelDetails({
@@ -133,31 +142,66 @@ function setup(solo = true) {
name = "Changed";
clock++;
},
- converted: (next = "private") => {
+ admission: (next: "member" | "guest") => {
+ joinRole = next;
+ clock++;
+ },
+ converted: (
+ next: "private" | "public" = "private",
+ admission: "member" | "guest" | undefined = next === "public"
+ ? "member"
+ : joinRole,
+ ) => {
labels = labels.filter((label) => label !== SOLO_LABEL);
visibility = next;
+ joinRole = admission;
clock++;
},
};
}
const confirm = () =>
screen.getByRole("button", { name: "Convert to channel" });
+const accessControl = () =>
+ screen.getByRole("combobox", { name: "General access" });
+async function selectAccess(label: string) {
+ const user = userEvent.setup();
+ await user.click(accessControl());
+ await user.click(await screen.findByRole("option", { name: label }));
+}
async function ready() {
await waitFor(() => expect(confirm()).toBeEnabled());
}
+it("preselects View only and preserves Guest admission when converting a view-only Solo chat", async () => {
+ const h = setup(true, "public", "guest");
+ await ready();
+ expect(accessControl()).toHaveTextContent("View only");
+ fireEvent.click(confirm());
+ await waitFor(() => expect(h.close).toHaveBeenCalledOnce());
+ expect(h.publish).toHaveBeenCalledOnce();
+ expect(h.sign.mock.calls[0]?.[0].tags).not.toContainEqual([
+ "visibility",
+ "private",
+ ]);
+ expect(await h.details.capability.load(id)).toMatchObject({
+ visibility: "public",
+ joinRole: "guest",
+ labels: ["work"],
+ ttlSeconds: 86400,
+ });
+});
it.each(["private", "public"])(
"converts through signed kind 9002 with explicit %s visibility and unchanged TTL",
async (visibility) => {
const h = setup();
await ready();
- expect(screen.getByRole("radio", { name: "Private" })).toBeChecked();
+ expect(accessControl()).toHaveTextContent("Private");
+ const user = userEvent.setup();
+ await user.click(accessControl());
expect(
- screen.getByRole("radio", { name: "Public" }),
- ).toHaveAccessibleDescription(
- "Everyone in this community will be able to view this channel’s full history.",
- );
- if (visibility === "public")
- fireEvent.click(screen.getByRole("radio", { name: "Public" }));
+ await screen.findByRole("option", { name: "Public" }),
+ ).toHaveAccessibleDescription("Anyone in the community can participate.");
+ await user.keyboard("{Escape}");
+ if (visibility === "public") await selectAccess("Public");
expect(h.sign).not.toHaveBeenCalled();
fireEvent.click(confirm());
await waitFor(() => expect(h.close).toHaveBeenCalledOnce());
@@ -187,6 +231,154 @@ it.each(["private", "public"])(
});
},
);
+
+const policies = [
+ { label: "Private", visibility: "private", joinRole: "guest" },
+ { label: "View only", visibility: "public", joinRole: "guest" },
+ { label: "Public", visibility: "public", joinRole: "member" },
+] as const;
+it.each(policies.flatMap((from) => policies.map((to) => ({ from, to }))))(
+ "converts $from.label → $to.label with the selected admission policy",
+ async ({ from, to }) => {
+ const h = setup(true, from.visibility, from.joinRole);
+ await ready();
+ expect(accessControl()).toHaveTextContent(from.label);
+ const user = userEvent.setup();
+ await user.click(accessControl());
+ expect(await screen.findAllByRole("option")).toHaveLength(3);
+ expect(
+ screen.getByRole("option", { name: "View only" }),
+ ).toHaveAccessibleDescription("Anyone in the community can read.");
+ await user.click(screen.getByRole("option", { name: to.label }));
+ const disclosure = screen.queryByText(
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.",
+ { exact: false },
+ );
+ if (from.visibility === "private" && to.visibility === "public") {
+ expect(disclosure).toBeVisible();
+ expect(screen.getByRole("dialog")).toHaveAccessibleDescription(
+ disclosure?.textContent,
+ );
+ } else expect(disclosure).not.toBeInTheDocument();
+ if (from.visibility === "public" && to.visibility === "private") {
+ expect(screen.getByRole("dialog")).toHaveAccessibleDescription(
+ from.joinRole === "guest"
+ ? "People who joined while it was View only are members and keep reading until you remove them in People."
+ : "People who already joined remain members and keep their access until you remove them in People.",
+ );
+ }
+ expect(h.publish).not.toHaveBeenCalled();
+ fireEvent.click(confirm());
+ await waitFor(() => expect(h.close).toHaveBeenCalledOnce());
+ expect(h.publish).toHaveBeenCalledOnce();
+ expect(await h.details.capability.load(id)).toMatchObject({
+ visibility: to.visibility,
+ joinRole: to.visibility === "private" ? from.joinRole : to.joinRole,
+ labels: ["work"],
+ ttlSeconds: 86400,
+ });
+ },
+);
+
+it("preselects Public when the open chat has the default Member admission", async () => {
+ setup(true, "public", undefined);
+ await ready();
+ expect(accessControl()).toHaveTextContent("Public");
+});
+
+it("retires superseded View-only recovery after Finish rejects changed admission and reload/remount", async () => {
+ const h = setup(true, "public", "member");
+ await ready();
+ await selectAccess("View only");
+ h.publish.mockRejectedValueOnce(new Error("lost acknowledgment"));
+ fireEvent.click(confirm());
+ await screen.findByRole("alert");
+ h.mounted.unmount();
+ h.converted("public", "guest");
+ await h.session.channelDetails.check(id);
+ render(();
const [busy, setBusy] = useState(false);
const [error, setError] = useState("");
- const [visibility, setVisibility] = useState<"private" | "public">("private");
+ const [access, setAccess] = useState();
const lifetime = useRef(undefined);
const pending = useRef(false);
const conversionAttempt =
@@ -90,17 +117,32 @@ export function ConvertToChannel({
base &&
receipt &&
!attempt &&
- !soloLabels(base.labels) &&
- base.name === receipt.draft.name &&
- base.visibility === receipt.draft.visibility &&
- base.ttlSeconds === receipt.draft.ttlSeconds
+ matchesConversion(base, receipt)
);
const canFinish = converted || confirmedElsewhere;
- // Uncertain intent belongs to the details owner, including the chosen privacy.
- const selectedVisibility =
- receipt?.draft.visibility ??
- conversionAttempt?.draft.visibility ??
- visibility;
+ // Uncertain intent belongs to the details owner, including admission.
+ const savedDraft = receipt?.draft ?? conversionAttempt?.draft;
+ const selectedAccess = savedDraft
+ ? generalAccessValue(savedDraft)
+ : (access ?? (base ? generalAccessValue(base) : "private"));
+
+ const acceptDetails = useCallback(
+ (next: ChannelDetails) => {
+ setBase(next);
+ const saved = chatConversion(session, id);
+ // A fresh superseding edit retires only unconfirmed local orchestration.
+ // Durable uncertainty and a completed metadata phase retain their owners.
+ if (
+ saved &&
+ !saved.running &&
+ !saved.converted &&
+ !details.snapshot(id) &&
+ !matchesConversion(next, saved)
+ )
+ updateChatConversion(session, id, undefined);
+ },
+ [details, id, session],
+ );
useEffect(() => {
const controller = new AbortController();
@@ -110,21 +152,21 @@ export function ConvertToChannel({
...(signal ? [signal] : []),
]);
setBase(undefined);
- setVisibility("private");
+ setAccess(undefined);
setError("");
setBusy(false);
pending.current = false;
void details
.load(id, active)
.then((next) => {
- if (!active.aborted) setBase(next);
+ if (!active.aborted) acceptDetails(next);
})
.catch((reason) => {
if (!active.aborted)
setError(reason instanceof Error ? reason.message : String(reason));
});
return () => controller.abort();
- }, [details, id, signal]);
+ }, [details, id, signal, acceptDetails]);
const run = async (action: "convert" | "reload" | "check" | "finish") => {
const controller = lifetime.current;
@@ -147,7 +189,7 @@ export function ConvertToChannel({
try {
if (action === "reload") {
const next = await details.load(id, active);
- if (!active.aborted) setBase(next);
+ if (!active.aborted) acceptDetails(next);
} else {
if (chatConversion(session, id)?.running)
throw new Error("Conversion is already in progress in another view.");
@@ -165,7 +207,7 @@ export function ConvertToChannel({
draft: {
name: base?.name ?? "",
description: base?.description ?? "",
- visibility: selectedVisibility,
+ ...generalAccessPolicy(selectedAccess, base?.joinRole),
ttlSeconds: base?.ttlSeconds,
labels: withoutSolo(base?.labels),
},
@@ -176,15 +218,14 @@ export function ConvertToChannel({
if (action === "check") await details.check(id, active);
else if (action === "finish") {
const fresh = await details.load(id, active);
- if (
- soloLabels(fresh.labels) ||
- fresh.name !== exact.draft.name ||
- fresh.visibility !== exact.draft.visibility ||
- fresh.ttlSeconds !== exact.draft.ttlSeconds
- )
+ if (!matchesConversion(fresh, exact)) {
+ setBase(fresh);
+ if (!details.snapshot(id))
+ updateChatConversion(session, id, undefined);
throw new Error(
"Channel settings changed. Reload details before continuing.",
);
+ }
} else if (base)
await applySharedChannelDetails(
session,
@@ -228,7 +269,9 @@ export function ConvertToChannel({
updateChatConversion(
session,
id,
- exact.converted || details.snapshot(id) ? exact : undefined,
+ exact.converted || details.snapshot(id) || action === "finish"
+ ? exact
+ : undefined,
);
}
if (!controller.signal.aborted) {
@@ -246,7 +289,17 @@ export function ConvertToChannel({
if (completed.current && !signal?.aborted) onConverted?.();
}}
title="Convert to channel"
- description="Move this conversation from Solo to Team. History, Canvas, members and lifetime stay the same."
+ size="compact"
+ headerGap="compact"
+ footerGap="compact"
+ description={
+ base?.visibility === "private" && selectedAccess !== "private"
+ ? SOLO_ACCESS_DISCLOSURE
+ : (base &&
+ selectedAccess === "private" &&
+ soloRetainedAccessWarning(base)) ||
+ "Move this conversation from Solo to Team. History, Canvas, members and lifetime stay the same."
+ }
onOpenChange={(open) => {
if (!open) setOpen(false);
}}
@@ -290,34 +343,26 @@ export function ConvertToChannel({
}
>
-
- {
- if (value === "private" || value === "public") setVisibility(value);
- }}
- >
-
-
+ {
+ const option = Object.values(generalAccessOptions).find(
+ (option) => option.value === value,
+ );
+ if (option) setAccess(option.value);
+ }}
+ />
{converted && (
Channel converted. Finish removing it from its Solo workspace.
diff --git a/src/features/solo/labels.ts b/src/features/solo/labels.ts
index 6512a0d3ea..5b8923f284 100644
--- a/src/features/solo/labels.ts
+++ b/src/features/solo/labels.ts
@@ -2,12 +2,28 @@ import type { ChannelSummary } from "../relay/contracts.ts";
/** Presentation provenance in the relay's existing NIP-CL labels, never access. */
export const SOLO_NAMED_LABEL = "buzz.session.named";
-/** NIP-CL label marking a Solo chat: a private channel whose owner talks with
+/** NIP-CL label marking a Solo chat: a channel whose owner talks with
* their agents at top level. Every member and agent reads it from channel
- * metadata. Presentation and composition only; membership stays the access
- * authority. Conversion to a channel clears it. */
+ * metadata. Presentation and composition only; ordinary channel permissions
+ * remain the access authority. Conversion to a channel clears it. */
export const SOLO_LABEL = "buzz.solo";
+export const SOLO_ACCESS_DISCLOSURE =
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.";
+
+/** Switching an open Solo chat to Private never removes its members. */
+export function soloRetainedAccessWarning(
+ base: Pick,
+ mayHaveGuestMembers = true,
+): string {
+ if (base.visibility !== "public") return "";
+ if (base.joinRole !== "guest")
+ return "People who already joined remain members and keep their access until you remove them in People.";
+ return mayHaveGuestMembers
+ ? "People who joined while it was View only are members and keep reading until you remove them in People."
+ : "";
+}
+
export function soloLabels(labels: readonly string[] | undefined): boolean {
return !!labels?.includes(SOLO_LABEL);
}
diff --git a/src/features/solo/share.test.ts b/src/features/solo/share.test.ts
index 188c63e21e..6f0557f1af 100644
--- a/src/features/solo/share.test.ts
+++ b/src/features/solo/share.test.ts
@@ -190,7 +190,7 @@ it("grants exact Solo chat membership to a person without touching the channel",
expect(t.published.map((event) => event.kind)).toEqual([9000]);
expect(t.published[0]?.tags).toContainEqual(["h", chatId]);
expect(t.published[0]?.tags).toContainEqual(["p", t.human.pubkey]);
- expect(t.published[0]?.tags.some(([name]) => name === "role")).toBe(false);
+ expect(t.published[0]?.tags).toContainEqual(["role", "member"]);
});
it("Everyone snapshots the destination's signed roster including agents, freezes it for retry, and only grants access", async () => {
@@ -229,14 +229,10 @@ it("Everyone snapshots the destination's signed roster including agents, freezes
)?.tags,
).toContainEqual(["role", "bot"]);
expect(
- t.published
- .find((event) =>
- event.tags.some(
- ([name, key]) => name === "p" && key === t.human.pubkey,
- ),
- )
- ?.tags.some(([name]) => name === "role"),
- ).toBe(false);
+ t.published.find((event) =>
+ event.tags.some(([name, key]) => name === "p" && key === t.human.pubkey),
+ )?.tags,
+ ).toContainEqual(["role", "member"]);
expect(
t.published.every((event) =>
event.tags.some(([name, id]) => name === "h" && id === chatId),
diff --git a/src/features/solo/share.ts b/src/features/solo/share.ts
index 3caba57bb7..61834fcdfb 100644
--- a/src/features/solo/share.ts
+++ b/src/features/solo/share.ts
@@ -226,6 +226,7 @@ export async function applySharedChannelDetails(
value.name === draft.name &&
value.description === draft.description &&
value.visibility === draft.visibility &&
+ (draft.joinRole === undefined || value.joinRole === draft.joinRole) &&
value.ttlSeconds === draft.ttlSeconds &&
(draft.labels === undefined ||
sameLabels(value.labels ?? [], draft.labels));
@@ -245,6 +246,7 @@ export async function applySharedChannelDetails(
base.name !== expected.name ||
base.description !== expected.description ||
base.visibility !== expected.visibility ||
+ base.joinRole !== expected.joinRole ||
base.ttlSeconds !== expected.ttlSeconds ||
(draft.labels !== undefined &&
!sameLabels(base.labels ?? [], expected.labels ?? []))
diff --git a/tests/browser/channel-members-focus.spec.mjs b/tests/browser/channel-members-focus.spec.mjs
index 8de5215a6f..febfe76f3a 100644
--- a/tests/browser/channel-members-focus.spec.mjs
+++ b/tests/browser/channel-members-focus.spec.mjs
@@ -1315,9 +1315,7 @@ test("Solo adds an agent with pointer or Enter and retains the search focus", as
name: "Search people, agents and channels",
});
await expect(search).toBeFocused();
- await expect(search).toHaveAccessibleDescription(
- /can read the full history/,
- );
+ await expect(search).toHaveAccessibleDescription("");
const add = dialog.getByRole("button", { name: /Add Morgan/ });
await expect(add).toHaveCount(0);
await expect(dialog).toHaveAccessibleDescription("");
diff --git a/tests/browser/fixture.mjs b/tests/browser/fixture.mjs
index 9f4e5afc16..cc62e948c6 100644
--- a/tests/browser/fixture.mjs
+++ b/tests/browser/fixture.mjs
@@ -1033,6 +1033,35 @@ export const test = base.extend({
return [39000, 39002].flatMap((kind) =>
answer(community, { ...filter, kinds: [kind] }),
);
+ const previewId = filter["#d"]?.length === 1 && filter["#d"][0];
+ const preview =
+ previewId &&
+ !rosterIds.includes(previewId) &&
+ soloDetails.get(`${community}/${previewId}`);
+ const rosterKind = filter.kinds?.find(
+ (kind) => kind === 39001 || kind === 39002,
+ );
+ if (preview && rosterKind) {
+ const owner = preview.tags.find(([key]) => key === "P")?.[1];
+ return [
+ sign(
+ rosterKind,
+ [
+ ["d", previewId],
+ ...(owner
+ ? [
+ rosterKind === 39002
+ ? ["p", owner, "", "owner"]
+ : ["p", owner, "owner"],
+ ]
+ : []),
+ ],
+ "",
+ relayKey,
+ lifecycleTime,
+ ),
+ ];
+ }
if (filter.kinds?.includes(13535)) {
expect(filter).toEqual({
kinds: [13535],
@@ -1138,7 +1167,8 @@ export const test = base.extend({
"p",
viewer,
"",
- lifecycleRows.some((row) => row.id === id)
+ lifecycleRows.some((row) => row.id === id) ||
+ ownSoloChannels.includes(id)
? lifecycleRole === "nonmember"
? "member"
: lifecycleRole
@@ -2430,6 +2460,20 @@ export const test = base.extend({
await use({
sign: (template) => finalizeEvent(template, userKey),
channelMetadata: (id, tags) => sign(39000, [["d", id], ...tags]),
+ // Model an owner changing visibility; production discovery consumes the
+ // signed metadata through normal reads/live traffic.
+ setChannelMetadata(id, tags) {
+ const event = sign(
+ 39000,
+ [["d", id], ...tags],
+ "",
+ relayKey,
+ ++lifecycleTime,
+ );
+ soloDetails.set(`primary/${id}`, event);
+ relay.publish("primary", event, { requireSubscriber: false });
+ return event;
+ },
signRelay: (template) => finalizeEvent(template, relayKey),
membershipSnapshot(role) {
expect(["owner", "admin", "member"]).toContain(role);
diff --git a/tests/browser/solo-chats.spec.mjs b/tests/browser/solo-chats.spec.mjs
index 76333389ac..da97dcb701 100644
--- a/tests/browser/solo-chats.spec.mjs
+++ b/tests/browser/solo-chats.spec.mjs
@@ -582,7 +582,7 @@ test("Share grants access and posts a link without promoting or moving the Solo
test("explicit conversion moves the same conversation from Solo to Messages and keeps history", async ({
page,
app,
-}) => {
+}, testInfo) => {
await page.goto(app.origin);
await newChat(page);
const sidebar = page.getByRole("navigation", {
@@ -602,15 +602,15 @@ test("explicit conversion moves the same conversation from Solo to Messages and
name: "Convert to channel",
exact: true,
});
- await expect(
- dialog.getByRole("radio", { name: "Private", exact: true }),
- ).toBeChecked();
- const publicChoice = dialog.getByRole("radio", {
+ const access = dialog.getByRole("combobox", { name: "General access" });
+ await expect(access).toHaveText("Private");
+ await access.click();
+ const publicChoice = page.getByRole("option", {
name: "Public",
exact: true,
});
await expect(publicChoice).toHaveAccessibleDescription(
- "Everyone in this community will be able to view this channel’s full history.",
+ "Anyone in the community can participate.",
);
const convert = dialog.getByRole("button", {
name: "Convert to channel",
@@ -618,7 +618,92 @@ test("explicit conversion moves the same conversation from Solo to Messages and
});
await expect(convert).toBeEnabled();
await publicChoice.click();
- await expect(publicChoice).toBeChecked();
+ await expect(access).toHaveText("Public");
+ const disclosure =
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.";
+ await expect(dialog).toHaveAccessibleDescription(disclosure);
+ await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
+ await expect(row).toBeFocused();
+ for (const { mode, width, scale } of [
+ { mode: "dark", width: 1440, scale: 1 },
+ { mode: "light", width: 1440, scale: 1 },
+ { mode: "dark", width: 390, scale: 1.5 },
+ { mode: "light", width: 390, scale: 1.5 },
+ ]) {
+ await page.setViewportSize({ width, height: width === 390 ? 720 : 950 });
+ await page.evaluate(
+ ({ mode, scale }) => {
+ localStorage.setItem("buzz-appearance.v1", mode);
+ localStorage.setItem("buzz-font-scale.v1", String(scale));
+ localStorage.setItem("buzz-accent.v1", "cobalt");
+ },
+ { mode, scale },
+ );
+ await page.reload();
+ await expect(page.locator("html")).toHaveAttribute("data-color-mode", mode);
+ await expect(page.locator("html")).toHaveCSS(
+ "--buzz-text-scale",
+ String(scale),
+ );
+ await page
+ .getByRole("button", { name: "Chat actions", exact: true })
+ .click();
+ await page
+ .getByRole("menuitem", { name: "Convert to channel", exact: true })
+ .click();
+ await expect(access).toBeEnabled();
+ await expect(access).toHaveText("Private");
+ await access.click();
+ await page.getByRole("option", { name: "View only", exact: true }).click();
+ await expect(dialog).toHaveAccessibleDescription(disclosure);
+ await access.scrollIntoViewIfNeeded();
+ await expect(access).toBeInViewport({ ratio: 1 });
+ await access.click({ trial: true });
+ await expect
+ .poll(() =>
+ dialog.evaluate((surface) => {
+ const header = surface
+ .querySelector(".buzz-dialog-header")
+ .getBoundingClientRect();
+ const control = surface
+ .querySelector('[role="combobox"]')
+ .getBoundingClientRect();
+ const footer = surface
+ .querySelector(".buzz-dialog-actions")
+ .getBoundingClientRect();
+ return header.bottom <= control.top && control.bottom <= footer.top;
+ }),
+ )
+ .toBe(true);
+ await dialog
+ .getByText(disclosure, { exact: true })
+ .scrollIntoViewIfNeeded();
+ await expect(dialog.getByText(disclosure, { exact: true })).toBeInViewport({
+ ratio: 1,
+ });
+ await expect(convert).toBeInViewport({ ratio: 1 });
+ if (testInfo.project.name === "chromium")
+ await dialog.screenshot({
+ path: testInfo.outputPath(
+ `SOLO_CONVERSION_DISCLOSURE_${mode}_${width}.png`,
+ ),
+ });
+ await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
+ await expect(
+ page.getByRole("button", { name: "Chat actions", exact: true }),
+ ).toBeFocused();
+ }
+ await page.setViewportSize({ width: 1440, height: 950 });
+ await page.evaluate(() => localStorage.setItem("buzz-font-scale.v1", "1"));
+ await page.reload();
+ await page.getByRole("button", { name: "Chat actions", exact: true }).click();
+ await page
+ .getByRole("menuitem", { name: "Convert to channel", exact: true })
+ .click();
+ await expect(access).toBeEnabled();
+ await access.click();
+ await publicChoice.click();
+ await expect(dialog).toHaveAccessibleDescription(disclosure);
expect(app.report.detailsPublications ?? []).toHaveLength(0);
await convert.click();
await expect(dialog).not.toBeVisible();
@@ -676,10 +761,18 @@ test("explicit conversion moves the same conversation from Solo to Messages and
// Browser-only: native modal focus handoff to a replacement Messages header.
// The held metadata/completion ordering matrix lives in the mounted page test.
-test("Messages conversion restores focus after its chat header is replaced", async ({
+test("View-only Solo conversion preserves access and restores focus after its chat header is replaced", async ({
page,
app,
-}) => {
+}, testInfo) => {
+ app.setChannelMetadata(id, [
+ ["name", "Alpha"],
+ ["t", "stream"],
+ ["t", "buzz.solo"],
+ ["P", app.viewer],
+ ["public"],
+ ["join_role", "guest"],
+ ]);
await page.goto(app.origin);
await expect
.poll(() =>
@@ -700,19 +793,129 @@ test("Messages conversion restores focus after its chat header is replaced", asy
exact: true,
});
const convert = page.getByRole("menuitem", { name: "Convert to channel" });
- await trigger.click();
- await convert.click();
const dialog = page.getByRole("dialog", { name: "Convert to channel" });
- await expect(
- dialog.getByRole("button", { name: "Convert to channel" }),
- ).toBeEnabled();
- await dialog.getByRole("button", { name: "Cancel" }).click();
- expect(app.report.detailsPublications ?? []).toHaveLength(0);
- await expect(trigger).toBeFocused();
+ for (const { mode, width, scale } of [
+ { mode: "dark", width: 1440, scale: 1 },
+ { mode: "light", width: 1440, scale: 1 },
+ { mode: "dark", width: 390, scale: 1.5 },
+ { mode: "light", width: 390, scale: 1.5 },
+ ]) {
+ await page.setViewportSize({ width, height: width === 390 ? 720 : 950 });
+ await page.evaluate(
+ ({ mode, scale }) => {
+ localStorage.setItem("buzz-appearance.v1", mode);
+ localStorage.setItem("buzz-font-scale.v1", String(scale));
+ },
+ { mode, scale },
+ );
+ await page.reload();
+ await expect(page.locator("html")).toHaveAttribute("data-color-mode", mode);
+ await expect(page.locator("html")).toHaveCSS(
+ "--buzz-text-scale",
+ String(scale),
+ );
+ await trigger.click();
+ await convert.click();
+ await expect(
+ dialog.getByRole("button", { name: "Convert to channel" }),
+ ).toBeEnabled();
+ const access = dialog.getByRole("combobox", { name: "General access" });
+ await expect(access).toHaveText("View only");
+ await access.click();
+ await page.getByRole("option", { name: "Private", exact: true }).click();
+ const retainedWarning =
+ "People who joined while it was View only are members and keep reading until you remove them in People.";
+ await expect(dialog).toHaveAccessibleDescription(retainedWarning);
+ await access.scrollIntoViewIfNeeded();
+ await access.click({ trial: true });
+ await expect(
+ dialog.getByText(retainedWarning, { exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ await expect(
+ dialog.getByRole("button", { name: "Convert to channel", exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ if (testInfo.project.name === "chromium")
+ await dialog.screenshot({
+ path: testInfo.outputPath(
+ `SOLO_CONVERSION_PRIVATE_WARNING_${mode}_${width}.png`,
+ ),
+ });
+ await access.click();
+ await page.getByRole("option", { name: "View only", exact: true }).click();
+ await expect(dialog).not.toHaveAccessibleDescription(retainedWarning);
+ const viewOnly = page.getByRole("option", {
+ name: "View only",
+ exact: true,
+ });
+ if (mode === "dark" && width === 1440) {
+ await access.click();
+ await page.getByRole("option", { name: "Public", exact: true }).click();
+ await access.click();
+ const privateOption = page.getByRole("option", {
+ name: "Private",
+ exact: true,
+ });
+ await privateOption.click();
+ await expect(page.getByRole("listbox")).not.toBeVisible();
+ await expect(access).toBeFocused();
+ await access.press("Enter");
+ // Popup focus settles asynchronously, particularly when reopened in WebKit.
+ await expect(privateOption).toBeFocused();
+ await page.keyboard.press("Home");
+ await expect(privateOption).toBeFocused();
+ await page.keyboard.press("ArrowDown");
+ await expect(viewOnly).toBeFocused();
+ await page.keyboard.press("Enter");
+ await expect(access).toHaveText("View only");
+ }
+ await access.click();
+ await expect(page.getByRole("option")).toHaveCount(3);
+ for (const name of ["Private", "View only", "Public"]) {
+ const option = page.getByRole("option", { name, exact: true });
+ await option.scrollIntoViewIfNeeded();
+ await option.click({ trial: true });
+ await expect(option).toBeInViewport();
+ }
+ await viewOnly.scrollIntoViewIfNeeded();
+ const popup = page.locator(".buzz-select-popup");
+ await expect(popup).toHaveCSS("filter", "blur(0px)");
+ await expect(popup).toHaveCSS("opacity", "1");
+ if (testInfo.project.name === "chromium") {
+ const boxes = await Promise.all([
+ dialog.boundingBox(),
+ popup.boundingBox(),
+ ]);
+ expect(boxes.every(Boolean)).toBe(true);
+ const left = Math.min(...boxes.map((box) => box.x));
+ const top = Math.min(...boxes.map((box) => box.y));
+ await page.screenshot({
+ clip: {
+ x: left,
+ y: top,
+ width: Math.max(...boxes.map((box) => box.x + box.width)) - left,
+ height: Math.max(...boxes.map((box) => box.y + box.height)) - top,
+ },
+ path: testInfo.outputPath(
+ `SOLO_CONVERSION_ACCESS_${mode}_${width}.png`,
+ ),
+ });
+ }
+ await page.keyboard.press("Escape");
+ await expect(access).toBeFocused();
+ await dialog.getByRole("button", { name: "Cancel" }).click();
+ expect(app.report.detailsPublications ?? []).toHaveLength(0);
+ await expect(trigger).toBeFocused();
+ }
+ await page.setViewportSize({ width: 1440, height: 950 });
+ await page.evaluate(() => localStorage.setItem("buzz-font-scale.v1", "1"));
+ await page.reload();
await trigger.press("Enter");
await convert.click();
const confirm = dialog.getByRole("button", { name: "Convert to channel" });
await expect(confirm).toBeEnabled();
+ await expect(
+ dialog.getByRole("combobox", { name: "General access" }),
+ ).toHaveText("View only");
await confirm.focus();
await confirm.press("Enter");
await expect(dialog).not.toBeVisible();
diff --git a/tests/browser/solo-legacy-invitation.spec.mjs b/tests/browser/solo-legacy-invitation.spec.mjs
new file mode 100644
index 0000000000..e7d4eccbe7
--- /dev/null
+++ b/tests/browser/solo-legacy-invitation.spec.mjs
@@ -0,0 +1,137 @@
+import { test, expect } from "./fixture.mjs";
+import { generateSecretKey } from "nostr-tools";
+import { openPage } from "./navigation.mjs";
+import { openChannelDetails } from "./channel-details.mjs";
+
+const chat = "33333333-3333-4333-8333-333333333333";
+const channel = "11111111-1111-4111-8111-111111111111";
+test.use({
+ productionBroker: true,
+ channelLifecycle: true,
+ channelIds: [channel, chat],
+ channelNames: { [channel]: "Project updates", [chat]: "Release planning" },
+ soloChannels: [chat],
+ ownSoloChannels: [chat],
+ historyCounts: { [channel]: 2, [chat]: 2 },
+});
+
+// Browser boundary: restored IndexedDB intent, the real Outbox Retry routing,
+// broker reads and signed roster readback must agree across a page reload.
+// Expiry/role/concurrency matrices stay in the colocated unit tests.
+test("Outbox Retry replaces an expired unapplied Solo invitation without replaying it", async ({
+ page,
+ app,
+}, info) => {
+ const now = Date.now();
+ await page.clock.setFixedTime(new Date(now));
+ const person = app.serveProfile(generateSecretKey(), { name: "Aria" });
+ const original = app.sign({
+ kind: 9000,
+ created_at: Math.floor(now / 1000) - 899,
+ content: "",
+ tags: [
+ ["h", chat],
+ ["p", person.pubkey],
+ ],
+ });
+ await page.addInitScript(
+ ({ scope, original }) => {
+ localStorage.setItem(
+ `buzz-outbox-v1:${scope}`,
+ JSON.stringify([
+ { event: original, signed: original, delivery: "unknown" },
+ ]),
+ );
+ },
+ { scope: `https://primary.example:${app.viewer}`, original },
+ );
+ const publications = [];
+ let joined = false;
+ await page.route("**/api/relay/**/publish", async (route) => {
+ const event = route.request().postDataJSON();
+ if (event.kind !== 9000) return route.continue();
+ expect(event.id).not.toBe(original.id);
+ expect(event.tags).toContainEqual(["role", "member"]);
+ publications.push(event);
+ joined = true;
+ await route.fulfill({
+ json: { accepted: true, event_id: event.id, message: "" },
+ });
+ });
+ await page.route("**/api/relay/**/query", async (route) => {
+ const filters = route.request().postDataJSON();
+ if (!joined || !filters.some((filter) => filter.kinds?.includes(39002)))
+ return route.continue();
+ const response = await route.fetch();
+ const events = await response.json();
+ await route.fulfill({
+ json: events.map((event) =>
+ event.kind === 39002 &&
+ event.tags.some(([key, value]) => key === "d" && value === chat)
+ ? app.signRelay({
+ ...event,
+ created_at: event.created_at + 1,
+ tags: [...event.tags, ["p", person.pubkey, "", "member"]],
+ })
+ : event,
+ ),
+ });
+ });
+ const panel = page.getByRole("complementary", {
+ name: "Channel settings",
+ exact: true,
+ });
+ const summary = panel.locator("summary").filter({ hasText: /^Outbox ·/ });
+ const outbox = summary.locator("..");
+ for (const mode of ["dark", "light"]) {
+ await page.goto(app.origin);
+ await page.evaluate(
+ (mode) => localStorage.setItem("buzz-appearance.v1", mode),
+ mode,
+ );
+ await page.reload();
+ await expect(page.locator("html")).toHaveAttribute("data-color-mode", mode);
+ await openPage(page, "Messages");
+ await page
+ .getByRole("button", { name: "Project updates", exact: true })
+ .click();
+ await expect(
+ page.getByRole("textbox", {
+ name: "Message #Project updates",
+ exact: true,
+ }),
+ ).toBeVisible();
+ await openChannelDetails(page);
+ await panel.getByText("Diagnostics", { exact: true }).click();
+ await summary.click();
+ await expect(summary).toHaveText("Outbox · 1 items");
+ await outbox.getByRole("button", { name: "Retry", exact: true }).click();
+ await expect(outbox.getByRole("alert")).toContainText(
+ "15-minute delivery window",
+ );
+ expect(publications).toHaveLength(0);
+ if (info.project.name === "chromium")
+ await outbox.screenshot({
+ path: info.outputPath(`SOLO_LEGACY_WAIT_${mode}.png`),
+ });
+ }
+ await page.clock.setFixedTime(new Date(now + 2000));
+ await outbox.getByRole("button", { name: "Retry", exact: true }).click();
+ await expect(summary).toHaveText("Outbox · 0 items");
+ await expect(outbox.getByRole("alert")).toHaveCount(0);
+ expect(publications).toHaveLength(1);
+ await page.reload();
+ await openPage(page, "Messages");
+ await page
+ .getByRole("button", { name: "Project updates", exact: true })
+ .click();
+ await expect(
+ page.getByRole("textbox", {
+ name: "Message #Project updates",
+ exact: true,
+ }),
+ ).toBeVisible();
+ await openChannelDetails(page);
+ await expect(summary).toHaveText("Outbox · 0 items");
+ expect(publications).toHaveLength(1);
+});
diff --git a/tests/browser/solo-public-access.spec.mjs b/tests/browser/solo-public-access.spec.mjs
new file mode 100644
index 0000000000..1e84278c98
--- /dev/null
+++ b/tests/browser/solo-public-access.spec.mjs
@@ -0,0 +1,439 @@
+import { test, expect } from "./fixture.mjs";
+import { generateSecretKey } from "nostr-tools";
+import {
+ expectMessageActionsHidden,
+ hoverMessage,
+} from "./message-actions.mjs";
+
+const own = "33333333-3333-4333-8333-333333333333";
+const shared = "11111111-1111-4111-8111-111111111111";
+const presentations = [
+ { mode: "dark", width: 1440, scale: 1 },
+ { mode: "light", width: 1440, scale: 1 },
+ { mode: "dark", width: 390, scale: 1.5 },
+ { mode: "light", width: 390, scale: 1.5 },
+];
+
+test.use({ productionBroker: true, channelLifecycle: true });
+
+async function openChat(page, app, channelId) {
+ await page.goto(
+ `${app.origin}/#buzz=${encodeURIComponent(
+ JSON.stringify({
+ version: 1,
+ kind: "conversation",
+ channelId,
+ scope: {
+ viewer: app.viewer,
+ communityOrigin: "https://primary.example",
+ },
+ }),
+ )}`,
+ );
+ await expect(
+ page.getByRole("article", { name: "Conversation", exact: true }),
+ ).toBeVisible();
+}
+
+async function present(page, { mode, width, scale }) {
+ await page.setViewportSize({ width, height: width === 390 ? 720 : 950 });
+ await page.evaluate(
+ ({ mode, scale }) => {
+ localStorage.setItem("buzz-appearance.v1", mode);
+ localStorage.setItem("buzz-font-scale.v1", String(scale));
+ localStorage.setItem("buzz-accent.v1", "cobalt");
+ },
+ { mode, scale },
+ );
+ await page.reload();
+ await expect(page.locator("html")).toHaveAttribute("data-color-mode", mode);
+ await expect(page.locator("html")).toHaveCSS(
+ "--buzz-text-scale",
+ String(scale),
+ );
+}
+
+async function capture(surface, info, name) {
+ if (info.project.name === "chromium")
+ await surface.screenshot({ path: info.outputPath(`${name}.png`) });
+}
+
+// These preserve the two browser journeys: actual routing, signed discovery,
+// broker save/readback, focus and responsive overlays. Role matrices stay in Vitest.
+test.describe("owner", () => {
+ test.use({
+ channelIds: [own],
+ channelNames: { [own]: "Release planning" },
+ soloChannels: [own],
+ ownSoloChannels: [own],
+ historyCounts: { [own]: 2 },
+ });
+ test("omits Public, retains View only after reload, and restores privacy", async ({
+ page,
+ app,
+ }, info) => {
+ await openChat(page, app, own);
+ const row = page.locator(`[data-solo-channel-id="${own}"]`);
+ const access = page
+ .getByRole("button", { name: "Share access", exact: true })
+ .last();
+ const dialog = page.getByRole("dialog", {
+ name: "Share access",
+ exact: true,
+ });
+ const audience = dialog.getByRole("combobox", { name: "General access" });
+ const confirm = page.getByRole("alertdialog", {
+ name: "Change general access?",
+ });
+ let saves = 0;
+ for (const presentation of presentations) {
+ const suffix = `${presentation.mode}_${presentation.width}`;
+ await present(page, presentation);
+ if (presentation.width === 1440) await expect(row).toBeVisible();
+ await access.click();
+ await expect(audience).toBeEnabled();
+ await expect(audience).toHaveText("Private");
+ await expect(dialog.getByRole("alert")).toHaveCount(0);
+ // General access now scrolls with the member list, including at enlarged text.
+ await audience.scrollIntoViewIfNeeded();
+ await expect(audience).toBeInViewport({ ratio: 1 });
+ await capture(dialog, info, `SOLO_DROPDOWN_PRIVATE_${suffix}`);
+ await audience.focus();
+ await audience.press("Enter");
+ await expect(page.getByRole("option")).toHaveCount(2);
+ await expect(
+ page.getByRole("option", { name: "Public", exact: true }),
+ ).toHaveCount(0);
+ await expect(
+ page.getByRole("option", { name: "Private", exact: true }),
+ ).toBeVisible();
+ await expect(
+ page.getByRole("option", { name: "View only", exact: true }),
+ ).toBeVisible();
+ // The popup owns the transition; the nested list has no animations.
+ await expect(page.locator(".buzz-select-popup")).toHaveCSS(
+ "filter",
+ "blur(0px)",
+ );
+ await expect(page.locator(".buzz-select-popup")).toHaveCSS(
+ "opacity",
+ "1",
+ );
+ // At 150% text the shared popup scrolls to the selected Private item.
+ // Verify View only is reachable before capturing it.
+ const viewOnlyOption = page.getByRole("option", {
+ name: "View only",
+ exact: true,
+ });
+ await viewOnlyOption.scrollIntoViewIfNeeded();
+ await expect(viewOnlyOption).toBeInViewport({ ratio: 1 });
+ await capture(page, info, `SOLO_DROPDOWN_OPTIONS_${suffix}`);
+ await page.keyboard.press("Home");
+ await expect(viewOnlyOption).toBeFocused();
+ await expect(confirm).toHaveCount(0);
+ expect(app.report.detailsPublications?.length ?? 0).toBe(saves);
+ await page.keyboard.press("Enter");
+ await expect(confirm).toHaveAccessibleDescription(
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions.",
+ );
+ await expect(
+ confirm.getByRole("button", { name: "Cancel", exact: true }),
+ ).toBeFocused();
+ await capture(confirm, info, `SOLO_VIEW_ONLY_CONFIRMATION_${suffix}`);
+ await page.keyboard.press("Escape");
+ await expect(audience).toBeFocused();
+ expect(app.report.detailsPublications?.length ?? 0).toBe(saves);
+ await audience.click();
+ await page
+ .getByRole("option", { name: "View only", exact: true })
+ .click();
+ await expect(
+ confirm.getByRole("button", { name: "Change access", exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ await confirm
+ .getByRole("button", { name: "Change access", exact: true })
+ .click();
+ await expect(audience).toBeEnabled();
+ await expect(audience).toHaveText("View only");
+ expect(app.report.detailsPublications).toHaveLength(++saves);
+ const opened = app.report.detailsPublications.at(-1);
+ expect(opened.tags).toContainEqual(["visibility", "open"]);
+ if (saves === 1)
+ expect(opened.tags).toContainEqual(["join_role", "guest"]);
+ await expect(dialog.getByRole("combobox")).toHaveCount(1);
+ await expect(dialog.getByRole("alert")).toHaveCount(0);
+ await capture(dialog, info, `SOLO_DROPDOWN_VIEW_ONLY_${suffix}`);
+ await page.keyboard.press("Escape");
+ await page.reload();
+ await access.click();
+ await expect(audience).toHaveText("View only");
+ await expect(audience).toBeEnabled();
+ await audience.click();
+ await expect(
+ page.getByRole("option", { name: "Public", exact: true }),
+ ).toHaveCount(0);
+ await page.getByRole("option", { name: "Private", exact: true }).click();
+ await expect(confirm).toContainText(
+ "Only chat members will have access.",
+ );
+ await confirm
+ .getByRole("button", { name: "Change access", exact: true })
+ .click();
+ await expect(audience).toHaveText("Private");
+ await expect(audience).toBeEnabled();
+ expect(app.report.detailsPublications).toHaveLength(++saves);
+ expect(app.report.detailsPublications.at(-1).tags).toContainEqual([
+ "visibility",
+ "private",
+ ]);
+ await expect(
+ dialog.getByRole("button", { name: "Done", exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ await page.keyboard.press("Escape");
+ }
+ // The longer conditional descriptions need real modal geometry and focus
+ // coverage. Guest/status matrices remain in the component/session tests.
+ const guest = app.serveProfile(generateSecretKey(), {
+ name: "Aria viewer",
+ });
+ await page.route("**/api/relay/**/query", async (route) => {
+ const filters = route.request().postDataJSON();
+ if (!filters.some((filter) => filter.kinds?.includes(39002)))
+ return route.continue();
+ const response = await route.fetch();
+ const events = await response.json();
+ await route.fulfill({
+ json: events.map((event) =>
+ event.kind === 39002 &&
+ event.tags.some(([key, value]) => key === "d" && value === own)
+ ? app.signRelay({
+ ...event,
+ // A changed signed roster must supersede the startup version.
+ created_at: event.created_at + 1,
+ tags: [...event.tags, ["p", guest.pubkey, "", "guest"]],
+ })
+ : event,
+ ),
+ });
+ });
+ for (const presentation of presentations) {
+ const suffix = `${presentation.mode}_${presentation.width}`;
+ app.setChannelMetadata(own, [
+ ["t", "stream"],
+ ["t", "buzz.solo"],
+ ["P", app.viewer],
+ ["name", "Release planning"],
+ ["public"],
+ ["join_role", "guest"],
+ ]);
+ await present(page, presentation);
+ await access.click();
+ await expect(audience).toBeEnabled();
+ await expect(audience).toHaveText("View only");
+ await expect(
+ dialog.getByText("Viewing only", { exact: true }),
+ ).toBeVisible();
+ await audience.click();
+ await page.getByRole("option", { name: "Private", exact: true }).click();
+ await expect(confirm).toHaveAccessibleDescription(
+ "Only chat members will have access. People who joined while it was View only are members and keep reading until you remove them in People.",
+ );
+ await expect(
+ confirm.getByRole("button", { name: "Cancel", exact: true }),
+ ).toBeFocused();
+ await expect(
+ confirm.getByRole("button", { name: "Change access", exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ await capture(confirm, info, `SOLO_PRIVATE_GUEST_CONFIRMATION_${suffix}`);
+ await page.keyboard.press("Escape");
+ await expect(audience).toBeFocused();
+ await page.keyboard.press("Escape");
+ app.setChannelMetadata(own, [
+ ["t", "stream"],
+ ["t", "buzz.solo"],
+ ["P", app.viewer],
+ ["name", "Release planning"],
+ ["public"],
+ ["join_role", "member"],
+ ]);
+ await page.reload();
+ await access.click();
+ await expect(audience).toBeEnabled();
+ await expect(audience).toHaveText("Public (existing)");
+ await audience.click();
+ await page
+ .getByRole("option", { name: "View only", exact: true })
+ .click();
+ await expect(confirm).toHaveAccessibleDescription(
+ "Everyone in this community will be able to read this chat’s full history and Canvas, including its workspace folders and agent instructions. People already in the chat keep their access.",
+ );
+ await expect(
+ confirm.getByRole("button", { name: "Change access", exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ await capture(
+ confirm,
+ info,
+ `SOLO_EXISTING_PUBLIC_CONFIRMATION_${suffix}`,
+ );
+ await page.keyboard.press("Escape");
+ await expect(audience).toBeFocused();
+ await audience.click();
+ await page.getByRole("option", { name: "Private", exact: true }).click();
+ await expect(confirm).toHaveAccessibleDescription(
+ "Only chat members will have access. People who already joined remain members and keep their access until you remove them in People.",
+ );
+ await expect(
+ confirm.getByRole("button", { name: "Change access", exact: true }),
+ ).toBeInViewport({ ratio: 1 });
+ await capture(
+ confirm,
+ info,
+ `SOLO_PUBLIC_PRIVATE_CONFIRMATION_${suffix}`,
+ );
+ await page.keyboard.press("Escape");
+ await expect(audience).toBeFocused();
+ await page.keyboard.press("Escape");
+ }
+ expect(app.report.detailsPublications.map(({ kind }) => kind)).toEqual(
+ Array(8).fill(9002),
+ );
+ expect(app.report.lifecyclePublications ?? []).toEqual([]);
+ expect(app.report.publications).toEqual([]);
+ });
+});
+
+test.describe("visitor", () => {
+ test.use({
+ guestPermalinks: true,
+ lifecycleRole: "nonmember",
+ historyCounts: { [shared]: 2 },
+ });
+ test("reads View only without joining and loses access when the chat becomes Private", async ({
+ page,
+ app,
+ }, info) => {
+ const tags = [
+ ["name", "Release planning"],
+ ["t", "stream"],
+ ["t", "buzz.solo"],
+ ["P", "a".repeat(64)],
+ ["join_role", "guest"],
+ ];
+ app.setChannelMetadata(shared, [...tags, ["public"]]);
+ await page.goto(app.origin);
+ await page
+ .getByRole("button", { name: "Search Buzz", exact: true })
+ .click();
+ await page
+ .getByRole("combobox", { name: "Search Buzz" })
+ .fill("Release planning");
+ const result = page
+ .locator("[data-search-result]")
+ .filter({ hasText: "View-only chat" });
+ await expect(result).toContainText("Release planning");
+ await result.click();
+ const article = page.getByRole("article", {
+ name: "Conversation",
+ exact: true,
+ });
+ for (const presentation of presentations) {
+ const suffix = `${presentation.mode}_${presentation.width}`;
+ await present(page, presentation);
+ const message = article.locator("[data-message-id]").last();
+ await expect(message).toBeVisible();
+ await expect(
+ page.getByText("This chat is read-only", { exact: true }),
+ ).toBeVisible();
+ await expect(page.locator('[contenteditable="true"]')).toHaveCount(0);
+ await expect(
+ page.getByRole("button", { name: "Join", exact: true }),
+ ).toHaveCount(0);
+ await expect(
+ page.locator(`[data-solo-channel-id="${shared}"]`),
+ ).toHaveCount(0);
+ await hoverMessage(message);
+ await message
+ .getByRole("button", { name: "More message actions", exact: true })
+ .click();
+ await expect(page.getByRole("menu")).toBeVisible();
+ await expect(
+ page.getByRole("menuitem", { name: "React", exact: true }),
+ ).toHaveCount(0);
+ await page.keyboard.press("Escape");
+ await expect(page.getByRole("menu")).toHaveCount(0);
+ const searchButton = page.getByRole("button", {
+ name: "Search Buzz",
+ exact: true,
+ });
+ await searchButton.focus();
+ await expect(searchButton).toBeFocused();
+ await searchButton.evaluate((button) => button.blur());
+ await page.mouse.move(0, 0);
+ await expect(page.getByRole("tooltip")).toHaveCount(0);
+ await expectMessageActionsHidden(
+ message.getByRole("group", {
+ name: "Message actions",
+ exact: true,
+ includeHidden: true,
+ }),
+ );
+ await capture(article, info, `SOLO_DROPDOWN_VISITOR_${suffix}`);
+ await page
+ .getByRole("button", { name: /^Share access/ })
+ .last()
+ .click();
+ const dialog = page.getByRole("dialog", {
+ name: "Chat access",
+ exact: true,
+ });
+ await expect(
+ dialog.getByText("Anyone in the community can read."),
+ ).toBeVisible();
+ await expect(
+ dialog.getByText("Viewing only. Ask an owner or admin to participate."),
+ ).toBeVisible();
+ await expect(dialog.getByRole("alert")).toHaveCount(0);
+ await expect(
+ dialog.getByRole("combobox", { name: "General access" }),
+ ).toHaveCount(0);
+ await capture(dialog, info, `SOLO_DROPDOWN_VISITOR_ACCESS_${suffix}`);
+ await page.keyboard.press("Escape");
+ }
+ app.setChannelMetadata(shared, [...tags, ["private"]]);
+ await page.reload();
+ await expect(article.locator("[data-message-id]")).toHaveCount(0);
+ app.setChannelMetadata(shared, [
+ ...tags.filter(([name]) => name !== "join_role"),
+ ["join_role", "member"],
+ ["public"],
+ ]);
+ await page.reload();
+ await expect(article.locator("[data-message-id]").last()).toBeVisible();
+ await page
+ .getByRole("button", { name: /^Share access/ })
+ .last()
+ .click();
+ const existingAccess = page.getByRole("dialog", {
+ name: "Share access",
+ exact: true,
+ });
+ await expect(
+ existingAccess.getByRole("region", { name: "Member list" }),
+ ).toHaveAttribute("data-refreshing", "false");
+ await expect(existingAccess.getByRole("alert")).toHaveCount(0);
+ await expect(
+ existingAccess.getByRole("region", { name: "People", exact: true }),
+ ).toBeVisible();
+ await expect(
+ existingAccess.getByRole("region", { name: "General access" }),
+ ).toContainText("New people can participate.");
+ await capture(
+ existingAccess,
+ info,
+ "SOLO_PUBLIC_EXISTING_VISITOR_light_390",
+ );
+ expect(app.report.detailsPublications ?? []).toEqual([]);
+ expect(app.report.lifecyclePublications ?? []).toEqual([]);
+ expect(app.report.publications).toEqual([]);
+ });
+});