@agent-native/core 0.152.0 → 0.153.0

package/dist/client/org/TeamPage.js

@@ -2,15 +2,21 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { Skeleton } from "@agent-native/toolkit/design-system";
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger, } from "@agent-native/toolkit/ui/alert-dialog";
 import { Button as ToolkitButton } from "@agent-native/toolkit/ui/button";
+import { Checkbox } from "@agent-native/toolkit/ui/checkbox";
+import { Input } from "@agent-native/toolkit/ui/input";
 import { Pagination, PaginationContent, PaginationItem, PaginationNext, PaginationPrevious, } from "@agent-native/toolkit/ui/pagination";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, } from "@agent-native/toolkit/ui/select";
 import { Switch } from "@agent-native/toolkit/ui/switch";
-import { IconUserPlus, IconTrash, IconCrown, IconShieldCheck, IconLoader2, IconCheck, IconPencil, IconAt, IconX, IconKey, IconCopy, IconRefresh, IconEye, IconEyeOff, IconCloudUpload, IconFileImport, IconPlus, IconAlertTriangle, IconUsersGroup, IconHelpCircle, IconExternalLink, } from "@tabler/icons-react";
+import { IconUserPlus, IconTrash, IconCrown, IconShieldCheck, IconLoader2, IconCheck, IconPencil, IconAt, IconX, IconKey, IconCopy, IconRefresh, IconEye, IconEyeOff, IconCloudUpload, IconFileImport, IconPlus, IconAlertTriangle, IconUsersGroup, IconHelpCircle, IconExternalLink, IconSearch, } from "@tabler/icons-react";
 import { forwardRef, useEffect, useMemo, useRef, useState, } from "react";
+import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, } from "../components/ui/dialog.js";
+import { Popover, PopoverContent, PopoverTrigger, } from "../components/ui/popover.js";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, } from "../components/ui/tooltip.js";
 import { useT } from "../i18n.js";
 import { SettingsGroup, SettingsRow } from "../settings/SettingsRow.js";
 import { SettingsSkeleton } from "../settings/SettingsSkeleton.js";
+import { useShareOrgMemberSearch } from "../sharing/share-controller-helpers.js";
+import { useActionMutation, useActionQuery } from "../use-action.js";
 import { cn } from "../utils.js";
 import { useOrg, useOrgMembers, useOrgInvitations, useCreateOrg, useUpdateOrg, useBulkInviteMembers, useChangeMemberRole, useAcceptInvitation, useRemoveMember, useDeleteOrg, useSwitchOrg, useSetOrgDomain, useSetOrgWorkspaceUrl, useSetOrgAuthProvider, useRevealA2ASecret, useSetA2ASecret, useSyncA2ASecret, useJoinByDomain, useAppRoles, useSetAppMemberRole, ORG_MEMBER_PAGE_SIZE, } from "./hooks.js";
 const Button = forwardRef(({ className, ...props }, ref) => (_jsx(ToolkitButton, { ref: ref, variant: "ghost", className: cn("h-auto p-0 hover:bg-transparent hover:text-inherit active:scale-100 [&_svg]:!size-auto", className), ...props })));
@@ -96,6 +102,87 @@ function OrgNameDisplay({ name, canEdit }) {
                         setEditing(false);
                 }, onBlur: save, className: "rounded border border-border bg-background px-1.5 py-0.5 text-sm font-medium focus:outline-none focus:ring-1 focus:ring-foreground", autoFocus: true }), _jsx(ErrorText, { error: updateOrg.error })] }));
 }
+function WorkspaceGroupEditor({ open, group, onClose, }) {
+    const t = useT();
+    const [name, setName] = useState("");
+    const [members, setMembers] = useState([]);
+    const [search, setSearch] = useState("");
+    const memberSearch = useShareOrgMemberSearch(search, open, { limit: 100 });
+    const saveGroup = useActionMutation("upsert-workspace-user-group");
+    const selected = useMemo(() => new Set(members.map((email) => email.toLowerCase())), [members]);
+    useEffect(() => {
+        if (!open)
+            return;
+        setName(group?.name ?? "");
+        setMembers(group?.memberEmails ?? []);
+        setSearch("");
+    }, [group, open]);
+    const searchMembers = memberSearch.members.map((member) => ({
+        email: member.email.toLowerCase(),
+        name: member.name,
+    }));
+    const selectedMembersNotInSearch = members
+        .map((email) => email.toLowerCase())
+        .filter((email) => !searchMembers.some((member) => member.email === email))
+        .map((email) => ({ email, name: undefined }));
+    const visibleMembers = [...selectedMembersNotInSearch, ...searchMembers];
+    function toggleMember(email, checked) {
+        const normalized = email.trim().toLowerCase();
+        setMembers((current) => checked
+            ? Array.from(new Set([...current, normalized]))
+            : current.filter((value) => value !== normalized));
+    }
+    function save() {
+        const trimmedName = name.trim();
+        if (!trimmedName || saveGroup.isPending)
+            return;
+        saveGroup.mutate({
+            ...(group?.id ? { id: group.id } : {}),
+            name: trimmedName,
+            memberEmails: members,
+        }, { onSuccess: onClose });
+    }
+    return (_jsx(Dialog, { open: open, onOpenChange: (next) => {
+            if (!next && !saveGroup.isPending)
+                onClose();
+        }, children: _jsxs(DialogContent, { className: "max-w-lg", children: [_jsx(DialogHeader, { children: _jsx(DialogTitle, { children: group
+                            ? t("org.editGroup", { defaultValue: "Edit group" })
+                            : t("org.createGroup", { defaultValue: "Create group" }) }) }), _jsxs("div", { className: "grid gap-4", children: [_jsxs("div", { className: "grid gap-1.5", children: [_jsx("label", { htmlFor: "workspace-group-name", className: "text-xs font-medium", children: t("org.groupName", { defaultValue: "Group name" }) }), _jsx(Input, { id: "workspace-group-name", value: name, onChange: (event) => setName(event.target.value), placeholder: "Rev Ops", autoFocus: true })] }), _jsxs("div", { className: "grid gap-2", children: [_jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsx("span", { className: "text-xs font-medium", children: t("org.groupMembers", { defaultValue: "People" }) }), _jsx("span", { className: "text-xs text-muted-foreground", children: members.length })] }), _jsxs("div", { className: "relative", children: [_jsx(IconSearch, { className: "pointer-events-none absolute start-3 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" }), _jsx(Input, { value: search, onChange: (event) => setSearch(event.target.value), placeholder: t("org.searchPeople", {
+                                                defaultValue: "Search people",
+                                            }), "aria-label": t("org.searchPeople", {
+                                                defaultValue: "Search people",
+                                            }), className: "ps-9" })] }), _jsx("div", { className: "max-h-64 overflow-y-auto rounded-md bg-muted/30 p-1", children: memberSearch.isLoading ? (_jsx("div", { className: "px-3 py-6 text-center text-xs text-muted-foreground", children: t("org.loadingPeople", { defaultValue: "Loading people…" }) })) : visibleMembers.length > 0 ? (visibleMembers.map((member) => (_jsxs("label", { htmlFor: `workspace-group-member-${member.email}`, className: "flex cursor-pointer items-center justify-between gap-3 rounded px-3 py-2 hover:bg-background", children: [_jsx("span", { className: "min-w-0 truncate text-sm", children: member.name || member.email }), _jsx(Checkbox, { id: `workspace-group-member-${member.email}`, checked: selected.has(member.email), onCheckedChange: (value) => toggleMember(member.email, value === true), "aria-label": member.email })] }, member.email)))) : (_jsx("div", { className: "px-3 py-6 text-center text-xs text-muted-foreground", children: t("org.noPeopleFound", { defaultValue: "No people found" }) })) }), memberSearch.hasMore ? (_jsx(Button, { type: "button", onClick: memberSearch.loadMore, disabled: memberSearch.isLoadingMore, className: "w-fit text-xs text-muted-foreground", children: t("org.loadMorePeople", { defaultValue: "Load more" }) })) : null] }), _jsx(ErrorText, { error: memberSearch.error ? new Error("Could not load people.") : null }), _jsx(ErrorText, { error: saveGroup.error })] }), _jsxs(DialogFooter, { children: [_jsx(Button, { type: "button", onClick: onClose, className: "text-muted-foreground", children: t("org.cancel") }), _jsx(Button, { type: "button", intent: "primary", emphasis: "solid", disabled: !name.trim() || saveGroup.isPending, onClick: save, className: "rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90 disabled:opacity-50", children: saveGroup.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : (t("org.saveGroup", { defaultValue: "Save group" })) })] })] }) }));
+}
+function WorkspaceGroupsCard({ groups }) {
+    const t = useT();
+    const [editorOpen, setEditorOpen] = useState(false);
+    const [editingGroup, setEditingGroup] = useState(null);
+    const [deleteError, setDeleteError] = useState(null);
+    const deleteGroup = useActionMutation("delete-workspace-user-group");
+    function openEditor(group) {
+        setEditingGroup(group);
+        setEditorOpen(true);
+    }
+    return (_jsxs("section", { className: "overflow-hidden rounded-xl bg-card text-card-foreground", children: [_jsxs("div", { className: "flex items-center justify-between gap-3 px-5 py-4", children: [_jsx("h3", { className: "text-sm font-medium", children: t("org.groups", { defaultValue: "Groups" }) }), _jsxs(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: () => openEditor(null), className: "inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90", children: [_jsx(IconPlus, { size: 14 }), t("org.newGroup", { defaultValue: "New group" })] })] }), _jsxs("div", { className: "grid gap-1 px-3 pb-3", children: [groups.length > 0 ? (groups.map((group) => (_jsxs("div", { className: "flex items-center gap-3 rounded-lg bg-muted/35 px-3 py-2.5", children: [_jsx(IconUsersGroup, { className: "size-4 shrink-0 text-muted-foreground" }), _jsx("span", { className: "min-w-0 flex-1 truncate text-sm font-medium", children: group.name }), _jsx("span", { className: "text-xs text-muted-foreground", children: group.memberEmails.length }), _jsx(Button, { type: "button", onClick: () => openEditor(group), "aria-label": t("org.editGroupAria", {
+                                    defaultValue: "Edit group {{name}}",
+                                    name: group.name,
+                                }), className: "rounded p-1 text-muted-foreground hover:bg-background hover:text-foreground", children: _jsx(IconPencil, { size: 14 }) }), _jsxs(AlertDialog, { children: [_jsx(AlertDialogTrigger, { asChild: true, children: _jsx(Button, { type: "button", intent: "danger", emphasis: "ghost", "aria-label": t("org.deleteGroupAria", {
+                                                defaultValue: "Delete group {{name}}",
+                                                name: group.name,
+                                            }), className: "rounded p-1 text-muted-foreground hover:bg-background hover:text-destructive", children: _jsx(IconTrash, { size: 14 }) }) }), _jsxs(AlertDialogContent, { children: [_jsxs(AlertDialogHeader, { children: [_jsx(AlertDialogTitle, { children: t("org.deleteGroup", { defaultValue: "Delete group?" }) }), _jsx(AlertDialogDescription, { children: t("org.deleteGroupConfirm", {
+                                                            defaultValue: "People will keep their workspace access, but this group can no longer be used for connection access.",
+                                                        }) })] }), _jsx(ErrorText, { error: deleteError }), _jsxs(AlertDialogFooter, { children: [_jsx(AlertDialogCancel, { children: t("org.cancel") }), _jsx(AlertDialogAction, { disabled: deleteGroup.isPending, onClick: () => {
+                                                            setDeleteError(null);
+                                                            deleteGroup.mutate({ id: group.id }, {
+                                                                onError: setDeleteError,
+                                                            });
+                                                        }, children: deleteGroup.isPending
+                                                            ? t("org.deleting", { defaultValue: "Deleting…" })
+                                                            : t("org.delete", { defaultValue: "Delete" }) })] })] })] })] }, group.id)))) : (_jsx("p", { className: "px-2 py-3 text-sm text-muted-foreground", children: t("org.noGroups", { defaultValue: "No groups yet" }) })), _jsx(ErrorText, { error: deleteError })] }), _jsx(WorkspaceGroupEditor, { open: editorOpen, group: editingGroup, onClose: () => {
+                    setEditorOpen(false);
+                    setEditingGroup(null);
+                } })] }));
+}
 function MembersCard({ appRoles }) {
     const t = useT();
     const { data: org } = useOrg();
@@ -103,6 +190,8 @@ function MembersCard({ appRoles }) {
     const { data: membersData, isLoading: isLoadingMembers, isFetching: isFetchingMembers, isPlaceholderData: isPlaceholderMembers, } = useOrgMembers(memberOffset);
     const { data: invitationsData } = useOrgInvitations();
     const switchOrg = useSwitchOrg();
+    const isOwnerOrAdmin = org?.role === "owner" || org?.role === "admin";
+    const groupsQuery = useActionQuery("list-workspace-user-groups", {}, { enabled: isOwnerOrAdmin });
     useEffect(() => {
         setMemberOffset(0);
     }, [org?.orgId]);
@@ -125,23 +214,81 @@ function MembersCard({ appRoles }) {
     if (!org?.orgId)
         return null;
     const isOwner = org.role === "owner";
-    const isOwnerOrAdmin = isOwner || org.role === "admin";
     const members = membersData?.members ?? [];
     const totalMembers = membersData?.totalCount ?? 0;
     const pendingInvites = invitationsData?.invitations ?? [];
     const hasMultipleOrgs = (org.orgs?.length ?? 0) > 1;
-    return (_jsxs("div", { className: "space-y-6", children: [_jsxs(SettingsGroup, { title: "Organization", children: [_jsx(SettingsRow, { id: "organization", label: _jsxs("span", { className: "flex items-center gap-2", children: [_jsx(IconUsersGroup, { className: "size-4 text-muted-foreground" }), _jsx(OrgNameDisplay, { name: org.orgName ?? "", canEdit: isOwnerOrAdmin })] }), description: `${t("org.memberCount", { count: totalMembers })} · ${t("org.youAreRole", { role: org.role })}`, control: hasMultipleOrgs ? (_jsxs(Select, { value: org.orgId ?? "", onValueChange: (value) => switchOrg.mutate(value || null), disabled: switchOrg.isPending, children: [_jsx(SelectTrigger, { className: "h-auto w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-xs sm:w-auto", children: _jsx(SelectValue, {}) }), _jsx(SelectContent, { children: org.orgs.map((o) => (_jsx(SelectItem, { value: o.orgId, children: o.orgName }, o.orgId))) })] })) : undefined }), isOwnerOrAdmin && (_jsxs(_Fragment, { children: [_jsx(DomainSettingsSection, { domain: org.allowedDomain, ownerEmail: org.email }), _jsx(WorkspaceUrlSettingsSection, { workspaceUrl: org.workspaceUrl }), _jsx(AuthProviderSettingsSection, { requiredAuthProvider: org.requiredAuthProvider }), isOwner && _jsx(A2ASecretSection, { isSet: Boolean(org.a2aSecretSet) })] })), switchOrg.error && (_jsx("div", { className: "px-5 pb-4", children: _jsx(ErrorText, { error: switchOrg.error }) }))] }), _jsx(MembersTableCard, { members: members, totalMembers: totalMembers, pendingInvites: pendingInvites, isLoadingMembers: isLoadingMembers, isFetchingMembers: isFetchingMembers, currentUserEmail: org.email, currentUserRole: org.role ?? null, appRoles: appRoles, memberOffset: memberOffset, hasNextPage: membersData?.hasMore === true, nextMemberOffset: membersData?.nextOffset ?? null, onMemberPageChange: setMemberOffset }), isOwner && _jsx(DangerZoneCard, { orgName: org.orgName ?? "" })] }));
+    return (_jsxs("div", { className: "space-y-6", children: [_jsxs(SettingsGroup, { title: "Organization", children: [_jsx(SettingsRow, { id: "organization", label: _jsxs("span", { className: "flex items-center gap-2", children: [_jsx(IconUsersGroup, { className: "size-4 text-muted-foreground" }), _jsx(OrgNameDisplay, { name: org.orgName ?? "", canEdit: isOwnerOrAdmin })] }), description: `${t("org.memberCount", { count: totalMembers })} · ${t("org.youAreRole", { role: org.role })}`, control: hasMultipleOrgs ? (_jsxs(Select, { value: org.orgId ?? "", onValueChange: (value) => switchOrg.mutate(value || null), disabled: switchOrg.isPending, children: [_jsx(SelectTrigger, { className: "h-auto w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-xs sm:w-auto", children: _jsx(SelectValue, {}) }), _jsx(SelectContent, { children: org.orgs.map((o) => (_jsx(SelectItem, { value: o.orgId, children: o.orgName }, o.orgId))) })] })) : undefined }), isOwnerOrAdmin && (_jsxs(_Fragment, { children: [_jsx(DomainSettingsSection, { domain: org.allowedDomain, ownerEmail: org.email }), _jsx(WorkspaceUrlSettingsSection, { workspaceUrl: org.workspaceUrl }), _jsx(AuthProviderSettingsSection, { requiredAuthProvider: org.requiredAuthProvider }), isOwner && _jsx(A2ASecretSection, { isSet: Boolean(org.a2aSecretSet) })] })), switchOrg.error && (_jsx("div", { className: "px-5 pb-4", children: _jsx(ErrorText, { error: switchOrg.error }) }))] }), _jsx(MembersTableCard, { members: members, totalMembers: totalMembers, pendingInvites: pendingInvites, isLoadingMembers: isLoadingMembers, isFetchingMembers: isFetchingMembers, currentUserEmail: org.email, currentUserRole: org.role ?? null, appRoles: appRoles, groups: groupsQuery.data ?? [], canManageGroups: isOwnerOrAdmin, memberOffset: memberOffset, hasNextPage: membersData?.hasMore === true, nextMemberOffset: membersData?.nextOffset ?? null, onMemberPageChange: setMemberOffset }), isOwnerOrAdmin && (_jsx(WorkspaceGroupsCard, { groups: groupsQuery.data ?? [] })), isOwner && _jsx(DangerZoneCard, { orgName: org.orgName ?? "" })] }));
 }
-function MembersTableCard({ members, totalMembers, pendingInvites, isLoadingMembers, isFetchingMembers, currentUserEmail, currentUserRole, appRoles, memberOffset, hasNextPage, nextMemberOffset, onMemberPageChange, }) {
+function MembersTableCard({ members, totalMembers, pendingInvites, isLoadingMembers, isFetchingMembers, currentUserEmail, currentUserRole, appRoles, groups, canManageGroups, memberOffset, hasNextPage, nextMemberOffset, onMemberPageChange, }) {
     const t = useT();
     const [showInviteForm, setShowInviteForm] = useState(false);
+    const [selectedEmails, setSelectedEmails] = useState(() => new Set());
+    const [bulkActionKey, setBulkActionKey] = useState(0);
     const canInvite = currentUserRole === "owner" || currentUserRole === "admin";
+    const updateGroupMembers = useActionMutation("bulk-update-workspace-user-groups");
     const { data: appRoleData } = useAppRoles(appRoles?.appId);
     const appRoleByEmail = new Map((appRoleData?.assignments ?? []).map((a) => [
         a.email.toLowerCase(),
         a.role,
     ]));
-    return (_jsxs("section", { className: "overflow-hidden rounded-xl border border-border/70 bg-card text-card-foreground", children: [_jsxs("div", { className: "flex flex-col gap-3 px-5 py-4 sm:flex-row sm:items-center sm:justify-between", children: [_jsxs("div", { children: [_jsx("h3", { className: "text-sm font-medium", children: t("org.members") }), _jsx("p", { className: "text-xs text-muted-foreground", children: t("org.memberCount", { count: totalMembers }) })] }), canInvite && !showInviteForm && (_jsxs(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: () => setShowInviteForm(true), className: "inline-flex items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90", children: [_jsx(IconUserPlus, { size: 14 }), t("org.inviteMembers")] }))] }), canInvite && showInviteForm && (_jsx("div", { className: "border-b border-border p-4", children: _jsx(BulkInviteForm, { currentUserRole: currentUserRole, onClose: () => setShowInviteForm(false) }) })), _jsx("div", { className: "divide-y divide-border/60 border-t border-border/60", children: isLoadingMembers && members.length === 0 ? (_jsx("div", { role: "status", "aria-busy": "true", "aria-label": "Loading members", children: ["w-44", "w-56", "w-64"].map((nameWidth) => (_jsxs("div", { className: "flex items-center gap-3 px-5 py-4", children: [_jsx(Skeleton, { className: "size-8 rounded-full bg-muted" }), _jsxs("div", { className: "space-y-2", children: [_jsx(Skeleton, { className: cn("h-3.5 bg-muted", nameWidth) }), _jsx(Skeleton, { className: "h-3 w-20 bg-muted" })] })] }, nameWidth))) })) : members.length === 0 && pendingInvites.length === 0 ? (_jsx("div", { className: "px-5 py-10 text-center text-sm text-muted-foreground", children: t("org.noMembers") })) : (_jsxs(_Fragment, { children: [members.map((m) => (_jsx(MemberRow, { email: m.email, role: m.role, isCurrentUser: m.email === currentUserEmail, currentUserRole: currentUserRole, appRoles: appRoles, appRole: appRoleByEmail.get(m.email.toLowerCase()) ?? null, canManageAppRoles: Boolean(appRoleData?.canManage) }, m.email))), pendingInvites.map((inv) => (_jsx(PendingInviteRow, { invite: inv }, inv.id)))] })) }), (memberOffset > 0 || hasNextPage) && (_jsx(MemberPagination, { memberOffset: memberOffset, totalMembers: totalMembers, hasNextPage: hasNextPage, nextMemberOffset: nextMemberOffset, isFetchingMembers: isFetchingMembers, onMemberPageChange: onMemberPageChange }))] }));
+    const selectedCount = selectedEmails.size;
+    const allMembersSelected = members.length > 0 &&
+        members.every((member) => selectedEmails.has(member.email));
+    useEffect(() => {
+        setSelectedEmails(new Set());
+    }, [memberOffset, members]);
+    function toggleSelected(email, checked) {
+        setSelectedEmails((current) => {
+            const next = new Set(current);
+            if (checked)
+                next.add(email);
+            else
+                next.delete(email);
+            return next;
+        });
+    }
+    function applyBulkAction(value) {
+        const [operation, groupId] = value.split(":");
+        if ((operation !== "add" && operation !== "remove") ||
+            !groupId ||
+            selectedEmails.size === 0) {
+            return;
+        }
+        updateGroupMembers.mutate({
+            groupId,
+            memberEmails: Array.from(selectedEmails),
+            operation,
+        }, {
+            onSuccess: () => {
+                setSelectedEmails(new Set());
+                setBulkActionKey((key) => key + 1);
+            },
+        });
+    }
+    return (_jsxs("section", { className: "overflow-hidden rounded-xl bg-muted/20 p-1 text-card-foreground", children: [_jsxs("div", { className: "flex flex-col gap-3 rounded-lg bg-card px-5 py-4 sm:flex-row sm:items-center sm:justify-between", children: [_jsxs("div", { children: [_jsx("h3", { className: "text-sm font-medium", children: t("org.members") }), _jsxs("p", { className: "text-xs text-muted-foreground", children: [t("org.memberCount", { count: totalMembers }), appRoles
+                                        ? ` · ${appRoles.label ?? appRoles.appId} can be assigned here`
+                                        : ""] })] }), canInvite && !showInviteForm && (_jsxs(Button, { type: "button", intent: "primary", emphasis: "solid", onClick: () => setShowInviteForm(true), className: "inline-flex items-center justify-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90", children: [_jsx(IconUserPlus, { size: 14 }), t("org.inviteMembers")] }))] }), canInvite && showInviteForm && (_jsx("div", { className: "rounded-lg bg-card p-4", children: _jsx(BulkInviteForm, { currentUserRole: currentUserRole, onClose: () => setShowInviteForm(false) }) })), canManageGroups && members.length > 0 ? (_jsxs("div", { className: "flex flex-col gap-3 rounded-lg bg-muted/40 px-5 py-3 sm:flex-row sm:items-center sm:justify-between", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Checkbox, { checked: allMembersSelected, onCheckedChange: (value) => {
+                                    if (value === true) {
+                                        setSelectedEmails(new Set(members.map((member) => member.email)));
+                                    }
+                                    else {
+                                        setSelectedEmails(new Set());
+                                    }
+                                }, "aria-label": t("org.selectPage", { defaultValue: "Select page" }) }), _jsx("span", { className: "text-xs text-muted-foreground", children: selectedCount > 0
+                                    ? t("org.selectedMembers", {
+                                        defaultValue: "{{count}} selected",
+                                        count: selectedCount,
+                                    })
+                                    : t("org.selectMembers", {
+                                        defaultValue: "Select people to edit groups",
+                                    }) })] }), selectedCount > 0 && groups.length > 0 ? (_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsxs(Select, { onValueChange: applyBulkAction, disabled: updateGroupMembers.isPending, children: [_jsx(SelectTrigger, { className: "h-8 w-auto min-w-36 border-0 bg-background text-xs", children: _jsx(SelectValue, { placeholder: t("org.addToGroup", {
+                                                defaultValue: "Add to group",
+                                            }) }) }), _jsx(SelectContent, { children: groups.map((group) => (_jsx(SelectItem, { value: `add:${group.id}`, children: group.name }, group.id))) })] }, `add-${bulkActionKey}`), _jsxs(Select, { onValueChange: applyBulkAction, disabled: updateGroupMembers.isPending, children: [_jsx(SelectTrigger, { className: "h-8 w-auto min-w-36 border-0 bg-background text-xs", children: _jsx(SelectValue, { placeholder: t("org.removeFromGroup", {
+                                                defaultValue: "Remove from group",
+                                            }) }) }), _jsx(SelectContent, { children: groups.map((group) => (_jsx(SelectItem, { value: `remove:${group.id}`, children: group.name }, group.id))) })] }, `remove-${bulkActionKey}`), _jsx(Button, { type: "button", onClick: () => setSelectedEmails(new Set()), className: "text-xs text-muted-foreground", children: t("org.clearSelection", { defaultValue: "Clear" }) })] })) : null, selectedCount > 0 && groups.length === 0 ? (_jsx("span", { className: "text-xs text-muted-foreground", children: t("org.createGroupForBulk", {
+                            defaultValue: "Create a group below first",
+                        }) })) : null, _jsx(ErrorText, { error: updateGroupMembers.error })] })) : null, _jsx("div", { className: "space-y-1 pt-1", children: isLoadingMembers && members.length === 0 ? (_jsx("div", { role: "status", "aria-busy": "true", "aria-label": "Loading members", children: ["w-44", "w-56", "w-64"].map((nameWidth) => (_jsxs("div", { className: "flex items-center gap-3 px-5 py-4", children: [_jsx(Skeleton, { className: "size-8 rounded-full bg-muted" }), _jsxs("div", { className: "space-y-2", children: [_jsx(Skeleton, { className: cn("h-3.5 bg-muted", nameWidth) }), _jsx(Skeleton, { className: "h-3 w-20 bg-muted" })] })] }, nameWidth))) })) : members.length === 0 && pendingInvites.length === 0 ? (_jsx("div", { className: "px-5 py-10 text-center text-sm text-muted-foreground", children: t("org.noMembers") })) : (_jsxs(_Fragment, { children: [members.map((m) => (_jsx(MemberRow, { email: m.email, role: m.role, isCurrentUser: m.email === currentUserEmail, currentUserRole: currentUserRole, appRoles: appRoles, appRole: appRoleByEmail.get(m.email.toLowerCase()) ?? null, canManageAppRoles: Boolean(appRoleData?.canManage), canSelect: canManageGroups, selected: selectedEmails.has(m.email), onSelect: (checked) => toggleSelected(m.email, checked) }, m.email))), pendingInvites.map((inv) => (_jsx(PendingInviteRow, { invite: inv }, inv.id)))] })) }), (memberOffset > 0 || hasNextPage) && (_jsx(MemberPagination, { memberOffset: memberOffset, totalMembers: totalMembers, hasNextPage: hasNextPage, nextMemberOffset: nextMemberOffset, isFetchingMembers: isFetchingMembers, onMemberPageChange: onMemberPageChange }))] }));
 }
 function MemberPagination({ memberOffset, totalMembers, hasNextPage, nextMemberOffset, isFetchingMembers, onMemberPageChange, }) {
     const t = useT();
@@ -149,7 +296,7 @@ function MemberPagination({ memberOffset, totalMembers, hasNextPage, nextMemberO
     const totalPages = Math.max(1, Math.ceil(totalMembers / ORG_MEMBER_PAGE_SIZE));
     const canGoPrevious = memberOffset > 0 && !isFetchingMembers;
     const canGoNext = hasNextPage && nextMemberOffset !== null && !isFetchingMembers;
-    return (_jsxs("div", { className: "flex flex-col gap-3 border-t border-border/60 px-5 py-3 sm:flex-row sm:items-center sm:justify-between", children: [_jsx("p", { className: "text-xs text-muted-foreground", "aria-live": "polite", children: t("org.memberPageStatus", {
+    return (_jsxs("div", { className: "mt-1 flex flex-col gap-3 rounded-lg bg-card px-5 py-3 sm:flex-row sm:items-center sm:justify-between", children: [_jsx("p", { className: "text-xs text-muted-foreground", "aria-live": "polite", children: t("org.memberPageStatus", {
                     page: currentPage,
                     totalPages,
                 }) }), _jsx(Pagination, { "aria-label": t("org.memberPagination"), className: "mx-0 w-auto justify-start sm:justify-end", children: _jsxs(PaginationContent, { children: [_jsx(PaginationItem, { children: _jsx(PaginationPrevious, { href: "#", "aria-label": t("org.previousMemberPage"), "aria-disabled": !canGoPrevious, tabIndex: canGoPrevious ? undefined : -1, className: cn("text-xs", !canGoPrevious && "pointer-events-none opacity-50"), onClick: (event) => {
@@ -224,14 +371,16 @@ function AppRoleControl({ email, appRoles, appRole, canManage, }) {
                     return;
                 }
                 setAppRole.mutate({ email, role: next }, { onSuccess: () => setEditing(false) });
-            }, disabled: setAppRole.isPending, children: [_jsx(SelectTrigger, { autoFocus: true, className: "h-auto w-auto rounded-md border border-border bg-background px-2 py-1 text-xs", children: _jsx(SelectValue, {}) }), _jsxs(SelectContent, { children: [_jsx(SelectItem, { value: UNASSIGNED, children: appRoles.defaultRole ? labelFor(appRoles.defaultRole) : "—" }), appRoles.roles.map((r) => (_jsx(SelectItem, { value: r, children: labelFor(r) }, r)))] })] }));
+            }, disabled: setAppRole.isPending, children: [_jsx(SelectTrigger, { autoFocus: true, className: "h-auto w-auto rounded-md border border-border bg-background px-2 py-1 text-xs", children: _jsx(SelectValue, {}) }), _jsxs(SelectContent, { children: [_jsx(SelectItem, { value: UNASSIGNED, children: appRoles.defaultRole
+                                ? labelFor(appRoles.defaultRole)
+                                : "Not assigned" }), appRoles.roles.map((r) => (_jsx(SelectItem, { value: r, children: labelFor(r) }, r)))] })] }));
     }
     // An unassigned member shows the app's default only as a hint. The default
     // never satisfies a server guard, so it must not read as a granted role.
-    const display = appRole ? (_jsx("span", { className: "inline-flex items-center rounded border border-border px-2 py-1 text-xs text-muted-foreground", children: labelFor(appRole) })) : (_jsx("span", { className: "text-xs text-muted-foreground/70", children: appRoles.defaultRole ? labelFor(appRoles.defaultRole) : "—" }));
+    const display = appRole ? (_jsx("span", { className: "inline-flex items-center rounded border border-border px-2 py-1 text-xs text-muted-foreground", children: labelFor(appRole) })) : (_jsx("span", { className: "text-xs text-muted-foreground/70", children: appRoles.defaultRole ? labelFor(appRoles.defaultRole) : "Not assigned" }));
     return canManage ? (_jsx(Button, { type: "button", onClick: () => setEditing(true), className: "cursor-pointer rounded hover:opacity-80", children: display })) : (display);
 }
-function MemberRow({ email, role, isCurrentUser, currentUserRole, appRoles, appRole, canManageAppRoles, }) {
+function MemberRow({ email, role, isCurrentUser, currentUserRole, appRoles, appRole, canManageAppRoles, canSelect = false, selected = false, onSelect, }) {
     const t = useT();
     const removeMember = useRemoveMember();
     const changeRole = useChangeMemberRole();
@@ -244,7 +393,7 @@ function MemberRow({ email, role, isCurrentUser, currentUserRole, appRoles, appR
         !isCurrentUser &&
         (currentUserRole === "owner" ||
             (currentUserRole === "admin" && role === "member"));
-    return (_jsxs("div", { className: "flex flex-col gap-3 px-5 py-3.5 sm:flex-row sm:items-center", children: [_jsxs("div", { className: "flex min-w-0 flex-1 items-center gap-3", children: [_jsx("div", { className: "flex size-8 shrink-0 items-center justify-center rounded-full border border-border bg-background text-xs font-medium text-muted-foreground", children: memberInitials(email) }), _jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "truncate text-sm", children: email }), isCurrentUser && (_jsx("div", { className: "mt-0.5 text-xs text-muted-foreground", children: t("org.you") }))] })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2 sm:justify-end", children: [_jsx(RoleBadge, { role: role }), appRoles && (_jsx(AppRoleControl, { email: email, appRoles: appRoles, appRole: appRole ?? null, canManage: Boolean(canManageAppRoles) })), canManage && (_jsxs("div", { className: "flex shrink-0 items-center gap-1", children: [editing ? (_jsxs(Select, { defaultOpen: true, value: role, onOpenChange: (open) => {
+    return (_jsxs("div", { className: "flex flex-col gap-3 rounded-lg bg-card px-5 py-3.5 sm:flex-row sm:items-center", children: [_jsxs("div", { className: "flex min-w-0 flex-1 items-center gap-3", children: [canSelect ? (_jsx(Checkbox, { checked: selected, onCheckedChange: (value) => onSelect?.(value === true), "aria-label": `Select ${email}` })) : null, _jsx("div", { className: "flex size-8 shrink-0 items-center justify-center rounded-full border border-border bg-background text-xs font-medium text-muted-foreground", children: memberInitials(email) }), _jsxs("div", { className: "min-w-0", children: [_jsx("div", { className: "truncate text-sm", children: email }), isCurrentUser && (_jsx("div", { className: "mt-0.5 text-xs text-muted-foreground", children: t("org.you") }))] })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2 sm:justify-end", children: [_jsx(RoleBadge, { role: role }), appRoles && (_jsx(AppRoleControl, { email: email, appRoles: appRoles, appRole: appRole ?? null, canManage: Boolean(canManageAppRoles) })), canManage && (_jsxs("div", { className: "flex shrink-0 items-center gap-1", children: [editing ? (_jsxs(Select, { defaultOpen: true, value: role, onOpenChange: (open) => {
                                     if (!open)
                                         setEditing(false);
                                 }, onValueChange: (value) => {
@@ -523,24 +672,21 @@ function A2ASecretSection({ isSet }) {
         });
     }
     const masked = isSet ? "••••••••••••" : "Not set";
-    return (_jsx(SettingsRow, { id: "cross-app-authentication", label: "Cross-app authentication", description: _jsx(OrganizationDescription, { help: "This secret authenticates cross-app delegation. Every app in the organization must share it.", children: "Share one secret across connected apps." }), control: _jsxs("div", { className: "flex flex-wrap items-center justify-end gap-2", children: [_jsxs("span", { className: "inline-flex items-center gap-1.5 rounded-md border border-border bg-background px-2.5 py-1.5 text-sm font-mono", children: [_jsx(IconKey, { className: "h-3.5 w-3.5 text-muted-foreground" }), secret ?? masked] }), isSet && (_jsxs(_Fragment, { children: [_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { type: "button", onClick: toggleReveal, disabled: revealA2ASecret.isPending, className: "text-muted-foreground hover:text-foreground", children: secret ? _jsx(IconEyeOff, { size: 14 }) : _jsx(IconEye, { size: 14 }) }) }), _jsx(TooltipContent, { children: secret ? "Hide secret" : "Reveal secret" })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { type: "button", onClick: copyToClipboard, disabled: revealA2ASecret.isPending, className: "text-muted-foreground hover:text-foreground", children: copied ? (_jsx(IconCheck, { size: 14, className: "text-primary" })) : (_jsx(IconCopy, { size: 14 })) }) }), _jsx(TooltipContent, { children: "Copy secret" })] })] })), _jsxs(Button, { type: "button", intent: "danger", emphasis: "outline", onClick: regenerate, disabled: setA2ASecret.isPending || syncA2ASecret.isPending, className: "inline-flex items-center gap-1 rounded-md border border-border px-2.5 py-1.5 text-xs font-medium hover:bg-accent/50 disabled:opacity-50", children: [setA2ASecret.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : (_jsx(IconRefresh, { size: 14 })), "Regenerate"] }), isSet && (_jsxs(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: () => syncToApps(), disabled: setA2ASecret.isPending || syncA2ASecret.isPending, className: "inline-flex items-center gap-1 rounded-md border border-border px-2.5 py-1.5 text-xs font-medium hover:bg-accent/50 disabled:opacity-50", children: [syncA2ASecret.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : (_jsx(IconCloudUpload, { size: 14 })), "Sync"] })), !pasteMode && (_jsxs(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: () => setPasteMode(true), className: "inline-flex items-center gap-1 rounded-md border border-border px-2.5 py-1.5 text-xs font-medium hover:bg-accent/50", children: [_jsx(IconKey, { size: 14 }), "Paste secret"] }))] }), children: (pasteMode ||
-            syncA2ASecret.isPending ||
-            syncResult ||
-            revealA2ASecret.error ||
-            setA2ASecret.error ||
-            syncA2ASecret.error) && (_jsxs("div", { className: "space-y-3", children: [syncA2ASecret.isPending && (_jsx("p", { className: "text-xs text-muted-foreground", children: "Syncing to connected apps\u2026" })), syncResult && !syncA2ASecret.isPending && (_jsxs("div", { className: "space-y-1", children: [_jsxs("p", { className: "text-xs text-muted-foreground", children: ["Synced to ", syncResult.succeeded, "/", syncResult.total, " app", syncResult.total === 1 ? "" : "s", syncResult.failed > 0 ? ` (${syncResult.failed} failed)` : "", "."] }), syncResult.failed > 0 && (_jsx("ul", { className: "list-disc space-y-0.5 ps-5 text-xs text-destructive", children: syncResult.results
-                                .filter((r) => !r.ok)
-                                .map((r) => (_jsxs("li", { children: [r.name, ": ", r.error || `HTTP ${r.status ?? "?"}`] }, r.id))) }))] })), pasteMode ? (_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("input", { type: "text", value: pasteValue, onChange: (e) => setPasteValue(e.target.value), onKeyDown: (e) => {
-                                if (e.key === "Enter")
-                                    saveSecret();
-                                if (e.key === "Escape") {
-                                    setPasteMode(false);
-                                    setPasteValue("");
-                                }
-                            }, placeholder: "Paste A2A secret", className: "min-w-0 flex-1 rounded-md border border-border bg-background px-2.5 py-1.5 text-sm font-mono focus:outline-none focus:ring-1 focus:ring-foreground", autoFocus: true }), _jsx(Button, { type: "button", intent: "primary", emphasis: "solid", disabled: !pasteValue.trim() || setA2ASecret.isPending, onClick: saveSecret, className: "rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:bg-primary/90 disabled:opacity-50", children: setA2ASecret.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : ("Save") }), _jsx(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: () => {
-                                setPasteMode(false);
-                                setPasteValue("");
-                            }, className: "rounded-md border border-border px-3 py-1.5 text-xs font-medium text-muted-foreground hover:text-foreground", children: "Cancel" })] })) : null, _jsx(ErrorText, { error: revealA2ASecret.error }), _jsx(ErrorText, { error: setA2ASecret.error }), _jsx(ErrorText, { error: syncA2ASecret.error })] })) }));
+    return (_jsx(SettingsRow, { id: "cross-app-authentication", label: "Cross-app authentication", description: _jsx(OrganizationDescription, { help: "This secret authenticates cross-app delegation. Every app in the organization must share it.", children: "Share one secret across connected apps." }), control: _jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx(ToolkitButton, { type: "button", variant: "ghost", intent: "neutral", emphasis: "outline", className: "inline-flex h-9 min-h-9 items-center justify-center rounded-md border border-border px-3 text-sm font-medium leading-none text-foreground hover:bg-accent/40 active:scale-100", children: "Manage" }) }), _jsxs(PopoverContent, { align: "end", sideOffset: 8, className: "w-[min(420px,calc(100vw-2rem))] space-y-4 p-4", children: [_jsxs("div", { className: "space-y-1", children: [_jsx("h3", { className: "text-sm font-semibold text-foreground", children: "Cross-app authentication" }), _jsx("p", { className: "text-xs leading-5 text-muted-foreground", children: "Use one shared secret across connected apps. Regenerating or replacing it automatically syncs the new value to those apps." })] }), _jsx("div", { className: "rounded-lg border border-border bg-background p-3", children: _jsxs("div", { className: "flex items-center justify-between gap-3", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("p", { className: "text-xs font-medium text-muted-foreground", children: "Shared secret" }), _jsx("p", { className: "mt-1 truncate font-mono text-sm text-foreground", children: secret ?? masked })] }), isSet && (_jsxs("div", { className: "flex shrink-0 items-center gap-1", children: [_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { type: "button", onClick: toggleReveal, disabled: revealA2ASecret.isPending, "aria-label": secret ? "Hide secret" : "Reveal secret", className: "rounded-md p-2 text-muted-foreground hover:bg-accent hover:text-foreground", children: secret ? (_jsx(IconEyeOff, { size: 14 })) : (_jsx(IconEye, { size: 14 })) }) }), _jsx(TooltipContent, { children: secret ? "Hide secret" : "Reveal secret" })] }), _jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { type: "button", onClick: copyToClipboard, disabled: revealA2ASecret.isPending, "aria-label": "Copy secret", className: "rounded-md p-2 text-muted-foreground hover:bg-accent hover:text-foreground", children: copied ? (_jsx(IconCheck, { size: 14, className: "text-primary" })) : (_jsx(IconCopy, { size: 14 })) }) }), _jsx(TooltipContent, { children: "Copy secret" })] })] }))] }) }), _jsxs("div", { className: "grid gap-2 sm:grid-cols-2", children: [_jsxs(Button, { type: "button", intent: "danger", emphasis: "outline", onClick: regenerate, disabled: setA2ASecret.isPending || syncA2ASecret.isPending, className: "inline-flex h-9 items-center justify-center gap-1 rounded-md border border-border px-2.5 text-xs font-medium hover:bg-accent/50 disabled:opacity-50", children: [setA2ASecret.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : (_jsx(IconRefresh, { size: 14 })), "Regenerate"] }), isSet ? (_jsxs(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: () => syncToApps(), disabled: setA2ASecret.isPending || syncA2ASecret.isPending, className: "inline-flex h-9 items-center justify-center gap-1 rounded-md border border-border px-2.5 text-xs font-medium hover:bg-accent/50 disabled:opacity-50", children: [syncA2ASecret.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : (_jsx(IconCloudUpload, { size: 14 })), "Sync to apps"] })) : null] }), !pasteMode ? (_jsxs(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: () => setPasteMode(true), className: "inline-flex h-9 w-full items-center justify-center gap-1 rounded-md border border-border px-2.5 text-xs font-medium hover:bg-accent/50", children: [_jsx(IconKey, { size: 14 }), "Paste secret"] })) : (_jsxs("div", { className: "space-y-2 rounded-lg border border-border bg-background p-3", children: [_jsx("label", { htmlFor: "cross-app-secret", className: "text-xs font-medium text-foreground", children: "Paste a shared secret" }), _jsx("input", { id: "cross-app-secret", type: "text", value: pasteValue, onChange: (e) => setPasteValue(e.target.value), onKeyDown: (e) => {
+                                        if (e.key === "Enter")
+                                            saveSecret();
+                                        if (e.key === "Escape") {
+                                            setPasteMode(false);
+                                            setPasteValue("");
+                                        }
+                                    }, placeholder: "Paste A2A secret", className: "min-w-0 w-full rounded-md border border-border bg-background px-2.5 py-1.5 text-sm font-mono focus:outline-none focus:ring-1 focus:ring-foreground", autoFocus: true }), _jsxs("div", { className: "flex justify-end gap-2", children: [_jsx(Button, { type: "button", intent: "neutral", emphasis: "outline", onClick: () => {
+                                                setPasteMode(false);
+                                                setPasteValue("");
+                                            }, className: "h-8 rounded-md border border-border px-3 text-xs font-medium text-muted-foreground hover:text-foreground", children: "Cancel" }), _jsxs(Button, { type: "button", intent: "primary", emphasis: "solid", disabled: !pasteValue.trim() || setA2ASecret.isPending, onClick: saveSecret, className: "h-8 rounded-md bg-primary px-3 text-xs font-medium text-primary-foreground hover:bg-primary/90 disabled:opacity-50", children: [setA2ASecret.isPending ? (_jsx(IconLoader2, { size: 14, className: "animate-spin" })) : null, "Save"] })] })] })), syncA2ASecret.isPending && (_jsx("p", { className: "text-xs text-muted-foreground", children: "Syncing to connected apps\u2026" })), syncResult && !syncA2ASecret.isPending && (_jsxs("div", { className: "space-y-1", children: [_jsxs("p", { className: "text-xs text-muted-foreground", children: ["Synced to ", syncResult.succeeded, "/", syncResult.total, " app", syncResult.total === 1 ? "" : "s", syncResult.failed > 0
+                                            ? ` (${syncResult.failed} failed)`
+                                            : "", "."] }), syncResult.failed > 0 && (_jsx("ul", { className: "list-disc space-y-0.5 ps-5 text-xs text-destructive", children: syncResult.results
+                                        .filter((r) => !r.ok)
+                                        .map((r) => (_jsxs("li", { children: [r.name, ": ", r.error || `HTTP ${r.status ?? "?"}`] }, r.id))) }))] })), _jsx(ErrorText, { error: revealA2ASecret.error }), _jsx(ErrorText, { error: setA2ASecret.error }), _jsx(ErrorText, { error: syncA2ASecret.error })] })] }) }));
 }
 /**
  * Default Team management page. Templates can route directly to this component

package/dist/client/resources/McpConnectionSuggestion.js

@@ -1,11 +1,10 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { IconArrowUpRight, IconLoader2, IconPlugConnected, IconX, } from "@tabler/icons-react";
+import { IconLoader2, IconPlugConnected, IconX } from "@tabler/icons-react";
 import { useEffect, useMemo, useState } from "react";
-import { agentNativePath } from "../api-path.js";
 import { openAgentSettings } from "../CommandMenu.js";
 import { useT } from "../i18n.js";
 import { clearMcpConnectionResume, notifyMcpConnectionComplete, saveMcpConnectionResume, } from "./mcp-connection-resume.js";
-import { buildMcpOAuthStartUrl, findMcpIntegrationForText, getMcpIntegrationApiFallback, getDefaultMcpIntegrations, isMcpConnectionFailureText, navigateToMcpOAuthStart, shouldOfferMcpIntegrationOrganizationScope, } from "./mcp-integration-catalog.js";
+import { findMcpIntegrationForText, getMcpIntegrationApiFallback, getDefaultMcpIntegrations, isMcpConnectionFailureText, isMcpConnectionSuggestionText, } from "./mcp-integration-catalog.js";
 import { McpIntegrationDialog } from "./McpIntegrationDialog.js";
 import { McpIntegrationLogo } from "./McpIntegrationLogo.js";
 import { useCreateMcpServer, useMcpServers, } from "./use-mcp-servers.js";
@@ -17,8 +16,19 @@ function visibleUserAuthoredText(text) {
         .trim();
 }
 export function findMcpConnectionSuggestionIntegration({ text, contextText = "", variant = "composer", integrations = getDefaultMcpIntegrations(), }) {
-    const sourceText = variant === "response" ? contextText : text;
-    return findMcpIntegrationForText(visibleUserAuthoredText(sourceText), integrations);
+    const responseText = visibleUserAuthoredText(text);
+    if (variant !== "response") {
+        return findMcpIntegrationForText(responseText, integrations);
+    }
+    // A completed response may itself be the agent's request for setup. Prefer
+    // that provider, then fall back to the user's preceding provider mention for
+    // responses such as "I can't access it yet - please connect it.".
+    if (isMcpConnectionSuggestionText(responseText) ||
+        isMcpConnectionFailureText(responseText)) {
+        return (findMcpIntegrationForText(responseText, integrations) ??
+            findMcpIntegrationForText(visibleUserAuthoredText(contextText), integrations));
+    }
+    return null;
 }
 export function shouldRenderMcpIntegrationFallback(logoUrl, logoLoadFailed) {
     return !logoUrl || logoLoadFailed;
@@ -38,17 +48,6 @@ function isConnected(integration, servers) {
     return servers.some((server) => server.status.state === "connected" &&
         compareUrl(server.url) === targetUrl);
 }
-function returnUrl() {
-    if (typeof window === "undefined")
-        return "/";
-    return (window.location.pathname + window.location.search + window.location.hash);
-}
-function canStartOAuth(integration) {
-    return (integration.authMode === "oauth" &&
-        ((integration.connectionMode === "oauth" &&
-            integration.availability === "ready") ||
-            integration.managedOAuth === true));
-}
 function hasApiFallback(apiFallback) {
     return Boolean(apiFallback);
 }
@@ -57,6 +56,7 @@ export function McpConnectionSuggestion({ text, contextText = "", variant = "com
     const mcpServersQuery = useMcpServers();
     const createMcpServer = useCreateMcpServer();
     const [dialogOpen, setDialogOpen] = useState(false);
+    const [quickConnectIntegrationId, setQuickConnectIntegrationId] = useState(null);
     const [dismissedId, setDismissedId] = useState(null);
     const [connecting, setConnecting] = useState(false);
     const [error, setError] = useState(null);
@@ -79,13 +79,13 @@ export function McpConnectionSuggestion({ text, contextText = "", variant = "com
     const canCreateOrgMcp = Boolean(hasOrg &&
         (mcpServersQuery.data?.role === "owner" ||
             mcpServersQuery.data?.role === "admin"));
-    const shouldChooseScope = Boolean(integration &&
-        shouldOfferMcpIntegrationOrganizationScope(integration, hasOrg, canCreateOrgMcp));
     const shouldSuggest = mcpServersQuery.isSuccess &&
         integration &&
         !connected &&
         dismissedId !== integration.id &&
-        (variant === "composer" || isMcpConnectionFailureText(text));
+        (variant === "composer" ||
+            isMcpConnectionFailureText(text) ||
+            isMcpConnectionSuggestionText(text));
     useEffect(() => {
         setError(null);
         setConnecting(false);
@@ -96,76 +96,33 @@ export function McpConnectionSuggestion({ text, contextText = "", variant = "com
         if (!integration || connecting)
             return;
         setError(null);
+        setConnecting(true);
         if (apiFallback) {
             openAgentSettings(`secrets:${apiFallback.secretKey}`);
-            return;
-        }
-        if (shouldChooseScope) {
-            saveMcpConnectionResume(variant === "response" ? contextText : text);
-            setDialogOpen(true);
-            return;
-        }
-        if (canStartOAuth(integration)) {
-            setConnecting(true);
-            saveMcpConnectionResume(variant === "response" ? contextText : text);
-            navigateToMcpOAuthStart(agentNativePath(buildMcpOAuthStartUrl({
-                name: integration.name,
-                url: integration.url,
-                description: integration.description,
-                scope: "user",
-                returnUrl: returnUrl(),
-            })));
-            return;
-        }
-        if (integration.authMode === "none" &&
-            integration.connectionMode === "direct") {
-            saveMcpConnectionResume(variant === "response" ? contextText : text);
-            setConnecting(true);
-            try {
-                await createMcpServer.mutateAsync({
-                    scope: "user",
-                    name: integration.name,
-                    url: integration.url,
-                    description: integration.description,
-                });
-                setDismissedId(integration.id);
-                notifyMcpConnectionComplete();
-            }
-            catch (cause) {
-                clearMcpConnectionResume();
-                setError(cause instanceof Error ? cause.message : t("mcpIntegrations.failed"));
-            }
-            finally {
-                setConnecting(false);
-            }
+            setConnecting(false);
             return;
         }
         saveMcpConnectionResume(variant === "response" ? contextText : text);
+        setQuickConnectIntegrationId(integration.id);
         setDialogOpen(true);
     };
     const actionLabel = hasApiFallback(apiFallback)
         ? t("mcpIntegrations.useApiToken")
-        : canStartOAuth(integration)
-            ? t("mcpIntegrations.connectWithOAuth")
-            : integration.availability === "client-restricted" ||
-                integration.availability === "provider-setup"
-                ? t("mcpIntegrations.viewSetup")
-                : t("mcpIntegrations.connect");
+        : t("mcpIntegrations.connect");
     return (_jsxs(_Fragment, { children: [_jsxs("div", { className: variant === "response"
                     ? "agent-mcp-connection-suggestion agent-mcp-connection-suggestion--response mt-3 flex max-w-[520px] items-center gap-2 rounded-lg border border-primary/20 bg-primary/5 px-3 py-2 text-[12px]"
                     : "agent-mcp-connection-suggestion agent-mcp-connection-suggestion--composer mx-auto mb-2 flex w-[min(calc(100%_-_1.5rem),750px)] items-center gap-2 rounded-lg border border-primary/20 bg-primary/5 px-3 py-2 text-[12px]", "data-mcp-connection-suggestion": integration.id, "data-mcp-connection-suggestion-variant": variant, children: [_jsx(McpIntegrationLogo, { name: integration.name, logoUrl: integration.logoUrl, integrationId: integration.id, className: "size-6 rounded-md text-[10px]", imageClassName: "size-5" }), _jsx("span", { className: "min-w-0 flex-1 leading-snug text-foreground", children: t(hasApiFallback(apiFallback)
                             ? "mcpIntegrations.connectSuggestionWithApiToken"
-                            : "mcpIntegrations.connectSuggestion", { name: integration.name }) }), _jsxs("button", { type: "button", onClick: () => void connect(), disabled: connecting, "aria-busy": connecting, className: "inline-flex shrink-0 items-center gap-1 rounded-md bg-primary px-2.5 py-1.5 text-[11px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-60", children: [connecting && _jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), !connecting &&
-                                canStartOAuth(integration) &&
-                                !hasApiFallback(apiFallback) && (_jsx(IconPlugConnected, { className: "h-3 w-3" })), !connecting && hasApiFallback(apiFallback) && (_jsx(IconPlugConnected, { className: "h-3 w-3" })), actionLabel, !connecting &&
-                                !canStartOAuth(integration) &&
-                                !hasApiFallback(apiFallback) && (_jsx(IconArrowUpRight, { className: "h-3 w-3" }))] }), _jsx("button", { type: "button", onClick: () => setDismissedId(integration.id), className: "inline-flex h-6 w-6 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-background hover:text-foreground", "aria-label": t("mcpIntegrations.dismissSuggestion"), children: _jsx(IconX, { className: "h-3.5 w-3.5" }) })] }), error && (_jsx("div", { className: variant === "response"
+                            : "mcpIntegrations.connectSuggestion", { name: integration.name }) }), _jsxs("button", { type: "button", onClick: () => void connect(), disabled: connecting, "aria-busy": connecting, className: "inline-flex shrink-0 items-center gap-1 rounded-md bg-primary px-2.5 py-1.5 text-[11px] font-medium text-primary-foreground hover:bg-primary/90 disabled:pointer-events-none disabled:opacity-60", children: [connecting && _jsx(IconLoader2, { className: "h-3 w-3 animate-spin" }), !connecting && _jsx(IconPlugConnected, { className: "h-3 w-3" }), actionLabel] }), _jsx("button", { type: "button", onClick: () => setDismissedId(integration.id), className: "inline-flex h-6 w-6 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-background hover:text-foreground", "aria-label": t("mcpIntegrations.dismissSuggestion"), children: _jsx(IconX, { className: "h-3.5 w-3.5" }) })] }), error && (_jsx("div", { className: variant === "response"
                     ? "agent-mcp-connection-suggestion-error agent-mcp-connection-suggestion-error--response mt-1 max-w-[520px] text-[11px] text-destructive"
                     : "agent-mcp-connection-suggestion-error agent-mcp-connection-suggestion-error--composer mx-auto mb-2 w-[min(calc(100%_-_1.5rem),750px)] text-[11px] text-destructive", children: error })), _jsx(McpIntegrationDialog, { open: dialogOpen, onOpenChange: (open) => {
                     setDialogOpen(open);
-                    if (!open)
+                    if (!open) {
                         clearMcpConnectionResume();
-                }, initialIntegrationId: integration.id, defaultScope: "user", canCreateOrgMcp: canCreateOrgMcp, hasOrg: hasOrg, onCreateMcpServer: (args) => createMcpServer.mutateAsync(args), onCreated: () => {
+                        setQuickConnectIntegrationId(null);
+                        setConnecting(false);
+                    }
+                }, initialIntegrationId: integration.id, quickConnectIntegrationId: quickConnectIntegrationId, defaultScope: "user", canCreateOrgMcp: canCreateOrgMcp, hasOrg: hasOrg, onCreateMcpServer: (args) => createMcpServer.mutateAsync(args), onCreated: () => {
                     setDismissedId(integration.id);
                     saveMcpConnectionResume(variant === "response" ? contextText : text);
                     notifyMcpConnectionComplete();

package/dist/client/resources/McpIntegrationDialog.d.ts

@@ -4,6 +4,8 @@ export interface McpIntegrationDialogProps {
     open: boolean;
     onOpenChange: (open: boolean) => void;
     initialIntegrationId?: string | null;
+    connectIntegrationId?: string | null;
+    quickConnectIntegrationId?: string | null;
     defaultScope: McpServerScope;
     canCreateOrgMcp: boolean;
     hasOrg: boolean;
@@ -11,4 +13,4 @@ export interface McpIntegrationDialogProps {
     onCreated?: () => void;
     integrations?: DefaultMcpIntegration[];
 }
-export declare function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId, defaultScope, canCreateOrgMcp, hasOrg, onCreateMcpServer, onCreated, integrations, }: McpIntegrationDialogProps): import("react").JSX.Element | null;
+export declare function McpIntegrationDialog({ open, onOpenChange, initialIntegrationId, connectIntegrationId, quickConnectIntegrationId, defaultScope, canCreateOrgMcp, hasOrg, onCreateMcpServer, onCreated, integrations, }: McpIntegrationDialogProps): import("react").JSX.Element | null;